From 3d4fab1d95453c29ef2196e8e45535d1f1489e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sun, 31 Jul 2005 17:56:51 +0000
Subject: * Special:Watchlist allowed only one type of limit at a time * moved
 appendToArrayIfNotDefault to GlobalFunctions * changed some html message in
 Special:Watchlist to wiki text or plain text

---
 RELEASE-NOTES                     |  1 +
 includes/GlobalFunctions.php      | 12 ++++++
 includes/SpecialRecentchanges.php | 34 +++++-----------
 includes/SpecialWatchlist.php     | 85 ++++++++++++++++++++++++---------------
 4 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 44d71cea599b..d4376bfcf2d7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -631,6 +631,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 === Changes since 1.5beta4 ===
 
 * Fix Special:Allmessages under PHP 5
+* (bug ????) Special:Watchlist allowed only one type of limit at a time
 
 
 === Caveats ===
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a694c96cfefc..7673e64cc3b7 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1304,4 +1304,16 @@ function wfEncryptPassword( $userid, $password ) {
 		return $p;
 }
 
+/**
+ * Appends to second array if $value differs from that in $default
+ */
+function wfAppendToArrayIfNotDefault( $key, $value, $default, &$changed ) {
+	if ( is_null( $changed ) ) {
+		wfDebugDieBacktrace('GlobalFunctions::wfAppendToArrayIfNotDefault got null');
+	}
+	if ( $default[$key] !== $value ) {
+		$changed[$key] = $value;
+	}
+}
+
 ?>
diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 8ad4899d7e4c..7405e688e1b9 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -131,7 +131,7 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 	$hidem .= $hidebots ? ' AND rc_bot=0' : '';
 	$hidem .= $hideliu ? ' AND rc_user=0' : '';
 	$hidem .= $hidepatrolled ? ' AND rc_patrolled=0' : '';
-	$hidem .= is_null( $namespace ) ?  ''	: ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace;
+	$hidem .= is_null( $namespace ) ?  '' : ' AND rc_namespace' . ($invert ? '!=' : '=') . $namespace;
 
 	// This is the big thing!
 
@@ -176,15 +176,15 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 			// Dump everything here
 			$nondefaults = array();
 		
-			appendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'limit', $limit , $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'hideminor', $hideminor, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'hidebots', $hidebots, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'hideliu', $hideliu, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'hidepatrolled', $hidepatrolled, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'from', $from, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'namespace', $namespace, $defaults, $nondefaults);
-			appendToArrayIfNotDefault( 'invert', $invert, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'limit', $limit , $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'hideminor', $hideminor, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'hidebots', $hidebots, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'hideliu', $hideliu, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'hidepatrolled', $hidepatrolled, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'from', $from, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'namespace', $namespace, $defaults, $nondefaults);
+			wfAppendToArrayIfNotDefault( 'invert', $invert, $defaults, $nondefaults);
 
 			// Add end of the texts
 			$wgOut->addHTML( '<div class="rcoptions">' . rcOptionsPanel( $defaults, $nondefaults ) );
@@ -563,18 +563,4 @@ function rcFormatDiff( $row ) {
 	return $comment;	
 }
 
-
-/**
- * Appends to second array if $value differs from that in $default
- */
-function appendToArrayIfNotDefault( $key, $value, $default, &$changed )
-{
-	if ( is_null( $changed ) ) {
-		die();
-	}
-	if ( $default[$key] !== $value ) {
-		$changed[$key] = $value;
-	}
-}
-
 ?>
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index e6fabf80fa26..56f48fcc42b7 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -33,11 +33,20 @@ function wfSpecialWatchlist( $par ) {
 		return;
 	}
 
+	$defaults = array(
+	/* float */ 'days' => 3.0, /* or 0.5, watch further below */
+	/* bool  */ 'hideOwn' => false,
+	);
+
+	extract($defaults);
+
 	# Get query variables
 	$days = $wgRequest->getVal( 'days' );
+	$hideOwn = $wgRequest->getBool( 'hideOwn' );
+
+	# Watchlist editing
 	$action = $wgRequest->getVal( 'action' );
 	$remove = $wgRequest->getVal( 'remove' );
-	$hideOwn = $wgRequest->getBool( 'hideOwn' );	
 	$id = $wgRequest->getArray( 'id' );
 
 	$uid = $wgUser->getID();
@@ -45,7 +54,7 @@ function wfSpecialWatchlist( $par ) {
 		$wgUser->clearAllNotifications( $uid );
 	}
 
-
+  # Deleting items from watchlist
 	if(($action == 'submit') && isset($remove) && is_array($id)) {
 		$wgOut->addWikiText( wfMsg( 'removingchecked' ) );
 		$wgOut->addHTML( '<p>' );
@@ -92,18 +101,24 @@ function wfSpecialWatchlist( $par ) {
 		return;
 	}
 
-	if ( is_null( $days ) ) {
-		$big = 1000;
+	if( is_null($days) || !is_numeric($days) ) {
+		$big = 1000; /* The magical big */
 		if($nitems > $big) {
 			# Set default cutoff shorter
-			$days = (12.0 / 24.0); # 12 hours...
+			$days = $defaults['days'] = (12.0 / 24.0); # 12 hours...
 		} else {
-			$days = 3; # longer cutoff for shortlisters
+			$days = $defaults['days']; # default cutoff for shortlisters
 		}
 	} else {
 		$days = floatval($days);
 	}
 
+	// Dump everything here
+	$nondefaults = array();
+
+	wfAppendToArrayIfNotDefault( 'days', $days, $defaults, $nondefaults);
+	wfAppendToArrayIfNotDefault( 'hideOwn', $hideOwn, $defaults, $nondefaults);
+
 	if ( $days <= 0 ) {
 		$docutoff = '';
 		$cutoff = false;
@@ -119,6 +134,7 @@ function wfSpecialWatchlist( $par ) {
 
 	}
 
+	/* Edit watchlist form */
 	if($wgRequest->getBool('edit') || $par == 'edit' ) {
 		$wgOut->addWikiText( wfMsg( 'watchlistcontains', $wgLang->formatNum( $nitems ) ) .
 			"\n\n" . wfMsg( 'watcheditlist' ) );
@@ -139,12 +155,12 @@ function wfSpecialWatchlist( $par ) {
 		while( $s = $dbr->fetchObject( $res ) ) {
 			$list[$s->wl_namespace][] = $s->wl_title;
 		}
-		
+
 		// TODO: Display a TOC
 		foreach($list as $ns => $titles) {
 			if (Namespace::isTalk($ns))
 				continue;
-			if ($ns != NS_MAIN) 
+			if ($ns != NS_MAIN)
 				$wgOut->addHTML( '<h2>' . $wgContLang->getFormattedNsText( $ns ) . '</h2>' );
 			$wgOut->addHTML( '<ul>' );
 			foreach($titles as $title) {
@@ -208,7 +224,7 @@ function wfSpecialWatchlist( $par ) {
 		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
 	}
 
-	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems / 2 ), 
+	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems / 2 ),
 		$wgLang->formatNum( $npages ), $y,
 		$specialTitle->getFullUrl( 'edit=yes' ) );
 	$wgOut->addWikiText( $header );
@@ -238,30 +254,36 @@ function wfSpecialWatchlist( $par ) {
 
 	$res = $dbr->query( $sql, $fname );
 	$numRows = $dbr->numRows( $res );
+
+	/* Start bottom header */
+	$wgOut->addHTML( "<hr />\n<p>" );
+
 	if($days >= 1)
-		$note = wfMsg( 'rcnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( $days ) );
+		$wgOut->addWikiText( wfMsg( 'rcnote', $wgLang->formatNum( $numRows ),
+			$wgLang->formatNum( $days ) ) . '<br />' , false );
 	elseif($days > 0)
-		$note = wfMsg( 'wlnote', $wgLang->formatNum( $numRows ), $wgLang->formatNum( round($days*24) ) );
-	else
-		$note = '';
-	$wgOut->addHTML( "\n<hr />\n{$note}\n<br />" );
-	$note = wlCutoffLinks( $days );
-	$wgOut->addHTML( "{$note}\n" );
+		$wgOut->addWikiText( wfMsg( 'wlnote', $wgLang->formatNum( $numRows ),
+			$wgLang->formatNum( round($days*24) ) ) . '<br />' , false );
+
+	$wgOut->addHTML( "\n" . wlCutoffLinks( $days, 'Watchlist', $nondefaults ) . "<br />\n" );
 	
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
 		$wgContLang->specialPage( 'Watchlist' ),
-		(0 == $hideOwn) ? wfMsg( 'wlhide' ) : wfMsg( 'wlshow' ),	
-	  	'hideOwn=' . $wgLang->formatNum( 1-$hideOwn ) );
-	  	
-	$note = wfMsg( "wlhideshowown", $s );
-	$wgOut->addHTML( "\n<br />{$note}\n<br />" );
+		(0 == $hideOwn) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
+		wfArrayToCGI( array('hideOwn' => $wgLang->formatNum( 1-$hideOwn )), $nondefaults ) );
+
+	$wgOut->addHTML( wfMsgHtml( "wlhideshowown", $s ) );
 	
 	if ( $numRows == 0 ) {
-		$wgOut->addHTML( '<p><i>' . wfMsg( 'watchnochange' ) . '</i></p>' );
+		$wgOut->addWikitext( "<br />\n" . wfMsg( 'watchnochange' ), false );
+		$wgOut->addHTML( "</p>\n" );
 		return;
 	}
 
+	$wgOut->addHTML( "</p>\n" );
+	/* End bottom header */
+
 	$sk = $wgUser->getSkin();
 	$list =& new ChangesList( $sk );
 	$s = $list->beginRecentChangesList();
@@ -300,44 +322,43 @@ function wfSpecialWatchlist( $par ) {
 
 }
 
-
-function wlHoursLink( $h, $page ) {
+function wlHoursLink( $h, $page, $options = array() ) {
 	global $wgUser, $wgLang, $wgContLang;
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
 	  $wgContLang->specialPage( $page ),
 	  $wgLang->formatNum( $h ),
-	  'days=' . ($h / 24.0) );
+	  wfArrayToCGI( array('days' => ($h / 24.0)), $options ) );
 	return $s;
 }
 
-
-function wlDaysLink( $d, $page ) {
+function wlDaysLink( $d, $page, $options = array() ) {
 	global $wgUser, $wgLang, $wgContLang;
 	$sk = $wgUser->getSkin();
 	$s = $sk->makeKnownLink(
 	  $wgContLang->specialPage( $page ),
-	  ($d ? $wgLang->formatNum( $d ) : wfMsg( 'watchlistall2' ) ), "days=$d" );
+	  ($d ? $wgLang->formatNum( $d ) : wfMsgHtml( 'watchlistall2' ) ),
+	  wfArrayToCGI( array('days' => $d), $options ) );
 	return $s;
 }
 
-function wlCutoffLinks( $days, $page = 'Watchlist' )
+function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() )
 {
 	$hours = array( 1, 2, 6, 12 );
 	$days = array( 1, 3, 7 );
 	$cl = '';
 	$i = 0;
 	foreach( $hours as $h ) {
-		$hours[$i++] = wlHoursLink( $h, $page );
+		$hours[$i++] = wlHoursLink( $h, $page, $options );
 	}
 	$i = 0;
 	foreach( $days as $d ) {
-		$days[$i++] = wlDaysLink( $d, $page );
+		$days[$i++] = wlDaysLink( $d, $page, $options );
 	}
 	return wfMsg ('wlshowlast',
 		implode(' | ', $hours),
 		implode(' | ', $days),
-		wlDaysLink( 0, $page ) );
+		wlDaysLink( 0, $page, $options ) );
 }
 
 ?>
-- 
cgit v1.2.3


From f43c4521fc88b4a75f4fc67c6d08624a6fbf7282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sun, 31 Jul 2005 19:35:52 +0000
Subject: Removed some nonsense and fixed ugly HTML

---
 includes/SpecialWatchlist.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 56f48fcc42b7..d254b333f34b 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -271,12 +271,12 @@ function wfSpecialWatchlist( $par ) {
 	$s = $sk->makeKnownLink(
 		$wgContLang->specialPage( 'Watchlist' ),
 		(0 == $hideOwn) ? wfMsgHtml( 'wlhide' ) : wfMsgHtml( 'wlshow' ),
-		wfArrayToCGI( array('hideOwn' => $wgLang->formatNum( 1-$hideOwn )), $nondefaults ) );
+		wfArrayToCGI( array('hideOwn' => 1-$hideOwn ), $nondefaults ) );
 
 	$wgOut->addHTML( wfMsgHtml( "wlhideshowown", $s ) );
 	
 	if ( $numRows == 0 ) {
-		$wgOut->addWikitext( "<br />\n" . wfMsg( 'watchnochange' ), false );
+		$wgOut->addWikitext( "<br />" . wfMsg( 'watchnochange' ), false );
 		$wgOut->addHTML( "</p>\n" );
 		return;
 	}
@@ -342,8 +342,7 @@ function wlDaysLink( $d, $page, $options = array() ) {
 	return $s;
 }
 
-function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() )
-{
+function wlCutoffLinks( $days, $page = 'Watchlist', $options = array() ) {
 	$hours = array( 1, 2, 6, 12 );
 	$days = array( 1, 3, 7 );
 	$cl = '';
-- 
cgit v1.2.3


From 403468685201c4e11548533960f48e7d2f569af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Mon, 1 Aug 2005 19:45:09 +0000
Subject: added missing bug number

---
 RELEASE-NOTES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d4376bfcf2d7..65ead8695f90 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -631,7 +631,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 === Changes since 1.5beta4 ===
 
 * Fix Special:Allmessages under PHP 5
-* (bug ????) Special:Watchlist allowed only one type of limit at a time
+* (bug 2911) Special:Watchlist allowed only one type of limit at a time
 
 
 === Caveats ===
-- 
cgit v1.2.3


From 77a6ba25d63a5d1e1a3e365e48be4aba436d8eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 2 Aug 2005 00:01:45 +0000
Subject: No references here, caused ugly by php notice

---
 includes/GlobalFunctions.php   | 2 +-
 includes/Parser.php            | 2 +-
 includes/SpecialRandompage.php | 2 +-
 includes/Title.php             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 7673e64cc3b7..0709db1f937a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -523,7 +523,7 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) {
 	if( is_object( $link ) ) {
 		$title =& $link;
 	} else {
-		$title =& Title::newFromText( $link );
+		$title = Title::newFromText( $link );
 		if( is_null( $title ) ) {
 			return false;
 		}
diff --git a/includes/Parser.php b/includes/Parser.php
index f7d32f5590a3..bfbc23f25213 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1308,7 +1308,7 @@ class Parser
 				$link = substr($link, 1);
 			}
 
-			$nt =& Title::newFromText( $this->unstripNoWiki($link, $this->mStripState) );
+			$nt = Title::newFromText( $this->unstripNoWiki($link, $this->mStripState) );
 			if( !$nt ) {
 				$s .= $prefix . '[[' . $line;
 				continue;
diff --git a/includes/SpecialRandompage.php b/includes/SpecialRandompage.php
index 59836c9fedfe..82d580cb6a6b 100644
--- a/includes/SpecialRandompage.php
+++ b/includes/SpecialRandompage.php
@@ -51,7 +51,7 @@ function wfSpecialRandompage( $par = NS_MAIN ) {
 	}	
 	if( is_null( $title ) ) {
 		# That's not supposed to happen :)
-		$title =& Title::newFromText( wfMsg( 'mainpage' ) );
+		$title = Title::newFromText( wfMsg( 'mainpage' ) );
 	}
 	$wgOut->reportTime(); # for logfile
 	$wgOut->redirect( $title->getFullUrl() );
diff --git a/includes/Title.php b/includes/Title.php
index 33f728b780aa..4d7994b42bef 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -102,7 +102,7 @@ class Title {
 	 * @static
 	 * @access public
 	 */
-	function &newFromText( $text, $defaultNamespace = NS_MAIN ) {
+	function newFromText( $text, $defaultNamespace = NS_MAIN ) {
 		$fname = 'Title::newFromText';
 		wfProfileIn( $fname );
 
-- 
cgit v1.2.3


From cb61aefd47fb07f9e0a59a329e0f43c20f5a46c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 2 Aug 2005 11:08:24 +0000
Subject: backported ns selector & some other fixes

---
 includes/GlobalFunctions.php      | 35 +++++++++++++++++++++++++++++++++--
 includes/Image.php                |  2 +-
 includes/SpecialAllpages.php      | 19 +++++--------------
 includes/SpecialContributions.php | 17 ++++-------------
 includes/SpecialRecentchanges.php | 28 ++++++++--------------------
 includes/SpecialUndelete.php      |  4 ++--
 languages/Language.php            |  2 +-
 languages/LanguageAr.php          |  2 +-
 languages/LanguageCs.php          |  2 +-
 languages/LanguageDa.php          |  9 ++-------
 languages/LanguageFi.php          |  9 +++++----
 languages/LanguageKu.php          |  1 -
 languages/LanguageMk.php          |  2 +-
 languages/LanguageNn.php          |  2 +-
 languages/LanguageRu.php          |  2 +-
 languages/LanguageSk.php          |  2 +-
 16 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0709db1f937a..0b85b00dd3e3 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1151,7 +1151,7 @@ function wfGetSiteNotice() {
  *
  * @param string $element
  * @param array $attribs Name=>value pairs. Values will be escaped.
- * @param bool $contents NULL to make an open tag only; '' for a contentless closed tag (default)
+ * @param string $contents NULL to make an open tag only; '' for a contentless closed tag (default)
  * @return string
  */
 function wfElement( $element, $attribs = null, $contents = '') {
@@ -1182,7 +1182,7 @@ function wfElement( $element, $attribs = null, $contents = '') {
  *
  * @param string $element
  * @param array $attribs Name=>value pairs. Values will be escaped.
- * @param bool $contents NULL to make an open tag only; '' for a contentless closed tag (default)
+ * @param string $contents NULL to make an open tag only; '' for a contentless closed tag (default)
  * @return string
  */
 function wfElementClean( $element, $attribs = array(), $contents = '') {
@@ -1195,6 +1195,37 @@ function wfElementClean( $element, $attribs = array(), $contents = '') {
 	return wfElement( $element, $attribs, $contents );
 }
 
+/**
+ * Create a namespace selector
+ *
+ * @param mixed $selected The namespace which should be selected, default ''
+ * @param string $allnamespaces Value of a special item denoting all namespaces. Null to not include (default)
+ * @return Html string containing the namespace selector
+ */
+function &HTMLnamespaceselector($selected = '', $allnamespaces = null) {
+	global $wgContLang;
+	$s = "<select name='namespace' class='namespaceselector'>\n";
+	$arr = $wgContLang->getFormattedNamespaces();
+	if( !is_null($allnamespaces) ) {
+		$arr = array($allnamespaces => wfMsgHtml('namespacesall')) + $arr;
+	}
+	foreach ($arr as $index => $name) {
+		if ($index < NS_MAIN) continue;
+
+		$name = $index !== 0 ? $name : wfMsgHtml('blanknamespace');
+
+		if ($index === $selected) {
+			$s .= wfElement("option",
+					array("value" => $index, "selected" => "selected"),
+					$name);
+		} else {
+			$s .= wfElement("option", array("value" => $index), $name);
+		}
+	}
+	$s .= "</select>\n";
+	return $s;
+}
+
 /** Global singleton instance of MimeMagic. This is initialized on demand,
 * please always use the wfGetMimeMagic() function to get the instance.
 * 
diff --git a/includes/Image.php b/includes/Image.php
index 3e7362132438..1314b4a028bb 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -854,7 +854,7 @@ class Image
 	 * @return ThumbnailImage
 	 * @access public
 	 */
-	function &getThumbnail( $width, $height=-1 ) {
+	function getThumbnail( $width, $height=-1 ) {
 		if ( $height == -1 ) {
 			return $this->renderThumb( $width );
 		}
diff --git a/includes/SpecialAllpages.php b/includes/SpecialAllpages.php
index 26e7434abaed..5ba83c7e90b7 100644
--- a/includes/SpecialAllpages.php
+++ b/includes/SpecialAllpages.php
@@ -45,31 +45,22 @@ function indexNamespaceForm ( $namespace = NS_MAIN, $from = '' ) {
 	global $wgContLang, $wgScript;
 	$t = Title::makeTitle( NS_SPECIAL, "Allpages" );
 
-	$namespaceselect = "<select name='namespace' id='nsselectbox'>";
-	$arr = $wgContLang->getFormattedNamespaces();
-	foreach ( $arr as $ns => $name ) {
-		if ($ns < NS_MAIN)
-			continue;
-		$n = $ns == 0 ? wfMsg ( 'blanknamespace' ) : $name;
-		$sel = $ns == $namespace ? ' selected="selected"' : '';
-		$namespaceselect .= "<option value='$ns'$sel>$n</option>";	
-	}
-	$namespaceselect .= '</select>';
+	$namespaceselect = HTMLnamespaceselector($namespace, null);
 
 	$frombox = "<input type='text' size='20' name='from' id='nsfrom' value=\""
 	            . htmlspecialchars ( $from ) . '"/>';
-	$submitbutton = '<input type="submit" value="' . wfMsg( 'allpagessubmit' ) . '" />';
+	$submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . '" />';
 	
-	$out = "<div class='namespaceselector'><form method='get' action='{$wgScript}'>";
+	$out = "<div class='namespaceoptions'><form method='get' action='{$wgScript}'>";
 	$out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
 	$out .= "
 <table id='nsselect' class='allpages'>
 	<tr>
-		<td align='right'>" . wfMsg('allpagesfrom') . "</td>
+		<td align='right'>" . wfMsgHtml('allpagesfrom') . "</td>
 		<td align='left'><label for='nsfrom'>$frombox</label></td>
 	</tr>
 	<tr>    
-		<td align='right'><label for='nsselectbox'>" . wfMsg('namespace') . "</label></td>
+		<td align='right'><label for='namespace'>" . wfMsgHtml('namespace') . "</label></td>
 		<td align='left'>
 			$namespaceselect $submitbutton
 		</td>
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 35afe173eca5..0e552850480e 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -245,19 +245,10 @@ function wfSpecialContributions( $par = null ) {
 			"type" => "hidden",
 			"value" => $target));
 	$nsform .= "<p>";
-	$nsform .= htmlspecialchars(wfMsg('namespace')) . " <select name='namespace'>\n";
-	foreach (array("" => wfMsg('contributionsall')) + $arr as $nsn => $name) {
-		if ($nsn < 0)
-			continue;
-		$name = $nsn!==0 ? $name : wfMsg('blanknamespace');
-		$nsform .= ("$nsn" == "$ns") ?
-				wfElement("option",
-					array("value" => $nsn, "selected" => "selected"),
-					$name)
-				:
-				wfElement("option", array("value" => $nsn), $name);
-	}
-	$nsform .= "</select>\n";
+	$nsform .= wfMsgHtml('namespace');
+
+	$nsform .= HTMLnamespaceselector($ns, '');
+
 	$nsform .= wfElement("input", array(
 			"type" => "submit",
 			"value" => wfMsg('allpagessubmit')));
diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 7405e688e1b9..eccc4c688943 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -458,34 +458,22 @@ function rcNamespaceForm ( $namespace, $invert, $nondefaults ) {
 	global $wgContLang, $wgScript;
 	$t = Title::makeTitle( NS_SPECIAL, 'Recentchanges' );
 
-	$namespaceselect = "<select name='namespace' id='nsselectbox'>";
-	$namespaceselect .= '<option value="" ' . ($namespace === '' ? ' selected="selected"' : '') . '>' . wfMsg( 'contributionsall' ) . '</option>';
-	$arr =  $wgContLang->getFormattedNamespaces();
-	foreach ( $arr as $ns => $name ) {
-		if( $ns < NS_MAIN )
-			continue;
-		$n = $ns === NS_MAIN ? wfMsg ( 'blanknamespace' ) : $name;
-		$sel = $namespace === (string) $ns ? ' selected="selected"' : '';
-		$namespaceselect .= "<option value='$ns'$sel>$n</option>";
-	}
-	$namespaceselect .= '</select>';
+	$namespaceselect = HTMLnamespaceselector($namespace, '');
+	$submitbutton = '<input type="submit" value="' . wfMsgHtml( 'allpagessubmit' ) . '" />';
+	$invertbox = "<input type='checkbox' name='invert' value='1' id='nsinvert'" . ( $invert ? ' checked="checked"' : '' ) . ' />';
+
+	$out = "<div class='namespacesettings'><form method='get' action='{$wgScript}'>\n";
 
-	$out = '';
-	$out .= "<div class='namespaceselector'><form method='get' action='{$wgScript}'>\n";
 	foreach ( $nondefaults as $key => $value ) {
 		if ($key != 'namespace' && $key != 'invert')
-			$out .= "<input type='hidden' name='$key' value='$value' />";
+			$out .= wfElement('input', array( 'type' => 'hidden', 'name' => $key, 'value' => $value));
 	}
 
-	$submitbutton = '<input type="submit" value="' . wfMsg( 'allpagessubmit' ) . '" />';
-	$invertbox = "<input type='checkbox' name='invert' value='1' id='nsinvert'" . ( $invert ? ' checked="checked"' : '' ) . ' />';
-	
-	
 	$out .= '<input type="hidden" name="title" value="'.$t->getPrefixedText().'" />';
 	$out .= "
 <div id='nsselect' class='recentchanges'>
-	<label for='nsselectbox'>" . wfMsg('namespace') . "</label>
-	$namespaceselect $submitbutton $invertbox <label for='nsinvert'>" . wfMsg('invert') . "</label>
+	<label for='namespace'>" . wfMsgHtml('namespace') . "</label>
+	$namespaceselect $submitbutton $invertbox <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>
 </div>";
 	$out .= '</form></div>';
 	return $out;
diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 51b8083f7a4a..09ef8678e5fc 100644
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -40,7 +40,7 @@ class PageArchive {
 	 *
 	 * @return ResultWrapper
 	 */
-	/* static */ function &listAllPages() {
+	/* static */ function listAllPages() {
 		$dbr =& wfGetDB( DB_SLAVE );
 		$archive = $dbr->tableName( 'archive' );
 
@@ -56,7 +56,7 @@ class PageArchive {
 	 *
 	 * @return ResultWrapper
 	 */
-	function &listRevisions() {
+	function listRevisions() {
 		$dbr =& wfGetDB( DB_SLAVE );
 		return $dbr->resultObject( $dbr->select( 'archive',
 			array( 'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text', 'ar_comment' ),
diff --git a/languages/Language.php b/languages/Language.php
index cfb8ffe25603..902b638f5d90 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2085,7 +2085,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'imagelistall' => 'all',
 'watchlistall1' => 'all',
 'watchlistall2' => 'all',
-'contributionsall' => 'all',
+'namespacesall' => 'all',
 
 # E-mail address confirmation
 'confirmemail' => 'Confirm E-mail address',
diff --git a/languages/LanguageAr.php b/languages/LanguageAr.php
index c92b0339f6ef..f2d495b39c39 100644
--- a/languages/LanguageAr.php
+++ b/languages/LanguageAr.php
@@ -148,7 +148,6 @@ require_once('LanguageUtf8.php');
 'contribslink' => 'مساهمات',
 'contribsub' => 'للمستخدم $1',
 'contributions' => 'مساهمات المستخدم',
-'contributionsall' => 'الكل',
 'copyright' => 'المحتويات تحت  $1.',
 'copyrightpage' => 'ويكيبيديا:حقوق النسخ',
 'copyrightpagename' => 'حقوق النسخ في ويكيبيديا',
@@ -329,6 +328,7 @@ require_once('LanguageUtf8.php');
 'mycontris' => 'مساهماتي',
 'mypage' => 'صفحتي',
 'namespace' => 'النطاق:',
+'namespacesall' => 'الكل',
 'navigation' => 'تصفح',
 'nbytes' => '$1 بايت',
 'nchanges' => '$1 تغييرات',
diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index ca8089e3a9dc..835df227550e 100644
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -1855,7 +1855,7 @@ ta['ca-nstab-category'] = new Array('c','Zobrazit kategorii.');",
 'imagelistall' => 'všechny',
 'watchlistall1' => 'všechny',
 'watchlistall2' => 'všechny',
-'contributionsall' => 'všechny',
+'namespacesall' => 'všechny',
 
 # E-mail address confirmation
 'confirmemail' => 'Potvrzení e-mailové adresy',
diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index fe99a9db242f..a60bbc6b9639 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -651,12 +651,7 @@ nummer <b>$2</b>.",
 Søg i navnerum:<br />
 $1<br />
 $2 List omdirigeringer &nbsp; Søg efter $3 $9",
-"searchdisabled" => "<p>Beklager! Fuldtekstsøgningen er midlertidigt afbrudt på grund af for stor belastning på serverne. I mellemtidem kan du anvende Google- eller Yahoo!-søgefelterne herunder. Bemærk at deres kopier af {{SITENAME}}s indhold kan være forældet.</p>
-                                                                                                                                                        
-",
-"googlesearch" => "<p> <table border=\"0\" bgcolor=\"#FFFFFF\"> <!-- SiteSearch Google --> <tr> <td valign=\"top\" align=\"center\"> <a href=\"http://www.google.com/\"> <img src=\"http://www.google.com/logos/Logo_40wht.gif\" border=\"0\" alt=\"Google\" title=\"Google\"> </a> </td> <td width=\"100%\"> <form method=\"get\" action=\"http://www.google.com/search\"> <input type=\"text\" name=\"q\" size=31 maxlength=255 value=\"$1\"> <input type=\"submit\" name=\"btnG\" value=\"Google-søgning\"> <input type=\"hidden\" name=\"domains\" value=\"{{SERVER}}\"> <input type=\"hidden\" name=\"ie\" value=\"$2\"> <input type=\"hidden\" name=\"oe\" value=\"$2\"> <br /> 
-<font size=-1> <input type=\"radio\" name=\"sitesearch\" value=\"\">WWW <input type=\"radio\" name=\"sitesearch\" value=\"{{SERVER}}\" checked>{{SERVER}} </font> </form> </td> </tr> <!-- SiteSearch Google --> <!-- Spacing --> <tr> <td colspan=2>&nbsp;</td> </tr> <!-- Spacing --> <!-- Yahoo search --> <tr> <td valign=\"top\" align=\"center\"> <a href=\"http://search.yahoo.com/\"> <img src=\"http://us.i1.yimg.com/us.yimg.com/i/us/search/ysan/ysanlogo.gif\" border=\"0\" alt=\"Yahoo!\"vspace=\"5\"> </a> </td> <td width=\"100%\"> <form method=get action=\"http://search.yahoo.com/search\"> <input type=\"hidden\" name=\"x\" value=\"op\"> <input type=\"hidden\" name=\"va_vt\" value=\"any\"> <input type=\"text\" name=\"va\" size=\"31\" value=\"$1\"> <input type=\"submit\" value=\"Yahoo!-søgning\"> <br /> <font size=-1> <input type=\"radio\" name=\"vs\" value=\"\">WWW <input type=\"radio\" name=\"vs\" value=\"da.wikipedia.org\" checked>{{SERVER}}</font> </form> </td> </table> </p> <p>Du kan anvende følgende link til at forfatte en artikel om dette emne: <a href=\"/w/wiki.phtml?title=$1&action=edit\">$1</a></p> <p><b>Bemærk</b>: Vi anbefaler at du gennemsøger {{SITENAME}}, før du opretter en ny artikel, dette er for at undgå flere artikler om samme emne, som kan være oprettet under et andet navn eller stavemåde.</p> 
-",
+"searchdisabled" => "<p>Beklager! Fuldtekstsøgningen er midlertidigt afbrudt på grund af for stor belastning på serverne. I mellemtidem kan du anvende Google- eller Yahoo!-søgefelterne herunder. Bemærk at deres kopier af {{SITENAME}}s indhold kan være forældet.</p>",
 "blanknamespace" => "(Artikler)",
 
 # Preferences page
@@ -1622,7 +1617,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Se kategorisiden\');
 'imagelistall' => 'alle',
 'watchlistall1' => 'alle',
 'watchlistall2' => 'alle',
-'contributionsall' => 'alle',
+'namespacesall' => 'alle',
 
 );
 
diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index 500d4b457e1a..143bbe2a4fb0 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -181,7 +181,7 @@ require_once( 'LanguageUtf8.php' );
 'help'                => 'Ohje',
 'search'              => 'Etsi',
 'go'                  => 'Siirry',
-'history'             => 'Vanhemmat versiot',
+'history'             => 'Historia',
 'history_short'       => 'Historia',
 'info_short'          => 'Tiedostus',
 'printableversion'    => 'Tulostettava versio',
@@ -828,7 +828,7 @@ Huomaa, että {{GRAMMAR:inessive|{{SITENAME}}}} muut voivat muokata tai poistaa
 'unwatch'             => 'Lopeta tarkkailu',
 'unwatchthispage'     => 'Lopeta tarkkailu',
 'notanarticle'        => 'Ei ole sivu',
-'watchnochange'       => 'Valittuna ajanjaksona yhtäkään tarkkailemistasi sivuista ei muokattu. ',
+'watchnochange'       => 'Valittuna ajanjaksona yhtäkään tarkkailemistasi sivuista ei muokattu.',
 'watchdetails'        => 'Keskustelusivuja mukaan laskematta tarkkailun alla on $1 sivua, joista $2 on muokattu määritellyllä aikavälillä. <span class="plainlinks"> [$4 Muokkaa listaa]</span>.',
 'wlheader-enotif'     => '* Sähköposti-ilmoitukset ovat käytössä.',
 'wlheader-showupdated'=> '* Sivut, joita on muokattu viimeisen käyntisi jälkeen on merkitty \'\'\'paksummalla\'\'\'',
@@ -841,7 +841,7 @@ Huomaa, että {{GRAMMAR:inessive|{{SITENAME}}}} muut voivat muokata tai poistaa
 'couldntremove'       => 'Sivua $1 ei voitu poistaa tarkkailulistalta',
 'iteminvalidname'     => 'Sivun $1 kanssa oli ongelmia! Sivun nimessä on vikaa.',
 'wlnote'              => 'Alla on <b>$1</b> muutosta viimeisen <b>$2</b> tunnin ajalta.', // TODO NOWIKIMARKUP
-'wlshowlast'          => 'Näytä viimeiset $1 tuntia $2 päivää$3',
+'wlshowlast'          => 'Näytä viimeiset $1 tuntia tai $2 päivää$3',
 'wlsaved'             => 'Tämä on tallennettu versio tarkkailulistastasi.',
 'wlhideshowown'       => '$1 omat muokkaukset.',
 'wlshow'              => 'Näytä',
@@ -1272,8 +1272,9 @@ ta['ca-nstab-category'] = new Array('c','Näytä luokkasivu');
 'edit-externally'     => 'Muokkaa tätä tiedostoa ulkoisessa sovelluksessa',
 'edit-externally-help'=> 'Katso [http://meta.wikimedia.org/wiki/Help:External_editors ohjeet], jos haluat lisätietoja.',
 
+'watchlistall1'       => 'kaikkia',
 'watchlistall2'       => ', koko historia',
-'contributionsall'    => 'kaikki',
+'namespacesall'       => 'kaikki',
 
 # E-mail address confirmation
 'confirmemail'        => 'Varmenna sähköpostiosoite',
diff --git a/languages/LanguageKu.php b/languages/LanguageKu.php
index f4bbb0848ec4..c7b7806cbc3f 100644
--- a/languages/LanguageKu.php
+++ b/languages/LanguageKu.php
@@ -226,7 +226,6 @@ link in your browser to confirm that your e-mail address is valid.', */
 'contribslink' => 'tevkarî',
 'contribsub' => 'Ji bo $1',
 'contributions' => 'Tevkariyên vê bikarhêner',
-#'contributionsall' => 'all',
 'copyright' => 'Naverok bin $1 (Lîsansa Belgekirina Azada GNU) tê weşandin.',
 'copyrightpage' => 'Wîkîpediya:Mafên nivîsanê',
 'copyrightpagename' => 'Mafên nivîsanê',
diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index f41d3bc04363..45093743773a 100644
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -1240,7 +1240,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Видете ја страница
 	'imagelistall'				=>	'сите',
 	'watchlistall1'				=>	'сите',
 	'watchlistall2'				=>	'сите',
-	'contributionsall'			=>	'сите',
+	'namespacesall'				=>	'сите',
 );
 
 
diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index a04e1d7bc32f..026f56dea7a2 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -1640,7 +1640,7 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 'imagelistall'            => 'alle',
 'watchlistall1'           => 'alle',
 'watchlistall2'           => 'alle',
-'contributionsall'        => 'alle',
+'namespacesall'           => 'alle',
 
 # E-mail address confirmation
 'confirmemail'            => 'Stadfest e-postadresse',
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index d53fcb3d4ec9..d6a86738959c 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -1902,7 +1902,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'imagelistall' => 'все',
 'watchlistall1' => 'все',
 'watchlistall2' => 'все',
-'contributionsall' => 'все',
+'namespacesall' => 'все',
 
 # E-mail address confirmation
 'confirmemail' => 'Подтверждение адреса электронной почты',
diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index 339ca7968408..d0711073bd81 100644
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -1636,7 +1636,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Pozrieť si stránku s kategóriam
 'imagelistall' => 'všetky',
 'watchlistall1' => 'všetky',
 'watchlistall2' => 'všetky',
-'contributionsall' => 'všetky',
+'namespacesall' => 'všetky',
 
 # E-mail address confirmation
 'confirmemail' => 'Potvrdiť e-mailovú adresu',
-- 
cgit v1.2.3


From 6b6038d8b331dfd075bed54ddffc33a719c0d935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 2 Aug 2005 22:37:50 +0000
Subject: backported cool new allmessages

---
 RELEASE-NOTES                   |  2 +-
 includes/SpecialAllmessages.php | 46 ++++++++++++++++++++++++++++-------------
 skins/common/common.css         | 19 +++++++++++++++++
 skins/monobook/main.css         | 22 +++++++++++++++++++-
 4 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 65ead8695f90..b61b765077c2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -632,7 +632,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * Fix Special:Allmessages under PHP 5
 * (bug 2911) Special:Watchlist allowed only one type of limit at a time
-
+* (bug 693) Special:Allmessages is excessively wide and redundant
 
 === Caveats ===
 
diff --git a/includes/SpecialAllmessages.php b/includes/SpecialAllmessages.php
index 56e128f37a87..91975a8c891b 100644
--- a/includes/SpecialAllmessages.php
+++ b/includes/SpecialAllmessages.php
@@ -96,12 +96,13 @@ function makeHTMLText( $messages ) {
 	$mwnspace = $wgLang->getNsText( NS_MEDIAWIKI );
 	$mwtalk = $wgLang->getNsText( NS_MEDIAWIKI_TALK );
 	$txt = "
-
-	<table border='1' cellspacing='0' width='100%'>
-	<tr bgcolor='#b2b2ff'>
-		<th>" . wfMsg('allmessagesname') . "</th>
-		<th>" . wfMsg('allmessagesdefault') . "</th>
-		<th>" . wfMsg('allmessagescurrent')  . "</th>
+<table border='1' cellspacing='0' width='100%' id='allmessagestable'>
+	<tr >
+		<th rowspan='2'>" . wfMsgHtml('allmessagesname') . "</th>
+		<th>" . wfMsgHtml('allmessagesdefault') . "</th>
+	</tr>
+	<tr>
+		<th>" . wfMsgHtml('allmessagescurrent') . "</th>
 	</tr>";
 	
 	wfProfileIn( "$fname-check" );
@@ -132,7 +133,7 @@ function makeHTMLText( $messages ) {
 		$titleObj =& Title::makeTitle( NS_MEDIAWIKI, $title );
 		$talkPage =& Title::makeTitle( NS_MEDIAWIKI_TALK, $title );
 
-		$colorIt = ($m['statmsg'] == $m['msg']) ? " bgcolor=\"#f0f0ff\"" : " bgcolor=\"#ffe2e2\"";
+		$changed = ($m['statmsg'] != $m['msg']);
 		$message = htmlspecialchars( $m['statmsg'] );
 		$mw = htmlspecialchars( $m['msg'] );
 		
@@ -149,15 +150,32 @@ function makeHTMLText( $messages ) {
 			$talkLink = $sk->makeBrokenLinkObj( $talkPage, htmlspecialchars( $talk ) );
 		}
 
-		$txt .= 
-		"<tr$colorIt><td>
-		$pageLink<br />
-		$talkLink
+		if($changed) {
+
+			$txt .=
+	"<tr class='orig'>
+		<td rowspan='2'>
+			$pageLink<br />$talkLink
 		</td><td>
-		$message
+$message
+		</td>
+	</tr><tr class='new'>
+		<td>
+$mw
+		</td>
+	</tr>";
+		} else {
+
+			$txt .=
+	"<tr class='def'>
+		<td>
+			$pageLink<br />$talkLink
 		</td><td>
-		$mw
-		</td></tr>";
+$mw
+		</td>
+	</tr>";
+
+		}
 	}
 	$txt .= "</table>";
 	wfProfileOut( "$fname-output" );
diff --git a/skins/common/common.css b/skins/common/common.css
index d73d1399a768..3e9c30525d57 100644
--- a/skins/common/common.css
+++ b/skins/common/common.css
@@ -354,3 +354,22 @@ table.exif td.spacer {
 	background-color: #eeeeff;
 	padding: 0.2em;
 }
+
+/* Allmessages table */
+
+#allmessagestable th {
+	background-color: #b2b2ff;
+}
+
+#allmessagestable tr.orig {
+	background-color: #ffe2e2;
+}
+
+#allmessagestable tr.new {
+	background-color: #e2ffe2;
+}
+
+#allmessagestable tr.def {
+	background-color: #f0f0ff;
+}
+
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index ff04c7de6e0d..58e57788662a 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1,4 +1,4 @@
-/*
+/*
 ** MediaWiki 'monobook' style sheet for CSS2-capable browsers.
 ** Copyright Gabriel Wicke - http://wikidev.net/
 ** License: GPL (http://www.gnu.org/copyleft/gpl.html)
@@ -1187,3 +1187,23 @@ p.revision_saved {
 	background-color: #eeeeff;
 	padding: 0.2em;
 }
+
+
+/* Allmessages table */
+
+#allmessagestable th {
+	background-color: #b2b2ff;
+}
+
+#allmessagestable tr.orig {
+	background-color: #ffe2e2;
+}
+
+#allmessagestable tr.new {
+	background-color: #e2ffe2;
+}
+
+#allmessagestable tr.def {
+	background-color: #f0f0ff;
+}
+
-- 
cgit v1.2.3


From 597ec6c685d8dc899ba14dfcd4818c24d0aee70c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 3 Aug 2005 22:10:28 +0000
Subject: * (bug 3001) Updated and applied live hack for recentchanges-based
 watchlist

---
 RELEASE-NOTES                 |  2 ++
 includes/SpecialWatchlist.php | 74 +++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b61b765077c2..11b3667e2e6e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -633,6 +633,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix Special:Allmessages under PHP 5
 * (bug 2911) Special:Watchlist allowed only one type of limit at a time
 * (bug 693) Special:Allmessages is excessively wide and redundant
+* (bug 3001) Updated and applied live hack for recentchanges-based watchlist
+
 
 === Caveats ===
 
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index d254b333f34b..99ea60e7836d 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -87,14 +87,14 @@ function wfSpecialWatchlist( $par ) {
 	$dbr =& wfGetDB( DB_SLAVE );
 	extract( $dbr->tableNames( 'page', 'revision', 'watchlist', 'recentchanges' ) );
 
-	$sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
-	$res = $dbr->query( $sql, $fname );
-	$s = $dbr->fetchObject( $res );
+               	$sql = "SELECT COUNT(*) AS n FROM $watchlist WHERE wl_user=$uid";
+        	$res = $dbr->query( $sql, $fname );
+        	$s = $dbr->fetchObject( $res );
 
-#	Patch *** A1 *** (see A2 below)
+        #	Patch *** A1 *** (see A2 below)
 #	adjust for page X, talk:page X, which are both stored separately, but treated together
-#	$nitems = $s->n / 2;
-	$nitems = $s->n;
+	$nitems = floor($s->n / 2);
+#	$nitems = $s->n;
 
 	if($nitems == 0) {
 		$wgOut->addWikiText( wfMsg( 'nowatchlist' ) );
@@ -127,10 +127,13 @@ function wfSpecialWatchlist( $par ) {
 	        $docutoff = "AND rev_timestamp > '" .
 		  ( $cutoff = $dbr->timestamp( time() - intval( $days * 86400 ) ) )
 		  . "'";
-	        $sql = "SELECT COUNT(*) AS n FROM $page, $revision  WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
-		$res = $dbr->query( $sql, $fname );
-		$s = $dbr->fetchObject( $res );
-		$npages = $s->n;
+                  /* 
+                  $sql = "SELECT COUNT(*) AS n FROM $page, $revision  WHERE rev_timestamp>'$cutoff' AND page_id=rev_page";
+                  $res = $dbr->query( $sql, $fname );
+                  $s = $dbr->fetchObject( $res );
+                  $npages = $s->n;
+                  */
+                  $npages = 40000 * $days;
 
 	}
 
@@ -197,23 +200,8 @@ function wfSpecialWatchlist( $par ) {
 	# through the time-sorted page list checking for watched items.
 
 	# Up estimate of watched items by 15% to compensate for talk pages...
-	if( $cutoff && ( $nitems*1.15 > $npages ) ) {
-		$x = 'rev_timestamp';
-		$y = wfMsg( 'watchmethod-recent' );
-		# TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
-		# The change results in talk-pages not automatically included in watchlists, when their parent page is included
-		# $z = "wl_namespace=cur_namespace & ~1";
-		$z = 'wl_namespace=page_namespace';
-	} else {
-		$x = 'page_timestamp';
-		$y = wfMsg( 'watchmethod-list' );
-		# TG patch: here we do not consider pages and their talk pages equivalent - why should we ?
-		# The change results in talk-pages not automatically included in watchlists, when their parent page is included
-		# $z = "(wl_namespace=cur_namespace OR wl_namespace+1=cur_namespace)";
-		$z = 'wl_namespace=page_namespace';
-	}
 
-	$andHideOwn = $hideOwn ? "AND (rev_user <> $uid)" : '';
+	$andHideOwn = $hideOwn ? "AND (rc_user <> $uid)" : '';
 
 	# Show watchlist header
 	$header = '';
@@ -224,7 +212,7 @@ function wfSpecialWatchlist( $par ) {
 		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
 	}
 
-	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems / 2 ),
+	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems ), 
 		$wgLang->formatNum( $npages ), $y,
 		$specialTitle->getFullUrl( 'edit=yes' ) );
 	$wgOut->addWikiText( $header );
@@ -238,19 +226,23 @@ function wfSpecialWatchlist( $par ) {
 			"\n\n" );
 	}
 
-	$use_index = $dbr->useIndexClause( $x );
-	$sql = "SELECT
-  page_namespace,page_title,rev_comment, page_id,
-  rev_user,rev_user_text,rev_timestamp,rev_minor_edit,rev_id,page_is_new,wl_notificationtimestamp
-  FROM $watchlist,$page,$revision  $use_index
-  WHERE wl_user=$uid
-  $andHideOwn
-  AND $z
-  AND wl_title=page_title
-  AND page_latest=rev_id
-  $docutoff
-  ORDER BY rev_timestamp DESC";
-
+        $sql = "SELECT
+          rc_namespace page_namespace,rc_title page_title,
+          rc_comment rev_comment, rc_cur_id page_id,
+          rc_user rev_user,rc_user_text rev_user_text,
+          rc_timestamp rev_timestamp,rc_minor rev_minor_edit,
+          rc_this_oldid rev_id,
+          rc_last_oldid,
+          rc_new rev_is_new,wl_notificationtimestamp
+          FROM $watchlist,$recentchanges,$page
+          WHERE wl_user=$uid
+          AND wl_namespace=rc_namespace
+          AND wl_title=rc_title
+          AND rc_timestamp > '$cutoff'
+          AND rc_cur_id=page_id
+          AND rc_this_oldid=page_latest
+          $andHideOwn
+          ORDER BY rc_timestamp DESC";
 
 	$res = $dbr->query( $sql, $fname );
 	$numRows = $dbr->numRows( $res );
@@ -290,7 +282,7 @@ function wfSpecialWatchlist( $par ) {
 	$counter = 1;
 	while ( $obj = $dbr->fetchObject( $res ) ) {
 		# Make fake RC entry
-		$rc = RecentChange::newFromCurRow( $obj );
+		$rc = RecentChange::newFromCurRow( $obj, $obj->rc_last_oldid );
 		$rc->counter = $counter++;
 
 		if ( $wgShowUpdatedMarker ) {
-- 
cgit v1.2.3


From 7a0fbe5597cd4a42ea56c5326c6187ca51099045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Sat, 6 Aug 2005 22:14:43 +0000
Subject: * Support for restorelink1

---
 includes/Skin.php      | 2 +-
 languages/Language.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index dc1fa4a6bcc4..9fbc2533d339 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -555,7 +555,7 @@ END;
 			return wfMsg( 'thisisdeleted',
 				$this->makeKnownLink(
 					$wgContLang->SpecialPage( 'Undelete/' . $wgTitle->getPrefixedDBkey() ),
-					wfMsg( 'restorelink', $n ) ) );
+					wfMsg( 'restorelink' . ($n == 1 ? '1' : ''), $n ) ) );
 		}
 		return '';
 	}
diff --git a/languages/Language.php b/languages/Language.php
index 902b638f5d90..db72dce80be7 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -476,6 +476,7 @@ See $1.',
 'showtoc' => 'show',
 'hidetoc' => 'hide',
 'thisisdeleted' => "View or restore $1?",
+'restorelink1' => 'one deleted edit',
 'restorelink' => "$1 deleted edits",
 'feedlinks' => 'Feed:',
 'sitenotice'	=> '-', # the equivalent to wgSiteNotice
-- 
cgit v1.2.3


From 4b63009f08d2fa1bd852d5ac10ada7b956949cd7 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 7 Aug 2005 12:20:45 +0000
Subject: disableCache function

---
 includes/Parser.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/includes/Parser.php b/includes/Parser.php
index bfbc23f25213..a38adc2822b8 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -3289,6 +3289,14 @@ class Parser
 		$sk =& $this->mOptions->getSkin();
 		return $sk->makeImageLinkObj( $nt, $caption, $alt, $align, $width, $height, $framed, $thumb, $manual_thumb );
 	}
+
+	/**
+	 * Set a flag in the output object indicating that the content is dynamic and 
+	 * shouldn't be cached.
+	 */
+	function disableCache() {
+		$this->mOutput->mCacheTime = -1;
+	}
 }
 
 /**
-- 
cgit v1.2.3


From 04059f4b4f1d63b8ef0c2443d38d1ff2a535b4c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 8 Aug 2005 07:34:24 +0000
Subject: * Backported <noinclude> and <includeonly>

---
 includes/Parser.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/includes/Parser.php b/includes/Parser.php
index a38adc2822b8..5fd0bd53f1b5 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -753,6 +753,10 @@ class Parser
 		$fname = 'Parser::internalParse';
 		wfProfileIn( $fname );
 
+		# Remove <noinclude> tags and <includeonly> sections
+		$text = strtr( $text, array( '<noinclude>' => '', '</noinclude>' => '') );
+		$text = preg_replace( '/<includeonly>.*?<\/includeonly>/s', '', $text );
+
 		$text = Sanitizer::removeHTMLtags( $text, array( &$this, 'replaceVariables' ) );
 		$text = $this->replaceVariables( $text, $args );
 
@@ -2279,6 +2283,10 @@ class Parser
 			$this->mTemplatePath[$part1] = 1;
 
 			if( $this->mOutputType == OT_HTML ) {
+				# Remove <noinclude> sections and <includeonly> tags
+				$text = preg_replace( '/<noinclude>.*?<\/noinclude>/s', '', $text );
+				$text = strtr( $text, array( '<includeonly>' => '' , '</includeonly>' => '' ) );
+				# Strip <nowiki>, <pre>, etc.
 				$text = $this->strip( $text, $this->mStripState );
 				$text = Sanitizer::removeHTMLtags( $text, array( &$this, 'replaceVariables' ), $assocArgs );
 			}
-- 
cgit v1.2.3


From a6d85dd0ad6a7fe6c59c01255705b5c2bf120822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 8 Aug 2005 11:11:50 +0000
Subject: * Fixed a content loss bug that would occour if  
 $wgContLang->linkPrefixExtension() evaluated to true and the string being  
 passed to Parser::replaceInternalLinks() matched msg:linkprefix

---
 includes/Parser.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/includes/Parser.php b/includes/Parser.php
index 5fd0bd53f1b5..fa6c1ce06c9c 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1229,7 +1229,6 @@ class Parser
 		if ( $useLinkPrefixExtension ) {
 			if ( preg_match( $e2, $s, $m ) ) {
 				$first_prefix = $m[2];
-				$s = $m[1];
 			} else {
 				$first_prefix = false;
 			}
-- 
cgit v1.2.3


From 6c4af0d964a39350535ff30db5e134c8765a8fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 8 Aug 2005 13:27:13 +0000
Subject: * Made the sidebar idiot proof, if a message is specified like * **
 This message key|Does not exist use * then the literals are used if the
 wfMsg() lookup on them fails

---
 includes/GlobalFunctions.php | 12 ++++++++++++
 includes/Skin.php            |  6 +++++-
 skins/MonoBook.php           |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0b85b00dd3e3..a257ff106086 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1347,4 +1347,16 @@ function wfAppendToArrayIfNotDefault( $key, $value, $default, &$changed ) {
 	}
 }
 
+/**
+ * Since wfMsg() and co suck, they don't return false if the message key they
+ * looked up didn't exist but a XHTML string, this function checks for the
+ * nonexistance of messages by looking at wfMsg() output
+ *
+ * @param $msg      The message key looked up
+ * @param $wfMsgOut The output of wfMsg*()
+ * @return bool
+ */
+function wfNoMsg( $msg, $wfMsgOut ) {
+	return $wfMsgOut === "&lt;$msg&gt;";
+}
 ?>
diff --git a/includes/Skin.php b/includes/Skin.php
index 9fbc2533d339..e84c72777a71 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1316,8 +1316,12 @@ END;
 					$link = wfMsgForContent( $line[0] );
 					if ($link == '-')
 						continue;
+					if (wfNoMsg($line[1], $text = wfMsg($line[1])))
+						$text = $line[1];
+					if (wfNoMsg($line[0], $link))
+						$link = $line[0];
 					$bar[$heading][] = array(
-						'text' => wfMsg( $line[1] ),
+						'text' => $text,
 						'href' => $this->makeInternalOrExternalUrl( $link ),
 						'id' => 'n-' . strtr($line[1], ' ', '-'),
 					);
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index b192ee7dab18..ca28f92c8db0 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -126,7 +126,7 @@ class MonoBookTemplate extends QuickTemplate {
 	<script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
 	<?php foreach ($this->data['sidebar'] as $bar => $cont) { ?>
 	<div class='portlet' id='p-<?php echo htmlspecialchars($bar) ?>'>
-	  <h5><?php $this->msg( $bar ) ?></h5>
+	  <h5><?php $out = wfMsg( $bar ); if (wfNoMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 	  <div class='pBody'>
 	    <ul>
 	    <?php foreach($cont as $key => $val) { ?>
-- 
cgit v1.2.3


From 3d0419bd3337180af10982a644e417d299011312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Tue, 9 Aug 2005 08:02:25 +0000
Subject: * Adding a SkinTemplateContentActions hook to be able to modify the  
 $content_actions array from an extension.

---
 docs/hooks.txt            | 6 ++++++
 includes/SkinTemplate.php | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 92fa0f44c488..ddc7e2f00ad3 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -348,5 +348,11 @@ $article: article object watched
 'CategoryPageView': before viewing a categorypage in CategoryPage::view
 $catpage: CategoryPage instance
 
+'SkinTemplateContentActions': after building the $content_action array right
+                              before returning it, see content_action.php in
+			      the extension module for a demonstration of how
+			      to use this hook.
+$content_actions: The array of content actions
+
 
 More hooks might not be available but undocumented.
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 0cd2963658cf..9270bc530690 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -711,6 +711,8 @@ class SkinTemplate extends Skin {
 			}
 		}
 
+		wfRunHooks( 'SkinTemplateContentActions', array(&$content_actions) );
+		
 		wfProfileOut( $fname );
 		return $content_actions;
 	}
-- 
cgit v1.2.3


From 6848208a9bbe968350c1fa74ccb55dfe83802313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Tue, 9 Aug 2005 12:25:06 +0000
Subject: * Giving interwiki links a class so that they can be styled
 individually

---
 includes/SkinTemplate.php | 11 ++++++++---
 skins/MonoBook.php        |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9270bc530690..496ceeadc0a3 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -362,10 +362,15 @@ class SkinTemplate extends Skin {
 
 		if ( !$wgHideInterlanguageLinks ) {
 			foreach( $wgOut->getLanguageLinks() as $l ) {
+				$tmp = explode( ':', $l, 2 );
+				$class = 'interwiki-' . $tmp[0];
+				unset($tmp);
 				$nt = Title::newFromText( $l );
-				$language_urls[] = array('href' => $nt->getFullURL(),
-				'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
-				'class' => $wgContLang->isRTL() ? 'rtl' : 'ltr');
+				$language_urls[] = array(
+					'href' => $nt->getFullURL(),
+					'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+					'class' => $class
+				);
 			}
 		}
 		if(count($language_urls)) {
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index ca28f92c8db0..2556c4b0b196 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -189,7 +189,7 @@ class MonoBookTemplate extends QuickTemplate {
 	  <div class="pBody">
 	    <ul>
 	      <?php foreach($this->data['language_urls'] as $langlink) { ?>
-	      <li>
+	      <li class="<?php echo htmlspecialchars($langlink['class'])?>">
 	      <a href="<?php echo htmlspecialchars($langlink['href'])
 	        ?>"><?php echo $langlink['text'] ?></a>
 	      </li>
-- 
cgit v1.2.3


From 3fe9f52033c3c1699d95d04efbaddee82d67ba00 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 10 Aug 2005 21:13:49 +0000
Subject: BACKPORT from HEAD: fix bug 145: finish 'exclude redirect'
 implementation

---
 RELEASE-NOTES              | 2 +-
 includes/SearchMySQL.php   | 4 ++--
 includes/SpecialSearch.php | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 11b3667e2e6e..4f07aea58beb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -634,7 +634,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2911) Special:Watchlist allowed only one type of limit at a time
 * (bug 693) Special:Allmessages is excessively wide and redundant
 * (bug 3001) Updated and applied live hack for recentchanges-based watchlist
-
+* (bug 145) Finish 'exclude redirect' implementation in search form
 
 === Caveats ===
 
diff --git a/includes/SearchMySQL.php b/includes/SearchMySQL.php
index 304c714050e3..bf90fdb721e0 100644
--- a/includes/SearchMySQL.php
+++ b/includes/SearchMySQL.php
@@ -61,9 +61,9 @@ class SearchMySQL extends SearchEngine {
 	 */
 	function queryRedirect() {
 		if( $this->showRedirects ) {
-			return 'AND cur_is_redirect=0';
-		} else {
 			return '';
+		} else {
+			return 'AND page_is_redirect=0';
 		}
 	}
 	
diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 20948b96aed3..87174832d05c 100644
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -70,7 +70,7 @@ class SpecialSearch {
 			$this->namespaces = $this->userNamespaces( $user );
 		}
 		
-		$this->searchRedirects = false;
+		$this->searchRedirects = $request->getcheck( 'redirs' ) ? true : false;
 	}
 	
 	/**
@@ -164,6 +164,7 @@ class SpecialSearch {
 		$search =& SearchEngine::create();
 		$search->setLimitOffset( $this->limit, $this->offset );
 		$search->setNamespaces( $this->namespaces );
+		$search->showRedirects = $this->searchRedirects;
 		$titleMatches = $search->searchTitle( $term );
 		$textMatches = $search->searchText( $term );
 		
-- 
cgit v1.2.3


From 2015bb5031ca50ea6e206d9f577859bcd5592433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Wed, 10 Aug 2005 22:11:07 +0000
Subject: * Adding a tool to find duplicate translations

---
 maintenance/duplicatetrans.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 maintenance/duplicatetrans.php

diff --git a/maintenance/duplicatetrans.php b/maintenance/duplicatetrans.php
new file mode 100644
index 000000000000..89d9cff1c778
--- /dev/null
+++ b/maintenance/duplicatetrans.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Prints out messages that are the same as the message with the corrisponding
+ * key in the Language.php file
+ *
+ * @package MediaWiki
+ * @subpackage Maintenance
+ */
+
+require_once('commandLine.inc');
+
+if ( 'en' == $wgLanguageCode ) {
+	print "Current selected language is English. Cannot check translations.\n";
+	exit();
+}
+
+$count = $total = 0;
+$msgarray = 'wgAllMessages' . ucfirst( $wgLanguageCode );
+
+foreach ( $$msgarray as $code => $msg ) {
+	++$total;
+	if ( @$wgAllMessagesEn[$code] == $msg ) {
+		echo "* $code\n";
+		++$count;
+	}
+}
+
+echo "{$count} messages of {$total} are duplicates\n";
+?>
-- 
cgit v1.2.3


From 7f60d040581db5dea3ed1d94153b9c4d2e0be61c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 11 Aug 2005 08:11:43 +0000
Subject: * Rearranged Special:Movepage form to reduce confusion between
 destination   title and reason input boxes (Copied from HEAD)

---
 RELEASE-NOTES                | 3 +++
 includes/SpecialMovepage.php | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4f07aea58beb..8bbf994b0712 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -635,6 +635,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 693) Special:Allmessages is excessively wide and redundant
 * (bug 3001) Updated and applied live hack for recentchanges-based watchlist
 * (bug 145) Finish 'exclude redirect' implementation in search form
+* Rearranged Special:Movepage form to reduce confusion between destination
+  title and reason input boxes
+
 
 === Caveats ===
 
diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 70c8a4feda13..58f445cf1dad 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -138,9 +138,9 @@ class MovePageForm {
 			</td>
 		</tr>
 		<tr>
-			<td align='right'>{$movereason}:</td>
-			<td align='left'>
-				<input type='text' size='40' name=\"wpReason\" value=\"{$encReason}\" />
+			<td align='right' valign='top'><br />{$movereason}:</td>
+			<td align='left' valign='top'><br />
+				<textarea type='text' cols='60' rows='2' name=\"wpReason\" value=\"{$encReason}\"></textarea>
 			</td>
 		</tr>" );
 
-- 
cgit v1.2.3


From 14e080625c9f6dfa40921692b9edb6ec60a6b10c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 11 Aug 2005 10:13:38 +0000
Subject: * (bug 2527) Always set destination filename when new file is
 selected

---
 RELEASE-NOTES            | 1 +
 skins/common/wikibits.js | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8bbf994b0712..7f52c39d800a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -637,6 +637,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 145) Finish 'exclude redirect' implementation in search form
 * Rearranged Special:Movepage form to reduce confusion between destination
   title and reason input boxes
+* (bug 2527) Always set destination filename when new file is selected
 
 
 === Caveats ===
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 249f72064619..76485a2c1133 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -479,10 +479,7 @@ function fillDestFilename() {
 
 	// Output result
 	var destFile = document.getElementById('wpDestFile');
-	if (destFile.value == '' || destFile.value == document.fname ) {
-		document.getElementById('wpDestFile').value = fname;
-	}
-	document.fname = fname;
+	if (destFile) destFile.value = fname;
 }
 	
 
-- 
cgit v1.2.3


From 38a0f51b03bfcd548d41d4ff770ea256e98dda93 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 11 Aug 2005 11:21:32 +0000
Subject: * (bug 3056) MySQL 3 compatibility fix: USE INDEX instead of FORCE
 INDEX * PHP 4.1 compatibility fix: don't use new_link parameter to
 mysql_connect   if running prior to 4.2.0 as it causes the call to fail

---
 RELEASE-NOTES         |  3 +++
 config/index.php      |  2 +-
 includes/Database.php | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7f52c39d800a..8b85e0151a09 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -638,6 +638,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Rearranged Special:Movepage form to reduce confusion between destination
   title and reason input boxes
 * (bug 2527) Always set destination filename when new file is selected
+* (bug 3056) MySQL 3 compatibility fix: USE INDEX instead of FORCE INDEX
+* PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
+  if running prior to 4.2.0 as it causes the call to fail
 
 
 === Caveats ===
diff --git a/config/index.php b/config/index.php
index bfabc7ac6749..14afe6305b2c 100644
--- a/config/index.php
+++ b/config/index.php
@@ -519,7 +519,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 				$errs["DBserver"] = "Connection failed";
 				break;
 			default:
-				$errs["DBserver"] = "Couldn't connect to database";
+				$errs["DBserver"] = "Couldn't connect to database ($err)";
 				break;
 			}
 			if( !$ok ) continue;
diff --git a/includes/Database.php b/includes/Database.php
index b66e7178dc8c..32a49971b11c 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -37,7 +37,7 @@ class Database {
 	 */
 	var $mLastQuery = '';
 	
-	var $mServer, $mUser, $mPassword, $mConn, $mDBname;
+	var $mServer, $mUser, $mPassword, $mConn = null, $mDBname;
 	var $mOut, $mOpened = false;
 	
 	var $mFailFunction; 
@@ -215,7 +215,14 @@ class Database {
 			@/**/$this->mConn = mysql_pconnect( $server, $user, $password );
 		} else {
 			# Create a new connection...
-			@/**/$this->mConn = mysql_connect( $server, $user, $password, true );
+			if( version_compare( PHP_VERSION, '4.2.0', 'ge' ) ) {
+				@/**/$this->mConn = mysql_connect( $server, $user, $password, true );
+			} else {
+				# On PHP 4.1 the new_link parameter is not available. We cannot
+				# guarantee that we'll actually get a new connection, and this
+				# may cause some operations to fail possibly.
+				@/**/$this->mConn = mysql_connect( $server, $user, $password );
+			}
 		}
 
 		if ( $dbName != '' ) {
@@ -1120,7 +1127,10 @@ class Database {
 	 * PostgreSQL doesn't have them and returns ""
 	 */
 	function useIndexClause( $index ) {
-		return "FORCE INDEX ($index)";
+		global $wgDBmysql4;
+		return $wgDBmysql4
+			? "FORCE INDEX ($index)"
+			: "USE INDEX ($index)";
 	}
 
 	/**
-- 
cgit v1.2.3


From f993acc57d2ef1a8c3880bec0eadac47b9c0a65f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 12 Aug 2005 04:48:32 +0000
Subject: * (bug 3117) Fix display of upload size and type with tidy on Copy
 fix from HEAD

---
 RELEASE-NOTES          |  1 +
 includes/ImagePage.php | 45 ++++++++++++++++++++-------------------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8b85e0151a09..f86922eb9a3c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -641,6 +641,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3056) MySQL 3 compatibility fix: USE INDEX instead of FORCE INDEX
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
   if running prior to 4.2.0 as it causes the call to fail
+* (bug 3117) Fix display of upload size and type with tidy on
 
 
 === Caveats ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 58085809521e..5f2ddc4a340b 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -206,34 +206,29 @@ class ImagePage extends Article {
 
 
 			if ($showLink) {
-				$s= $sk->makeMediaLink( $this->img->getName(), '', '', true );
-				$info= wfMsg( 'fileinfo', ceil($this->img->getSize()/1024.0), $this->img->getMimeType() );
+				$filename = wfEscapeWikiText( $this->img->getName() );
+				$info = wfMsg( 'fileinfo',
+					ceil($this->img->getSize()/1024.0),
+					$this->img->getMimeType() );
 
 				if (!$this->img->isSafeFile()) {
-					$wgOut->addHTML("<div class=\"fullMedia\">");
-					$wgOut->addHTML("<span class=\"dangerousLink\">");
-					$wgOut->addHTML($s);
-					$wgOut->addHTML("</span>");
-
-					$wgOut->addHTML("<span class=\"fileInfo\"> (");
-					$wgOut->addWikiText( $info, false );
-					$wgOut->addHTML(")</span>");
-					$wgOut->addHTML("</div>");
-
-					#this should be formated a little nicer. Is CSS sufficient?
-					$wgOut->addHTML("<div class=\"mediaWarning\">");
-					$wgOut->addWikiText( wfMsg( 'mediawarning' ) );
-					$wgOut->addHTML('</div>');
-
+					$warning = wfMsg( 'mediawarning' );
+					$wgOut->addWikiText( <<<END
+<div class="fullMedia">
+<span class="dangerousLink">[[Media:$filename|$filename]]</span>
+<span class="fileInfo"> ($info)</span>
+</div>
+
+<div class="mediaWarning">$warning</div>
+END
+						);
 				} else {
-					$wgOut->addHTML("<div class=\"fullMedia\">");
-					$wgOut->addHTML($s);
-
-					$wgOut->addHTML("<span class=\"fileInfo\"> (");
-					$wgOut->addWikiText( $info, false );
-					$wgOut->addHTML(")</span>");
-
-					$wgOut->addHTML("</div>");
+					$wgOut->addWikiText( <<<END
+<div class="fullMedia">
+[[Media:$filename|$filename]] <span class="fileInfo"> ($info)</span>
+</div>
+END
+						);
 				}
 			}
 
-- 
cgit v1.2.3


From b47724a7f29bbebc6f02d1f448053ee60fd5f64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 12 Aug 2005 05:37:47 +0000
Subject: * (bug 3122) MAG_END did not have __ around it

---
 languages/LanguageCy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 19f5ccb3667d..41d3a2b9ca0a 100644
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -68,7 +68,7 @@
     MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN", "GENENWMISCYFOES"     ),
     MAG_SUBST                => array( 1,    "SUBST:"                                     ),
     MAG_MSGNW                => array( 0,    "MSGNW:"                                     ),
-    MAG_END                 => array( 0, "DIWEDD"                                   ),
+    MAG_END                 => array( 0, "__DIWEDD__"                                   ),
     MAG_IMG_THUMBNAIL       => array( 1, "ewin bawd", "bawd", "thumb", "thumbnail"  ),
     MAG_IMG_RIGHT            => array( 1,    "de", "right"                                ),
     MAG_IMG_LEFT             => array( 1,    "chwith", "left"                             ),
-- 
cgit v1.2.3


From d43174f9633e6da95ddb748647d17f99b7036e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 12 Aug 2005 06:57:35 +0000
Subject: * Typo

---
 config/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/index.php b/config/index.php
index 14afe6305b2c..4959368f9f35 100644
--- a/config/index.php
+++ b/config/index.php
@@ -824,7 +824,7 @@ if( count( $errs ) ) {
 		use Turck shared memory if the wiki will be running on a single Apache server.
 	</dl>
 
-<h2>E-mail, e-mail notification and authentification setup</h2>
+<h2>E-mail, e-mail notification and authentication setup</h2>
 
 <dl class="setup">
 	<dd>
-- 
cgit v1.2.3


From 57ada872403e971327ac866e8d2c745b6dbf7d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 12 Aug 2005 18:32:29 +0000
Subject: * (bug 1487) invalid html on empty list in banlist (hack) * (bug
 3017) Hotkey conflict for delete and show changes * made pixel unit
 translateable and blocklistline now eats infiniteblock and expiringblock *
 removed some obsolote messages

---
 RELEASE-NOTES                   |  3 +++
 includes/SpecialIpblocklist.php | 29 ++++++++++++---------------
 includes/SpecialPreferences.php |  4 ++--
 languages/Language.php          | 21 ++++++++------------
 languages/LanguageAf.php        |  4 +---
 languages/LanguageBg.php        |  6 +++---
 languages/LanguageCa.php        |  4 +---
 languages/LanguageCs.php        | 14 +++----------
 languages/LanguageCsb.php       |  2 --
 languages/LanguageCy.php        |  4 +---
 languages/LanguageDa.php        | 15 +++-----------
 languages/LanguageDe.php        |  4 +---
 languages/LanguageEo.php        |  4 +---
 languages/LanguageEs.php        |  4 +---
 languages/LanguageEt.php        |  6 +-----
 languages/LanguageFa.php        |  4 +---
 languages/LanguageFi.php        | 44 +++++++++++++++++++++++------------------
 languages/LanguageFr.php        |  7 +------
 languages/LanguageFy.php        |  4 +---
 languages/LanguageGa.php        |  6 +++---
 languages/LanguageHe.php        |  4 +---
 languages/LanguageHu.php        |  4 +---
 languages/LanguageIa.php        |  4 +---
 languages/LanguageId.php        | 13 +-----------
 languages/LanguageIs.php        |  4 +++-
 languages/LanguageIt.php        |  4 +---
 languages/LanguageJa.php        |  4 +---
 languages/LanguageKu.php        | 19 +-----------------
 languages/LanguageLi.php        |  6 +-----
 languages/LanguageLt.php        |  1 -
 languages/LanguageMk.php        | 13 ++++--------
 languages/LanguageMs.php        |  4 +---
 languages/LanguageNds.php       |  8 +-------
 languages/LanguageNl.php        |  4 +---
 languages/LanguageNn.php        | 16 +++------------
 languages/LanguageNo.php        |  4 +---
 languages/LanguageOc.php        |  4 +---
 languages/LanguagePl.php        |  4 +---
 languages/LanguagePt.php        |  4 +---
 languages/LanguageRo.php        |  4 +---
 languages/LanguageRu.php        | 15 +++-----------
 languages/LanguageSc.php        |  4 +---
 languages/LanguageSk.php        | 11 +++--------
 languages/LanguageSl.php        |  4 +---
 languages/LanguageSq.php        |  4 +---
 languages/LanguageSr.php        |  4 +---
 languages/LanguageSv.php        |  4 +---
 languages/LanguageTa.php        |  4 +---
 languages/LanguageUk.php        |  4 +---
 languages/LanguageWa.php        |  4 +---
 languages/LanguageZh_cn.php     |  4 +---
 languages/LanguageZh_tw.php     |  4 +---
 52 files changed, 115 insertions(+), 268 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f86922eb9a3c..fa5a3c7ab9cf 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -642,6 +642,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
   if running prior to 4.2.0 as it causes the call to fail
 * (bug 3117) Fix display of upload size and type with tidy on
+* (bug 1487) invalid html on empty list in banlist
+* (bug 3017) Hotkey conflict for delete and show changes
+* made pixel unit translateable and blocklistline now eats infiniteblock and expiringblock
 
 
 === Caveats ===
diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 492f78db26c9..609bda25631e 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -49,20 +49,20 @@ class IPUnblockForm {
 	
 	function showForm( $err )
 	{
-		global $wgOut, $wgUser, $wgLang;
+		global $wgOut, $wgUser, $wgLang, $wgSysopUserBans;
 
 		$wgOut->setPagetitle( wfMsg( "unblockip" ) );
 		$wgOut->addWikiText( wfMsg( "unblockiptext" ) );
 
-		$ipa = wfMsg( "ipaddress" );
-		$ipr = wfMsg( "ipbreason" );
-		$ipus = htmlspecialchars( wfMsg( "ipusubmit" ) );
+		$ipa = wfMsgHtml( $wgSysopUserBans ? 'ipadressorusername' : 'ipaddress' );
+		$ipr = wfMsgHtml( 'ipbreason' );
+		$ipus = wfMsgHtml( 'ipusubmit' );
 		$titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
 		$action = $titleObj->escapeLocalURL( "action=submit" );
 
 		if ( "" != $err ) {
 			$wgOut->setSubtitle( wfMsg( "formerror" ) );
-			$wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
+			$wgOut->addWikitext( "<span class='error'>{$err}</span>\n" );
 		}
 		$token = htmlspecialchars( $wgUser->editToken() );
 		
@@ -104,7 +104,7 @@ class IPUnblockForm {
 		} else {
 			$block->mAddress = $this->ip;
 		}
-		
+
 		# Delete block (if it exists)
 		# We should probably check for errors rather than just declaring success
 		$block->delete();
@@ -127,7 +127,9 @@ class IPUnblockForm {
 			$wgOut->setSubtitle( $msg );
 		}
 		$wgOut->addHTML( "<ul>" );
-		Block::enumBlocks( "wfAddRow", 0 );
+		// FIXME hack to solve #bug 1487
+		if(!Block::enumBlocks( "wfAddRow", 0 ))
+			$wgOut->addHTML( '<li>'.wfMsg( 'ipblocklistempty' ).'</li>' );
 		$wgOut->addHTML( "</ul>\n" );
 	}
 }
@@ -148,9 +150,9 @@ function wfAddRow( $block, $tag ) {
 	$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
 	
 	if ( $block->mExpiry === "" ) {
-		$formattedExpiry = "indefinite";
+		$formattedExpiry = wfMsgHtml('infiniteblock');
 	} else {
-		$formattedExpiry = $wgLang->timeanddate( $block->mExpiry, true );
+		$formattedExpiry = wfMsgHtml('expiringblock', $wgLang->timeanddate( $block->mExpiry, true ) );
 	}
 	
 	$line = wfMsg( "blocklistline", $formattedTime, $ulink, $addr, $formattedExpiry );
@@ -159,17 +161,12 @@ function wfAddRow( $block, $tag ) {
 
 	if ( !$block->mAuto ) {
 		$titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
-		$clink = "<a href=\"" . $titleObj->escapeLocalURL( "target={$block->mAddress}" ) . "\">" .
-		  wfMsg( "contribslink" ) . "</a>";
-		$wgOut->addHTML( " ({$clink})" );
+		$wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'contribslink' ), "target={$block->mAddress}") . ')' );
 	}
 
 	if ( $wgUser->isAllowed('block') ) {
 		$titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
-		$ublink = "<a href=\"" . 
-		  $titleObj->escapeLocalURL( "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
-		  wfMsg( "unblocklink" ) . "</a>";
-		$wgOut->addHTML( " ({$ublink})" );
+		$wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'unblocklink' ), 'action=unblock&ip=' . urlencode( $addr ) ) . ')' );
 	}
 	$wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
 	$wgOut->addHTML( "</li>\n" );
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 6e99b3f03fe6..f96efe3399ef 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -661,7 +661,7 @@ class PreferencesForm {
 			$imageLimitOptions = null;
 			foreach ( $wgImageLimits as $index => $limits ) {
 				$selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
-				$imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";
+				$imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}×{$limits[1]}". wfMsgHtml('unit-pixel') ."</option>\n";
 			}
 
 			$imageThumbOptions = null;
@@ -669,7 +669,7 @@ class PreferencesForm {
 				<div><label>" . wfMsg('thumbsize') . "<select name=\"wpThumbSize\">");
 			foreach ( $wgThumbLimits as $index => $size ) {
 				$selected = ($index == $this->mThumbSize) ? 'selected="selected"' : '';
-				$imageThumbOptions .= "<option value=\"{$index}\" {$selected}>{$size}px</option>\n";
+				$imageThumbOptions .= "<option value=\"{$index}\" {$selected}>{$size}". wfMsgHtml('unit-pixel') ."</option>\n";
 			}
 			$wgOut->addHTML( "{$imageThumbOptions}</select></label></div></fieldset>\n\n");
 
diff --git a/languages/Language.php b/languages/Language.php
index db72dce80be7..212eb61e0697 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1134,17 +1134,6 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
 'specialpages'	=> 'Special pages',
 'spheading'		=> 'Special pages for all users',
 'restrictedpheading'	=> 'Restricted special pages',
-'blockpheading' => 'block level',
-'createaccountpheading' => 'createaccount level',
-'deletepheading' => 'delete level',
-'userrightspheading' => 'userrights level',
-'grouprightspheading' => 'grouprights level',
-'siteadminpheading' => 'siteadmin level',
-
-/** obsoletes
-'sysopspheading' => 'For sysop use only',
-'developerspheading' => 'For developer use only',
-*/
 'protectpage'	=> 'Protect page',
 'recentchangeslinked' => 'Related changes',
 'rclsub'		=> "(to pages linked from \"$1\")",
@@ -1416,6 +1405,10 @@ to a previously blocked IP address or username.',
 'ipusubmit'		=> 'Unblock this address',
 'ipusuccess'	=> "\"[[$1]]\" unblocked",
 'ipblocklist'	=> 'List of blocked IP addresses and usernames',
+'blocklistline'	=> "$1, $2 blocked $3 ($4)",
+'infiniteblock' => 'infinite',
+'expiringblock' => 'expires $1',
+'ipblocklistempty'	=> 'The blocklist is empty.',
 'blocklistline'	=> "$1, $2 blocked $3 (expires $4)",
 'blocklink'		=> 'block',
 'unblocklink'	=> 'unblock',
@@ -1639,7 +1632,7 @@ article [[Train]].
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for some actions, most are in Monobook.js
@@ -1770,7 +1763,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'nextdiff' => 'Next diff &rarr;',
 
 'imagemaxsize' => 'Limit images on image description pages to: ',
-'thumbsize'	=> 'Thumbnail size :',
+'thumbsize'	=> 'Thumbnail size: ',
 'showbigimage' => 'Download high resolution version ($1x$2, $3 KB)',
 
 'newimages' => 'Gallery of new files',
@@ -2136,6 +2129,8 @@ $1
 'trackbackremove' => ' ([$1 Delete])',
 'trackbacklink' => 'Trackback',
 'trackbackdeleteok' => 'The trackback was successfully deleted.',
+
+'unit-pixel' => 'px',
 );
 
 /* a fake language converter */
diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php
index 373fdd3001e3..c03384547e2e 100644
--- a/languages/LanguageAf.php
+++ b/languages/LanguageAf.php
@@ -603,8 +603,6 @@ Dit werk uit op gemiddeld <b>$5</b> veranderings per bladsy, en bladsye word <b>
 "listusers"		=> "Gebruikerslys",
 "specialpages"	=> "Spesiale bladsye",
 "spheading"		=> "Spesiale bladsye",
-"sysopspheading" => "Spesiale bladsye vir die sisop se gebruik",
-"developerspheading" => "Spesiale bladsye vir programmeerders se gebruik",
 "protectpage"	=> "Beskerm bladsy",
 "recentchangeslinked" => "Verwante veranderings",
 "rclsub"		=> "(na bladsye waarna \"$1\" skakel)",
@@ -737,7 +735,7 @@ Vul 'n spesifieke rede hier onder in (haal byvoorbeeld spesifieke bladsye wat ge
 "ipusubmit"		=> "Maak hierdie adres oop",
 "ipusuccess"	=> "IP-adres \"$1\" is oopgemaak",
 "ipblocklist"	=> "Lys van geblokkeerde IP-adresse",
-"blocklistline"	=> "$1, $2 het $3 geblok",
+'blocklistline'	=> '$1, $2 het $3 geblok ($4)',
 "blocklink"		=> "blok",
 "unblocklink"	=> "maak oop",
 "contribslink"	=> "bydraes",
diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php
index f0f895795526..64108d8698c2 100644
--- a/languages/LanguageBg.php
+++ b/languages/LanguageBg.php
@@ -907,8 +907,6 @@ border='0' alt='Google'/></a>
 'listusers'    => 'Списък на потребителите',
 'specialpages'  => 'Специални страници',
 'spheading'    => 'За всички потребители',
-'sysopspheading' => 'Само за администратори',
-'developerspheading' => 'Само за разработчици',
 'protectpage'  => 'Защитена страница',
 'recentchangeslinked' => 'Сродни промени',
 'rclsub'    => "(на страници, сочени от \"$1\")",
@@ -1108,7 +1106,9 @@ $3...
 'ipusubmit'    => 'Отблокиране на адреса',
 'ipusuccess'  => "\"$1\" бе отблокиран",
 'ipblocklist'  => 'Списък на блокирани IP-адреси и потребители',
-'blocklistline'  => "$1, $2 е блокирал $3 (изтича на $4)",
+'blocklistline'  => "$1, $2 е блокирал $3 ($4)",
+'infiniteblock' => 'изтича на infinite', //fixme
+'expiringblock' => 'изтича на $1',
 'blocklink'    => 'блокиране',
 'unblocklink'  => 'отблокиране',
 'contribslink'  => 'приноси',
diff --git a/languages/LanguageCa.php b/languages/LanguageCa.php
index c5e169d8ab9d..a5d77599950b 100644
--- a/languages/LanguageCa.php
+++ b/languages/LanguageCa.php
@@ -624,8 +624,6 @@ subpàgines.",
 "listusers"		=> "Llistat d'usuaris",
 "specialpages"	=> "Pàgines especials",
 "spheading"		=> "Pàgines especials",
-"sysopspheading" => "Pàgines especials per ús de sysops",
-"developerspheading" => "Pàgines especials per a l'ús dels desenvolupadors",
 "protectpage"	=> "Pàgines protegides",
 "recentchangeslinked" => "Seguiment d'enllaços",
 "rclsub"		=> "(a pàgines enllaçades des de \"$1\")",
@@ -780,7 +778,7 @@ l'accés a l'escriptura a una direcció IP prèviament bloquejada.",
 "ipusubmit"		=> "Desbloqueja aquesta direcció",
 "ipusuccess"	=> "Direcció IP \"$1\" desbloquejada",
 "ipblocklist"	=> "Llistat de direccions IP bloquejades",
-"blocklistline"	=> "$1, $2 bloqueja $3",
+"blocklistline"	=> "$1, $2 bloqueja $3 ($4)",
 "blocklink"		=> "bloqueja",
 "unblocklink"	=> "desbloqueja",
 "contribslink"	=> "contribucions",
diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 835df227550e..9f5e912c1866 100644
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -960,9 +960,6 @@ váš uživatelský účet zablokován.",
 'specialpages'  => 'Speciální stránky',
 'spheading'             => 'Speciální stránky pro všechny uživatele',
 'restrictedpheading'	=> 'Speciální stránky s omezeným přístupem',
-/** obsoletes
-'sysopspheading' => 'Speciální stránky pro správce',
-'developerspheading' => 'Speciální stránky pro vývojáře',*/
 'protectpage'   => 'Zamčení stránky',
 'recentchangeslinked' => 'Související změny',
 'rclsub'                => '(stránek odkazovaných z „$1“)',
@@ -986,13 +983,6 @@ váš uživatelský účet zablokován.",
 'pubmedurl' =>  'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1',
 'alphaindexline' => 'od $1 do $2',
 'version'               => 'Verze',
-'asksqlpheading' => 'Úroveň pro přímé dotazy',
-'blockpheading' => 'Úroveň pro blokování',
-'createaccountpheading' => 'Úroveň pro tvorbu účtů',
-'deletepheading' => 'Úroveň pro mazání',
-'userrightspheading' => 'Úroveň pro přidělování uživatelských práv',
-'grouprightspheading' => 'Úroveň pro přidělování práv skupinám',
-'siteadminpheading' => 'Úroveň správce serveru',
 'log'		=> 'Protokolovací záznamy',
 'alllogstext'	=> 'Společné zobrazení knihy nahrávek, smazání, zamčení, zablokování a uživatelských práv.
 Zobrazení můžete zůžit výběrem typu záznamu, uživatelského jména nebo dotčené stránky.',
@@ -1202,7 +1192,9 @@ Stiskněte tlačítko „zpět“, obnovte stránku, ze které jste přišli a z
 'ipusubmit'             => 'Odblokovat',
 'ipusuccess'	=> 'IP adresa „[[$1]]“ byla úspěšně odblokována',
 'ipblocklist'   => 'Seznam blokovaných IP adres',
-'blocklistline' => '$1 $2 zablokoval $3 (čas vypršení: $4)',
+'blocklistline' => '$1 $2 zablokoval $3 ($4)',
+'infiniteblock' => 'čas vypršení: infinite', //fixme
+'expiringblock' => 'čas vypršení: $1',
 'blocklink'             => 'zablokovat',
 'unblocklink'   => 'uvolnit',
 'contribslink'  => 'příspěvky',
diff --git a/languages/LanguageCsb.php b/languages/LanguageCsb.php
index 857e3dc371ed..62a3106057bc 100644
--- a/languages/LanguageCsb.php
+++ b/languages/LanguageCsb.php
@@ -91,7 +91,6 @@ $wgNamespaceNamesCsb = array(
 'delete' => 'Rëmôj',
 'deletionlog' => 'register rëmaniów',
 'dellogpage' => 'Rëmóné',
-'developerspheading' => 'Specjalné starnë blós dlô brëkòwników z prawama Programistë',
 'developertext' => 'Ną òperacëjã mòże wëkònac blós brëkòwnik z prawama\n"Programista".\nZdrzë $1.',
 'difference' => '(różnice midzë wersëjama)',
 'disambiguationspage' => '{{ns:4}}:Starnë_ùjednoznacznieniô',
@@ -300,7 +299,6 @@ $wgNamespaceNamesCsb = array(
 'spheading' => 'Specjalné nôpisma',
 'sqlquery' => 'Pòdôj zapëtanié',
 'successfulupload' => 'Wladënk darzëł sã',
-'sysopspheading' => 'Specjalné starnë blós dlô brëkòwników z prawama Administratorë',
 'talk' => 'Diskùsëjô',
 'timezonelegend' => 'Czasowô cona',
 'toc' => 'Spisënk zamkłoscë',
diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 41d3a2b9ca0a..98921e20b707 100644
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -712,8 +712,6 @@ Sef <b>$5</b> golygiadau pob tudalen, ar gyfartaledd, a <b>$6</b> golygon o bob
 "listusers" => "Rhestr defnyddwyr",
 "specialpages" => "Erthyglau arbennig",
 "spheading" => "Erthyglau arbennig",
-"sysopspheading" => "Erthyglau arbennig am defnyddiad y sysop",
-"developerspheading" => "Erthyglau arbennig am defnyddiad y datblygydd",
 "protectpage" => "Sicrhau erthygl",
 "recentchangeslinked" => "Newidiadau perthnasol",
 "rclsub" => "(i erthyglau cysyllt oddiwrth \"$1\")",
@@ -883,7 +881,7 @@ Llenwch rheswm am y bloc, isod (e.e. enwch y tudalennau a oedd wedi fandalo).",
 "ipusubmit" => "Di-blociwch y cyfeiriad hwn",
 "ipusuccess" => "Cyfeiriad IP \"$1\" wedi di-blocio",
 "ipblocklist" => "Rhestr cyfeiriadau IP wedi blocio",
-"blocklistline"	=> "$1, $2 wedi blocio $3",
+"blocklistline"	=> "$1, $2 wedi blocio $3 ($4)",
 "blocklink" => "bloc",
 "unblocklink" => "di-bloc",
 "contribslink" => "cyfraniadau",
diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index a60bbc6b9639..648423422cff 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -993,17 +993,6 @@ henvisning til den samme artikel i $1. Omdirigeringer og underartikler er
 "specialpages"	=> "Specielle sider",
 "spheading"		=> "Specielle sider for alle brugere",
 'restrictedpheading'	=> 'Specielle sider med begrænset adgang',
-'blockpheading' => 'Blokeringsniveau',
-'createaccountpheading' => 'Opret konto-niveau',
-'deletepheading' => 'Sletteniveau',
-'userrightspheading' => 'Brugerrettighedsniveau',
-'grouprightspheading' => 'Grupperettighedsniveau',
-'siteadminpheading' => 'Webstedsadministratorniveau',
-
-/** obsoletes
-"sysopspheading" => "Specielle sider til sysop-brug",
-"developerspheading" => "Specielle sider til developer-brug",
-*/
 "protectpage"	=> "Beskyt side",
 "recentchangeslinked" => "Relaterede ændringer",
 "rclsub"		=> "(til sider henvist fra \"$1\")",
@@ -1260,7 +1249,9 @@ for en tidligere blokeret IP-adresse eller bruger.",
 "ipusubmit"		=> "Ophæv blokeringen af denne adresse",
 "ipusuccess"	=> "\"$1\" har fået ophævet blokeringen",
 "ipblocklist"	=> "Liste over blokerede IP-adresser og brugernavne",
-"blocklistline"	=> "$1, $2 blokerede $3 (udløber $4)",
+'blocklistline'	=> '$1, $2 blokerede $3 ($4)',
+'infiniteblock' => 'udløber infinite', //fixme
+'expiringblock' => 'udløber $1',
 "blocklink"		=> "bloker",
 "unblocklink"	=> "ophæv blokering",
 "contribslink"	=> "bidrag",
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index a07a8fccf754..d3611e360cc7 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -804,8 +804,6 @@ Davon haben <b>$2</b> Administrator-Rechte (siehe $3).",
 "listusers"		=> "Benutzerverzeichnis",
 "specialpages"	=> "Spezialseiten",
 "spheading"		=> "Spezialseiten",
-"sysopspheading" => "Spezialseiten für Sysops",
-"developerspheading" => "Spezialseiten für Entwickler",
 "protectpage"	=> "Artikel schützen",
 "recentchangeslinked" => "Verlinkte Seiten",
 "rclsub"		=> "(auf Artikel von \"$1\")",
@@ -1007,7 +1005,7 @@ Bitte tragen Sie den Grund für die Blockade ein.",
 "ipusubmit"		=> "Diese Adresse freigeben",
 "ipusuccess"	=> "IP-Adresse \"$1\" wurde freigegeben",
 "ipblocklist"	=> "Liste blockierter IP-Adressen",
-"blocklistline"	=> "$1, $2 blockierte $3",
+"blocklistline"	=> "$1, $2 blockierte $3 ($4)",
 "blocklink"		=> "blockieren",
 "unblocklink"	=> "freigeben",
 "contribslink"	=> "Beiträge",
diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index f393d1400120..0155172467b0 100644
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -696,8 +696,6 @@ Kelkaj funkcioj povas streĉi la datumbazon, do bonvolu ne reŝuti post ĉiu rip
 'listusers'		=> 'Uzularo',
 'specialpages'	=> 'Specialaj paĝoj',
 'spheading'		=> 'Specialaj paĝoj',
-'sysopspheading' => 'Specialaj paĝoj por uzado de administrantoj',
-'developerspheading' => 'Specialaj paĝoj nur por uzado de programistoj',
 'protectpage'	=> 'Protektu paĝon',
 'recentchangeslinked' => 'Rilataj paĝoj',
 'rclsub'		=> '(al paĝoj ligitaj de "$1")',
@@ -875,7 +873,7 @@ forbarita IP-adreso/nomo la povon enskribi en la vikio.',
 'ipusubmit'		=> 'Malforbaru la adreson',
 'ipusuccess'	=> '"$1" estas malforbarita',
 'ipblocklist'	=> 'Listo de forbaritaj IP-adresoj/nomoj',
-'blocklistline'	=> 'Je $1, $2 forbaris $3',
+'blocklistline'	=> 'Je $1, $2 forbaris $3 ($4)',
 'blocklink'		=> 'forbaru',
 'unblocklink'	=> 'malforbaru',
 'contribslink'	=> 'kontribuoj',
diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php
index 01b3221be67d..131a58b67539 100644
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -698,8 +698,6 @@ de los cuales <b>$2</b> son administradores (ver $3).",
 "listusers"		=> "Lista de usuarios",
 "specialpages"	=> "Páginas especiales",
 "spheading"		=> "Páginas especiales",
-"sysopspheading" => "Páginas especiales para uso de sysops",
-"developerspheading" => "Páginas especiales para uso de developers",
 "protectpage"	=> "Páginas protegidas",
 "recentchangeslinked" => "Seguimiento de enlaces",
 "rclsub"		=> "(a páginas enlazadas desde \"$1\")",
@@ -874,7 +872,7 @@ acceso de escritura a una dirección IP previamente bloqueada.",
 "ipusubmit"		=> "Desbloquea esta dirección",
 "ipusuccess"	=> "Dirección IP \"$1\" desbloqueada",
 "ipblocklist"	=> "Lista de direcciones IP bloqueadas",
-"blocklistline"	=> "$1, $2 bloquea $3",
+"blocklistline"	=> "$1, $2 bloquea $3 ($4)",
 "blocklink"		=> "bloquear",
 "unblocklink"	=> "desbloquear",
 "contribslink"	=> "contribuciones",
diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php
index f16ff4319697..80a7d1103ba1 100644
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -808,10 +808,6 @@ Administraatori staatuses kasutajaid: <b>$2</b> (vt $3).",
 "listusers"		=> "Kasutajad",
 "specialpages"	=> "Erileheküljed",
 "spheading"		=> "Erileheküljed",
-/* aegunud
-"sysopspheading" => "Administraatori erileheküljed",
-"developerspheading" => "Arendaja erileheküljed",
-*/
 "protectpage"	=> "Kaitse lehekülge",
 "recentchangeslinked" => "Seotud muudatused",
 "rclsub"		=> "(lehekülgedel, millele \"$1\" viitab)", #
@@ -965,7 +961,7 @@ to a previously blocked IP address.",
 "ipusubmit"		=> "Unblock this address",
 "ipusuccess"	=> "IP address \"$1\" unblocked",
 "ipblocklist"	=> "Blokeeritud IP-aadresside loend",
-"blocklistline"	=> "$1, $2 blocked $3",
+"blocklistline"	=> "$1, $2 blocked $3 ($4)",
 "blocklink"		=> "blokeeri",
 "unblocklink"	=> "unblock",
 "contribslink"	=> "contribs",
diff --git a/languages/LanguageFa.php b/languages/LanguageFa.php
index 8bf943adfd50..d3bea03c807d 100644
--- a/languages/LanguageFa.php
+++ b/languages/LanguageFa.php
@@ -793,8 +793,6 @@ They should link to the appropriate topic instead.<br />A page is treated as dis
 "listusers"		=> "فهرست کاربران",
 "specialpages"	=> "صفحات ویژه",
 "spheading"		=> "صفحات ویژه‌ی همه‌ی کاربران",
-"sysopspheading" => "فقط برای استفاده‌ی اپراتور سیستم",
-"developerspheading" => "فقط برای استفاده‌ی برنامه‌نویس",
 "protectpage"	=> "محافظت از صفحه",
 "recentchangeslinked" => "تغییرات مرتبط",
 "rclsub"		=> "(به صفحات پیونددار از «$1»)",
@@ -982,7 +980,7 @@ by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled bac
 "ipusubmit"		=> "باز کردن این نشانی",
 "ipusuccess"	=> "«$1» باز شد",
 "ipblocklist"	=> "فهرست نشانی‌های IP و نام‌های کاربری بسته‌شده",
-"blocklistline"	=> "$1، $2 بست $3 را",
+"blocklistline"	=> "$1، $2 بست $3 را ($4)",
 "blocklink"		=> "بسته شود",
 "unblocklink"	=> "باز شود",
 "contribslink"	=> "مشارکت‌ها",
diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index 143bbe2a4fb0..b3f8a82cca3b 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -64,7 +64,7 @@ require_once( 'LanguageUtf8.php' );
 
 # User preference toggles
 'tog-underline'       => 'Alleviivaa linkit',
-'tog-highlightbroken' => 'Näytä linkit puuttuville sivuille <a href="" class="new">näin </a> (vaihtoehtoisesti näin: <a href="" class="internal">?</a>).',
+'tog-highlightbroken' => 'Näytä linkit puuttuville sivuille <a href="" class="new">näin</a> (vaihtoehtoisesti näin: <a href="" class="internal">?</a>).',
 'tog-justify'         => 'Tasaa kappaleet',
 'tog-hideminor'       => 'Piilota pienet muutokset tuoreet muutokset -listasta',
 'tog-usenewrc'        => 'Kehittynyt tuoreet muutokset -listaus (JavaScript)',
@@ -94,6 +94,8 @@ require_once( 'LanguageUtf8.php' );
 'underline-never'     => 'Ei koskaan',
 'underline-default'   => 'Selaimen oletustapa',
 
+'skinpreview'         => '(Esikatsele...)',
+
 # dates
 'sunday'      => 'sunnuntai',
 'monday'      => 'maanantai',
@@ -473,7 +475,7 @@ Sivun lähdekoodi:',
 'next'                => 'seur.',
 'last'                => 'edell.',
 'orig'                => 'alkup.',
-'histlegend'          => 'Merkinnät: (nyk.) = eroavaisuudet nykyiseen versioon, (edell.) = eroavaisuudet edelliseen versioon, <b>p</b> = pieni muutos', // TODO NO WIKIMARKUP
+'histlegend'          => 'Merkinnät: (nyk.) = eroavaisuudet nykyiseen versioon, (edell.) = eroavaisuudet edelliseen versioon, <span class="minor">p</span> = pieni muutos', // TODO NO WIKIMARKUP
 'history_copyright'   => '-',
 'histfirst'           => 'Ensimmäiset',
 'histlast'            => 'Viimeisimmät',
@@ -662,15 +664,15 @@ Huomaa, että {{GRAMMAR:inessive|{{SITENAME}}}} muut voivat muokata tai poistaa
 'illegalfilename'     => 'Tiedoston nimessä \'\'\'$1\'\'\' on merkkejä, joita ei sallita sivujen nimissä. Vaihda tiedoston nimeä, ja yritä tallentamista uudelleen.',
 'badfilename'         => 'Tiedoston nimi vaihdettiin: $1.',
 'badfiletype'         => '".$1" ei ole suositeltava tiedostomuoto.',
-'largefile'           => 'Tiedostojen ei tulisi olla yli 100 kilotavun kokoisia.',
-'emptyfile'           => 'Tiedosto, jota yritit tallentaa näyttäisi olevan tyhjä. Tarkista, että kirjoitit polun ja nimen oikein.',
-'fileexists'          => 'Tämän niminen tiedosto on jo olemassa. Tarkista $1, ellet ole varma, että haluat muuttaa sitä.',
+'largefile'           => 'Tiedostojen ei tulisi olla yli $1 kilotavun kokoisia. Tiedoston, jonka yritit tallentaa, koko on $2.',
+'emptyfile'           => 'Tiedosto, jonka yritit tallentaa näyttää olevan tyhjä. Tarkista, että kirjoitit polun ja nimen oikein ja että se ei ole liian suuri kohdepalvelimelle.',
+'fileexists'          => 'Samanniminen tiedosto on jo olemassa. Katso tiedoston sivu $1, jos et ole varma, haluatko muuttaa sitä.',
 'successfulupload'    => 'Tallennus onnistui',
 'fileuploaded'        => 'Tiedosto \'\'\'$1\'\'\' on tallennettu onnistuneesti. Seuraa linkkiä ($2) kuvaussivulle, ja täytä tiedostoon liityvät tiedot, kuten mistä se on peräisin, milloin se on luotu, kuka sen loi ja mahdollisesti muita tietämiäsi tietoja. Jos tiedosto on kuva, voit lisätä sen sivulle näin: \'\'\'<nowiki>[[Kuva:$1|thumb|Kuvaus]]</nowiki>\'\'\'',
 'uploadwarning'       => 'Tallennusvaroitus',
 'savefile'            => 'Tallenna',
 'uploadedimage'       => 'tallensi tiedoston [[$1]]',
-'uploaddisabled'      => 'Tiedostojen lähettäminen on poissa käytöstä.',
+'uploaddisabled'      => 'Tiedostojen tallentaminen ei ole käytöstä.',
 'uploadscripted'      => 'Tämä tiedosto sisältää HTML-koodia tai skriptejä, jotka selain saattaa virheellisesti suorittaa.',
 'uploadcorrupt'       => 'Tiedosto on vioittunut tai sillä on väärä tiedostopääte. Tarkista tiedosto ja lähetä se uudelleen.',
 'uploadvirus'         => 'Tiedosto sisältää viruksen. Tarkemmat tiedot: $1',
@@ -801,7 +803,7 @@ Huomaa, että {{GRAMMAR:inessive|{{SITENAME}}}} muut voivat muokata tai poistaa
 'emailpage'           => 'Lähetä sähköpostia käyttäjälle',
 'emailpagetext'       => 'Jos tämä käyttäjä on antanut asetuksissaan kelvollisen sähköpostiosoitteen, alla olevalla lomakeella voi lähettää yhden viestin hänelle. Omissa asetuksissasi annettu sähköpostiosoite näkyy sähköpostin lähettäjän osoitteena, jotta vastaanottaja voi vastata viestiin.',
 'usermailererror'     => 'Postitus palautti virheen: ',
-'defemailsubject'     => '{{SITENAME}} e-mail',
+'defemailsubject'     => '{{SITENAME}}-sähköposti',
 'noemailtitle'        => 'Ei sähköpostiosoitetta',
 'noemailtext'         => 'Tämä käyttäjä ei ole määritellyt kelpoa sähköpostiosoitetta tai ei halua postia muilta käyttäjiltä.',
 'emailfrom'           => 'Lähettäjä',
@@ -955,7 +957,7 @@ Palaute ja lisäapu osoitteessa:
 #
 'whatlinkshere'       => 'Tänne viittaavat sivut',
 'notargettitle'       => 'Ei kohdetta',
-'notargettext'        => 'Et ole määritellyt kohdesivua tai -käyttäjää johon toiminto kohdustuu.',
+'notargettext'        => 'Et ole määritellyt kohdesivua tai -käyttäjää johon toiminto kohdistuu.',
 'linklistsub'         => 'Lista linkeistä',
 'linkshere'           => 'Seuraavilta sivuilta on linkki tälle sivulle:',
 'nolinkshere'         => 'Tänne ei ole linkkejä.',
@@ -969,25 +971,27 @@ Palaute ja lisäapu osoitteessa:
 'ipadressorusername'  => 'IP-osoite tai käyttäjätunnus',
 'ipbexpiry'           => 'Umpeutuu',
 'ipbreason'           => 'Syy',
-'ipbsubmit'           => 'Estä tämä osoite',
+'ipbsubmit'           => 'Estä',
 'ipbother'            => 'Vapaamuotoinen kesto',
 'ipboptions'          => '2 tuntia:2 hours,1 päivä:1 day,3 päivää:3 days,1 viikko:1 week,2 viikkoa:2 weeks,1 kuukausi:1 month,3 kuukautta:3 months,6 kuukautta:6 months,1 vuosi:1 year,ikuisesti:infinite',
 'ipbotheroption'      => 'Muu kesto',
 'badipaddress'        => 'IP-osoite on väärin muotoiltu.',
 'blockipsuccesssub'   => 'Esto onnistui',
 'blockipsuccesstext'  => 'Käyttäjä tai IP-osoite \'\'\'$1\'\'\' on estetty.<br />Nykyiset estot löytyvät [[Special:Ipblocklist|estolistalta]].',
-'unblockip'           => 'Poista IP-osoitteen muokkausesto',
-'unblockiptext'       => 'Käytä alla olevaa lomaketta poistaaksesi kirjoitusesto aikaisemmin estetyltä IP-osoitteelta.',
-'ipusubmit'           => 'Poista tämän osoitteen esto',
-'ipusuccess'          => 'IP-osoitteen \'\'\'$1\'\'\' esto poistettu',
+'unblockip'           => 'Muokkauseston poisto',
+'unblockiptext'       => 'Tällä lomakkeella voit poistaa käyttäjän tai IP-osoitteen muokkauseston.',
+'ipusubmit'           => 'Poista esto',
+'ipusuccess'          => 'IP-osoitteen tai käyttäjän <b>$1<b> esto poistettu', // TODO NOWIKIMARKUP
 'ipblocklist'         => 'Lista estetyistä IP-osoitteista',
-'blocklistline'       => '$1 — $2 on estänyt käyttäjän $3 (vanhenee $4)',
+'blocklistline'       => '$1 — $2 on estänyt käyttäjän $3 ($4)',
+'infiniteblock'       => 'ikuisesti',
+'expiringblock'       => 'vanhenee $1',
 'blocklink'           => 'esto',
 'unblocklink'         => 'poista esto',
 'contribslink'        => 'muokkaukset',
 'autoblocker'         => 'Olet automaattisesti estetty, koska jaat IP-osoitteen käyttäjän $1 kanssa. Eston syy: $2.', // TODO: IS WIKIMARKUP?
 'blocklogpage'        => 'Estoloki',
-'blocklogentry'       => 'esti käyttäjän $1. Vanhenee: $2',
+'blocklogentry'       => 'esti käyttäjän tai IP-osoitteen $1. Eston kesto: $2',
 'blocklogtext'        => 'Tässä on loki muokkausestoista ja niiden purkamisista. Automaattisesti estettyjä IP-osoitteita ei kirjata. Tutustu [[Special:Ipblocklist|estolistaan]] nähdäksesi listan tällä hetkellä voimassa olevista estoista.',
 'unblocklogentry'     => 'poisti käyttäjältä $1 muokkauseston',
 'range_block_disabled'=> 'Ylläpitäjän oikeis luoda alue-estoja ei ole käytöstä.',
@@ -1249,8 +1253,8 @@ ta['ca-nstab-category'] = new Array('c','Näytä luokkasivu');
 'previousdiff'        => '← Edellinen muutos',
 'nextdiff'            => 'Seuraava muutos →',
 
-'imagemaxsize'        => 'Rajoita kuvien koko kuvien kuvaussivuilla arvoon: ',
-'thumbsize'           => 'Pikkukuvien koko : ',
+'imagemaxsize'        => 'Rajoita kuvien koko kuvien kuvaussivuilla arvoon ',
+'thumbsize'           => 'Pikkukuvien koko: ',
 'showbigimage'        => 'Lataa korkeatarkkuuksinen versio ($1×$2, $3 KiB)',
 
 'newimages'           => 'Uudet kuvat',
@@ -1258,12 +1262,12 @@ ta['ca-nstab-category'] = new Array('c','Näytä luokkasivu');
 
 # labels for User: and Title: on Special:Log pages
 'specialloguserlabel' => 'Käyttäjä: ',
-'speciallogtitlelabel'=> 'Otsikko: ',
+'speciallogtitlelabel'=> 'Kohde: ',
 
 'passwordtooshort'    => 'Salasanasi on liian lyhyt. Salasanan pitää olla vähintään $1 merkkiä pitkä.',
 
 # Media Warning
-'mediawarning' => '\'\'\'Varoitus\'\'\': Tämä tiedosto saattaa sisältää This file may contain vahingollista koodia, ja suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.
+'mediawarning' => '\'\'\'Varoitus\'\'\': Tämä tiedosto saattaa sisältää vahingollista koodia, ja suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.
 <hr>',
 
 'fileinfo' => '$1 KiB, MIME-tyyppi: <code>$2</code>',
@@ -1302,6 +1306,8 @@ Jos tämä tunnus ei ole sinun, ÄLÄ seuraa linkkiä. Varmennuskoodi vanhenee $
 'searchfulltext'      => 'Etsi koko tekstiä',
 'createarticle'       => 'Luo sivu',
 
+'unit-pixel' => ' px',
+
 );
 
 
diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 6f7d416f453b..e1c04ae3bc10 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -808,11 +808,6 @@ Parmi ceux-ci, <b>$2</b> ont le statut d\'administrateur (voir $3).',
 'listusers'     => 'Liste des participants',
 'specialpages'  => 'Pages spéciales',
 'spheading'     => 'Pages spéciales',
-'sysopspheading' => "Pages spéciales à l'usage des administrateurs",
-'developerspheading' => "Pages spéciales à l'usage des développeurs",
-'blockpheading' => 'Onglet blocage',
-'deletepheading' => 'Onglet suppression',
-'siteadminpheading' => 'niveau administrateur du site',
 'protectpage'   => 'Protéger la page',
 'recentchangeslinked' => 'Suivi des liens',
 'rclsub'        => "(des pages liées à \"$1\")",
@@ -1016,7 +1011,7 @@ Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui on
 'ipusubmit'	=> 'Débloquer cette adresse',
 'ipusuccess'	=> 'Adresse IP « $1 » débloquée',
 'ipblocklist'	=> 'Liste des adresses IP bloquées',
-'blocklistline' => '$1, $2 a bloqué $3',
+'blocklistline' => '$1, $2 a bloqué $3 ($4)',
 'blocklink'	=> 'bloquer',
 'unblocklink'	=> 'débloquer',
 'contribslink'	=> 'contribs',
diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php
index 073b7af1aa5c..307ac63f05a9 100644
--- a/languages/LanguageFy.php
+++ b/languages/LanguageFy.php
@@ -724,8 +724,6 @@ Dêr soe ek stean moatte hoe't it (goed skreaun) wurdt.",
 "listusers"		=> "Brûkerlist",
 "specialpages"	=> "Bysûndere siden",
 "spheading"		=> "Bysûndere siden foar all brûkers",
-"sysopspheading"	=> "Allinich foar behearders",
-"developerspheading" => "Allinich foar untwiklers",
 "protectpage"	=> "Beskerm side",
 "recentchangeslinked" => "Folgje keppelings",
 "rclsub"		=> "(nei siden dêr't \"$1\" keppelings nei hat)",
@@ -904,7 +902,7 @@ Meld de krekte reden! Begelyk, neam de siden dy't oantaaste waarden.",
 "ipusubmit"		=> "Lit dizze brûker der wer yn",
 "ipusuccess"	=> "Brûker \"$1\" ynlitten",
 "ipblocklist"	=> "List fan útsletten Ynternet-adressen en brûkersnammen",
-"blocklistline"	=> "$\"3\", troch \"$2\" op $1",
+"blocklistline"	=> '"$3", troch "$2" op $1 ($4)',
 "blocklink"		=> "slut út",
 "unblocklink"	=> "lit yn",
 "contribslink"	=> "bydragen",
diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index fa8ae67360d3..0507043db201 100755
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -900,8 +900,6 @@ tugann sé sin an sprioc-alt \"fí­or\".",
 "listusers"     => "Liosta úsáideoirí­",
 "specialpages"  => "Lgh speisialta",
 "spheading"     => "Lgh speisialta do gach úsáideoir",
-"sysopspheading" => "Ach amháin do ceannasaithe",
-"developerspheading" => "Ach amháin do cumadoirí­",
 "protectpage"   => "Cuir glas ar leathanach",
 "recentchangeslinked" => "Athruithe gaolmhara",
 "rclsub"        => "(go leathanaigh nasctha ó \"$1\")",
@@ -1111,7 +1109,9 @@ IP nó ainm úsáideora a raibh coiscthe roimhe seo.",
 "ipusubmit"     => "Bain an cosc den seoladh seo",
 "ipusuccess"    => "\"$1\" gan cosc",
 "ipblocklist"   => "Liosta seoltaí­ IP agus ainmneacha úsáideoirí­ coiscthe",
-"blocklistline" => "$1, $2 a choisc $3 (am éaga $4)",
+"blocklistline" => "$1, $2 a choisc $3 ($4)",
+'infiniteblock' => 'am éaga infinite', //fixme
+'expiringblock' => 'am éaga  $1',
 "blocklink"     => "Coisceadh",
 "unblocklink"   => "bain an cosc den",
 "contribslink"  => "dréachtaí­",
diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php
index 826985c89eef..46a271594ff6 100644
--- a/languages/LanguageHe.php
+++ b/languages/LanguageHe.php
@@ -602,8 +602,6 @@ $3 $9",
 "listusers"		=> "רשימת משתמשים",
 "specialpages"	=> "דפים מיוחדים",
 "spheading"		=> "דפים מיוחדים",
-"sysopspheading" => "דפים מיוחדים למפעילי מערכת",
-"developerspheading" => "דפים מיוחדים למפתחים",
 "protectpage"	=> "הפוך דף למוגן",
 "recentchangeslinked" => "שינויים בדפים המקושרים",
 "rclsub"		=> "(לדפים המקושרים מ-\"$1\")",
@@ -734,7 +732,7 @@ $3 $9",
 "ipusubmit"		=> "שחרר כתובת זו",
 "ipusuccess"	=> "הכתובת \"$1\" שוחררה",
 "ipblocklist"	=> "רשימת כתובות IP חסומות",
-"blocklistline"	=> "$1, $2 חסם את $3",
+"blocklistline"	=> "$1, $2 חסם את $3 ($4)",
 "blocklink"		=> "חסום",
 "unblocklink"	=> "שחרר חסימה",
 "contribslink"	=> "תרומות המשתמש",
diff --git a/languages/LanguageHu.php b/languages/LanguageHu.php
index ba221898e62d..32b6fa84f9b2 100644
--- a/languages/LanguageHu.php
+++ b/languages/LanguageHu.php
@@ -775,8 +775,6 @@ Ebből <b>$2</b> darab adminisztrátor (lásd $3).",
 "listusers"		=> "Felhasználók",
 "specialpages"	=> "Speciális lapok",
 "spheading"		=> "Speciális lapok",
-"sysopspheading" => "Special pages for sysop use",
-"developerspheading" => "Special pages for developer use",
 "protectpage"	=> "Protect page",
 "recentchangeslinked" => "Kapcsolódó változtatások",
 # FIXME: possible context?
@@ -964,7 +962,7 @@ to a previously blocked IP address.",
 "ipusubmit"		=> "Unblock this address",
 "ipusuccess"	=> "IP address \"$1\" unblocked",
 "ipblocklist"	=> "List of blocked IP addresses",
-"blocklistline"	=> "$1, $2 blocked $3",
+"blocklistline"	=> "$1, $2 blocked $3 ($4)",
 "blocklink"		=> "block",
 "unblocklink"	=> "unblock",
 "contribslink"	=> "contribs",
diff --git a/languages/LanguageIa.php b/languages/LanguageIa.php
index 1a2abd2ea741..9f20750d5fea 100644
--- a/languages/LanguageIa.php
+++ b/languages/LanguageIa.php
@@ -668,8 +668,6 @@ al qual le prime redirection deberea referer se.",
 "listusers"		=> "Lista de usatores",
 "specialpages"	=> "Paginas special",
 "spheading"		=> "Paginas special",
-"sysopspheading" => "Paginas special pro uso del operatores del systema",
-"developerspheading" => "Pagians special pro uso del disveloppatores",
 "protectpage"	=> "Proteger pagina",
 "recentchangeslinked" => "Modificationes correlate",
 "rclsub"		=> "(a paginas ligate a partir de \"$1\")",
@@ -824,7 +822,7 @@ a un adresse de IP blocate previemente.",
 "ipusubmit"		=> "Disbloca iste adresse",
 "ipusuccess"	=> "Adresse IP \"$1\" disblocate",
 "ipblocklist"	=> "Lista de adresses IP blocate",
-"blocklistline"	=> "$1, $2 ha blockate $3",
+"blocklistline"	=> "$1, $2 ha blockate $3 ($4)",
 "blocklink"		=> "blocar",
 "unblocklink"	=> "disblocar",
 "contribslink"	=> "contributiones",
diff --git a/languages/LanguageId.php b/languages/LanguageId.php
index 16777c3c3270..584b77bb7211 100644
--- a/languages/LanguageId.php
+++ b/languages/LanguageId.php
@@ -747,17 +747,6 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "listusers" => "Daftar Pengguna",
 "specialpages" => "Halaman Istimewa",
 "spheading" => "Halaman Istimewa untuk Semua Pengguna",
-'asksqlpheading' => 'Tingkat asksql', 
-'blockpheading' => 'Tingkat block', 
-'createaccountpheading' => 'Tingkat createaccount', 
-'deletepheading' => 'Tingkat delete', 
-'userrightspheading' => 'Tingkat userrights', 
-'siteadminpheading' => 'Tingkat siteadmin', 
-
-/** obsoletes
-"sysopspheading" => "Hanya untuk Sysop",
-"developerspheading" => "Hanya untuk Pengembang",
-*/
 "protectpage" => "Lindungi halaman",
 "recentchangeslinked" => "Perubahan terkait",
 "rclsub" => "(untuk halaman yang berpaut dari \"$1\")",
@@ -937,7 +926,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "ipusubmit" => "Hilangkan blokir terhadap alamat ini",
 "ipusuccess" => "Blokir terhadap alamat IP atau pengguna \"$1\" telah dihilangkan",
 "ipblocklist" => "Daftar Alamat IP dan Pengguna yang Diblokir",
-"blocklistline" => "$1, $2 memblokir $3",
+"blocklistline" => "$1, $2 memblokir $3 ($4)",
 "blocklink" => "blokir",
 "unblocklink" => "hilangkan blokir",
 "contribslink" => "sumbangan",
diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php
index 411a308086d8..d340b107cd41 100644
--- a/languages/LanguageIs.php
+++ b/languages/LanguageIs.php
@@ -177,7 +177,9 @@ Sjá [[Special:Ipblocklist|bannaðar notendur og IP tölur]] fyrir yfirlit yfir
 
 Sjá [[meta:Range blocks|Range blocks]] á meta fyrir yfirlit yfir [[CIDR]] tölur, [[{{ns:Special}}:Ipblocklist|bannaða notendur og IP tölur]] fyrir lista yfir þá sem nú eru bannaðir og [[{{ns:4}}:Bönnunarskrá|bönnunarskrá]] fyrir lista sem inniheldur einnig þá sem hafa verið bannaðir í fortíðinni.",
 'blocklink' => "banna",
-'blocklistline' => "$1, $2 bannaði $3 (rennur út $4)",
+'blocklistline' => "$1, $2 bannaði $3 ($4)",
+'infiniteblock' => 'rennur út infinite', //fixme
+'expiringblock' => 'rennur út  $1',
 'blocklogpage' => "Bönnunarskrá",
 'blocklogtext' => "This is a log of user blocking and unblocking actions. Automatically 
 blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
diff --git a/languages/LanguageIt.php b/languages/LanguageIt.php
index 105dce6598b1..c9227bc46352 100644
--- a/languages/LanguageIt.php
+++ b/languages/LanguageIt.php
@@ -572,8 +572,6 @@ Questa media rivela che ci sono state una media di  <b>$5</b> modifiche per cias
 "listusers"		=> "Elenco degli Utenti",
 "specialpages"	=> "Pagine speciali",
 "spheading"		=> "Pagine speciali",
-"sysopspheading" => "Pagine speciali riservate ai sysop",
-"developerspheading" => " Pagine speciali riservate ai developer",
 "protectpage"	=> "Proteggi questa pagina ",
 "recentchangeslinked" => "Modifiche correlate",
 "rclsub"		=> "(alle pagine linkate da \"$1\")",
@@ -707,7 +705,7 @@ Scrivi un motivo specifico per il quale questo indirizzo IP dovrebbe a tuo avvis
 "ipusubmit"		=> "Sblocca questo indirizzo IP",
 "ipusuccess"	=> "Indirizzo IP \"$1\" sbloccato",
 "ipblocklist"	=> "Lista degli indirizzi IP bloccati",
-"blocklistline"	=> "$1, $2 ha bloccato $3",
+"blocklistline"	=> "$1, $2 ha bloccato $3 ($4)",
 "blocklink"		=> "blocca",
 "unblocklink"	=> "sblocca",
 "contribslink"	=> "contributi",
diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php
index 0e7e654c0180..68052cad18b3 100644
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -677,8 +677,6 @@ created and by whom, and anything else you may know about it." */,
 "listusers"		=> "登録ユーザー一覧",
 "specialpages"	        => "特別ページ",
 "spheading"		=> "特別ページ",
-"sysopspheading"        => "シスオペ用特別ページ (pages for sysop)",
-"developerspheading"    => "開発者用特別ページ (pages for developper)",
 "protectpage"	        => "Protect page",
 "recentchangeslinked"   => "リンクを見張る",
 "rclsub"		=> "(to pages linked from \"$1\")",
@@ -846,7 +844,7 @@ to a previously blocked IP address.",
 "ipusubmit"		=> "Unblock this address",
 "ipusuccess"	=> "IP address \"$1\" unblocked",
 "ipblocklist"	=> "List of blocked IP addresses",
-"blocklistline"	=> "$1, $2 blocked $3",
+"blocklistline"	=> "$1, $2 blocked $3 ($4)",
 "blocklink"		=> "block",
 "unblocklink"	=> "unblock",
 "contribslink"	=> "contribs",
diff --git a/languages/LanguageKu.php b/languages/LanguageKu.php
index c7b7806cbc3f..a62b1e6e4143 100644
--- a/languages/LanguageKu.php
+++ b/languages/LanguageKu.php
@@ -145,13 +145,12 @@ accordance with [[Project:Policy|policy]].
 Fill in a specific reason below (for example, citing particular
 pages that were vandalized).', */
 'blocklink' => 'asteng bike',
-'blocklistline' => '$1, $2 $3 bloke kir',
+'blocklistline' => '$1, $2 $3 bloke kir ($4)',
 'blocklogentry' => '"$1" bloke kir',
 #'blocklogpage' => 'Block_log',
 /* 'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically
 blocked IP addresses are not listed. See the [[Special:Ipblocklist|IP block list]] for
 the list of currently operational bans and blocks.', */
-#'blockpheading' => 'block level',
 'bold_sample' => 'Nivîsa qalind',
 'bold_tip' => 'Nivîsa qalind',
 'booksources' => 'Çavkaniyên pirtûkan',
@@ -267,7 +266,6 @@ public domain or similar free resource (see $1 for details).
 #'couldntremove' => 'Couldn\'t remove item \'$1\'...',
 'createaccount' => 'Hesabê nû çêke',
 'createaccountmail' => 'bi e-name',
-#'createaccountpheading' => 'createaccount level',
 #'createarticle' => 'Create article',
 #'created' => 'created',
 #'creditspage' => 'Page credits',
@@ -312,7 +310,6 @@ The destination article "[[$1]]" already exists. Do you want to delete it to mak
 'deleteimg' => 'jêbibe',
 #'deleteimgcompletely' => 'Delete all revisions',
 'deletepage' => 'Rûpelê jê bibe',
-#'deletepheading' => 'delete level',
 #'deletesub' => '(Deleting "$1")',
 'deletethispage' => 'Vê rûpelê jê bibe',
 #'deletionlog' => 'deletion log',
@@ -729,7 +726,6 @@ Bi vê grêdanê tu dikarî vê gotarê çêkî an biguherînî: <a href="/w/wik
 #'group-loggedin-name' => 'User',
 #'group-steward-desc' => 'Full access',
 #'group-steward-name' => 'Steward',
-#'grouprightspheading' => 'grouprights level',
 #'groups' => 'User groups',
 #'groups-addgroup' => 'Add group',
 #'groups-already-exists' => 'A group of that name already exists',
@@ -1300,7 +1296,6 @@ the text into a text file and save it for later.</strong>', */
 #'renamegrouplogentry' => 'Renamed group $2 to $3',
 #'resetprefs' => 'Reset',
 #'restorelink' => '$1 deleted edits',
-#'restrictedpheading' => 'Restricted special pages',
 #'resultsperpage' => 'Hits per page',
 'retrievedfrom' => 'Ji "$1" hatiye standin.',
 'returnto' => 'Bizivire $1.',
@@ -1373,18 +1368,7 @@ Please hit "back" and reload the page you came from, then try again.', */
 'showlast' => '$1 wêneyên dawî bi rêz kirî $2 nîşan bide.',
 'showpreview' => 'Pêşdîtin',
 'showtoc' => 'nîşan bide',
-'sidebar' => '
-* navigation
-** mainpage|mainpage
-** portal-url|portal
-** currentevents-url|currentevents
-** recentchanges-url|recentchanges
-** randompage-url|randompage
-** helppage|help
-** sitesupport-url|sitesupport',
 'sig_tip' => 'Îmze û demxeya wext ya te',
-#'siteadminpheading' => 'siteadmin level',
-#'sitenotice' => '-',
 'sitestats' => 'Statîstîkên sîteyê',
 'sitestatstext' => 'Di \'\'database\'\' de <b>$1</b> rûpel hene. Tê de rûpelên nîqaşê, rûpelên der barê Wîkîpediyayê, rûpelên pir kurt (stub), rûpelên ragihandinê (redirect) û rûpelên din ku qey ne gotar in hene.
 
@@ -1582,7 +1566,6 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left
 #'userrights-logcomment' => 'Changed group membership from $1 to $2',
 #'userrights-lookup-user' => 'Manage user groups',
 'userrights-user-editname' => 'Enter a username:',
-#'userrightspheading' => 'userrights level',
 'userstats' => 'Statistîkên bikarhêneran',
 'userstatstext' => '<b>$1</b> bikarhênerên qeydkirî hene. Ji wan <b>$2</b> administrator/koordînator in. (Binêre $3).
 <br><br>
diff --git a/languages/LanguageLi.php b/languages/LanguageLi.php
index 8e2a4d664c0b..4da7af5ad647 100644
--- a/languages/LanguageLi.php
+++ b/languages/LanguageLi.php
@@ -525,8 +525,6 @@ Er is in totaal $3 maal een pagina bekeken, en $4 maal een pagina bewerkt. Dat g
 "listusers"  => "liest van gebroekers",
 "specialpages" => "Speciale pagina's",
 "spheading"  => "Speciale pagina's",
-"sysopspheading" => "Speciale pagina's voor systeembeheerders",
-"developerspheading" => "Speciale pagina's voor systeemontwikkelaars",
 "protectpage" => "Beveilig pagina",
 "recentchangeslinked" => "Volg links",
 "rclsub"  => "(van pagina's waarnaar \"$1\" verwijst)",
@@ -647,7 +645,7 @@ Zie de [[Special:Ipblocklist|liest van geBlokkierde IP-adressen]].",
 "ipusubmit"  => "De-Blokkier dit IP-adres.",
 "ipusuccess" => "Het IP-adres \"$1\" is gedeBlokkierd.",
 "ipblocklist" => "Liest van geblokkierde IP-adressen.",
-"blocklistline" => "Op $1 blokkierde $2 ut adres $3",
+"blocklistline" => "Op $1 blokkierde $2 ut adres $3 ($4)",
 "blocklink"  => "Blokkier",
 "unblocklink" => "de-Blokkier",
 "contribslink" => "bijdragen",
@@ -730,7 +728,6 @@ De kins ouch 'n log type, de gebroekersname of de betriffende pazjena selectiere
 'blocklogentry' => "\"$1\" geblokkierd veur de tied van $2",
 'blocklogpage' => "Blokkier log",
 'blocklogtext' => "Dit is 'n log van 't blokkieringe van gebroekers. Automatisch geblokkierde IP adresse sjtón hie neet bie. Zuug de [[Special:Ipblocklist|IP blokkier liest]] vuur de liest van op dit mement akteve blokkieringe.",
-'blockpheading' => "Blokkieringe",
 'bold_sample' => "Vètte tèks",
 'bold_tip' => "Vètte tèks",
 'bureaucratlogentry' => "Rechte vuur gebroeker \"$1\" op \"$2\" gesjtèld",
@@ -773,7 +770,6 @@ De beluifs os auch das e dees tèks zelf höbs gesjreve, of gekopieerd van 'n [[
 'delete' => "Wisse",
 'deletedrevision' => "Aw versie $1 gewist.",
 'deleteimgcompletely' => "Wis al versies",
-'deletepheading' => "Verwiederinge",
 'edit' => "Bewirk",
 'editcomment' => "'t Edit commentaor waor: \"<i>$1</i>\".",
 'editingcomment' => "Bewirk $1 (commentaar)",
diff --git a/languages/LanguageLt.php b/languages/LanguageLt.php
index abb420900a2c..37dad672219b 100644
--- a/languages/LanguageLt.php
+++ b/languages/LanguageLt.php
@@ -367,7 +367,6 @@ Taigi vidutiniškai kiekvienas puslapis keistas '''$5''' kartų, o žiūrėtas '
 'statistics' => "Statistika",
 'subcategorycount' => "Kategorijoje esančių kategorijų - $1",
 'summary' => "Komentaras",
-'sysopspheading' => "Administratoriams skirti puslapiai",
 'talk' => "Diskusijos",
 'talkpage' => "Aptarti straipsnį",
 'toc' => "Turinys",
diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index 45093743773a..3ead79eb4a35 100644
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /** Macedonian (Македонски)
  * @package MediaWiki
  * @subpackage Language
@@ -788,13 +788,6 @@ global $wgRightsText;
 	"specialpages"			=>	"Специјални страници",
 	"spheading"			=>	"Специјални страници за сите корисници",
 	'restrictedpheading'		=>	'Специјални страници со ограничен пристап',
-	'asksqlpheading'		=>	'Ниво "прашалници до SQL"',
-	'blockpheading'			=>	'Ниво "блокирање"',
-	'createaccountpheading'		=>	'Ниво "регистрација"',
-	'deletepheading'		=>	'Ниво "бришење"',
-	'userrightspheading'		=>	'Ниво "кориснички права"',
-	'grouprightspheading'		=>	'Ниво "групни права"',
-	'siteadminpheading'		=>	' Ниво "администратор на сајтот"',
 	"protectpage"			=>	"Заштитени страници",
 	"recentchangeslinked"		=>	"Поврзани промени",
 	"rclsub"			=>	"(до страници поврзани од \"$1\")",
@@ -967,7 +960,9 @@ global $wgRightsText;
 	'ipusubmit'			=>	'Деблокирај ја оваа адреса',
 	'ipusuccess'			=>	"\"[[$1]]\" деблокиран",
 	'ipblocklist'			=>	'Листа на блокирани IP адреси и кориснички имиња',
-	'blocklistline'			=>	"$1, $2 го блокираше $3 (истекува на $4)",
+	'blocklistline'			=>	"$1, $2 го блокираше $3 ($4)",
+	'infiniteblock'			=> 'истекува на infinite', //fixme
+	'expiringblock'			=> 'истекува на $1',
 	'blocklink'			=>	'блокирај',
 	'unblocklink'			=>	'деблокирај',
 	'contribslink'			=>	'придонеси',
diff --git a/languages/LanguageMs.php b/languages/LanguageMs.php
index 5052f5b5f012..507c5089593e 100644
--- a/languages/LanguageMs.php
+++ b/languages/LanguageMs.php
@@ -669,8 +669,6 @@ Ini menjadikan <b>$5</b> purata halaman yang disunting, dan <b>$6</b> paparan ya
 "listusers"		=> "Senarai Pengguna",
 "specialpages"	=> "Halaman Istimewa",
 "spheading"		=> "Halaman Istimewa", #"Special pages",
-"sysopspheading" => "Halaman Istimewa Admin",
-"developerspheading" => "",
 "protectpage"	=> "Halaman dilindungi",
 "recentchangeslinked" => "Pautan pilihan",
 "rclsub"		=> "(Untuk halaman yang berpaut dari \"$1\")",   #"(to pages linked from \"$1\")",
@@ -842,7 +840,7 @@ capaian kemaskini ke alamat IP atau pengguna yang telah diblok sebelumnya.",
 "ipusubmit"		=> "Lepaskan semula alamat ini dari diblok", #"Unblock this address",
 "ipusuccess"	=> "Alamat IP atau pengguna \"$1\" dilepaskan dari diblok", #"IP address or user \"$1\" unblocked",
 "ipblocklist"	=> "Senarai alamat IP dan pengguna yang diblok", #"List of blocked IP addresses and users",
-"blocklistline"	=> "$1, $2 blok $3", #"$1, $2 blocked $3",
+"blocklistline"	=> "$1, $2 blok $3 ($4)",
 "blocklink"		=> "blok", #"block",
 "unblocklink"	=> "lepaskan dari diblok", #"unblock",
 "contribslink"	=> "contribs",
diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php
index 0dc2f3e6244c..5a7c14dce9de 100644
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -816,12 +816,6 @@ In Klammern angevene Wöör geven de korrekte Schrievwies weer.',
 'listusers'                          => 'Brukerlist',
 'specialpages'                  => 'Spezialsieten',
 'spheading'                             => 'Spezialsieten för alle Bruker',
-'asksqlpheading'          => 'SQL-Affraag-Evene',
-'blockpheading'           => 'Block-Evene',
-'createaccountpheading'   => 'Kontoanlegg-Evene',
-'deletepheading'          => 'Lösch-Evene',
-'userrightspheading'      => 'Brukerrecht-Evene',
-'siteadminpheading'       => 'Sietenadmininstrater-Evene',
 'protectpage'               => 'Siet schulen',
 'recentchangeslinked'     => 'Verlinkte Sieten',
 'rclsub'                                => '(op Artikel vun „$1“)',
@@ -1002,7 +996,7 @@ Ok den Grund för dat Blocken indregen.',
 'ipusubmit'                     => 'Disse Adress freegeven',
 'ipusuccess'               => 'IP-Adress „$1“ is freegeven',
 'ipblocklist'           => 'List vun blockte IP-Adressen',
-'blocklistline'              => '$1, $2 hett $3 blockt',
+'blocklistline'              => '$1, $2 hett $3 blockt ($4)',
 'blocklink'                     => 'blocken',
 'unblocklink'             => 'freegeven',
 'contribslink'           => 'Bidreeg',
diff --git a/languages/LanguageNl.php b/languages/LanguageNl.php
index c4ff1ca26490..a88c365dcbc0 100644
--- a/languages/LanguageNl.php
+++ b/languages/LanguageNl.php
@@ -631,8 +631,6 @@ Er is in totaal $3 maal een pagina bekeken, en $4 maal een pagina bewerkt. Dat g
 "listusers"  => "Lijst van gebruikers",
 "specialpages" => "Speciale pagina's",
 "spheading"  => "",
-"sysopspheading" => "Alleen voor systeembeheerders",
-"developerspheading" => "Alleen voor systeemontwikkelaars",
 "protectpage" => "Beveilig pagina",
 "recentchangeslinked" => "Volg links",
 "rclsub"  => "(van pagina's waarnaar \"$1\" verwijst)",
@@ -780,7 +778,7 @@ Zie de [[speciaal:Ipblocklist|Lijst van geblokkeerde IP-adressen]].",
 "ipusubmit"  => "De-blokkeer deze gebruiker.",
 "ipusuccess" => "\"$1\" is gedeblokkeerd.",
 "ipblocklist" => "Lijst van geblokkeerde gebruikers en IP-adressen.",
-"blocklistline" => "Op $1 blokkeerde $2: $3",
+"blocklistline" => "Op $1 blokkeerde $2: $3 ($4)",
 "blocklink"  => "blokkeer",
 "unblocklink" => "de-blokkeer",
 "contribslink" => "bijdragen",
diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index 026f56dea7a2..eb554239755c 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -849,18 +849,6 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'specialpages'	        => 'Spesialsider',
 'spheading'		=> 'Spesialsider for alle brukarar',
 'restrictedpheading'    => 'Spesialsider med avgrensa tilgang',
-'blockpheading'         => 'Blokkering',
-'createaccountpheading' => 'Lag konto',
-'deletepheading'        => 'Slett',
-'userrightspheading'    => 'Brukartilgang',
-'grouprightspheading'   => 'gruppetilgangsnivå',
-'siteadminpheading'     => 'Administrasjon av wikinettstaden',
-
-/** obsoletes
-'sysopspheading'        => 'Berre for administrator-bruk',
-'developerspheading'    => 'Berre for utviklar-bruk',
-*/
-
 'protectpage'	        => 'Vern side',
 'recentchangeslinked'   => 'Relaterte endringar',
 'rclsub'		=> '(til sider med lenkje frå «$1»)',
@@ -1086,7 +1074,9 @@ For informasjon om korleis ein kan blokkere seriar av IP-adresser, sjå [[Help:B
 'ipusubmit'		=> 'Opphev blokkering',
 'ipusuccess'	        => '«[[$1]]» har fått oppheva blokkeringa',
 'ipblocklist'	        => 'Blokkerte IP-adresser og brukarnamn',
-'blocklistline'	        => '$1, $2 blokkerte $3 (opphørstid $4)',
+'blocklistline'	        => '$1, $2 blokkerte $3 ($4)',
+'infiniteblock' => 'opphørstid infinite', //fixme
+'expiringblock' => 'opphørstid $1',
 'blocklink'		=> 'blokker',
 'unblocklink'	        => 'opphev blokkering',
 'contribslink'	        => 'bidrag',
diff --git a/languages/LanguageNo.php b/languages/LanguageNo.php
index ee4f2aca52a6..9cc89e00296d 100644
--- a/languages/LanguageNo.php
+++ b/languages/LanguageNo.php
@@ -721,8 +721,6 @@ lenker til den samme artikkel i $1. Omdirigeringer og underartikler er
 "listusers"		=> "Brukerliste",
 "specialpages"	=> "Spesialsider",
 "spheading"		=> "Spesialsider for alle brukere",
-"sysopspheading" => "Kun for sysop-bruk",
-"developerspheading" => "Kun for utvikler-bruk",
 "protectpage"	=> "Beskytt side",
 "recentchangeslinked" => "Relaterte endringer",
 "rclsub"		=> "(til sider med lenke fra \"$1\")",
@@ -923,7 +921,7 @@ for en tidligere blokkert IP-adresse.",
 "ipusubmit"		=> "Opphev blokkeringen av denne adresse",
 "ipusuccess"	=> "IP-adressen \"$1\" har fått opphevet blokkeringen",
 "ipblocklist"	=> "Liste over blokkerte IP-adresser",
-"blocklistline"	=> "$1, $2 blokkerte $3",
+"blocklistline"	=> "$1, $2 blokkerte $3 ($4)",
 "blocklink"		=> "blokker",
 "unblocklink"	=> "opphev blokkering",
 "contribslink"	=> "bidrag",
diff --git a/languages/LanguageOc.php b/languages/LanguageOc.php
index 303ed108a92f..560db9fcf572 100644
--- a/languages/LanguageOc.php
+++ b/languages/LanguageOc.php
@@ -655,8 +655,6 @@ Parmi ceux-ci, <b>$2</b> ont le statut d'administrateur (voir $3).",
 "listusers"     => "Liste des participants",
 "specialpages"  => "Pages spéciales",
 "spheading"     => "Pages spéciales",
-"sysopspheading" => "Pages spéciales à l'usage des administrateurs",
-"developerspheading" => "Pages spéciales à l'usage des développeurs",
 "protectpage"   => "Protéger la page",
 "recentchangeslinked" => "Suivi des liens",
 "rclsub"        => "(des pages liées à \"$1\")",
@@ -822,7 +820,7 @@ Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui on
 "ipusubmit"	=> "Débloquer cette adresse",
 "ipusuccess"	=> "Adresse IP \"$1\" débloquée",
 "ipblocklist"	=> "Liste des adresses IP bloquées",
-"blocklistline" => "$1, $2 a bloqué $3",
+"blocklistline" => "$1, $2 a bloqué $3 ($4)",
 "blocklink"	=> "bloquer",
 "unblocklink"	=> "débloquer",
 "contribslink"	=> "contribs",
diff --git a/languages/LanguagePl.php b/languages/LanguagePl.php
index f1d677c960ce..d6ecb20138b0 100644
--- a/languages/LanguagePl.php
+++ b/languages/LanguagePl.php
@@ -731,8 +731,6 @@ odpowiednika w tym języku. Na tej liście <i>pominięto</i> podstrony oraz prze
 "listusers" => "Lista użytkowników",
 "specialpages" => "Strony specjalne",
 "spheading" => "Strony specjalne",
-"sysopspheading" => "Strony specjalne tylko dla użytkowników z prawami Administratora",
-"developerspheading" => "Strony specjalne tylko dla użytkowników z prawami Programisty",
 "protectpage" => "Zabezpiecz stronę",
 "recentchangeslinked" => "Zmiany w dolinkowanych",
 "rclsub" => "(dla stron dolinkowanych do \"$1\")",
@@ -925,7 +923,7 @@ dla poprzednio zablokowanego adresu IP.",
 "ipusubmit" => "Odblokuj ten adres",
 "ipusuccess" => "Adress IP \"$1\" został odblokowany",
 "ipblocklist" => "Lista zablokowanych adresów IP",
-"blocklistline" => "$1, $2 zablokował $3",
+"blocklistline" => "$1, $2 zablokował $3 ($4)",
 "blocklink" => "zablokuj",
 "unblocklink" => "odblokuj",
 "contribslink" => "wkład",
diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index b4bbdb0d76a2..4fad2a1cafc6 100644
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -687,8 +687,6 @@ Destes, <b>$2</b> são administradores (veja $3).",
 "listusers"     => "Lista de Usuários",
 "specialpages"  => "Páginas especiais",
 "spheading"     => "Páginas especiais para todos os usuários",
-"sysopspheading" => "Somente para uso dos SYSOP",
-"developerspheading" => "Somente para uso dos desenvolvedores",
 "protectpage"   => "Páginas Protegidas",
 "recentchangeslinked" => "Páginas relacionadas",
 "rclsub"        => "(para páginas linkadas de \"$1\")",
@@ -851,7 +849,7 @@ Preencha com um motivo específico (por exemplo, citando páginas que sofreram v
 "ipusubmit"     => "Desbloquear este endereço",
 "ipusuccess"    => "Endereço de IP  \"$1\" foi desbloqueado",
 "ipblocklist"   => "Lista de IP's bloqueados",
-"blocklistline" => "$1, $2 bloqueado $3",
+"blocklistline" => "$1, $2 bloqueado $3 ($4)",
 "blocklink"     => "block",
 "unblocklink"   => "unblock",
 "contribslink"  => "contribs",
diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php
index 297487cf9fd6..bfb7dc3b1731 100644
--- a/languages/LanguageRo.php
+++ b/languages/LanguageRo.php
@@ -397,7 +397,7 @@ a preveni vandalismul conform [[Project:Politica|politicii {{SITENAME}}]].
 Include un motiv specific mai jos (de exemplu citează paginile care
 au fost vandalizate de acest utilizator).",
 'blocklink' => "blochează",
-'blocklistline' => "$1, $2 a blocat $3",
+'blocklistline' => "$1, $2 a blocat $3 ($4)",
 'blocklogentry' => "blocat \"$1\"",
 'blocklogpage' => "Jurnal_blocări",
 'blocklogtext' => "Acesta este un jurnal al acţiunilor de blocare şi deblocare.
@@ -501,7 +501,6 @@ Vezi $2 pentru o listă a elementelor şterse recent.",
 <ul>
 </ul>
 ",
-'developerspheading' => "Pagini speciale pentru dezvoltatori",
 'developertext' => "Acţiunea pe care ai încercat-o necesită drepturi de dezvoltator.
 Vezi $1.",
 'developertitle' => "Ai nevoie de acces ca dezvoltator",
@@ -1074,7 +1073,6 @@ de la ultima actualizare a programului (July 20, 2002).
 </div>
 
 Sumar",
-'sysopspheading' => "Pagini speciale pentru operatori",
 'sysoptext' => "Acţiunea pe care ai încercat-o necesită drepturi de operator.
 Vezi $1.",
 'sysoptitle' => "Ai nevoie de acces ca operator",
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index d6a86738959c..276ac0204a88 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -987,17 +987,6 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'specialpages'  => 'Служебные страницы',
 'spheading'             => 'Служебные страницы',
 'restrictedpheading'    => 'Служебные страницы с ограниченным доступом',
-'blockpheading' => 'Блокировка',
-'createaccountpheading' => 'Уровень создания пользователей',
-'deletepheading' => 'Уровень удаления',
-'userrightspheading' => 'Уровень прав участников',
-'grouprightspheading' => 'Уровень прав групп',
-'siteadminpheading' => 'Уровень сисадмина',
-
-/** obsoletes
-'sysopspheading' => 'Служебные страницы для операторов',
-'developerspheading' => 'Служебные страницы для разработчиков',
-*/
 'protectpage'   => 'Защищённая страница',
 'recentchangeslinked' => 'Связанные правки',
 'rclsub'                => "(на статьи, ссылки на которые есть на $1)",
@@ -1258,7 +1247,9 @@ IP-адреса.',
 'ipusubmit'             => 'Разблокировать этот адрес',
 'ipusuccess'    => "IP-адрес [[$1|«$1»]] разблокирован",
 'ipblocklist'   => 'Список заблокированных IP-адресов и пользователей',
-'blocklistline' => "$1, $2 заблокировал $3 (блокировка завершится $4)",
+'blocklistline' => "$1, $2 заблокировал $3 ($4)",
+'infiniteblock' => 'блокировка завершится infinite', //fixme
+'expiringblock' => 'блокировка завершится $1',
 'blocklink'             => 'заблокировать',
 'unblocklink'   => 'разблокировать',
 'contribslink'  => 'вклад',
diff --git a/languages/LanguageSc.php b/languages/LanguageSc.php
index da6c5e35473d..46812d97af5e 100644
--- a/languages/LanguageSc.php
+++ b/languages/LanguageSc.php
@@ -565,8 +565,6 @@ Questa media rivela che ci sono state una media di  <b>$5</b> modifiche per cias
 "listusers"		=> "Elenco degli Utenti",
 "specialpages"	=> "Pagine speciali",
 "spheading"		=> "Pagine speciali",
-"sysopspheading" => "Pagine speciali riservate ai sysop",
-"developerspheading" => " Pagine speciali riservate ai developer",
 "protectpage"	=> "Proteggi questa pagina ",
 "recentchangeslinked" => "Modifiche correlate",
 "rclsub"		=> "(alle pagine linkate da \"$1\")",
@@ -702,7 +700,7 @@ Scrivi un motivo specifico per il quale questo indirizzo IP dovrebbe a tuo avvis
 "ipusubmit"		=> "Sblocca questo indirizzo IP",
 "ipusuccess"	=> "Indirizzo IP \"$1\" sbloccato",
 "ipblocklist"	=> "Lista degli indirizzi IP bloccati",
-"blocklistline"	=> "$1, $2 ha bloccato $3",
+"blocklistline"	=> "$1, $2 ha bloccato $3 ($4)",
 "blocklink"		=> "blocca",
 "unblocklink"	=> "sblocca",
 "contribslink"	=> "contributi",
diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index d0711073bd81..649722e9b7eb 100644
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -968,13 +968,6 @@ z čoho '''$2''' (alebo '''$4%''') sú administrátormi (pozri $3).",
 'specialpages' => 'Špeciálne stránky',
 'spheading' => 'Špeciálne stránky pre všetkých redaktorov',
 'restrictedpheading' => 'Obmedzené špeciálne stránky',
-'asksqlpheading' => 'úroveň sql príkazov',
-'blockpheading' => 'úroveň blokovania',
-'createaccountpheading' => 'úroveň vytvorenia účtu',
-'deletepheading' => 'úroveň vymazávania',
-'userrightspheading' => 'úroveň redaktorských práv',
-'grouprightspheading' => 'úroveň skupinových práv',
-'siteadminpheading' => 'úroveň administrátorov stránok',
 'protectpage' => 'Zamknúť stránku',
 'recentchangeslinked' => 'Súvisiace úpravy',
 'rclsub' => "(na články, na ktoré odkazuje \"$1\")",
@@ -1242,7 +1235,9 @@ z doteraz zablokovanej IP adresy alebo od redaktora.',
 'ipusubmit' => 'Odblokovať túto adresu',
 'ipusuccess' => "\"[[$1]]\" odblokovaný/á",
 'ipblocklist' => 'Zablokovaní/é redaktori/IP adresy',
-'blocklistline' => "$1, $2 zablokoval $3 (ukončenie $4)",
+'blocklistline' => "$1, $2 zablokoval $3 ($4)",
+'infiniteblock' => 'ukončenie infinite', //fixme
+'expiringblock' => 'ukončenie $1',
 'blocklink' => 'zablokovať',
 'unblocklink' => 'odblokuj',
 'contribslink' => 'príspevky',
diff --git a/languages/LanguageSl.php b/languages/LanguageSl.php
index e2fe213d97a4..1f43b99efc85 100644
--- a/languages/LanguageSl.php
+++ b/languages/LanguageSl.php
@@ -624,8 +624,6 @@ na eno urejevanje.",
 "listusers"	=> "Seznam uporabnikov",
 "specialpages"	=> "Posebne strani",
 "spheading"	=> "Posebne strani za vse uporabnike",
-"sysopspheading" => "Posebne strani za vzdrževalce",
-"developerspheading" => "Posebne strani za razvijalce",
 "protectpage"	=> "Zaščiti stran",
 "recentchangeslinked" => "Povezane strani",
 "rclsub"	=> "(na strani povezano od \"$1\")",
@@ -769,7 +767,7 @@ Vnesi razloge spodaj (na primer z navedbo določenih strani, ki so jih po nepotr
 "ipusubmit"	=> "Poveži ta naslov",
 "ipusuccess"	=> "IP naslov \"$1\" je povezan",
 "ipblocklist"	=> "Seznam prekinjenih IP naslovov",
-"blocklistline"	=> "$1, $2 je prekinil $3",
+"blocklistline"	=> "$1, $2 je prekinil $3 ($4)",
 "blocklink"	=> "prekini",
 "unblocklink"	=> "poveži",
 "contribslink"	=> "prispevki",
diff --git a/languages/LanguageSq.php b/languages/LanguageSq.php
index 681635a8d0cf..f2250258524f 100644
--- a/languages/LanguageSq.php
+++ b/languages/LanguageSq.php
@@ -720,8 +720,6 @@ duke dhënë dhe  artikullin e \"vërtetë\", me të cilin ridrejtimi i parë du
 "listusers"		=> "Lista e përdoruesve",
 "specialpages"	=> "Faqe speciale",
 "spheading"		=> "Faqe speciale për të gjithë përdoruesit",
-"sysopspheading" => "Vetëm për ato me titull sysop",
-"developerspheading" => "Vetëm për zhvilluesit",
 "protectpage"	=> "Mbroje faqen",
 "recentchangeslinked" => "Ndryshime të përafërta",
 "rclsub"		=> "(për faqet e lidhura nga \"$1\")",
@@ -911,7 +909,7 @@ një përdoruesi ose IP adreseje të bllokuar.",
 "ipusubmit"		=> "Ç'blloko këtë adresë",
 "ipusuccess"	=> "\"$1\" u ç'bllokua",
 "ipblocklist"	=> "Lista e përdoruesve dhe e IP adresave të bllokuara",
-"blocklistline"	=> "$1, $2 bllokoi $3",
+"blocklistline"	=> "$1, $2 bllokoi $3 ($4)",
 "blocklink"		=> "blloko",
 "unblocklink"	=> "ç'blloko",
 "contribslink"	=> "kontribute",
diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 4edd260219bb..8f43b587555d 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -740,8 +740,6 @@ or '''<nowiki>[[media:file.ogg]]</nowiki>''' за звукове.
 "listusers"  => "Листа корисника",
 "specialpages" => "Посебне странице",
 "spheading"  => "Посебне странице за све кориснике",
-"sysopspheading" => "Само за сисопе",
-"developerspheading" => "Само за девелопере",
 "protectpage" => "Заштити страницу",
 "recentchangeslinked" => "Сродне промене",
 "rclsub"  => "(на странице повезане од \"$1\")",
@@ -930,7 +928,7 @@ $3...
 "ipusubmit"  => "Отпусти ову адресу",
 "ipusuccess" => "\"$1\" отпуштен",
 "ipblocklist" => "Списак обузданих ИП адреса и корисника",
-"blocklistline" => "$1, $2 је обуздао $3",
+"blocklistline" => "$1, $2 је обуздао $3 ($4)",
 "blocklink"  => "блокирај",
 "unblocklink" => "деблокирај",
 "contribslink" => "прилози",
diff --git a/languages/LanguageSv.php b/languages/LanguageSv.php
index 4016dc896230..6f917a9de524 100644
--- a/languages/LanguageSv.php
+++ b/languages/LanguageSv.php
@@ -675,8 +675,6 @@ till deras i $1. Redirects och undersidor visas <i>inte</i>.",
 "listusers"             => "Användarlista",
 "specialpages"          => "Speciella sidor",
 "spheading"             => "Speciella sidor",
-"sysopspheading"        => "Speciella sidor för sysop",
-"developerspheading"    => "Speciella sidor för utvecklare",
 "protectpage"           => "Skydda sida",
 "recentchangeslinked"   => "Relaterade ändringar",
 "rclsub"                => "(till sidor som är länkade från \"$1\")",
@@ -830,7 +828,7 @@ Fyll i anledningen till blockering nedan (till exempel vilka artiklar som klottr
 "ipusuccess"            => "Blockeringen för IP-adressen \"$1\" har tagits bort",
 
 "ipblocklist"           => "Lista över blockerade IP-adresser",
-"blocklistline"         => "$1, $2 blockerade $3",
+"blocklistline"         => "$1, $2 blockerade $3 ($4)",
 "blocklink"             => "blockera",
 "unblocklink"           => "ta bort blockering",
 "contribslink"          => "bidrag",
diff --git a/languages/LanguageTa.php b/languages/LanguageTa.php
index 3f1c37895c47..9b18b36a5055 100644
--- a/languages/LanguageTa.php
+++ b/languages/LanguageTa.php
@@ -666,8 +666,6 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 "listusers"		=> "பயனர் அட்டவணை",
 "specialpages"	=> "விசேட பக்கங்கள்",
 "spheading"		=> "எல்லாப் பயனர்களுக்குமான விசேட பக்கங்கள்",
-"sysopspheading" => "sysop பயன்பாட்டுக்கு மட்டும்",
-"developerspheading" => "உருவாக்குபவர் பயன்பாட்டுக்கு மட்டும்",
 "protectpage"	=> "பக்கத்தைக் காப்புச் செய்",
 "recentchangeslinked" => "தொடர்பான மாற்றங்கள்",
 "rclsub"		=> "(\"$1\" இலிருந்து இணைக்கப்பட்ட பக்கங்களுக்கு)",
@@ -811,7 +809,7 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 "ipusubmit"		=> "இம் முகவரியைத் தடை நீக்கு",
 "ipusuccess"	=> "\"$1\" தடை நீக்கப்பட்டது",
 "ipblocklist"	=> "தடுக்கப்பட்ட ஐபி முகவரிகளினதும், பயனர் பெயர்களினதும் பட்டியல்",
-"blocklistline"	=> "$1, $2 blocked $3",
+"blocklistline"	=> "$1, $2 blocked $3 ($4)",
 "blocklink"		=> "தடு",
 "unblocklink"	=> "தடை நீக்கு",
 "contribslink"	=> "contribs",
diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php
index b8d02552ba58..24d490424ffe 100755
--- a/languages/LanguageUk.php
+++ b/languages/LanguageUk.php
@@ -657,8 +657,6 @@ value=\"{$wgServer}\" checked> {$wgServer} <br />
 "listusers"		=> "Список користувачів",
 "specialpages"	=> "Спеціальні сторінки",
 "spheading"		=> "Спеціальні сторінки",
-"sysopspheading" => "Спеціальні сторінки для використання адміністраторами",
-"developerspheading" => "Спеціальні сторінки для використання розробниками",
 "protectpage"	=> "Захищена стаття",
 "recentchangeslinked" => "Пов'язані редагування",
 "rclsub"		=> "(на статті, посилання на які є на \"$1\")",
@@ -832,7 +830,7 @@ IP-адреси.",
 "ipusubmit"		=> "Розблокувати цю адресу",
 "ipusuccess"	=> "\"$1\" розблоковано",
 "ipblocklist"	=> "Список заблокованих IP-адрес й користувачів",
-"blocklistline"	=> "$1, $2 заблоковано $3",
+"blocklistline"	=> "$1, $2 заблоковано $3 ($4)",
 "blocklink"		=> "заблокувати",
 "unblocklink"	=> "розблокувати",
 "contribslink"	=> "вклад",
diff --git a/languages/LanguageWa.php b/languages/LanguageWa.php
index b8d91c3fccb0..6049cda03990 100644
--- a/languages/LanguageWa.php
+++ b/languages/LanguageWa.php
@@ -818,8 +818,6 @@ flotche, di cenes metowes so $1. Li scrijhaedje corek pout esse mostré inte
 "listusers"		=> "Djivêye des uzeus",
 "specialpages"	=> "Pådjes sipeciåles",
 "spheading"		=> "Pådjes sipeciåles po tos ls uzeus",
-"sysopspheading" => "Pådjes sipeciåles po les manaedjeus",
-"developerspheading" => "Pådjes sipeciåles po les diswalpeus",
 "protectpage"	=> "Protedjî l'&nbsp;pådje",
 "recentchangeslinked" => "Candjmints aloyîs",
 "rclsub"		=> "(ezès pådjes ki «$1» a-st on loyén dzeu)",
@@ -1019,7 +1017,7 @@ to a previously blocked IP address.", # co a fé
 "ipusubmit"		=> "Unblock this address", # co a fé
 "ipusuccess"	=> "«%s» a stî disbloké",
 "ipblocklist"	=> "Djivêye d'&nbsp;adresses IP et di nos d'&nbsp;uzeus ki sont blokés",
-"blocklistline"	=> "$1, $2 a bloké $3",
+"blocklistline"	=> "$1, $2 a bloké $3 ($4)",
 "blocklink"		=> "bloker",
 "unblocklink"	=> "disbloker",
 "contribslink"	=> "contribs", # co a fé
diff --git a/languages/LanguageZh_cn.php b/languages/LanguageZh_cn.php
index df4b1ecb7073..eedeef1a8fc4 100644
--- a/languages/LanguageZh_cn.php
+++ b/languages/LanguageZh_cn.php
@@ -690,8 +690,6 @@ alt=\"Google\" align=\"middle\"></a>
 "listusers"		=> "用户列表",
 "specialpages"	=> "特殊页面",
 "spheading"		=> "特殊页面",
-"sysopspheading" => "管理员特殊页面",
-"developerspheading" => "发展者特殊页面",
 "protectpage"	=> "保护页面",
 "recentchangeslinked" => "链出更改",
 "rclsub"		=> "（从 \"$1\"链出的页面）",
@@ -850,7 +848,7 @@ Wikipedia与这些公司并没有任何商业关系，因此本表不应该
 "ipusubmit"		=> "解除禁封",
 "ipusuccess"	=> "IP地址“$1”已经被解除禁封",
 "ipblocklist"	=> "被封IP地址列表",
-"blocklistline"	=> "$1，$2禁封$3",
+"blocklistline"	=> "$1，$2禁封$3 ($4)",
 "blocklink"		=> "禁封",
 "unblocklink"	=> "解除禁封",
 "contribslink"	=> "贡献",
diff --git a/languages/LanguageZh_tw.php b/languages/LanguageZh_tw.php
index dc0033cc2a4e..805c22e833cf 100644
--- a/languages/LanguageZh_tw.php
+++ b/languages/LanguageZh_tw.php
@@ -694,8 +694,6 @@ alt=\"Google\" align=\"middle\"></a>
 "listusers"		=> "用戶列表",
 "specialpages"	=> "特殊頁面",
 "spheading"		=> "特殊頁面",
-"sysopspheading" => "管理員特殊頁面",
-"developerspheading" => "發展者特殊頁面",
 "protectpage"	=> "保護頁面",
 "recentchangeslinked" => "鏈出更改",
 "rclsub"		=> "（從 \"$1\"鏈出的頁面）",
@@ -854,7 +852,7 @@ alt=\"Google\" align=\"middle\"></a>
 "ipusubmit"		=> "解除禁封",
 "ipusuccess"	=> "網址”$1”已經被解除禁封",
 "ipblocklist"	=> "被封網址列表",
-"blocklistline"	=> "$1，$2禁封$3",
+"blocklistline"	=> "$1，$2禁封$3 ($4)",
 "blocklink"		=> "禁封",
 "unblocklink"	=> "解除禁封",
 "contribslink"	=> "貢獻",
-- 
cgit v1.2.3


From 5ca74c3d1cf1a56af8649dca8e5b4c166dc41671 Mon Sep 17 00:00:00 2001
From: Rowan Collins <imsop@users.mediawiki.org>
Date: Fri, 12 Aug 2005 22:51:20 +0000
Subject: Parser test for bug 3090

---
 maintenance/parserTests.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 9794cff3c0b2..3c18bf5dc2d6 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -1844,6 +1844,15 @@ Image caption containing a newline
 !!end
 
 
+!! test
+Bug 3090: External links other than http: in image captions
+!! input
+[[Image:Foobar.jpg|thumb|200px|This caption has [irc://example.net irc] and [https://example.com Secure] ext links in it.]]
+!! result
+<div class="thumb tright"><div style="width:202px;"><a href="/wiki/Image:Foobar.jpg" class="internal" title="This caption has irc and Secure ext links in it."><img src="/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg" alt="This caption has irc and Secure ext links in it." width="200" height="23" longdesc="/wiki/Image:Foobar.jpg" /></a>  <div class="thumbcaption" ><div class="magnify" style="float:right"><a href="/wiki/Image:Foobar.jpg" class="internal" title="Enlarge"><img src="/skins/common/images/magnify-clip.png" width="15" height="11" alt="Enlarge" /></a></div>This caption has <a href="irc://example.net" class='external text' title="irc://example.net" rel="nofollow">irc</a> and <a href="https://example.com" class='external text' title="https://example.com" rel="nofollow">Secure</a> ext links in it.</div></div></div>
+
+!! end
+
 
 ###
 ### Subpages
-- 
cgit v1.2.3


From edc556133dfa276967cc50c020625f2bb4d3460d Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 13 Aug 2005 07:25:00 +0000
Subject: Authors as per #3123

---
 languages/LanguageKn.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/languages/LanguageKn.php b/languages/LanguageKn.php
index 3e37b6cc4313..dc8d2745c1a2 100644
--- a/languages/LanguageKn.php
+++ b/languages/LanguageKn.php
@@ -1,8 +1,18 @@
 <?php
 /**
-  * @package MediaWiki
-  * @subpackage Language
-  */
+ * Language file for Kannada.
+ * Mosty done by:
+ *   Hari Prasad Nadig <hpnadig@gmail.com>
+ *     http://en.wikipedia.org/wiki/User:Hpnadig
+ *   Ashwath Mattur <ashwatham@gmail.com>
+ *     http://en.wikipedia.org/wiki/User:Ashwatham
+ *
+ * Also see the Kannada Localisation Initiative at:
+ *      http://kannada.sourceforge.net/
+ *
+ * @package MediaWiki
+ * @subpackage Language
+ */
 
 require_once( 'LanguageUtf8.php' );
 
-- 
cgit v1.2.3


From 6e558c87533e50619bead1581286a4cf5a17fc1e Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 13 Aug 2005 07:31:31 +0000
Subject: #3130 patch by Tom Gries

---
 config/index.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/index.php b/config/index.php
index 4959368f9f35..310a14e408b4 100644
--- a/config/index.php
+++ b/config/index.php
@@ -885,10 +885,8 @@ if( count( $errs ) ) {
 		</ul>
 	</dd>
 	<dt>
-		<p>
-		E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or who changes his/her stored e-mail address
-		gets a one-time temporary password mailed to that address. The user can use the original password as long as wanted, however, the stored e-mail address
-		is only authenticated at the moment when the user logs in with the one-time temporary password.<p>
+		<p>E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or changes his/her stored e-mail address
+		gets a link with a token mailed to that address. The stored e-mail address is authenticated at the moment the user comes back to the wiki via the link.</p>
 
 		<p>The e-mail address stays authenticated as long as the user does not change it; the time of authentication is indicated
 		on the user preference page.</p>
-- 
cgit v1.2.3


From 627cef62f6b999281aa9ef793073d5c0cc2e3f66 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 13 Aug 2005 07:50:19 +0000
Subject: Suppressed file not found warning, removed unnecessary cache
 suppression header

---
 includes/StreamFile.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 3098ea876cdd..0c44bb9228a0 100644
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -4,7 +4,7 @@
 /** */
 function wfStreamFile( $fname ) {
 	global $wgSquidMaxage;
-	$stat = stat( $fname );
+	$stat = @stat( $fname );
 	if ( !$stat ) {
 		header( 'HTTP/1.0 404 Not Found' );
 		echo "<html><body>
@@ -15,7 +15,6 @@ does not.</p>
 		return;
 	}
 
-	header( "Cache-Control: s-maxage=$wgSquidMaxage, must-revalidate, max-age=0" );
 	header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s', $stat['mtime'] ) . ' GMT' );
 
 	if ( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
-- 
cgit v1.2.3


From 0f387dc913ca07863b741cd892c2d7ef0d3c34e7 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 13 Aug 2005 07:58:19 +0000
Subject: #3092: Wrong numerical separator for big numbers.

---
 RELEASE-NOTES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fa5a3c7ab9cf..dd0c28025d96 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -645,7 +645,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 1487) invalid html on empty list in banlist
 * (bug 3017) Hotkey conflict for delete and show changes
 * made pixel unit translateable and blocklistline now eats infiniteblock and expiringblock
-
+* (bug 3092) Wrong numerical separator for big numbers in Serbian.
 
 === Caveats ===
 
-- 
cgit v1.2.3


From 62a44d1174cab46ba7bc37183da983aafef77743 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 13 Aug 2005 07:58:19 +0000
Subject: #3092: Wrong numerical separator for big numbers.

---
 languages/LanguageSr.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 8f43b587555d..8ecd3f08b8cc 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -1109,6 +1109,10 @@ class LanguageSr extends LanguageUtf8 {
 		else
 			return parent::getMessage($key);
  }
+
+ function formatNum( $number, $year = false ) {
+        return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
+ }
  
 }
 
-- 
cgit v1.2.3


From 69eec89e97107c82a1a2f292e08acac0ec36972e Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 13 Aug 2005 08:10:36 +0000
Subject: #3077 : typo

---
 includes/Title.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Title.php b/includes/Title.php
index 4d7994b42bef..1ad1b30f906d 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -667,7 +667,7 @@ class Title {
 		$namespace = $wgContLang->getNsText( $this->mNamespace );
 		if ( '' != $namespace ) {
 			# Can this actually happen? Interwikis shouldn't be parsed.
-			$namepace .= ':';
+			$namespace .= ':';
 		}
 		$url = str_replace( '$1', $namespace . $this->mUrlform, $baseUrl );
 		if( $query != '' ) {
-- 
cgit v1.2.3


From 42d77d1d811dbc1757f15b88137d5278686409eb Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 13 Aug 2005 09:03:19 +0000
Subject: Fix #2855: Credit for a uniq author showed its realname even with
 $wgAllowRealName=false.

---
 RELEASE-NOTES        | 5 ++++-
 includes/Credits.php | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dd0c28025d96..2cd31dfca1ea 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -644,8 +644,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3117) Fix display of upload size and type with tidy on
 * (bug 1487) invalid html on empty list in banlist
 * (bug 3017) Hotkey conflict for delete and show changes
-* made pixel unit translateable and blocklistline now eats infiniteblock and expiringblock
+* made pixel unit translateable and blocklistline now eats infiniteblock
+  and expiringblock
 * (bug 3092) Wrong numerical separator for big numbers in Serbian.
+* (bug 2855) Credit for a uniq author showed its realname even with
+  $wgAllowRealName=false.
 
 === Caveats ===
 
diff --git a/includes/Credits.php b/includes/Credits.php
index 8699c79f768f..7131789b0cd4 100644
--- a/includes/Credits.php
+++ b/includes/Credits.php
@@ -68,15 +68,14 @@ function getCredits($article, $cnt, $showIfMax=true) {
  *
  */
 function getAuthorCredits($article) {
-    global $wgLang;
+    global $wgLang, $wgAllowRealName;
 
     $last_author = $article->getUser();
 
     if ($last_author == 0) {
 		$author_credit = wfMsg('anonymous');
     } else {
-
-		$real_name = User::whoIsReal($last_author);
+		if($wgAllowRealName) { $real_name = User::whoIsReal($last_author); }
 		$user_name = User::whoIs($last_author);
 
 		if (!empty($real_name)) {
-- 
cgit v1.2.3


From 21c69cc99a25348e47fbbcbec6edd80b1a1244e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Sat, 13 Aug 2005 13:31:48 +0000
Subject: Removing line that shouldn't be there anymore

---
 languages/Language.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/languages/Language.php b/languages/Language.php
index 212eb61e0697..bf67d3a644a8 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1409,7 +1409,6 @@ to a previously blocked IP address or username.',
 'infiniteblock' => 'infinite',
 'expiringblock' => 'expires $1',
 'ipblocklistempty'	=> 'The blocklist is empty.',
-'blocklistline'	=> "$1, $2 blocked $3 (expires $4)",
 'blocklink'		=> 'block',
 'unblocklink'	=> 'unblock',
 'contribslink'	=> 'contribs',
-- 
cgit v1.2.3


From ede4090f62623a333b47ba9672657f0bd0011e00 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 14 Aug 2005 04:49:31 +0000
Subject: fixed connection error handling

---
 includes/Database.php     | 22 +++++++++++++++-------
 includes/LoadBalancer.php | 10 ++++++++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/includes/Database.php b/includes/Database.php
index 32a49971b11c..0035866aef22 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -244,7 +244,6 @@ class Database {
 		
 		if ( !$success ) {
 			$this->reportConnectionError();
-			$this->close();
 		}
 		$this->mOpened = $success;
 		return $success;
@@ -273,16 +272,15 @@ class Database {
 	/**
 	 * @access private
 	 * @param string $msg error message ?
-	 * @todo parameter $msg is not used
 	 */
-	function reportConnectionError( $msg = '') {
+	function reportConnectionError() {
 		if ( $this->mFailFunction ) {
 			if ( !is_int( $this->mFailFunction ) ) {
 				$ff = $this->mFailFunction;
 				$ff( $this, mysql_error() );
 			}
 		} else {
-			wfEmergencyAbort( $this, mysql_error() );
+			wfEmergencyAbort( $this, $this->lastError() );
 		}
 	}
 	
@@ -598,7 +596,13 @@ class Database {
 	 */
 	function lastError() { 
 		if ( $this->mConn ) {
-			$error = mysql_error( $this->mConn ); 
+			# Even if it's non-zero, it can still be invalid
+			wfSuppressWarnings();
+			$error = mysql_error( $this->mConn );
+			if ( !$error ) {
+				$error = mysql_error();
+			}
+			wfRestoreWarnings();
 		} else {
 			$error = mysql_error();
 		}
@@ -1616,8 +1620,8 @@ class ResultWrapper {
  */
 function wfEmergencyAbort( &$conn, $error ) {
 	global $wgTitle, $wgUseFileCache, $title, $wgInputEncoding, $wgOutputEncoding;
-	global $wgSitename, $wgServer;
-	
+	global $wgSitename, $wgServer, $wgMessageCache;
+
 	# I give up, Brion is right. Getting the message cache to work when there is no DB is tricky.
 	# Hard coding strings instead.
 
@@ -1658,6 +1662,10 @@ border=\"0\" ALT=\"Google\"></A>
 		header( 'Cache-control: none' );
 		header( 'Pragma: nocache' );
 	}
+
+	# No database access
+	$wgMessageCache->disable();
+	
 	$msg = wfGetSiteNotice();
 	if($msg == '') {
 		$msg = str_replace( '$1', $error, $noconnect );
diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index ee402d68e587..cff4f38bc5fa 100644
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -27,7 +27,7 @@ define( 'DB_WRITE', -2 );
  */
 class LoadBalancer {
 	/* private */ var $mServers, $mConnections, $mLoads, $mGroupLoads;
-	/* private */ var $mFailFunction;
+	/* private */ var $mFailFunction, $mErrorConnection;
 	/* private */ var $mForce, $mReadIndex, $mLastIndex;
 	/* private */ var $mWaitForFile, $mWaitForPos, $mWaitTimeout;
 	/* private */ var $mLaggedSlaveMode;
@@ -40,6 +40,7 @@ class LoadBalancer {
 		$this->mReadIndex = -1;
 		$this->mForce = -1;
 		$this->mLastIndex = -1;
+		$this->mErrorConnection = false;
 	}
 
 	function newFromParams( $servers, $failFunction = false, $waitTimeout = 10 )
@@ -348,6 +349,10 @@ class LoadBalancer {
 				$i = $this->getWriterIndex();
 			}
 		}
+		# Couldn't find a working server in getReaderIndex()?
+		if ( $i === false ) {
+			$this->reportConnectionError( $this->mErrorConnection );
+		}
 		# Now we have an explicit index into the servers array
 		$this->openConnection( $i, $fail );
 		
@@ -374,6 +379,7 @@ class LoadBalancer {
 			if ( $fail ) {
 				$this->reportConnectionError( $this->mConnections[$i] );
 			}
+			$this->mErrorConnection = $this->mConnections[$i];
 			$this->mConnections[$i] = false;
 			$success = false;
 		}
@@ -434,7 +440,7 @@ class LoadBalancer {
 			if ( $this->mFailFunction ) {
 				$conn->failFunction( $this->mFailFunction );
 			} else {
-				$conn->failFunction( 'wfEmergencyAbort' );
+				$conn->failFunction( false );
 			}
 			$conn->reportConnectionError();
 			$reporting = false;
-- 
cgit v1.2.3


From 310768b175803a685e75032ef4d9f0f4b8793934 Mon Sep 17 00:00:00 2001
From: Alexander Sigachov <ajvol@users.mediawiki.org>
Date: Sun, 14 Aug 2005 20:22:26 +0000
Subject: To language.php 1.633.2.4

---
 languages/LanguageRu.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 276ac0204a88..88ef40402b49 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -1,7 +1,7 @@
 <?php
 /** Russian (русский язык)
   *
-  * Based on Language.php 1.628
+  * Based on Language.php 1.633.2.4
   *
   * @package MediaWiki
   * @subpackage Language
@@ -238,6 +238,7 @@ if(isset($wgExtraNamespaces)) {
 
 
 'linktrail'             => '/^((?:[a-z]|а|б|в|г|д|е|ё|ж|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ъ|ы|ь|э|ю|я)+)(.*)$/sD', 
+'linkprefix'            => '/^(.*?)([a-zA-Z\x80-\xff\x4000-\x4f0f]+)$/sD',
 'mainpage'              => 'Заглавная страница',
 'mainpagetext'  => 'Програмное обеспечение вики-проекта успешно установлено.',
 "mainpagedocfooter" => "См. [http://meta.wikipedia.org/wiki/MediaWiki_i18n documentation on customizing the interface]
@@ -358,6 +359,7 @@ if(isset($wgExtraNamespaces)) {
 'showtoc' => 'показать',
 'hidetoc' => 'убрать',
 'thisisdeleted' => "Просмотреть или восстановить $1?",
+'restorelink1' => 'одно удаление',
 'restorelink' => "$1 удаление(й)",
 'feedlinks' => 'В виде:',
 'sitenotice'    => '-', # the equivalent to wgSiteNotice
@@ -584,7 +586,7 @@ $1",
 'explainconflict' => "Пока вы редактировали эту статью, кто-то внёс в неё изменения. В верхнем окне для редактирования вы видите тот текст статьи, который будет сохранён при нажатии на кнопку «Записать страницу». В нижнем окне для редактирования находится ваш вариант. Чтобы сохранить ваши изменения, перенесите их из нижнего окна для редактирования в верхнее.<br/>",
 'yourtext'              => 'Ваш текст',
 'storedversion' => 'Сохранённая версия',
-'nonunicodebrowser' => "<strong>ПРЕДУПРЕЖДЕНИЕ: Ваш [[браузер]] не поддерживает кодировку [[Юникод]]. Пожалуйста, воспользуйтесь другим браузером для редактирования.</strong>",
+'nonunicodebrowser' => "<strong>ПРЕДУПРЕЖДЕНИЕ: Ваш [[браузер]] не поддерживает кодировку [[Юникод]]. При редактировании статей все не-ASCII символы будут заменены на свои шестнадцатеричные коды.</strong>",
 'editingold'    => "<strong>ПРЕДУПРЕЖДЕНИЕ: Вы редактируете устаревшую версию данной страницы. После сохранения страницы будут потеряны изменения сделанные в последующих версиях.",
 'yourdiff'              => 'Различия',
 'copyrightwarning' => "Обратите внимание, что все добавления и изменения в данном проекте попадают под действие $2 (см. $1). Внося какие-либо дополнения, вы соглашаетесь с тем, что они могут быть изменены кем угодно.
@@ -1248,8 +1250,9 @@ IP-адреса.',
 'ipusuccess'    => "IP-адрес [[$1|«$1»]] разблокирован",
 'ipblocklist'   => 'Список заблокированных IP-адресов и пользователей',
 'blocklistline' => "$1, $2 заблокировал $3 ($4)",
-'infiniteblock' => 'блокировка завершится infinite', //fixme
+'infiniteblock' => 'бессрочная блокировка', 
 'expiringblock' => 'блокировка завершится $1',
+'ipblocklistempty'      => 'Список блокировок пуст.',
 'blocklink'             => 'заблокировать',
 'unblocklink'   => 'разблокировать',
 'contribslink'  => 'вклад',
@@ -1266,6 +1269,7 @@ IP-адреса.',
 'proxyblocksuccess'     => "Выполнено.\n",
 'sorbs'         => 'SORBS DNSBL',
 'sorbsreason'   => 'Ваш IP-адрес находится в списке отрытых прокси-серверов [http://www.sorbs.net SORBS] DNSBL.',
+'sorbs_create_account_reason' => 'Ваш IP-адрес занесён в список открытых прокси [http://www.sorbs.net SORBS] DNSBL. Вы не можете создать учётную запись.',
 
 # Developer tools
 #
@@ -1459,7 +1463,7 @@ IP-адреса.',
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for some actions, most are in Monobook.js
@@ -1939,6 +1943,8 @@ $1
 'trackbackremove' => ' ([$1 удалить])',
 'trackbacklink' => 'Trackback',
 'trackbackdeleteok' => 'Trackback был удалён.',
+
+'unit-pixel' => 'пкс',
 );
 
 /* Please, see Language.php for general function comments */
-- 
cgit v1.2.3


From 5dc5063a598e29e7a91a9e1b130a2e515d1ca74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 15 Aug 2005 03:03:19 +0000
Subject: * New special page: SpecialMostlinked

---
 RELEASE-NOTES                  |  1 +
 includes/QueryPage.php         |  1 +
 includes/SpecialMostlinked.php | 69 ++++++++++++++++++++++++++++++++++++++++++
 languages/Language.php         |  1 +
 4 files changed, 72 insertions(+)
 create mode 100644 includes/SpecialMostlinked.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2cd31dfca1ea..d039cdc5f55e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -649,6 +649,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3092) Wrong numerical separator for big numbers in Serbian.
 * (bug 2855) Credit for a uniq author showed its realname even with
   $wgAllowRealName=false.
+* New special page: SpecialMostlinked
 
 === Caveats ===
 
diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 8c6e110364dd..6ed0de439dcf 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -29,6 +29,7 @@ $wgQueryPages = array(
     array( 'UncategorizedPagesPage',    'Uncategorizedpages'),
     array( 'UnusedimagesPage',          'Unusedimages'      ),
     array( 'WantedPagesPage',           'Wantedpages'       ),
+    array( 'MostlinkedPage',		'Mostlinked'	    ),
 );
     
 global $wgDisableCounters;
diff --git a/includes/SpecialMostlinked.php b/includes/SpecialMostlinked.php
new file mode 100644
index 000000000000..008a2d4123be
--- /dev/null
+++ b/includes/SpecialMostlinked.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+require_once ( 'QueryPage.php' ) ;
+
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+class MostlinkedPage extends QueryPage {
+
+	function getName() {
+		return 'Mostlinked';
+	}
+
+	function isExpensive() {
+		return true;
+	}
+	function isSyndicated() { return false; }
+
+	function getSQL() {
+		$dbr =& wfGetDB( DB_SLAVE );
+		extract( $dbr->tableNames( 'pagelinks', 'page' ) );
+		return
+			"SELECT 'Mostlinked' AS type,
+				pl_namespace AS namespace,
+				pl_title AS title,
+				COUNT(*) AS value,
+				page_namespace
+			FROM $pagelinks
+			LEFT JOIN $page ON pl_namespace=page_namespace AND pl_title=page_title
+			GROUP BY pl_namespace,pl_title
+			HAVING COUNT(*) > 1";
+	}
+
+	function formatResult( $skin, $result ) {
+		global $wgContLang;
+
+		$nt = Title::makeTitle( $result->namespace, $result->title );
+		$text = $wgContLang->convert( $nt->getPrefixedText() );
+		if ( is_null( $result->page_namespace ) )
+			$plink = $skin->makeBrokenLink( $nt->getPrefixedText(), $text );
+		else
+			$plink = $skin->makeKnownLink( $nt->getPrefixedText(), $text );
+		
+		$nl = wfMsg( "nlinks", $result->value );
+		$nlink = $skin->makeKnownLink( $wgContLang->specialPage( "Whatlinkshere" ), $nl, "target=" . $nt->getPrefixedURL() );
+
+		return "{$plink} ({$nlink})";
+	}
+}
+
+/**
+ * constructor
+ */
+function wfSpecialMostlinked() {
+	list( $limit, $offset ) = wfCheckLimits();
+
+	$wpp = new MostlinkedPage();
+
+	$wpp->doQuery( $offset, $limit );
+}
+
+?>
diff --git a/languages/Language.php b/languages/Language.php
index bf67d3a644a8..b26500debb4e 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1123,6 +1123,7 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
 'popularpages'	=> 'Popular pages',
 'nviews'		=> '$1 views',
 'wantedpages'	=> 'Wanted pages',
+'mostlinked'	=> 'Most linked to pages',
 'nlinks'		=> '$1 links',
 'allpages'		=> 'All pages',
 'randompage'	=> 'Random page',
-- 
cgit v1.2.3


From b3cd4c12692e4a9ce4bd3b0df28a7f6199cc68cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Mon, 15 Aug 2005 03:04:06 +0000
Subject: * New special page: SpecialMostlinked * Removed redundant global
 declerations, the variables are in the same scope * (bug 2885, 2931) Can't
 pass a literal as a reference

---
 includes/SpecialPage.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 869ccafe1af2..4fbd7b9f5b1d 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -16,11 +16,6 @@
  */
 
 
-/**
- *
- */
-global $wgSpecialPages, $wgUser;
-
 /**
  * @access private
  */
@@ -47,6 +42,7 @@ $wgSpecialPages = array(
 	'Unusedcategories'	=> new SpecialPage( 'Unusedcategories' ),
 	'Unusedimages'      => new SpecialPage( 'Unusedimages' ),
 	'Wantedpages'	=> new SpecialPage( 'Wantedpages' ),
+	'Mostlinked'	=> new SpecialPage( 'Mostlinked' ),
 	'Shortpages'	=> new SpecialPage( 'Shortpages' ),
 	'Longpages'		=> new SpecialPage( 'Longpages' ),
 	'Newpages'		=> new IncludableSpecialPage( 'Newpages' ),
@@ -75,21 +71,17 @@ $wgSpecialPages = array(
 	'Userrights'	=> new SpecialPage( 'Userrights', 'userrights' ),
 );
 
-global $wgUseValidation ;
 if ( $wgUseValidation )
 	$wgSpecialPages['Validate'] = new SpecialPage( 'Validate' );
 
-global $wgDisableCounters;
 if( !$wgDisableCounters ) {
 	$wgSpecialPages['Popularpages'] = new SpecialPage( 'Popularpages' );
 }
 
-global $wgDisableInternalSearch;
 if( !$wgDisableInternalSearch ) {
 	$wgSpecialPages['Search'] = new UnlistedSpecialPage( 'Search' );
 }
 
-global $wgEmailAuthentication;
 if( $wgEmailAuthentication ) {
 	$wgSpecialPages['Confirmemail'] = new UnlistedSpecialPage( 'Confirmemail' );
 }
@@ -165,7 +157,7 @@ class SpecialPage
 	 * @static
 	 * @param string $name
 	 */
-	function &getPage( $name ) {
+	function getPage( $name ) {
 		global $wgSpecialPages;
 		if ( array_key_exists( $name, $wgSpecialPages ) ) {
 			return $wgSpecialPages[$name];
@@ -179,7 +171,7 @@ class SpecialPage
 	 * @param string $name
 	 * @return mixed Title object if the redirect exists, otherwise NULL
 	 */
-	function &getRedirect( $name ) {
+	function getRedirect( $name ) {
 		global $wgUser;
 		switch ( $name ) {
 			case 'Mypage':
@@ -240,12 +232,12 @@ class SpecialPage
 			$par = $bits[1];
 		}
 
-		$page =& SpecialPage::getPage( $name );
+		$page = SpecialPage::getPage( $name );
 		if ( is_null( $page ) ) {
 			if ( $including ) {
 				return false;
 			} else {
-				$redir =& SpecialPage::getRedirect( $name );
+				$redir = SpecialPage::getRedirect( $name );
 				if ( isset( $redir ) ) {
 					if ( isset( $par ) )
 						$wgOut->redirect( $redir->getFullURL() . '/' . $par );
-- 
cgit v1.2.3


From a8877922adbbe557c6990332e01adda3b0dda42e Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Mon, 15 Aug 2005 13:22:01 +0000
Subject: Merge down Tim's HEAD changes

---
 includes/ExternalStoreDB.php | 59 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index 00f8c481ea89..3c61726523fb 100644
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -10,31 +10,74 @@ require_once( 'LoadBalancer.php' );
 
 
 /** @package MediaWiki */
+
 class ExternalStoreDB {
+	var $loadBalancers = array();
+	
 	/**
 	 * Fetch data from given URL
 	 * @param string $url An url
 	 */
+
+	function &getLoadBalancer( $cluster ) {
+		global $wgExternalServers;
+		if ( !array_key_exists( $cluster, $this->loadBalancers ) ) {
+			$this->loadBalancers[$cluster] = LoadBalancer::newFromParams( $wgExternalServers[$cluster] );
+		}
+		return $this->loadBalancers[$cluster];
+	}
+	
+	function &getSlave( $cluster ) {
+		$lb =& $this->getLoadBalancer( $cluster );
+		return $lb->getConnection( DB_SLAVE );
+	}
+
+	function &getMaster( $cluster ) {
+		$lb =& $this->getLoadBalancer( $cluster );
+		return $lb->getConnection( DB_MASTER );
+	}		
+	
 	function fetchFromURL($url) {
 		global $wgExternalServers;
 		#
-		# URLs have the form DB://cluster/id, e.g.
-		# DB://cluster1/3298247
+		# URLs have the form DB://cluster/id or DB://cluster/id/itemid for concatenated storage
 		#
 		$path = explode( '/', $url );
 		$cluster  = $path[2];
 		$id	  = $path[3];
+		if ( isset( $path[4] ) ) {
+			$itemID = $path[4];
+		} else {
+			$itemID = false;
+		}
 
-		$lb = LoadBalancer::NewFromParams( $wgExternalServers[$cluster] );
-		$db = $lb->getConnection( DB_SLAVE );
+		$dbr =& $this->getSlave( $cluster );
+		$ret = $dbr->selectField( 'blobs', 'blob_text', array( 'blob_id' => $id ) ); 
 
-		$ret = $db->selectField( 'blobs', 'blob_text', array( 'blob_id' => $id ) ); 
-		
+		if ( $itemID !== false ) {
+			# Unserialise object and get item
+			$obj = unserialize( $ret );
+			$ret = $obj->getItem( $itemID );
+		}
 		return $ret;
 	}
 
-	/* @fixme XXX: may require other methods, for store, delete, 
-	 * whatever, for initial ext storage  
+	/**
+	 * Insert a data item into a given cluster
+	 *
+	 * @param string $cluster The cluster name
+	 * @param string $data The data item
+	 * @return string URL
 	 */
+	function store( $cluster, $data ) {
+		global $wgExternalServers;
+		$fname = 'ExternalStoreDB::store';
+
+		$dbw =& $this->getMaster( $cluster );
+
+		$id = $dbw->nextSequenceValue( 'blob_blob_id_seq' );
+		$dbw->insert( 'blobs', array( 'blob_id' => $id, 'blob_text' => $data ), $fname );
+		return "DB://$cluster/" . $dbw->insertId();
+	}
 }
 ?>
-- 
cgit v1.2.3


From a9820febc44c63f0c19bf8d5e1785522b8721123 Mon Sep 17 00:00:00 2001
From: Alexander Sigachov <ajvol@users.mediawiki.org>
Date: Mon, 15 Aug 2005 21:25:59 +0000
Subject: Messages from Wikipedia MediaWiki namespace

---
 languages/LanguageRu.php | 175 +++++++++++++++++++++++------------------------
 1 file changed, 86 insertions(+), 89 deletions(-)

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 88ef40402b49..d948fe0f951a 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -179,7 +179,7 @@ if(isset($wgExtraNamespaces)) {
 'tog-watchdefault' => 'По умолчанию добавлять новые и изменённые статьи в список наблюдения',
 'tog-minordefault' => 'По умолчанию помечать изменения как малозначимые',
 'tog-previewontop' => 'Показывать предпросмотр статьи до окна редактирования',
-'tog-previewonfirst' => 'Показывать предварительный просмотр по первому изменению',
+'tog-previewonfirst' => 'Предварительный просмотр по первому изменению',
 'tog-nocache' => 'Запретить кеширование страниц',
 'tog-enotifwatchlistpages'      => 'Уведомлять по эл. почте об изменениях страниц',
 'tog-enotifusertalkpages'       => 'Уведомлять по эл. почте об изменении персональной страницы обсуждения',
@@ -257,8 +257,8 @@ if(isset($wgExtraNamespaces)) {
 'bugreportspage' => '{{ns:project}}:Отчёт об ошибке',
 'sitesupport'   => 'Пожертвования', # To enable, something like 'Donations', '-' to disable
 'sitesupport-url' => "{{ns:project}}:Пожертвования",
-'faq'                   => 'Ответы на вопросы',
-'faqpage'             => '{{ns:project}}:Ответы на вопросы',
+'faq'                   => 'ЧаВО',
+'faqpage'             => '{{ns:project}}:ЧаВО',
 'edithelp'            => 'Справка по редактированию',
 'newwindow'           => '(в новом окне)',
 'edithelppage'        => '{{ns:project}}:Справка по редактированию',
@@ -471,14 +471,15 @@ $1",
 'createaccountmail'     => 'по эл. почте',
 'badretype'             => 'Введённые вами пароли не совпадают.',
 'userexists'    => 'Введённое вами имя участника уже существует. Пожалуйста, выберите другое имя.',
-'youremail'             => 'Ваш адрес эл. почты *',
-'yourrealname'          => 'Ваше настоящее имя *',
+'youremail'             => 'Ваш адрес электронной почты *',
+'yourrealname'          => 'Ваше настоящее имя (*)',
 'yourlanguage'  => 'Язык интерфейса',
 'yourvariant'  => 'Вариант языка',
 'yournick'              => 'Ваш псевдоним (для подписей)',
 'email'                 => 'Эл. почта',
-'emailforlost'          => "Поля отмеченные звёздочкой необязательны для заполнения. Указав адрес электронной почты, вы позволите другим участникам проекта отправлять вам сообщение через веб-форму. 
-Это также поможет вам в случае если вы забудете свой пароль.<br />Ваше настоящее имя будет использовано для подписи ваших работ.",
+'emailforlost'          => "Поля отмеченные звёздочкой необязательны для заполнения.
+Вводить ваш адрес электронной почты необязательно. Однако это позволит людям связываться с вами через веб-сайт, не зная вашего адреса электронной почты. Также это поможет в случае, если вы забудете свой пароль.<br /><br />
+Ваше настоящее имя будет использовано для подписи ваших работ.",
 'prefs-help-email-enotif' => 'Этот адрес также используется для отправки по электронной почте оповещений об изменении страниц если вы активировали соответствующую опцию.',
 'prefs-help-realname'   => '* Настоящее имя (необязательное поле): если вы укажите его, то оно будет использовано для того чтобы показать кем был внесена правка страницы.',
 'loginerror'    => 'Ошибка опознавания участника',
@@ -555,9 +556,9 @@ $1",
 'whitelistedittitle' => 'Для изменения требуется авторизаци',
 'whitelistedittext' => 'Вы должны [[{{ns:special}}:Userlogin|зарегистрироваться]] для изменения этих страниц.',
 'whitelistreadtitle' => 'Для чтения требуется авторизация',
-'whitelistreadtext' => 'Для доступа необходимо [[{{ns:special}}:Userlogin|представиться]].',
+'whitelistreadtext' => 'Вы должны [[Special:Userlogin|зарегистрироваться]] для чтения этих страниц.',
 'whitelistacctitle' => 'У вас нет прав чтобы создать учётную запись',
-'whitelistacctext' => 'Для создания учётных записей в этой Вики необходимо [[{{ns:special}}:Userlogin|представиться]]',
+'whitelistacctext' => 'Для того чтобы иметь возможность создавать учётные записи в этой вики вы должны [[Special:Userlogin|зарегистрироваться]] и иметь соответствующие права.',
 'loginreqtitle' => 'Требуется авторизация',
 'loginreqtext'  => 'Вы должны [[{{ns:special}}:Userlogin|представиться системе]] для того чтобы просматривать остальные страницы.',
 'accmailtitle' => 'Пароль выслан.',
@@ -583,24 +584,33 @@ $1",
 'editingsection'                => "Редактирование $1 (секция)",
 'editingcomment'                => "Редактирование $1 (комментарий)",
 'editconflict'  => 'Конфликт редактирования: $1',
-'explainconflict' => "Пока вы редактировали эту статью, кто-то внёс в неё изменения. В верхнем окне для редактирования вы видите тот текст статьи, который будет сохранён при нажатии на кнопку «Записать страницу». В нижнем окне для редактирования находится ваш вариант. Чтобы сохранить ваши изменения, перенесите их из нижнего окна для редактирования в верхнее.<br/>",
+'explainconflict' => "Пока вы редактировали эту статью, кто-то внёс в неё изменения. В верхнем окне для редактирования вы видите тот текст статьи, который будет сохранён при нажатии на кнопку «Записать страницу». В нижнем окне для редактирования находится ваш вариант. Чтобы сохранить ваши изменения, перенесите их из нижнего окна для редактирования в верхнее.<br />",
 'yourtext'              => 'Ваш текст',
 'storedversion' => 'Сохранённая версия',
 'nonunicodebrowser' => "<strong>ПРЕДУПРЕЖДЕНИЕ: Ваш [[браузер]] не поддерживает кодировку [[Юникод]]. При редактировании статей все не-ASCII символы будут заменены на свои шестнадцатеричные коды.</strong>",
-'editingold'    => "<strong>ПРЕДУПРЕЖДЕНИЕ: Вы редактируете устаревшую версию данной страницы. После сохранения страницы будут потеряны изменения сделанные в последующих версиях.",
+'editingold'    => "<strong>ПРЕДУПРЕЖДЕНИЕ: Вы редактируете устаревшую версию данной страницы. После сохранения страницы будут потеряны изменения сделанные в последующих версиях.</strong>",
 'yourdiff'              => 'Различия',
-'copyrightwarning' => "Обратите внимание, что все добавления и изменения в данном проекте попадают под действие $2 (см. $1). Внося какие-либо дополнения, вы соглашаетесь с тем, что они могут быть изменены кем угодно.
-
-Прежде чем поместить сюда какие-либо материалы, убедитесь что вы [[{{ns:project}}:Авторские права|имеете на это право]].
-
-<strong>НЕ РАЗМЕЩАЙТЕ БЕЗ РАЗРЕШЕНИЯ МАТЕРИАЛЫ, ЯВЛЯЮЩИЕСЯ ОБЪЕКТОМ ОХРАНЫ АВТОРСКОГО И СМЕЖНЫХ ПРАВ</strong>",
+'copyrightwarning' => "Пожалуйста, обратите внимание, что все добавления и изменения
+рассматриваются, как выпущенные на условиях лицензии $2 (см. $1).
+Внося какие-либо дополнения, вы соглашаетесь с тем, что они могут быть изменены кем угодно.
+Если вы не хотите, чтобы ваши тексты свободно распространялись и редактировались,
+не помещайте их сюда.<br />
+Вы также подтверждаете, что являетесь автором вносимых дополнений, или скопировали их из
+источника допускающего свободное распространение и изменение своего содержимого.<br />
+<strong>НЕ РАЗМЕЩАЙТЕ БЕЗ РАЗРЕШЕНИЯ ОХРАНЯЕМЫЕ АВТОРСКИМ ПРАВОМ МАТЕРИАЛЫ!</strong>",
+'copyrightwarning2' => "Пожалуйста, обратите внимание, что все ваши добавления
+могут быть отредактированы или удалены другими участниками.
+Если вы не хотите, чтобы кто-либо изменял ваши тексты, не помещайте их сюда.<br />
+Вы также подтверждаете, что являетесь автором вносимых дополнений, или скопировали их из
+источника допускающего свободное распространение и изменение своего содержимого (см. $1).<br />
+<strong>НЕ РАЗМЕЩАЙТЕ БЕЗ РАЗРЕШЕНИЯ ОХРАНЯЕМЫЕ АВТОРСКИМ ПРАВОМ МАТЕРИАЛЫ!</strong>",
 'longpagewarning' => "<strong>ПРЕДУПРЕЖДЕНИЕ: размер этой страницы $1 килобайт; страницы, размер которых превышает 32 килобайта, могут быть неверно отображены в окне редактирование некоторых браузеров.
 Пожалуйста, рассмотрите вариант разбиения страницы на меньшие части.</strong>",
 'readonlywarning' => '<strong>ПРЕДУПРЕЖДЕНИЕ: база данных заблокирована в связи с процедурами обслуживания,
 поэтому вы не можете записать ваши изменения прямо сейчас.
 Возможно, вам следует сохранить текст в файл на своём диске и поместить его в данный проект позже.</strong>',
 'protectedpagewarning' => "<strong>ПРЕДУПРЕЖДЕНИЕ: эта страница заблокирована и только [[Project:Администраторы|администраторы проекта]] могут изменять её. См. [[Project:Правила защиты страниц|правила защиты страниц]].</strong>",
-'templatesused' => 'На этой странице помещены шаблоны:',
+'templatesused' => 'Шаблоны, использованные на этой странице:',
 
 # History pages
 #
@@ -615,7 +625,7 @@ $1",
 'revisionasofwithlink'  => 'Версия как $1; $2<br />$3 | $4',
 'previousrevision'      => '← Старая версия',
 'nextrevision'          => 'Новые версии →',
-'currentrevisionlink'   => 'посмотреть текущие изменения',
+'currentrevisionlink'   => 'перейти к текущей версии',
 'cur'                   => 'текущ.',
 'next'                  => 'след.',
 'last'                  => 'пред.',
@@ -661,48 +671,37 @@ $1",
 'showingresults' => "Ниже показаны <strong>$1</strong> результатов, начиная с <strong>#$2</strong>.",
 'showingresultsnum' => "Ниже показаны <strong>$3</strong> результатов, начиная с №<strong>$2</strong>.",
 'nonefound'             => "Неудачный поиск может быть вызван попыткой найти общие слова, которые не подлежат индексированию, например — «тоже» и «чтобы» или употреблением более чем одного ключевого слова поиска (показываются только страницы, содержащие все указанные слова для поиска).",
-'powersearch' => 'Искать',
 'powersearchtext' => "
-Поиск $3 $9<br />
-$2 — <strong>Показывать перенаправления</strong><br />
-<strong>Искать в пространствах имён:</strong>
-<center><table border=\"0\"><tr><td>
-$1
-</td></tr></table></center></FORM>
-<br />
-<br />
-<h2>Поиск с учётом русской морфологии</h2>
-Для поиска с учётом русской морфологии воспользуйтесь поисковой системой Яндекс. Слово будет искаться во всех словоформах, а также будут игнорироваться различия между буквами «е» и «ё». Имейте в виду, что в этом случае поиск ведётся только в проиндексированных Яндексом страницах.
-<!-- Поиск через Яндекс (ya.ru) -->
-<form NAME=\"web\" METHOD=\"get\" ACTION=\"http://www.yandex.ru/yandsearch\">
-<input type=\"hidden\" name=\"serverurl\" value=\"{{SERVER}}\">
-<input type=\"hidden\" name=\"server_name\" value=\"{{SITENAME}} (русская версия)\">
-<INPUT type=hidden value=rad name=rpt><input type=\"hidden\" name=\"referrer1\" value=\"{{SERVER}}\">
-<input type=\"hidden\" name=\"referrer2\" value=\"{{SITENAME}} (русская версия)\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td width=130 align=\"right\">
-<a href=\"http://www.yandex.ru\">
-<IMG SRC=\"http://www.ya.ru/logo.gif\"
-border=\"0\" ALT=\"Яндекс\"></A>
-</td><td>
-<input TYPE=\"text\" NAME=\"text\" SIZE=\"31\" VALUE=\"\" MAXLENGTH=\"160\">
-</td><td><input TYPE=\"SUBMIT\" VALUE=\"Поиск по сайту\">
-</td></tr></table>
+Искать в пространствах имён:<br />
+$1<br />
+$2 — Показывать перенаправления &nbsp; Искать $3 $9",
+"searchdisabled" => 'Извините, но встроенный полнотекстовый поиск выключен. Вы можете воспользоваться поиском по сайту через поисковые системы общего назначения, однако имейте в виду, что копия сайта в их кэше может быть несколько устаревшей.',
+
+'googlesearch' => '
+<form method="get" action="http://www.google.com/search" id="googlesearch">
+    <input type="hidden" name="domains" value="{{SERVER}}" />
+    <input type="hidden" name="num" value="50" />
+    <input type="hidden" name="ie" value="$2" />
+    <input type="hidden" name="oe" value="$2" />
+
+    <input type="text" name="q" size="31" maxlength="255" value="$1" />
+    <input type="submit" name="btnG" value="$3" />
+  <div>
+    <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label>
+    <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label>
+  </div>
 </form>
-<!-- Поиск через Яндекс (ya.ru) -->
-<h2>Поиск через Гугл</h2>
-Поиск с использованием языка запросов Google. Поиск ведётся только в проиндексированных страницах.
-<!-- SiteSearch Google -->
-<FORM method=GET action=\"http://www.google.com/search\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td width=130 align=\"right\">
-<A HREF=\"http://www.google.com/\">
-<IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
-border=\"0\" ALT=\"Google\"></A>
-</td>
-<td>
-<INPUT TYPE=text name=q size=31 maxlength=255 value=\"\"> <INPUT type=submit name=btnG VALUE=\"Поиск по сайту\"> <input type=hidden name=domains value=\"{{SERVER}}\">
-<input type=hidden name=sitesearch value=\"{{SERVER}}\"><input type='hidden' name='ie' value='UTF-8'> <input type='hidden' name='oe' value='UTF-8'>
-</td></tr></TABLE></FORM>
-<!-- SiteSearch Google -->",
+
+<form name="web" method="get" action="http://www.yandex.ru/yandsearch">
+  <input type="hidden" name="serverurl" value="{{SERVER}}" />
+  <input type="hidden" name="server_name" value="{{SITENAME}} (русская версия)" />
+  <input type="hidden" name="rpt" value="rad" />
+  <input type="hidden" name="referrer1" value="{{SERVER}}" />
+  <input type="hidden" name="referrer2" value="{{SITENAME}} (русская версия)" />
+
+  <input type="text" name="text" size="31" maxlength="255" value="$1" />
+  <input type="submit" value="Поиск по сайту" />
+</form>',
 'blanknamespace' => 'Статьи',
 
 # Preferences page
@@ -821,7 +820,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'rcnote'                => "Последние <strong>$1</strong> изменеий(я) за <strong>$2</strong> дней(я).",
 'rcnotefrom'    => "Ниже перечислены изменения с <strong>$2</strong> (по <strong>$1</strong>).",
 'rclistfrom'    => "Показать изменения с $1.",
-'showhideminor' => "$1 малозн. правки | $2 ботов | $3 представившихся участников | $4 проверенные правки ",
+'showhideminor' => "$1 мелкие правки | $2 ботов | $3 представившихся участников | $4 проверенные правки",
 'rclinks'               => "Показать последние $1 изменений за $2 дней;<br />$3.",
 'rchide'                => "в форме $4; $1 малозначимых изменений; $2 вторичное(ые) пространство(а) имён; $3 множественных изменений.",
 'rcliu'                 => "; $1 изменений, сделанных представившимися участниками",
@@ -924,7 +923,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'imagelinks'    => 'Ссылки',
 'linkstoimage'  => 'Следующие страницы ссылаются на данный файл:',
 'nolinkstoimage' => 'Нет страниц, ссылающихся на данный файл.',
-'sharedupload' => 'Этот файл взят из [[Commons:Заглавная_страница|WikiCommons]], репозитория изображений и других свободно распространяемых файлов, общего для всех проектов [[Фонд Викимедиа|Фонда Викимедиа]].',
+'sharedupload' => "Этот файл взят из [[Commons:Заглавная_страница|Викихранилища]] (WikiCommons), репозитория изображений и других свободно распространяемых медиа-файлов, общего для всех проектов [[Фонд Викимедиа|Фонда Викимедиа]]. См. '''[[Commons:Image:{{PAGENAME}}|страницу описания]]''', где находится описание изображения, в том числе и лицензия на него.",
 'shareduploadwiki' => 'Смотри [$1 страницу описания файла] для объяснений.',
 'shareddescriptionfollows' => '-',
 'noimage'       => "Файла с таким именем не существует. вы можете [$1 загрузить его].",
@@ -949,8 +948,8 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'maintnancepagetext'    => 'На этой странице есть несколько удобных инструментов для ежедневного обслуживания. Некоторые из этих функций дают сильную нагрузку на базу данных, поэтому, не перезагружайте страницу после каждого сделанного вами изменения ;-',
 'maintenancebacklink'   => 'Назад, на страницу обслуживания',
 'disambiguations'       => 'Многозначные страницы',
-'disambiguationspage'   => "Template:disambig",
-'disambiguationstext'   => "Следующие статьи ссылаются на <em>страницы разъяснения многозначностей</em>. Вместо этого они должны указывать на соответствующую конкретную статью.<br/>Страница считается многозначной, если на неё указывает $1.<br/>Ссылки из других пространств имён здесь <em>не</em> перечислены.",
+'disambiguationspage'   => "{{ns:template}}:disambig",
+'disambiguationstext'   => "Следующие статьи ссылаются на <em>многозначные страницы</em>. Вместо этого они, вероятно, должны указывать на соответствующую конкретную статью.<br/>Страница считается многозначной, если на ней размещён $1.<br/>Ссылки из других пространств имён здесь <em>не</em> приведены.",
 'doubleredirects'       => 'Двойные перенаправления',
 'doubleredirectstext'   => "Каждая строка содержит ссылки на первое и второе перенаправления, а также первую строчку страницы второго перенаправления, в которой обычно указывается название страницы куда должно осуществляться перенаправление. Нужно чтобы и первое перенаправление ссылалось на эту страницу.",
 'brokenredirects'       => 'Разорванные перенаправления',
@@ -986,7 +985,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'longpages'             => 'Длинные страницы',
 'deadendpages'  => 'Тупиковые статьи',
 'listusers'             => 'Список участников',
-'specialpages'  => 'Служебные страницы',
+'specialpages'  => 'Спецстраницы',
 'spheading'             => 'Служебные страницы',
 'restrictedpheading'    => 'Служебные страницы с ограниченным доступом',
 'protectpage'   => 'Защищённая страница',
@@ -1070,7 +1069,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'unwatchthispage'       => 'Прекратить наблюдение',
 'notanarticle'          => 'Не статья',
 'watchnochange'         => 'Ничто из списка наблюдения не изменялось в рассматриваемый период.',
-'watchdetails'          => "Всего в списке наблюдения находится $1 страниц (не считая страниц обсуждения)
+'watchdetails'          => "В вашем списке наблюдения находится $1 страниц (не считая страниц обсуждения)
 * [[Special:Watchlist/edit|Показать и отредактировать полный список]]
 ",
 'wlheader-enotif'       => "* Уведомление по эл. почте включено.",
@@ -1165,14 +1164,14 @@ $NEWPAGE
 #   only shown if there is an edit comment
 'editcomment' => "Изменение было пояснено так: <em>«$1»</em>.",
 'revertpage'    => "Откачено к последнему изменению, сделанному $1",
-'sessionfailure' => 'Обнаружена проблема с регистрационной сессией;
-действие было отменено для предотвращения возможного захвата сессии (session hijacking).
-Пожалуйста нажмите кнопку «назад» и перезагрузите странизу с которой вы пришли.',
+'sessionfailure' => 'Похоже, возникли проблемы с текущим сеансом работы;
+это действие было отменено в целях предотвращения «захвата сеанса».
+Пожалуйста, нажмите кнопку «Назад» и перезагрузите страницу с которой вы пришли.',
 'protectlogpage' => 'Журнал_защиты',
 'protectlogtext' => "Ниже — список установок и снятий защиты со статей.
 См. дополнительную информацию на [[{{ns:project}}:Protected page]].",
 'protectedarticle' => "защищена страница [[$1|«$1»]]",
-'unprotectedarticle' => "снята защита со страницы  [[$1|«$1»]]",
+'unprotectedarticle' => "снята защита со страницы [[$1|«$1»]]",
 'protectsub' =>"(Установка защиты для «$1»)",
 'confirmprotecttext' => 'Вы действительно хотите установить защиту этой страницы?',
 'confirmprotect' => 'Подтвердите установку защиты страницы',
@@ -1268,8 +1267,8 @@ IP-адреса.',
 'proxyblockreason'      => 'Ваш IP-адрес заблокирован потому что это открытый прокси. Пожалуйста, свяжитесь с вашим интернет-провайдером  или службой поддержки и сообщите им об этой серьёзной проблеме безопасности.',
 'proxyblocksuccess'     => "Выполнено.\n",
 'sorbs'         => 'SORBS DNSBL',
-'sorbsreason'   => 'Ваш IP-адрес находится в списке отрытых прокси-серверов [http://www.sorbs.net SORBS] DNSBL.',
-'sorbs_create_account_reason' => 'Ваш IP-адрес занесён в список открытых прокси [http://www.sorbs.net SORBS] DNSBL. Вы не можете создать учётную запись.',
+'sorbsreason'   => 'Ваш IP-адрес числится как открытый прокси в [http://www.sorbs.net SORBS] DNSBL.',
+'sorbs_create_account_reason' => 'Ваш IP-адрес числится как открытый прокси в [http://www.sorbs.net SORBS] DNSBL. Вы не можете создать учётную запись.',
 
 # Developer tools
 #
@@ -1329,7 +1328,7 @@ IP-адреса.',
 'val_del' => 'Удалить',
 'val_show_my_ratings' => 'Показать мои оценки',
 'val_revision_number' => 'Версия №$1',
-'val_warning' => '<b>Никогда не изменяйте что-либо здесь без <i>явного</i> согласия сообщества!</b>',
+'val_warning' => '<strong>Никогда не изменяйте что-либо здесь без <em>явного</em> согласия сообщества!</strong>',
 'val_rev_for' => 'Версии для $1',
 'val_details_th_user' => 'Участник $1',
 'val_validation_of' => 'Проверка «$1»',
@@ -1338,7 +1337,7 @@ IP-адреса.',
 'val_rev_stats' => 'См. статистику проверок для «$1» <a href="$2">здесь</a>',
 'val_revision_stats_link' => 'подробнее',
 'val_iamsure' => 'Подтвердите, что вы действительно хотите сделать это!',
-'val_clear_old' => 'Очистить мои старые оценки',
+'val_clear_old' => 'Очистить мои другие проверки данных',
 'val_details_th' => '<sub>Участник</sub> \\ <sup>Тема</sup>',
 'val_merge_old' => 'Использовать мою предыдущую оценку там где выбрано «Нет мнения»',
 'val_form_note' => "'''Посказка:''' Слияние ваших данных означает что для версии 
@@ -1430,7 +1429,7 @@ IP-адреса.',
 
 Вы также можете использовать специальный адрес для экспорта только последней версии статьи. Например для статьи [[Паровоз]] это будет адрес [[{{ns:special}}:Export/Паровоз]].
 ',
-'exportcuronly' => 'Экспортировать только текущую версию, без истории изменений',
+'exportcuronly' => 'Включать только текущую версию, без полной предыстории',
 
 # Namespace 8 related
 
@@ -1473,7 +1472,7 @@ IP-адреса.',
 'tooltip-preview' => 'Предварительный просмотр страницы, пожалуйста, используйте перед сохранением! [alt-p]',
 'tooltip-diff' => 'Показать изменения, сделанные по отношению к исходному тексту. [alt-d]',
 'tooltip-compareselectedversions' => 'Посмотреть разницу между двумя выбранными версиями этой страницы. [alt-v]',
-'tooltip-watch' => 'Добавить эту страницу в ваш список наблюдения [alt-w]',
+'tooltip-watch' => 'Добавить текущую страницу в список наблюдения [alt-w]',
 
 # stylesheets
 'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
@@ -1494,20 +1493,18 @@ The wiki server can\'t provide data in a format your client can read.',
 'othercontribs' => "Основано на работе $1.",
 'others' => 'другие',
 'siteusers' => "Участник(и) {{grammar:genitive|{{SITENAME}}}} $1",
-'creditspage' => 'Список участников',
+'creditspage' => 'Благодарности',
 'nocredits' => 'Нет списка участников для этой статьи',
 
 # Spam protection
 
 'spamprotectiontitle' => 'Спам-фильтр',
-'spamprotectiontext' => 'Страница, которую вы пытаетесь сохранить заблокирована спам-фильтром. Вероятнее всего она содержит ссылку на внешний сайт.
-
-Посмотрите следующие регулярные выражения для шаблонов, которые блокируются:',
+'spamprotectiontext' => 'Страница, которую вы пытаетесь сохранить заблокирована спам-фильтром. Вероятнее всего она содержит ссылку на внешний сайт.',
 'spamprotectionmatch' => 'Следующее сообщение было получено от спам-фильтра: $1',
-'subcategorycount' => "Имеется $1 подкатегори(я,ий) в этой категории.",
-'subcategorycount1' => "Всего $1 подкатегори(я,ий) в этой категории.",
-'categoryarticlecount' => "Имеется $1 статьи(я, ей) в этой категории.",
-'categoryarticlecount1' => "Имеется $1 статьи(я, ей) в этой категории.",
+'subcategorycount' => "Имеется $1 подкатегорий в этой категории.",
+'subcategorycount1' => "Всего $1 подкатегория в этой категории.",
+'categoryarticlecount' => "Имеется $1 статьей в этой категории.",
+'categoryarticlecount1' => "Всего $1 статья в этой категории.",
 'usenewcategorypage' => "1\n\nУстановите первый символ в «0» чтобы заблокировать новое размещение страницы категории.",
 'listingcontinuesabbrev' => " <em><small>(продолжение)</small></em>",
 
@@ -1590,7 +1587,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 ',
 
 # image deletion
-'deletedrevision' => 'Удалена страя версия $1.',
+'deletedrevision' => 'Удалена старая версия $1.',
 
 # browsing diffs
 'previousdiff' => '← К предыдущему изменению',
@@ -1605,7 +1602,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 
 # labels for User: and Title: on Special:Log pages
 'specialloguserlabel' => 'Участник: ',
-'speciallogtitlelabel' => 'Название: ',
+'speciallogtitlelabel' => 'Заголовок: ',
 
 'passwordtooshort' => 'Введённый пароль слишком короткий. Пароль должен состоять не менее чем из $1 символов.',
 
@@ -1626,7 +1623,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'exif-samplesperpixel' =>'Количество цветовых компонентов',
 'exif-planarconfiguration' =>'Принцип организации данных',
 'exif-ycbcrsubsampling' =>'Отношение размеров компонент Y и C',
-'exif-ycbcrpositioning' =>'Порядок размещения компонент Y и C ',
+'exif-ycbcrpositioning' =>'Порядок размещения компонент Y и C',
 'exif-xresolution' =>'Горизонтальное разрешение',
 'exif-yresolution' =>'Вертикальное разрешение',
 'exif-resolutionunit' =>'Единица измерения разрешения',
@@ -1653,7 +1650,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'exif-componentsconfiguration' =>'Конфигурация цветовых компонентов',
 'exif-compressedbitsperpixel' =>'Глубина цвета после сжатия',
 'exif-pixelydimension' =>'Полная высота изображения',
-'exif-pixelxdimension' =>' Полная ширина изображения ',
+'exif-pixelxdimension' =>'Полная ширина изображения',
 'exif-makernote' =>'Дополнительные данные производителя',
 'exif-usercomment' =>'Дополнительный комментарий',
 'exif-relatedsoundfile' =>'Файл звукового комментария',
@@ -1682,7 +1679,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'exif-flashenergy' =>'Энергия вспышки',
 'exif-spatialfrequencyresponse' =>'Пространственная частотная характеристика',
 'exif-focalplanexresolution' =>'Разрешение по X в фокальной плоскости',
-'exif-focalplaneyresolution' =>'Разрешение по Y в фокальной плоскости ',
+'exif-focalplaneyresolution' =>'Разрешение по Y в фокальной плоскости',
 'exif-focalplaneresolutionunit' =>'Единица измерения разрешения в фокальной плоскости',
 'exif-subjectlocation' =>'Положение объекта относительно левого верхнего угла',
 'exif-exposureindex' =>'Индекс экспозиции',
@@ -1733,7 +1730,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'exif-gpsdestdistance' =>'Расстояние',
 'exif-gpsprocessingmethod' =>'Метод вычисления положения',
 'exif-gpsareainformation' =>'Название области GPS',
-'exif-gpsdatestamp' =>'Дата ',
+'exif-gpsdatestamp' =>'Дата',
 'exif-gpsdifferential' =>'Дифференциальная поправка',
 
 # Exif attributes
@@ -1877,7 +1874,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'exif-gpsstatus-v' => 'Готов к передаче данных',
 
 'exif-gpsmeasuremode-2' => 'Измерение 2-х координат',
-'exif-gpsmeasuremode-3' => 'Измерение 3-х координат ',
+'exif-gpsmeasuremode-3' => 'Измерение 3-х координат',
 
 // Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
 'exif-gpsspeed-k' => 'км/час',
-- 
cgit v1.2.3


From 1052b31f364a497426a8f808d6be2a791aeba19b Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 15 Aug 2005 21:46:46 +0000
Subject: Fix #2393: incorrect MIME type for atom feeds ref:
 http://www.atomenabled.org/developers/syndication/atom-format-spec.php#rfc.section.7

---
 RELEASE-NOTES           | 1 +
 includes/OutputPage.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d039cdc5f55e..dea560e50ffc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -650,6 +650,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2855) Credit for a uniq author showed its realname even with
   $wgAllowRealName=false.
 * New special page: SpecialMostlinked
+* (bug 2393) Fix MIME type for Atom feeds ( application/rss+atom )
 
 === Caveats ===
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ae4694bc4812..6f4e04666f94 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -876,7 +876,7 @@ class OutputPage {
 			$link = $wgRequest->escapeAppendQuery( 'feed=rss' );
 			$ret .= "<link rel='alternate' type='application/rss+xml' title='RSS 2.0' href='$link' />\n";
 			$link = $wgRequest->escapeAppendQuery( 'feed=atom' );
-			$ret .= "<link rel='alternate' type='application/rss+atom' title='Atom 0.3' href='$link' />\n";
+			$ret .= "<link rel='alternate' type='application/atom+xml' title='Atom 0.3' href='$link' />\n";
 		}
 
 		return $ret;
-- 
cgit v1.2.3


From e7ef15fcaabb16e88f9258d08b255195ab55a4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Mon, 15 Aug 2005 23:40:19 +0000
Subject: Some backporting, see also bug 3162

---
 includes/Article.php          | 5 +++--
 includes/DefaultSettings.php  | 6 ++++++
 includes/DifferenceEngine.php | 8 +++++---
 includes/SpecialWatchlist.php | 3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index e0bd2016f242..1a9e40d23079 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -864,7 +864,7 @@ class Article {
 
 		$tbtext = "";
 		while ($o = $dbr->fetchObject($tbs)) {
-			$rmvtext = "";
+			$rmvtxt = "";
 			if ($wgUser->isSysop()) {
 				$delurl = $this->mTitle->getFullURL("action=deletetrackback&tbid="
 						. $o->tb_id . "&token=" . $wgUser->editToken());
@@ -970,6 +970,7 @@ class Article {
 			# An extra check against threads stepping on each other
 			$conditions['page_latest'] = $lastRevision;
 		}
+
 		$text = $revision->getText();
 		$dbw->update( 'page',
 			array( /* SET */
@@ -1706,7 +1707,7 @@ class Article {
 		}
 
 		# Fetch cur_text
-		$rev =& Revision::newFromTitle( $this->mTitle );
+		$rev = Revision::newFromTitle( $this->mTitle );
 
 		# Fetch name(s) of contributors
 		$rev_name = '';
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7690ddc86abe..0eab40282652 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1556,6 +1556,12 @@ $wgCountCategorizedImagesAsUsed = false;
  */
 $wgExternalStores = false;
 
+/**
+ * An array of external mysql servers, e.g.
+ * $wgExternalServers = array( 'cluster1' => array( 'srv28', 'srv29', 'srv30' ) );
+ */
+$wgExternalServers = array();
+
 /**
 * list of trusted media-types and mime types.
 * Use the MEDIATYPE_xxx constants to represent media types.
diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index e78fb878388c..e056eee1fd67 100644
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -169,11 +169,13 @@ CONTROL;
 			$patrol = '';
 		}
 
-		$prevlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'previousdiff' ), 'diff=prev&oldid='.$this->mOldid );
+		$prevlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'previousdiff' ),
+			'diff=prev&oldid='.$this->mOldid, '', '', 'id="differences-prevlink"' );
 		if ( $this->newRev->isCurrent() ) {
 			$nextlink = '';
 		} else {
-			$nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid );
+			$nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'nextdiff' ),
+				'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
 		}
 
 		$oldHeader = "<strong>{$this->mOldtitle}</strong><br />$oldUserLink " .
@@ -240,7 +242,7 @@ CONTROL;
 		$userLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER, $this->mOldUser ), $this->mOldUser );
 		$contribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), wfMsg( 'contribslink' ),
 			'target=' . urlencode($this->mOldUser) );
-		$nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid );
+		$nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
 		$header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />$userLink " .
 			"($uTLink | $contribs)<br />" . $this->mOldComment .
 			'<br />' . $nextlink. "</div>\n";
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 99ea60e7836d..263746fa5bb4 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -212,8 +212,9 @@ function wfSpecialWatchlist( $par ) {
 		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
 	}
 
+	# TODO: Consider removing the third parameter
 	$header .= wfMsg( 'watchdetails', $wgLang->formatNum( $nitems ), 
-		$wgLang->formatNum( $npages ), $y,
+		$wgLang->formatNum( $npages ), '',
 		$specialTitle->getFullUrl( 'edit=yes' ) );
 	$wgOut->addWikiText( $header );
 	
-- 
cgit v1.2.3


From d536b5e912cbfb7652493bf0a3c8f25e50bc0e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 16 Aug 2005 12:54:52 +0000
Subject: arrow up, arrow down, arrow round the clock, arrow to cvs' heart,
 getting rid of entities

---
 languages/Language.php   | 10 +++++-----
 languages/LanguageBe.php |  4 ++--
 languages/LanguageCs.php | 10 +++++-----
 languages/LanguageDa.php | 10 +++++-----
 languages/LanguageDe.php |  4 ++--
 languages/LanguageEs.php |  4 ++--
 languages/LanguageFr.php |  8 ++++----
 languages/LanguageId.php | 10 +++++-----
 languages/LanguageKu.php |  6 +++---
 languages/LanguageLi.php |  6 +++---
 languages/LanguageMk.php | 10 +++++-----
 languages/LanguageNn.php |  6 +++---
 12 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/languages/Language.php b/languages/Language.php
index b26500debb4e..4d96d5921dc5 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -770,8 +770,8 @@ Please check the URL you used to access this page.\n",
 'currentrev'	=> 'Current revision',
 'revisionasof'          => 'Revision as of $1',
 'revisionasofwithlink'  => 'Revision as of $1; $2<br />$3 | $4',
-'previousrevision'	=> '&larr;Older revision',
-'nextrevision'		=> 'Newer revision&rarr;',
+'previousrevision'	=> '←Older revision',
+'nextrevision'		=> 'Newer revision→',
 'currentrevisionlink'   => 'view current revision',
 'cur'			=> 'cur',
 'next'			=> 'next',
@@ -976,7 +976,7 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left
 'nchanges'		=> "$1 changes",
 'minoreditletter' => 'm',
 'newpageletter' => 'N',
-'sectionlink' => '&rarr;',
+'sectionlink' => '→',
 'number_of_watching_users_RCview' 	=> '[$1]',
 'number_of_watching_users_pageview' 	=> '[$1 watching user/s]',
 
@@ -1759,8 +1759,8 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'deletedrevision' => 'Deleted old revision $1.',
 
 # browsing diffs
-'previousdiff' => '&larr; Previous diff',
-'nextdiff' => 'Next diff &rarr;',
+'previousdiff' => '← Previous diff',
+'nextdiff' => 'Next diff →',
 
 'imagemaxsize' => 'Limit images on image description pages to: ',
 'thumbsize'	=> 'Thumbnail size: ',
diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php
index 1d46253ed2c2..e8a9485e2313 100644
--- a/languages/LanguageBe.php
+++ b/languages/LanguageBe.php
@@ -335,7 +335,7 @@ public domain or similar free resource.<br />
 'newtitle' => 'Новая назва',
 'newusersonly' => ' (толькі для новых удзельнікаў і ўдзельніц)',
 'newwindow' => '(адчыняецца ў новым акне)',
-'nextdiff' => 'Перайсьці да наступнай зьмены &rarr;',
+'nextdiff' => 'Перайсьці да наступнай зьмены →',
 'nextn' => 'наступныя $1',
 'nextpage' => 'Наступная старонка ($1)',
 'noaffirmation' => 'Вы павінныя пацьвердзіць, што загрузка гэтага файла не парушае нічыіх аўтарскіх правоў.',
@@ -391,7 +391,7 @@ public domain or similar free resource.<br />
 'postcomment' => 'Пракамэнтаваць',
 'preferences' => 'Устаноўкі',
 'preview' => 'Прагляд',
-'previousdiff' => '&larr; Перайсьці да папярэдняй зьмены',
+'previousdiff' => '← Перайсьці да папярэдняй зьмены',
 'prevn' => 'папярэднія $1',
 'printableversion' => 'Вэрсія для друку',
 'protect' => 'Абараніць',
diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 9f5e912c1866..2eaa59b3955d 100644
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -592,8 +592,8 @@ Všechny příspěvky do {{grammar:2sg|{{SITENAME}}}} jsou zveřejňovány podle
 'currentrev'    => 'Aktuální verze',
 'revisionasof'          => 'Verze z $1',
 'revisionasofwithlink'  => 'Verze z $1; $2<br />$3 | $4',
-'previousrevision' => '&larr; Starší verze',
-'nextrevision'		=> 'Novější verze &rarr;',
+'previousrevision' => '← Starší verze',
+'nextrevision'		=> 'Novější verze →',
 'currentrevisionlink'   => 'zobrazit aktuální verzi',
 'cur'                   => 'teď',
 'next'                  => 'násl',
@@ -793,7 +793,7 @@ Nezvolené skupiny nebudou změněny. Skupinu můžete vyřadit z vybraných pom
 'nchanges'              => '$1 změn',
 'minoreditletter' => 'm',
 'newpageletter' => 'N',
-'sectionlink' => '&rarr;',
+'sectionlink' => '→',
 'number_of_watching_users_RCview' 	=> '[$1]',
 'number_of_watching_users_pageview' 	=> '[Sledujících uživatelů: $1]',	#TODO: plural
 
@@ -1544,8 +1544,8 @@ ta['ca-nstab-category'] = new Array('c','Zobrazit kategorii.');",
 'deletedrevision' => 'Smazána stará verze $1.',
 
 # browsing diffs
-'previousdiff' => '&larr; Předchozí porovnání',
-'nextdiff' => 'Následující porovnání &rarr;',
+'previousdiff' => '← Předchozí porovnání',
+'nextdiff' => 'Následující porovnání →',
 
 'imagemaxsize' => 'Omezit obrázky na stránkách s popiskem na: ',
 'thumbsize'	=> 'Velikost náhledu: ',
diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index 648423422cff..f5959341bbad 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -598,8 +598,8 @@ ikke findes. Kontrollér den URL du brugte til at få adgang til denne side.\n",
 "currentrev"	=> "Nuværende version",
 "revisionasof"	=> "Versionen fra $1",
 'revisionasofwithlink'  => 'Revision pr. $1; $2<br />$3 | $4',
-'previousrevision'	=> '&larr;Ældre version',
-'nextrevision'		=> 'Nyere version&rarr;',
+'previousrevision'	=> '←Ældre version',
+'nextrevision'		=> 'Nyere version→',
 'currentrevisionlink'   => 'se nuværende version',
 "cur"			=> "nuværende",
 "next"			=> "næste",
@@ -792,7 +792,7 @@ sidste <strong>$2</strong> dage.",
 "nchanges"		=> "$1 ændringer",
 "minoreditletter" => "m",
 "newpageletter" => "N",
-'sectionlink' => '&rarr;',
+'sectionlink' => '→',
 'number_of_watching_users_RCview' 	=> '[$1]',
 'number_of_watching_users_pageview' 	=> '[$1 overvågende bruger/e]',
 
@@ -1579,8 +1579,8 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Se kategorisiden\');
 'deletedrevision' => 'Slettede gammel version $1.',
 
 # browsing diffs
-'previousdiff' => '&larr; Gå til forrige forskel',
-'nextdiff' => 'Gå til næste forskel &rarr;',
+'previousdiff' => '← Gå til forrige forskel',
+'nextdiff' => 'Gå til næste forskel →',
 
 'imagemaxsize' => 'Begræns størrelsen af billeder på billedsiderne til: ',
 'thumbsize'	=> 'Thumbnail størrelse : ',
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index d3611e360cc7..6e32042d86b5 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -527,8 +527,8 @@ Benutzer mit Sysop-Rechten bearbeitet werden kann. Beachten Sie bitte die
 "currentrev"	=> "Aktuelle Version",
 "revisionasof"	=> "Version vom $1",
 'revisionasofwithlink'	=> 'Version vom $1; $2<br />$3 | $4',
-'nextrevision'		=> '&larr;Nächstjüngere Version',
-'previousrevision'	=> 'Nächstältere Version&rarr;',
+'nextrevision'		=> '←Nächstjüngere Version',
+'previousrevision'	=> 'Nächstältere Version→',
 "cur"			=> "Aktuell",
 'cur_tooltiptext'	=> 'Zeige Differenz zwischen dieser und aktueller Version von ',
 "next"			=> "Nächste",
diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php
index 131a58b67539..abd535103033 100644
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -1064,8 +1064,8 @@ Por favor, elige otro nombre.",
 'newimages' => 'Galería de imágenes nuevas',
 'noimages'  => 'No hay nada que ver.',
 
-'previousdiff' => "&larr; Ir a diferencia anterior",
-'nextdiff' => "Ir a siguiente diferencia &rarr;",
+'previousdiff' => "← Ir a diferencia anterior",
+'nextdiff' => "Ir a siguiente diferencia →",
 
 'deletedrevision' => "Borrada revisión antigua $1.",
 
diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index e1c04ae3bc10..cca0ad756140 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -511,10 +511,10 @@ vous suivez les [[Project:Page_protégée|directives concernant les pages proté
 (dern) = différence avec la version précédente, M = modification mineure",
 'selectnewerversionfordiff' => 'Choisir une version plus récente',
 'selectolderversionfordiff' => 'Choisir une version plus ancienne',
-'previousdiff' => '&larr; Différence précédente',
-'previousrevision' => '&larr; Version précédente',
-'nextdiff' => 'Différence suivante &rarr;',
-'nextrevision' => 'Version suivante &rarr;',
+'previousdiff' => '← Différence précédente',
+'previousrevision' => '← Version précédente',
+'nextdiff' => 'Différence suivante →',
+'nextrevision' => 'Version suivante →',
 
 
 # Category pages
diff --git a/languages/LanguageId.php b/languages/LanguageId.php
index 584b77bb7211..4e20b2bc884d 100644
--- a/languages/LanguageId.php
+++ b/languages/LanguageId.php
@@ -458,8 +458,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "currentrev" => "Revisi sekarang",
 "revisionasof" => "Revisi per $1",
 'revisionasofwithlink'  => 'Revisi per $1; $2<br />$3 | $4', 
-'previousrevision'      => '&larr;Revisi yang lebih tua', 
-'nextrevision'          => 'Revisi yang lebih baru&rarr;', 
+'previousrevision'      => '←Revisi yang lebih tua', 
+'nextrevision'          => 'Revisi yang lebih baru→', 
 'currentrevisionlink'   => 'lihat revisi sekarang', 
 "cur" => "kini",
 "next" => "berikut",
@@ -628,7 +628,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "nchanges" => "$1 perubahan",
 "minoreditletter" => "m",
 "newpageletter" => "B",
-'sectionlink' => '&rarr;',
+'sectionlink' => '→',
 
 # Upload 
 # 
@@ -1265,8 +1265,8 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Lihat halaman kategori\');
 'deletedrevision' => 'Menghapus revisi tua $1.',
 
 # browsing diffs
-'previousdiff' => '&larr; Ke diff sebelumnya',
-'nextdiff' => 'Ke diff selanjutnya &rarr;',
+'previousdiff' => '← Ke diff sebelumnya',
+'nextdiff' => 'Ke diff selanjutnya →',
 
 'imagemaxsize' => 'Batasi gambar dalam halaman deskripsi gambar sampai: ',
 'showbigimage' => 'Download versi resolusi tinggi ($1x$2, $3 KB)',
diff --git a/languages/LanguageKu.php b/languages/LanguageKu.php
index a62b1e6e4143..e59ed4bea1fe 100644
--- a/languages/LanguageKu.php
+++ b/languages/LanguageKu.php
@@ -1011,7 +1011,7 @@ Eger tu bi şaştî hatî, bizivire rûpela berê.
 #'nextdiff' => 'Next diff →',
 'nextn' => '$1 pêş',
 'nextpage' => 'Rûpela pêşî ($1)',
-#'nextrevision' => 'Newer revision&rarr;',
+#'nextrevision' => 'Newer revision→',
 'nlinks' => '$1 lînk',
 'noaffirmation' => 'Pêwîst e tu teyît bikî ku barkirin mafên nivîsanê îhlal neke.',
 'noarticletext' => '<div style="border: 1px solid #ccc; padding: 7px; background-color: #fff; color: #000">\'\'\'Di Wîkîpediyayê de rûpeleke bi vî navî hîn tune.\'\'\'
@@ -1141,7 +1141,7 @@ to set user preferences.', */
 text editing area as it will appear if you choose to save.', */
 'previewnote' => 'Ji bîr neke ku ev bi tenê çavdêriyek e, ev rûpel hîn nehat qeyd kirin!',
 #'previousdiff' => '← Previous diff',
-#'previousrevision' => '&larr;Older revision',
+#'previousrevision' => '←Older revision',
 'prevn' => '$1 paş',
 #'print' => 'Print',
 'printableversion' => 'Versiyon ji bo çapkirinê',
@@ -1339,7 +1339,7 @@ Please check the URL you used to access this page.
 'searchresults' => 'Encamên lêgerînê',
 'searchresultshead' => 'Eyarên encamên lêgerinê',
 'searchresulttext' => 'Ji bo zêdetir agahî der barê lêgerînê di Wîkîpediyayê de, binêre $1.',
-#'sectionlink' => '&rarr;',
+#'sectionlink' => '→',
 #'selectnewerversionfordiff' => 'Select a newer version for comparison',
 #'selectolderversionfordiff' => 'Select an older version for comparison',
 #'selflinks' => 'Pages with Self Links',
diff --git a/languages/LanguageLi.php b/languages/LanguageLi.php
index 4da7af5ad647..487c192ebb78 100644
--- a/languages/LanguageLi.php
+++ b/languages/LanguageLi.php
@@ -824,7 +824,7 @@ De beluifs os auch das e dees tèks zelf höbs gesjreve, of gekopieerd van 'n [[
 'newmessageslink' => "nuui berichte",
 'newpage' => "Nuui pazjena",
 'newwindow' => "(in nuui venster)",
-'nextdiff' => "Gank nao de volgende diff &rarr;",
+'nextdiff' => "Gank nao de volgende diff →",
 'nextpage' => "Volgende pazjena ($1)",
 'nogomatch' => "Inne pazjena mit exak dees titel besjtit neet, probeer noe alle teks doer te zeuke.",
 'noimages' => "Niks te zeen.",
@@ -845,8 +845,8 @@ De beluifs os auch das e dees tèks zelf höbs gesjreve, of gekopieerd van 'n [[
 'prefs-misc' => "Anger insjtèllinge",
 'prefs-personal' => "Gebroekersinfo",
 'prefs-rc' => "Recènte verangeringe en weergaaf van sjtumpkes",
-'previousdiff' => "&larr; Gank nao de vurrige diff",
-'previousrevision' => "&larr;Awwer versie",
+'previousdiff' => "← Gank nao de vurrige diff",
+'previousrevision' => "←Awwer versie",
 'protect' => "Besjerm",
 'protectcomment' => "Rede veur besjerming",
 'protectedarticle' => "$1 besjermd",
diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index 3ead79eb4a35..d709c930c357 100644
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -513,8 +513,8 @@ global $wgRightsText;
 	"currentrev"			=>	"Моментална ревизија",
 	"revisionasof"			=>	"Ревизија од $1",
 	'revisionasofwithlink'		=>	'Ревизија од $1; $2<br />$3 | $4',
-	'previousrevision'		=>	'&larr;Претходна ревизија',
-	'nextrevision'			=>	'Следна ревизија&rarr;',
+	'previousrevision'		=>	'←Претходна ревизија',
+	'nextrevision'			=>	'Следна ревизија→',
 	'currentrevisionlink'		=>	'види ја тековната ревизија',
 	"cur"					=>	"мом",
 	"next"				=>	"следна",
@@ -669,7 +669,7 @@ global $wgRightsText;
 	"nchanges"			=>	"$1 промени",
 	"minoreditletter"		=>	"с",
 	"newpageletter"			=>	"Н",
-	'sectionlink'			=>	'&rarr;',
+	'sectionlink'			=>	'→',
 	'number_of_watching_users_RCview' =>	'[$1]',
 	'number_of_watching_users_pageview' =>	'[$1 корисници кои набљудуваат]',
 
@@ -1211,8 +1211,8 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Видете ја страница
 ',
 
 	'deletedrevision'		=>	'Избришана стара ревизија $1.',
-	'previousdiff'			=>	'&larr; Претходна разлика',
-	'nextdiff'			=>	'Следна разлика &rarr;',
+	'previousdiff'			=>	'← Претходна разлика',
+	'nextdiff'			=>	'Следна разлика →',
 	'imagemaxsize'			=>	'Ограничи ги сликите на нивните описни страници до: ',
 	'thumbsize'			=>	'Thumbnail големина : ',
 	'showbigimage'			=>	'Преземете ја верзијата со висока резолуција ($1x$2, $3 KB)',
diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index eb554239755c..9e0d1e36a400 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -541,8 +541,8 @@ er lengre enn 32KB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><b
 'currentrev'	          => 'Noverande versjon',
 'revisionasof'	          => 'Versjonen frå $1',
 'revisionasofwithlink'    => 'Versjon frå $1; $2<br />$3 | $4',
-'previousrevision'        => '&larr;Eldre versjon',
-'nextrevision'            => 'Nyare versjon&rarr;',
+'previousrevision'        => '←Eldre versjon',
+'nextrevision'            => 'Nyare versjon→',
 'currentrevisionlink'     => 'Vis noverande versjon',
 'cur'			  => 'no',
 'next'			  => 'neste',
@@ -713,7 +713,7 @@ Sjå [[Help:Brukarinnstillingar|Hjelp]] for ei forklaring på dei ulike innstill
 'nchanges'		=> '$1 endringar',
 'minoreditletter'       => 'u',
 'newpageletter'         => 'n',
-'sectionlink'           => '&rarr;',
+'sectionlink'           => '→',
 'number_of_watching_users_RCview'     => '[$1]',
 'number_of_watching_users_pageview'     => '[$1 brukar(ar) overvakar]',
 
-- 
cgit v1.2.3


From 5be76944b9d54d8579616991f261a392111b6c20 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 16 Aug 2005 23:56:57 +0000
Subject: Remove obsolete IRC scripts (bug 3134)

---
 irc/.htaccess    |   1 -
 irc/mxircecho.py |  54 ------------------------
 irc/rcdumper.php | 122 -------------------------------------------------------
 3 files changed, 177 deletions(-)
 delete mode 100644 irc/.htaccess
 delete mode 100755 irc/mxircecho.py
 delete mode 100644 irc/rcdumper.php

diff --git a/irc/.htaccess b/irc/.htaccess
deleted file mode 100644
index 3a4288278871..000000000000
--- a/irc/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
diff --git a/irc/mxircecho.py b/irc/mxircecho.py
deleted file mode 100755
index b8b38332bb52..000000000000
--- a/irc/mxircecho.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /usr/bin/env python
-#
-# usage: mxircecho.py nickname server
-import sys
-sys.path.append('/home/kate/pylib/lib/python2.2/site-packages')
-
-from ircbot import SingleServerIRCBot
-import threading
-
-class EchoReader(threading.Thread):
-	def __init__(self, bot):
-		threading.Thread.__init__(self)
-		self.abot = bot
-
-	def run(self):
-		while True:
-			try:
-				s = raw_input()
-				sp = s.split("\t")
-				if len(sp) == 2:
-					channel = sp[0]
-					text = sp[1]
-
-					if channel not in bot.chans:
-						bot.chans.append(channel)
-						bot.connection.join(channel)
-
-
-					# this throws an exception if not connected.
-					bot.connection.privmsg(channel, text)
-			except EOFError:
-				# Once the input is finished, the bot should exit
-				break
-			except:
-				pass
-
-class EchoBot(SingleServerIRCBot):
-	def __init__(self, chans, nickname, server):
-		print "*** Connecting to IRC server %s..." % server
-		SingleServerIRCBot.__init__(self, [(server, 6667)], nickname, "IRC echo bot")
-		self.chans = chans
-
-	def on_nicknameinuse(self, c, e):
-		c.nick(c.get_nickname() + "_")
-
-	def on_welcome(self, c, e):
-		print "*** Connected"
-		for chan in self.chans:
-			c.join(chan)
-	
-bot = EchoBot([], sys.argv[1], sys.argv[2]);
-sthr = EchoReader(bot)
-sthr.start()
-bot.start()
diff --git a/irc/rcdumper.php b/irc/rcdumper.php
deleted file mode 100644
index 2adbd5057a9c..000000000000
--- a/irc/rcdumper.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * A recentchanges IRC bot
- *
- * Example command-line where irc is the name of the ircII executable:
- *  php rcdumper.php | irc -d -c \#channel nick server
- * The name of the IRC server should match $ircServer below.
- * 
- * @package MediaWiki
- * @subpackage IRC
- */
-
-$ircServer = "irc.freenode.net";
-
-# Set the below if this is running on a non-Wikimedia site:
-#$serverName="your.site.here";
-
-ini_set( "display_errors", 1 );
-$wgCommandLineMode = true;
-$optionsWithArgs = array( 'm' );
-require_once("../maintenance/commandLine.inc" );
-
-if ( !empty( $options['m'] ) ) {
-	$channel = $options['m'];
-} else {
-	$channel = false;
-}
-
-if ($lang == "commons") $site = "wikimedia";
-
-if ($wgWikiFarm) {
-	$serverName="$lang.$site.org";
-	$newPageURLFirstPart="http://$serverName/wiki/";
-	$URLFirstPart="http://$serverName/w/wiki.phtml?title=";
-} else {
-	$newPageURLFirstPart="http://$serverName$wgScript/";
-	$URLFirstPart="http://$serverName$wgScript?title=";
-}
-
-$wgTitle = Title::newFromText( "RC dumper" );
-$wgCommandLineMode = true;
-set_time_limit(0);
-
-if ( empty($options['b']) ) {
-	$bots = "AND NOT(rc_bot)";
-} else {
-	$bots = "";
-}
-
-if (isset($args[0]) && isset($args[1])) {
-	$lowest = $args[0];
-	$highest = $args[1];
-	#$what = $args[0][0];
-	#$highest = $args[0][1];
-}
-#sleep(30);
-
-$res = $dbr->query( "SELECT rc_timestamp FROM $recentchanges ORDER BY rc_timestamp DESC LIMIT 1" ); 
-$row = $dbr->fetchObject( $res );
-$oldTimestamp = $row->rc_timestamp;
-$serverCount = 0;
-
-while (1) {
-	$res = $dbr->query( "SELECT * FROM $recentchanges WHERE rc_timestamp>'$oldTimestamp' ORDER BY rc_timestamp" );
-	$rowIndex = 0;
-	while ( $row = $dbr->fetchObject( $res ) ) {
-		if ( ++$serverCount % 20 == 0 ) {
-			print "/server $ircServer\n";
-		}
-		$ns = $wgLang->getNsText( $row->rc_namespace ) ;
-		if ( $ns ) {
-			$title = "$ns:{$row->rc_title}";
-		} else {
-			$title = $row->rc_title;
-		}
-		/*if ( strlen( $row->rc_comment ) > 50 ) {
-			$comment = substr( $row->rc_comment, 0, 50 );
-		} else {*/
-			$comment = $row->rc_comment;
-//		}
-		$bad = array("\n", "\r");
-		$empty = array("", "");
-		$comment = str_replace($bad, $empty, $comment);
-		$title = str_replace($bad, $empty, $title);
-		$a = $title[0];
-		if ($a < 'A' || $a > 'Z')
-			$a = 'Z';
-			#if ((isset($highest)) && (($what == "<" && $a > "$highest") || ($what == ">" && $a <= "$highest")))
-		if ((isset($highest) && ($a > $highest)) || (isset($lowest) && $a <= $lowest))
-			continue;
-		$user = str_replace($bad, $empty, $row->rc_user_text);
-		$lastid = IntVal($row->rc_last_oldid);
-		$flag = ($row->rc_minor ? "M" : "") . ($row->rc_new ? "N" : "");
-		$stupid_urlencode = array("%2F", "%3A");
-		$haha_take_that = array("/", ":");
-		if ( $row->rc_new ) {
-			$url = $newPageURLFirstPart . urlencode($title);
-		} else {
-			$url = $URLFirstPart . urlencode($title) .
-				"&diff=0&oldid=$lastid";
-		}
-		$url = str_replace($stupid_urlencode, $haha_take_that, $url);
-		$title = str_replace("_", " ", $title);
-                # see http://www.irssi.org/?page=docs&doc=formats for some colour codes. prefix is \003, 
-		# no colour (\003) switches back to the term default
-		$comment = preg_replace("/\/\* (.*) \*\/(.*)/", "\00315\$1\003 - \00310\$2\003", $comment);
-		$fullString = "\00314[[\00307$title\00314]]\0034 $flag\00310 " .
-		              "\00302$url\003 \0035*\003 \00303$user\003 \0035*\003 \00310$comment\003\n";
-	        if ( $channel ) {
-			$fullString = "$channel\t$fullString";
-		}
-
-		print( $fullString );
-		$oldTimestamp = $row->rc_timestamp;
-		sleep(2);
-	}
-	sleep(5);
-}
-
-exit();
-
-?>
-- 
cgit v1.2.3


From 3f2d0c1eeccadebcfa9e72ab76c8b0be79c47e88 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 07:43:20 +0000
Subject: * Fix display of read-only lockfile message Committing live hack

---
 RELEASE-NOTES                | 2 ++
 includes/GlobalFunctions.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dea560e50ffc..ce78abdae719 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -651,6 +651,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   $wgAllowRealName=false.
 * New special page: SpecialMostlinked
 * (bug 2393) Fix MIME type for Atom feeds ( application/rss+atom )
+* Fix display of read-only lockfile message
+
 
 === Caveats ===
 
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a257ff106086..a11c2fbe9cc4 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -238,7 +238,7 @@ function wfReadOnly() {
 	
 	// Set $wgReadOnly and unset $wgReadOnlyFile, for faster access next time
 	if ( is_file( $wgReadOnlyFile ) ) {
-		$wgReadOnly = true;
+		$wgReadOnly = file_get_contents( $wgReadOnlyFile );
 	} else {
 		$wgReadOnly = false;
 	}
-- 
cgit v1.2.3


From 528f50b7fdb12b03fb0bb7e516633b175ef135bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Wed, 17 Aug 2005 07:46:00 +0000
Subject: * Added a new hook, 'AddNewAccount', which is run after account
 creation

---
 RELEASE-NOTES                 | 2 +-
 docs/hooks.txt                | 3 +++
 includes/SpecialUserlogin.php | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ce78abdae719..8ed215e3b239 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -652,7 +652,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * New special page: SpecialMostlinked
 * (bug 2393) Fix MIME type for Atom feeds ( application/rss+atom )
 * Fix display of read-only lockfile message
-
+* Added a new hook, 'AddNewAccount', which is run after account creation
 
 === Caveats ===
 
diff --git a/docs/hooks.txt b/docs/hooks.txt
index ddc7e2f00ad3..b285ddc11e3c 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -237,6 +237,9 @@ protocol came about after MediaWiki 1.4rc1.
 This is a list of known events and parameters; please add to it if
 you're going to add events to the MediaWiki code.
 
+'AddNewAccount': after a user account is created
+null: This hook passes null as an argument
+
 'ArticleDelete': before an article is deleted
 $article: the article (object) being deleted
 $user: the user (object) deleting the article
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 84b36ccdb15a..0d2b80ae8bef 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -147,6 +147,8 @@ class LoginForm {
 			$wgUser->sendConfirmationMail();
 		}
 
+		wfRunHooks( 'AddNewAccount', null );
+
 		if( $this->hasSessionCookie() ) {
 			return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
 		} else {
-- 
cgit v1.2.3


From 6d79b8bf26a0f796e98e121556388179bb2a1856 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 07:54:28 +0000
Subject: Reset the additional fields; committing live hack from Wikimedia

---
 maintenance/recount.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance/recount.sql b/maintenance/recount.sql
index 2bf4a7fba806..d9fec31fb5c4 100644
--- a/maintenance/recount.sql
+++ b/maintenance/recount.sql
@@ -4,5 +4,5 @@
 
 SELECT @foo:=COUNT(*) FROM /*$wgDBprefix*/cur
   WHERE cur_namespace=0 AND cur_is_redirect=0 AND cur_text like '%[[%';
-UPDATE /*$wgDBprefix*/site_stats SET ss_good_articles=@foo;
+UPDATE /*$wgDBprefix*/site_stats SET ss_good_articles=@foo, ss_total_pages=-1, ss_users=-1, ss_admins=-1;
 
-- 
cgit v1.2.3


From 3d7a6251b85ff7e05446e6d5d8d8ad754ab1595d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 08:09:02 +0000
Subject: * Include software-visible client IP address in Special:Version
 comment   as a proxy debugging aid committing live hack

---
 RELEASE-NOTES               | 4 ++++
 includes/SpecialVersion.php | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8ed215e3b239..f8fe4228de45 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -653,6 +653,10 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2393) Fix MIME type for Atom feeds ( application/rss+atom )
 * Fix display of read-only lockfile message
 * Added a new hook, 'AddNewAccount', which is run after account creation
+* Update all stats fields on recount.sql
+* Include software-visible client IP address in Special:Version comment
+  as a proxy debugging aid
+
 
 === Caveats ===
 
diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index a525d35ef0c9..9b5e15038398 100644
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -60,6 +60,11 @@ or [http://www.gnu.org/copyleft/gpl.html read it online]
 		}
 	}
 	$wgOut->addWikiText( $out );
+	
+	global $wgIP;
+	$wgOut->addHTML( '<!-- visited from '
+		. str_replace( '--', ' - - ', htmlspecialchars( $wgIP ) )
+		. " -->\n" );
 }
 
 function formatExtensionCredits( $name, $author, $url = null, $version = null ) {
-- 
cgit v1.2.3


From 4ff272cc311c0da9a70564567409253a99bf3a21 Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Wed, 17 Aug 2005 08:23:23 +0000
Subject: * fetch wl_timestampnotificationwhatever only when it is turned on.
 fetch * only from recentchanges. makes watchlist join index-only (live hack)

---
 includes/SpecialRecentchanges.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index eccc4c688943..c7549af4807c 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -136,9 +136,10 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 	// This is the big thing!
 
 	$uid = $wgUser->getID();
+        $notifts = ($wgShowUpdatedMarker?",wl_notificationtimestamp":"");
 
 	// Perform query
-	$sql2 = "SELECT *" . ($uid ? ",wl_user,wl_notificationtimestamp" : "") . " FROM $recentchanges " .
+	$sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user".$notifts : "") . " FROM $recentchanges " .
 	  ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
 	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
 	  "ORDER BY rc_timestamp DESC LIMIT {$limit}";
-- 
cgit v1.2.3


From 91ac0c062a5c55e7895cecf777b9ab816768ea88 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 08:53:48 +0000
Subject: * (bug 3162) Fix 'undefined property page_is_new' error on watchlist
 Somebody wrote rev_is_new instead of page_is_new ;)

---
 RELEASE-NOTES                 | 1 +
 includes/SpecialWatchlist.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f8fe4228de45..27bffebf205b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -656,6 +656,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Update all stats fields on recount.sql
 * Include software-visible client IP address in Special:Version comment
   as a proxy debugging aid
+* (bug 3162) Fix 'undefined property page_is_new' error on watchlist
 
 
 === Caveats ===
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 263746fa5bb4..a90f1492f102 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -234,7 +234,7 @@ function wfSpecialWatchlist( $par ) {
           rc_timestamp rev_timestamp,rc_minor rev_minor_edit,
           rc_this_oldid rev_id,
           rc_last_oldid,
-          rc_new rev_is_new,wl_notificationtimestamp
+          rc_new page_is_new,wl_notificationtimestamp
           FROM $watchlist,$recentchanges,$page
           WHERE wl_user=$uid
           AND wl_namespace=rc_namespace
-- 
cgit v1.2.3


From 4c1e0ef25c636c61fb4049bd2056cace686994a9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 19:48:56 +0000
Subject: * (bug 3175) update filenames in documentation files

---
 docs/deferred.txt  | 2 +-
 docs/globals.txt   | 2 +-
 docs/hooks.txt     | 2 +-
 docs/language.txt  | 2 +-
 docs/linkcache.txt | 2 +-
 docs/skin.txt      | 2 +-
 docs/title.txt     | 2 +-
 docs/user.txt      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/deferred.txt b/docs/deferred.txt
index 425395fa63b7..445eb0e485b2 100644
--- a/docs/deferred.txt
+++ b/docs/deferred.txt
@@ -1,5 +1,5 @@
 
-DEFERRED.DOC
+deferred.txt
 
 A few of the database updates required by various functions here
 can be deferred until after the result page is displayed to the
diff --git a/docs/globals.txt b/docs/globals.txt
index ac1a60916344..519b4161aa74 100644
--- a/docs/globals.txt
+++ b/docs/globals.txt
@@ -1,4 +1,4 @@
-GLOBALS.DOC
+globals.txt
 
 PHP loves globals. I hate them. This is not a great
 combination, but I manage. I could get rid of most of
diff --git a/docs/hooks.txt b/docs/hooks.txt
index b285ddc11e3c..b4a267983089 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1,4 +1,4 @@
-HOOKS.DOC
+hooks.txt
 
 This document describes how event hooks work in MediaWiki; how to add
 hooks for an event; and how to run hooks for an event.
diff --git a/docs/language.txt b/docs/language.txt
index 06639f73bacc..9d6a0db329d6 100644
--- a/docs/language.txt
+++ b/docs/language.txt
@@ -1,4 +1,4 @@
-LANGUAGE.DOC
+language.txt
 
 The Language object handles all readable text produced by the
 software. The most used function is getMessage(), usually
diff --git a/docs/linkcache.txt b/docs/linkcache.txt
index b0afbeec6e87..ab36587d82a6 100644
--- a/docs/linkcache.txt
+++ b/docs/linkcache.txt
@@ -1,4 +1,4 @@
-LINKCACHE.DOC
+linkcache.txt
 
 The LinkCache class maintains a list of article titles and
 the information about whether or not the article exists in
diff --git a/docs/skin.txt b/docs/skin.txt
index 3b7a74ed088f..82a5b72ec1ae 100644
--- a/docs/skin.txt
+++ b/docs/skin.txt
@@ -1,5 +1,5 @@
 
-SKIN.DOC
+skin.txt
 
 This document describes the overall architecture of MediaWiki's HTML rendering
 code as well as some history about the skin system. It is placed here rather
diff --git a/docs/title.txt b/docs/title.txt
index c86baa9efd7f..b404bd3ced27 100644
--- a/docs/title.txt
+++ b/docs/title.txt
@@ -1,4 +1,4 @@
-TITLE.DOC
+title.txt
 
 The MediaWiki software's "Title" class represents article
 titles, which are used for many purposes: as the human-readable
diff --git a/docs/user.txt b/docs/user.txt
index 927889234935..3f1c8202ef2d 100644
--- a/docs/user.txt
+++ b/docs/user.txt
@@ -1,5 +1,5 @@
 
-USER.DOC
+user.txt
 
 Documenting the MediaWiki User object.
 
-- 
cgit v1.2.3


From dd8b646e7ceaea52e977033da99851f0652ab05b Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 17 Aug 2005 19:51:03 +0000
Subject: Fix #1734: failed grant with usernames having a -.

---
 RELEASE-NOTES         |  2 +-
 maintenance/users.sql | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 27bffebf205b..dd362fedccba 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -657,7 +657,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Include software-visible client IP address in Special:Version comment
   as a proxy debugging aid
 * (bug 3162) Fix 'undefined property page_is_new' error on watchlist
-
+* (bug 1734) granting db permissions failed with db usernames containg '-'
 
 === Caveats ===
 
diff --git a/maintenance/users.sql b/maintenance/users.sql
index 4d74987b3159..d2d174ffbd84 100644
--- a/maintenance/users.sql
+++ b/maintenance/users.sql
@@ -5,15 +5,15 @@
 --
 
 GRANT ALL ON `{$wgDBname}`.*
- TO {$wgDBadminuser}@'%' IDENTIFIED BY '{$wgDBadminpassword}';
+ TO '{$wgDBadminuser}'@'%' IDENTIFIED BY '{$wgDBadminpassword}';
 GRANT ALL ON `{$wgDBname}`.*
- TO {$wgDBadminuser}@localhost IDENTIFIED BY '{$wgDBadminpassword}';
+ TO '{$wgDBadminuser}'@localhost IDENTIFIED BY '{$wgDBadminpassword}';
 GRANT ALL ON `{$wgDBname}`.*
- TO {$wgDBadminuser}@localhost.localdomain IDENTIFIED BY '{$wgDBadminpassword}';
+ TO '{$wgDBadminuser}'@localhost.localdomain IDENTIFIED BY '{$wgDBadminpassword}';
 
 GRANT DELETE,INSERT,SELECT,UPDATE ON `{$wgDBname}`.*
- TO {$wgDBuser}@'%' IDENTIFIED BY '{$wgDBpassword}';
+ TO '{$wgDBuser}'@'%' IDENTIFIED BY '{$wgDBpassword}';
 GRANT DELETE,INSERT,SELECT,UPDATE ON `{$wgDBname}`.*
- TO {$wgDBuser}@localhost IDENTIFIED BY '{$wgDBpassword}';
+ TO '{$wgDBuser}'@localhost IDENTIFIED BY '{$wgDBpassword}';
 GRANT DELETE,INSERT,SELECT,UPDATE ON `{$wgDBname}`.*
- TO {$wgDBuser}@localhost.localdomain IDENTIFIED BY '{$wgDBpassword}';
+ TO '{$wgDBuser}'@localhost.localdomain IDENTIFIED BY '{$wgDBpassword}';
-- 
cgit v1.2.3


From 54ded1126fba00e3082115299f3f69c3d8c1dcb1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 20:08:58 +0000
Subject: Committing live hacks: profiling

---
 includes/Image.php     | 17 ++++++++++++++---
 includes/Profiling.php | 10 ++++++----
 thumb.php              |  3 +++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/includes/Image.php b/includes/Image.php
index 1314b4a028bb..5f33d6ca30d8 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -915,6 +915,9 @@ class Image
 	function renderThumb( $width, $useScript = true ) {
 		global $wgUseSquid, $wgInternalServer;
 		global $wgThumbnailScriptPath, $wgSharedThumbnailScriptPath;
+
+		$fname = 'Image::renderThumb';
+		wfProfileIn( $fname );
 		
 		$width = IntVal( $width );
 
@@ -922,18 +925,22 @@ class Image
 		if ( ! $this->exists() )
 		{
 			# If there is no image, there will be no thumbnail
+			wfProfileOut( $fname );
 			return null;
 		}
 		
 		# Sanity check $width
 		if( $width <= 0 || $this->width <= 0) {
 			# BZZZT
+			wfProfileOut( $fname );
 			return null;
 		}
 
 		if( $width >= $this->width && !$this->mustRender() ) {
 			# Don't make an image bigger than the source
-			return new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() );
+			$thumb = new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() );
+			wfProfileOut( $fname );
+			return $thumb;
 		}
 		
 		$height = floor( $this->height * ( $width/$this->width ) );
@@ -941,7 +948,9 @@ class Image
 		list( $isScriptUrl, $url ) = $this->thumbUrl( $width );
 		if ( $isScriptUrl && $useScript ) {
 			// Use thumb.php to render the image
-			return new ThumbnailImage( $url, $width, $height );
+			$thumb = new ThumbnailImage( $url, $width, $height );
+			wfProfileOut( $fname );
+			return $thumb;
 		}
 
 		$thumbName = $this->thumbName( $width, $this->fromSharedDirectory );
@@ -976,7 +985,9 @@ class Image
 			}
 		}
 		
-		return new ThumbnailImage( $url, $width, $height, $thumbPath );
+		$thumb = new ThumbnailImage( $url, $width, $height, $thumbPath );
+		wfProfileOut( $fname );
+		return $thumb;
 	} // END OF function renderThumb
 
 	/**
diff --git a/includes/Profiling.php b/includes/Profiling.php
index 770f39fedd3b..2fe5adab3b75 100755
--- a/includes/Profiling.php
+++ b/includes/Profiling.php
@@ -245,10 +245,12 @@ class Profiler {
 			$subcalls = $this->calltreeCount($this->mStack, $index);
 
 			if (!preg_match('/^-overhead/', $fname)) {
-				# Adjust for profiling overhead
-				$elapsed -= $overheadInternal;
-				$elapsed -= ($subcalls * $overheadTotal);
-				$memory -= ($subcalls * $overheadMemory);
+				# Adjust for profiling overhead (except special values with elapsed=0
+				if ( $elapsed ) {
+					$elapsed -= $overheadInternal;
+					$elapsed -= ($subcalls * $overheadTotal);
+					$memory -= ($subcalls * $overheadMemory);
+				}
 			}
 
 			if (!array_key_exists($fname, $this->mCollated)) {
diff --git a/thumb.php b/thumb.php
index ff84d89468a0..0183c3fea16d 100644
--- a/thumb.php
+++ b/thumb.php
@@ -51,6 +51,7 @@ if ( file_exists( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePa
 
 // OK, no valid thumbnail, time to get out the heavy machinery
 require_once( 'Setup.php' );
+wfProfileIn( 'thumb.php' );
 
 $img = Image::newFromName( $fileName );
 if ( $img ) {
@@ -72,5 +73,7 @@ if ( $thumb && $thumb->path ) {
 </body></html>";
 }
 
+wfProfileOut( 'thumb.php' );
+
 
 ?>
-- 
cgit v1.2.3


From 1dfb448aa46ae8b08efd922598abce3809ffb1a7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 20:09:26 +0000
Subject: Committing live hack: engage memcached client debug mode in mcc

---
 maintenance/mcc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance/mcc.php b/maintenance/mcc.php
index 73b03a139880..a32fd6f790d9 100755
--- a/maintenance/mcc.php
+++ b/maintenance/mcc.php
@@ -11,7 +11,7 @@
 require_once( "commandLine.inc" );
 require_once("memcached-client.php");
 
-$mcc = new memcached( array('persistant' => true) );
+$mcc = new memcached( array('persistant' => true, 'debug' => true) );
 $mcc->set_servers( $wgMemCachedServers );
 $mcc->set_debug( true );
 
-- 
cgit v1.2.3


From 7b33296df220229f288557bafec151163d5eb148 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 17 Aug 2005 20:09:53 +0000
Subject: * Add ability to break off certain debug topics into additional log
 files;   use $wgDebugLogGroups to configure and wfDebugLog() to log.

---
 includes/DefaultSettings.php |  8 ++++++++
 includes/GlobalFunctions.php | 16 ++++++++++++++++
 includes/LoadBalancer.php    |  8 ++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0eab40282652..1b95381bd4f7 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -615,6 +615,14 @@ $wgReadOnly             = false;
 $wgLogQueries           = false;
 $wgDebugDumpSql         = false;
 
+/**
+ * Set to an array of log group keys to filenames.
+ * If set, wfDebugLog() output for that group will go to that file instead 
+ * of the regular $wgDebugLogFile. Useful for enabling selective logging
+ * in production.
+ */
+$wgDebugLogGroups       = array();
+
 /**
  * Whether to show "we're sorry, but there has been a database error" pages.
  * Displaying errors aids in debugging, but may display information useful
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index a11c2fbe9cc4..da8517aeae13 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -175,6 +175,22 @@ function wfDebug( $text, $logonly = false ) {
 	}
 }
 
+/**
+ * Send a line to a supplementary debug log file, if configured, or main debug log if not.
+ * $wgDebugLogGroups[$logGroup] should be set to a filename to send to a separate log.
+ * @param string $logGroup
+ * @param string $text
+ */
+function wfDebugLog( $logGroup, $text ) {
+	global $wgDebugLogGroups, $wgDBname;
+	if( $text{strlen( $text ) - 1} != "\n" ) $text .= "\n";
+	if( isset( $wgDebugLogGroups[$logGroup] ) ) {
+		@error_log( "$wgDBname: $text", 3, $wgDebugLogGroups[$logGroup] );
+	} else {
+		wfDebug( $text, true );
+	}
+}
+
 /**
  * Log for database errors
  * @param string $text Database error message.
diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index cff4f38bc5fa..c4c780576b4e 100644
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -140,7 +140,7 @@ class LoadBalancer {
 			return false;
 		}
 
-		#wfDebug( var_export( $loads, true ) );
+		#wfDebugLog( 'connect', var_export( $loads, true ) );
 
 		# Return a random representative of the remainder
 		return $this->pickRandom( $loads );
@@ -183,8 +183,9 @@ class LoadBalancer {
 							$i = $this->pickRandom( $loads );
 						}
 					}
+					$serverIndex = $i;
 					if ( $i !== false ) {
-						wfDebug( "Using reader #$i: {$this->mServers[$i]['host']}...\n" );
+						wfDebugLog( 'connect', "Using reader #$i: {$this->mServers[$i]['host']}...\n" );
 						$this->openConnection( $i );
 						
 						if ( !$this->isOpen( $i ) ) {
@@ -211,7 +212,10 @@ class LoadBalancer {
 					}
 					if ( $sleepTime ) {
 							$totalElapsed += $sleepTime;
+							$x = "{$this->mServers[$serverIndex]['host']} $sleepTime [$serverIndex]";
+							wfProfileIn( "$fname-sleep $x" );
 							usleep( $sleepTime );
+							wfProfileOut( "$fname-sleep $x" );
 					}
 				} while ( count( $loads ) && !$done && $totalElapsed / 1e6 < $wgDBClusterTimeout );
 
-- 
cgit v1.2.3


From d1beb34db1b93597aa03bec46b6161c010e664b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Thu, 18 Aug 2005 16:01:17 +0000
Subject: Language file cleanup backported

---
 languages/Language.php             |  32 +-
 languages/LanguageAf.php           | 143 ++-----
 languages/LanguageAr.php           |  82 ++--
 languages/LanguageAst.php          |  38 +-
 languages/LanguageBe.php           |  37 +-
 languages/LanguageBg.php           | 190 +--------
 languages/LanguageBn.php           |   3 +-
 languages/LanguageCa.php           | 186 ++-------
 languages/LanguageConverter.php    |  76 ++--
 languages/LanguageCs.php           | 330 +++++----------
 languages/LanguageCsb.php          |  28 +-
 languages/LanguageCy.php           | 299 ++++----------
 languages/LanguageDa.php           | 313 ++++++--------
 languages/LanguageDe.php           | 197 +--------
 languages/LanguageEl.php           |   6 +-
 languages/LanguageEo.php           | 131 +-----
 languages/LanguageEs.php           | 377 ++++++-----------
 languages/LanguageEt.php           | 368 +++++++++--------
 languages/LanguageFa.php           | 187 ++-------
 languages/LanguageFi.php           | 454 ++++++++++++---------
 languages/LanguageFo.php           |  89 +---
 languages/LanguageFr.php           | 805 ++++++++++++++-----------------------
 languages/LanguageFur.php          | 498 +++++++++++++++++++----
 languages/LanguageFy.php           | 273 ++++---------
 languages/LanguageGa.php           | 179 ++-------
 languages/LanguageGem_alsatian.php |   2 +-
 languages/LanguageHe.php           | 155 ++-----
 languages/LanguageHi.php           |  13 +-
 languages/LanguageHu.php           | 288 +++++--------
 languages/LanguageIa.php           | 155 ++-----
 languages/LanguageId.php           | 476 ++++++++--------------
 languages/LanguageIs.php           | 172 ++++----
 languages/LanguageIt.php           | 144 ++-----
 languages/LanguageJa.php           | 153 +------
 languages/LanguageKn.php           |   9 +-
 languages/LanguageKo.php           |  67 +--
 languages/LanguageKu.php           | 159 +++-----
 languages/LanguageLa.php           | 100 +----
 languages/LanguageLi.php           | 125 +-----
 languages/LanguageLt.php           | 249 +++++-------
 languages/LanguageMk.php           | 145 +------
 languages/LanguageMs.php           | 174 +-------
 languages/LanguageNds.php          | 394 +++++-------------
 languages/LanguageNl.php           | 166 ++------
 languages/LanguageNn.php           | 244 ++++++-----
 languages/LanguageNo.php           | 270 ++++---------
 languages/LanguageNv.php           | 158 +-------
 languages/LanguageOc.php           | 217 +++-------
 languages/LanguageOs.php           | 147 +++----
 languages/LanguagePa.php           |  85 ++--
 languages/LanguagePl.php           | 190 +++------
 languages/LanguagePt.php           | 253 ++++--------
 languages/LanguageRo.php           | 348 +++-------------
 languages/LanguageRu.php           | 443 +++++++++-----------
 languages/LanguageSc.php           | 148 ++-----
 languages/LanguageSk.php           | 214 ++++------
 languages/LanguageSl.php           | 165 ++------
 languages/LanguageSq.php           | 238 +++--------
 languages/LanguageSr.php           | 217 +++-------
 languages/LanguageSv.php           | 213 ++--------
 languages/LanguageTa.php           | 562 ++++++++++----------------
 languages/LanguageTh.php           | 109 +----
 languages/LanguageTlh.php          |  51 ++-
 languages/LanguageTr.php           |  66 +--
 languages/LanguageTt.php           | 193 +++------
 languages/LanguageUk.php           | 106 ++---
 languages/LanguageUtf8.php         |  14 +-
 languages/LanguageWa.php           | 222 ++--------
 languages/LanguageZh.php           |  14 +-
 languages/LanguageZh_cn.php        | 184 ++-------
 languages/LanguageZh_hk.php        |   2 +-
 languages/LanguageZh_sg.php        |   2 +-
 languages/LanguageZh_tw.php        | 164 +-------
 73 files changed, 4267 insertions(+), 9439 deletions(-)

diff --git a/languages/Language.php b/languages/Language.php
index 4d96d5921dc5..fa15263a42e6 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -22,11 +22,6 @@ if( defined( 'MEDIAWIKI' ) ) {
 # Language-specific text
 #--------------------------------------------------------------------------
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
 if($wgMetaNamespace === FALSE)
 	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
@@ -366,7 +361,6 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f
 'article'		=> 'Content page',
 'help'			=> 'Help',
 'helppage'		=> 'Help:Contents',
-'wikititlesuffix' => '{{SITENAME}}',
 'bugreports'	=> 'Bug reports',
 'bugreportspage' => 'Project:Bug_reports',
 'sitesupport'   => 'Donations',
@@ -411,7 +405,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f
 'info_short'	=> 'Information',
 'printableversion' => 'Printable version',
 'print' => 'Print',
-'edit' => 'Edit this page',
+'edit' => 'Edit',
 'editthispage'	=> 'Edit this page',
 'delete' => 'Delete',
 'deletethispage' => 'Delete this page',
@@ -589,7 +583,7 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'yourdomainname'       => 'Your domain',
 'externaldberror'      => 'There was either an external authentication database error or you are not allowed to update your external account.',
 'loginproblem'	=> '<b>There has been a problem with your login.</b><br />Try again!',
-'alreadyloggedin' => "<font color=red><b>User $1, you are already logged in!</b></font><br />\n",
+'alreadyloggedin' => "<strong>User $1, you are already logged in!</strong><br />\n",
 
 'login'			=> 'Log in',
 'loginprompt'           => "You must have cookies enabled to log in to {{SITENAME}}.",
@@ -710,7 +704,7 @@ If you are here by mistake, just click your browser's '''back''' button.",
 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
 'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical [[IP address]] to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.'' ",
 'noarticletext' => '(There is currently no text in this page)',
-'clearyourcache' => "'''Note:''' After saving, you have to clear your browser cache to see the changes: '''Mozilla:''' click ''Reload'' (or ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools&rarr;Preferences''.",
 'usercssjsyoucanpreview' => "<strong>Tip:</strong> Use the 'Show preview' button to test your new CSS/JS before saving.",
 'usercsspreview' => "'''Remember that you are only previewing your user CSS, it has not yet been saved!'''",
 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''",
@@ -2074,7 +2068,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'edit-externally' => 'Edit this file using an external application',
 'edit-externally-help' => 'See the [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] for more information.',
 
-# 'all' in various places, this might be different for inflicted languages
+# 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'all',
 'imagelistall' => 'all',
 'watchlistall1' => 'all',
@@ -2120,7 +2114,7 @@ will expire at $4.
 
 # Trackbacks
 'trackbackbox' => "<div id='mw_trackbacks'>
-Trackbacks for this article:<br/>
+Trackbacks for this article:<br />
 $1
 </div>
 ",
@@ -2131,6 +2125,7 @@ $1
 'trackbackdeleteok' => 'The trackback was successfully deleted.',
 
 'unit-pixel' => 'px',
+
 );
 
 /* a fake language converter */
@@ -2505,21 +2500,6 @@ class Language {
 		}
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesEn;
-		return $wgValidSpecialPagesEn;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesEn;
-		return $wgSysopSpecialPagesEn;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesEn;
-		return $wgDeveloperSpecialPagesEn;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesEn;
 		return @$wgAllMessagesEn[$key];
diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php
index c03384547e2e..3b434ada0fda 100644
--- a/languages/LanguageAf.php
+++ b/languages/LanguageAf.php
@@ -38,56 +38,6 @@ require_once( 'LanguageUtf8.php' );
 	'cologneblue' => "Keulen blou",
 ) + $wgSkinNamesEn;
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesAf = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Wysig my gebruikersvoorkeure.",
-	"Watchlist"		=> "My gunstelinge.",
-	"Recentchanges" => "Onlangs gewysig.",
-	"Upload"		=> "Laai prente.",
-	"Imagelist"		=> "Lys van prente.",
-	"Listusers"		=> "Geregistreerde gebruikers.",
-	"Statistics"	=> "Werf statistieke.",
-	"Randompage"	=> "Lukrake artikel.",
-
-	"Lonelypages"	=> "",
-	"Unusedimages"	=> "",
-	"Popularpages"	=> "",
-	"Wantedpages"	=> "Mees gevraagde artikels.",
-	"Shortpages"	=> "Kort artikels.",
-	"Longpages"		=> "Lang artikels.",
-	"Newpages"		=> "Nuwe artikels.",
-	"Ancientpages"	=> "Old articles",
-	"Allpages"		=> "Alle blaaie volgens titel.",
-
-	"Ipblocklist"	=> "Geblokkeerde IP-adresse.",
-	"Maintenance" => "Instandhoudingsbladsy.",
-	"Specialpages"  => "Spesiale bladsye.",
-	"Contributions" => "Bydraes.",
-	"Emailuser"		=> "E-pos gebruiker.",
-	"Whatlinkshere" => "Wat skakel hierheen?",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "Eksterne boekbronne.",
-	"Export"		=> "XML export",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesAf = array(
-	"Blockip"		=> "Blokkeer 'n IP-adres.",
-	"Asksql"		=> "SQL.",
-	"Undelete"		=> "Kyk na en herstel geskrapte bladsye."
-);
-
-/* private */ $wgDeveloperSpecialPagesAf = array(
-	"Lockdb"		=> "Laat toe dat die databasis slegs gelees word.",
-	"Unlockdb"		=> "Herstel databasis skryfregte.",
-);
-
 /* private */ $wgAllMessagesAf = array(
 # User Toggles
 
@@ -104,7 +54,7 @@ require_once( 'LanguageUtf8.php' );
 "tog-watchdefault" => "Lys nuwe en gewysigde bladsye.",
 "tog-minordefault" => "Merk alle wysigings automaties as klein by verstek.",
 "tog-previewontop" => "Wys voorskou bo wysigingsboks.",
-	
+
 # Dates
 'sunday' => 'Sondag',
 'monday' => 'Maandag',
@@ -148,7 +98,6 @@ require_once( 'LanguageUtf8.php' );
 "aboutpage"		=> "{{ns:4}}:Omtrent",
 "help"			=> "Help",
 "helppage"		=> "{{ns:4}}:Hulp",
-"wikititlesuffix" => "{{ns:4}}",
 "bugreports"	=> "Foutrapporte",
 "bugreportspage" => "{{ns:4}}:FoutRapporte",
 "faq"			=> "Gewilde vrae",
@@ -157,7 +106,7 @@ require_once( 'LanguageUtf8.php' );
 "edithelppage"	=> "{{ns:4}}:Hoe_word_'n_bladsy_gewysig",
 "cancel"		=> "Kanselleer",
 "qbfind"		=> "Vind",
-"qbbrowse"		=> "Snuffel", 
+"qbbrowse"		=> "Snuffel",
 "qbedit"		=> "Wysig",
 "qbpageoptions" => "Bladsy opsies",
 "qbpageinfo"	=> "Bladsy inligting",
@@ -190,7 +139,6 @@ require_once( 'LanguageUtf8.php' );
 "redirectedfrom" => "(Van $1 aangestuur.)",
 "lastmodified"	=> "Laaste wysiging op $1.",
 "viewcount"		=> "Hierdie bladsy is al $1 keer aangevra.",
-"gnunote" => "Alle teks is beskikbaar onder die terme van die <a class=internal href='http://en.wikipedia.org/wiki/GNU_FDL'>GNU gratis dokumentasielisensie</a>.",
 "printsubtitle" => "(Van {{SERVER}})",
 "protectedpage" => "Beskermde bladsy",
 "administrators" => "{{ns:4}}:Administreerders",
@@ -207,11 +155,11 @@ require_once( 'LanguageUtf8.php' );
 "sitesubtitle"	=> "Die gratis ensiklopedie", #fixme
 "retrievedfrom" => "Ontsluit van \"$1\"",
 "newmessages" => "Jy het $1.",
-"newmessageslink" => "nuwe boodskappe", 
+"newmessageslink" => "nuwe boodskappe",
 
 # Main script and global functions
 #
-"nosuchaction"	=> "Ongeldige aksie", 
+"nosuchaction"	=> "Ongeldige aksie",
 "nosuchactiontext" => "Onbekende aksie deur die adres gespesifeer",
 "nosuchspecialpage" => "Ongeldige spesiale bladsy",
 "nospecialpagetext" => "Ongeldige spesiale bladsy gespesifeer.",
@@ -228,7 +176,7 @@ MySQL foutboodskap \"<tt>$3: $4</tt>\".",
 "noconnect"		=> "Kon nie met databasis op $1 konnekteer nie",
 "nodb"			=> "Kon nie databasis $1 selekteer nie",
 "readonly"		=> "Databasis gesluit",
-"enterlockreason" => "Rede vir die sluiting, 
+"enterlockreason" => "Rede vir die sluiting,
 en beraming van wanneer ontsluiting sal plaas vind",
 "readonlytext"	=> "Die {{SITENAME}} databasis is tans gesluit vir nuwe
 artikelwysigings, waarskynlik vir roetine databasisonderhoud,
@@ -244,11 +192,11 @@ Raporteer die adres asseblief aan enige administrateur.",
 "filedeleteerror" => "Kon nie lêer \"$1\" skrap nie.",
 "filenotfound"	=> "Kon nie lêer \"$1\" vind nie.",
 "unexpected"	=> "Onverwagte waarde: \"$1\"=\"$2\".",
-"formerror"		=> "Fout: kon vorm nie stuur nie", 
+"formerror"		=> "Fout: kon vorm nie stuur nie",
 "badarticleerror" => "Die aksie kon nie op hierdie bladsy uitgevoer word nie.",
 "cannotdelete"	=> "Kon nie die bladsy of prent skrap nie, iemand anders het dit miskien reeds geskrap.",
 "badtitle"		=> "Ongeldige titel",
-"badtitletext"	=> "Die bladsytitel waarvoor gevra is, is ongeldig, leeg, of 
+"badtitletext"	=> "Die bladsytitel waarvoor gevra is, is ongeldig, leeg, of
 'n verkeerd geskakelde tussen-taal of tussen-wiki titel.",
 "perfdisabled" => "Hierdie funksie is afgeskakel tydens spitstoegangsure vir verrigtingsredes, probeer weer tussen 02:00z en 14:00z (Universeel Gekoördineerde Tyd - UGT).",
 
@@ -258,7 +206,7 @@ Raporteer die adres asseblief aan enige administrateur.",
 "logouttext"	=> "Jy is nou uitgeteken, en kan aanhou om
 {{SITENAME}} anoniem te gebruik; of jy kan inteken as dieselfde of 'n ander gebruiker.\n",
 
-"welcomecreation" => "<h2>Welkom, $1.</h2><p>Jou rekening is geskep; 
+"welcomecreation" => "<h2>Welkom, $1.</h2><p>Jou rekening is geskep;
 moenie vergeet om jou persoonlike voorkeure te stel nie.",
 
 "loginpagetitle" => "Teken in",
@@ -268,12 +216,7 @@ moenie vergeet om jou persoonlike voorkeure te stel nie.",
 "newusersonly"	=> " (slegs nuwe gebruikers)",
 "remembermypassword" => "Onthou my wagwoord oor sessies.",
 "loginproblem"	=> "<b>Daar was probleme met jou intekening.</b><br />Probeer weer.",
-"alreadyloggedin" => "<font color=red><b>Gebruiker $1, jy is reeds ingeteken.</b></font><br />\n",
-
-"areyounew"		=> "Indien jy nuut is by {{SITENAME}}, en ingeteken,
-voer jou gebruikersnaam en wagwoord in.
-Jou e-pos is opsioneel; indien jy jou wagwoord vergeet, kan jy vra dat dit na
-die e-pos adres gestuur word.<br />\n",
+"alreadyloggedin" => "<strong>Gebruiker $1, jy is reeds ingeteken.</strong><br />\n",
 
 "login"			=> "Teken in",
 "userlogin"		=> "Teken in",
@@ -295,7 +238,7 @@ Maak seker dit is reg gespel, of gebruik die vorm hier onder om 'n nuwe rekening
 "mailmypassword" => "Stuur my wagwword na my e-pos adres.",
 "passwordremindertitle" => "Wagwoordwenk van {{SITENAME}}",
 "passwordremindertext" => "Iemand (waarskynlik jy, van IP-adres $1)
-het gevra dat ons vir jou 'n nuwe {{SITENAME}} wagwoord stuur. 
+het gevra dat ons vir jou 'n nuwe {{SITENAME}} wagwoord stuur.
 Die wagwoord vir gebruiker \"$2\" is nou \"$3\".
 Teken asseblief in en verander jou wagwoord.",
 "noemail"		=> "Daar is geen e-pos adres vir gebruiker \"$1\" nie.",
@@ -304,30 +247,30 @@ Teken asseblief in na jy dit ontvang het.",
 
 # Edit pages
 #
-"summary"		=> "Opsomming", 
-"minoredit"		=> "Klein wysiging", 
+"summary"		=> "Opsomming",
+"minoredit"		=> "Klein wysiging",
 "watchthis"		=> "Hou bladsy dop",
 "savearticle"	=> "Stoor bladsy",
 "preview"		=> "Voorskou",
 "showpreview"	=> "Wys voorskou",
 "blockedtitle"	=> "Gebruiker is geblokkeer",
 "blockedtext"	=> "Jou gebruikersnaam of IP-adres is deur $1 geblokkeer:
-<br />''$2''<p>Jy mag $1 of een van die ander [[{{ns:4}}:administreerders|administreerders]] kontak 
+<br />''$2''<p>Jy mag $1 of een van die ander [[{{ns:4}}:administreerders|administreerders]] kontak
 om dit te bespreek.",
-"newarticle"	=> "(Nuut)", 
-"newarticletext" => 
+"newarticle"	=> "(Nuut)",
+"newarticletext" =>
 "Die bladsy waarna geskakel is, bestaan nie.
-Om 'n nuwe bladsy te skep, tik in die invoerboks hier onder. Lees die [[{{ns:4}}:Help|hulp bladsy]] 
+Om 'n nuwe bladsy te skep, tik in die invoerboks hier onder. Lees die [[{{ns:4}}:Help|hulp bladsy]]
 vir meer inligting.
 Indien jy per ongeluk hier is, gebruik jou blaaier se '''terug''' knop.",
-"anontalkpagetext" => "---- ''Dit is die besprekingsbladsy vir 'n anonieme gebruiker wat nie 'n rekening geskep het nie. Ons moet dus hul [[IP-adres]] gebruik om hulle te identifiseer. So 'n IP-adres kan deur verskeie gebruikers gedeel word. Indien jy 'n anonieme gebruiker is wat voel dat oneerbiedige komentaar aan jou gerig is, [[Special:Userlogin|skep 'n rekening of teken in]] om verwarring te voorkom met ander anonieme gebruikers.'' ", 
+"anontalkpagetext" => "---- ''Dit is die besprekingsbladsy vir 'n anonieme gebruiker wat nie 'n rekening geskep het nie. Ons moet dus hul [[IP-adres]] gebruik om hulle te identifiseer. So 'n IP-adres kan deur verskeie gebruikers gedeel word. Indien jy 'n anonieme gebruiker is wat voel dat oneerbiedige komentaar aan jou gerig is, [[Special:Userlogin|skep 'n rekening of teken in]] om verwarring te voorkom met ander anonieme gebruikers.'' ",
 "noarticletext" => "(Daar is tans geen inligting vir hierdie artikel nie.)",
 "updated"		=> "(Gewysig)",
 "note"			=> "<strong>Nota:</strong> ",
 "previewnote"	=> "Onthou dat dit slegs 'n voorskou is en nog nie gestoor is nie!",
 "previewconflict" => "Hierdie voorskou reflekteer die teks in die boonste invoerboks soos dit sal lyk as jy dit stoor.",
 "editing"		=> "Besig om $1 te wysig",
-"editconflict"	=> "Wysigingskonflik: $1", 
+"editconflict"	=> "Wysigingskonflik: $1",
 "explainconflict" => "Iemand anders het hierdie bladsy gewysig sedert jy dit begin verander het.
 Die boonste invoerboks het die teks wat tans bestaan.
 Jou wysigings word in die onderste invoerboks gewys.
@@ -338,7 +281,7 @@ Jy sal jou wysigings moet saamsmelt met die huidige teks.
 "editingold"	=> "<strong>Waarskuwing: jy is besig om 'n ou weergawe van hierdie bladsy te wysig.
 As jy dit stoor, sal enige wysigings sedert hierdie wysiging verloor word.</strong>",
 "yourdiff"		=> "Wysigings",
-"copyrightwarning" => "Alle bydraes aan {{SITENAME}} word beskou as beskikbaar gestel onder 
+"copyrightwarning" => "Alle bydraes aan {{SITENAME}} word beskou as beskikbaar gestel onder
 die ''GNU Free Documentation License'' (lees $1 vir meer inligting).
 As jy nie wil hê dat jou werk ongemagtig gewysig of versprei mag word nie, moet jy dit nie hier indien nie.<br />
 Jy belowe ons ook dat jy dit self geskryf het, of verkry het van 'n bron wat toelaat dat dit hier mag wees.<br />
@@ -351,7 +294,7 @@ kan probleme hê met die wysiging va blaaie langer as 32 kilogrepe. Breek assebl
 "revhistory"	=> "Wysigingsgeskiedenis",
 "nohistory"		=> "Daar is geen wysigingsgeskiedenis vir hierdie bladsy nie.",
 "revnotfound"	=> "Wysiging nie gevind nie.",
-"revnotfoundtext" => "Die ou wysiging waarvoor jy gevra het, kon nie gevind word nie. Maak asseblief seker dat die adres wat jy gebruik 
+"revnotfoundtext" => "Die ou wysiging waarvoor jy gevra het, kon nie gevind word nie. Maak asseblief seker dat die adres wat jy gebruik
 het om toegang te kry tot hierdie bladsy, reg is.\n",
 "loadhist"		=> "Besig om bladsy wysigingsgeskiedenis te laai.",
 "currentrev"	=> "Huidige wysiging",
@@ -389,7 +332,7 @@ en teks in $3 artikels.",
 "nextn"			=> "volgende $1",
 "viewprevnext"	=> "Kyk na ($1) ($2) ($3).",
 "showingresults" => "Onder <b>$1</b> resultate, beginende met #<b>$2</b>.",
-"nonefound"		=> "<strong>Nota</strong>: onsuksesvolle navrae word gewoonlik veroorsaak deur 'n soektog met algemene 
+"nonefound"		=> "<strong>Nota</strong>: onsuksesvolle navrae word gewoonlik veroorsaak deur 'n soektog met algemene
 woorde wat nie geindekseer word nie, of spesifisering van meer as een woord (slegs blaaie wat alle navraagwoorde
 bevat, word gewys).",
 "powersearch" => "Soek",
@@ -424,12 +367,12 @@ Jou internet ID-nommer is $2.",
 "retypenew"		=> "Tik nuwe wagwoord weer in",
 "textboxsize"	=> "Grootte van invoerboks",
 "rows"			=> "Rye",
-"columns"		=> "Kolomme", 
+"columns"		=> "Kolomme",
 "searchresultshead" => "Soekresultaat voorkeure",
 "resultsperpage" => "Aantal resultate om te wys",
 "contextlines"	=> "Aantal lyne per resultaat",
 "contextchars"	=> "Karakters konteks per lyn",
-"stubthreshold" => "Drempel vir verkorte artikels", 
+"stubthreshold" => "Drempel vir verkorte artikels",
 "recentchangescount" => "Aantal titels in onlangse wysigings",
 "savedprefs"	=> "Jou voorkeure is gestoor.",
 "timezonetext"	=> "Aantal ure wat plaaslike tyd verskil van UGT.",
@@ -441,7 +384,7 @@ Jou internet ID-nommer is $2.",
 #
 "changes" => "wysigings",
 "recentchanges" => "Onlangse wysigings",
-"recentchangestext" => "Volg wysigings wat onlangs verander het, op 
+"recentchangestext" => "Volg wysigings wat onlangs verander het, op
 [[{{ns:4}}:Welkom nuwelinge|Welkom nuwelinge]]!
 Kyk asb. ook na hierdie bladsye: [[{{ns:4}}:FAQ|{{ns:4}} FAQ]],
 [[{{ns:4}}:beleid|beleid]]
@@ -449,7 +392,7 @@ Kyk asb. ook na hierdie bladsye: [[{{ns:4}}:FAQ|{{ns:4}} FAQ]],
 [[{{ns:4}}:neutrale standpunt|neutrale standpunt]]),
 en [[{{ns:4}}:mees algemene Wikipedia foute|mees algemene Wikipedia foute]].
 
-As jy wil hê dat Wikipedia suksesvol moet wees, is dit belangrik dat jy nie 
+As jy wil hê dat Wikipedia suksesvol moet wees, is dit belangrik dat jy nie
 materiaal byvoeg wat deur [[{{ns:4}}:kopiereg|kopiereg]] beperk word nie.
 Die wetlike onderhewigheid kan die projek skade aandoen.", #fixMeContinue
 "rcloaderr"		=> "Laai onlangse wysigings",
@@ -511,11 +454,9 @@ Alle tye is bedienertyd (UGT).
 ",
 "filename"		=> "Lêernaam",
 "filedesc"		=> "Opsomming",
-"affirmation"	=> "Ek bevestig dat die kopiereghouer van hierdie lêer toestem om dit te lisensieer volgens die terme van die $1.",
 "copyrightpage" => "{{ns:4}}:kopiereg",
 "copyrightpagename" => "{{ns:4}} kopiereg",
 "uploadedfiles"	=> "Gelaaide lêers",
-"noaffirmation" => "Jy moet bevestig dat die laai van jou lêer geen kopieregte skend nie.",
 "ignorewarning"	=> "Ignoreer waarskuwing en stoor lêer.",
 "minlength"		=> "Prentname moet ten minste drie letters lank wees.",
 "badfilename"	=> "Prentnaam is verander na \"$1\".",
@@ -726,7 +667,6 @@ Vul 'n spesifieke rede hier onder in (haal byvoorbeeld spesifieke bladsye wat ge
 "ipbreason"		=> "Rede",
 "ipbsubmit"		=> "Blok hierdie adres",
 "badipaddress"	=> "Die IP-adres is nie in die regte formaat nie.",
-"noblockreason" => "Jy moet 'n rede vir die blokkering gee.",
 "blockipsuccesssub" => "Blokkering het geslaag",
 "blockipsuccesstext" => "Die IP-adres \"$1\" is geblok.
 <br />Kyk na [[Special:Ipblocklist|IP block list]] vir 'n oorsig van blokkerings.",
@@ -759,23 +699,12 @@ Bevestig asseblief dat dit is wat jy wil doen.",
 <br />Onthou om dit te ontsluit wanneer jou onderhoud afgehandel is.",
 "unlockdbsuccesstext" => "Die {{SITENAME}} databasis is ontsluit.",
 
-# SQL query
-#
-"asksql"		=> "SQL navraag",
-"asksqltext"	=> "Gebruik die vorm hier onder om 'n navraag direk op die {{SITENAME}} databasis te doen.
-Gebruik enkel aanhaligstekens ('soos hier') om karkaterkonstantes te begrens.
-Dit kan dikwels 'n groot lading op die bediener plaas, so gebruik hierdie funksie asseblief so min as moontlik.",
-"sqlquery"		=> "Tik navraag in",
-"querybtn"		=> "Stuur navraag",
-"selectonly"	=> "Net {{SITENAME}} prgrammeerders mag navrae doen wat SQL-sleutelwoorde anders as \"SELECT\" bevat.",
-"querysuccessful" => "Navraag suksesvol",
-
 # Move page
 #
 "movepage"		=> "Skuif bladsy",
 "movepagetext"	=> "Met die vorm hier onder kan jy 'n bladsy hernoem en so al sy geskiedenis na die nuwe naam skuif.
 Die ou titel sal 'n aanstuurbladsy na die nuwe titel word.
-Skakels na die ou bladsytitel sal nie verander nie; maak seker dat jy 
+Skakels na die ou bladsytitel sal nie verander nie; maak seker dat jy
 check vir dubbele of gebrekte aansture.
 Dis jou verantwoordelikheid om seker te maak dat skakels steeds wys waarheen hulle moet.
 
@@ -833,24 +762,6 @@ class LanguageAf extends LanguageUtf8 {
 		return $wgSkinNamesAf;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesAf;
-		return $wgValidSpecialPagesAf;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesAf;
-		return $wgSysopSpecialPagesAf;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesAf;
-		return $wgDeveloperSpecialPagesAf;
-	}
-
 	function getMessage( $key )
 	{
 		global $wgAllMessagesAf;
@@ -865,7 +776,7 @@ class LanguageAf extends LanguageUtf8 {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, '.,', ',.' ) : $number;
 	}
-							
+
 }
 
 ?>
diff --git a/languages/LanguageAr.php b/languages/LanguageAr.php
index f2d495b39c39..8374987bd90b 100644
--- a/languages/LanguageAr.php
+++ b/languages/LanguageAr.php
@@ -9,24 +9,24 @@
 require_once('LanguageUtf8.php');
 
 /* private */ $wgNamespaceNamesAr = array(
-        NS_MEDIA            => 'ملف',
-        NS_SPECIAL          => 'خاص',
-        NS_MAIN             => '',
-        NS_TALK             => 'نقاش',
-        NS_USER             => 'مستخدم',
-        NS_USER_TALK        => 'نقاش_المستخدم',
-        NS_PROJECT          => 'ويكيبيديا',
-        NS_PROJECT_TALK     => 'نقاش_ويكيبيديا',
-        NS_IMAGE            => 'صورة',
-        NS_IMAGE_TALK       => 'نقاش_الصورة',
-        NS_MEDIAWIKI        => 'ميدياويكي',
-        NS_MEDIAWIKI_TALK   => 'نقاش_ميدياويكي',
-        NS_TEMPLATE         => 'Template',
-        NS_TEMPLATE_TALK    => 'نقاش_Template',
-        NS_HELP             => 'مساعدة',
-        NS_HELP_TALK        => 'نقاش_المساعدة',
-        NS_CATEGORY         => 'تصنيف',
-        NS_CATEGORY_TALK    => 'نقاش_التصنيف'
+	NS_MEDIA            => 'ملف',
+	NS_SPECIAL          => 'خاص',
+	NS_MAIN             => '',
+	NS_TALK             => 'نقاش',
+	NS_USER             => 'مستخدم',
+	NS_USER_TALK        => 'نقاش_المستخدم',
+	NS_PROJECT          => 'ويكيبيديا',
+	NS_PROJECT_TALK     => 'نقاش_ويكيبيديا',
+	NS_IMAGE            => 'صورة',
+	NS_IMAGE_TALK       => 'نقاش_الصورة',
+	NS_MEDIAWIKI        => 'ميدياويكي',
+	NS_MEDIAWIKI_TALK   => 'نقاش_ميدياويكي',
+	NS_TEMPLATE         => 'Template',
+	NS_TEMPLATE_TALK    => 'نقاش_Template',
+	NS_HELP             => 'مساعدة',
+	NS_HELP_TALK        => 'نقاش_المساعدة',
+	NS_CATEGORY         => 'تصنيف',
+	NS_CATEGORY_TALK    => 'نقاش_التصنيف'
 ) + $wgNamespaceNamesEn;
 
 
@@ -84,21 +84,20 @@ require_once('LanguageUtf8.php');
 <p>
 إذا كنت تريد إزالة الصفحة من قائمة المراقبة لديك، إضغط على "توقف عن مراقبة الصفحة" في اللوحة أسفل الصفحة.',
 'administrators' => 'ويكيبيديا:إداريين',
-'affirmation' => 'اؤكد أن حامل الحقوق لهذا الملف موافق على أن يوضع ملفه تحت ترخيص $1.',
 'allmessages' => 'كافة رسائل النظام',
 'allpages' => 'كل الصفحات',
 'allpagessubmit' => 'اذهب',
 'alphaindexline' => '$1 إلى $2',
-'alreadyloggedin' => '<font color=red><b>المستخدم $1, انت مسجل للدخول من قبل!</b></font><br>',
+'alreadyloggedin' => '<strong>المستخدم $1, انت مسجل للدخول من قبل!</strong><br />',
 'ancientpages' => 'المقالات القديمة',
 'anontalkpagetext' => '----
 هذه صفحة نقاش لمستخدم مجهول، وهو المستخدم الذي لم يقم بإنشاء حساب في ويكيبيديا، أو لا يستعمل ذلك الحساب.
 لذا يتم إستعمال رقم ال IP للتعريف به. من الممكن أن يشترك عدد من المستخدمين بنفس رقم ال IP. إذا كنت مستخدم مجهول
-وترى أن رسائل خير موجهة لك قد وصلتك، من الممكن أن تقوم [[Special:Userlogin|بإنشاء حساب أو القيام بالدخول]] 
+وترى أن رسائل خير موجهة لك قد وصلتك، من الممكن أن تقوم [[Special:Userlogin|بإنشاء حساب أو القيام بالدخول]]
 حتى يزول الخلط بينك وبين المستخدمين المجهولين الآخرين.',
 'anonymous' => 'مستخدم مجهول لويكيبيديا',
 'article' => 'مقالة',
-'articleexists' => 'يوجد صفحة بهذا الإسم، 
+'articleexists' => 'يوجد صفحة بهذا الإسم،
 أو أن الإسم الذي تم إختياره غير صالح.
 يرجى إختيار إسم آخر.',
 'articlepage' => 'عرض المقالة',
@@ -109,7 +108,7 @@ require_once('LanguageUtf8.php');
 'badtitle' => 'عنوان خاطئ',
 'blanknamespace' => 'مقالات',
 'blockedtext' => 'إسم المستخدم أو عنوان ال IP الخاص بك تم منعه من قبل $1.
-سبب المنع هو: <br>\'\'$2\'\' <p>
+سبب المنع هو: <br />\'\'$2\'\' <p>
 من الممكن الإتصال مع $1 للنقاش حول المنع، أو من الممكن الإتصال مع أحد [[Wikipedia:Administrators|الإداريين]] حول ذلك.
 
 تذكر أنه لا يمكن لك إستعمال خاصية إرسال رسائل إلكترونية للمستخدمين إلا إذا كنت قد وضعت عنوان بريدي صحيح في صفحة [[Special:Preferences|التفضيلات]] الخاصة بك.
@@ -151,11 +150,11 @@ require_once('LanguageUtf8.php');
 'copyright' => 'المحتويات تحت  $1.',
 'copyrightpage' => 'ويكيبيديا:حقوق النسخ',
 'copyrightpagename' => 'حقوق النسخ في ويكيبيديا',
-'copyrightwarning' => 'يرجى الملاحظة أن جميع المساهمات هنا خاضعة وصادرة تحت ترخيص 
+'copyrightwarning' => 'يرجى الملاحظة أن جميع المساهمات هنا خاضعة وصادرة تحت ترخيص
 جنو للوثائق الحرة (أنظر في $1 للمزيد من التفاصيل)
 إذا لم ترد أن تخضع كتابتك للتعديل والتوزيع الحر، لا تضعها هنا.
-<br>
-كما أنك تتعهد بأنك قمت بكتابة ما هو موجود بنفسك، أو قمت بنسخها 
+<br />
+كما أنك تتعهد بأنك قمت بكتابة ما هو موجود بنفسك، أو قمت بنسخها
 من مصدر يخضع ضمن الملكية العامة، أو مصدر حر آخر.
 <strong>لا ترسل أي عمل ذو حقوق محفوظة بدون الإذن من صاحب الحق</strong>.',
 'createaccount' => 'إنشاء حساب جديد',
@@ -194,9 +193,9 @@ require_once('LanguageUtf8.php');
 'emailfrom' => 'من',
 'emailmessage' => 'نص الرسالة',
 'emailpage' => 'أرسل رسالة للمستخدم',
-'emailpagetext' => 'لو أن هذا المستخدم قد قام بإدخال عنوان بريدي صحيح في تفضيلاته، 
+'emailpagetext' => 'لو أن هذا المستخدم قد قام بإدخال عنوان بريدي صحيح في تفضيلاته،
 فسيتم إرسال رسالة واحدة له بالنموذج أدناه.
-العنوان الذي قمت أنت بإدخاله لك في تفضيلات المستخدم، 
+العنوان الذي قمت أنت بإدخاله لك في تفضيلات المستخدم،
 سيظهر في مكان المرسل في الرسالة التي سترسل له، ليتمكن من الرد عليك.',
 'emailsend' => 'إرسال',
 'emailsent' => 'تم إرسال الرسالة',
@@ -225,13 +224,6 @@ require_once('LanguageUtf8.php');
 'filerenameerror' => 'لا يمكن غيير إسم الملف من  "$1" إلى "$2".',
 'filesource' => 'مصدر',
 'go' => 'إذهب',
-'googlesearch' => '<p>
- <table border="0" bgcolor="#FFFFFF">
- <!-- SiteSearch Google -->
- <tr><td valign="top" align="center"> <a href="http://www.google.com/">
-<img src="http://www.google.com/logos/Logo_40wht.gif" border="0" alt="Google" title="Google"></a> </td>
-<td width="100%"> <form method=get action="http://www.google.com/search"> <input type="text" name="q" size=31 maxlength=255 value="$1"> <input type="submit" name="btnG" value="بحث في جووجل"> <input type="hidden" name="domains" value="http://ar.wikipedia.org"> <input type="hidden" name="ie" value="$2"> <input type="hidden" name="oe" value="$2"> <br> <font size=-1> <input type="radio" name="sitesearch" value="">إنترنت<input type="radio" name="sitesearch" value="http://en.wikipedia.org" checked>ويكيبيديا العربية</font> </form> </td></tr><!-- SiteSearch Google --> <!-- Spacing --> <tr><td colspan=2>&nbsp;</td></tr> <!-- Spacing --> <!-- Yahoo search --> <tr><td valign="top" align="center"> <a href="http://search.yahoo.com/"> <img src="http://us.i1.yimg.com/us.yimg.com/i/us/search/ysan/ysanlogo.gif" border="0" alt="Yahoo!"vspace="5"> </a> </td> <td width="100%"> <form method=get action="http://search.yahoo.com/search"> <input type="hidden" name="x" value="op"> <input type="hidden" name="va_vt" value="any"> <input type="text" name="va" size="31" value="$1"> <input type="submit" value="بحث في ياهوو!"> <br> <font size=-1> <input type="radio" name="vs" value="">إنترنت<input type="radio" name="vs" value="ar.wikipedia.org" checked>الموسوعة العربية</font> </form> </td> </table>
-من الممكن تتبع الوصلة التالية لإنشاء موضوع بهذا العنوان، في حال عدم وجود الموضوع. أو تحريره في حال وجود الموضوع:  <a href="/w/wiki.phtml?title=$1&action=edit">$1</a>',
 'headline_sample' => 'نص عنوان رئيسي',
 'headline_tip' => 'عنوان من المستوى الثاني',
 'help' => 'مساعدة',
@@ -271,7 +263,7 @@ require_once('LanguageUtf8.php');
 'login' => 'دخول',
 'loginerror' => 'خطأ في الدخول',
 'loginpagetitle' => 'تسجيل الدخول للمستخدم',
-'loginproblem' => '<b>حدثت مشكلة أثناء الدخول.</b><br>يرجى المحاولة مرى أخرى!',
+'loginproblem' => '<b>حدثت مشكلة أثناء الدخول.</b><br />يرجى المحاولة مرى أخرى!',
 'loginprompt' => 'يجب أن يدعم متصفحك الكوكيز Cookies لتتمكن من الدخول.',
 'loginsuccess' => 'لقد قمت بتسجيل الدخول لويكيبيديا بإسم "$1".',
 'loginsuccesstitle' => 'تم الدخول بشكل صحيح',
@@ -308,11 +300,11 @@ require_once('LanguageUtf8.php');
 * قمت بإزالة إختيار نقل صفحة النقاش في الأسفل.
 
 وفي الحالات أعلاه، يجب عليك نقل أو دمج محتويات صفحة النقاش يدويا، إذا رغب في ذلك.',
-'movepagetext' => 'بإستعمال النموذج أدنه، تستطيع تغيير أسم الصفحة، 
+'movepagetext' => 'بإستعمال النموذج أدنه، تستطيع تغيير أسم الصفحة،
 ونقل تاريخ الصفحة للإسم الجديد.
 سيتم أنشاء تحويل من العنوان القديم، للصفحة بالعنوان الجديد.
 لكن، لن يتم تغيير الوصلات في الصفحات التي تتصل بهذه الصفحة، لذا عليك
-[[Special:Maintenance|التأكد]] من عدم وجود وصلات مقطوعة، أو وصلات متتالية، 
+[[Special:Maintenance|التأكد]] من عدم وجود وصلات مقطوعة، أو وصلات متتالية،
 للتأكد من أن المقالات تتصل مع بعضها بشكل مناسب.
 
 يرجى الملاحظة انه \'\'\'لن يتم\'\'\' نقل الصفحة إذا وجدت صفحة بالإسم الجديد،
@@ -320,7 +312,7 @@ require_once('LanguageUtf8.php');
 وضع صفحة مكان صفحة، كما أنه من الممكن إرجاع الصفحة لمكانها في حال تم النقل بشكل خاطئ.
 
 <b>تحذير!</b>
-قد يكون لنقل الصفحة آثار كبيرة، وتغييرا غير متوقع بالنسبة للصفحات المشهورة. 
+قد يكون لنقل الصفحة آثار كبيرة، وتغييرا غير متوقع بالنسبة للصفحات المشهورة.
 يرجى فهم وإدارك عواقب نقل الصفحات قبل القيام به.',
 'movereason' => 'السبب',
 'movetalk' => 'أنقل صفحة \'\'\'النقاش\'\'\' أن أمكن.',
@@ -350,10 +342,9 @@ require_once('LanguageUtf8.php');
 'next' => 'التالي',
 'nextn' => '$1 التالية',
 'nlinks' => '$1 وصلة',
-'noaffirmation' => 'يجب عليك التأكيد أنك لم تخالف أي حقوق للنسخ أو التوزيع بتحميلك لهذا الملف.',
 'noarticletext' => '(لا يوجد حاليا أي نص في هذه الصفحة)',
 'noemail' => 'لا يوجد أي عنوان بريدي مسجل للمستخدم "$1".',
-'noemailtext' => 'لم يحدد هذا المستخدم عنوان بريد إلكتروني صحيح، 
+'noemailtext' => 'لم يحدد هذا المستخدم عنوان بريد إلكتروني صحيح،
 أو طلب عدم إستلام الرسائل من المستخدمين الآخرين.',
 'noemailtitle' => 'لا يوجد عنوان بريد إلكتروني',
 'nogomatch' => 'لا يوجد صفحة بنفس العنوان، حاول البحث بشكل مفصل أكثر من خلال إستعمال صندوق البحث أدناه. بإمكانك أيضاً إنشاء <a href="$1" class="new">صفحة جديدة</a> بالعنوان الذي طلبته.',
@@ -546,11 +537,11 @@ That comes to <b>$5</b> average edits per page, and <b>$6</b> views per edit.
 'uploadnologintext' => 'يجب أن تكون <a href="/wiki/Special:Userlogin">مسجلا الدخول</a>
 لتتمكن من تحميل الملفات.',
 'uploadtext' => '<strong>توقف!</strong>
-قبل تحميل أي ملف تأكد من قرائتك وثيقة <a href="/wiki/Wikipedia:Image_use_policy">سياسة إستعمال الصور</a>. 
-إذا وجد ملف بنفس الإسم في ويكيبيديا سيتم إستبدال الملف بدون أي تحذير أو إشعار مسبق. 
-فإذا لم يكن الملف تحديثا لملف مسبق، تأكد من أن إسم الملف غير موجود من قبل. 
+قبل تحميل أي ملف تأكد من قرائتك وثيقة <a href="/wiki/Wikipedia:Image_use_policy">سياسة إستعمال الصور</a>.
+إذا وجد ملف بنفس الإسم في ويكيبيديا سيتم إستبدال الملف بدون أي تحذير أو إشعار مسبق.
+فإذا لم يكن الملف تحديثا لملف مسبق، تأكد من أن إسم الملف غير موجود من قبل.
 لعرض أو البحث في الملفات التي تم تحميلها من قبل إذهب إلى <a href="/wiki/Special:Imagelist">قائمة الملفات المحملة</a>.
-يتم تسجيل كل حالات التحميل والحذث للملفات في <a href="/wiki/Wikipedia:Upload_log">سجل التحميل</a>. 
+يتم تسجيل كل حالات التحميل والحذث للملفات في <a href="/wiki/Wikipedia:Upload_log">سجل التحميل</a>.
 <p>إستعمل النموذج الموجود الموجود في الأسفل لتحميل الصور التي تساعد على توضيح مقالاتك.
 في أغلب متصفحات الإنترنت سترى زر "إستعراض..." الذي سيفتح لك شاشة إختيار الملفات. إختيار الملف سيملأ الخانة المجاورة للزر بإسم الملف وموقعه.
 يجب عليك كذلك التأكيد على أنك لم تخالف أي حقوق نسخ من خلال تحميلك للملف.
@@ -602,7 +593,6 @@ $3...
 'whitelistreadtext' => 'يجب عليك [[Special:Userlogin|تسجيل الدخول]] لتتمكن من قراءة المقالات.',
 'whitelistreadtitle' => 'تسجيل الدخول ضروري للقراءة',
 'wikipediapage' => 'عرض الصفحة العامة',
-'wikititlesuffix' => 'ويكيبيديا',
 'wlnote' => 'في الأسفل آخر $1 تعديل في آخر <b>$2</b> ساعة.',
 'wlsaved' => 'هذه نسخة مخزنة من قائمة المراقبة لديك.',
 'wlshowlast' => 'عرض أخر $1 ساعات $2 أيام $3',
diff --git a/languages/LanguageAst.php b/languages/LanguageAst.php
index 6e7645ced1fb..d2176ffa1ed8 100644
--- a/languages/LanguageAst.php
+++ b/languages/LanguageAst.php
@@ -11,28 +11,28 @@ require_once( 'LanguageUtf8.php' );
 # See Language.php for notes.
 
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
+	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
 /* $wgMetaNamespace == 'Uiquipedia' */
 /* private */ $wgNamespaceNamesAst = array(
-        NS_MEDIA            => 'Media',
-        NS_SPECIAL          => 'Especial',
-        NS_MAIN             => '',
-        NS_TALK             => 'Discusión',
-        NS_USER             => 'Usuariu',
-        NS_USER_TALK        => 'Usuariu_discusión',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => $wgMetaNamespace . '_discusión',
-        NS_IMAGE            => 'Imaxen',
-        NS_IMAGE_TALK       => 'Imaxen_discusión',
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'MediaWiki_discusión',
-        NS_TEMPLATE         => 'Plantilla',
-        NS_TEMPLATE_TALK    => 'Plantilla_discusión',
-        NS_HELP             => 'Ayuda',
-        NS_HELP_TALK        => 'Ayuda_discusión',
-        NS_CATEGORY         => 'Categoría',
-        NS_CATEGORY_TALK    => 'Categoría_discusión',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Especial',
+	NS_MAIN             => '',
+	NS_TALK             => 'Discusión',
+	NS_USER             => 'Usuariu',
+	NS_USER_TALK        => 'Usuariu_discusión',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaNamespace . '_discusión',
+	NS_IMAGE            => 'Imaxen',
+	NS_IMAGE_TALK       => 'Imaxen_discusión',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_discusión',
+	NS_TEMPLATE         => 'Plantilla',
+	NS_TEMPLATE_TALK    => 'Plantilla_discusión',
+	NS_HELP             => 'Ayuda',
+	NS_HELP_TALK        => 'Ayuda_discusión',
+	NS_CATEGORY         => 'Categoría',
+	NS_CATEGORY_TALK    => 'Categoría_discusión',
 ) + $wgNamespaceNamesEn;
 
 
diff --git a/languages/LanguageBe.php b/languages/LanguageBe.php
index e8a9485e2313..a18d22e1b9e5 100644
--- a/languages/LanguageBe.php
+++ b/languages/LanguageBe.php
@@ -47,7 +47,7 @@ require_once('LanguageUtf8.php');
 	'monobook' => 'Монакніга',
 	'myskin' => 'MySkin',
 	'chick' => 'Цыпа'
-);
+) + $wgSkinNamesEn;
 
 /* private */ $wgMagicWordsBe = array(
 	MAG_REDIRECT		=> array( 0,	'#redirect', '#перанакіраваньне' ),
@@ -112,17 +112,12 @@ require_once('LanguageUtf8.php');
 'addedwatch' => 'Даданая ў сьпіс назіраньня',
 'addgroup' => 'Дадаць групу',
 'administrators' => 'Project:Адміністрацыя',
-'affirmation' => 'Я пацьвярджаю, што ўладальнік/уладальніца аўтарскіх правоў на гэты файл згодзен/згодная распаўсюджваць яго адпаведна з умовамі ліцэнзіі $1.',
-'all' => 'усе',
 'allarticles' => 'Усе артыкулы',
 'allmessages' => 'Усе сыстэмныя паведамленьні',
 'allmessagescurrent' => 'Бягучы тэкст',
 'allmessagesname' => 'Назва',
 'allmessagestext' => 'Сьпіс усіх сыстэмных паведамленьняў, якія існуюць у прасторы назваў \'\'\'MediaWiki:\'\'\'.',
 'allpages' => 'Усе старонкі',
-'allpagesformtext1' => 'Паказаць старонкі пачынаючы з: $1',
-'allpagesformtext2' => 'Выберыце прастору назваў: $1 $2',
-'allpagesnamespace' => 'Усе старонкі (прастора назваў: $1)',
 'allpagesnext' => 'Наступныя',
 'allpagesprev' => 'Папярэднія',
 'allpagessubmit' => 'Паказаць',
@@ -133,7 +128,6 @@ require_once('LanguageUtf8.php');
 'apr' => '04',
 'april' => 'красавіка',
 'article' => 'Артыкул',
-'articlenamespace' => '(артыкулы)',
 'articlepage' => 'Паказаць артыкул',
 'aug' => '08',
 'august' => 'жніўня',
@@ -155,7 +149,6 @@ require_once('LanguageUtf8.php');
 'categoryarticlecount1' => 'У катэгорыі ёсьць $1 артыкул.',
 'changepassword' => 'Зьмяніць пароль',
 'compareselectedversions' => 'Параўнаць выбраныя вэрсіі',
-'confirmcheck' => 'Так, я сапраўды жадаю выдаліць гэта.',
 'confirmprotecttext' => 'Вы сапраўды жадаеце абараніць гэтую старонку?',
 'contribslink' => 'унёсак',
 'contributions' => 'Унёсак удзельніка/удзельніцы',
@@ -252,7 +245,6 @@ public domain or similar free resource.<br />
 'hr_tip' => 'Гарызантальная лінія (не выкарыстоўвайце часта)',
 'ignorewarning' => 'Праігнараваць папярэджаньне і захаваць файл.',
 'illegalfilename' => 'Назва файла «$1» зьмяшчае сымбалі, якія нельга выкарыстоўваць у назвах старонак. Калі ласка, зьмяніце назву файла і паспрабуйце загрузіць яго зноў.',
-'ilshowmatch' => 'Паказаць усе выявы з адпавядаючымі назвамі',
 'ilsubmit' => 'Шукаць',
 'image_sample' => 'Прыклад.jpg',
 'imagelist' => 'Сьпіс выяваў',
@@ -338,7 +330,6 @@ public domain or similar free resource.<br />
 'nextdiff' => 'Перайсьці да наступнай зьмены →',
 'nextn' => 'наступныя $1',
 'nextpage' => 'Наступная старонка ($1)',
-'noaffirmation' => 'Вы павінныя пацьвердзіць, што загрузка гэтага файла не парушае нічыіх аўтарскіх правоў.',
 'noarticletext' => '(Зараз тэкст на гэтай старонцы адсутнічае)',
 'nodb' => 'Немагчыма выбраць базу дадзеных $1',
 'noemailtitle' => 'Адрас электроннай пошты адсутнічае',
@@ -448,9 +439,6 @@ public domain or similar free resource.<br />
 'showpreview' => 'Праглядзець',
 'showtoc' => 'паказаць',
 'sig_tip' => 'Ваш подпіс і момант часу',
-'sitesettings-images' => 'Выявы',
-'sitesettings-permissions' => 'Правы',
-'sitesettings-wgUseCategoryMagic' => 'Дазволіць катэгорыі',
 'sitesubtitle' => 'Вольная энцыкляпэдыя',
 'sitesupport' => 'Ахвяраваньні',
 'sitetitle' => '{{SITENAME}}',
@@ -517,13 +505,6 @@ public domain or similar free resource.<br />
 ** \'\'\'ліцэнзіі\'\'\', згодна ўмоваў якіх магчыма распаўсюджваць файл.
 * \'\'\'Выкарыстоўвайце файл\'\'\' у артыкуле(ах). Напрыклад: <code><nowiki>[[Image:file.jpg]]</nowiki></code> ці <code><nowiki>[[Image:file.jpg|thumb|200px|Апісаньне]]</nowiki></code> — для выяваў; <code><nowiki>[[Media:file.ogg]]</nowiki></code> — для аўдыёфайлаў.',
 'userexists' => 'Выбранае Вамі імя ўдзельніка/ўдзельніцы ўжо выкарыстоўваецца кімсьці іншым. Калі ласка, выберыце іншае імя.',
-'userlevels-addgroup' => 'Дадаць групу',
-'userlevels-editgroup' => 'Рэдагаваць групу',
-'userlevels-editgroup-name' => 'Назва групы:',
-'userlevels-editusergroup' => 'Рэдагаваць групы ўдзельнікаў і ўдзельніц',
-'userlevels-group-edit' => 'Існуючыя групы:',
-'userlevels-groupsavailable' => 'Даступныя групы:',
-'userlevels-lookup-user' => 'Кіраваць групамі ўдзельнікаў і ўдзельніц',
 'userlogout' => 'Выйсьці',
 'val_table_header' => '<tr><th>Кляса</th>$1<th colspan=4>Меркаваньне</th>$1<th>Камэнтар</th></tr>',
 'val_version' => 'Вэрсія',
@@ -540,7 +521,6 @@ public domain or similar free resource.<br />
 'wednesday' => 'серада',
 'whatlinkshere' => 'Адкуль спасылаюцца на старонку',
 'whitelistacctitle' => 'Вам не дазволена ствараць рахунак',
-'wikititlesuffix' => '{{SITENAME}}',
 'youremail' => 'Ваш адрас электроннай пошты (*)',
 'yourname' => 'Ваша імя ўдзельніка/ўдзельніцы',
 'yournick' => 'Ваша мянушка (для подпісаў)',
@@ -550,7 +530,7 @@ public domain or similar free resource.<br />
 );
 
 class LanguageBe extends LanguageUtf8 {
-	
+
 	// Namespaces
 	function getNamespaces() {
 		global $wgNamespaceNamesBe;
@@ -562,7 +542,7 @@ class LanguageBe extends LanguageUtf8 {
 		global $wgQuickbarSettingsBe;
 		return $wgQuickbarSettingsBe;
 	}
-	
+
 	// Skins
 	function getSkinNames() {
 		global $wgSkinNamesBe;
@@ -570,13 +550,12 @@ class LanguageBe extends LanguageUtf8 {
 	}
 
 	// Magic words
-	function getMagicWords() 
-	{
+	function getMagicWords() {
 		global $wgMagicWordsBe;
 		return $wgMagicWordsBe;
 	}
-	
-	// The date and time format 
+
+	// The date and time format
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); } # Adjust based on the timezone setting.
 		// 20050310001506 => 10.03.2005
@@ -594,7 +573,7 @@ class LanguageBe extends LanguageUtf8 {
 	function timeanddate( $ts, $adj = false ) {
 		return $this->time( $ts, $adj ) . ', ' .$this->date( $ts, $adj );
 	}
-	
+
 	function getMessage( $key ) {
 		global $wgAllMessagesBe;
 		if( isset( $wgAllMessagesBe[$key] ) ) {
@@ -603,7 +582,7 @@ class LanguageBe extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	function formatNum( $number ) {
 		return strtr($number, '.,', ',.' );
 	}
diff --git a/languages/LanguageBg.php b/languages/LanguageBg.php
index 64108d8698c2..20ba51fba58a 100644
--- a/languages/LanguageBg.php
+++ b/languages/LanguageBg.php
@@ -91,71 +91,9 @@
 	MAG_SERVER               => array( 0, 'SERVER', 'СЪРВЪР'       )
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesBg = array(
-	'Userlogin'           => 'Влизане',
-	'Userlogout'          => 'Излизане',
-	'Preferences'         => 'Потребителски настройки',
-	'Watchlist'           => 'Наблюдавани страници',
-	'Recentchanges'       => 'Последни промени',
-	'Upload'              => 'Качване на картинки',
-	'Imagelist'           => 'Списък на картинките',
-	'Listusers'           => 'Регистрирани потребители',
-	'Statistics'          => 'Статистика',
-	'Randompage'          => 'Случайна статия',
-
-	'Lonelypages'         => 'Статии сираци',
-	'Unusedimages'        => 'Картинки сираци',
-	'Popularpages'        => 'Известни статии',
-	'Wantedpages'         => 'Желани статии',
-	'Shortpages'          => 'Кратки статии',
-	'Longpages'           => 'Дълги статии',
-	'Newpages'            => 'Нови статии',
-	'Ancientpages'        => 'Стари статии',
-	'Deadendpages'        => 'Задънени статии',
-	# 'Intl'                => 'Междуезикови препратки',
-	'Allpages'            => 'Всички статии по заглавие',
-
-	'Ipblocklist'         => 'Блокирани потребители/IP-адреси',
-	'Maintenance'         => 'Страница за поддръжка',
-	'Specialpages'        => '',
-	'Contributions'       => '',
-	'Emailuser'           => '',
-	'Whatlinkshere'       => '',
-	'Recentchangeslinked' => '',
-	'Movepage'            => '',
-	'Blockme'             => '',
-	'Booksources'         => 'Външни източници на книги',
-	'Categories'          => 'Категории страници',
-	'Export'              => 'Изнасяне като XML',
-	'Version'             => 'Версия на МедияУики',
-	'Allmessages'         => 'Всички системни съобщения',
-	'Search'              => '',
-);
-
-/* private */ $wgSysopSpecialPagesBg = array(
-	'Blockip'    => 'Блокиране на потребител/IP-адрес',
-	'Asksql'     => 'Справка към базата данни',
-	'Undelete'   => 'Възстановяване на изтрити страници',
-	'Makesysop'  => 'Превръщане на потребител в администратор',
-	'Import'     => 'Внасяне на страница с история',
-);
-
-/* private */ $wgDeveloperSpecialPagesBg = array(
-	'Lockdb'    => 'Забрана на достъп за писане към базата данни',
-	'Unlockdb'  => 'Разрешаване на достъп за писане към базата данни',
-);
-
 #-------------------------------------------------------------------
 # Default messages
 #-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
-
 # БЕЛЕЖКА: За да изключите "Текущите събития" в страничното меню,
 # въведете 'currentevents' => '-'
 
@@ -236,11 +174,9 @@
 'article'   => 'Статия',
 'help'      => 'Помощ',
 'helppage'    => "{{ns:12}}:Помощ",
-'wikititlesuffix' => "{{SITENAME}}",
 'bugreports'  => 'Съобщения за грешки',
 'bugreportspage' => "{{ns:4}}:Съобщения_за_грешки",
 "sitesupport"   => "Дарения", # Set a URL in $wgSiteSupportPage in LocalSettings.php
-'sitesupportpage' => '', # If not set, won't appear. Can be wiki page or URL
 'faq'      => 'ЧЗВ',
 'faqpage'    => "{{ns:4}}:ЧЗВ",
 'edithelp'    => 'Помощ при редактиране',
@@ -299,8 +235,6 @@
 'redirectedfrom' => "(пренасочване от $1)",
 'lastmodified'  => "Последна промяна на страницата: $1.",
 'viewcount'    => "Страницата е била преглеждана $1 пъти.",
-# obsolete
-'gnunote' => 'Всички текстове са достъпни при условията на [[Лиценз_за_свободна_документация_на_ГНУ|лиценза за свободна документация на ГНУ]].',
 'copyright'     => "Съдържанието е достъпно при условията на $1.",
 'poweredby'     => "{{SITENAME}} се задвижва от [http://www.mediawiki.org/ МедияУики], софтуер за уики с отворен код.",
 'printsubtitle' => '(от {{SERVER}})',
@@ -312,8 +246,6 @@
 'developertitle' => 'Изискват се права на разработчик',
 'developertext'  => "Желаното действие може да се изпълни само от разработчици.
 Вижте $1.",
-'bureaucrattitle' => 'Изискват се права на бюрократ',
-'bureaucrattext'  => 'Желаното действие може да се изпълни само от бюрократи.',
 "nbytes"    => "$1 байта",
 'go'      => 'Отваряне',
 'ok'      => 'Добре',
@@ -407,7 +339,6 @@ MySQL дава грешка \"$3: $4\".\n",
 [[{{ns:4}}:Защитена_страница]].
 
 Може да прегледате и копирате изходния код на страницата:",
-'seriousxhtmlerrors' => 'tidy откри сериозни грешки в кода на XHTML.',
 
 # Login and logout pages
 #
@@ -427,14 +358,7 @@ MySQL дава грешка \"$3: $4\".\n",
 "newusersonly"  => " (само за нови потребители)",
 "remembermypassword" => "Запомняне на паролата между сесиите.",
 "loginproblem"  => "<b>Имаше проблем с Вашето влизане.</b><br />Опитайте отново!",
-"alreadyloggedin" => "<font color=\"red\"><b>$1, вече сте влезли в системата!</b></font><br />\n",
-
-"areyounew"    => "Ако посещавате за пръв път {{SITENAME}} и искате да си откриете
-потребителска сметка,
-моля, въведете потребителско име и парола.
-Посочването на електронна поща е незадължително, но се препоръчва:
-ако си забравите паролата, може да поискате тя да Ви бъде изпратена
-на дадения адрес.<br />\n",
+"alreadyloggedin" => "<strong>$1, вече сте влезли в системата!</strong><br />\n",
 
 'login'      => 'Влизане',
 'loginprompt'  => "Бисквитките трябва да са разрешени, за да може да влезете в {{SITENAME}}.",
@@ -540,7 +464,6 @@ MySQL дава грешка \"$3: $4\".\n",
 
 Ако сте анонимен потребител и мислите, че тези неуместни коментари са отправени към Вас, моля [[{{ns:-1}}:Userlogin|регистрирайте се или влезте в системата]], за да избегнете евентуално бъдещо объркване с други анонимни потребители.''",
 'noarticletext' => "(Тази страница все още не съществува. Може да я създадете, като щракнете на '''Редактиране'''.)",
-'usercssjs' => "'''Бележка:''' След съхранението е необходимо да укажете на браузъра да вземе новата версия: '''Mozilla:''' щракнете върху ''презареждане''(или ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
 'usercssjsyoucanpreview' => "<strong>Съвет:</strong> Използвайте бутона 'Предварителен преглед', за да изпробвате новия код на css/js преди съхранението.",
 'usercsspreview' => "'''Не забравяйте, че това е само предварителен преглед на кода на CSS, страницата все още не е съхранена!'''",
 'userjspreview' => "'''Не забравяйте, че това е само изпробване/предварителен преглед на кода на Javascript, страницата все още не е съхранена!'''",
@@ -560,7 +483,6 @@ MySQL дава грешка \"$3: $4\".\n",
 версия на страницата.
 Ако съхраните, всякакви промени, направени след тази версия, ще бъдат изгубени.</strong>",
 "yourdiff"    => "Разлики",
-# REPLACE THE COPYRIGHT WARNING IF YOUR SITE ISN'T GFDL!
 "copyrightwarning" => "<div style=\"border:1px solid #333; padding:0.5em\">
 Моля, обърнете внимание на това, че
 всички приноси към {{SITENAME}} се публикуват при условията на
@@ -731,7 +653,6 @@ border='0' alt='Google'/></a>
 #
 'changes' => 'промени',
 'recentchanges' => 'Последни промени',
-# This is the default text, and can be overriden by editing [[{{SITENAME}}:Recentchanges]]
 'recentchangestext' => "Проследяване на последните промени в {{SITENAME}}.
 
 Легенда: <b>тек</b> = разлика на текущата версия,
@@ -753,7 +674,7 @@ border='0' alt='Google'/></a>
 'tableform'    => 'таблица',
 'listform'    => 'списък',
 'nchanges'    => "$1 промени",
-'minor#editletter' => 'М',
+'minoreditletter' => 'М',
 'newpageletter' => 'Н',
 
 # Upload
@@ -802,13 +723,9 @@ border='0' alt='Google'/></a>
 'filedesc'    => 'Описание',
 'filestatus' => 'Авторско право',
 'filesource' => 'Изходен код',
-'affirmation'  => "Потвърждавам, че притежателят на авторското право за този файл
-разрешава той да се използва според условията на $1.",
 'copyrightpage' => "{{ns:4}}:Авторски права",
 'copyrightpagename' => "авторските права в {{SITENAME}}",
 'uploadedfiles'  => 'Качени файлове',
-'noaffirmation' => 'Потвърдете, че с качването на файла не нарушавате
-авторски права.',
 'ignorewarning'  => 'Съхраняване на файла въпреки предупрежденията.',
 'minlength'    => 'Имената на картинките трябва да съдържат поне три знака.',
 'badfilename'  => "Картинката бе преименувана на \"$1\".",
@@ -1096,7 +1013,6 @@ $3...
 'ipbreason'    => 'Причина',
 'ipbsubmit'    => 'Блокиране на потребителя',
 'badipaddress'  => 'Невалиден IP-адрес или грешно име на потребител',
-'noblockreason' => 'Необходимо е да посочите причина за блокирането.',
 'blockipsuccesssub' => 'Блокирането бе успешно',
 'blockipsuccesstext' => "\"$1\" беше блокиран.
 <br />Вижте [[{{ns:-1}}:Ipblocklist|списъка на блокираните IP-адреси]], за да прегледате блокираните.",
@@ -1151,21 +1067,6 @@ $3...
 <br />Не забравяйте да отключите базата данни, когато привършите с работата по поддръжката.",
 'unlockdbsuccesstext' => "Базата данни на {{SITENAME}} бе отключена.",
 
-# SQL query
-#
-'asksql'    => 'Заявка на SQL',
-'asksqltext'  => "Използвайте долния формуляр, за да отправите пряка заявка
-към базата данни на {{SITENAME}}.
-Използвайте апострофи ('като тези'), за ограничители на низовете.
-
-Честите заявки доста натоварват сървъра, затова, моля,
-използвайте пестеливо тази функция.",
-'sqlislogged'  => 'Моля, обърнете внимание, че всички заявки се записват.',
-'sqlquery'    => 'Заявка',
-'querybtn'    => 'Изпращане на заявка',
-'selectonly'  => 'Позволени са единствено заявки за четене.',
-'querysuccessful' => 'Заявката бе успешна',
-
 # Make sysop
 'makesysoptitle'        => 'Превръщане на потребител в администратор',
 'makesysoptext'         => 'Този формуляр се използва от бюрократи за превръщане на обикновени потребители в администратори.
@@ -1256,40 +1157,7 @@ $3...
 'importhistoryconflict' => 'Съществува версия от историята, която си противоречи с тази (възможно е страницата да е била вече внесена)',
 
 # Keyboard access keys for power users
-'accesskey-article' => 'a',
-'accesskey-talk' => 't',
-'accesskey-edit' => 'e',
-'accesskey-addsection' => '+',
-'accesskey-viewsource' => 'e',
-'accesskey-history' => 'h',
-'accesskey-protect' => '=',
-'accesskey-delete' => 'd',
-'accesskey-undelete' => 'd',
-'accesskey-move' => 'm',
-'accesskey-watch' => 'w',
-'accesskey-unwatch' => 'w',
-'accesskey-watchlist' => 'l',
-'accesskey-userpage' => '',
-'accesskey-anonuserpage' => '.',
-'accesskey-mytalk' => '',
-'accesskey-anontalk' => 'n',
-'accesskey-preferences' => '',
-'accesskey-mycontris' => '',
-'accesskey-login' => 'o',
-'accesskey-logout' => 'o',
 'accesskey-search' => 's',
-'accesskey-mainpage' => '',
-'accesskey-portal' => '',
-'accesskey-randompage' => 'x',
-'accesskey-currentevents' => '',
-'accesskey-sitesupport' => '',
-'accesskey-help' => '',
-'accesskey-recentchanges' => 'r',
-'accesskey-recentchangeslinked' => 'c',
-'accesskey-whatlinkshere' => 'b',
-'accesskey-specialpages' => '',
-'accesskey-specialpage' => '',
-'accesskey-upload' => 'u',
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
@@ -1298,47 +1166,11 @@ $3...
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for the main actions
-'tooltip-atom'  => 'Atom feed за страницата',
-'tooltip-article' => 'Преглед на статията [alt-a]',
-'tooltip-talk' => 'Беседа относно страницата [alt-t]',
-'tooltip-edit' => 'Може да редактирате страницата. Моля, използвайте бутона за предварителен преглед преди да съхраните. [alt-e]',
-'tooltip-addsection' => 'Добавяне на коментар към страницата. [alt-+]',
-'tooltip-viewsource' => 'Страницата е защитена. Може да разгледате изходния код. [alt-e]',
-'tooltip-history' => 'Предишни версии на страницата, [alt-h]',
-'tooltip-protect' => 'Защитаване на страницата, [alt-=]',
-'tooltip-delete' => 'Изтриване на страницата, [alt-d]',
-'tooltip-undelete' => "Възстановяване на $1 изтрити редакции на страницата [alt-d]",
-'tooltip-move' => 'Преместване на страницата, [alt-m]',
 'tooltip-watch' => 'Добавяне на страницата към списъка Ви за наблюдение [alt-w]',
-'tooltip-unwatch' => 'Премахване на страницата от списъка Ви за наблюдение [alt-w]',
-'tooltip-watchlist' => 'Списък на страници, чиито промени сте избрали да наблюдавате. [alt-l]',
-'tooltip-userpage' => 'Моята потребителска страница',
-'tooltip-anonuserpage' => 'Потребителската страница за адреса, от който редактирате [alt-.]',
-'tooltip-mytalk' => 'Моята дискусионна страница',
-'tooltip-anontalk' => 'Дискусия относно редакциите от този адрес [alt-n]',
-'tooltip-preferences' => 'Моите настройки',
-'tooltip-mycontris' => 'Списък на моите приноси',
-'tooltip-login' => 'В момента не сте влезли. Насърчаваме Ви да влезете, въпреки че не е задължително, за да редактирате.',
-'tooltip-logout' => 'Излизане от {{SITENAME}} [alt-o]',
 'tooltip-search' => 'Търсене в Уикито',
-'tooltip-mainpage' => 'Началната страница',
-'tooltip-portal' => 'Информация за проекта',
-'tooltip-randompage' => 'Случайна страница [alt-x]',
-'tooltip-currentevents' => 'Информация за текущите събития по света',
-'tooltip-sitesupport' => 'Подкрепете {{SITENAME}}',
-'tooltip-help' => 'Помощната страница.',
-'tooltip-recentchanges' => 'Това е списък на последните промени в цялото Уики [alt-r]',
-'tooltip-recentchangeslinked' => 'Последните промени на страници, сочещи към тази страница [alt-c]',
-'tooltip-whatlinkshere' => 'Списък на всички страници, сочещи насам [alt-b]',
-'tooltip-specialpages' => 'Списък на всички специални страници',
-'tooltip-upload' => 'Качване на файлове [alt-u]',
-'tooltip-specialpage' => 'Това е специална страница, която не може да се редактира',
 'tooltip-minoredit' => 'Отбелязване на промяната като малка [alt-i]',
 'tooltip-save' => 'Съхраняване на промените [alt-s]',
 'tooltip-preview' => 'Предварителен преглед, моля, използвайте го преди да съхраните! [alt-p]',
-'tooltip-contributions' => 'Показване на приносите на потребителя',
-'tooltip-emailuser' => 'Изпращане на писмо на потребителя',
-'tooltip-rss' => 'RSS feed за страницата',
 'tooltip-compareselectedversions' => 'Показване на разликите между двете избрани версии на страницата [alt-v]',
 
 # Metadata
@@ -1398,24 +1230,6 @@ class LanguageBg extends LanguageUtf8 {
 		return $wgDateFormatsBg;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesBg;
-		return $wgValidSpecialPagesBg;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesBg;
-		return $wgSysopSpecialPagesBg;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesBg;
-		return $wgDeveloperSpecialPagesBg;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesBg;
 		if( isset( $wgAllMessagesBg[$key] ) ) {
diff --git a/languages/LanguageBn.php b/languages/LanguageBn.php
index 6e16becb1527..ab354ef75c7b 100644
--- a/languages/LanguageBn.php
+++ b/languages/LanguageBn.php
@@ -67,7 +67,6 @@ require_once( 'LanguageUtf8.php' );
 'aboutpage'   => 'উইকিপেডিয়া:বৃত্তান্ত',
 'help'      => 'সহায়িকা',
 'helppage'    => 'উইকিপেডিয়া:সহায়িকা',
-'wikititlesuffix' => 'উইকিপেডিয়া',
 'bugreports'  => 'ত্রুটি বিবরণী',
 'bugreportspage' => 'উইকিপেডিয়া:ত্রুটি_বিবরণী',
 'faq'     => 'প্রশ্নোত্তর',
@@ -161,7 +160,7 @@ class LanguageBn extends LanguageUtf8 {
 		'8' => '৮',
 		'9' => '৯'
 	);
-	
+
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		if( $wgTranslateNumerals ) {
diff --git a/languages/LanguageCa.php b/languages/LanguageCa.php
index a5d77599950b..c02628ec1c1b 100644
--- a/languages/LanguageCa.php
+++ b/languages/LanguageCa.php
@@ -43,56 +43,6 @@
 #	"No preference",
 );
 
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesCa = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Preferències d'usuari",
-	"Watchlist"		=> "El meu llistat de seguiment",
-	"Recentchanges" => "Canvis Recents",
-	"Upload"		=> "Puja una imatge",
-	"Imagelist"		=> "Llistat d'imatges",
-	"Listusers"		=> "Usuaris registrats",
-	"Statistics"	=> "Estadístiques del lloc",
-	"Randompage"	=> "Article aleatori",
-
-	"Lonelypages"	=> "Articles orfes",
-	"Unusedimages"	=> "Imatges hores",
-	"Popularpages"	=> "Articles populars",
-	"Wantedpages"	=> "Articles més sol·licitats",
-	"Shortpages"	=> "Articles curts",
-	"Longpages"		=> "Articles llargs",
-	"Newpages"		=> "Articles nous",
-	"Allpages"		=> "Totes les pàgines (alfabètic)",
-
-	"Ipblocklist"	=> "Direccions d'IP bloquejades",
-	"Maintenance"   => "Pàgina de manutenció",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"     => "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"   => "Fonts externes de llibres",
-	"Export"		=> "XML export",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesCa = array(
-	"Blockip"		=> "Bloqueja una direcció IP",
-	"Asksql"		=> "Recerca en la base de dades",
-	"Undelete"      => "Mostra i restaura les pàgines esborrades"
-);
-
-/* private */ $wgDeveloperSpecialPagesCa = array(
-	"Lockdb"		=> "Tanca l'accés d'escriptura a la base de dades",
-	"Unlockdb"		=> "Restaura accés d'escriptura a la base de dades",
-);
-
 /* private */ $wgAllMessagesCa = array(
 # User Toggles
 
@@ -157,7 +107,6 @@
 "aboutpage"		=> "{{ns:4}}: Quant a",
 "help"			=> "Ajuda",
 "helppage"		=> "{{ns:4}}:Ajuda",
-"wikititlesuffix"		=> "{{SITENAME}}",
 "bugreports"	=> "Informes d'error del programari",
 "bugreportspage" => "{{ns:4}}:Informes_d'error",
 "faq"			=> "PMF",
@@ -196,7 +145,6 @@
 "redirectedfrom" => "(Redirigit des de $1)",
 "lastmodified"	=> "Aquesta pàgina ha estat modificada per última vegada el $1.",
 "viewcount"		=> "Aquesta pàgina ha estat visitada $1 vegades.",
-"gnunote" => "Aquesta pàgina es fa disponible sota la <a class=internal href='$wgScriptPath/GNU_FDL'>GNU FDL</a>.",
 "printsubtitle" => "(De {{SERVER}})",
 "protectedpage" => "Pàgina protegida",
 "administrators" => "{{ns:4}}:Administradors",
@@ -224,14 +172,14 @@ Vegeu $1.",
 #
 "error"			=> "Error",
 "databaseerror" => "Error de la base de dades",
-"dberrortext"	=> "Ha ocorregut un error de sintaxi en una consulta a la base de dades. 
+"dberrortext"	=> "Ha ocorregut un error de sintaxi en una consulta a la base de dades.
 L'última consulta que s'ha intentat ha estat:
 <blockquote><tt>$1</tt></blockquote>L'error de retorn de MySQL ha estat\"<tt>$3: $4</tt>\".",
 "noconnect"		=> "No s'ha pogut connectar a la base de dades a $1",
 "nodb"			=> "No s'ha pogut seleccionar la base de dades$1",
 "readonly"		=> "Base de dades bloquejada",
 "enterlockreason" => "Entreu una raó per bloquejar-la, incloent una estimació de quan s'efecturarà el bloqueig",
-"readonlytext"	=> "La base de dades de la {{SITENAME}} està temporalment bloquejada per noves entrades o altres modificacions, 
+"readonlytext"	=> "La base de dades de la {{SITENAME}} està temporalment bloquejada per noves entrades o altres modificacions,
 
 probablement per manteniment de rutina, després del qual tornarà a la normalitat. L'administrador la bloquejada ha ofert aquesta explicació:
 <p>$1",
@@ -246,7 +194,7 @@ fent-ne arribar l'URL.",
 "filedeleteerror" => "No s'ha pogut esborrar l'arxiu \"$1\".",
 "filenotfound"	=> "No s'ha pogut trobar l'arxiu \"$1\".",
 "unexpected"	=> "Valor no esperat: \"$1\"=\"$2\".",
-"formerror"		=> "Error: no s'ha pogut trametre la forma",	
+"formerror"		=> "Error: no s'ha pogut trametre la forma",
 "badarticleerror" => "Aquesta acció no es pot dur a terme en aquesta pagina.",
 "cannotdelete"	=> "No s`'ha pogut esborrar la pàgina o imatge especificada.(Pot haver estat esborrada per algú abans)",
 "badtitle"		=> "Títol incorrecte",
@@ -270,13 +218,8 @@ Recordeu personalitzar les vostres preferències del {{SITENAME}}.",
 "newusersonly"	=> " (només usuaris nous)",
 "remembermypassword" => "Vull que recordis la meva contrasenya entre sessions.",
 "loginproblem"	=> "<b>Hi ha hagut un problema amb l'entrada.</b><br />Proveu-ho de nou!",
-"alreadyloggedin" => "<font color=red><b>Benvingut, usuari $1!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Benvingut, usuari $1!</strong><br />\n",
 
-"areyounew"		=> "Si sou nou a la {{SITENAME}} en català, i
-voleu tenir un compte d'usuari, ingresseu un nom d'usuari,
-i teclegeu i repetiu una contrasenya.
-La vostra direcció electrònica és opcional: si perdeu o oblideu la
-contrasenya, podeu demanar que s'enviï a la direcció que vulgueu<br />\n",
 "login"			=> "Registre/Entrada",
 "userlogin"		=> "Registre/Entrada",
 "logout"		=> "Sortida",
@@ -286,7 +229,7 @@ contrasenya, podeu demanar que s'enviï a la direcció que vulgueu<br />\n",
 "userexists"	=> "El nom que heu entrat ja és en ús. Escolliu un nombre diferent.",
 "youremail"		=> "Direcció electrònica",
 "yournick"		=> "Malnom (nom que es mostrarà)",
-"emailforlost"	=> "Si perdeu o oblideu la vostra contrasenya, podeu demanar que se us enviï una nova a la vostra direcció electrònica.", 
+"emailforlost"	=> "Si perdeu o oblideu la vostra contrasenya, podeu demanar que se us enviï una nova a la vostra direcció electrònica.",
 "loginerror"	=> "Error d'inici de sessió",
 "noname"		=> "No heu especificat un nom vàlid d'usuari.",
 "loginsuccesstitle" => "S'ha iniciat la sessió amb èxit",
@@ -325,7 +268,7 @@ La raó és la que segueix:<br />$2<p>Podeu contactar amb l'administrador per di
 d'edició superior tal i com apareixerà si escolliu gravar.",
 "editing"		=> "S'està editant $1",
 "editconflict"	=> "Conflicte d'edició: $1",
-"explainconflict" => "Algú més ha canviat aquesta pàgina des que l'heu editada. 
+"explainconflict" => "Algú més ha canviat aquesta pàgina des que l'heu editada.
 L'ària de text superior conté el text de la pàgina com existeix actualment. Els vostres canvis es mostren a l'ària de text inferior.
 Haureu d'incorporar els vostres canvis en el text existent.
 <b>Sólo</b> el text a l'ària de text superior serà gravat quan premeu
@@ -335,12 +278,12 @@ Haureu d'incorporar els vostres canvis en el text existent.
 "editingold"	=> "<strong>ATENCIÓ:Esteu editant una versió antiga d'aquesta pàgina.
 Si la graveu, els canvis fets des d'eixa revisió es perdran.</strong>",
 "yourdiff"		=> "Diferències",
-"copyrightwarning" => "Noteu que totes les contribucions a la {{SITENAME}} 
-es consideren fetes públiques sota la llicència de documentació lliure GNU 
-(mostra detalls a $1). 
- Si no desitgeu que la gent corregeixi els vostres escrits sense pietat 
+"copyrightwarning" => "Noteu que totes les contribucions a la {{SITENAME}}
+es consideren fetes públiques sota la llicència de documentació lliure GNU
+(mostra detalls a $1).
+ Si no desitgeu que la gent corregeixi els vostres escrits sense pietat
 i els distribueixi lliurement, llavors no els poseu ací. <br />
-També ens heu d'assegurar que tot plegat és obra vostra i que sou l'amo dels drets d'autor, o els heu copiat des del domini públic 
+També ens heu d'assegurar que tot plegat és obra vostra i que sou l'amo dels drets d'autor, o els heu copiat des del domini públic
 o una altra font lliura.
  <strong>NO EMPREU ESCRITS AMB COPYRIGHT SENSE PERMÍS!</strong>",
 
@@ -407,7 +350,7 @@ per seleccionar preferències d'usuari.",
 "prefslogintext" => "Heu entrat amb el nom \"$1\".
 El vostre número d'identificació intern és $2.",
 "prefsreset"	=> "Les preferències han estat respostes des d'emmagatzematge.",
-"qbsettings"	=> "Preferències de \"Quickbar\"", 
+"qbsettings"	=> "Preferències de \"Quickbar\"",
 "changepassword" => "Canvia contrasenya",
 "skin"			=> "Aparença",
 "math"			=> "Com es mostren les fòrmules",
@@ -514,12 +457,9 @@ carregat més recentement. Totes les hores són les del servidor (UTC).
 ",
 "filename"		=> "Nom de l'arxiu",
 "filedesc"		=> "Sumari",
-"affirmation"	=> "Afirmo que el propietari del copyright d'aquest arxiu
-està d'acord en llicenciar-lo sota els termes de $1.",
 "copyrightpage" => "{{ns:4}}:Copyrights",
 "copyrightpagename" => "{{ns:4}} copyright",
 "uploadedfiles"	=> "Arxius carregats",
-"noaffirmation" => "Heu d'afirmar que les carregues d'arxius no violen cap copyright.",
 "ignorewarning"	=> "Ignora l'advertència i desa l'arxiu de totes maneres.",
 "minlength"		=> "Els noms de les imatges han de tenir un mínim de tres lletres.",
 "badfilename"	=> "El nom de la imatge s'ha canviat a \"$1\".",
@@ -569,7 +509,7 @@ redireccions, i altres que probablement no es poden classificar com a articles.
 Excloent-les, hi ha <b>$2</b> pàgines que probablement són articles legítims.<p>
 Hi ha hagut un total de <b>$3</b> visites a pàgines, i <b>$4</b> edicions de pàgina
 des que el programari ha estat actualitzat (Febrer 2003).
-Això resulta en un promig de <b>$5</b> edicions per pàgina, 
+Això resulta en un promig de <b>$5</b> edicions per pàgina,
 i <b>$6</b> visites per edició.",
 "userstatstext" => "Hi ha <b>$1</b> usuaris registrats.
 dels quals <b>$2</b> són administradors (vegeu $3).",
@@ -577,7 +517,7 @@ dels quals <b>$2</b> són administradors (vegeu $3).",
 # Maintenance Page
 #
 "maintenance"		=> "Pàgina de manteniment",
-"maintnancepagetext"	=> "Aquesta pàgina inclou diverses eines útils per al manteniment diari. Algunes d'aquestes funcions tendeixen a 
+"maintnancepagetext"	=> "Aquesta pàgina inclou diverses eines útils per al manteniment diari. Algunes d'aquestes funcions tendeixen a
 
 sobrecarregar la base de dades, així que si us plau, no torneu a carregar la pàgina després de cada element que arregleu ;-)",
 "maintenancebacklink"	=> "Torna a la pàgina de manteniment",
@@ -589,21 +529,21 @@ sobrecarregar la base de dades, així que si us plau, no torneu a carregar la p
 
 dia: o usuari:) <i>no</i> són  llistats ací.",
 "doubleredirects"	=> "Redireccions Dobles",
-"doubleredirectstext"	=> "<b>Atenció:</b> aquest llistat pot contenir falsos positius. Això normalment significa que hi ha text 
+"doubleredirectstext"	=> "<b>Atenció:</b> aquest llistat pot contenir falsos positius. Això normalment significa que hi ha text
 
-addicional amb enllaços sota el primer #REDIRECT.<br />\nCada fila conté enllaços al segon i tercer redireccionament, així com la primera línia del 
+addicional amb enllaços sota el primer #REDIRECT.<br />\nCada fila conté enllaços al segon i tercer redireccionament, així com la primera línia del
 
 segon redireccionament, la qual cosa dóna normalment l'article \"real\", al que el primer redireccionamet hauria d'apuntar.",
 "selflinks"		=> "Pàgines amb autoenllaços",
 "selflinkstext"		=> "Les següents pàgines contenen un enllaç a si mateixes, la qual cosa no és recomanable.",
 "mispeelings"       => "Pàgines amb faltes d'ortografia",
-"mispeelingstext"               => "Les següents pàgines contenen una falta d'ortografia comuna, les quals s'han llistat a $1. L'escriptura correcta 
+"mispeelingstext"               => "Les següents pàgines contenen una falta d'ortografia comuna, les quals s'han llistat a $1. L'escriptura correcta
 
 pot ser donada (com això).",
-"mispeelingspage"       => "Llistat de faltes d'ortografia comunes",           
+"mispeelingspage"       => "Llistat de faltes d'ortografia comunes",
 "missinglanguagelinks"  => "Enllaços Interidioma Faltants",
 "missinglanguagelinksbutton"    => "Troba els enllaços interidioma que falten per",
-"missinglanguagelinkstext"      => "Aquests articles <i>no</i> enllacen a les seves contraparts a $1. <i>No</i> es mostren redireccions i 
+"missinglanguagelinkstext"      => "Aquests articles <i>no</i> enllacen a les seves contraparts a $1. <i>No</i> es mostren redireccions i
 
 subpàgines.",
 
@@ -635,7 +575,7 @@ com ara altres Viquipèdies poden enllaçar a una imatge
 amb un URL directe, i d'aquixa manera estar encara llistada ací
 tot i estar en ús actiu.",
 "booksources"   => "Fonts de llibres",
-"booksourcetext" => "A continuació hi ha un llistat d'enllaços a altres llocs que venen llibres nous i de segona mà, i també poden contenir 
+"booksourcetext" => "A continuació hi ha un llistat d'enllaços a altres llocs que venen llibres nous i de segona mà, i també poden contenir
 
 informació addicional sobre els llibres que esteu cercant.
 La {{SITENAME}} no està afiliada amb cap d'aquests negocis, i aquest llistat no ha de ser considerat com propaganda.",
@@ -648,10 +588,10 @@ i tenir una direcció electrònica vàlida en les vostres [[Especial:Preferences
 per enviar un correu electrònic a altres usuaris.",
 "emailuser"		=> "Envia correu electrònic a aquest usuari",
 "emailpage"		=> "Correu electrònic a usuari",
-"emailpagetext"	=> "Si aquest usuari ha entrat una direcció electrònica vàlida en les vostres preferències d'usuari, el següent formulari 
+"emailpagetext"	=> "Si aquest usuari ha entrat una direcció electrònica vàlida en les vostres preferències d'usuari, el següent formulari
 
 serveix per enviar-li un missatge.
-La direcció electrònica que heu entrat en les vostres preferències d'usuari apareixerà en el remitent, de manera que el destinatari pugui 
+La direcció electrònica que heu entrat en les vostres preferències d'usuari apareixerà en el remitent, de manera que el destinatari pugui
 
 respondre.",
 "noemailtitle"	=> "No hi ha cap direcció electrònica",
@@ -695,7 +635,7 @@ Canvis futurs a aquesta pàgina i a la vostra pàgina de discussió associada hi
 "confirm"		=> "Confirma",
 "confirmdelete" => "Confirma l'esborrat",
 "deletesub"		=> "(Esborrant \"$1\")",
-"confirmdeletetext" => "Esteu a punt d'esborrar una pàgina o imatge 
+"confirmdeletetext" => "Esteu a punt d'esborrar una pàgina o imatge
 de forma permanent, així com tota la seva història de la base de dades.
 Confirmeu que realment ho voleu fer, que enteneu les
 conseqüències, i que el esteu fent està d'acord amb [[{{ns:4}}:Polítiques]].",
@@ -721,13 +661,13 @@ Tots els temps es mostren en l'hora del servidor (UTC).
 # Undelete
 "undelete" => "Restaura una pàgina esborrada",
 "undeletepage" => "Mostra i restaura pàgines esborrades",
-"undeletepagetext" => "Les següents pàgines han estat esborrades però encara són a l'arxiu i poden ser restaurades. L'arxiu pot ser netejat 
+"undeletepagetext" => "Les següents pàgines han estat esborrades però encara són a l'arxiu i poden ser restaurades. L'arxiu pot ser netejat
 
 periòdicament.",
 "undeletearticle" => "Restaura l'article esborrat",
 "undeleterevisions" => "$1 revisions arxivades",
 "undeletehistory" => "Si restaureu una pàgina, totes les revisions seran restaurades a la història.
-Si una nova pàgina amb el mateix nom ha estat creada des de l'esborrat, les versions restaurades apareixeran com a història anterior, i la 
+Si una nova pàgina amb el mateix nom ha estat creada des de l'esborrat, les versions restaurades apareixeran com a història anterior, i la
 
 revisió actual del la pàgina \"viva\" no serà substituïda automàticament.",
 "undeleterevision" => "Revisió esborrada al $1",
@@ -768,12 +708,11 @@ quines pàgines en concret estan sent vandalitzades).",
 "ipbreason"		=> "Raó",
 "ipbsubmit"		=> "Bloqueja aquesta direcció",
 "badipaddress"	=> "La direcció IP no té el format correcte.",
-"noblockreason" => "Heu de donar un motiu per al bloqueig.",
 "blockipsuccesssub" => "S'ha bloquejat amb èxit",
 "blockipsuccesstext" => "La direcció IP  \"$1\" ha estat bloquejada.
 <br />Vegeu [[Especial:llistat d'IP bloquejades|llistat d'IPs bloquejades]] per revisar bloquejos.",
 "unblockip"		=> "Desbloqueja direcció IP",
-"unblockiptext"	=> "Empreu el següent formulari per restaurar 
+"unblockiptext"	=> "Empreu el següent formulari per restaurar
 l'accés a l'escriptura a una direcció IP prèviament bloquejada.",
 "ipusubmit"		=> "Desbloqueja aquesta direcció",
 "ipusuccess"	=> "Direcció IP \"$1\" desbloquejada",
@@ -807,35 +746,21 @@ Confirmeu que això és el que voleu fer.",
 <br />Recordeu-vos-en d'extreure el bloqueig havent acabant el manteniment.",
 "unlockdbsuccesstext" => "La base de dades de la {{SITENAME}} ha estat desbloquejada.",
 
-# SQL query
-#
-"asksql"		=> "Consulta SQL",
-"asksqltext"	=> "Empreu el següent formulari per fer una consulta directa
-a la base de dades de la {{SITENAME}}. Empreu les cometes simples ('como aquestes') per delimitar
-cadenes de caràcters literals.
-això pot afegir una càrrega considerable al servidor, així que
-si us plau empreu aquesta funció el mínim possible.",
-"sqlquery"		=> "Entreu la consulta",
-"querybtn"		=> "Envia la consulta",
-"selectonly"	=> "Consultes diferents a \"SELECT\" estan restringides només
-als desenvolupadors de la {{SITENAME}}.",
-"querysuccessful" => "Consulta amb èxit",
-
 # Move page
 #
 "movepage"		=> "Reanomena pàgina",
 "movepagetext"	=> "Emprant el següent formulari reanomenareu una pàgina,
 movent tota la seva història al nou nom.
 El títol anterior es convertirà en un redireccionament al nou títol.
-Els enllaços a l'antic títol de la pàgina no es canviaran. Assegureu-vos-en de verificar que no deixeu redireccions 
+Els enllaços a l'antic títol de la pàgina no es canviaran. Assegureu-vos-en de verificar que no deixeu redireccions
 
 dobles o trencades.
-Sou el responsable de fer que els enllaços segueixin apuntant on se suposa que ho facin. 
+Sou el responsable de fer que els enllaços segueixin apuntant on se suposa que ho facin.
 
-Noteu que la pàgina '''no''' serà traslladada si ja existeix una pàgina amb el títol nou, a no ser que sigui una pàgina buida o un 
+Noteu que la pàgina '''no''' serà traslladada si ja existeix una pàgina amb el títol nou, a no ser que sigui una pàgina buida o un
 
-''redireccionament'' sense història. 
-Això significa que podeu reanomenar de nou una pàgina al seu títol original si cometeu un error, i que no podeu sobreescriure una pàgina 
+''redireccionament'' sense història.
+Això significa que podeu reanomenar de nou una pàgina al seu títol original si cometeu un error, i que no podeu sobreescriure una pàgina
 
 existent.
 
@@ -860,7 +785,7 @@ per reanomenar una pàgina.",
 "articleexists" => "Ja existeix una pàgina amb aquest nom, o el nom que heu
 escollit no és vàlid.
 Escolliu un altre nom, si us plau.",
-"talkexists"	=> "S'ha reanomenat la pàgina amb èxit, però la pàgina de discussió no s'ha pogut moure car ja no existeix en el títol nou. 
+"talkexists"	=> "S'ha reanomenat la pàgina amb èxit, però la pàgina de discussió no s'ha pogut moure car ja no existeix en el títol nou.
 
 Incorporeu-les manualment, si us plau.",
 "movedto"		=> "reanomenat a",
@@ -868,10 +793,10 @@ Incorporeu-les manualment, si us plau.",
 "talkpagemoved" =>  "També ha estat reanomenada la pàgina de discussió corresponent.",
 "talkpagenotmoved" => "La pàgina de discussió corresponent <strong>no</strong> ha estat reanomenada.",
 #Math
-	'mw_math_png' => "Produeix sempre PNG",
-	'mw_math_simple' =>"HTML si és molt simple, si no PNG",
-	'mw_math_html' => "HTML si és possible, si no PNG",
-	'mw_math_source' => "Deixa com a TeX (per a navegadors de text)",
+'mw_math_png' => "Produeix sempre PNG",
+'mw_math_simple' =>"HTML si és molt simple, si no PNG",
+'mw_math_html' => "HTML si és possible, si no PNG",
+'mw_math_source' => "Deixa com a TeX (per a navegadors de text)",
 
 );
 
@@ -896,9 +821,8 @@ class LanguageCa extends LanguageUtf8 {
 		return $wgSkinNamesCa;
 	}
 
-	        
-	function shortdate( $ts, $adj = false )
-	{
+
+	function shortdate( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = (0 + substr( $ts, 6, 2 )) . " " .$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . ", " .
@@ -906,8 +830,7 @@ class LanguageCa extends LanguageUtf8 {
 		return $d;
 	}
 
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = (0 + substr( $ts, 6, 2 )) . " de " .$this->getMonthName( substr( $ts, 4, 2 ) ) . ", " .
@@ -915,39 +838,18 @@ class LanguageCa extends LanguageUtf8 {
 		return $d;
 	}
 
-	function time( $ts, $adj = false )
-	{
+	function time( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
 		return $t;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		return $this->time( $ts, $adj ) . " " . $this->shortdate( $ts, $adj );
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesCa;
-		return $wgValidSpecialPagesCa;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesCa;
-		return $wgSysopSpecialPagesCa;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesCa;
-		return $wgDeveloperSpecialPagesCa;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesCa;
 		if( isset( $wgAllMessagesCa[$key] ) ) {
 			return $wgAllMessagesCa[$key];
@@ -955,11 +857,11 @@ class LanguageCa extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	function formatNum( $number, $year = false ) {
 		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
 	}
-		
+
 }
 
 ?>
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index d4a0b10eb0f2..515a298e3485 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -30,15 +30,15 @@ class LanguageConverter {
 	 * @param array $flags array defining the custom strings that maps to the flags
      * @access public
      */
-	function LanguageConverter($langobj, $maincode, 
-								$variants=array(), 
-								$variantfallbacks=array(), 
+	function LanguageConverter($langobj, $maincode,
+								$variants=array(),
+								$variantfallbacks=array(),
 								$markup=array(),
 								$flags = array()) {
 		global $wgDBname;
 		$this->mLangObj = $langobj;
 		$this->mMainLanguageCode = $maincode;
-		$this->mVariants = $variants;		
+		$this->mVariants = $variants;
 		$this->mVariantFallbacks = $variantfallbacks;
 		$this->mCacheKey = $wgDBname . ":conversiontables";
 		$m = array('begin'=>'-{', 'flagsep'=>'|', 'codesep'=>':',
@@ -51,7 +51,7 @@ class LanguageConverter {
 	/**
      * @access public
      */
-	function getVariants() { 
+	function getVariants() {
 		return $this->mVariants;
 	}
 
@@ -61,7 +61,7 @@ class LanguageConverter {
 	 * will define zh-cn and zh-tw, but less so for zh-sg or zh-hk.
 	 * when zh-sg is preferred but not defined, we will pick zh-cn
 	 * in this case. right now this is only used by zh.
-	 *	
+	 *
 	 * @param string $v the language code of the variant
 	 * @return string the code of the fallback language or false if there is no fallback
      * @access private
@@ -70,15 +70,15 @@ class LanguageConverter {
 		return $this->mVariantFallbacks[$v];
 	}
 
-	
-	/** 
+
+	/**
      * get preferred language variants.
      * @return string the preferred language code
      * @access public
 	*/
 	function getPreferredVariant() {
 		global $wgUser, $wgRequest;
-		
+
 		if($this->mPreferredVariant)
 			return $this->mPreferredVariant;
 
@@ -89,7 +89,7 @@ class LanguageConverter {
 			return $req;
 		}
 
-		// get language variant preference from logged in users 
+		// get language variant preference from logged in users
 		if(is_object($wgUser) && $wgUser->isLoggedIn() )  {
 			$this->mPreferredVariant = $wgUser->getOption('variant');
 			return $this->mPreferredVariant;
@@ -130,7 +130,7 @@ class LanguageConverter {
 		if(!$this->mTablesLoaded)
 			$this->loadTables();
 
-		if(!$toVariant) 
+		if(!$toVariant)
 			$toVariant = $this->getPreferredVariant();
 		if(!in_array($toVariant, $this->mVariants))
 			return $text;
@@ -147,11 +147,11 @@ class LanguageConverter {
 			$ret .= substr($text, $mstart, $m[1]-$mstart);
 			$ret .= strtr($m[0], $this->mTables[$toVariant]);
 			$mstart = $m[1] + strlen($m[0]);
-		}		
+		}
 		wfProfileOut( $fname );
 		return $ret;
 	}
-    
+
 	/**
      * convert text to all supported variants
      *
@@ -175,8 +175,8 @@ class LanguageConverter {
 
 	/**
 	 * convert text to different variants of a language. the automatic
-	 * conversion is done in autoConvert(). here we parse the text 
-	 * marked with -{}-, which specifies special conversions of the 
+	 * conversion is done in autoConvert(). here we parse the text
+	 * marked with -{}-, which specifies special conversions of the
 	 * text that can not be accomplished in autoConvert()
 	 *
 	 * syntax of the markup:
@@ -184,7 +184,7 @@ class LanguageConverter {
 	 * -{text}- in which case no conversion should take place for text
      *
      * @param string $text text to be converted
-     * @param bool $isTitle whether this conversion is for the article title 
+     * @param bool $isTitle whether this conversion is for the article title
      * @return string converted text
      * @access public
      */
@@ -198,7 +198,7 @@ class LanguageConverter {
 			return $text;
 
 		if($wgDisableLangConversion)
-			return $text; 
+			return $text;
 
 		$mw =& MagicWord::get( MAG_NOTITLECONVERT );
 		if( $mw->matchAndRemove( $text ) )
@@ -282,7 +282,7 @@ class LanguageConverter {
 					/* modify the conversion table for this session*/
 
 					/* fill in the missing variants, if any,
-					    with fallbacks */ 
+					    with fallbacks */
 					foreach($this->mVariants as $v) {
 						if(!array_key_exists($v, $carray)) {
 							$vf = $this->getVariantFallback($v);
@@ -311,7 +311,7 @@ class LanguageConverter {
 			if(array_key_exists(1, $marked))
 				$text .= $this->autoConvert($marked[1]);
 		}
-		
+
 		return $text;
 	}
 
@@ -344,7 +344,7 @@ class LanguageConverter {
 	/**
 	 * if a language supports multiple variants, it is
 	 * possible that non-existing link in one variant
-	 * actually exists in another variant. this function 
+	 * actually exists in another variant. this function
 	 * tries to find it. See e.g. LanguageZh.php
 	 *
 	 * @param string $link the name of the link
@@ -382,7 +382,7 @@ class LanguageConverter {
 
     /**
      * returns language specific hash options
-     * 
+     *
      * @access public
      */
 	function getExtraHashOptions() {
@@ -412,7 +412,7 @@ class LanguageConverter {
 				break;
 			sleep(1);
 		}
-		return $success;		
+		return $success;
 	}
 
 	/**
@@ -429,7 +429,7 @@ class LanguageConverter {
 	/**
      * Load default conversion tables
      * This method must be implemented in derived class
-     * 
+     *
      * @access private
      */
 	function loadDefaultTables() {
@@ -451,7 +451,7 @@ class LanguageConverter {
 			if( !empty( $this->mTables ) ) //all done
 				return;
 		}
-		// not in cache, or we need a fresh reload. 
+		// not in cache, or we need a fresh reload.
 		// we will first load the default tables
 		// then update them using things in MediaWiki:Zhconversiontable/*
 		global $wgMessageCache;
@@ -462,13 +462,13 @@ class LanguageConverter {
 		}
 
 		$this->postLoadTables();
-		
+
 		if($this->lockCache()) {
 			$wgMemc->set($this->mCacheKey, $this->mTables, 43200);
 			$this->unlockCache();
 		}
 	}
-	
+
     /**
      * Hook for post processig after conversion tables are loaded
      *
@@ -477,7 +477,7 @@ class LanguageConverter {
 
     /**
      * Reload the conversion tables
-     * 
+     *
      * @access private
      */
 	function reloadTables() {
@@ -489,7 +489,7 @@ class LanguageConverter {
 
 
 	/**
-     * parse the conversion table stored in the cache 
+     * parse the conversion table stored in the cache
      *
      * the tables should be in blocks of the following form:
 
@@ -498,7 +498,7 @@ class LanguageConverter {
      *			word => word ;
      *			...
      *		}-
-     *	
+     *
      *	to make the tables more manageable, subpages are allowed
      *	and will be parsed recursively if $recursive=true
      *
@@ -517,7 +517,7 @@ class LanguageConverter {
 
 		if(array_key_exists($key, $parsed))
 			return array();
-	
+
 
 		$txt = $wgMessageCache->get( $key, true, true, true );
 
@@ -534,7 +534,7 @@ class LanguageConverter {
 			$b = explode('/', trim($b[0]), 3);
 			if(count($b)==3)
 				$sublink = $b[2];
-			else	
+			else
 				$sublink = '';
 
 			if($b[0] == $linkhead && $b[1] == $code) {
@@ -546,7 +546,7 @@ class LanguageConverter {
 		// parse the mappings in this page
 		$blocks = explode($this->mMarkup['begin'], $txt);
 		array_shift($blocks);
-		$ret = array();	
+		$ret = array();
 		foreach($blocks as $block) {
 			$mappings = explode($this->mMarkup['end'], $block, 2);
 			$stripped = str_replace(array("'", '"', '*','#'), '', $mappings[0]);
@@ -570,7 +570,7 @@ class LanguageConverter {
 				$ret = array_merge($ret, $s);
 			}
 		}
-		
+
 		if ($this->mUcfirst) {
 			foreach ($ret as $k => $v) {
 				$ret[LanguageUtf8::ucfirst($k)] = LanguageUtf8::ucfirst($v);
@@ -582,7 +582,7 @@ class LanguageConverter {
 	/**
 	 * Enclose a string with the "no conversion" tag. This is used by
 	 * various functions in the Parser
-	 * 
+	 *
 	 * @param string $text text to be tagged for no conversion
 	 * @return string the tagged text
 	*/
@@ -597,23 +597,23 @@ class LanguageConverter {
 	}
 
 	/**
-	 * convert the sorting key for category links. this should make different 
+	 * convert the sorting key for category links. this should make different
 	 * keys that are variants of each other map to the same key
 	*/
 	function convertCategoryKey( $key ) {
 		return $key;
 	}
 	/**
-     * hook to refresh the cache of conversion tables when 
+     * hook to refresh the cache of conversion tables when
      * MediaWiki:conversiontable* is updated
      * @access private
 	*/
 	function OnArticleSaveComplete($article, $user, $text, $summary, $isminor, $iswatch, $section) {
 		$titleobj = $article->getTitle();
-		if($titleobj->getNamespace() == NS_MEDIAWIKI) { 
+		if($titleobj->getNamespace() == NS_MEDIAWIKI) {
             /*
 			global $wgContLang; // should be an LanguageZh.
-			if(get_class($wgContLang) != 'languagezh')	
+			if(get_class($wgContLang) != 'languagezh')
 				return true;
             */
 			$title = $titleobj->getDBkey();
diff --git a/languages/LanguageCs.php b/languages/LanguageCs.php
index 2eaa59b3955d..99a740f6389a 100644
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -11,7 +11,7 @@ require_once( 'LanguageUtf8.php' );
 # See Language.php for notes.
 
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
+	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
 # Yucky hardcoding hack
 switch( $wgMetaNamespace ) {
@@ -24,35 +24,35 @@ default:
 }
 
 /* private */ $wgNamespaceNamesCs = array(
-        NS_MEDIA              => 'Média',
-        NS_SPECIAL            => 'Speciální',
-        NS_MAIN               => '',
-        NS_TALK               => 'Diskuse',
-        NS_USER               => $wgUserNamespace,
-        NS_USER_TALK          => $wgUserNamespace . '_diskuse',
-        NS_PROJECT            => $wgMetaNamespace,
-        NS_PROJECT_TALK	      => $wgMetaNamespace . '_diskuse',
-        NS_IMAGE              => 'Soubor',
-        NS_IMAGE_TALK         => 'Soubor_diskuse',
-        NS_MEDIAWIKI          => 'MediaWiki',
-        NS_MEDIAWIKI_TALK     => 'MediaWiki_diskuse',
-        NS_TEMPLATE           => 'Šablona',
-        NS_TEMPLATE_TALK      => 'Šablona_diskuse',
-        NS_HELP               => 'Nápověda',
-        NS_HELP_TALK          => 'Nápověda_diskuse',
-        NS_CATEGORY           => 'Kategorie',
-        NS_CATEGORY_TALK      => 'Kategorie_diskuse',
+	NS_MEDIA              => 'Média',
+	NS_SPECIAL            => 'Speciální',
+	NS_MAIN               => '',
+	NS_TALK               => 'Diskuse',
+	NS_USER               => $wgUserNamespace,
+	NS_USER_TALK          => $wgUserNamespace . '_diskuse',
+	NS_PROJECT            => $wgMetaNamespace,
+	NS_PROJECT_TALK	      => $wgMetaNamespace . '_diskuse',
+	NS_IMAGE              => 'Soubor',
+	NS_IMAGE_TALK         => 'Soubor_diskuse',
+	NS_MEDIAWIKI          => 'MediaWiki',
+	NS_MEDIAWIKI_TALK     => 'MediaWiki_diskuse',
+	NS_TEMPLATE           => 'Šablona',
+	NS_TEMPLATE_TALK      => 'Šablona_diskuse',
+	NS_HELP               => 'Nápověda',
+	NS_HELP_TALK          => 'Nápověda_diskuse',
+	NS_CATEGORY           => 'Kategorie',
+	NS_CATEGORY_TALK      => 'Kategorie_diskuse',
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsCs = array(
-        'Žádný', 'Leží vlevo', 'Leží vpravo', 'Visí vlevo'
+	'Žádný', 'Leží vlevo', 'Leží vpravo', 'Visí vlevo'
 );
 
 /* private */ $wgSkinNamesCs = array(
-        'standard'            => 'Standard',
-        'nostalgia'           => 'Nostalgie',
-        'cologneblue'         => 'Kolínská modř',
-        'chick'               => 'Kuře'
+	'standard'            => 'Standard',
+	'nostalgia'           => 'Nostalgie',
+	'cologneblue'         => 'Kolínská modř',
+	'chick'               => 'Kuře'
 ) + $wgSkinNamesEn;
 
 # Hledání knihy podle ISBN
@@ -62,59 +62,6 @@ default:
     'Státní technická knihovna' => 'http://www.stk.cz/cgi-bin/dflex/CZE/STK/BROWSE?A=01&V=$1'
 ) + $wgBookstoreListEn;
 
-# *Neměnit jména v levém sloupci, jsou to interní jména programových
-# funkcí. Pravý sloupec  obsahuje několik mezer, které mají tak zůstat,
-# aby se tyto funkce nezařadily do seznamu speciálních stránek.
-
-/* private */ $wgValidSpecialPagesCs = array(
-  'Userlogin'           => 'Přihlásit se',
-  'Userlogout'          => 'Odhlásit se',
-  'Preferences'         => 'Nastavení',
-  'Watchlist'           => 'Sledované stránky',
-  'Recentchanges'       => 'Poslední změny',
-  'Upload'              => 'Načíst soubor',
-  'Imagelist'           => 'Seznam načtených souborů',
-  'Listusers'           => 'Uživatelé',
-  'Statistics'          => 'Statistika',
-  'Randompage'          => 'Náhodná stránka',
-
-# todo
-  'Lonelypages'         => 'Sirotčí články',
-  'Unusedimages'        => 'Nepoužívané obrázky a soubory',
-  'Popularpages'        => 'Nejnavštěvovanější stránky',
-  'Wantedpages'         => 'Žádoucí články',
-  'Shortpages'          => 'Nejkratší články',
-  'Longpages'           => 'Nejdelší články',
-  'Newpages'            => 'Nejnovější články',
-  'Ancientpages'        => 'Nejdéle needitované články',
-  'Intl'                => 'Mezijazykové odkazy',
-  'Allpages'            => 'Všechny stránky',
-
-  'Ipblocklist'         => 'Seznam blokovaných IP adres',
-  'Maintenance'         => 'Nástroje pro opravy a údržbu',
-  'Specialpages'        => 'Speciální stránky',
-  'Contributions'       => 'Příspěvky uživatele',
-  'Emailuser'           => 'Poslat e-mail',
-  'Whatlinkshere'       => 'Odkazuje sem',
-  'Recentchangeslinked' => 'Související změny',
-  'Movepage'            => 'Přesunout stránku',
-  'Booksources'         => 'Zdroje knih',
-  'Categories'          => 'Kategorie',
-  'Export'              => 'Exportovat stránky',
-  'Version'             => 'Verze',
-);
-
-/* private */ $wgSysopSpecialPagesCs = array(
-  'Blockip'             => 'Zablokovat uživatele',
-  'Asksql'              => 'Dotaz pomocí SQL',
-  'Undelete'            => 'Obnovit smazanou stránku'
-);
-
-/* private */ $wgDeveloperSpecialPagesCs = array(
-  'Lockdb'              => 'Zamknout databázi',
-  'Unlockdb'            => 'Odemknout databázi',
-  'Debug'               => 'Zobrazit ladící informace'
-);
 
 # Note to translators:
 #   Please include the English words as synonyms.  This allows people
@@ -215,7 +162,6 @@ default:
 'article' => 'Obsahová stránka',
 'help'                  => 'Nápověda',
 'helppage'              => '{{ns:12}}:Obsah',
-'wikititlesuffix' => '{{SITENAME}}',
 'bugreports'    => 'Hlášení chyb',
 'bugreportspage' => '{{ns:4}}:Chyby',
 'sitesupport'   => 'Sponzorství',
@@ -298,8 +244,6 @@ default:
 'sysoptext'      => 'Žádaný úkon může provést jen správce. Podívejte se prosím na $1.',
 'developertitle' => 'Jen pro vývojáře',
 'developertext'  => 'Žádaný úkon může provést jen vývojář. Podívejte se prosím na $1.',
-'bureaucrattitle' => 'Pouze pro byrokraty',
-'bureaucrattext'  => 'Žádaný úkon může provést jen byrokrat.',
 'nbytes'          => '$1 B',
 'ok'              => 'OK',
 'sitetitle'       => '{{SITENAME}}',
@@ -344,12 +288,12 @@ default:
 Příčinou může být chyba v programu.
 Poslední dotaz byl:
 <blockquote><tt>$1</tt></blockquote>
-z funkce \'<tt>$2</tt>\'. 
+z funkce \'<tt>$2</tt>\'.
 MySQL vrátil chybu \'<tt>$3: $4</tt>\'.',
 'dberrortextcl' => 'Při dotazu do databáze došlo k syntaktické chybě.
 Poslední dotaz byl:
 <blockquote><tt>$1</tt></blockquote>
-z funkce \'<tt>$2</tt>\'. 
+z funkce \'<tt>$2</tt>\'.
 MySQL vrátil chybu \'<tt>$3: $4</tt>\'.',
 'noconnect'             => 'Promiňte! Tato wiki má nějaké technické potíže a nepodařilo se připojit k databázovém serveru.<br />
 $1',
@@ -372,7 +316,7 @@ Správce, který databázi zamkl, zanechal následující zprávu:
 'filedeleteerror' => 'Nebylo možné smazat soubor „$1“.',
 'filenotfound'  => 'Nebylo možné najít soubor „$1“.',
 'unexpected'    => 'Neočekávaná hodnota: "$1"="$2".',
-'formerror'             => 'Chyba: nebylo možné odeslat formulář',   
+'formerror'             => 'Chyba: nebylo možné odeslat formulář',
 'badarticleerror' => 'Tento úkon nelze použít na tento článek.',
 'cannotdelete'  => 'Nebylo možné smazat zvolenou stránku ani soubor. (Možná už byla smazána někým jiným.)',
 'badtitle'              => 'Neplatný název',
@@ -385,7 +329,6 @@ Funkce: $1<br />
 Dotaz: $2',
 'viewsource' => ' Ukázat zdroj',
 'protectedtext' => 'Tato stránka byla zamčena, takže ji nelze editovat; je mnoho důvodů, proč se tak mohlo stát. Vizte prosím [[{{ns:4}}:Stránka je zamčena]]. Můžete si prohlédnout a okopírovat zdrojový text této stránky:',
-'seriousxhtmlerrors' => 'Tidy nalezl v xhtml kódu závažné chyby.',
 'sqlhidden' => '(SQL dotaz skryt)',
 
 # Login and logout pages
@@ -395,7 +338,7 @@ Dotaz: $2',
 Tento počítač může být používán k prohlížení a editaci {{grammar:2sg|{{SITENAME}}}} bez uživatelského jména, nebo pro přihlášení jiného uživatele. Upozorňujeme, že některé stránky se mohou i nadále zobrazovat, jako byste byli dosud přihlášeni. Tento jev potrvá do smazání cache vašeho prohlížeče.',
 
 'welcomecreation' => '<h2>Vítejte, $1!</h2> Váš účet je vytvořen.
-<font color=\'red\'>Nezapomeňte si upravit své nastavení!</font>',
+<strong>Nezapomeňte si upravit své nastavení!</strong>',
 
 'loginpagetitle' => 'Přihlaste se', #FIXME
 'yourname'              => 'Název vašeho účtu', #FIXME buď heslo nebo jméno uživatele nebo název účtu atd.?
@@ -406,7 +349,7 @@ Tento počítač může být používán k prohlížení a editaci {{grammar:2sg
 'externaldberror'      => 'Buď nastalo chyba v databázi pro externí autentikaci, nebo nemáte dovoleno měnit svůj externí účet.',
 'remembermypassword' => 'Pamatovat si heslo mezi jednotlivými přihlášeními.',
 'loginproblem'  => '<b>Nastal problém při vašem přihlášení.</b><br />Zkuste to znovu!',
-'alreadyloggedin' => "<font color=\'red\'><b>Uživateli $1, již jste přihlášen!</b></font><br />\n",
+'alreadyloggedin' => "<strong>Uživateli $1, již jste přihlášen!</strong><br />\n",
 
 'login'                 => 'Přihlašte se', #FIXME, what exactly do the following go to?
 'loginprompt'   => 'K přihlášení do {{grammar:2sg|{{SITENAME}}}} musíte mít povoleny cookies.',
@@ -555,7 +498,7 @@ okénko. Tento problém mít nebudete, pokud budete klikat jen na modré odkazy.
 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
 'anontalkpagetext' => "---- ''Toto je diskusní stránka anonymního uživatele, který si dosud nevytvořil účet nebo ho nepoužívá. Musíme proto použít číselnou [[w:cs:IP adresa|IP adresu]] k jeho identifikaci. Taková IP adresa může být sdílena několika uživateli. Pokud jste anonymní uživatel a cítíte, že jsou Vám adresovány irrelevantní komentáře, prosím [[Special:Userlogin|vytvořte si účet nebo se přihlaste]] a tím se vyhnete budoucí záměně s jinými anonymními uživateli.''",
 'noarticletext' => '(Článek zatím neobsahuje text)',
-'clearyourcache' => "'''Poznámka:''' Po uložení musíte smazat cache vašeho prohlížeče, jinak změny neuvidíte: '''Mozilla:''' klikněte na ''reload'' (nebo ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
+'clearyourcache' => "'''Poznámka:''' Po uložení musíte smazat cache vašeho prohlížeče, jinak změny neuvidíte: '''Mozilla / Firefox:''' ''Ctrl-Shift-R'', '''IE:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror''': ''F5''.",
 'usercssjsyoucanpreview' => '<strong>Tip:</strong> Použijte tlačítko „Ukázat náhled“ k testování vašeho nového css/js před uložením.',
 'usercsspreview' => "'''Pamatujte, že si prohlížíte jen náhled vašeho uživatelského css, neboť ještě nebylo uloženo!'''",
 'userjspreview' => "'''Pamatujte, že testujete a prohlížíte pouze náhled vašeho uživatelského javascriptu, dosud nebyl uložen!'''",
@@ -673,8 +616,7 @@ $2 Vypsat přesměrování &nbsp; Hledat $3 $9',
 
 Podívejte se na [[{{ns:12}}:Uživatelské nastavení]] pro popis možností.',
 'prefsreset'    => 'Nastavení vráceno.', #FIXME: Hmm...
-'qbsettings'    => 'Nastavení lišty nástrojů', 
-'qbsettingsnote'	=> 'Toto nastavení funguje pouze ve stylech „Standard“ a „Kolínská modř“.',
+'qbsettings'    => 'Nastavení lišty nástrojů',
 'changepassword' => 'Změna hesla',
 'skin'                  => 'Styl',
 
@@ -758,7 +700,7 @@ Nezvolené skupiny nebudou změněny. Skupinu můžete vyřadit z vybraných pom
 'userrights-logcomment' => 'Změněno členství ve skupinách z $1 na $2',
 
 # Default group names and descriptions
-# 
+#
 'group-anon-name'       => 'Anonym',
 'group-anon-desc'       => 'Anonymní uživatelé',
 'group-loggedin-name'   => 'Uživatel',
@@ -846,11 +788,9 @@ váš uživatelský účet zablokován.",
 'filedesc'              => 'Popis',
 'filestatus' => 'Autorská práva',
 'filesource' => 'Zdroj',
-'affirmation'   => 'Potvrzuji, že majitel autorských práv k tomuto souboru souhlasí s poskytnutím licence podle $1.',
 'copyrightpage' => '{{ns:4}}:Autorské právo',
 'copyrightpagename' => 'podmínek {{grammar:2sg|{{SITENAME}}}}',
 'uploadedfiles' => 'Načtené soubory',
-'noaffirmation' => 'Musíte potvrdit, že uložení tohoto souboru neporušuje autorské právo.',
 'ignorewarning' => 'Ignorovat varování a uložit soubor.',
 'minlength'             => 'Jméno souboru se musí skládat nejméně ze tří písmen.',
 'illegalfilename'       => 'Název souboru "$1" obsahuje znaky, které nejsou povoleny v názvech stránek. Prosím přejmenujte soubor a zkuste jej nahrát znovu.',
@@ -933,8 +873,6 @@ váš uživatelský účet zablokován.",
 'missinglanguagelinks'  => 'Chybějící mezijazykové odkazy',
 'missinglanguagelinksbutton'    => 'Nalézt chybějící mezijazykové odkazy pro',
 'missinglanguagelinkstext'      => 'Těmto článkům chybí odkaz na ekvivalent v jazyce $1. Přesměrování a podstránky zde <i>nejsou</i> zobrazeny.',
-'linkstodisambig' => 'Odkazy na rozcestníky',
-'linkstodisambigtext' => 'Následující stránky odkazují na <i>stránku s rozcestníky</i>. Místo toho by měly by odkazovat na náležitou stránku.',
 
 # Miscellaneous special pages
 #
@@ -972,12 +910,10 @@ váš uživatelský účet zablokován.",
 'unusedimagestext' => '<p>Jiné WWW stránky mohou odkazovat přímo pomocí URL, na takové odkazy se v tomto seznamu nebere zřetel.',
 'categoriespagetext' => 'Ve wiki existují následující kategorie:',
 'booksources'   => 'Zdroje knih',
-'booksourcetext' => 'Následují odkazy na jiné WWW stránky, na kterých se prodávají knihy, nebo které mohou obsahovat další informace o knize, kterou hledáte. {{SITENAME}} nemá s těmito prodejnami žádný vztah, tyto odkazy nelze chápat jako doporučení.', 
+'booksourcetext' => 'Následují odkazy na jiné WWW stránky, na kterých se prodávají knihy, nebo které mohou obsahovat další informace o knize, kterou hledáte. {{SITENAME}} nemá s těmito prodejnami žádný vztah, tyto odkazy nelze chápat jako doporučení.',
 'userrights' => 'Správa uživatelských skupin',
 'groups' => 'Uživatelské skupiny',
 'data'	=> 'Data',
-'userlevels'	=> 'Správa uživatelských práv',
-'grouplevels' => 'Správa uživatelských skupin',
 'isbn'  => 'ISBN',
 'rfcurl' =>  'http://www.faqs.org/rfcs/rfc$1.html',
 'pubmedurl' =>  'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1',
@@ -993,7 +929,6 @@ Zobrazení můžete zůžit výběrem typu záznamu, uživatelského jména nebo
 # Special:Allpages
 'nextpage'          => 'Další stránka ($1)',
 'allpagesfrom'		=> 'Všechny stránky počínaje od:',
-'articlenamespace'  => '(články)',
 'allarticles'		=> 'Všechny články',
 'allnonarticles'	=> 'Všechny nečlánky',
 'allinnamespace'	=> 'Všechny stránky (jmenný prostor $1)',
@@ -1179,12 +1114,11 @@ Stiskněte tlačítko „zpět“, obnovte stránku, ze které jste přišli a z
 'blockiptext'   => 'Tento formulář slouží k zablokování editací z konkrétní IP adresy nebo uživatelského jména. Toto by mělo být používáno jen v souladu s [[{{ns:4}}:blokování|pravidly blokování]]. Udejte přesný důvod níže (například ocitujte, které stránky byly poškozeny). Čas pro vypršení se udává ve standardním formátu GNU, který je popsán na [http://www.gnu.org/software/tar/manual/html_chapter/tar_7.html tar manual], např. „1 hour“, „2 days“, „next Wednesday“, „1 January 2017“. Alternativně můžete použít „indefinite“ (na dobu neurčitou) nebo „infinite“ (navždy). Pro informaci, jak zablokovat rozsah adres, se podívejte na [[meta:Range blocks]]. Pro odblokování se podívejte na [[Special:Ipblocklist|seznam blokovaných IP adres]].',
 'ipaddress'			  => 'IP adresa',
 'ipadressorusername' => 'IP adresa nebo uživatelské jméno',		#TODO: remove
-'ipaddressorusername' => 'IP adresa nebo uživatelské jméno',
+#'ipaddressorusername' => 'IP adresa nebo uživatelské jméno',
 'ipbexpiry'             => 'Vyprší',
 'ipbreason'             => 'Důvod',
 'ipbsubmit'             => 'Zablokovat',
 'badipaddress'  => 'Neplatná IP adresa',
-'noblockreason' => 'Nutno uvést důvod zablokování.',
 'blockipsuccesssub' => 'Zablokování uspělo',
 'blockipsuccesstext' => 'Uživatel „$1“ je zablokován. <br />Podívejte se na [[Special:Ipblocklist|seznam zablokovaných]], [[Project:Kniha zablokování]] zaznamenává všechny podobné úkony.',
 'unblockip'             => 'Odblokovat IP adresu',
@@ -1229,18 +1163,6 @@ Stiskněte tlačítko „zpět“, obnovte stránku, ze které jste přišli a z
 <br />Nezapomeňte ji po opravách odemknout.',
 'unlockdbsuccesstext' => 'Databáze {{grammar:2sg|{{SITENAME}}}} je odemčena.',
 
-# SQL query
-#
-'asksql'                => 'SQL dotaz',
-'asksqltext'    => 'Pomocí tohoto formuláře lze provést přímý dotaz do databáze.
-Pro řetězcové literály použijte apostrofy (\'takto\').
-Tato funkce může výrazně zatěžovat server, proto ji používejte s rozvahou.',
-'sqlislogged'   => 'Uvědomte si prosím, že všechny dotazy se zaznamenávají.',
-'sqlquery'              => 'Zadejte dotaz',
-'querybtn'              => 'Provést',
-'selectonly'    => 'Povoleny jsou dotazy pouze pro čtení.',
-'querysuccessful' => 'Dotaz úspěšně proveden.',
-
 # Make sysop
 'makesysoptitle'        => 'Učinit uživatele správcem',
 'makesysoptext'         => 'Tento formulář je používán byrokraty pro změnu obyčejného uživatele na správce. Vepište jméno uživatele do políčka a stiskněte tlačítko.',
@@ -1281,7 +1203,6 @@ Tato funkce může výrazně zatěžovat server, proto ji používejte s rozvaho
 'val_validation_of' => 'Hodnocení stránky „$1“',
 'val_revision_of' => 'Verze $1',
 'val_revision_changes_ok' => 'Vaše hodnocení bylo uloženo!',
-'val_rev_stats_link' => 'Statistiky hodnocení pro „$1“ vizte <a href="$2">zde</a>.',
 'val_revision_stats_link' => '(<a href="$1">podrobnosti</a>)',
 'val_iamsure' => 'Jste si opravdu jisti?',
 'val_clear_old' => 'Smazat moje starší hodnocení',
@@ -1343,7 +1264,7 @@ V těchto případech musíte přesunout nebo sloučit stránky manuálně, jest
 'movereason'	=> 'Důvod',
 'revertmove'	=> 'vrátit',
 'delete_and_move' => 'Smazat a přesunout',
-'delete_and_move_text'	=> 
+'delete_and_move_text'	=>
 '==Je potřeba smazání==
 
 Cílová stránka „[[$1]]“ již existuje. Přejete si ji smazat pro uvolnění místa pro přesun?',
@@ -1409,13 +1330,13 @@ Cílová stránka „[[$1]]“ již existuje. Přejete si ji smazat pro uvolněn
 
 # Attribution
 
-'anonymous' => "Anonymní uživatel(é) $wgSitename",
-'siteuser' => "Uživatel $wgSitename $1",
+'anonymous' => "Anonymní uživatel(é) {{SITENAME}}",
+'siteuser' => "Uživatel {{SITENAME}} $1",
 'lastmodifiedby' => 'Tuto stránku naposledy měnil $2 v $1.',
 'and' => 'a',
 'othercontribs' => 'Založeno na textu od uživatele $1.',
 'others' => 'další',
-'siteusers' => "Uživatel(é) $wgSitename $1",
+'siteusers' => "Uživatel(é) {{SITENAME}} $1",
 'creditspage' => 'Zásluhy za stránku',
 'nocredits' => 'K této stránce neexistuje informace o zásluhách.',
 
@@ -1536,7 +1457,6 @@ ta['ca-nstab-category'] = new Array('c','Zobrazit kategorii.');",
 'tog-enotifminoredits' 			=> 'Poslat e-mail i pro menší editace (které jinak nezpůsobují odeslání e-mailu)',
 'tog-enotifrevealaddr' 			=> 'Prozradit mou e-mailovou adresu v upozorňujících e-mailech (při mých změnách to umožňuje sledujícím uživatelům rychle mi odpovědět)',
 'tog-shownumberswatching' 		=> 'Zobrazovat počet sledujících uživatelů (v posledních změnách, sledovaných stránkách a patičkách stránek',
-'tog-showupdated'				=> 'Zobrazit značku úprav',
 'tog-externaleditor'			=> 'Implicitně používat externí editor',
 'tog-externaldiff'				=> 'Implicitně používat externí porovnávací program',
 
@@ -1710,9 +1630,6 @@ ta['ca-nstab-category'] = new Array('c','Zobrazit kategorii.');",
 'exif-planarconfiguration-1' => 'chunky',
 'exif-planarconfiguration-2' => 'planar',
 
-'exif-resolutionunit-2' => 'palce',
-'exif-resolutionunit-3' => 'centimetry',
-
 'exif-colorspace-1' => 'sRGB',
 'exif-colorspace-ffff.h' => 'FFFF.H',
 
@@ -1882,104 +1799,75 @@ kódu vyprší $4.',
 
 class LanguageCs extends LanguageUtf8 {
 
-        function getBookstoreList () {
-                global $wgBookstoreListCs ;
-                return $wgBookstoreListCs ;
-        }
-
-        function getNamespaces() {
-                global $wgNamespaceNamesCs;
-                return $wgNamespaceNamesCs;
-        }
-
-        function getNsIndex( $text ) {
-                global $wgNamespaceNamesCs;
-
-                foreach ( $wgNamespaceNamesCs as $i => $n ) {
-                        if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
-                }
-                return false;
-        }
-
-        function getQuickbarSettings() {
-                global $wgQuickbarSettingsCs;
-                return $wgQuickbarSettingsCs;
-        }
-
-        function getSkinNames() {
-                global $wgSkinNamesCs;
-                return $wgSkinNamesCs;
-        }
-
-/*
-        function &getMagicWords()
-        {
-            global $wgMagicWordsCs;
-            return $wgMagicWordsCs;
-        }
-*/
-
-        # Datové a časové funkce možno upřesnit podle jazyka
-        # TODO: Umožnit nastavování formátu data a času.
-        function date( $ts, $adj = false )
-        {
-                if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-
-                $d = (0 + substr( $ts, 6, 2 )) . '. ' .
-                $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-                  ' ' . 
-                  substr( $ts, 0, 4 );
-                return $d;
-        }
-
-        function getValidSpecialPages()
-        {
-                global $wgValidSpecialPagesCs;
-                return $wgValidSpecialPagesCs;
-        }
-
-        function getSysopSpecialPages()
-        {
-                global $wgSysopSpecialPagesCs;
-                return $wgSysopSpecialPagesCs;
-        }
-
-        function getDeveloperSpecialPages()
-        {
-                global $wgDeveloperSpecialPagesCs;
-                return $wgDeveloperSpecialPagesCs;
-        }
-
-        function getMessage( $key )
-        {
-                global $wgAllMessagesCs;
-                if(array_key_exists($key, $wgAllMessagesCs))
-                        return $wgAllMessagesCs[$key];
-                else
-                        return parent::getMessage($key);
-        }
-
-        function getAllMessages()
-        {
-                global $wgAllMessagesCs;
-                return $wgAllMessagesCs;
-        }
-
-        function checkTitleEncoding( $s ) {
-                global $wgInputEncoding;
-
-                # Check for non-UTF-8 URLs; assume they are WinLatin2
-                $ishigh = preg_match( '/[\x80-\xff]/', $s);
-                $isutf = ($ishigh ? preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
-                '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ) : true );
-
-                if( $ishigh and !$isutf ) {
-                        return iconv( 'cp1250', 'utf-8', $s );
-				}
-
-                return $s;
-        }
-	
+	function getBookstoreList () {
+		global $wgBookstoreListCs ;
+		return $wgBookstoreListCs ;
+	}
+
+	function getNamespaces() {
+		global $wgNamespaceNamesCs;
+		return $wgNamespaceNamesCs;
+	}
+
+	function getNsIndex( $text ) {
+		global $wgNamespaceNamesCs;
+
+		foreach ( $wgNamespaceNamesCs as $i => $n ) {
+			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
+		}
+		return false;
+	}
+
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsCs;
+		return $wgQuickbarSettingsCs;
+	}
+
+	function getSkinNames() {
+		global $wgSkinNamesCs;
+		return $wgSkinNamesCs;
+	}
+
+	# Datové a časové funkce možno upřesnit podle jazyka
+	# TODO: Umožnit nastavování formátu data a času.
+	function date( $ts, $adj = false ) {
+		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+
+		$d = (0 + substr( $ts, 6, 2 )) . '. ' .
+		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
+		  ' ' .
+		  substr( $ts, 0, 4 );
+		return $d;
+	}
+
+	function getMessage( $key ) {
+		global $wgAllMessagesCs;
+		if(array_key_exists($key, $wgAllMessagesCs))
+			return $wgAllMessagesCs[$key];
+		else
+			return parent::getMessage($key);
+	}
+
+	function getAllMessages() {
+		global $wgAllMessagesCs;
+		return $wgAllMessagesCs;
+	}
+
+	function checkTitleEncoding( $s ) {
+		global $wgInputEncoding;
+
+		# Check for non-UTF-8 URLs; assume they are WinLatin2
+		$ishigh = preg_match( '/[\x80-\xff]/', $s);
+		$isutf = ($ishigh ? preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
+		'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ) : true );
+
+		if( $ishigh and !$isutf ) {
+			return iconv( 'cp1250', 'utf-8', $s );
+	}
+
+		return $s;
+	}
+
 	var $digitTransTable = array(
 			',' => "\xc2\xa0", // @bug 2749
 			'.' => ','
@@ -1989,8 +1877,8 @@ class LanguageCs extends LanguageUtf8 {
 		return strtr($number, $this->digitTransTable);
 	}
 
-        # Grammatical transformations, needed for inflected languages
-        # Invoked by putting {{grammar:case|word}} in a message
+		# Grammatical transformations, needed for inflected languages
+		# Invoked by putting {{grammar:case|word}} in a message
 		function convertGrammar( $word, $case ) {
 			# allowed values for $case:
 			#	1sg, 2sg, ..., 7sg -- nominative, genitive, ... (in singular)
diff --git a/languages/LanguageCsb.php b/languages/LanguageCsb.php
index 62a3106057bc..b2452115e753 100644
--- a/languages/LanguageCsb.php
+++ b/languages/LanguageCsb.php
@@ -30,11 +30,9 @@ $wgNamespaceNamesCsb = array(
 '1movedto2' => '$1 przeniesłé do $2',
 'aboutpage' => '{{ns:4}}:Ò_Wiki',
 'aboutsite' => 'Ò {{SITENAME}}',
-'aboutwikipedia' => 'Ò Wiki',
 'actioncomplete' => 'Òperacëjô wëkònónô',
 'addedwatch' => 'Dodónô do lëstë ùzérónëch',
 'administrators' => '{{ns:4}}:Administratorzë',
-'affirmation' => 'Pòcwierdzajã, ëż majicel autorsczich praw do hewòtnégò lopka\nzgôdzaje sã ùdzelëc licencëji wedle $1.',
 'allmessages' => 'Wszëtczé systemòwé ògłosë',
 'ancientpages' => 'Nôstarszé starnë',
 'and' => 'ë',
@@ -42,13 +40,12 @@ $wgNamespaceNamesCsb = array(
 'anonymous' => 'Anonimòwi brëkòwnik/-cë  Wiki',
 'april-gen' => 'Łżëkwiôta',
 'april' => 'Łżëkwiôt',
-'asksql' => 'SQL-owé zapëtanié',
 'august-gen' => 'Zélnika',
 'august' => 'Zélnik',
 'badfilename' => 'Miono òbrôzka zmienioné na "$1".',
 'badfiletype' => '".$1" nie je nôlepszim fòrmatã lopka.',
 'badipaddress' => 'IP-adresa nie je richtich pòdónô.',
-'blockedtext' => 'Twòje kònto abò/ ë IP-adresa òstałë zascëgòwóné przez $1.\nPòdónô przëczëna to:<br>$2.<p>Bë wëjasnic sprawã zablokòwaniégò mòżesz skòntaktowac sã z $1 abò jińszim [[{{ns:4}}:Administratorzë|administratorã]].',
+'blockedtext' => 'Twòje kònto abò/ ë IP-adresa òstałë zascëgòwóné przez $1.\nPòdónô przëczëna to:<br />$2.<p>Bë wëjasnic sprawã zablokòwaniégò mòżesz skòntaktowac sã z $1 abò jińszim [[{{ns:4}}:Administratorzë|administratorã]].',
 'blockip' => 'Zascëgôj IP-adresã',
 'booksources' => 'Ksążczi',
 'brokenredirects' => 'Zerwóné przeczerowania',
@@ -60,9 +57,7 @@ $wgNamespaceNamesCsb = array(
 'category_header' => 'Artikle w kategòrëji "$1"',
 'category' => 'Kategòrëjô',
 'changepassword' => 'Zmiana parolë',
-'commentedit' => ' (kòmentar)',
 'compareselectedversions' => 'Przërównôj wëbróné wersëje',
-'confirmcheck' => 'Jo, jem gwës, że chcã rëmac.',
 'confirmdelete' => 'Pòcwierdzë rëmónié',
 'confirm' => 'Pòcwierdzë',
 'confirmprotect' => 'Pòcwierdzë zazychrowanié',
@@ -72,7 +67,7 @@ $wgNamespaceNamesCsb = array(
 'contribslink' => 'wkłôd',
 'contribsub' => 'Dlô brëkòwnika $1',
 'contributions' => 'Wkłôd brëkòwników',
-'copyrightwarning' => 'Prosymë wdôrzëc, że przëjimô sã, ëż wszelejaczi\nwkłôd do Wiki je ùżëczóny wedle reglów <i>GNU Free Documentation License</i>\n(szczegóły w $1).  <br>Jeżle nie chcesz, bë Twój tekst bëł dowòlno zmieniwóny przez kòżdégò ë rozpòmiónowóny bez ògrańczeniów, tej nie dôwôj do niegò  doprzińdzeniô w Wiki. Równoczasno òswiôdczôsz, że nen tekst je Twòjim dokazã, abò pòchôdô z materiałów ôrtu <i>public domain</i> abò\n<i>GNU Free Documentation License</i>, abò téż kòmpatibilnégò ôrtu.\n<br><strong>PROSYMË NIE ÙŻIWAC BEZ ZEZWÒLENIÉGÒ MATERIAŁÓW ÒBJIMNIÃTËCH AUTORSCZIM PRAWÃ!</strong>',
+'copyrightwarning' => 'Prosymë wdôrzëc, że przëjimô sã, ëż wszelejaczi\nwkłôd do Wiki je ùżëczóny wedle reglów <i>GNU Free Documentation License</i>\n(szczegóły w $1).  <br />Jeżle nie chcesz, bë Twój tekst bëł dowòlno zmieniwóny przez kòżdégò ë rozpòmiónowóny bez ògrańczeniów, tej nie dôwôj do niegò  doprzińdzeniô w Wiki. Równoczasno òswiôdczôsz, że nen tekst je Twòjim dokazã, abò pòchôdô z materiałów ôrtu <i>public domain</i> abò\n<i>GNU Free Documentation License</i>, abò téż kòmpatibilnégò ôrtu.\n<br /><strong>PROSYMË NIE ÙŻIWAC BEZ ZEZWÒLENIÉGÒ MATERIAŁÓW ÒBJIMNIÃTËCH AUTORSCZIM PRAWÃ!</strong>',
 'copyright' => 'Zamkłosc hewòtny starnë je ùżëczónô wedle reglów $1.',
 'couldntremove' => 'Ni móg rëmac pòzycëje "$1"...',
 'createaccount' => 'Założë nowé kònto',
@@ -123,7 +118,6 @@ $wgNamespaceNamesCsb = array(
 'filesource' => 'Zdrój',
 'fileuploaded' => 'Lopk"$1" òstôł wladowóny.\nBiôj, prosymë, do starnë òpisënkù lopka ($2) ë pòdôj tikającé gò infòrmacëje\ntaczé jak: pòchòdzenié lopka, czedë ë przez kògò òstôł ùtworzony, ôs dëcht co le ò nim wiész, a wëdôwô Cë sã wôżné.',
 'formerror' => 'Fela: ni mòże wëslac fòrmùlara',
-'fromwikipedia' => 'Z Wikipediji, wòlny encyklopediji.',
 'getimagelist' => 'zladënk lëstë lopków',
 'go' => 'Biôj!',
 'guesstimezone' => 'Wezmi z przezérnika',
@@ -138,12 +132,11 @@ $wgNamespaceNamesCsb = array(
 'ilsubmit' => 'Szëkôj',
 'imagelinks' => 'Lënczi do lopka',
 'imagelist' => 'Lësta òbrôzków',
-'image' => 'Òbrôzk',
 'imagepage' => 'Starna òbrôzka',
 'imagereverted' => 'Przëwôrcenié wczasniészi wersëje darzëło sã.',
 'imgdelete' => 'rëmôj',
 'imgdesc' => 'òpisënk',
-'imghistlegend' => 'Legenda: (aktualny) = to je aktualny lopk, (rëmôj) = rëmôj\nną starszą wersëjã, (przëwôrcë) = przëwôrcë ną starszą wersëjã.\n<br><i>Klëkni na datum bë òbôczëc jaczé lopczi bëlë wladowóné òb nen dzéń</i>.',
+'imghistlegend' => 'Legenda: (aktualny) = to je aktualny lopk, (rëmôj) = rëmôj\nną starszą wersëjã, (przëwôrcë) = przëwôrcë ną starszą wersëjã.\n<br /><i>Klëkni na datum bë òbôczëc jaczé lopczi bëlë wladowóné òb nen dzéń</i>.',
 'imghistory' => 'Historëjô lopka',
 'import' => 'Impòrtëjë starnë',
 'internalerror' => 'Bënowô fela',
@@ -257,7 +250,6 @@ $wgNamespaceNamesCsb = array(
 'qbfind' => 'Nalézë',
 'qbmyoptions' => 'Mòje òptacëje',
 'qbspecialpages' => 'Specjalné starnë',
-'querybtn' => 'Wëslë zapëtanié',
 'randompage' => 'Kawlowô starna',
 'rcloaderr' => 'Ladëjë slédné edicëje',
 'readonly' => 'Baza pòdôwków je zablokòwónô',
@@ -277,10 +269,7 @@ $wgNamespaceNamesCsb = array(
 'rollbacklink' => 'copnij',
 'savearticle' => 'Zapiszë artikel',
 'savefile' => 'Zapiszë lôpk',
-'searchhelppage' => '{{ns:4}}:Szëkba',
-'searchingwikipedia' => 'Szëkba w Wiki',
 'search' => 'Szëkba',
-'sectionedit' => ' (wëjimk)',
 'september-gen' => 'Séwnika',
 'september' => 'Séwnik',
 'servertime' => 'Aktualny czas serwera',
@@ -297,22 +286,11 @@ $wgNamespaceNamesCsb = array(
 'specialpage' => 'Specjalnô starna',
 'specialpages' => 'Specjalné starnë',
 'spheading' => 'Specjalné nôpisma',
-'sqlquery' => 'Pòdôj zapëtanié',
 'successfulupload' => 'Wladënk darzëł sã',
 'talk' => 'Diskùsëjô',
 'timezonelegend' => 'Czasowô cona',
 'toc' => 'Spisënk zamkłoscë',
 'toolbox' => 'Przërëchtënczi',
-'tooltip-emailuser' => 'Wëslë emaila do negò brëkòwnika',
-'tooltip-logout' => 'Wëlogùjë [alt-o]',
-'tooltip-move' => 'Przeniesë ną starnã [alt-m]',
-'tooltip-mytalk' => 'Mòja starna diskùsëji [alt-n]',
-'tooltip-preferences' => 'Mòje preferencëje',
-'tooltip-randompage' => 'Zladëjë kawlową starnã [alt-x]',
-'tooltip-specialpages' => 'Zestôwk wszëtczich specjalnëch starnów [alt-q]',
-'tooltip-unwatch' => 'Rëmôj ną starnã z lëstë ùzérónëch [alt-w]',
-'tooltip-upload' => 'Wladëjë òbrôzczi/ mùltimedia [alt-u]',
-'tooltip-viewsource' => 'Na starna je zazychrowónô. Mòżesz czëtac ji zdrój. [alt-e]',
 'tooltip-watch' => 'Dodôj ną starnã do lëstë ùzérónëch [alt-w]',
 'ucnote' => 'Hewò je lësta slédnëch <b>$1</b> edicëjów dokònónëch przez\nbrëkòwnika òbczôs òstatnëch <b>$2</b> dni.',
 'unprotectcomment' => 'Przëczëna òdzychrowaniô',
diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 98921e20b707..94f8355e7b88 100644
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -7,20 +7,20 @@
 /* Cymraeg - Welsh */
 
 /* private */ $wgNamespaceNamesCy = array(
-	-2 => "Media",
-	-1 => "Arbennig",
-	0  => "",
-	1  => "Sgwrs",
-	2  => "Defnyddiwr",
-	3  => "Sgwrs_Defnyddiwr",
-	4  => $wgMetaNamespace,
-	5  => "Sgwrs_".$wgMetaNamespace,
-	6  => "Delwedd",
-	7  => "Sgwrs_Delwedd",
-	8  => "MediaWiki",
-	9  => "Sgwrs_MediaWiki",
-	10  => "Nodyn",
-	11  => "Sgwrs_Nodyn"
+	NS_MEDIA          => "Media",
+	NS_SPECIAL        => "Arbennig",
+	NS_MAIN           => "",
+	NS_TALK           => "Sgwrs",
+	NS_USER           => "Defnyddiwr",
+	NS_USER_TALK      => "Sgwrs_Defnyddiwr",
+	NS_PROJECT        => $wgMetaNamespace,
+	NS_PROJECT_TALK   => "Sgwrs_".$wgMetaNamespace,
+	NS_IMAGE          => "Delwedd",
+	NS_IMAGE_TALK     => "Sgwrs_Delwedd",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "Sgwrs_MediaWiki",
+	NS_TEMPLATE       => "Nodyn",
+	NS_TEMPLATE_TALK  => "Sgwrs_Nodyn"
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsCy = array(
@@ -31,13 +31,7 @@
 	'standard' => "Safonol",
 	'nostalgia' => "Hiraeth",
 	'cologneblue' => "Glas Cwlen",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsCy = array(
 #	"Dim dewis",
@@ -48,88 +42,37 @@
 	"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
 	"Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
 	"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1",
-        "Amazon.co.uk" => "http://www.amazon.co.uk/exec/obidos/ISBN=$1"
+	"Amazon.co.uk" => "http://www.amazon.co.uk/exec/obidos/ISBN=$1"
 );
 
 
 /* private */ $wgMagicWordsCy = array(
 #   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    "#redirect", "#ail-cyfeirio"                 ),
-    MAG_NOTOC                => array( 0,    "__NOTOC__", "__DIMTAFLENCYNNWYS__"          ),
-    MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__", "__DIMADRANGOLYGU__"    ),
-    MAG_START                => array( 0,    "__START__", "__DECHRAU__"                   ),
-    MAG_CURRENTMONTH        => array( 1, "CURRENTMONTH", "MISCYFOES"                ),
-    MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "ENWMISCYFOES"           ),
-    MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "DYDDIADCYFOES"                ),   
-    MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "ENWDYDDCYFOES"            ),
-    MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "FLWYDDYNCYFOES"              ),
-    MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "AMSERCYFOES"                 ),
-    MAG_NUMBEROFARTICLES    => array( 1, "NUMBEROFARTICLES","NIFEROERTHYGLAU"       ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN", "GENENWMISCYFOES"     ),
-    MAG_SUBST                => array( 1,    "SUBST:"                                     ),
-    MAG_MSGNW                => array( 0,    "MSGNW:"                                     ),
-    MAG_END                 => array( 0, "__DIWEDD__"                                   ),
-    MAG_IMG_THUMBNAIL       => array( 1, "ewin bawd", "bawd", "thumb", "thumbnail"  ),
-    MAG_IMG_RIGHT            => array( 1,    "de", "right"                                ),
-    MAG_IMG_LEFT             => array( 1,    "chwith", "left"                             ),
-    MAG_IMG_NONE             => array( 1,    "dim", "none"                                ),
-    MAG_IMG_WIDTH            => array( 1,    "$1px"                                       ),
-    MAG_IMG_CENTER          => array( 1, "canol", "centre", "center"                ),
-    MAG_INT                  => array( 0,    "INT:"                                       )
-
-);
-	
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesCy = array(
-	"Userlogin" => "",
-	"Userlogout" => "",
-	"Preferences" => "Setiwch fy ffafraethau defnyddwr",
-	"Watchlist" => "Rhestr gwylio fi",
-	"Recentchanges" => "Tudalennau wedi adnewid yn diweddar",
-	"Upload" => "Llwytho ffeiliau lluniau",
-	"Imagelist" => "Rhestr lluniau",
-	"Listusers" => "Defnyddwyr cofrestru",
-	"Statistics" => "Ystadegau'r Safle",
-	"Randompage" => "Erthygl hapgyrch",
-	"Lonelypages" => "Erthyglau heb cysylltiadau",
-	"Unusedimages" => "Lluniau heb cysylltiadau",
-	"Popularpages" => "Erthyglau poblogol",
-	"Wantedpages" => "Eisiau erthyglau am...",
-	"Shortpages" => "Erthyglau byr",
-	"Longpages" => "Erthyglau hir",
-	"Newpages" => "Erthyglau newydd",
-        "Ancientpages" => "Erthyglau hynach",
-        "Deadendpages" => "Erthyglau heb cysylltiadau",
-        "Intl" => "Cysylltiadau rhwng-ieithol",
-	"Allpages" => "Pob tudalen gan teitl",
-	"Ipblocklist" => "Cyfeiriadau IP wedi'i blocio",
-	"Maintenance" => "Tudalen arofal",
-	"Specialpages" => "",
-	"Contributions" => "",
-	"Emailuser" => "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage" => "",
-	"Booksources" => "Ffynnonellau llyfrau allanol",
-        "Categories" => "Categorïau tudalennau",
-        "Export" => "",
-        "Version" => "Dangos fersiwn MediaWiki"
-);
+	MAG_REDIRECT             => array( 0,    "#redirect", "#ail-cyfeirio"                 ),
+	MAG_NOTOC                => array( 0,    "__NOTOC__", "__DIMTAFLENCYNNWYS__"          ),
+	MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__", "__DIMADRANGOLYGU__"    ),
+	MAG_START                => array( 0,    "__START__", "__DECHRAU__"                   ),
+	MAG_CURRENTMONTH         => array( 1, "CURRENTMONTH", "MISCYFOES"                ),
+	MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "ENWMISCYFOES"           ),
+	MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "DYDDIADCYFOES"                ),
+	MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "ENWDYDDCYFOES"            ),
+	MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "FLWYDDYNCYFOES"              ),
+	MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "AMSERCYFOES"                 ),
+	MAG_NUMBEROFARTICLES     => array( 1, "NUMBEROFARTICLES","NIFEROERTHYGLAU"       ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN", "GENENWMISCYFOES"     ),
+	MAG_SUBST                => array( 1,    "SUBST:"                                     ),
+	MAG_MSGNW                => array( 0,    "MSGNW:"                                     ),
+	MAG_END                  => array( 0, "__DIWEDD__"                                   ),
+	MAG_IMG_THUMBNAIL        => array( 1, "ewin bawd", "bawd", "thumb", "thumbnail"  ),
+	MAG_IMG_RIGHT            => array( 1,    "de", "right"                                ),
+	MAG_IMG_LEFT             => array( 1,    "chwith", "left"                             ),
+	MAG_IMG_NONE             => array( 1,    "dim", "none"                                ),
+	MAG_IMG_WIDTH            => array( 1,    "$1px"                                       ),
+	MAG_IMG_CENTER           => array( 1, "canol", "centre", "center"                ),
+	MAG_INT                  => array( 0,    "INT:"                                       )
 
-/* private */ $wgSysopSpecialPagesCy = array(
-	"Blockip" => "Blociwch cyfeiriad IP",
-	"Asksql" => "Gofynnwch y databas",
-	"Undelete" => "Gwyliwch ac atgyweirio tundalennau wedi'u dileu",
-        "Makesysop" => "Gwnewch sysop allan o defnyddiwr"
 );
 
-/* private */ $wgDeveloperSpecialPagesCy = array(
-	"Lockdb" => "Databas darllen yn unig",
-	"Unlockdb" => "Gwnewch y databas yn ysgrifennol"
-);
 
 /* private */ $wgAllMessagesCy = array(
 # User Toggles
@@ -197,18 +140,16 @@
 "mainpagetext" => "Meddalwedd Wicipedia wedi sefydlu'n llwyddiannus",
 "about"	=> "Amdano",
 "aboutsite"      => "Amdano Wicipedia",
-"aboutpage" => "$wgMetaNamespace:Amdano",
+"aboutpage" => "{{ns:project}}:Amdano",
 "help" => "Help",
-"helppage" => "$wgMetaNamespace:Help",
-"wikititlesuffix" => "$wgSitename",
+"helppage" => "{{ns:project}}:Help",
 "bugreports" => "Adroddiadau diffygion",
-"bugreportspage" => "$wgMetaNamespace:Adroddiadau_diffygion",
+"bugreportspage" => "{{ns:project}}:Adroddiadau_diffygion",
 "sitesupport" => "Rhoddion",
-"sitesupportpage" => "", # If not set, won't appear. Can be wiki page or URL
 "faq" => "COF",
-"faqpage" => "$wgMetaNamespace:COF",
+"faqpage" => "{{ns:project}}:COF",
 "edithelp" => "Help gyda golygu",
-"edithelppage" => "$wgMetaNamespace:Sut_ydy_chi'n_golygu_tudalen",
+"edithelppage" => "{{ns:project}}:Sut_ydy_chi'n_golygu_tudalen",
 "cancel" => "Dirymu",
 "qbfind" => "Cael",
 "qbbrowse" => "Pori",
@@ -221,7 +162,7 @@
 "mypage" => "Fy nhudalen",
 "mytalk" => "Sgwrs fi",
 "disclaimers" => "Gwadiadau",
-"disclaimerpage" => "$wgMetaNamespace:Gwadiad_cyffredin",
+"disclaimerpage" => "{{ns:project}}:Gwadiad_cyffredin",
 "currentevents" => "Digwyddiadau presennol",
 "errorpagetitle" => "Gwall",
 "returnto" => "Ewch yn ôl i $1.",
@@ -249,18 +190,15 @@
 "redirectedfrom" => "(Ail-cyfeiriad oddiwrth $1)",
 "lastmodified" => "Pryd cafodd ei newid diwethaf $1.",
 "viewcount" => "Mae'r tudalen hyn wedi cael ei gweld $1 o weithiau.",
-"gnunote" => "Mae pob testun ar gael o dan term<a class=internal href='$wgScriptPath/GNU_FDL'>Goddefiad dogfennau rhad GNU</a>.",
 "printsubtitle" => "(Oddiwrth {{SERVER}})",
 "protectedpage" => "Tudalen amddiffyniol",
-"administrators" => "$wgMetaNamespace:Gweinyddwyr",
+"administrators" => "{{ns:project}}:Gweinyddwyr",
 "sysoptitle" => "Mynediad Sysop yn unig",
 "sysoptext" => "Mae'r peth rydych wedi gofyn amdano dim ond yn bosibl i ddefnyddwyr gyda statws \"sysop\".
 Gwelwch $1.",
 "developertitle" => "Mynediad Datblygwr yn unig",
 "developertext"	=> "Mae'r peth rydych wedi gofyn amdano dim ond yn bosibl i ddefnyddwyr gyda statws \"datblygwr\".
 Gwelwch $1.",
-"bureaucrattitle" => "Mynediad Biwrocrat yn unig",
-"bureaucrattext" => "Mae'r peth rydych wedi gofyn amdano dim ond yn bosibl i ddefnyddwyr gyda statws \"biwrocrat\"",
 "nbytes" => "$1 bytes",
 "go" => "Mynd",
 "ok" => "OK",
@@ -314,7 +252,7 @@ Adroddwch hwn i gweinyddwr os gwelwch yn dda, a cofiwch sylwi'r URL.",
 "filedeleteerror" => "Ddim yn gallu dileu ffeil \"$1\".",
 "filenotfound" => "Ddim yn gallu ffeindio ffeil \"$1\".",
 "unexpected" => "Gwerth annisgwyl: \"$1\"=\"$2\".",
-"formerror" => "Gwall: ddim yn medru ymostwng y ffurflen",	
+"formerror" => "Gwall: ddim yn medru ymostwng y ffurflen",
 "badarticleerror" => "Mae'n amhosib perfformio'r gweithred hwn ar tudalen hon.",
 "cannotdelete" => "Mae'n amhosib dileu y tudalen neu llun hwn. (Wyrach mae rhywun arall eisoes wedi eu dileu.)",
 "badtitle" => "Teitl drwg",
@@ -327,7 +265,7 @@ Query: $2
 ",
 "viewsource" => "Gwyliwch y ffynhonnell",
 "protectedtext" => "Mae tudalen hon wedi cael eu gloi i gwahardd golygu'r tudalen. Mae nifer o rheswmau paham mae hwn wedi digwydd, gwelwch y tudalen
-[[$wgMetaNamespace:Protected page]].
+[[{{ns:project}}:Protected page]].
 
 Ellwch gweld a copïo'r ffynhonnell y tudalen hon:",
 
@@ -345,12 +283,10 @@ Gallwch chi defnyddio'r Wicipedia yn anhysbys, neu gallwch chi mewngofnodi eto f
 "newusersonly" => " (defnyddwyr newydd yn unig)",
 "remembermypassword" => "Cofiwch fy allweddair dros mwy nag un sesiwn.",
 "loginproblem" => "<b>Mae problem efo'ch mewngofnodi.</b><br />Triwch eto!",
-"alreadyloggedin" => "<font color=red><b>Defnyddwr $1, yr ydych eisioes wedi mewngofnodi!</b></font><br />\n",
-
-"areyounew" => "Os ydych chi newydd wedi dod i Wicipedia ac yn eisiau cael accownt defnyddwr, teipiwch enw defnyddwr, felly teipiwch ac ail-teipiwch allweddair. Dydy eich cyfeiriad e-bost ddim yn gorfodol; os collwch eich allweddair mae'n bosibl i chi gofyn i gael hi eu anfon at y cyfeiriad e-bost hon.<br />\n",
+"alreadyloggedin" => "<strong>Defnyddwr $1, yr ydych eisioes wedi mewngofnodi!</strong><br />\n",
 
 "login"	=> "Mewngofnodi",
-"loginprompt" => "Rhaid i chi galluogi cwcis i mewngofnodi i $wgSitename.",
+"loginprompt" => "Rhaid i chi galluogi cwcis i mewngofnodi i {{SITENAME}}.",
 "userlogin" => "Mewngofnodi",
 "logout" => "Allgofnodi",
 "userlogout" => "Allgofnodi",
@@ -363,8 +299,8 @@ Gallwch chi defnyddio'r Wicipedia yn anhysbys, neu gallwch chi mewngofnodi eto f
 "yournick" => "Eich llysenw (am llofnod)",
 "emailforlost" => "Os anghofiwch eich allweddair, cewch cael un newydd postwyd i'ch cyfeiriad e-bost.",
 "loginerror" => "Problem mewngofnodi",
-"nocookiesnew" => "Mae'r accownt defnyddiwr wedi gael eu creu, ond dydwch chi ddim wedi mewngofnodi. Mae $wgSitename yn defnyddio cwcis i mewngofnodi defnyddwyr. Rydych chi wedi anablo cwcis. Galluogwch nhw os welwch yn dda, felly mewngofnodwch gyda'ch enw defnyddiwr a cyfrinair newydd.",
-"nocookieslogin" => "Mae $wgSitename yn defnyddio cwcis i mewngofnodi defnyddwyr. Rydych chi wedi anablo cwcis. Galluogwch nhw os welwch yn dda, a triwch eto.",
+"nocookiesnew" => "Mae'r accownt defnyddiwr wedi gael eu creu, ond dydwch chi ddim wedi mewngofnodi. Mae {{SITENAME}} yn defnyddio cwcis i mewngofnodi defnyddwyr. Rydych chi wedi anablo cwcis. Galluogwch nhw os welwch yn dda, felly mewngofnodwch gyda'ch enw defnyddiwr a cyfrinair newydd.",
+"nocookieslogin" => "Mae {{SITENAME}} yn defnyddio cwcis i mewngofnodi defnyddwyr. Rydych chi wedi anablo cwcis. Galluogwch nhw os welwch yn dda, a triwch eto.",
 "noname" => "Dydi chi ddim wedi enwi enw defnyddwr dilys.",
 "loginsuccesstitle" => "Mewngofnod llwyddiannus",
 "loginsuccess" => "Yr ydych wedi mewngofnodi i Wicipedia fel \"$1\".",
@@ -412,7 +348,7 @@ Allweddair defnyddwr \"$2\" rwan yw \"$3\". Ddylwch chi mewngofnodi rwan a newid
 "preview" => "Blaenwelediad",
 "showpreview" => "Gweler blaenwelediad",
 "blockedtitle"	=> "Mae'r defnyddwr wedi gael eu blocio",
-"blockedtext" => "Mae eich enw defnyddwr neu cyfeiriad IP wedi gael eu blocio gan $1. Y rheswm yw:<br />''$2''<p>Ellwch cysylltu $1 neu un o'r 
+"blockedtext" => "Mae eich enw defnyddwr neu cyfeiriad IP wedi gael eu blocio gan $1. Y rheswm yw:<br />''$2''<p>Ellwch cysylltu $1 neu un o'r
 [[Wicipedia:administrators|swyddogion]] eraill i trafodi'r bloc.",
 "whitelistedittitle" => "Rhaid mewngofnodi i golygu",
 "whitelistedittext" => "Rhaid i chi [[Special:Userlogin|mewngofnodi]] i olygu erthyglau.",
@@ -425,7 +361,7 @@ Allweddair defnyddwr \"$2\" rwan yw \"$3\". Ddylwch chi mewngofnodi rwan a newid
 "newarticle" => "(Newydd)",
 "newarticletext" =>
 "Yr ydych wedi dilyn cysylltiad i tudalen sydd ddim wedi gael eu creu eto.
-I creuo'r tudalen, dechreuwch teipio yn y bocs isaf 
+I creuo'r tudalen, dechreuwch teipio yn y bocs isaf
 (gwelwch y [[Wicipedia:Help|tudalen help]] am mwy o hysbys).
 Os ydych yma trwy camgymeriad, cliciwch eich botwm '''nol'''.",
 "anontalkpagetext" => "---- ''Dyma tudalen sgwrsio am defnyddwr sydd ddim eto wedi creu accownt, neu ddim yn eu defnyddio. Rhaid i ni defnyddio'r [[cyfeiriad IP]] rhifiadol i adnabod fe neu hi. Mae'n posib i llawer o bobl siario'r un cyfeiriad IP. Os ydych chi'n defnyddwr anhysbys ac yn teimlo mae esboniadau amherthynol wedi cael eu gwneud arnach chi, creuwch accownt neu mewngofnodwch i osgoi anhrefn gyda defnyddwyr anhysbys yn y dyfodol.'' ",
@@ -519,7 +455,7 @@ i setio ffafraethau defnyddwr.",
 "prefslogintext"  => "Yr ydych wedi mewngofnodi fel \"$1\".
 $2 yw eich rhif hunaniaith mewnol.",
 "prefsreset" => "Mae ffafraethau wedi gael eu ail-setio oddiwrth y storfa.",
-"qbsettings" => "Gosodiadau bar-gyflym", 
+"qbsettings" => "Gosodiadau bar-gyflym",
 "changepassword" => "Newydwch allweddair",
 "skin"	=> "Croen",
 "math"	=> "Rendro mathemateg",
@@ -620,11 +556,9 @@ Pob amser sy'n dangos yw amser y gwasanaethwr (UTC).
 "filedesc" => "Crynodeb",
 "filestatus" => "Statws hawlfraint",
 "filesource" => "Ffynhonnell",
-"affirmation" => "Rwy'n addo mae'r hawlfraintiwr y ffeil hon wedi cytuno trwyddo'r ffeil o dan termau'r $1.",
-"copyrightpage" => "$wgMetaNamespace:Hawlfraint",
-"copyrightpagename" => "Hawlfraint $wgSitename",
+"copyrightpage" => "{{ns:project}}:Hawlfraint",
+"copyrightpagename" => "Hawlfraint {{SITENAME}}",
 "uploadedfiles"	=> "Ffeiliau wedi llwytho i fynu",
-"noaffirmation" => "Rhaid i chi addo dydy'r llwyth i fynu ddim y torri unrhyw hawlfraint.",
 "ignorewarning"	=> "Anwybyddwch y rhybudd, a chadwch y tudalen beth bynnag.",
 "minlength" => "Rhaid enwau lluniau bod o leia tri llythrennau.",
 "badfilename" => "Mae enw'r llun wedi newid i \"$1\".",
@@ -673,28 +607,6 @@ Sef <b>$5</b> golygiadau pob tudalen, ar gyfartaledd, a <b>$6</b> golygon o bob
 "userstatstext" => "Mae 'ne <b>$1</b> defnyddwyr wedi cofrestru.
 (Mae <b>$2</b> yn gweinyddwyr (gwelwch $3)).",
 
-# Maintenance Page
-#
-"maintenance" => "Maintenance page",
-"maintnancepagetext" => "This page includes several handy tools for everyday maintenance. Some of these functions tend to stress the database, so please do not hit reload after every item you fixed ;-)",
-"maintenancebacklink" => "Back to Maintenance Page",
-"disambiguations" => "Disambiguation pages",
-"disambiguationspage" => "Wicipedia:Links_to_disambiguating_pages",
-"disambiguationstext" => "The following articles link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br />A page is treated as dismbiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
-"doubleredirects" => "Double Redirects",
-"doubleredirectstext" => "<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first #REDIRECT.<br />\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" taget article, which the first redirect should point to.",
-"brokenredirects" => "Broken Redirects",
-"brokenredirectstext" => "The following redirects link to a non-existing article.",
-"selflinks" => "Pages with Self Links",
-"selflinkstext"	=> "The following pages contain a link to themselves, which they should not.",
-"mispeelings" => "Pages with misspellings",
-"mispeelingstext" => "The following pages contain a common misspelling, which are listed on $1. The correct spelling might be given (like this).",
-"mispeelingspage" => "List of common misspellings",
-"missinglanguagelinks" => "Missing Language Links",
-"missinglanguagelinksbutton" => "Find missing language links for",
-"missinglanguagelinkstext" => "These articles do <i>not</i> link to their counterpart in $1. Redirects and subpages are <i>not</i> shown.",
-
-
 # Miscellaneous special pages
 #
 "orphans" => "Erthyglau heb cysylltiadau",
@@ -708,7 +620,7 @@ Sef <b>$5</b> golygiadau pob tudalen, ar gyfartaledd, a <b>$6</b> golygon o bob
 "randompage" => "Erthygl hapgyrch",
 "shortpages" => "Erthyglau byr",
 "longpages" => "Erthyglau hir",
-"deadendpages" => "Tudalennau heb cysylltiadau",  
+"deadendpages" => "Tudalennau heb cysylltiadau",
 "listusers" => "Rhestr defnyddwyr",
 "specialpages" => "Erthyglau arbennig",
 "spheading" => "Erthyglau arbennig",
@@ -736,7 +648,7 @@ i anfon e-bost i ddefnyddwyr eraill.",
 "emailuser" => "Anfon e-bost i defnyddwr hwn",
 "emailpage" => "Anfon e-bost i defnyddwr",
 "emailpagetext"	 => "Os yw defnyddwr hwn wedi rhoi cyfeiriad e-bost yn eu ffafraethau, fydd y ffurf isod yn anfon un neges iddo ef. Fydd y cyfeiriad e-bost rydych chi wedi rhoi yn eich ffafraethau yn dangos yn yr \"Oddiwrth\" cyfeiriad yr e-bost, felly fydd y defnyddwr arall yn gallu ateb.",
-"defemailsubject" => "e-post $wgSitename",				       
+"defemailsubject" => "e-post {{SITENAME}}",
 "noemailtitle" => "Dim cyfeiriad e-bost",
 "noemailtext" => "Dydy defnyddwr hwn ddim wedi rhoi cyfeiriad e-bost dilys, neu mae e wedi dewis nid i dderbyn e-bost oddiwrth defnyddwyr eraill.",
 "emailfrom" => "Oddiwrth",
@@ -815,19 +727,19 @@ Gwelwch $2 am cofnod o dileuon diweddar.",
 "rollbacklink" => "rolio nôl",
 "cantrollback" => "Ddim yn gallu gwrthdroi golygiad; y cyfrannwr olaf oedd yr unrhyw awdur yr erthygl hon.",
 "alreadyrolled"	=> "Amhosib rolio nôl golygiad olaf [[$1]]
-gan [[Defnyddwr:$2|$2]] ([[Sgwrs defnyddwr:$2|Sgwrs]]); mae rhywun arall yn barod wedi olygu neu rolio nôl yr erthygl. 
+gan [[Defnyddwr:$2|$2]] ([[Sgwrs defnyddwr:$2|Sgwrs]]); mae rhywun arall yn barod wedi olygu neu rolio nôl yr erthygl.
 
 [[Defnyddwr:$3|$3]] ([[Sgwrs defnyddwr:$3|Sgwrs]] gwneuthoedd yr olygiad olaf). ",
 #   only shown if there is an edit comment
-"editcomment" => "Crynodeb y golygiad oedd: \"<i>$1</i>\".", 
+"editcomment" => "Crynodeb y golygiad oedd: \"<i>$1</i>\".",
 "revertpage" => "Wedi gwrthdroi i golygiad olaf gan $1",
 "protectlogpage" => "Log_amdiffyno",
 "protectlogtext" => "Isod mae rhestr o cloion/datgloion tudalennau.
-Gwelwch [[$wgMetaNamespace:Tudalen amddiffynol]] am mwy o wybodaeth.",
+Gwelwch [[{{ns:project}}:Tudalen amddiffynol]] am mwy o wybodaeth.",
 "protectedarticle" => "wedi amddiffyno [[$1]]",
 "unprotectedarticle" => "wedi di-amddiffyno [[$1]]",
 
-# Undelete   
+# Undelete
 "undelete" => "Gwrthdroi tudalen wedi dileuo",
 "undeletepage" => "Gwyliwch ac adferiwch tudalennau wedi dileuo",
 "undeletepagetext" => "Mae'r tudalennau isod wedi cael eu dileuo ond mae nhw'n dal yn yr archif ac maen bosibl adferio nhw. Mae'r archif yn cael eu glanhau o dro i dro.",
@@ -872,7 +784,6 @@ Llenwch rheswm am y bloc, isod (e.e. enwch y tudalennau a oedd wedi fandalo).",
 "ipbreason" => "Achos",
 "ipbsubmit" => "Blociwch y cyfeiriad hwn",
 "badipaddress" => "Dydy'r cyfeiriad IP ddim yn ddilys.",
-"noblockreason" => "Rhaid i chi rhoi rheswm am y bloc.",
 "blockipsuccesssub" => "Bloc yn llwyddiannus",
 "blockipsuccesstext" => "Mae cyfeiriad IP \"$1\" wedi cael eu blocio.
 <br />Gwelwch [[Arbennig:Ipblocklist|rhestr bloc IP]] i arolygu blociau.",
@@ -888,7 +799,7 @@ Llenwch rheswm am y bloc, isod (e.e. enwch y tudalennau a oedd wedi fandalo).",
 "autoblocker" => "Wedi cloi'n awtomatig am achos rydych chi'n rhannu cyfeiriad IP gyda \"$1\". Rheswm \"$2\".",
 "blocklogpage" => "Log_blociau",
 "blocklogentry"	=> 'wedi blocio "$1" efo amser diwedd o $2',
-"blocklogtext" => "Dyma log o pryd mae cyfeiriadau wedi cael eu blocio a datblocio. Dydy cyfeiriad 
+"blocklogtext" => "Dyma log o pryd mae cyfeiriadau wedi cael eu blocio a datblocio. Dydy cyfeiriad
 a sydd wedi blocio'n awtomatig ddim yn cael eu ddangos yma. Gwelwch [[Special:Ipblocklist|rhestr block IP]] am
 y rhestr o blociau a gwaharddiadau sydd yn effeithiol rwan.",
 "unblocklogentry" => 'wedi datblocio "$1"',
@@ -896,48 +807,10 @@ y rhestr o blociau a gwaharddiadau sydd yn effeithiol rwan.",
 "ipb_expiry_invalid" => "Amser diwedd ddim yn dilys.",
 "ip_range_invalid" => "Dewis IP annilys.\n",
 
-# Developer tools - left untranslated as the developers would probably
-#  prefer them in English!
-#
-"lockdb" => "Lock database",
-"unlockdb" => "Unlock database",
-"lockdbtext" => "Locking the database will suspend the ability of all
-users to edit pages, change their preferences, edit their watchlists, and
-other things requiring changes in the database.
-Please confirm that this is what you intend to do, and that you will
-unlock the database when your maintenance is done.",
-"unlockdbtext"	=> "Unlocking the database will restore the ability of all
-users to edit pages, change their preferences, edit their watchlists, and
-other things requiring changes in the database.
-Please confirm that this is what you intend to do.",
-"lockconfirm" => "Yes, I really want to lock the database.",
-"unlockconfirm"	=> "Yes, I really want to unlock the database.",
-"lockbtn" => "Lock database",
-"unlockbtn" => "Unlock database",
-"locknoconfirm" => "You did not check the confirmation box.",
-"lockdbsuccesssub" => "Database lock succeeded",
-"unlockdbsuccesssub" => "Database lock removed",
-"lockdbsuccesstext" => "The database has been locked.
-<br />Remember to remove the lock after your maintenance is complete.",
-"unlockdbsuccesstext" => "The database has been unlocked.",
-
-# SQL query -- left untranslated
-#
-"asksql" => "SQL query",
-"asksqltext" => "Use the form below to make a direct query of the
-Wicipedia database.
-Use single quotes ('like this') to delimit string literals.
-This can often add considerable load to the server, so please use
-this function sparingly.",
-"sqlquery" => "Enter query",
-"querybtn" => "Submit query",
-"selectonly" => "Queries other than \"SELECT\" are restricted to
-Wicipedia developers.",
-"querysuccessful" => "Query successful",
 
 # Make sysop
 "makesysoptitle" => "Gwnewch sysop allan o defnyddiwr",
-"makesysoptext"	=> "Defnyddiwch y ffurflen hon i troi defnyddiwr cyffredin i gweinyddwr.  
+"makesysoptext"	=> "Defnyddiwch y ffurflen hon i troi defnyddiwr cyffredin i gweinyddwr.
 Teipiwch enw'r defnyddiwr yn y blwch a cliciwch y botwm i troi'r defnyddiwr i gweinyddwr",
 "makesysopname"	=> "Enw'r defnyddiwr:",
 "makesysopsubmit" => "Gwnewch y defnyddiwr hwn yn gweinyddwr",
@@ -951,7 +824,7 @@ Teipiwch enw'r defnyddiwr yn y blwch a cliciwch y botwm i troi'r defnyddiwr i gw
 #
 "movepage" => "Symud tudalen",
 "movepagetext" => "Fydd defnyddio'r ffurflen isod yn ail-enwi tudalen, symud eu hanes gyfan i'r enw newydd.
-Fydd yr hen teitl yn dod tudalen ail-cyfeiriad i'r teitl newydd. 
+Fydd yr hen teitl yn dod tudalen ail-cyfeiriad i'r teitl newydd.
 Ni fydd cysylltiadau i'r hen teitl yn newid; mae rhaid i chi gwirio mae cysylltau'n dal yn mynd i'r lle mae angen iddyn nhw mynd!
 
 Sylwch fydd y tudalen '''ddim''' yn symud os mae 'ne tudalen efo'r enw newydd yn barod ar y databas (sef os mae hi'n gwâg neu yn ail-cyfeiriad heb unrhyw hanes golygu). Mae'n posibl i chi ail-enwi tudalen yn ôl i lle oedd hi os ydych chi wedi gwneud camgymeriad, ac mae'n amhosibl i ysgrifennu dros tudalen sydd barod yn bodoli.
@@ -998,12 +871,12 @@ amusement.",
 "thumbnail-more" => "Helaethwch",
 
 #Math
-	'mw_math_png' => "Rendrwch PNG o hyd",
-	'mw_math_simple' => "HTML os yn syml iawn, PNG fel arall",
-	'mw_math_html' => "HTML os bosibl, PNG fel arall",
-	'mw_math_source' => "Gadewch fel TeX (am porwyr testun)",
-	'mw_math_modern' => "Cymeradwedig am porwyr modern",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Rendrwch PNG o hyd",
+'mw_math_simple' => "HTML os yn syml iawn, PNG fel arall",
+'mw_math_html' => "HTML os bosibl, PNG fel arall",
+'mw_math_source' => "Gadewch fel TeX (am porwyr testun)",
+'mw_math_modern' => "Cymeradwedig am porwyr modern",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -1039,26 +912,7 @@ class LanguageCy extends LanguageUtf8 {
 		return $wgDateFormatsCy;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesCy;
-		return $wgValidSpecialPagesCy;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesCy;
-		return $wgSysopSpecialPagesCy;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesCy;
-		return $wgDeveloperSpecialPagesCy;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesCy;
 		if( isset( $wgAllMessagesCy[$key] ) ) {
 			return $wgAllMessagesCy[$key];
@@ -1066,20 +920,17 @@ class LanguageCy extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
-	function getAllMessages()
-	{
+
+	function getAllMessages() {
 		global $wgAllMessagesCy;
 		return $wgAllMessagesCy;
 	}
 
-	function getMagicWords() 
-	{
+	function getMagicWords() {
 		global $wgMagicWordsCy, $wgMagicWordsEn;
 		return $wgMagicWordsCy + $wgMagicWordsEn;
 	}
 
-
 }
 
 ?>
diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index f5959341bbad..edd97d4ea8ec 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -57,67 +57,9 @@ require_once( "LanguageUtf8.php" );
 ) + $wgBookstoreListEn;
 
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesDa = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Mine brugerindstillinger",
-	"Watchlist"	=> "Min overvågningsliste",
-	"Recentchanges" => "Seneste ændringer",
-	"Upload"	=> "Læg filer op",
-	"Imagelist"	=> "Billedliste",
-	"Listusers"	=> "Registrerede brugere",
-	"Statistics"	=> "Statistik om siden",
-	"Randompage"	=> "Tilfældig artikel",
-
-	"Lonelypages"	=> "Forældreløse artikler",
-	"Unusedimages"	=> "Forældreløse filer",
-	"Popularpages"	=> "Populære artikler",
-	"Wantedpages"	=> "Mest ønskede artikler",
-	"Shortpages"	=> "Korte artikler",
-	"Longpages"		=> "Lange artikler",
-	"Newpages"		=> "Nyeste artikler",
-	"Ancientpages"	=> "Ældste artikler",
-	"Deadendpages"	=> "Blindgydesider",
-#	"Intl"			=> "Sproghenvisninger",
-	"Allpages"		=> "Alle sider efter titel",
-
-	"Ipblocklist"	=> "Blokerede IP-adresser",
-	"Maintenance"	=> "Vedligeholdelsesside",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "Eksterne bogkilder",
-	"Categories"	=> "Kategorier",
-	"Export"	=> "Eksportér sider i XML format",
-	"Version"	=> "Vis MediaWiki version",
-);
-
-/* private */ $wgSysopSpecialPagesDa = array(
-	"Blockip"		=> "Bloker en IP-adresse",
-	"Asksql"		=> "Lav en forespørgsel i databasen",
-	"Undelete"		=> "Se og gendan slettede sider",
-	"Makesysop"		=> "Lav en bruger til administrator"
-);
-
-/* private */ $wgDeveloperSpecialPagesDa = array(
-	"Lockdb"		=> "Skrivebeskyt databasen",
-	"Unlockdb"		=> "Gendan skriveadgangen til databasen",
-);
-
-
 #-------------------------------------------------------------------
 # Default messages
 #-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
 
 /* private */ $wgAllMessagesDa = array(
 # User preference toggles
@@ -191,7 +133,7 @@ require_once( "LanguageUtf8.php" );
 "linktrail"		=> '/^([a-zæøå]+)(.*)$/sDu',
 "mainpage"		=> "Forside",
 "mainpagetext"	=> "MediaWiki er nu installeret.",
-"mainpagedocfooter" => "Se vores engelsksprogede [http://meta.wikipedia.org/wiki/MediaWiki_i18n dokumentation om tilpasning af brugergrænsefladen] 
+"mainpagedocfooter" => "Se vores engelsksprogede [http://meta.wikipedia.org/wiki/MediaWiki_i18n dokumentation om tilpasning af brugergrænsefladen]
 og [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide brugervejledningen] for oplysninger om opsætning og anvendelse.",
 
 # NOTE: To turn off "Community portal" in the title links,
@@ -205,7 +147,6 @@ og [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide brugervejledningen]
 'article' => 'Artikel',
 "help"			=> "Hjælp",
 "helppage"		=> "{{ns:4}}:Hjælp",
-"wikititlesuffix" => "{{SITENAME}}",
 "bugreports"	=> "Fejlrapporter",
 "bugreportspage" => "{{ns:4}}:Fejlrapporter",
 "sitesupport"   => "Donation",
@@ -294,10 +235,6 @@ udføres af brugere med \"sysop\"-status. Se $1.",
 "developertitle" => "Developer-adgang påkrævet",
 "developertext"	=> "Den funktion du har bedt om, kan kun
 udføres af brugere med \"developer\"-status. Se $1.",
-'bureaucrattitle'	=> 'Bureaucratadgang påkrævet ',
-"bureaucrattext"	=> "Den handling du har bedt om kan kun
-udføres af brugere med \"bureaucrat\"-status.",
-
 'badaccess'     => 'Permission error',
 'badaccesstext' => 'The action you have requested is limited
 to users with the "$2" permission assigned.
@@ -376,7 +313,7 @@ som den skulle have fundet, med navnet \"$1\".
 
 <p>Dette er ikke en databasefejl, men sandsynligvis en fejl i softwaren.
 
-<p>Send venligst en rapport om dette til en administrator, 
+<p>Send venligst en rapport om dette til en administrator,
 hvor du også nævner URL'en.",
 'readonly_lag' => "Databasen er automatisk blevet låst mens slave database serverne synkronisere med master databasen",
 "internalerror" => "Intern fejl",
@@ -407,7 +344,6 @@ der kan være flere årsager til at det er sket,
 se [[{{ns:4}}:Liste over beskyttede sider|listen over beskyttede sider]].
 
 Du kan sé og kopiere sidens indhold:",
-'seriousxhtmlerrors' => 'Programmet tidy har opdaget alvorlige xhtml-fejl.',
 'sqlhidden' => '(SQL forespørgsel gemt)',
 
 # Login and logout pages
@@ -430,7 +366,7 @@ Din konto er blevet oprettet. Glem ikke at personliggøre dine {{SITENAME}}-inds
 'yourdomainname'       => 'Your domain',
 'externaldberror'      => 'There was either an external authentication database error or you are not allowed to update your external account.',
 "loginproblem"	=> "<b>Der har været et problem med at få dig logget på.</b><br />Prøv igen!",
-"alreadyloggedin" => "<font color=red><b>Bruger $1, du er allerede logget på!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Bruger $1, du er allerede logget på!</strong><br />\n",
 
 "login"			=> "Log på",
 'loginprompt'   => "Du skal have cookies slået til for at kunne logge på {{SITENAME}}.",
@@ -441,7 +377,7 @@ Din konto er blevet oprettet. Glem ikke at personliggøre dine {{SITENAME}}-inds
 "createaccount"	=> "Opret en ny konto",
 'createaccountmail'	=> 'via e-mail',
 "badretype"		=> "De indtastede adgangskoder er ikke ens.",
-"userexists"	=> "Det brugernavn du har valgt er allerede i brug. Vælg 
+"userexists"	=> "Det brugernavn du har valgt er allerede i brug. Vælg
 venligst et andet brugernavn.",
 "youremail"		=> "Din e-mail-adresse *",
 'yourrealname'		=> 'Dit rigtige navn*',
@@ -516,7 +452,7 @@ Log ind med den midlertidige adgangskode, der er blevet sendt til dig, for at be
 
 # Edit pages
 #
-"summary"		=> '<a href=\"{{SERVER}}/wiki/{{ns:4}}:Beskrivelse" title="Giv venligst en kort beskrivelse af din ændring\">Beskrivelse</a>',
+"summary"		=> '<a href="{{SERVER}}/wiki/{{ns:4}}:Beskrivelse" title="Giv venligst en kort beskrivelse af din ændring">Beskrivelse</a>',
 "subject"		=> "Emne/overskrift",
 "minoredit"		=> "Dette er en mindre ændring.",
 "watchthis"		=> "Overvåg denne artikel",
@@ -525,9 +461,9 @@ Log ind med den midlertidige adgangskode, der er blevet sendt til dig, for at be
 "showpreview"	=> "Forhåndsvisning",
 'showdiff'	=> 'Vis ændringer',
 "blockedtitle"	=> "Brugeren er blokeret",
-"blockedtext"	=> "Dit brugernavn eller din IP-adresse er blevet blokeret af 
+"blockedtext"	=> "Dit brugernavn eller din IP-adresse er blevet blokeret af
 $1. Begrundelsen er denne:<br />$2<p>Du kan kontakte $1
-eller en af de andre [[{{SITENAME}}:Administratorer|administratorer]] for at diskutere blokeringen.
+eller en af de andre [[{{ns:project}}:Administratorer|administratorer]] for at diskutere blokeringen.
 
 Din IP-adresse er $3.
 Sørg venligst for at medtage denne IP-adresse i alle henvendelser til en administrator.
@@ -547,15 +483,15 @@ Sørg venligst for at medtage denne IP-adresse i alle henvendelser til en admini
 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
 "anontalkpagetext" => "---- ''Dette er en diskussionsside for en anonym bruger, der ikke har oprettet en konto endnu eller ikke bruger den. Vi er derfor nødt til at bruge den nummeriske [[IP-adresse]] til at identificere ham eller hende. En IP-adresse kan være delt mellem flere brugere. Hvis du er en anonym bruger og synes, at du har fået irrelevante kommentarer på sådan en side, så vær venlig at oprette en brugerkonto og [[Speciel:Userlogin|logge på]], så vi undgår fremtidige forvekslinger med andre anonyme brugere.'' ",
 "noarticletext" => "<div style=\"border: 1px solid \#ccc; padding: 7px; background-color: \#fff; color: \#000\">'''{{SITENAME}} har ikke nogen side med præcis dette navn.''' * Du kan se om {{PAGENAME}} findes i [[Wiktionary:{{NAMESPACE}}:{{PAGENAME}}|wikiordbogen]] eller på '''[[:no:{{PAGENAME}}|norsk]]''', '''[[:nn:{{PAGENAME}}|nynorsk]]''', eller '''[[:sv:{{PAGENAME}}|svensk]]'''. * Du kan '''[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} starte siden {{PAGENAME}}]''' * Eller [[{{ns:special}}:Search/{{PAGENAME}}|søge efter {{PAGENAME}}]] i andre artikler ---- * Hvis du har oprettet denne artikel indenfor de sidste få minutter, så kan de skyldes at der er lidt forsinkelse i opdateringen af {{SITENAME}}s cache. Vent venligst og tjek igen senere om artiklen dukker op, inden du forsøger at oprette artiklen igen. </div>",
-'clearyourcache' => "'''Bemærk''', efter at have gemt, er du nødt til at tømme din browsers cache for at kunne se ændringerne. '''Mozilla/Safari/Konqueror''': hold ''shifttasten'' nede og klik på ''reload'' eller tryk på ''control-shift-r'', '''Internet Explorer''': ''ctrl-f5'', '''Opera''': ''f5''.",
+'clearyourcache' => "'''Bemærk''', efter at have gemt, er du nødt til at tømme din browsers cache for at kunne se ændringerne. '''Mozilla / Firefox / Safari''': hold ''shifttasten'' nede og klik på ''reload'' eller tryk på ''control-shift-r'' (Mac: ''cmd-shift-r''); '''Internet Explorer''': hold ''controltasten'' nede og klik på ''refresh'' eller tryk på ''control-F5''; '''Konqueror''': klik på ''reload'' eller tryk på ''F5''",
 'usercssjsyoucanpreview' => "<strong>Tip:</strong> Brug knappen 'forhåndsvisning' til at teste dit nye css/js før du gemmer.",
 'usercsspreview' => "'''Husk at du kun tester/forhåndsviser dit eget css, den er ikke gemt endnu!'''",
 'userjspreview' => "'''Husk at du kun tester/forhåndsviser dit eget javascript, det er ikke gemt endnu!'''",
 "updated"		=> "(Opdateret)",
 'note'			=> '<strong>Bemærk:</strong> ',
-"previewnote"	=> "Husk at dette er kun en forhåndsvisning, siden er ikke 
+"previewnote"	=> "Husk at dette er kun en forhåndsvisning, siden er ikke
 gemt endnu!",
-"previewconflict" => "Denne forhåndsvisning er resultatet af den 
+"previewconflict" => "Denne forhåndsvisning er resultatet af den
 redigérbare tekst ovenfor,
 sådan vil det komme til at se ud hvis du vælger at gemme teksten.",
 "editing"		=> "Redigerer $1",
@@ -574,16 +510,16 @@ trykker \"Gem side\".<br />",
 'nonunicodebrowser' => "<strong>Advarsel: Din browser er ikke unicode-kompatibel, skift eller opdater din browser før du redigerer en artikel.</strong>",
 "editingold"	=> "<strong>ADVARSEL: Du redigerer en gammel version
 af denne side.
-Hvis du gemmer den, vil alle ændringer foretaget siden denne revision blive 
+Hvis du gemmer den, vil alle ændringer foretaget siden denne revision blive
 overskrevet.</strong>",
 "yourdiff"		=> "Forskelle",
 "copyrightwarning" => "<div id=\"editpage-specialchars\" class=\"plainlinks\" style=\"margin-top:15px;border-width:1px;border-style:solid;border-color:\#aaaaaa;padding:2px;\"> <small> Indsæt: <charinsert> Á á É é Í í Ó ó Ú ú </charinsert> &nbsp; <charinsert> À à È è Ì ì Ò ò Ù ù </charinsert> &nbsp; <charinsert>  â Ê ê Î î Ô ô Û û </charinsert> &nbsp; <charinsert> Ä ä Ë ë Ï ï Ö ö Ü ü </charinsert> &nbsp; <charinsert> ß </charinsert> &nbsp; <charinsert> à ã Ñ ñ Õ õ </charinsert> &nbsp; <charinsert> Ç ç &\#290; &\#291; &\#310; &\#311; &\#315; &\#316; &\#325; &\#326; &\#342; &\#343; &\#350; &\#351; &\#354; &\#355; </charinsert> &nbsp; <charinsert> &\#262; &\#263; &\#313; &\#314; &\#323; &\#324; &\#340; &\#341; &\#346; &\#347; Ý ý &\#377; &\#378; </charinsert> &nbsp; <charinsert> Ð ð Þ þ </charinsert> &nbsp; <charinsert> Œ œ </charinsert> &nbsp; <charinsert> Æ æ Ø ø Å å </charinsert> &nbsp; <charinsert> &ndash; &mdash; &hellip; </charinsert> &nbsp; <charinsert> [+] [[+]] {{+}} </charinsert> &nbsp; <charinsert> ~ | ° </charinsert> &nbsp; <charinsert> ± &minus; × ² ³ </charinsert> &nbsp; <charinsert> &euro; </charinsert> &nbsp; </small> </div> *Bemærk at alle bidrag til {{SITENAME}} er at betragte som udgivet under GNU Free Documentation License (se $1 for flere oplysninger). *Hvis du ikke ønsker at din tekst skal udsættes for nådesløse redigeringer og at den kan blive kopieret efter forgodtbefindende, så skal du ikke placere den her. *Du lover os også, at du selv har forfattet teksten, kopieret den fra en public domain-kilde eller tilsvarende fri kilde. <div style=\"font-weight: bold; font-size: 120%;\">LÆG ALDRIG MATERIALE HER SOM ER BESKYTTET AF ANDRES OPHAVSRET UDEN DERES TILLADELSE!</div>",
 "longpagewarning" => "<strong>ADVARSEL: Denne side er $1 kilobyte stor; nogle browsere kan have problemer med at redigere sider der nærmer sig eller er større end 32 Kb. Overvej om siden kan opdeles i mindre dele.</strong>",
 "readonlywarning" => "<strong>ADVARSEL: Databasen er låst på grund af vedligeholdelse,
-så du kan ikke gemme dine ændringer lige nu. Det kan godt være en god ide at 
+så du kan ikke gemme dine ændringer lige nu. Det kan godt være en god ide at
 kopiere din tekst til en tekstfil, så du kan gemme den til senere.</strong>",
 "protectedpagewarning" => "<strong>ADVARSEL: Denne side er låst, så kun administratorer
-kan redigere den. Sørg for at du følger 
+kan redigere den. Sørg for at du følger
 [[Project:Politik_for_beskyttede_sider|politiken for beskyttede sider]].</strong>",
 'templatesused'	=> 'Skabeloner der er brugt på denne side:',
 
@@ -592,7 +528,7 @@ kan redigere den. Sørg for at du følger
 "revhistory"	=> "Versionshistorik",
 "nohistory"		=> "Der er ingen versionshistorik for denne side.",
 "revnotfound"	=> "Versionen er ikke fundet",
-"revnotfoundtext" => "Den gamle version af den side du spurgte efter kan 
+"revnotfoundtext" => "Den gamle version af den side du spurgte efter kan
 ikke findes. Kontrollér den URL du brugte til at få adgang til denne side.\n",
 "loadhist"		=> "Indlæser sidens historik",
 "currentrev"	=> "Nuværende version",
@@ -605,7 +541,7 @@ ikke findes. Kontrollér den URL du brugte til at få adgang til denne side.\n",
 "next"			=> "næste",
 "last"			=> "forrige",
 "orig"			=> "originale",
-"histlegend"	=> "Forklaring: (nuværende) = forskel til den nuværende 
+"histlegend"	=> "Forklaring: (nuværende) = forskel til den nuværende
 version, (forrige) = forskel til den forrige version, M = mindre ændring",
 'history_copyright'    => '-',
 'deletedrev' => '[slettet]',
@@ -642,7 +578,7 @@ og teksten i $3 artikler.",
 "prevn"			=> "forrige $1",
 "nextn"			=> "næste $1",
 "viewprevnext"	=> "Vis ($1) ($2) ($3).",
-"showingresults" => "Nedenfor vises <b>$1</b> resultater startende med 
+"showingresults" => "Nedenfor vises <b>$1</b> resultater startende med
 nummer <b>$2</b>.",
 "showingresultsnum" => "Herunder vises <b>$3</b> resultater startende med nummer <b>$2</b>.",
 "nonefound"		=> "<strong>Bemærk</strong>: Søgning uden resultat skyldes at man søger efter almindelige ord som \"har\" og \"fra\", der ikke er indekseret, eller at man har angivet mere end ét søgeord (da kun sider indeholdende alle søgeordene vil blive fundet).",
@@ -658,7 +594,7 @@ $2 List omdirigeringer &nbsp; Søg efter $3 $9",
 #
 "preferences"	=> "Indstillinger",
 "prefsnologin" => "Ikke logget på",
-"prefsnologintext"	=> "Du skal være [[Speciel:Userlogin|logget på]] 
+"prefsnologintext"	=> "Du skal være [[Speciel:Userlogin|logget på]]
 for at ændre brugerindstillinger.",
 "prefslogintext" => "Du logget på som \"[[Bruger:$1|$1]]\" ([[Bruger_diskussion:$1|Diskussion]], [[Speciel:Contributions/$1|bidrag]]).
 Dit interne ID-nummer er $2.
@@ -699,8 +635,8 @@ Se [[Project:Hvordan sætter jeg mine indstillinger]] for en forklaring på de f
 "savedprefs"	=> "Dine indstillinger er blevet gemt.",
 'timezonelegend' => 'Tidszone',
 "timezonetext"	=> "Indtast antal timer din lokale tid er forskellig
-fra serverens tid (UTC). Der bliver automatisk tilpasset til dansk tid, 
-ellers skulle man for eksempel for dansk vintertid, indtaste \"1\" 
+fra serverens tid (UTC). Der bliver automatisk tilpasset til dansk tid,
+ellers skulle man for eksempel for dansk vintertid, indtaste \"1\"
 (og \"2\" når vi er på sommertid).",
 "localtime"	=> "Lokaltid",
 "timezoneoffset" => "Forskel",
@@ -727,7 +663,7 @@ ellers skulle man for eksempel for dansk vintertid, indtaste \"1\"
 # group editing
 'groups-editgroup' => 'Redigér gruppe',
 'groups-addgroup' => 'Tilføj gruppe',
-'groups-editgroup-preamble' => 'Hvis navn eller beskrivelse starter med et kolon, så vil 
+'groups-editgroup-preamble' => 'Hvis navn eller beskrivelse starter med et kolon, så vil
 resten blive behandlet som et navn på en besked, og derfor vil teksten blive behandlet som
 en besked i MediaWiki navnerummet',
 'groups-editgroup-name' => 'Gruppenavn: ',
@@ -747,12 +683,12 @@ en besked i MediaWiki navnerummet',
 'saveusergroups' => 'Gem brugergrupper',
 'userrights-groupsmember' => 'Medlem af:',
 'userrights-groupsavailable' => 'Tilgængelige grupper:',
-'userrights-groupshelp' => 'Vælg grupper som du ønsker brugeren skal fjernes fra eller føjes til. 
+'userrights-groupshelp' => 'Vælg grupper som du ønsker brugeren skal fjernes fra eller føjes til.
 Grupper som ikke er valgt, vil ikke blive ændret. Du kan ophæve valget af en gruppe ved hjælp af CTRL-tasten og et venstreklik.',
 'userrights-logcomment' => 'Ændret gruppemedlemskab fra $1 til $2',
 
 # Default group names and descriptions
-# 
+#
 'group-anon-name'       => 'Anonym',
 'group-anon-desc'       => 'Anonyme brugere',
 'group-loggedin-name'   => 'Bruger',
@@ -770,12 +706,8 @@ Grupper som ikke er valgt, vil ikke blive ændret. Du kan ophæve valget af en g
 "changes" => "ændringer",
 "recentchanges" => "Seneste ændringer",
 'recentchanges-url' => 'Speciel:Recentchanges',
-"recentchangestext" => "{|border=\"0\" class=\"plainlinks\" |-valign=\"top\" |align=\"right\"|<small>Seneste&nbsp;ændringer&nbsp;for:&nbsp;</small> 
-|align=\"left\"|<small>[http://da.wiktionary.org/wiki/Speciel:Recentchanges Wikiordbog] - [http://da.wikiquote.org/wiki/Speciel:Recentchanges Wikiquote] - [http://da.wikibooks.org/wiki/Speciel:Recentchanges Wikibooks] - [http://wikisource.org/wiki/Special:Recentchanges Wikisource] - [http://meta.wikipedia.org/wiki/Special%3ARecentchanges Meta] - [http://commons.wikimedia.org/wiki/Special:Recentchanges Commons] - ([[Project:Hvordan bruger jeg seneste ændringer siden|hjælp]] | [http://da.wikipedia.org/w/wiki.phtml?title=MediaWiki:Recentchangestext&action=edit rediger])</small> 
-|-valign=\"top\" |align=\"right\"|<small>[[Project:Om|Om {{SITENAME}}]]:'''&nbsp;</small> 
-|align=\"left\"|<small>[[Project:Velkommen nybegynder|Velkommen nybegynder]] - [[Project:OSS|Ofte stillede spørgsmål]] - [[Project:Bekendtgørelser|Bekendtgørelser]] - [[Project:Landsbybrønden|Landsbybrønden]] - [[Project:Stilmanual|Stilmanual]] - [[Project:Navngivning|Navngivning]]</small> |}",
 "rcloaderr"		=> "Indlæser seneste ændrede sider",
-"rcnote"		=> "Nedenfor er de seneste <strong>$1</strong> ændringer i de 
+"rcnote"		=> "Nedenfor er de seneste <strong>$1</strong> ændringer i de
 sidste <strong>$2</strong> dage.",
 "rcnotefrom"	=> "Nedenfor er ændringerne fra <b>$2</b> indtil <b>$1</b> vist.",
 "rclistfrom"	=> "Vis nye ændringer startende fra $1",
@@ -806,16 +738,16 @@ sidste <strong>$2</strong> dage.",
 "uploadnologin" => "Ikke logget på",
 "uploadnologintext"	=> "Du skal være [[Speciel:Userlogin|logget på]] for at kunne lægge filer op.",
 "uploaderror"	=> "Fejl under oplægning af fil",
-"uploadtext"	=> "[[Billede:Commons_without_text-35px.png|thumb|right|35px|Wiki-C]] Hvis du har billeder som kan være til nytte både her og på andre Wiki'er, 
-anbefales det at lægge det op på '''[[Commons:Forside|Wikimedia Commons]]''' der er en fælles base for frie billeder og andre filer til alle Wikimedia-projekterne. 
-For at lægge en fil op på Commons skal man oprette en brugerkonto der, på samme måde som på den danske {{SITENAME}}. 
-Der er en oversat [[Commons:Commons:Første skridt|vejledning]], og en dansksproget [[Commons:Forside|forside]]. 
-Når du skal bruge et billede fra Commons skal du bare udskifte ''image:fexxx.jpg'' med ''billede:fexxx.jpg'' i koden. 
+"uploadtext"	=> "[[Billede:Commons_without_text-35px.png|thumb|right|35px|Wiki-C]] Hvis du har billeder som kan være til nytte både her og på andre Wiki'er,
+anbefales det at lægge det op på '''[[Commons:Forside|Wikimedia Commons]]''' der er en fælles base for frie billeder og andre filer til alle Wikimedia-projekterne.
+For at lægge en fil op på Commons skal man oprette en brugerkonto der, på samme måde som på den danske {{SITENAME}}.
+Der er en oversat [[Commons:Commons:Første skridt|vejledning]], og en dansksproget [[Commons:Forside|forside]].
+Når du skal bruge et billede fra Commons skal du bare udskifte ''image:fexxx.jpg'' med ''billede:fexxx.jpg'' i koden.
 Logoet ovenfor til højre er hentet fra Commons, og sat ind her med denne kode: :<nowiki>[[Billede:Commons_without_text-35px.png|thumb|right|35px|Wiki-C]]</nowiki>
 
 <div style=\"border: 1px solid grey; background: \#ddf; padding: 7px; margin: 0 auto;\">
-<strong>STOP!</strong> Før du lægger filer op her, 
-så vær sikker på du har læst og følger {{SITENAME}}s 
+<strong>STOP!</strong> Før du lægger filer op her,
+så vær sikker på du har læst og følger {{SITENAME}}s
 [[{{NS:4}}:Politik om brug af billeder|politik om brug af billeder]].
 
 Følg venligst disse retningslinjer:
@@ -826,27 +758,27 @@ Følg venligst disse retningslinjer:
 <li>Tjek i [[Speciel:Imagelist|listen over filer]] om filen allerede er lagt op</li>
 </ul>
 </div>
-<p>Brug formularen herunder til at lægge nye filer op, som kan bruges i dine artikler. 
-På de fleste browsere vil du se en \"Browse...\" knap eller en 
-\"Gennemse...\" knap, som vil 
-bringe dig til dit styresystems standard-dialog til åbning af filer. 
-Når du vælger en fil, vil navnet på filen dukke op i tekstfeltet 
-ved siden af knappen. 
-Du skal også bekræfte, at du ikke er ved at bryde nogens ophavsret. 
-Det gør du ved at sætte et mærke i tjekboksen. 
-Vælg \"Læg en fil op\"-knappen for at lægge filen op. 
-Dette kan godt tage lidt tid hvis du har en langsom internetforbindelse. 
-
-<p>De foretrukne formater er JPEG til fotografiske billeder, PNG 
-til tegninger og andre små billeder, og OGG til lyd. 
-For at bruge et billede i en artikel, så brug et link af denne type 
-'''<nowiki>[[billede:fil.jpg]]</nowiki>''' eller 
-'''<nowiki>[[billede:fil.png|alternativ tekst]]</nowiki>''' eller 
-'''<nowiki>[[media:fil.ogg]]</nowiki>''' for lyd. 
-
-<p>Læg mærke til at præcis som med alle andre sider, så kan og må andre gerne 
-redigere eller 
-slette de filer, du har lagt op, hvis de mener det hjælper {{SITENAME}}, og 
+<p>Brug formularen herunder til at lægge nye filer op, som kan bruges i dine artikler.
+På de fleste browsere vil du se en \"Browse...\" knap eller en
+\"Gennemse...\" knap, som vil
+bringe dig til dit styresystems standard-dialog til åbning af filer.
+Når du vælger en fil, vil navnet på filen dukke op i tekstfeltet
+ved siden af knappen.
+Du skal også bekræfte, at du ikke er ved at bryde nogens ophavsret.
+Det gør du ved at sætte et mærke i tjekboksen.
+Vælg \"Læg en fil op\"-knappen for at lægge filen op.
+Dette kan godt tage lidt tid hvis du har en langsom internetforbindelse.
+
+<p>De foretrukne formater er JPEG til fotografiske billeder, PNG
+til tegninger og andre små billeder, og OGG til lyd.
+For at bruge et billede i en artikel, så brug et link af denne type
+'''<nowiki>[[billede:fil.jpg]]</nowiki>''' eller
+'''<nowiki>[[billede:fil.png|alternativ tekst]]</nowiki>''' eller
+'''<nowiki>[[media:fil.ogg]]</nowiki>''' for lyd.
+
+<p>Læg mærke til at præcis som med alle andre sider, så kan og må andre gerne
+redigere eller
+slette de filer, du har lagt op, hvis de mener det hjælper {{SITENAME}}, og
 du kan blive blokeret fra at lægge op hvis du misbruger systemet.",
 "uploadlog"		=> "oplægningslog",
 "uploadlogpage" => "Oplægningslog",
@@ -856,13 +788,9 @@ du kan blive blokeret fra at lægge op hvis du misbruger systemet.",
 "filedesc"		=> "Beskrivelse",
 'filestatus' => 'Status på ophavsret',
 'filesource' => 'Kilde',
-"affirmation"	=> "Jeg bekræfter, at ophavsretshaveren til denne fil
-er enig i, at filen udgives under betingelserne for $1.",
-"copyrightpage" => "{{SITENAME}}:Ophavsret",
+"copyrightpage" => "{{ns:project}}:Ophavsret",
 "copyrightpagename" => "{{SITENAME}} ophavsret",
 "uploadedfiles"	=> "Filer som er lagt op",
-"noaffirmation" => "Du skal bekræfte, at du ikke bryder nogens ophavsret
-ved at lægge denne fil op.",
 "ignorewarning"	=> "Ignorér advarslen og gem filen alligevel.",
 "minlength"		=> "Navnet på filen skal være på mindst tre bogstaver.",
 'illegalfilename'	=> 'Filnavnet "$1" indeholder tegn, der ikke er tilladte i sidetitler. Omdøb filen og prøv at lægge den op igen.',
@@ -901,7 +829,7 @@ og af hvem, og andre ting du ved om filen.",
 "revertimg"		=> "gendan",
 "deleteimg"		=> "slet",
 "deleteimgcompletely"		=> "Slet alle revisioner af dette billede",
-"imghistlegend" => "Forklaring: (nuværende) = dette er det nuværende billede, 
+"imghistlegend" => "Forklaring: (nuværende) = dette er det nuværende billede,
 (slet) = slet denne gamle version, (gendan) = gendan en gammel version.
 <br /><i>Klik på en dato for at se billedet, som er lagt op den dag</i>.",
 "imagelinks"	=> "Billedehenvisninger",
@@ -917,56 +845,56 @@ og af hvem, og andre ting du ved om filen.",
 "statistics"	=> "Statistik",
 "sitestats"		=> "Statistiske oplysninger om {{SITENAME}}",
 "userstats"		=> "Statistik om brugere på {{SITENAME}}",
-"sitestatstext" => "Der er i alt '''$1''' sider i databasen. 
-Dette tal indeholder \"diskussion\"-sider, sider om {{SITENAME}}, omdirigeringssider og andre sider der sikkert ikke kan kaldes artikler. 
-Hvis man udelader disse, så er der '''$2''' sider som sandsynligvis er rigtige artikler. 
-Der har i alt været '''$4''' sideredigeringer siden programmellet blev opdateret den 25. september 2002. 
-Det vil sige, at der har været '''$5''' gennemsnitlige redigeringer pr. side. 
-For mere udførlige statistikker se: 
-*[http://www.wikipedia.org/wikistats/DA/Sitemap.htm Omfattende Wikipedia-statistik] 
-*[http://wikimedia.org/stats/da.wikipedia.org Antal besøgende på Wikipedia] 
-*[http://wikimedia.org/stats/live Aktuelle grafer over servertrafikken] 
+"sitestatstext" => "Der er i alt '''$1''' sider i databasen.
+Dette tal indeholder \"diskussion\"-sider, sider om {{SITENAME}}, omdirigeringssider og andre sider der sikkert ikke kan kaldes artikler.
+Hvis man udelader disse, så er der '''$2''' sider som sandsynligvis er rigtige artikler.
+Der har i alt været '''$4''' sideredigeringer siden programmellet blev opdateret den 25. september 2002.
+Det vil sige, at der har været '''$5''' gennemsnitlige redigeringer pr. side.
+For mere udførlige statistikker se:
+*[http://www.wikipedia.org/wikistats/DA/Sitemap.htm Omfattende Wikipedia-statistik]
+*[http://wikimedia.org/stats/da.wikipedia.org Antal besøgende på Wikipedia]
+*[http://wikimedia.org/stats/live Aktuelle grafer over servertrafikken]
 *[[{{ns:4}}:Statistik|Statistik over væksten]] .",
-"userstatstext" => "Der er '''$1''' registrerede brugere. 
-'''$2''' (eller '''$4%''') af disse er administratorer (se $3). 
+"userstatstext" => "Der er '''$1''' registrerede brugere.
+'''$2''' (eller '''$4%''') af disse er administratorer (se $3).
 * [http://www.wikipedia.org/wikistats/DA/TablesWikipediaDA.htm#wikipedians Aktive brugere].",
 
 # Maintenance Page
 #
 "maintenance"		=> "Vedligeholdelsesside",
-"maintnancepagetext"	=> "På denne side er der forskellige smarte 
-værktøjer til at vedligeholde {{SITENAME}}. Nogle af disse funktioner er ret 
-hårde for databasen (de tager lang tid), så lad være med at opdatere siden 
+"maintnancepagetext"	=> "På denne side er der forskellige smarte
+værktøjer til at vedligeholde {{SITENAME}}. Nogle af disse funktioner er ret
+hårde for databasen (de tager lang tid), så lad være med at opdatere siden
 hver gang du har rettet en enkelt ting ;-)",
 "maintenancebacklink"	=> "Tilbage til vedligeholdelsessiden",
 "disambiguations"	=> "Artikler med flertydige titler",
 "disambiguationspage"	=> "Project:Henvisninger til artikler med flertydige titler",
-"disambiguationstext"	=> "De følgende artikler henviser til 
-<i>artikler med flertydige titler</i>. De skulle henvise til en ikke-flertydig 
+"disambiguationstext"	=> "De følgende artikler henviser til
+<i>artikler med flertydige titler</i>. De skulle henvise til en ikke-flertydig
 titel i stedet for.<br />En artikel bliver behandlet som flertydig, hvis den er
 henvist fra $1.<br />Henvisninger fra andre navnerum er <i>ikke</i> listet her.",
 "doubleredirects"	=> "Dobbelte omdirigeringer",
-"doubleredirectstext"	=> "<b>Bemærk:</b> Denne liste kan indeholde forkerte 
+"doubleredirectstext"	=> "<b>Bemærk:</b> Denne liste kan indeholde forkerte
 resultater. Det er som regel, fordi siden indeholder ekstra tekst under den
-første #REDIRECT.<br />\nHver linje indeholder henvisninger til den første og den 
-anden omdirigering, og den første linje fra den anden omdirigeringstekst, 
-det giver som regel den \"rigtige\" målartikel, som den første omdirigering 
+første #REDIRECT.<br />\nHver linje indeholder henvisninger til den første og den
+anden omdirigering, og den første linje fra den anden omdirigeringstekst,
+det giver som regel den \"rigtige\" målartikel, som den første omdirigering
 skulle have peget på.",
 "brokenredirects"	=> "Dårlige omdirigeringer",
-"brokenredirectstext"	=> "De følgende omdirigeringer peger på en side der 
+"brokenredirectstext"	=> "De følgende omdirigeringer peger på en side der
 ikke eksisterer.",
 "selflinks"		=> "Sider der henviser til sig selv",
-"selflinkstext"		=> "De følgende sider indeholder henvisninger til sig selv, 
+"selflinkstext"		=> "De følgende sider indeholder henvisninger til sig selv,
 men det burde de ikke.",
 "mispeelings"           => "Sider med stavefejl",
-"mispeelingstext"               => "De følgende sider indeholder en af de 
-almindelig stavefejl, som er listet på $1. Den korrekte stavemåde kan 
+"mispeelingstext"               => "De følgende sider indeholder en af de
+almindelig stavefejl, som er listet på $1. Den korrekte stavemåde kan
 angives i paranteser efter den fejlagtige stavemåde (sådan her).",
 "mispeelingspage"       => "Liste over almindelige stavefejl",
 "missinglanguagelinks"  => "Manglende sproghenvisninger",
 "missinglanguagelinksbutton"    => "Find manglende sproghenvisninger for",
-"missinglanguagelinkstext"      => "Disse artikler har <i>ikke</i> nogen 
-henvisning til den samme artikel i $1. Omdirigeringer og underartikler er 
+"missinglanguagelinkstext"      => "Disse artikler har <i>ikke</i> nogen
+henvisning til den samme artikel i $1. Omdirigeringer og underartikler er
 <i>ikke</i> vist.",
 
 
@@ -1011,7 +939,7 @@ i aktivt brug.",
 
 # FIXME: Other sites, of course, may have affiliate relations with the booksellers list
 "booksourcetext" => "Herunder er en liste af henvisninger til steder der
-udlåner og/eller sælger nye og brugte bøger, og som måske også har 
+udlåner og/eller sælger nye og brugte bøger, og som måske også har
 yderligere oplysninger om bøger du leder efter.
 {{SITENAME}} er ikke associeret med nogen af disse steder,
 og denne liste skal ikke ses som en anbefaling af disse.",
@@ -1021,7 +949,7 @@ og denne liste skal ikke ses som en anbefaling af disse.",
 "alphaindexline" => "$1 til $2",
 'version'		=> 'Information om MediaWiki',
 'log'		=> 'Logs',
-'alllogstext'	=> 'Samlet visning af oplægningslog, sletningslog, blokeringslog, bureaukratlog og listen over beskyttede sider. 
+'alllogstext'	=> 'Samlet visning af oplægningslog, sletningslog, blokeringslog, bureaukratlog og listen over beskyttede sider.
 Du kan sortere i visningen ved at vælge type, brugernavn og/eller en udvalgt side.',
 
 # Special:Allpages
@@ -1042,7 +970,7 @@ Du kan sortere i visningen ved at vælge type, brugernavn og/eller en udvalgt si
 "emailuser"		=> "E-mail til denne bruger",
 "emailpage"		=> "E-mail bruger",
 "emailpagetext"	=> "Hvis denne bruger har sat en gyldig e-mail-adresse i
-sine brugerindstillinger, så vil formularen herunder sende en enkelt 
+sine brugerindstillinger, så vil formularen herunder sende en enkelt
 besked.
 Den e-mailadresse, du har sat i dine brugerindstillinger, vil dukke op
 i \"Fra\" feltet på denne mail, så modtageren er i stand til at svare.",
@@ -1069,7 +997,7 @@ eller har valgt ikke at modtage e-mail fra andre brugere.",
 "addedwatch"	=> "Tilføjet til din overvågningsliste",
 "addedwatchtext" => "Siden \"$1\" er blevet tilføjet til din [[Speciel:Watchlist|overvågningsliste]]. Fremtidige ændringer til denne side og den tilhørende diskussionsside vil blive listet der, og siden vil fremstå '''fremhævet''' i [[Speciel:Recentchanges|listen med de seneste ændringer]] for at gøre det lettere at finde den. Hvis du senere vil fjerne siden fra din overvågningsliste, så klik \"Fjern overvågning\".",
 "removedwatch"	=> "Fjernet fra overvågningsliste",
-"removedwatchtext" => "Siden \"$1\" er blevet fjernet fra din 
+"removedwatchtext" => "Siden \"$1\" er blevet fjernet fra din
 overvågningsliste.",
 'watch' => 'Overvåg',
 "watchthispage"	=> "Overvåg side",
@@ -1088,7 +1016,7 @@ overvågningsliste.",
 "removechecked" => "Fjern valgte sider fra min overvågningsliste",
 "watchlistcontains" => "Din overvågningsliste indeholder $1 sider.",
 "watcheditlist" => "Her er en alfabetisk liste over siderne i din overvågningsliste.
-Vælg de sider du vil fjerne fra din overvågningsliste 
+Vælg de sider du vil fjerne fra din overvågningsliste
 og klik på 'fjern valgte sider fra min overvågningsliste' knappen
 i bunden af skærmen.",
 "removingchecked" => "Fjerner de valgte sider fra din overvågningsliste...",
@@ -1149,23 +1077,23 @@ konsekvenserne, og at du gør dette i overensstemmelse med
 Se $2 for en fortegnelse over de nyeste sletninger.",
 "deletedarticle" => "slettede \"$1\"",
 "dellogpage"	=> "Sletningslog",
-"dellogpagetext" => "Herunder er en liste over de nyeste sletninger. 
+"dellogpagetext" => "Herunder er en liste over de nyeste sletninger.
 Alle tider er serverens tid (UTC).
 ",
 "deletionlog"	=> "sletningslog",
 "reverted"		=> "Gendannet en tidligere version",
 "deletecomment"	=> "Begrundelse for sletning",
-"imagereverted" => "Gendannelse af en tidligere version gennemført med 
+"imagereverted" => "Gendannelse af en tidligere version gennemført med
 succes.",
 "rollback"		=> "Fjern redigeringer",
 'rollback_short' => 'Fjern redigering',
 "rollbacklink"	=> "fjern redigering",
 "rollbackfailed" => "Kunne ikke fjerne redigeringen",
-"cantrollback"	=> "Kan ikke fjerne redigering; 
+"cantrollback"	=> "Kan ikke fjerne redigering;
 den sidste bruger er den eneste forfatter.",
 "alreadyrolled"	=> "Kan ikke fjerne den seneste redigering af [[$1]] foretaget af [[Bruger:$2|$2]] ([[Bruger diskussion:$2|diskussion]]); en anden har allerede redigeret siden eller fjernet redigeringen. Den seneste redigering er foretaget af [[Bruger:$3|$3]] ([[Bruger diskussion:$3|diskussion]]). ",
 #   only shown if there is an edit comment
-"editcomment" => "Kommentaren til redigeringen var: \"<i>$1</i>\".", 
+"editcomment" => "Kommentaren til redigeringen var: \"<i>$1</i>\".",
 "revertpage"	=> "Gendannelse til seneste version ved $1, fjerner ændringer fra $2",
 'sessionfailure' => 'There seems to be a problem with your login session;
 this action has been canceled as a precaution against session hijacking.
@@ -1188,21 +1116,21 @@ Se [[Project:Beskyttet side]] for mere information.",
 # Undelete
 "undelete" => "Gendan en slettet side",
 "undeletepage" => "Se og gendan slettede sider",
-"undeletepagetext" => "De følgende sider er slettede, men de findes 
+"undeletepagetext" => "De følgende sider er slettede, men de findes
 stadig i arkivet og kan gendannes. Arkivet blivet periodevis slettet.",
 "undeletearticle" => "Gendan slettet artikel",
 "undeleterevisions" => "$1 revisioner arkiveret",
-"undeletehistory" => "Hvis du gendanner siden, vil alle de historiske 
-revisioner også blive gendannet. Hvis en ny side med det samme navn 
-er oprettet siden denne blev slettet, så vil de gendannede revisioner 
-dukke op i den tidligere historie, og den nyeste revision vil forblive 
+"undeletehistory" => "Hvis du gendanner siden, vil alle de historiske
+revisioner også blive gendannet. Hvis en ny side med det samme navn
+er oprettet siden denne blev slettet, så vil de gendannede revisioner
+dukke op i den tidligere historie, og den nyeste revision vil forblive
 på siden.",
 "undeleterevision" => "Slettet version fra $1",
 "undeletebtn" => "Gendan!",
 "undeletedarticle" => "gendannede \"$1\"",
 'undeletedrevisions' => "$1 versioner gendannet",
 "undeletedtext"   => "Artiklen [[$1]] er blevet gendannet med succes.
-Se [[{{SITENAME}}:Sletningslog]] for en fortegnelse over nylige 
+Se [[{{ns:project}}:Sletningslog]] for en fortegnelse over nylige
 sletninger og gendannelser.",
 
 # Namespace form on various pages
@@ -1215,7 +1143,7 @@ sletninger og gendannelser.",
 "mycontris" => "Mine bidrag",
 "contribsub"	=> "For $1",
 "nocontribs"	=> "Ingen ændringer er fundet som opfylder disse kriterier.",
-"ucnote"	=> "Herunder er denne brugers sidste <b>$1</b> ændringer i de 
+"ucnote"	=> "Herunder er denne brugers sidste <b>$1</b> ændringer i de
 sidste <b>$2</b> dage.",
 "uclinks"	=> "Vis de sidste $1 ændringer; vis de sidste $2 dage.",
 "uctop"		=> " (top)" ,
@@ -1272,8 +1200,8 @@ for en tidligere blokeret IP-adresse eller bruger.",
 "lockdb"		=> "Lås database",
 "unlockdb"		=> "Lås database op",
 "lockdbtext"	=> "At låse databasen vil forhindre alle brugere i at kunne redigere sider, ændre indstillinger, redigere overvågningslister og andre ting der kræver ændringer i databasen. Bekræft venligst at du har til hensigt at gøre dette, og at du vil låse databasen op, når din vedligeholdelse er overstået.",
-"unlockdbtext"	=> "At låse databasen op vil gøre, at alle brugere igen 
-kan redigere sider, ændre deres indstillinger, redigere deres 
+"unlockdbtext"	=> "At låse databasen op vil gøre, at alle brugere igen
+kan redigere sider, ændre deres indstillinger, redigere deres
 overvågningsliste, og andre ting der kræver ændringer i databasen.
 Bekræft venligst at du har til hensigt at gøre dette.",
 "lockconfirm"	=> "Ja, jeg vil virkelig låse databasen.",
@@ -1358,24 +1286,24 @@ Indsæt navnet på brugeren i tekstboksen og tryk på knappen for at ændre rett
 # Move page
 #
 "movepage"		=> "Flyt side",
-"movepagetext"	=> "Når du bruger formularen herunder vil du få omdøbt en 
+"movepagetext"	=> "Når du bruger formularen herunder vil du få omdøbt en
 side og flyttet hele sidens historie til det nye navn.
 Den gamle titel vil blive en omdirigeringsside til den nye titel.
-Henvisninger til den gamle titel vil ikke blive ændret. Sørg for at 
-tjekke for dobbelte eller dårlige omdirigeringer. 
-Du er ansvarlig for, at alle henvisninger stadig peger derhen, hvor det er 
+Henvisninger til den gamle titel vil ikke blive ændret. Sørg for at
+tjekke for dobbelte eller dårlige omdirigeringer.
+Du er ansvarlig for, at alle henvisninger stadig peger derhen, hvor det er
 meningen de skal pege.
 
-Bemærk at siden '''ikke''' kan flyttes hvis der allerede er en side 
-med den nye titel, medmindre den side er tom eller er en omdirigering 
-uden nogen historie. Det betyder at du kan flytte en side tilbage hvor 
+Bemærk at siden '''ikke''' kan flyttes hvis der allerede er en side
+med den nye titel, medmindre den side er tom eller er en omdirigering
+uden nogen historie. Det betyder at du kan flytte en side tilbage hvor
 den kom fra, hvis du kommer til at lave en fejl.
 
 <b>ADVARSEL!</b>
 Dette kan være en drastisk og uventet ændring for en populær side;
 vær sikker på, at du forstår konsekvenserne af dette før du
 fortsætter.",
-"movepagetalktext" => "Den tilhørende diskussionsside, hvis der er en, 
+"movepagetalktext" => "Den tilhørende diskussionsside, hvis der er en,
 vil automatisk blive flyttet med siden '''medmindre:'''
 *Du flytter siden til et andet navnerum,
 *En ikke-tom diskussionsside allerede eksisterer under det nye navn, eller
@@ -1392,13 +1320,13 @@ for at flytte en side.",
 "pagemovedtext" => "Siden \"[[$1]]\" er flyttet til \"[[$2]]\".",
 "articleexists" => "En side med det navn eksisterer allerede, eller det
 navn du har valgt er ikke gyldigt. Vælg et andet navn.",
-"talkexists"	=> "Siden blev flyttet korrekt, men den tilhørende 
-diskussionsside kunne ikke flyttes, fordi der allerede eksisterer en 
+"talkexists"	=> "Siden blev flyttet korrekt, men den tilhørende
+diskussionsside kunne ikke flyttes, fordi der allerede eksisterer en
 med den nye titel. Du er nødt til at flette dem sammen manuelt.",
 "movedto"		=> "flyttet til",
 "movetalk"		=> "Flyt også \"diskussionssiden\", hvis den eksisterer.",
 "talkpagemoved" => "Den tilhørende diskussionsside blev også flyttet.",
-"talkpagenotmoved" => "Den tilhørende diskussionsside blev 
+"talkpagenotmoved" => "Den tilhørende diskussionsside blev
 <strong>ikke</strong> flyttet.",
 '1movedto2'		=> "$1 flyttet til $2",
 '1movedto2_redir' => '$1 flyttet til $2 over en omdirigering',
@@ -1407,7 +1335,7 @@ med den nye titel. Du er nødt til at flette dem sammen manuelt.",
 'movereason'	=> 'Begrundelse',
 'revertmove'	=> 'gendan',
 'delete_and_move' => 'Slet og flyt',
-'delete_and_move_text'	=> 
+'delete_and_move_text'	=>
 '==Sletning nødvendig==
 
 Målartiklen "[[$1]]" eksisterer allerede. Vil du slette den for at lave plads til flytningen?',
@@ -1465,7 +1393,7 @@ Målartiklen "[[$1]]" eksisterer allerede. Vil du slette den for at lave plads t
 'tooltip-watch' => 'Tilføj denne side til din overvågningsliste [alt-w]',
 
 # stylesheets
-'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
+#'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
 #'Monobook.js' => '/* redigér denne fil for at ændre js-indstillinger i monobook-udseendet */',
 
 # Metadata
@@ -1475,13 +1403,13 @@ Målartiklen "[[$1]]" eksisterer allerede. Vil du slette den for at lave plads t
 
 # Attribution
 
-'anonymous' => "Anonym(e) bruger(e) af $wgSitename",
-'siteuser' => "$wgSitename bruger $1",
+'anonymous' => "Anonym(e) bruger(e) af {{SITENAME}}",
+'siteuser' => "{{SITENAME}} bruger $1",
 'lastmodifiedby' => "Denne side blev senest ændret $1 af $2.",
 'and' => 'og',
 'othercontribs' => "Baseret på arbejde af $1.",
 'others' => 'andre',
-'siteusers' => "$wgSitename bruger(e) $1",
+'siteusers' => "{{SITENAME}} bruger(e) $1",
 'creditspage' => 'Sidens forfattere',
 'nocredits' => 'Der er ingen forfatteroplysninger om denne side.',
 
@@ -1653,21 +1581,6 @@ class LanguageDa extends LanguageUtf8 {
 		return $this->date( $ts, $adj ) . " kl. " . $this->time( $ts, $adj );
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesDa;
-		return $wgValidSpecialPagesDa;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesDa;
-		return $wgSysopSpecialPagesDa;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesDa;
-		return $wgDeveloperSpecialPagesDa;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesDa;
 		if( isset( $wgAllMessagesDa[$key] ) ) {
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index 6e32042d86b5..b91937b64cfd 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -11,7 +11,7 @@ require_once( 'LanguageUtf8.php' );
 # See Language.php for notes.
 
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
+	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
 /* private */ $wgNamespaceNamesDe = array(
 	NS_MEDIA            => 'Media',
@@ -59,55 +59,6 @@ if($wgMetaNamespace === FALSE)
 	'Lehmanns Fachbuchhandlung' => 'http://www.lob.de/cgi-bin/work/suche?flag=new&stich1=$1',
 );
 
-
-/* private */ $wgValidSpecialPagesDe = array(
-  'Userlogin'           => '',
-  'Userlogout'          => '',
-  'Preferences'         => 'Meine Benutzereinstellungen',
-  'Watchlist'           => 'Meine Beobachtungsliste',
-  'Recentchanges'       => 'Letzte Änderungen',
-  'Upload'              => 'Dateien hochladen',
-  'Imagelist'           => 'Hochgeladene Dateien',
-  'Listusers'           => 'Registrierte Benutzer',
-  'Statistics'          => 'Seitenstatistik',
-  'Randompage'          => 'Zufälliger Artikel',
-
-  'Lonelypages'         => 'Verwaiste Artikel',
-  'Unusedimages'        => 'Verwaiste Dateien',
-  'Popularpages'        => 'Beliebte Artikel',
-  'Wantedpages'         => 'Gewünschte Artikel',
-  'Shortpages'          => 'Kurze Artikel',
-  'Longpages'           => 'Lange Artikel',
-  'Newpages'            => 'Neue Artikel',
-  'Ancientpages'        => 'Älteste Artikel',
-/*  "Intl"                => "Interlanguage Links", */
-  'Allpages'            => 'Alle Artikel (alphabetisch)',
-
-  'Ipblocklist'         => 'Blockierte IP-Adressen',
-  'Maintenance'         => 'Wartungsseite',
-  'Specialpages'        => '',
-  "Contributions"       => '',
-  "Movepage"            => '',
-  "Emailuser"           => '',
-  "Whatlinkshere"       => '',
-  "Recentchangeslinked" => '',
-  "Booksources"         => "Externe Buchhandlungen",
-  "Categories"          => "Seiten-Kategorien",
-  "Export"              => "XML-Seitenexport",
-  "Version"				=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesDe = array(
-	"Blockip"		=> "Blockiere eine IP-Adresse",
-	"Asksql"		=> "Datenbank-Abfrage",
-	"Undelete"              => "Gelöschte Seiten wiederherstellen"
-);
-
-/* private */ $wgDeveloperSpecialPagesDe = array(
-	"Lockdb"		=> "Datenbank sperren",
-	"Unlockdb"		=> "Datenbank freigeben",
-);
-
 /* private */ $wgAllMessagesDe = array(
 'Monobook.css' =>
 '/** Do not force \'lowercase\' */
@@ -118,7 +69,6 @@ if($wgMetaNamespace === FALSE)
 	text-transform: none;
 }',
 # User toggles
-'tog-hover'		=> 'Tooltips anzeigen',
 "tog-underline"               => "Verweise unterstreichen",
 "tog-highlightbroken"         => "Verweise auf leere Themen hervorheben",
 "tog-justify"                 => "Text als Blocksatz",
@@ -142,8 +92,6 @@ if($wgMetaNamespace === FALSE)
 'tog-enotifminoredits' 		=> 'Benachrichtigungsmails auch für kleine Seitenänderungen',
 'tog-enotifrevealaddr' 		=> 'Ihre E-Mail-Adresse wird in Benachrichtigungsmails gezeigt',
 'tog-shownumberswatching' 	=> 'Zeige die Anzahl seitenbeobachtender Benutzer (in Letzte Änderungen, Beobachtungsliste und Artikelseiten)',
-'tog-rccurrevonly' 		=> 'Zeige nur die letzte Seitenversion in Letzte Änderungen.',
-'tog-showupdated'		=> 'Zeige bei beobachteten Seiten mit ungesehenen Änderungen die Markierung ',
 'tog-fancysig'			=> 'Einfache Unterschrift (Spitzname ohne Link)',
 # Dates
 'sunday' => "Sonntag",
@@ -194,18 +142,17 @@ und das [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Benutzerhandbuc
 "portal-url"		=> "{{ns:4}}:Portal",
 "about"			=> "Über",
 "aboutsite"      => "Über {{SITENAME}}",
-"aboutpage"		=> "Project:Über_{{SITENAME}}",
+"aboutpage"		=> "{{ns:project}}:Über_{{SITENAME}}",
 "article" => "Artikel",
 "help"			=> "Hilfe",
 "helppage"		=> "Project:Hilfe",
-"wikititlesuffix"       => "{{SITENAME}}",
 "bugreports"	=> "Kontakt",
 "bugreportspage" => "Project:Kontakt",
 "sitesupport"   => "Spenden",
 "faq"			=> "FAQ",
-"faqpage"		=> "{{SITENAME}}:Häufig_gestellte_Fragen",
+"faqpage"		=> "{{ns:project}}:Häufig_gestellte_Fragen",
 "edithelp"		=> "Bearbeitungshilfe",
-"edithelppage"	=> "{{SITENAME}}:Editierhilfe",
+"edithelppage"	=> "{{ns:project}}:Editierhilfe",
 "cancel"		=> "Abbruch",
 "qbfind"		=> "Finden",
 "qbbrowse"		=> "Blättern",
@@ -259,15 +206,12 @@ und das [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Benutzerhandbuc
 "copyright"	=> "Inhalt ist verfügbar unter der $1.",
 "poweredby"	=> "{{SITENAME}} benutzt [http://www.mediawiki.org/ MediaWiki], eine Open Source Wiki-Engine.",
 "printsubtitle" => "(Von {{SERVER}})",
-"gnunote" => "Diese Seite ist unter der <a class=internal href='$wgScriptPath/GNU_FDL'>GNU FDL</a> verfügbar.",
 "protectedpage" => "Geschützte Seite",
 "administrators" => "Project:Administratoren",
 "sysoptitle"	=> "Sysop-Zugang notwendig",
 'sysoptext'		=> 'Dieser Vorgang kann aus Sicherheitsgründen nur von Benutzern mit"Sysop"-Status durchgeführt werden. Siehe auch $1.',
 "developertitle" => "Entwickler-Zugang notwendig",
 'developertext'	=> 'Dieser Vorgang kann aus Sicherheitsgründen nur von Benutzern mit"Entwickler"-Status durchgeführt werden. Siehe auch $1.',
-'bureaucrattitle'	=> 'Bürokraten-Rechte notwendig',
-'bureaucrattext'	=> 'Dieser Vorgang kann nur von Benutzern mit "Bürokrat"-Status durchgeführt werden.',
 "nbytes"		=> "$1 Byte",
 "go"			=> "Los",
 "ok"			=> "OK",
@@ -278,10 +222,6 @@ und das [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Benutzerhandbuc
 'retrievedfrom' => 'Von "$1"',
 "newmessages" => "Sie haben $1.",
 "newmessageslink" => "neue Nachrichten",
-'newmsg' => 'Sie haben neue Nachrichten auf Ihrer $1.',
-'newmsg_user' => 'Benutzerseite',
-'newmsg_usertalk' => 'Diskussionsseite',
-'newmsg_and' => 'und',
 "editsection" => "bearbeiten",
 "toc" => "Inhaltsverzeichnis",
 "showtoc" => "Anzeigen",
@@ -370,7 +310,6 @@ Query: $2
 "protectedtext" => "Diese Seite ist für das Bearbeiten gesperrt. Dafür kann es diverse Gründe geben; siehe [[{{ns:4}}:Geschützte Seiten]].
 
 Sie können den Quelltext dieser Seite betrachten und kopieren:",
-'seriousxhtmlerrors' => 'Tidy entdeckte schwere Fehler im XHTML-Markup.',
 
 
 # Login and logout pages
@@ -389,12 +328,12 @@ Vergessen Sie nicht, Ihre Einstellungen anzupassen.",
 "newusersonly"	=> " (nur für neue Mitglieder)",
 "remembermypassword" => "Dauerhaftes Einloggen",
 "loginproblem"	=> "<b>Es gab ein Problem mit Ihrer Anmeldung.</b><br />Bitte versuchen Sie es nochmal!",
-"alreadyloggedin" => "<font color=red><b>Benutzer $1, Sie sind bereits angemeldet!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Benutzer $1, Sie sind bereits angemeldet!</strong><br />\n",
 
 "login"			=> "Anmelden",
 "loginprompt"           => "Um sich bei {{SITENAME}} anmelden zu können, müssen Cookies aktiviert sein.",
 "userlogin"		=> "Anmelden",
-'disabled_on_this_wiki'	=> '<div class=\"error\"><b>Diese Funktion ist bei diesem Wiki dauerhaft abeschaltet.
+'disabled_on_this_wiki'	=> '<div class="error"><b>Diese Funktion ist bei diesem Wiki dauerhaft abeschaltet.
 Durch die automatische Anmeldung beim Benutzerkonto sind eigene Benutzer-Anmeldung oder -Abmeldung nicht erforderlich.</b></div>',
 "logout"		=> "Abmelden",
 "userlogout"	=> "Abmelden",
@@ -478,12 +417,11 @@ Als Grund wurde angegeben:<br />$2<p>Bitte kontaktieren Sie den Administrator, u
 "anontalkpagetext" => "---- ''Dies ist die Diskussions-Seite eines nicht angemeldeten Benutzers. Wir müssen hier die numerische [[IP-Adresse]] zur Identifizierung verwenden. Eine solche Adresse kann nacheinander von mehreren Benutzern verwendet werden. Wenn Sie ein anonymer Benutzer sind und denken, dass irrelevante Kommentare an Sie gerichtet wurden, [[Spezial:Userlogin|melden Sie sich bitte
  an]], um zukünftige Verwirrung zu vermeiden. ''",
 "noarticletext" => "(Dieser Artikel enthält momentan keinen Text)",
-'usercssjs' => "'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla:''' Klick auf ''Neu laden''(oder ''Strg-R''), '''IE / Opera:''' ''Strg-F5'', '''Safari:''' ''Cmd-r'', '''Konqueror''' ''Strg-R''.",
 'usercsspreview' => "== Vorschau ihres Benutzer-CSS. ==
-'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla:''' Klick auf ''Neu laden''(oder ''Strg-R''), '''IE / Opera:''' ''Strg-F5'', '''Safari:''' ''Cmd-r'', '''Konqueror''' ''Strg-R''.",
+'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla:''' ''Strg-Shift-R'', '''IE:''' ''Strg-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'userjspreview' => "== Vorschau Ihres Benutzer-Javascript. ==
-'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla:''' Klick auf ''Neu laden''(oder ''Strg-R''), '''IE / Opera:''' ''Strg-F5'', '''Safari:''' ''Cmd-r'', '''Konqueror''' ''Strg-R''.",
-'clearyourcache' => "'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla:''' Klick auf ''Neu laden''(oder ''Strg-R''), '''IE / Opera:''' ''Strg-F5'', '''Safari:''' ''Cmd-r'', '''Konqueror''' ''Strg-R''.",
+'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla:''' ''Strg-Shift-R'', '''IE:''' ''Strg-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
+'clearyourcache' => "'''Beachten Sie:''' Nach dem Speichern müssen Sie ihrem Browser sagen, die neue Version zu laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''IE:''' ''Strg-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'usercssjsyoucanpreview' => "<strong>Tipp:</strong> Benutzen Sie den Vorschau-Button, um Ihr neues css/js vor dem Speichern zu testen.",
 "updated"		=> "(Geändert)",
 "note"			=> "<strong>Hinweis:</strong> ",
@@ -504,7 +442,7 @@ Bitte fügen Sie Ihre Änderungen in das obere Textfeld ein.
 Wenn Sie speichern, werden alle neueren Versionen überschrieben.</strong>",
 "yourdiff"		=> "Unterschiede",
 "copyrightwarning" => "
-<b>Bitte <font size='+1'>kopieren Sie keine Webseiten</font>, die nicht Ihre eigenen sind, benutzen Sie <font size='+1'>keine urheberrechtlich geschützten Werke</font> ohne Erlaubnis des Copyright-Inhabers!</b>
+<b>Bitte <big>kopieren Sie keine Webseiten</big>, die nicht Ihre eigenen sind, benutzen Sie <big>keine urheberrechtlich geschützten Werke</big> ohne Erlaubnis des Copyright-Inhabers!</b>
 <p>Sie geben uns hiermit ihre Zusage, dass Sie den Text <strong>selbst verfasst</strong> haben, dass der Text Allgemeingut (<strong>public domain</strong>) ist, oder dass der <strong>Copyright-Inhaber</strong> seine <strong>Zustimmung</strong> gegeben hat. Falls dieser Text bereits woanders veröffentlicht wurde, weisen Sie bitte auf der 'Diskussion:'-Seite darauf hin.
 <p><i>Bitte beachten Sie, dass alle {{SITENAME}}-Beiträge automatisch unter der \"GNU Freie Dokumentationslizenz\" stehen. Falls Sie nicht möchten, dass Ihre Arbeit hier von anderen verändert und verbreitet wird, dann drücken Sie nicht auf \"Speichern\".</i>",
 "longpagewarning" => "<strong>WARNUNG: Diese Seite ist $1KB groß; einige Browser könnten Probleme haben, Seiten zu bearbeiten, die größer als 32KB sind.
@@ -530,10 +468,8 @@ Benutzer mit Sysop-Rechten bearbeitet werden kann. Beachten Sie bitte die
 'nextrevision'		=> '←Nächstjüngere Version',
 'previousrevision'	=> 'Nächstältere Version→',
 "cur"			=> "Aktuell",
-'cur_tooltiptext'	=> 'Zeige Differenz zwischen dieser und aktueller Version von ',
 "next"			=> "Nächste",
 "last"			=> "Vorherige",
-'last_tooltiptext'	=> 'Zeige Differenz zwischen dieser und vorheriger Version von ',
 "orig"			=> "Original",
 "histlegend"	=> "Diff Auswahl: Die Boxen der gewünschten
 Versionen markieren und 'Enter' drücken oder den Button unten klicken/alt-v.<br />
@@ -644,13 +580,7 @@ Wenn Sie möchten, dass {{SITENAME}} zu einem Erfolg wird, dann fügen Sie bitte
 "rclistfrom"	=> "Zeige neue Änderungen seit $1",
 "rclinks"		=> "Zeige die letzten $1 Änderungen; zeige die letzten $2 Tage.",
 "diff"			=> "Unterschied",
-'diff_tooltiptext'	=> 'Zeige Differenz zwischen dieser und der vorherigen Version von ',
-'diff-to-lvr'		=> 'Diff.z.zuletzt gesehenen',
-'diff-to-lvr_tooltiptext' => 'Zeige Differenz zwischen dieser und der zuletzt gesehenen Version von ',
-'lvr'			=> '<span class=\'updatedmarker\'>zuletzt gesehen</span>',
-'lvr_tooltiptext'  	=> 'Das ist die zuletzt gesehene Version von ',
 "hist"			=> "Versionen",
-"hist_tooltiptext"      => "Zeige ältere Versionen von ",
 "hide"			=> "Ausblenden",
 "show"			=> "Einblenden",
 "tableform"		=> "Tabelle",
@@ -698,16 +628,13 @@ Alle Zeiten sind UTC.
 <ul>
 </ul>
 ",
-"uploadlogtext" => "Hochgeladene und gelöschte Dateien werden im $1 verzeichnet.",
 "filename"		=> "Dateiname",
 "filedesc"		=> "Beschreibung",
 "filestatus" => "Copyright-Status",
 "filesource" => "Quelle",
-"affirmation"	=> "Hiermit bestätige ich, dass ich das Copyright dieser Datei habe, und diese hiermit unter $1 veröffentliche, bzw. dass die Datei 'Public Domain' ist.",
 "copyrightpage" => "Project:Copyright",
 "copyrightpagename" => "{{SITENAME}} copyright",
 "uploadedfiles"	=> "Hochgeladene Dateien",
-"noaffirmation" => "Sie müssen bestätigen, dass das Hochladen der Datei keine Copyright-Verletzung darstellt.",
 "ignorewarning"	=> "Warnung ignorieren und Datei trotzdem speichern.",
 "minlength"		=> "Bilddateien müssen mindestens drei Buchstaben haben.",
 "badfilename"	=> "Der Bildname wurde in \"$1\" geändert.",
@@ -866,7 +793,7 @@ am Ende des Artikels.",
 "watchmethod-list" => "Überprüfen der Beobachtungsliste nach letzten Bearbeitungen",
 "removechecked" => "Markierte Einträge löschen",
 "watchlistcontains" => "Ihre Beobachtungsliste enthält $1 Seiten.",
-"watcheditlist" => "Alphabetische Liste der von Ihnen beobachteten Seiten.<br>
+"watcheditlist" => "Alphabetische Liste der von Ihnen beobachteten Seiten.<br />
 Hier können Sie Seiten markieren, um Sie dann von der Beobachtungsliste zu löschen.",
 "removingchecked" => "Wunschgemäß werden die Einträge aus der Beobachtungsliste entfernt...",
 "couldntremove" => "Der Eintrag '$1' kann nicht gelöscht werden...",
@@ -879,7 +806,6 @@ Hier können Sie Seiten markieren, um Sie dann von der Beobachtungsliste zu lös
 'wlhide'         => 'Verstecke ',
 
 'updatedmarker'			=> '<span class=\'updatedmarker\'>&nbsp;(geändert)&nbsp;</span>',
-'updatedmarker_tooltiptext' 	=> 'Zeige Differenz zwischen aktueller und zuletzt gesehener Version von ',
 'enotif_mailer' 		=> '{{SITENAME}} E-Mail-Benachrichtigungsdienst',
 'enotif_reset'			=> 'Alle Benachrichtigungsmarker zurücksetzen (alle Seiten als "gesehen" markieren)',
 'enotif_newpagetext'		=> 'Dies ist eine neue Seite.',
@@ -996,7 +922,6 @@ Bitte tragen Sie den Grund für die Blockade ein.",
 "ipbreason"		=> "Grund",
 "ipbsubmit"		=> "Adresse blockieren",
 "badipaddress"	=> "Die IP-Adresse hat ein falsches Format.",
-"noblockreason" => "Sie müssen einen Grund für die Blockade angeben.",
 "blockipsuccesssub" => "Blockade erfolgreich",
 "blockipsuccesstext" => "Die IP-Adresse \"$1\" wurde blockiert.
 <br />Auf [[Spezial:Ipblocklist|IP block list]] ist eine Liste der Blockaden.",
@@ -1028,20 +953,6 @@ Bitte tragen Sie den Grund für die Blockade ein.",
 <br />Bitte geben Sie die Datenbank wieder frei, sobald die Wartung abgeschlossen ist.",
 "unlockdbsuccesstext" => "Die {{SITENAME}}-Datenbank wurde freigegeben.",
 
-# SQL query
-#
-"asksql"		=> "SQL-Abfrage",
-"asksqltext"	=> "Benutzen Sie das Formular für eine direkte
-Datenbank-Abfrage. Benutze einzelne Hochkommata ('so'), um Text zu begrenzen.
-Bitte diese Funktion vorsichtig benutzen! Das abschließende ';' wird
-automatisch ergänzt.",
-"sqlislogged" => "Bitte beachten Sie das alle SQL-Abfrage mitprotokolliert
-werden.",
-"sqlquery"		=> "Abfrage eingeben",
-"querybtn"		=> "Abfrage starten",
-"selectonly"	=> "Andere Abfragen als \"SELECT\" können nur von Entwicklern benutzt werden.",
-"querysuccessful" => "Abfrage erfolgreich",
-
 # Move page
 #
 "movepage"		=> "Artikel verschieben",
@@ -1076,91 +987,20 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 "missingimage"          => "<b>Fehlendes Bild</b><br /><i>$1</i>\n",
 
 #Tooltips:
-'tooltip-atom'	=> 'Atom-Feed von dieser Seite',
-'tooltip-addsection' => 'Einen Kommentar zu dieser Seite hinzufügen. [alt-+]',
-'tooltip-article' => 'Artikel betrachten [alt-a]',
-'tooltip-talk' => 'Diesen Artikel diskutieren [alt-t]',
-'tooltip-edit' => 'Sie können diesen Artikel bearbeiten. Benutzen Sie die Vorschau, bevor Sie die Seite speichern. [alt-e]',
-'tooltip-viewsource' => 'Diese Seite ist geschützt. Sie können ihren Quelltext betrachten. [alt-e]',
-'tooltip-history' => 'Ältere Versionen dieser Seite. [alt-h]',
-'tooltip-protect' => 'Diese Seite schützen [alt--]',
-'tooltip-delete' => 'Diese Seite löschen [alt-d]',
-'tooltip-undelete' => "$1 Versionen diese Artikels wieder herstellen. [alt-d]",
-'tooltip-move' => 'Diese Seite verschieben. [alt-m]',
 'tooltip-watch' => 'Diese Seite beobachten. [alt-w]',
-'tooltip-unwatch' => 'Diese Seite nicht mehr beobachten. [alt-w]',
-'tooltip-watchlist' => 'Die Liste der Artikel, die Sie auf Änderungen beobachten. [alt-l]',
-'tooltip-userpage' => 'Meine Benutzerseite  [alt-.]',
-'tooltip-anonuserpage' => 'Die Benutzerseite Ihrer IP-Adresse [alt-.]',
-'tooltip-mytalk' => 'Meine Benutzerdiskussion  [alt-n]',
-'tooltip-anontalk' => 'Diskussionen zu Bearbeitungen, die von dieser IP-Adresse gemacht wurden. [alt-n]',
-'tooltip-preferences' => 'Meine Einstellungen',
-'tooltip-mycontris' => 'Liste meiner Beiträge [alt-y]',
-'tooltip-login' => 'Sie können sich gerne anmelden, es ist aber nicht notwendig, um Artikel zu bearbeiten. [alt-o]',
-'tooltip-logout' => 'The start button [alt-o]',
 'tooltip-search' => 'Suchen [alt-f]',
-'tooltip-mainpage' => 'Zur Hauptseite [alt-z]',
-'tooltip-portal' => 'Über das Projekt, was Sie tun können, wo Sie Dinge finden können',
-'tooltip-randompage' => 'Zufälliger Artikel [alt-x]',
-'tooltip-currentevents' => 'Hintergründe zu aktuellen Ereignissen finden',
-'tooltip-sitesupport' => 'Unterstützen Sie {{SITENAME}}',
-'tooltip-help' => 'Hier bekommen Sie Hilfe.',
-'tooltip-recentchanges' => 'Die letzten Änderungen in diesem Wiki. [alt-r]',
-'tooltip-recentchangeslinked' => 'Die letzten Änderungen an Seiten, die von dieser Seite verlinkt wurden. [alt-c]',
-'tooltip-whatlinkshere' => 'Liste aller Seiten, die auf diese verweisen [alt-b]',
-'tooltip-specialpages' => 'Liste aller Spezialseiten [alt-q]',
-'tooltip-upload' => 'Bilder oder andere Medien hochladen [alt-u]',
-'tooltip-specialpage' => 'Dies ist eine Spezialseite, die nicht bearbeitet werden kann.',
 'tooltip-minoredit' => 'Diese Änderung als klein markieren. [alt-i]',
 'tooltip-save' => 'Änderungen speichern [alt-s]',
 'tooltip-preview' => 'Vorschau der Änderungen an dieser Seite. Benutzen Sie dies vor dem Speichern! [alt-p]',
 'tooltip-diff' => 'Zeigt Ihre Änderungen am Text tabellarisch an [alt-d]',
-'tooltip-contributions' => 'Liste der beiträge dieses Benutzers.',
-'tooltip-emailuser' => 'Senden Sie eine Mail an diesen Benutzer',
-'tooltip-rss' => 'RSS-Feed von dieser Seite.',
 'tooltip-compareselectedversions' => 'Unterschiede zwischen zwei ausgewählten Versionen dieser Seite vergleichen. [alt-v]',
 
 #Tastatur-Shortcuts
-'accesskey-article' => 'a',
-'accesskey-addsection' => '+',
-'accesskey-talk' => 't',
-'accesskey-edit' => 'e',
-'accesskey-viewsource' => 'e',
-'accesskey-history' => 'h',
-'accesskey-protect' => '-',
-'accesskey-delete' => 'd',
-'accesskey-undelete' => 'd',
-'accesskey-move' => 'm',
-'accesskey-watch' => 'w',
-'accesskey-unwatch' => 'w',
-'accesskey-watchlist' => 'l',
-'accesskey-userpage' => '.',
-'accesskey-anonuserpage' => '.',
-'accesskey-mytalk' => 'n',
-'accesskey-anontalk' => 'n',
-'accesskey-preferences' => '',
-'accesskey-mycontris' => 'y',
-'accesskey-login' => 'o',
-'accesskey-logout' => 'o',
 'accesskey-search' => 'f',
-'accesskey-mainpage' => 'z',
-'accesskey-portal' => '',
-'accesskey-randompage' => 'x',
-'accesskey-currentevents' => '',
-'accesskey-sitesupport' => '',
-'accesskey-help' => '',
-'accesskey-recentchanges' => 'r',
-'accesskey-recentchangeslinked' => 'c',
-'accesskey-whatlinkshere' => 'b',
-'accesskey-specialpages' => 'q',
-'accesskey-specialpage' => '',
-'accesskey-upload' => 'u',
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
 'accesskey-diff' => 'd',
-'accesskey-contributions' => '',
-'accesskey-emailuser' => '',
 'accesskey-compareselectedversions' => 'v',
 
 "makesysoptitle"        => "Mache einen Benutzer zum Administrator",
@@ -1379,21 +1219,6 @@ class LanguageDe extends LanguageUtf8 {
 		return $d;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesDe;
-		return $wgValidSpecialPagesDe;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesDe;
-		return $wgSysopSpecialPagesDe;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesDe;
-		return $wgDeveloperSpecialPagesDe;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesDe;
 		if( isset( $wgAllMessagesDe[$key] ) ) {
diff --git a/languages/LanguageEl.php b/languages/LanguageEl.php
index ad9552322127..0a5887c382ac 100644
--- a/languages/LanguageEl.php
+++ b/languages/LanguageEl.php
@@ -73,17 +73,17 @@ class LanguageEl extends LanguageUtf8 {
 		global $wgNamespaceNamesEl;
 		return $wgNamespaceNamesEl;
 	}
-	
+
 	function getMessage( $key ) {
 		global $wgAllMessagesEl;
 
 		return isset( $wgAllMessagesEl[$key] ) ? $wgAllMessagesEl[$key] : parent::getMessage( $key );
 	}
-	
+
 	function fallback8bitEncoding() {
 		return 'windows-1253';
 	}
-	
+
 	function formatNum( $number ) {
 		return strtr($number, '.,', ',.' );
 	}
diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index 0155172467b0..4297f7b5c9f0 100644
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -7,12 +7,6 @@
 /** */
 require_once('LanguageUtf8.php');
 
-# See language.txt
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesEo = array(
 	NS_MEDIA          => 'Media',
 	NS_SPECIAL        => 'Speciala',
@@ -54,62 +48,6 @@ require_once('LanguageUtf8.php');
 # $wgBookstoreListEo = ..
 
 
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-# *Ne ŝanĝu* la nomojn en la maldekstra kolumno, ili estas internaj
-# nomoj de programfunkcioj. La dekstra kolumno enhavas kelkajn
-# malplenaĵojn; ili restu tiel, por ke tiuj funkcioj ne listiĝu
-# en la listo da specialaj paĝoj.
-/* private */ $wgValidSpecialPagesEo = array(
-	'Userlogin'		=> '',
-	'Userlogout'	=> '',
-	'Preferences'	=> 'Ŝanĝu miajn preferojn',
-	'Watchlist'		=> 'Mian atentaron', # Listo de paĝoj, kiujn la uzulo elektis por atenti
-	'Recentchanges' => 'Lastaj ŝanĝoj al paĝoj',
-	'Upload'		=> 'Alŝutu bildojn kaj dosierojn',
-	'Imagelist'		=> 'Alŝutitaj dosieroj',
-	'Listusers'		=> 'Enskribitaj uzuloj',
-	'Statistics'	=> 'Statistiko pri la paĝaro',
-	'Randompage'	=> 'Hazarda paĝo',
-
-	'Lonelypages'	=> 'Paĝoj neligitaj',
-	'Unusedimages'	=> 'Bildoj neligitaj',
-	'Popularpages'	=> 'Plej vizitataj paĝoj',
-	'Wantedpages'	=> 'Plej dezirataj paĝoj',
-	'Shortpages'	=> 'Mallongaj artikoloj',
-	'Longpages'		=> 'Longegaj artikoloj',
-	'Newpages'		=> 'Novaj artikoloj',
-	'Ancientpages'	=> 'Antikvaj artikoloj',
-	'Allpages'		=> 'Ĉiu paĝo laŭ titolo',
-
-	'Ipblocklist'	=> 'Forbaritaj IP-adresoj',
-    'Maintenance' => 'Ripariloj kaj zorgiloj', # angle 'Maintenance page'
-	'Specialpages'  => '',
-	'Contributions' => '',
-    'Emailuser'     => '',
-	'Whatlinkshere' => '',
-	'Recentchangeslinked' => '',
-	'Movepage'		=> '',
-	'Booksources'	=> 'Eksteraj libroservoj',
-	'Export'	=> 'Elkopii per XML',
-	'Version'	=> 'Versionoj de la programaro',
-);
-
-/* private */ $wgSysopSpecialPagesEo = array(
-	'Blockip'		=> 'Forbaru fi-IP-adreson',
-	'Asksql'		=> 'Informomendu je la datumbazo',
-	'Undelete'		=> 'Restarigu forigitan paĝon'
-);
-
-# FIXME
-/* private */ $wgDeveloperSpecialPagesEo = array(
-	'Lockdb'		=> 'Forŝlosi datumaron',
-	'Unlockdb'		=> 'Repermesu ŝanĝon al datumaro',
-);
-
 /* private */ $wgAllMessagesEo = array(
 # User toggles
 'tog-underline' => 'Substreku ligilojn',
@@ -179,11 +117,9 @@ require_once('LanguageUtf8.php');
 'article'		=> 'Artikolo',
 'help'			=> 'Helpo',
 'helppage'		=> '{{ns:4}}:Helpo',
-'wikititlesuffix' => '{{SITENAME}}',
 'bugreports'	=> 'Raportu cimojn',
 'bugreportspage' => '{{ns:4}}:Raportu_cimojn',
 'sitesupport'   => 'Subteno',
-'sitesupportpage' => '', # FIXME
 'faq'			=> 'Oftaj demandoj',
 'faqpage'		=> '{{ns:4}}:Oftaj demandoj',
 'edithelp'		=> 'Helpo pri redaktado',
@@ -210,7 +146,7 @@ require_once('LanguageUtf8.php');
 'go'			=> 'Ek',
 'history'		=> 'Malnovaj versioj',
 'history_short'	=> 'Historio',
-'printableversion' => 'Presebla versio', 
+'printableversion' => 'Presebla versio',
 'editthispage'	=> 'Redaktu la paĝon',
 'deletethispage' => 'Forigu la paĝon',
 'protectthispage' => 'Protektu la paĝon', #FIXME: Ĉu 'gardu' / 'protekti' bonas /Bertilo
@@ -230,7 +166,6 @@ require_once('LanguageUtf8.php');
 'redirectedfrom' => '(Alidirektita el $1)',
 'lastmodified'	=> 'Laste redaktita je $1.',
 'viewcount'		=> 'Montrita $1-foje.',
-"gnunote"		=> "La enhavo de {{SITENAME}} disponeblas laŭ permesilo <a class='internal' href='$wgScript/GFDL'>GNU Free Documentation License</a>.",
 'printsubtitle' => '(El {{SERVER}})',
 'protectedpage' => 'Protektita paĝo', #FIXME: ĉu 'gardita' ktp?
 'administrators' => '{{ns:4}}:Administrantoj', # FIXME?
@@ -273,7 +208,7 @@ ne agnoskas la programaro de {{SITENAME}}',
 "dberrortext"	=> "Sintakseraro okazis en informpeto al la datumaro.
 Jen la plej laste provita informmendo:
 <blockquote><tt><nowiki>$1</nowiki></tt></blockquote>
-el la funkcio \"<tt>$2</tt>\". 
+el la funkcio \"<tt>$2</tt>\".
 MySQL redonis eraron  \"<tt>$3: $4</tt>\".",
 'noconnect'		=> 'Neeblis konekti al la datumbazo; estas ia erarao aŭ oni riparadas la servilon.',
 'nodb'			=> 'Neeblis elekti datumaron $1',
@@ -297,7 +232,7 @@ Bonvolu raporti ĉi tion al iu sistemestro, kaj rimarkigi la retadreson (URL).',
 'filedeleteerror' => 'Neeblis forigi dosieron "$1".',
 'filenotfound'	=> 'Neeblis trovi dosieron "$1".',
 'unexpected'	=> 'Neatendita valuto: "$1"="$2".',
-'formerror'		=> 'Eraro: neeblis liveri formulon',	
+'formerror'		=> 'Eraro: neeblis liveri formulon',
 'badarticleerror' => 'Tiu ago ne povas esti aplikata al tiu artikolo.',
 'cannotdelete'  => 'Neeblis forigi la elektitan paĝon aŭ dosieron.',
 'badtitle'		=> 'Nevalida titolo',
@@ -321,7 +256,7 @@ Vi rajtas daŭre Vikipediumi sennome, aŭ vi povas reensaluti
 kiel la sama aŭ kiel alia uzulo.\n", #FIXME
 
 'welcomecreation' => "<h2>Bonvenon, $1!</h2> Via konto estas kreita.
-<font color=\"red\">Ne forgesu fari viajn {{SITENAME}}-preferojn!</font>",
+<strong>Ne forgesu fari viajn {{SITENAME}}-preferojn!</strong>",
 
 'loginpagetitle' => 'Ensalutu / enskribu', #FIXME
 'yourname'		=> 'Via salutnomo', #FIXME ĉu kaŝnomo ĉu uzantonomo ĉu kontonomo ktp?
@@ -330,7 +265,7 @@ kiel la sama aŭ kiel alia uzulo.\n", #FIXME
 'newusersonly'	=> ' (nur novaj uzuloj)',
 'remembermypassword' => 'Rememoru mian pasvorton.',
 "loginproblem"	=> "<b>Okazis problemo pri via ensalutado.</b><br />Bonvolu reprovi!",
-"alreadyloggedin" => "<font color=\"red\"><b>Uzulo $1, vi jam estas ensalutinta!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Uzulo $1, vi jam estas ensalutinta!</strong><br />\n",
 
 'login'			=> 'Ensalutu', #FIXME, what exactly do the following go to?
 'userlogin'		=> 'Ensalutu',
@@ -453,7 +388,7 @@ Bonvolu kontroli la retadreson (URL) kiun vi uzis por atingi la paĝon.\b",
 'searchquery'	=> 'Serĉmendo "$1"',
 'badquery'		=> 'Misformita serĉmendo',
 'badquerytext'	=> 'Via serĉmendo ne estis plenumebla.
-Eble vi provis serĉi vorton malpli longan ol tri literoj. 
+Eble vi provis serĉi vorton malpli longan ol tri literoj.
 Tion la programo ne jam povas fari. Ankaŭ eblas, ke vi mistajpis la
 esprimon'.
 #", ekzemple \"fiŝoj kaj kaj skaloj\"".   # FIXME ? eblas
@@ -493,7 +428,7 @@ kaj vi povos ŝanĝi viajn preferojn.',
 'prefslogintext' => 'Vi ensalutis kiel "$1".
 Via interna identeconumero estas $2.',
 'prefsreset'	=> 'Preferoj reprenitaj el la registro.', #FIXME: Hmm...
-'qbsettings'	=> 'Preferoj pri ilaro', 
+'qbsettings'	=> 'Preferoj pri ilaro',
 'changepassword' => 'Ŝanĝu pasvorton',
 'skin'			=> 'Aspekto',
 'math'			=> 'Tradukas matematikaĵon',
@@ -597,12 +532,9 @@ forbarita.",
 ",
 'filename'		=> 'Dosiernomo',
 'filedesc'		=> 'Priskribo',
-"affirmation"	=> "Mi asertas, ke la laŭleĝa posedanto de la kopirajto
-de ĉi tiu dosiero konsentas eldoni ĝin laŭ la $1.",
 'copyrightpage' => '{{ns:4}}:Kopirajto',
 'copyrightpagename' => 'permesilo GFDL uzata por la {{SITENAME}}',
 'uploadedfiles'	=> 'Alŝutitaj dosieroj',
-'noaffirmation' => 'Vi nepre devas aserti, ke via alŝutaĵo ne malobeas la leĝojn de kopirajto.',
 'ignorewarning'	=> 'Malatentu averton kaj tamen konservu la dosieron.',
 'minlength'		=> 'Dosiernomo devas havi pli ol du literojn.',
 'badfilename'	=> 'Dosiernomo estis ŝanĝita al "$1".',
@@ -709,7 +641,7 @@ Tio ne estus enkalkutita en la jena listo.",
 "booksourcetext" => "Jen ligilaro al aliaj TTT-ejoj, kiuj vendas librojn,
 kaj/aŭ informumos pri la libro ligita.
 La {{SITENAME}} ne estas komerce ligita al tiuj vendejoj, kaj la listo ne estu
-komprenata kiel rekomendo aŭ reklamo.", 
+komprenata kiel rekomendo aŭ reklamo.",
 'alphaindexline' => '$1 ĝis $2',
 
 # Email this user
@@ -903,18 +835,6 @@ Bonvolu certigu, ke vi efektive intencas tion fari.',
 <br />Ne forgesu malŝlosi ĝin post kiam vi finos la riparadon.',
 'unlockdbsuccesstext' => 'La datumaro de {{SITENAME}} estas malŝlosita.',
 
-# SQL query
-#
-'asksql'		=> 'SQL-informpeto',
-'asksqltext'	=> 'Per la jena formulo vi povas rekte peti la datumbazon
-per informpeto SQL-a.
-Tio povas ege ŝarĝi la servilon, do bonvolu uzi tiun eblon ŝpare kaj singarde.',
-'sqlquery'		=> 'Tajpu informpeton',
-'querybtn'		=> 'Petu!',
-'selectonly'	=> 'Informpetojn krom "SELECT" estas limigitaj je
-{{SITENAME}}-programistoj.',
-'querysuccessful' => 'Informpeto sukcesis',
-
 # Move page
 #
 'movepage'		=> 'Movu paĝon',
@@ -961,12 +881,12 @@ Bonvolu permane kunigi ilin.',
 'talkpagemoved' => 'Ankaŭ la diskutpaĝo estas movita.',
 'talkpagenotmoved' => 'La diskutpaĝo <strong>ne</strong> estas movita.',
 # Math
-	'mw_math_png' => 'Ĉiam krei PNG-bildon',
-	'mw_math_simple' => 'HTMLigu se simple, aŭ PNG',
-	'mw_math_html' => 'HTMLigu se eble, aŭ PNG',
-	'mw_math_source' => 'Lasu TeX-fonton (por tekstfoliumiloj)',
-	'mw_math_modern' => 'Rekomendita por modernaj foliumiloj',
-	'mw_math_mathml' => 'MathML seeble (provizora)',
+'mw_math_png' => 'Ĉiam krei PNG-bildon',
+'mw_math_simple' => 'HTMLigu se simple, aŭ PNG',
+'mw_math_html' => 'HTMLigu se eble, aŭ PNG',
+'mw_math_source' => 'Lasu TeX-fonton (por tekstfoliumiloj)',
+'mw_math_modern' => 'Rekomendita por modernaj foliumiloj',
+'mw_math_mathml' => 'MathML seeble (provizora)',
 
 );
 
@@ -1010,26 +930,11 @@ class LanguageEo extends LanguageUtf8 {
 
 		$d = (0 + substr( $ts, 6, 2 )) . '. ' .
 		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-		  ' ' . 
+		  ' ' .
 		  substr( $ts, 0, 4 );
 		return $d;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesEo;
-		return $wgValidSpecialPagesEo;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesEo;
-		return $wgSysopSpecialPagesEo;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesEo;
-		return $wgDeveloperSpecialPagesEo;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesEo;
 		if(array_key_exists($key, $wgAllMessagesEo))
@@ -1080,12 +985,12 @@ class LanguageEo extends LanguageUtf8 {
 
 	function checkTitleEncoding( $s ) {
 		global $wgInputEncoding;
-		
+
 		# Check for X-system backwards-compatibility URLs
 		$ishigh = preg_match( '/[\x80-\xff]/', $s);
 		$isutf = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
 			'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
-		
+
 		if($ishigh and !$isutf) {
 			# Assume Latin1
 			$s = utf8_encode( $s );
@@ -1113,7 +1018,7 @@ class LanguageEo extends LanguageUtf8 {
 		$wgOutputEncoding = 'x';
 		$wgEditEncoding = '';
 	}
-	
+
 }
 
 ?>
diff --git a/languages/LanguageEs.php b/languages/LanguageEs.php
index abd535103033..86d9492297b2 100644
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -7,10 +7,6 @@
 
 require_once( "LanguageUtf8.php" );
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesEs = array(
 	NS_MEDIA          => "Media",
 	NS_SPECIAL        => "Especial",
@@ -42,61 +38,6 @@ require_once( "LanguageUtf8.php" );
 
 /* private */ $wgDateFormatsEs = array();
 
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesEs = array(
-
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Preferencias de usuario",
-	"Watchlist"		=> "Mi lista de seguimiento",
-	"Recentchanges" => "Cambios recientes",
-	"Upload"		=> "Subir una imagen",
-	"Imagelist"		=> "Lista de imágenes",
-	"Listusers"		=> "Usuarios registrados",
-	"Statistics"	=> "Estadísticas del sitio",
-	"Randompage"	=> "Artículo aleatorio",
-
-	"Lonelypages"	=> "Artículos huérfanos",
-	"Unusedimages"	=> "Imágenes huérfanas",
-	"Popularpages"	=> "Artículos populares",
-	"Wantedpages"	=> "Artículos más solicitados",
-	"Shortpages"	=> "Artículos cortos",
-
-	"Longpages"		=> "Artículos largos",
-	"Newpages"		=> "Artículos nuevos",
-	"Ancientpages" => "Artículos más antiguos",
-#	"Intl"		=> "Enlaces Interlenguaje",
-	"Allpages"		=> "Todas las páginas (alfabético)",
-
-	"Ipblocklist"	=> "Direcciones IP bloqueadas",
-	"Maintenance"   => "Página de mantenimiento",
-
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"     => "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"   => "Fuentes externas de libros",
-	"Export"		=> "XML export",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesEs = array(
-	"Blockip"		=> "Bloquear una dirección IP",
-	"Asksql"		=> "Búsqueda en la base de datos",
-	"Undelete"      => "Ver y restaurar páginas borradas"
-);
-
-/* private */ $wgDeveloperSpecialPagesEs = array(
-	"Lockdb"		=> "Cerrar acceso de escritura a la base de datos",
-	"Unlockdb"		=> "Restaurar acceso de escritura a la base de datos",
-);
-
 /* private */ $wgAllMessagesEs = array(
 # User Toggles
 
@@ -105,7 +46,7 @@ require_once( "LanguageUtf8.php" );
 "tog-justify"	=> "Ajustar párrafos",
 "tog-hideminor" => "Esconder ediciones menores en Cambios Recientes",
 "tog-usenewrc" => "Cambios recientes realzados (no para todos los navegadores)",
-"tog-numberheadings" => "Auto-numerar encabezados",        
+"tog-numberheadings" => "Auto-numerar encabezados",
 "tog-showtoolbar" => "Mostrar barra de edición",
 "tog-rememberpassword" => "Recordar la contraseña entre sesiones",
 "tog-editwidth" => "La caja de edición tiene el ancho máximo",
@@ -156,18 +97,17 @@ require_once( "LanguageUtf8.php" );
 "mainpage"		=> "Portada",
 "mainpagetext"	=> "Software wiki instalado con éxito.",
 "about"			=> "Acerca de",
-"aboutsite"      => "Acerca de $wgSitename",
-"aboutpage"		=> "$wgMetaNamespace:Acerca de",
+"aboutsite"      => "Acerca de {{SITENAME}}",
+"aboutpage"		=> "{{ns:project}}:Acerca de",
 "help"			=> "Ayuda",
-"helppage"		=> "$wgMetaNamespace:Ayuda",
-"wikititlesuffix"		=>"$wgSitename",
+"helppage"		=> "{{ns:project}}:Ayuda",
 "bugreports"	=> "Informes de error de software",
-"bugreportspage" => "$wgMetaNamespace:Informes_de_error",
+"bugreportspage" => "{{ns:project}}:Informes_de_error",
 
 "faq"			=> "FAQ",
-"faqpage"		=> "$wgMetaNamespace:FAQ",
+"faqpage"		=> "{{ns:project}}:FAQ",
 "edithelp"		=> "Ayuda de edición",
-"edithelppage"	=> "$wgMetaNamespace:Cómo_se_edita_una_página",
+"edithelppage"	=> "{{ns:project}}:Cómo_se_edita_una_página",
 "cancel"		=> "Cancelar",
 "qbfind"		=> "Encontrar",
 "qbbrowse"		=> "Hojear",
@@ -180,7 +120,7 @@ require_once( "LanguageUtf8.php" );
 "currentevents" => "Actualidad",
 "errorpagetitle" => "Error",
 "returnto"		=> "Regresa a $1.",
-"tagline"      	=> "De $wgSitename, la enciclopedia libre.",
+"tagline"      	=> "De {{SITENAME}}, la enciclopedia libre.",
 "whatlinkshere"	=> "Páginas que enlazan aquí",
 "help"			=> "Ayuda",
 "search"		=> "Buscar",
@@ -205,22 +145,21 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(Redirigido desde $1)",
 "lastmodified"	=> "Esta página fue modificada por última vez el $1.",
 "viewcount"		=> "Esta página ha sido visitada $1 veces.",
-"gnunote" => "Todo el texto se hace disponible bajo los términos de la <a class=internal href='/wiki/GNU_FDL'>Licencia de Documentación Libre GNU (GNU FDL)",
 "printsubtitle" => "(De {{SERVER}})",
 "protectedpage" => "Página protegida",
-"administrators" => "$wgMetaNamespace:Administradores",
+"administrators" => "{{ns:project}}:Administradores",
 "sysoptitle"	=> "Acceso de Administrador requerido",
 "sysoptext"		=> "La acción que has requerido sólo puede ser llevada a cabo
  por usuarios con status de administrador.
 Ver $1.",
 "developertitle" => "Acceso de developer requerido",
-"developertext"	=> "La acción que has requerido sólo puede ser llevada a cabo 
+"developertext"	=> "La acción que has requerido sólo puede ser llevada a cabo
 por usuarios con status de \"developer\".
 Ver $1.",
 "nbytes"		=> "$1 bytes",
 "go"			=> "Ir",
 "ok"			=> "OK",
-"sitetitle"		=> "$wgSitename",
+"sitetitle"		=> "{{SITENAME}}",
 "sitesubtitle"	=> "La Enciclopedia Libre",
 "retrievedfrom" => "Obtenido de \"$1\"",
 "newmessages" => "Tienes $1.",
@@ -237,19 +176,19 @@ Ver $1.",
 #
 "nosuchaction"	=> "No existe tal acción",
 "nosuchactiontext" => "La acción especificada por el URL no es
- reconocida por el software de $wgSitename",
+ reconocida por el software de {{SITENAME}}",
 "nosuchspecialpage" => "No existe esa página especial",
 "nospecialpagetext" => "Has requerido una página especial que no es
- reconocida por el software de $wgSitename.",
+ reconocida por el software de {{SITENAME}}.",
 
 # General errors
 #
 "error"			=> "Error",
 "databaseerror" => "Error de la base de datos",
 "dberrortext"	=> "Ha ocurrido un error de sintaxis en una consulta
-a la base de datos. 
+a la base de datos.
 La última consulta que se intentó fue:
-<blockquote><tt>$1</tt></blockquote>El error de retorno de 
+<blockquote><tt>$1</tt></blockquote>El error de retorno de
 MySQL fue\"<tt>$3: $4</tt>\".",
 "dberrortextcl" => "Ha ocurrido un error de sintaxis en una consulta
 a la base de datos.
@@ -262,7 +201,7 @@ MySQL retornó el error \"$3: $4\".\n",
 "readonly"		=> "Base de datos bloqueada",
 "cachederror"	=> "Esta es una copia guardada en el cache de la página requerida, y puede no estar actualizada.",
 "enterlockreason" => "Explica el motivo del bloqueo, incluyendo una estimación de cuándo se producirá el desbloqueo",
-"readonlytext"	=> "La base de datos de $wgSitename está temporalmente
+"readonlytext"	=> "La base de datos de {{SITENAME}} está temporalmente
 bloqueada para nuevas entradas u otras modificaciones, probablemente
 para mantenimiento de rutina, después de lo cual volverá a la normalidad.
 El administrador que la bloqueó ofreció esta explicación:
@@ -281,7 +220,7 @@ incluyendo el URL.",
 "filedeleteerror" => "No se pudo borrar el archivo \"$1\".",
 "filenotfound"	=> "No se pudo encontrar el archivo \"$1\".",
 "unexpected"	=> "Valor no esperado: \"$1\"=\"$2\".",
-"formerror"		=> "Error: no se pudo enviar el formulario",	
+"formerror"		=> "Error: no se pudo enviar el formulario",
 "badarticleerror" => "Esta acción no se puede llevar a cabo en esta página.",
 "cannotdelete"	=> "No se pudo borrar la página o imagen especificada. (Puede haber sido borrada por alguien antes)",
 "badtitle"		=> "Título incorrecto",
@@ -293,11 +232,11 @@ incluyendo el URL.",
 # Login and logout pagesítulo
 "logouttitle"	=> "Fin de sesión",
 "logouttext"	=> "Has terminado tu sesión.
-Puedes continuar usando $wgSitename en forma anónima, o puedes
+Puedes continuar usando {{SITENAME}} en forma anónima, o puedes
 iniciar sesión otra vez como el mismo u otro usuario.\n",
 
-"welcomecreation" => "<h2>Bienvenido(a), $1!</h2><p>Tu cuenta ha sido creada. 
-No olvides personalizar tus preferencia de $wgSitename.",
+"welcomecreation" => "<h2>Bienvenido(a), $1!</h2><p>Tu cuenta ha sido creada.
+No olvides personalizar tus preferencia de {{SITENAME}}.",
 
 "loginpagetitle" => "Registrarse/Entrar",
 "yourname"		=> "Tu nombre de usuario",
@@ -306,7 +245,7 @@ No olvides personalizar tus preferencia de $wgSitename.",
 "newusersonly"	=> " (sólo usuarios nuevos)",
 "remembermypassword" => "Quiero que recuerden mi contraseña entre sesiones.",
 "loginproblem"	=> "<b>Hubo un problema con tu entrada.</b><br />¡Inténtalo otra vez!",
-"alreadyloggedin" => "<font color=red><b>Usuario $1, ya entraste!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Usuario $1, ya entraste!</strong><br />\n",
 
 "login"			=> "Registrarse/Entrar",
 "userlogin"		=> "Registrarse/Entrar",
@@ -318,18 +257,18 @@ No olvides personalizar tus preferencia de $wgSitename.",
 "userexists"	=> "El nombre que entraste ya está en uso. Por favor, elije un nombre diferente.",
 "youremail"		=> "Tu dirección electrónica (e-mail)",
 "yournick"		=> "Tu apodo (para firmas)",
-"emailforlost"	=> "Ingresar una dirección electrónica es opcional, pero permite a los demás usuarios contactarse contigo a través del sitio web sin tener que revelarles tu dirección electrónica. Además, si pierdes u olvidas tu contraseña, puedes pedir que se te envíe una nueva.", 
+"emailforlost"	=> "Ingresar una dirección electrónica es opcional, pero permite a los demás usuarios contactarse contigo a través del sitio web sin tener que revelarles tu dirección electrónica. Además, si pierdes u olvidas tu contraseña, puedes pedir que se te envíe una nueva.",
 "loginerror"	=> "Error de inicio de sesión",
 "noname"		=> "No has especificado un nombre de usuario válido.",
 "loginsuccesstitle" => "Inicio de sesión exitoso",
-"loginsuccess"	=> "Has iniciado tu sesión en $wgSitename como \"$1\".",
+"loginsuccess"	=> "Has iniciado tu sesión en {{SITENAME}} como \"$1\".",
 "nosuchuser"	=> "No existe usuario alguno llamado \"$1\".
 Revisa tu escritura, o usa el formulario de abajo para crear una nueva cuenta de usuario.",
 "wrongpassword"	=> "La contraseña que ingresaste es incorrecta. Por favor inténtalo de nuevo.",
 "mailmypassword" => "Envíame una nueva contraseña por correo electrónico",
-"passwordremindertitle" => "Recordatorio de contraseña de $wgSitename",
+"passwordremindertitle" => "Recordatorio de contraseña de {{SITENAME}}",
 "passwordremindertext" => "Alguien (probablemente tú, desde la dirección IP $1)
-solicitó que te enviáramos una nueva contraseña para iniciar sesión en $wgSitename.
+solicitó que te enviáramos una nueva contraseña para iniciar sesión en {{SITENAME}}.
 La contraseña para el usuario \"$2\" es ahora \"$3\".
 Ahora deberías iniciar sesión y cambiar tu contraseña.",
 "noemail"		=> "No hay dirección electrónica (e-mail) registrada para el(la) usuario(a) \"$1\".",
@@ -347,10 +286,10 @@ Por favor entra otra vez después de que la recibas.",
 "showpreview"	=> "Mostrar previsualización",
 "blockedtitle"	=> "El usuario está bloqueado",
 "blockedtext"	=> "Tu nombre de usuario o dirección IP ha sido bloqueada por $1.
-La razón dada es la que sigue:<br />$2<p> Puedes contactar a $1 o a otro de los [[$wgMetaNamespace:Administradores|administradores]] para
+La razón dada es la que sigue:<br />$2<p> Puedes contactar a $1 o a otro de los [[{{ns:project}}:Administradores|administradores]] para
 discutir el bloqueo.",
 "newarticle"	=> "(Nuevo)",
-"newarticletext" => "$wgSitename es una enciclopedia en desarrollo, y esta página aún no existe. Puedes pedir información en [[$wgMetaNamespace:Consultas]], pero no esperes una respuesta pronta. Si lo que quieres es crear esta página, empieza a escribir en la caja que sigue. Si llegaste aquí por error, presiona la tecla para volver a la página anterior de tu navegador.",
+"newarticletext" => "{{SITENAME}} es una enciclopedia en desarrollo, y esta página aún no existe. Puedes pedir información en [[{{ns:project}}:Consultas]], pero no esperes una respuesta pronta. Si lo que quieres es crear esta página, empieza a escribir en la caja que sigue. Si llegaste aquí por error, presiona la tecla para volver a la página anterior de tu navegador.",
 "anontalkpagetext" => "---- ''Esta es la página de discusión para un usuario anónimo que aún no ha creado una cuenta, o no la usa. Por lo tanto, tenemos que usar su [[dirección IP]] numérica para identificarlo. Una dirección IP puede ser compartida por varios usuarios. Si eres un usuario anónimo y sientes que comentarios irrelevantes han sido dirigidos a ti, por favor [[Especial:Userlogin|crea una cuenta o entra]] para evitar confusiones futuras con otros usuarios anónimos.'' ",
 "noarticletext" => "(En este momento no hay texto en esta página)",
 
@@ -364,7 +303,7 @@ de edición superior como aparecerá si eliges grabar.",
 "editingcomment"	=> "Editando $1 (comentario)",
 "editconflict"	=> "Conflicto de edición: $1",
 "explainconflict" => "Alguien más ha cambiado esta página desde que empezaste
-a editarla. 
+a editarla.
 El área de texto superior contiene el texto de la página como existe
 actualmente. Tus cambios se muestran en el área de texto inferior.
 Vas a tener que incorporar tus cambios en el texto existente.
@@ -376,21 +315,21 @@ Vas a tener que incorporar tus cambios en el texto existente.
  de esta página.
 Si la grabas, los cambios hechos desde esa revisión se perderán.</strong>",
 "yourdiff"		=> "Diferencias",
-"copyrightwarning" => "Ayuda de edición, caracteres especiales: á é í ó ú Á É Í Ó Ú ü Ü ñ Ñ ¡ ¿ <br /><br />Nota por favor que todas las contribuciones a $wgSitename 
-se consideran hechas públicas bajo la Licencia de Documentación Libre GNU 
-(ver detalles en $1). 
- Si no deseas que la gente corrija tus escritos sin piedad 
+"copyrightwarning" => "Ayuda de edición, caracteres especiales: á é í ó ú Á É Í Ó Ú ü Ü ñ Ñ ¡ ¿ <br /><br />Nota por favor que todas las contribuciones a {{SITENAME}}
+se consideran hechas públicas bajo la Licencia de Documentación Libre GNU
+(ver detalles en $1).
+ Si no deseas que la gente corrija tus escritos sin piedad
 y los distribuya libremente, entonces no los pongas aquí. <br />
-También tú nos aseguras que escribiste esto tú mismo y 
-eres dueño de los derechos de autor, o lo copiaste desde el dominio público 
+También tú nos aseguras que escribiste esto tú mismo y
+eres dueño de los derechos de autor, o lo copiaste desde el dominio público
 u otra fuente libre.
  <strong>¡NO USES ESCRITOS CON COPYRIGHT SIN PERMISO!</strong><br />",
 "longpagewarning" => "<strong>ADVERTENCIA: Esta página tiene un tamaño de $1 kilobytes; algunos navegadores pueden tener problemas editando páginas de 32kb o más.
 Por favor considera la posibilidad de descomponer esta página en secciones más pequeñas.</strong>",
-"readonlywarning" => "<strong>ADVERTENCIA: La base de datos ha sido bloqueada para mantenimiento, así que no podrás grabar tus modificaciones en este momento. 
+"readonlywarning" => "<strong>ADVERTENCIA: La base de datos ha sido bloqueada para mantenimiento, así que no podrás grabar tus modificaciones en este momento.
 Puedes \"cortar y pegar\" a un archivo de texto en tu computador, y grabarlo para
 intentarlo después.</strong>",
-"protectedpagewarning" => "<strong>ADVERTENCIA: Esta página ha sido bloqueada de manera que s&ocute;lo usuarios con privilegios de administrador pueden editarla. Asegúrate de que estás siguiendo las 
+"protectedpagewarning" => "<strong>ADVERTENCIA: Esta página ha sido bloqueada de manera que s&ocute;lo usuarios con privilegios de administrador pueden editarla. Asegúrate de que estás siguiendo las
 [[Project:Guías_para_páginas_protegidas|guías para páginas protegidas]].</strong>",
 
 # History pages
@@ -450,31 +389,8 @@ Buscar en espacios de nombre :<br />
 $1<br />
 $2 Listar redirecciones   Buscar $3 $9",
 "searchdisabled" => "<p>Búsqueda en todo el texto ha sido desactivada temporalmente
-debido a carga alta del servidor; esperamos tenerla otra vez en linea después de algunas actualizaciones de 
-soporte físico próximas. Mientras tanto, puedes hacer una búsqueda vía google:</p>
-
-<!--Búsqueda de Sitio Google -->
-<FORM method=GET action=\"http://www.google.es/search\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td>
-<A HREF=\"http://www.google.es/\">
-<IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
-border=\"0\" ALT=\"Google\"></A>
-</td>
-<td>
-<INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
-<INPUT type=submit name=btnG VALUE=\"Google Search\">
-<font size=-1>
-<font size=-1>
-<input type=hidden name=domains value=\"{$wgServer}\"><br /><input type=radio
-name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch
-value=\"{$wgServer}\" checked> {$wgServer} <br />
-<input type='hidden' name='ie' value='$2'>
-<input type='hidden' name='oe' value='$2'>
-</font>
-</td></tr></TABLE>
-</FORM>
-<!-- SiteSearch Google -->
-",
+debido a carga alta del servidor; esperamos tenerla otra vez en linea después de algunas actualizaciones de
+soporte físico próximas.",
 "blanknamespace" => "(Principal)",
 # Preferences page
 #
@@ -485,7 +401,7 @@ para seleccionar preferencias de usuario.",
 "prefslogintext" => "Has entrado con el nombre \"$1\".
 Tu número de identificación interno es $2.",
 "prefsreset"	=> "Las preferencias han sido repuestas a sus valores almacenados.",
-"qbsettings"	=> "Preferencias de \"Quickbar\"", 
+"qbsettings"	=> "Preferencias de \"Quickbar\"",
 "changepassword" => "Cambiar contraseña",
 "skin"			=> "Piel",
 "math"			=> "Cómo se muestran las fórmulas",
@@ -524,15 +440,15 @@ y la hora del servidor (UTC).",
 #
 "changes" => "cambios",
 "recentchanges" => "Cambios recientes",
-"recentchangestext" => "Sigue los cambios más recientes a $wgSitename en esta página.
-¡[[$wgMetaNamespace:Bienvenidos|Bienvenidos]]!
-Por favor, lee estas páginas: [[$wgMetaNamespace:FAQ|$wgSitename FAQ]],
-[[$wgMetaNamespace:Políticas y guías|políticas de $wgSitename]]
-(especialmente [[$wgMetaNamespace:Convenciones de nombres|las convenciones para nombrar artículos]] y
-[[$wgMetaNamespace:Punto de vista neutral|punto de vista neutral]]).
-
-Si quieres que $wgSitename tenga éxito, es muy importante que no agregues
-material restringido por [[$wgMetaNamespace:Copyrights|derechos de autor]]. La responsabilidad legal realmente podría dañar el proyecto, así que por favor no lo hagas.",
+"recentchangestext" => "Sigue los cambios más recientes a {{SITENAME}} en esta página.
+¡[[{{ns:project}}:Bienvenidos|Bienvenidos]]!
+Por favor, lee estas páginas: [[{{ns:project}}:FAQ|{{SITENAME}} FAQ]],
+[[{{ns:project}}:Políticas y guías|políticas de {{SITENAME}}]]
+(especialmente [[{{ns:project}}:Convenciones de nombres|las convenciones para nombrar artículos]] y
+[[{{ns:project}}:Punto de vista neutral|punto de vista neutral]]).
+
+Si quieres que {{SITENAME}} tenga éxito, es muy importante que no agregues
+material restringido por [[{{ns:project}}:Copyrights|derechos de autor]]. La responsabilidad legal realmente podría dañar el proyecto, así que por favor no lo hagas.",
 "rcloaderr"		=> "cargando cambios recientes",
 "rcnote"		=> "Abajo están los últimos <b>$1</b> cambios en los últimos <b>$2</b> días.",
 "rclistfrom"	=> "Mostrar cambios nuevos desde $1",
@@ -586,7 +502,7 @@ Para incluir la imagen en un artículo, usa un enlace de la forma
 '''<nowiki>[[imagen:archivo.png|alt text]]</nowiki>''' o
 '''<nowiki>[[media:archivo.ogg]]</nowiki>''' para sonidos.
 
-Por favor recuerda que, al igual que con las páginas $wgSitename, otros pueden
+Por favor recuerda que, al igual que con las páginas {{SITENAME}}, otros pueden
 editar o borrar los archivos que has subido si piensan que es bueno para
 la enciclopedia, y se te puede bloquear, impidiéndote subir más archivos si abusas del sistema.",
 "uploadlog"		=> "registro de subidas",
@@ -598,17 +514,14 @@ subido más recientemente. Todas las horas son del servidor (UTC).
 ",
 "filename"		=> "Nombre del archivo",
 "filedesc"		=> "Sumario",
-"affirmation"	=> "Afirmo que el dueño del copyright de este archivo
-está de acuerdo en licenciarlo bajo los términos de $1.",
-"copyrightpage" => "$wgMetaNamespace:Copyrights",
-"copyrightpagename" => "$wgSitename copyright",
+"copyrightpage" => "{{ns:projec}}:Copyrights",
+"copyrightpagename" => "{{SITENAME}} copyright",
 "uploadedfiles"	=> "Archivos subidos",
-"noaffirmation" => "Tú debes afirmar que tus subidas de archivos no violan ningún copyright.",
 "ignorewarning"	=> "Ignora la advertencia y graba el archivo de todos modos.",
 "minlength"		=> "Los nombres de imágenes deben ser al menos de tres letras.",
 "badfilename"	=> "El nombre de la imagen se ha cambiado a \"$1\".",
 "badfiletype"	=> "\".$1\" no es un formato de imagen recomendado.",
-"largefile"		=> "Se recomienda que las imágenes no excedan 100k de tamaño.",
+#"largefile"		=> "Se recomienda que las imágenes no excedan 100k de tamaño.",
 "successfulupload" => "Subida exitosa",
 "fileuploaded"	=> "El archivo \"$1\" se subió en forma exitosa.
 Por favor sigue este enlace: ($2) a la página de descripción y escribe
@@ -649,12 +562,12 @@ esta versión antigua, (rev) = revertir a esta versión antigua.
 "sitestats"		=> "Estadísticas del sitio",
 "userstats"		=> "Estadísticas de usuario",
 "sitestatstext" => "Hay un total de <b>$1</b> páginas en la base de datos.
-Esto incluye páginas de discusión, páginas acerca de $wgSitename, páginas mínimas,
+Esto incluye páginas de discusión, páginas acerca de {{SITENAME}}, páginas mínimas,
 redirecciones, y otras que probablemente no puedan calificarse como artículos.
 Excluyéndolas, hay <b>$2</b> páginas que probablemente son artículos legítimos.<p>
 Ha habido un total de <b>$3</b> visitas a páginas, y <b>$4</b> ediciones de página
-desde que el software fue actualizado (Octubre 2002). 
-Esto resulta en un promedio de <b>$5</b> ediciones por página, 
+desde que el software fue actualizado (Octubre 2002).
+Esto resulta en un promedio de <b>$5</b> ediciones por página,
 y <b>$6</b> visitas por edición.",
 "userstatstext" => "Hay <b>$1</b> usuarios registrados.
 de los cuales <b>$2</b> son administradores (ver $3).",
@@ -665,8 +578,8 @@ de los cuales <b>$2</b> son administradores (ver $3).",
 "maintnancepagetext"	=> "Esta página incluye varias herramientas útiles para el mantenimiento diario de la enciclopedia. Algunas de estas funciones tienden a sobrecargar la base de datos, así que, por favor, no vuelvas a cargar la página después de cada ítem que arregles ;-)",
 "maintenancebacklink"	=> "Volver a la Página de Mantenimiento",
 "disambiguations"	=> "Páginas de desambiguación",
-"disambiguationspage"	=> "$wgMetaNamespace:Enlaces a páginas de desambiguación",
-"disambiguationstext"	=> "Los siguientes artículos enlazan a una <i>página de desambiguación</i>. Deberían enlazar al artículo apropiado.<br />Una página es considerada de desambiguación si está enlazada desde $1.<br />Enlaces desde otros espacios de nombre (Como $wgMetaNamespace: o usuario:) <b>no</b> son listados aquí.",
+"disambiguationspage"	=> "{{ns:project}}:Enlaces a páginas de desambiguación",
+"disambiguationstext"	=> "Los siguientes artículos enlazan a una <i>página de desambiguación</i>. Deberían enlazar al artículo apropiado.<br />Una página es considerada de desambiguación si está enlazada desde $1.<br />Enlaces desde otros espacios de nombre (Como {{ns:project}}: o usuario:) <b>no</b> son listados aquí.",
 "doubleredirects"	=> "Redirecciones dobles",
 "doubleredirectstext"	=> "<b>Atención:</b> Esta lista puede contener falsos positivos. Eso significa usualmente que hay texto adicional con enlaces bajo el primer #REDIRECT.<br />\nCada fila contiene enlaces al segundo y tercer redirect, así como la primera línea del segundo redirect, en la que usualmente se encontrará el artículo \"real\" al que el primer redirect debería apuntar.",
 "brokenredirects"	=> "Redirecciones incorrectas",
@@ -675,7 +588,7 @@ de los cuales <b>$2</b> son administradores (ver $3).",
 "selflinkstext"		=> "Las siguientes páginas contienen un enlace a sí mismas, lo que no se recomienda.",
 "mispeelings"       => "Páginas con faltas de ortografía",
 "mispeelingstext"               => "Las siguientes páginas contienen una falta de ortografía común de las listadas en $1. La escritura correcta se indica entre paréntesis.",
-"mispeelingspage"       => "Lista de faltas de ortografía comunes",           
+"mispeelingspage"       => "Lista de faltas de ortografía comunes",
 "missinglanguagelinks"  => "Enlaces Interleguaje Faltantes",
 "missinglanguagelinksbutton"    => "Encontrar los enlaces interlenguaje que faltan para",
 "missinglanguagelinkstext"      => "Estos artículos <b>no</b> enlazan a sus correspondientes en $1. <b>No</b> se muestran redirecciones ni subpáginas.",
@@ -712,7 +625,7 @@ con un URL directo, y de esa manera todavía estar listada aquí
 a pesar de estar en uso activo.",
 "booksources"   => "Fuentes de libros",
 "booksourcetext" => "A continuación hay una lista de enlaces a otros sitios que venden libros nuevos y usados, y también pueden contener información adicional acerca de los libros que estás buscando.
-$wgSitename no está relacionada con ninguno de estos negocios, y esta lista no debe ser considerada un patrocinio de los mismos.",
+{{SITENAME}} no está relacionada con ninguno de estos negocios, y esta lista no debe ser considerada un patrocinio de los mismos.",
 "alphaindexline" => "$1 a $2",
 
 # Email this user
@@ -766,7 +679,7 @@ $3...
 "removechecked" => "Borrar artículos seleccionados de la lista de seguimiento",
 "watchlistcontains" => "Tu lista de seguimiento posee $1 páginas.",
 "watcheditlist" => "Aquí está un listado alfabético de tu lista de seguimiento.
-Selecciona los artículos que deseas remover de tu lista de seguimiento y 
+Selecciona los artículos que deseas remover de tu lista de seguimiento y
 click el botón 'remover seleccionados' en el fin de la pantalla.",
 "removingchecked" => "Removiendo los artículos solicitados de la lista de seguimiento...",
 "couldntremove" => "No se pudo remover el artículo '$1'...",
@@ -782,11 +695,11 @@ click el botón 'remover seleccionados' en el fin de la pantalla.",
 "confirmdelete" => "Confirma el borrado",
 "deletesub"		=> "(Borrando \"$1\")",
 "historywarning" => "Atención: La página que estás por borrar tiene un historial: ",
-"confirmdeletetext" => "Estás a punto de borrar una página o imagen 
+"confirmdeletetext" => "Estás a punto de borrar una página o imagen
 en forma permanente,
 así como todo su historial, de la base de datos.
 Por favor, confirma que realmente quieres hacer eso, que entiendes las
-consecuencias, y que lo estás haciendo de acuerdo con [[$wgMetaNamespace:Políticas]].",
+consecuencias, y que lo estás haciendo de acuerdo con [[{{ns:project}}:Políticas]].",
 "actioncomplete" => "Acción completa",
 "deletedtext"	=> "\"$1\" ha sido borrado.
 Ve $2 para un registro de los borrados más recientes.",
@@ -810,7 +723,7 @@ por [[Colaborador:$2|$2]] ([[Colaborador Discusión:$2|Discusión]]); alguien m
 
 La última edición fue hecha por [[Colaborador:$3|$3]] ([[Colaborador Discusión:$3|Discusión]]). ",
 #   only shown if there is an edit comment
-"editcomment" => "El resumen de la edición fue: \"<i>$1</i>\".", 
+"editcomment" => "El resumen de la edición fue: \"<i>$1</i>\".",
 "revertpage"	=> "Revertida a la última edición por $1",
 
 # Undelete
@@ -825,7 +738,7 @@ Si una nueva página con el mismo nombre ha sido creada desde el borrado, las ve
 "undeletebtn" => "Restaurar!",
 "undeletedarticle" => "restaurado \"$1\"",
 "undeletedtext"   => "El artículo [[$1]] ha sido restaurado con éxito.
-Véase [[$wgMetaNamespace:Registro_de_borrados]] para una lista de borrados y restauraciones recientes.",
+Véase [[{{ns:project}}:Registro_de_borrados]] para una lista de borrados y restauraciones recientes.",
 
 # Contributions
 #
@@ -854,7 +767,7 @@ llevar a cabo esta función.",
 "blockiptext"	=> "Usa el formulario siguiente para bloquear el
 acceso de escritura desde una dirección IP específica.
 Esto debería hacerse sólo para prevenir vandalismo, y de
-acuerdo a las [[$wgMetaNamespace:Políticas| políticas de $wgSitename]].
+acuerdo a las [[{{ns:project}}:Políticas|políticas de {{SITENAME}}]].
 Explica la razón específica del bloqueo (por ejemplo, citando
 ls páginas en particular que han sido objeto de vandalismo desde la dirección IP a bloquear).",
 "ipaddress"		=> "Dirección IP",
@@ -862,12 +775,11 @@ ls páginas en particular que han sido objeto de vandalismo desde la dirección
 "ipbsubmit"		=> "Bloquear esta dirección",
 "badipaddress"	=> "La dirección IP no tiene el formato correcto.",
 
-"noblockreason" => "Debes dar una razón para el bloqueo.",
 "blockipsuccesssub" => "Bloqueo exitoso",
 "blockipsuccesstext" => "La dirección IP  \"$1\" ha sido bloqueada.
 <br />Ver [[Especial:Ipblocklist|lista de IP bloqueadas]] para revisar bloqueos.",
 "unblockip"		=> "Desbloquear dirección IP",
-"unblockiptext"	=> "Usa el formulario que sigue para restaurar el 
+"unblockiptext"	=> "Usa el formulario que sigue para restaurar el
 acceso de escritura a una dirección IP previamente bloqueada.",
 "ipusubmit"		=> "Desbloquea esta dirección",
 "ipusuccess"	=> "Dirección IP \"$1\" desbloqueada",
@@ -892,24 +804,9 @@ acceso de escritura a una dirección IP previamente bloqueada.",
 "locknoconfirm" => "No has confirmado lo que deseas hacer.",
 "lockdbsuccesssub" => "El bloqueo se ha realizado con éxito",
 "unlockdbsuccesssub" => "El desbloqueo se ha realizado con éxito",
-"lockdbsuccesstext" => "La base de datos de $wgSitename ha sido bloqueada.
+"lockdbsuccesstext" => "La base de datos de {{SITENAME}} ha sido bloqueada.
 <br />Recuerda retirar el bloqueo después de completar las tareas de mantenimiento.",
-"unlockdbsuccesstext" => "La base de datos de $wgSitename ha sido desbloqueada.",
-
-# SQL query
-#
-"asksql"		=> "Consulta SQL",
-"asksqltext"	=> "Usa el formulario que sigue para hacer una consulta directa
-a la base de datos de $wgSitename. Usa comillas simples ('como estas') para delimitar
-cadenas de caracteres literales.
-Esto puede añadir una carga considerable al servidor, así que
-por favor usa esta función lo menos posible.",
-"sqlislogged"	=> "Por favor nota que todas las consultas son grabadas.",
-"sqlquery"		=> "Entra la consulta",
-"querybtn"		=> "Envía la consulta",
-"selectonly"	=> "Consultas diferentes a \"SELECT\" están restringidas sólo
-a $wgSitename developers.",
-"querysuccessful" => "Consulta exitosa",
+"unlockdbsuccesstext" => "La base de datos de {{SITENAME}} ha sido desbloqueada.",
 
 # Move page
 #
@@ -918,9 +815,9 @@ a $wgSitename developers.",
 moviendo todo su historial al nombre nuevo.
 El título anterior se convertirá en un redireccionamiento al nuevo título.
 Enlaces al antiguo título de la página no se cambiarán. Asegúrate de verificar no dejar redirecciones dobles o rotas.
-Tú eres responsable de hacer que los enlaces sigan apuntando adonde se supone que lo deberían hacer. 
+Tú eres responsable de hacer que los enlaces sigan apuntando adonde se supone que lo deberían hacer.
 
-Recuerda que la página '''no''' será renombrada si ya existe una página con el nuevo título, a no ser que sea una página vacía o un ''redirect'' sin historial. 
+Recuerda que la página '''no''' será renombrada si ya existe una página con el nuevo título, a no ser que sea una página vacía o un ''redirect'' sin historial.
 Esto significa que podrás renombrar una página a su título original si cometes un error de escritura en el nuevo título, pero que no podrás sobreescribir una página existente.
 
 <b>ADVERTENCIA!</b>
@@ -950,12 +847,12 @@ Por favor, elige otro nombre.",
 "talkpagemoved" =>  "La página de discusión correspondiente también fue renombrada.",
 "talkpagenotmoved" => "La página de discusión correspondiente <strong>no</strong> fue renombrada.",
 # Math
-	'mw_math_png' => "Producir siempre PNG",
-	'mw_math_simple' => "HTML si es muy simple, si no PNG",
-	'mw_math_html' => "HTML si es posible, si no PNG",
-	'mw_math_source' => "Dejar como TeX (para navegadores de texto)",
-        'mw_math_modern' => "Recomendado para navegadores modernos",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Producir siempre PNG",
+'mw_math_simple' => "HTML si es muy simple, si no PNG",
+'mw_math_html' => "HTML si es posible, si no PNG",
+'mw_math_source' => "Dejar como TeX (para navegadores de texto)",
+'mw_math_modern' => "Recomendado para navegadores modernos",
+'mw_math_mathml' => 'MathML',
 
 # Bits of text used by many pages:
 #
@@ -1041,10 +938,10 @@ Por favor, elige otro nombre.",
 'tooltip-search' => "Buscar en este wiki [alt-f]",
 
 'clearyourcache' => "'''Nota:''' Tras salvar el fichero, debes refrescar la caché de tu navegador para ver los cambios:
-*'''Mozilla:'''  Pulsa el botón ''Recargar'' (o ''ctrl-r''), 
-*'''Internet Explorer / Opera:''' ''ctrl-f5'', 
-*'''Safari:''' ''cmd-r'', 
-*'''Konqueror''' ''ctrl-r''.",
+*'''Mozilla:'''  ''ctrl-shift-r'',
+*'''Internet Explorer:''' ''ctrl-f5'',
+*'''Safari:''' ''cmd-shift-r'',
+*'''Konqueror''' ''f5''.",
 'compareselectedversions' => "Comparar versiones seleccionadas",
 
 'feedlinks' => "Sindicación:",
@@ -1071,53 +968,53 @@ Por favor, elige otro nombre.",
 
 'Monobook.js' => "/* tooltips and access keys */
 ta = new Object();
-ta['pt-userpage'] = new Array('.','Mi página de usuario'); 
-ta['pt-anonuserpage'] = new Array('.','La página de usuario de la IP desde la que editas'); 
-ta['pt-mytalk'] = new Array('n','Mi página de discusión'); 
-ta['pt-anontalk'] = new Array('n','Discusión sobre ediciones hechas desde esta dirección IP'); 
-ta['pt-preferences'] = new Array('','Mis preferencias'); 
-ta['pt-watchlist'] = new Array('l','La lista de páginas para las que estás vigilando los cambios'); 
-ta['pt-mycontris'] = new Array('y','Lista de mis contribuciones'); 
-ta['pt-login'] = new Array('o','Te animamos a registrarte, aunque no es obligatorio'); 
-ta['pt-anonlogin'] = new Array('o','Te animamos a registrarte, aunque no es obligatorio'); 
-ta['pt-logout'] = new Array('o','Salir de la sesión'); 
-ta['ca-talk'] = new Array('t','Discusión acerca del artículo'); 
-ta['ca-edit'] = new Array('e','Puedes editar esta página. Por favor, usa el botón de previsualización antes de grabar.'); 
-ta['ca-addsection'] = new Array('+','Añade un comentario a esta discusión'); 
-ta['ca-viewsource'] = new Array('e','Esta página está protegida, sólo puedes ver su código fuente'); 
-ta['ca-history'] = new Array('h','Versiones anteriores de esta página'); 
-ta['ca-protect'] = new Array('=','Proteger esta página'); 
-ta['ca-delete'] = new Array('d','Borrar esta página'); 
-ta['ca-undelete'] = new Array('d','Restaurar las ediciones hechas a esta página antes de que fuese borrada'); 
-ta['ca-move'] = new Array('m','Trasladar (renombrar) esta página'); 
-ta['ca-watch'] = new Array('w','Añadir esta página a tu lista de seguimiento'); 
-ta['ca-unwatch'] = new Array('w','Borrar esta página de tu lista de seguimiento'); 
-ta['search'] = new Array('f','Buscar en este wiki'); 
-ta['p-logo'] = new Array('','Portada'); 
-ta['n-mainpage'] = new Array('z','Visitar la Portada'); 
-ta['n-portal'] = new Array('','Acerca del proyecto, qué puedes hacer, dónde encontrar información'); 
-ta['n-currentevents'] = new Array('','Información de contexto sobre acontecimientos actuales'); 
-ta['n-recentchanges'] = new Array('r','La lista de cambios recientes en el wiki'); 
-ta['n-randompage'] = new Array('x','Cargar una página aleatoriamente'); 
-ta['n-help'] = new Array('','El lugar para aprender'); 
-ta['n-sitesupport'] = new Array('','Respáldanos'); 
-ta['t-whatlinkshere'] = new Array('j','Lista de todas las páginas del wiki que enlazan con ésta'); 
-ta['t-recentchangeslinked'] = new Array('k','Cambios recientes en las páginas que enlazan con esta otra'); 
-ta['feed-rss'] = new Array('','Sindicación RSS de esta página'); 
-ta['feed-atom'] = new Array('','Sindicación Atom de esta página'); 
-ta['t-contributions'] = new Array('','Ver la lista de contribuciones de este usuario'); 
-ta['t-emailuser'] = new Array('','Enviar un mensaje de correo a este usuario'); 
-ta['t-upload'] = new Array('u','Subir imágenes o archivos multimedia'); 
-ta['t-specialpages'] = new Array('q','Lista de todas las páginas especiales'); 
-ta['ca-nstab-main'] = new Array('c','Ver el artículo'); 
-ta['ca-nstab-user'] = new Array('c','Ver la página de usuario'); 
-ta['ca-nstab-media'] = new Array('c','Ver la página de multimedia'); 
-ta['ca-nstab-special'] = new Array('','Esta es una página especial, no se puede editar la página en sí'); 
-ta['ca-nstab-wp'] = new Array('a','Ver la página de proyecto'); 
-ta['ca-nstab-image'] = new Array('c','Ver la página de la imagen'); 
-ta['ca-nstab-mediawiki'] = new Array('c','Ver el mensaje de sistema'); 
-ta['ca-nstab-template'] = new Array('c','Ver la plantilla'); 
-ta['ca-nstab-help'] = new Array('c','Ver la página de ayuda'); 
+ta['pt-userpage'] = new Array('.','Mi página de usuario');
+ta['pt-anonuserpage'] = new Array('.','La página de usuario de la IP desde la que editas');
+ta['pt-mytalk'] = new Array('n','Mi página de discusión');
+ta['pt-anontalk'] = new Array('n','Discusión sobre ediciones hechas desde esta dirección IP');
+ta['pt-preferences'] = new Array('','Mis preferencias');
+ta['pt-watchlist'] = new Array('l','La lista de páginas para las que estás vigilando los cambios');
+ta['pt-mycontris'] = new Array('y','Lista de mis contribuciones');
+ta['pt-login'] = new Array('o','Te animamos a registrarte, aunque no es obligatorio');
+ta['pt-anonlogin'] = new Array('o','Te animamos a registrarte, aunque no es obligatorio');
+ta['pt-logout'] = new Array('o','Salir de la sesión');
+ta['ca-talk'] = new Array('t','Discusión acerca del artículo');
+ta['ca-edit'] = new Array('e','Puedes editar esta página. Por favor, usa el botón de previsualización antes de grabar.');
+ta['ca-addsection'] = new Array('+','Añade un comentario a esta discusión');
+ta['ca-viewsource'] = new Array('e','Esta página está protegida, sólo puedes ver su código fuente');
+ta['ca-history'] = new Array('h','Versiones anteriores de esta página');
+ta['ca-protect'] = new Array('=','Proteger esta página');
+ta['ca-delete'] = new Array('d','Borrar esta página');
+ta['ca-undelete'] = new Array('d','Restaurar las ediciones hechas a esta página antes de que fuese borrada');
+ta['ca-move'] = new Array('m','Trasladar (renombrar) esta página');
+ta['ca-watch'] = new Array('w','Añadir esta página a tu lista de seguimiento');
+ta['ca-unwatch'] = new Array('w','Borrar esta página de tu lista de seguimiento');
+ta['search'] = new Array('f','Buscar en este wiki');
+ta['p-logo'] = new Array('','Portada');
+ta['n-mainpage'] = new Array('z','Visitar la Portada');
+ta['n-portal'] = new Array('','Acerca del proyecto, qué puedes hacer, dónde encontrar información');
+ta['n-currentevents'] = new Array('','Información de contexto sobre acontecimientos actuales');
+ta['n-recentchanges'] = new Array('r','La lista de cambios recientes en el wiki');
+ta['n-randompage'] = new Array('x','Cargar una página aleatoriamente');
+ta['n-help'] = new Array('','El lugar para aprender');
+ta['n-sitesupport'] = new Array('','Respáldanos');
+ta['t-whatlinkshere'] = new Array('j','Lista de todas las páginas del wiki que enlazan con ésta');
+ta['t-recentchangeslinked'] = new Array('k','Cambios recientes en las páginas que enlazan con esta otra');
+ta['feed-rss'] = new Array('','Sindicación RSS de esta página');
+ta['feed-atom'] = new Array('','Sindicación Atom de esta página');
+ta['t-contributions'] = new Array('','Ver la lista de contribuciones de este usuario');
+ta['t-emailuser'] = new Array('','Enviar un mensaje de correo a este usuario');
+ta['t-upload'] = new Array('u','Subir imágenes o archivos multimedia');
+ta['t-specialpages'] = new Array('q','Lista de todas las páginas especiales');
+ta['ca-nstab-main'] = new Array('c','Ver el artículo');
+ta['ca-nstab-user'] = new Array('c','Ver la página de usuario');
+ta['ca-nstab-media'] = new Array('c','Ver la página de multimedia');
+ta['ca-nstab-special'] = new Array('','Esta es una página especial, no se puede editar la página en sí');
+ta['ca-nstab-wp'] = new Array('a','Ver la página de proyecto');
+ta['ca-nstab-image'] = new Array('c','Ver la página de la imagen');
+ta['ca-nstab-mediawiki'] = new Array('c','Ver el mensaje de sistema');
+ta['ca-nstab-template'] = new Array('c','Ver la plantilla');
+ta['ca-nstab-help'] = new Array('c','Ver la página de ayuda');
 ta['ca-nstab-category'] = new Array('c','Ver la página de categoría');",
 'navigation' => "Navegación",
 
@@ -1131,6 +1028,7 @@ ta['ca-nstab-category'] = new Array('c','Ver la página de categoría');",
 'movedto' => "renombrado a",
 'moredotdotdot' => "Más...",
 );
+
 class LanguageEs extends LanguageUtf8 {
 
 	function getNamespaces() {
@@ -1148,7 +1046,6 @@ class LanguageEs extends LanguageUtf8 {
 		return $wgSkinNamesEs;
 	}
 
-
 	function shortdate( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
@@ -1176,21 +1073,6 @@ class LanguageEs extends LanguageUtf8 {
 		return $this->time( $ts, $adj ) . " " . $this->shortdate( $ts, $adj );
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesEs;
-		return $wgValidSpecialPagesEs;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesEs;
-		return $wgSysopSpecialPagesEs;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesEs;
-		return $wgDeveloperSpecialPagesEs;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesEs;
 		if( isset( $wgAllMessagesEs[$key] ) ) {
@@ -1199,9 +1081,10 @@ class LanguageEs extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	function formatNum( $number, $year = false ) {
 		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
 	}
 }
+
 ?>
diff --git a/languages/LanguageEt.php b/languages/LanguageEt.php
index 80a7d1103ba1..7b2fb0ea7f93 100644
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -5,24 +5,24 @@
   */
 
 $wgNamespaceNamesEt = array(
-        NS_MEDIA            => 'Meedia',
-        NS_SPECIAL          => 'Eri',
-        NS_MAIN             => '',
-        NS_TALK             => 'Arutelu',
-        NS_USER             => 'Kasutaja',
-        NS_USER_TALK        => 'Kasutaja_arutelu',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => $wgMetaNamespace . '_arutelu',
-        NS_IMAGE            => 'Pilt',
-        NS_IMAGE_TALK       => 'Pildi_arutelu',
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'MediaWiki_arutelu',
-        NS_TEMPLATE         => 'Mall',
-        NS_TEMPLATE_TALK    => 'Malli_arutelu',
-        NS_HELP             => 'Juhend',
-        NS_HELP_TALK        => 'Juhendi_arutelu',
-        NS_CATEGORY         => 'Kategooria',
-        NS_CATEGORY_TALK    => 'Kategooria_arutelu'
+	NS_MEDIA            => 'Meedia',
+	NS_SPECIAL          => 'Eri',
+	NS_MAIN             => '',
+	NS_TALK             => 'Arutelu',
+	NS_USER             => 'Kasutaja',
+	NS_USER_TALK        => 'Kasutaja_arutelu',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaNamespace . '_arutelu',
+	NS_IMAGE            => 'Pilt',
+	NS_IMAGE_TALK       => 'Pildi_arutelu',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_arutelu',
+	NS_TEMPLATE         => 'Mall',
+	NS_TEMPLATE_TALK    => 'Malli_arutelu',
+	NS_HELP             => 'Juhend',
+	NS_HELP_TALK        => 'Juhendi_arutelu',
+	NS_CATEGORY         => 'Kategooria',
+	NS_CATEGORY_TALK    => 'Kategooria_arutelu'
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgSkinNamesEt = array(
@@ -34,9 +34,19 @@ $wgNamespaceNamesEt = array(
 	'davinci' => "DaVinci",
 	'mono' => "Mono",
 	'monobook' => "MonoBook",
-	 "myskin" => "Mu oma nahk" 
+	 "myskin" => "Mu oma nahk"
 );
 
+
+/* private */ $wgDateFormatsEt = array(
+        'Eelistus puudub',
+        '15.01.2001, kell 16.12',
+        '15. jaanuar 2001, kell 16.12',
+        '15. I 2005, kell 16.12',
+        'ISO 8601' => '2001-01-15 16:12:34'
+);
+
+
 /* private */ $wgQuickbarSettingsEt = array(
 	"Ei_ole", "Püsivalt_vasakul", "Püsivalt paremal", "Ujuvalt vasakul"
 );
@@ -57,87 +67,40 @@ $wgNamespaceNamesEt = array(
 
 /* private */ $wgMagicWordsEt = array(
 #   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    '#redirect', "#suuna"    ),
-    MAG_NOTOC                => array( 0,    '__NOTOC__'              ),
-    MAG_FORCETOC             => array( 0,    '__FORCETOC__'           ),
-    MAG_TOC                  => array( 0,    '__TOC__'                ),
-    MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__'      ),
-    MAG_START                => array( 0,    '__START__'              ),
-    MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH'           ),
-    MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME'       ),
-    MAG_CURRENTDAY           => array( 1,    'CURRENTDAY'             ),
-    MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME'         ),
-    MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR'            ),
-    MAG_CURRENTTIME          => array( 1,    'CURRENTTIME'            ),
-    MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES'       ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN'    ),
-        MAG_PAGENAME             => array( 1,    'PAGENAME'               ),
-        MAG_PAGENAMEE                    => array( 1,    'PAGENAMEE'              ),
-        MAG_NAMESPACE            => array( 1,    'NAMESPACE'              ),
-        MAG_SUBST                => array( 0,    'SUBST:'                 ),
-    MAG_MSGNW                => array( 0,    'MSGNW:'                 ),
-        MAG_END                  => array( 0,    '__END__'                ),
-    MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb'     ),
-    MAG_IMG_RIGHT            => array( 1,    'right'                  ),
-    MAG_IMG_LEFT             => array( 1,    'left'                   ),
-    MAG_IMG_NONE             => array( 1,    'none'                   ),
-    MAG_IMG_WIDTH            => array( 1,    '$1px'                   ),
-    MAG_IMG_CENTER           => array( 1,    'center', 'centre'       ),
-    MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame' ),
-    MAG_INT                  => array( 0,    'INT:'                   ),
-    MAG_SITENAME             => array( 1,    'SITENAME'               ),
-    MAG_NS                   => array( 0,    'NS:'                    ),
-        MAG_LOCALURL             => array( 0,    'LOCALURL:'              ),
-        MAG_LOCALURLE            => array( 0,    'LOCALURLE:'             ),
-        MAG_SERVER               => array( 0,    'SERVER'                 ),
-        MAG_GRAMMAR              => array( 0,    'GRAMMAR:'               )
-);
-
-
-/* private */ $wgValidSpecialPagesEt = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Minu eelistuste seadmine",
-	"Watchlist"		=> "Minu jälgimisloend",
-	"Recentchanges" => "Viimati muudetud artiklid",
-	"Upload"		=> "Pildifailide üleslaadimine",
-	"Imagelist"		=> "Piltide loend",
-	"Listusers"		=> "Kasutajad",
-	"Statistics"	=> "Saidi statistika",
-	"Randompage"	=> "Juhuslik artikkel",
-
-	"Lonelypages"	=> "üksildased artiklid",
-	"Unusedimages"	=> "Kasutamata pildid",
-	"Popularpages"	=> "Kõige loetavamad artiklid",
-	"Wantedpages"	=> "Kõige oodatumad artiklid",
-	"Shortpages"	=> "Lühikesed artiklid",
-	"Longpages"		=> "Pikad artiklid",
-	"Newpages"		=> "Uued artiklid",
-#	"Intl"		=> "Keeltevahelised lingid",
-	"Allpages"		=> "Kõik artiklid pealkirja järgi",
-
-	"Ipblocklist"	=> "Blokeeritud IP-aadressid",
-	"Maintenance" => "Hoolduslehekülg",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "Raamatud",
-	"Export"		=> "Eksport XML-vormingusse",
-	"Version"		=> "Versioon",
-);
-
-/* private */ $wgSysopSpecialPagesEt = array(
-	"Blockip"		=> "Blokeeri IP-aadress",
-	"Asksql"		=> "Otsi andmebaasist",
-	"Undelete"		=> "Taasta kustutatud leheküljed"
-);
-
-/* private */ $wgDeveloperSpecialPagesEt = array(
-	"Lockdb"		=> "Võta andmebaas kirjutuskaitse alla",
-	"Unlockdb"		=> "Taasta andmebaasi kirjutuspääs",
+	MAG_REDIRECT             => array( 0,    '#redirect', "#suuna"    ),
+	MAG_NOTOC                => array( 0,    '__NOTOC__'              ),
+	MAG_FORCETOC             => array( 0,    '__FORCETOC__'           ),
+	MAG_TOC                  => array( 0,    '__TOC__'                ),
+	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__'      ),
+	MAG_START                => array( 0,    '__START__'              ),
+	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH'           ),
+	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME'       ),
+	MAG_CURRENTDAY           => array( 1,    'CURRENTDAY'             ),
+	MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME'         ),
+	MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR'            ),
+	MAG_CURRENTTIME          => array( 1,    'CURRENTTIME'            ),
+	MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES'       ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN'    ),
+	MAG_PAGENAME             => array( 1,    'PAGENAME'               ),
+	MAG_PAGENAMEE                    => array( 1,    'PAGENAMEE'              ),
+	MAG_NAMESPACE            => array( 1,    'NAMESPACE'              ),
+	MAG_SUBST                => array( 0,    'SUBST:'                 ),
+	MAG_MSGNW                => array( 0,    'MSGNW:'                 ),
+	MAG_END                  => array( 0,    '__END__'                ),
+	MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb'     ),
+	MAG_IMG_RIGHT            => array( 1,    'right'                  ),
+	MAG_IMG_LEFT             => array( 1,    'left'                   ),
+	MAG_IMG_NONE             => array( 1,    'none'                   ),
+	MAG_IMG_WIDTH            => array( 1,    '$1px'                   ),
+	MAG_IMG_CENTER           => array( 1,    'center', 'centre'       ),
+	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame' ),
+	MAG_INT                  => array( 0,    'INT:'                   ),
+	MAG_SITENAME             => array( 1,    'SITENAME'               ),
+	MAG_NS                   => array( 0,    'NS:'                    ),
+	MAG_LOCALURL             => array( 0,    'LOCALURL:'              ),
+	MAG_LOCALURLE            => array( 0,    'LOCALURLE:'             ),
+	MAG_SERVER               => array( 0,    'SERVER'                 ),
+	MAG_GRAMMAR              => array( 0,    'GRAMMAR:'               )
 );
 
 /* private */ $wgAllMessagesEt = array(
@@ -209,7 +172,6 @@ ning [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit]."
 "article"		=> "Sisu",  # või "Artikkel" nagu praegu Vikipeedias?
 "help"			=> "Juhend", # Vikipeedias "Spikker"
 "helppage"		=> "{{ns:12}}:Juhend",
-"wikititlesuffix" => "{{SITENAME}}",
 "bugreports"	=> "Teated programmivigadest",
 "bugreportspage" => "{{ns:4}}:Teated_programmivigadest",
 'sitesupport'   => 'Annetused', # Set a URL in $wgSiteSupportPage in LocalSettings.php
@@ -272,9 +234,9 @@ ning [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit]."
 "viewtalkpage" => "Arutelulehekülg",
 "otherlanguages" => "Teised keeled",
 "redirectedfrom" => "(Ümber suunatud artiklist $1)",
-"lastmodified"	=> "Viimati muudetud $1.",
+"lastmodified"	=> "Viimane muutmine: $1",
 "viewcount"		=> "Seda lehekülge on külastatud $1 korda.",
-"gnunote" => "Kogu tekst on kasutatav litsentsi <a class=internal href='$wgScriptPath/GNU_FDL'>GNU Free Documentation License</a> tingimustel.", # aegunud, võib vist eemaldada, asendada järgmisega:
+# aegunud, võib vist eemaldada, asendada järgmisega:
 "copyright" => "Kogu tekst on kasutatav litsentsi <a class=internal href='$wgScriptPath/GNU_FDL'>GNU Vaba Dokumentatsiooni Litsentsi</a> (GFDL) tingimustel.",
 'poweredby'     => "{{SITENAME}} kasutab avatud koodiga wiki mootorit [http://www.mediawiki.org/ MediaWiki].",
 "printsubtitle" => "(Allikas: {{SERVER}})",
@@ -285,8 +247,6 @@ ning [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide kasutusjuhendit]."
 "developertitle" => "Nõutav süsteemiarendaja staatus",
 "developertext"	=> "Seda toimingut saavad sooritada ainult süsteemiarendaja staatusega kasutajad.
 Vaata $1.",
-'bureaucrattitle'       => 'Nõutav bürokraadi staatus',
-"bureaucrattext"      => "Seda toimingut saavad sooritada ainult \"bürokraadi\" staatusega kasutajad. Vaata $1.",
 "nbytes"		=> "$1 baiti",
 "go"			=> "Mine",
 "ok"			=> "OK",
@@ -300,7 +260,7 @@ Vaata $1.",
 'toc' => 'Sisukord',
 'showtoc' => 'näita',
 'hidetoc' => 'peida',
-'thisisdeleted' => "Vaata või taasta $1?", # View or restore... 
+'thisisdeleted' => "Vaata või taasta $1?", # View or restore...
 'restorelink' => "Kustutatud muudatuste arv: $1",
 'feedlinks' => 'Sööde:', # See sõna ei meeldi, aga paremat ei tea.
 'sitenotice'    => '', # the equivalent to wgSiteNotice
@@ -349,9 +309,9 @@ MySQL andis vea \"$3: $4\".\n",
 "readonlytext"	=> "Andmebaas on praegu kirjutuskaitse all, tõenäoliselt andmebaasi rutiinseks hoolduseks, mille lõppedes normaalne olukord taastub.
 Administraator, kes selle kaitse alla võttis, andis järgmise selgituse:
 <p>$1",
-"missingarticle" => "Andmebaas ei leidnud lehekülje \"$1\" teksti, kuigi see oleks pidanud olema leitav. 
+"missingarticle" => "Andmebaas ei leidnud lehekülje \"$1\" teksti, kuigi see oleks pidanud olema leitav.
 
-<p>Tavaliselt on selle põhjuseks vananenud sisuerinevuste- või ajaloolink leheküljele, mis on kustutatud. 
+<p>Tavaliselt on selle põhjuseks vananenud sisuerinevuste- või ajaloolink leheküljele, mis on kustutatud.
 
 <p>Kui ei ole tegemist sellise juhtumiga, siis võib olla tegemist tarkvaraveaga. Palun teatage sellest administraatorile, märkides ära kasutatud aadressi.",
 "internalerror" => "Sisemine viga",
@@ -360,7 +320,7 @@ Administraator, kes selle kaitse alla võttis, andis järgmise selgituse:
 "filedeleteerror" => "Faili nimega \"$1\" ei ole võimalik kustutada.",
 "filenotfound"	=> "Faili nimega \"$1\" ei leitud.",
 "unexpected"	=> "Ootamatu väärtus: \"$1\"=\"$2\".",
-"formerror"		=> "Viga: vormi ei saanud salvestada",	
+"formerror"		=> "Viga: vormi ei saanud salvestada",
 "badarticleerror" => "Seda toimingut ei saa sellel leheküljel sooritada.",
 "cannotdelete"	=> "Seda lehekülge või pilti ei ole võimalik kustutada. (Võib-olla keegi teine juba kustutas selle.)",
 "badtitle"		=> "Vigane pealkiri",
@@ -378,7 +338,6 @@ Päring: $2
 mitmesuguseid põhjusi, vaata palun artiklit
 [[{{ns:4}}:Lukustatud lehekülg]].
 Sa saad aga vaadata ja kopeerida selle lehekülje lähteteksti -- ",
-'seriousxhtmlerrors' => 'tidy leidis, et xhtml-märgenduses on tõsiseid vigu.',
 
 
 
@@ -388,7 +347,7 @@ Sa saad aga vaadata ja kopeerida selle lehekülje lähteteksti -- ",
 "logouttitle"	=> "Väljalogimine",
 "logouttext"	=> "Te olete välja loginud.
 Võite kasutada süsteemi anonüümselt, aga ka sama või mõne teise kasutajana uuesti sisse logida.\n",
-     # rookisin Vikipeedia välja, {{SITENAME}} oleks õige, aga vajab ümbersõnastamist.
+	 # rookisin Vikipeedia välja, {{SITENAME}} oleks õige, aga vajab ümbersõnastamist.
 
 "welcomecreation" => "<h2>Tere tulemast, $1!</h2><p>Teie konto on loodud. Ärge unustage seada oma eelistusi.",
 
@@ -399,11 +358,7 @@ Võite kasutada süsteemi anonüümselt, aga ka sama või mõne teise kasutajana
 "newusersonly"	=> " (ainult uued kasutajad)",
 "remembermypassword" => "Parooli meeldejätmine tulevasteks seanssideks.",
 "loginproblem"	=> "<b>Sisselogimine ei õnnestunud.</b><br />Proovige uuesti!",
-"alreadyloggedin" => "<font color=red><b>Kasutaja $1, Te olete juba sisse loginud!</b></font><br />\n",
-
-"areyounew"		=> "Kui olete siin uustulnuk ja tahate saada kasutajakontot, siis 
-sisestage kasutajanimi, seejärel parool (kaks korda).
-E-posti aadress ei ole kohustuslik; kui Te kaotate oma parooli, võite lasta selle saata Teie poolt antud aadressil.<br />\n", # aegunud -- kustutada.
+"alreadyloggedin" => "<strong>Kasutaja $1, Te olete juba sisse loginud!</strong><br />\n",
 
 "login"			=> "Logi sisse",
 'loginprompt'           => "{{SITENAME}} võimaldab sisselogimist vaid siis kui küpsised on lubatud.",
@@ -504,12 +459,12 @@ Teie IP on $3. Lisage see aadress kõigile järelpärimistele, mida kavatsete te
 "newarticle"	=> "(Uus)",
 "newarticletext" =>
 "Seda lehekülge veel ei ole.
-Lehekülje loomiseks hakake kirjutama all olevasse boksi 
+Lehekülje loomiseks hakake kirjutama all olevasse boksi
 (lisainfo saamiseks vaadake [[{{ns:4}}:Juhend|juhendit]]).
 Kui sattusite siia kogemata, klõpsake lihtsalt brauseri ''back''-nupule.",
 "anontalkpagetext" => "---- ''See on arutelulehekülg anonüümse kasutaja kohta, kes ei ole loonud kontot või ei kasuta seda. Sellepärast tuleb meil kasutaja identifitseerimiseks kasutada tema [[IP-aadress]]i. See IP-aadress võib olla mitmele kasutajale ühine. Kui olete anonüümne kasutaja ning leiate, et kommentaarid sellel leheküljel ei ole mõeldud Teile, siis palun [[{{ns:4}}:Kasutaja sisselogimine|looge konto või logige sisse]], et edaspidi arusaamatusi vältida.'' ",
 "noarticletext" => "(See lehekülg on praegu tühi)",
-'clearyourcache' => "'''Märkus:''' Pärast salvestamist pead sa muudatuste nägemiseks oma brauseri puhvri tühjendama: '''Mozilla:''' vajuta ''reload''(või ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
+'clearyourcache' => "'''Märkus:''' Pärast salvestamist pead sa muudatuste nägemiseks oma brauseri puhvri tühjendama: '''Mozilla:''' ''ctrl-shift-r'', '''IE:''' ''ctrl-f5'', '''Safari:''' ''cmd-shift-r'', '''Konqueror''' ''f5''.",
 'usercssjsyoucanpreview' => "<strong>Vihje:</strong> Kasuta nuppu 'Näita eelvaadet' oma uue css/js testimiseks enne salvestamist.",
 'usercsspreview' => "'''Ärge unustage, et seda versiooni teie isiklikust stiililehest pole veel salvestatud!'''",
 'userjspreview' => "'''Ärge unustage, et see versioon teie isiklikust javascriptist on alles salvestamata!'''",
@@ -534,11 +489,11 @@ Kui Te selle salvestate, siis lähevad kõik vahepealsed muudatused kaduma.</str
 "copyrightwarning" => "Pidage silmas, et kõik kaastööd loetakse avaldatuks vastavalt GNU Vaba Dokumentatsiooni Litsentsile
 (Üksikasjad on leheküljel $1).
 Kui Te ei soovi, et Teie poolt kirjutatut halastamatult redigeeritakse ja omal äranägemisel kasutatakse, siis ärge seda siia salvestage.<br />
-Te kinnitate ka, et kirjutasite selle ise või võtsite selle kopeerimiskitsenduseta allikast. 
+Te kinnitate ka, et kirjutasite selle ise või võtsite selle kopeerimiskitsenduseta allikast.
 <strong>ÄRGE SAATKE AUTORIÕIGUSTEGA KAITSTUD MATERJALI ILMA LOATA!</strong>", # Vikipeedia võtsin välja, {{SITENAME}} paigutada kuidagi?
 "longpagewarning" => "<strong>HOIATUS: Selle lehekülje pikkus ületab $1 kilobaiti. Mõne brauseri puhul valmistab raskusi juba 32-le kilobaidile läheneva pikkusega lehekülgede redigeerimine. Palun kaaluge selle lehekülje sisu jaotamist lühemate lehekülgede vahel.</strong>",
 "readonlywarning" => "<strong>HOIATUS: Andmebaas on lukustatud hooldustöödeks, nii et praegu ei saa parandusi salvestada. Võite teksti alal hoida tekstifailina ning salvestada hiljem.</strong>",
-"protectedpagewarning" => "<strong>HOIATUS:  See lehekülg on lukustatud, nii et seda saavad redigeerida ainult süsteemi operaatori õigustega kasutajad. Järgige juhtnööre leheküljel 
+"protectedpagewarning" => "<strong>HOIATUS:  See lehekülg on lukustatud, nii et seda saavad redigeerida ainult süsteemi operaatori õigustega kasutajad. Järgige juhtnööre leheküljel
 [[Project:Juhtnöörid_kaitstud_lehekülje_kohta]]</strong>.",
 
 # History pages
@@ -550,7 +505,7 @@ Te kinnitate ka, et kirjutasite selle ise või võtsite selle kopeerimiskitsendu
 Palun kontrollige aadressi, millel Te seda lehekülge leida püüdsite.\n",
 "loadhist"		=> "Lehekülje ajaloo laadimine",
 "currentrev"	=> "Viimane redaktsioon",
-"revisionasof"	=> "Redaktsioon $1",
+"revisionasof"	=> "Redaktsioon: $1",
 "cur"			=> "viim",
 "next"			=> "järg",
 "last"			=> "eel",
@@ -571,8 +526,6 @@ Legend: (viim) = erinevused võrreldes viimase redaktsiooniga,
 # Search results
 #
 "searchresults" => "Otsingu tulemid",
-"searchhelppage" => "{{ns:4}}:Otsing",
-"searchingwikipedia" => "{{ns:4}} &ndash; Otsimine",
 "searchresulttext" => "Lisainfot otsimise kohta vaata $1.",
 "searchquery"	=> "Päring \"$1\"",
 "badquery"		=> "Vigane päring",
@@ -611,10 +564,11 @@ sisse logida.",
 "prefslogintext" => "Te olete sisse loginud kasutajanimega \"$1\".
 Teie sisemine ID-number on $2.",
 "prefsreset"	=> "Teie eelistused on arvutimälu järgi taastatud.",
-"qbsettings"	=> "Kiirriba sätted", 
+"qbsettings"	=> "Kiirriba sätted",
 "changepassword" => "Muuda parool",
 "skin"			=> "Nahk",
 "math"			=> "Valemite näitamine",
+"dateformat"            => "Kuupäeva formaat",
 "math_failure"		=> "Arusaamatu süntaks",
 "math_unknown_error"	=> "Tundmatu viga",
 "math_unknown_function"	=> "Tundmatu funktsioon ",
@@ -711,13 +665,9 @@ Kellaajad on märgitud serveri ajaarvamise järele (UTC).
 ",
 "filename"		=> "Faili nimi",
 "filedesc"		=> "Lühikirjeldus",
-"affirmation"	=> "Kinnitan, et selle faili autoriõiguste valdaja
-on nõus seda litsenseerima tingimuste alusel, mille esitab $1.",
 "copyrightpage" => "{{ns:4}}:Autoriõigused",
 "copyrightpagename" => "{{SITENAME}} ja autoriõigused",
 "uploadedfiles"	=> "Üleslaetud failid",
-"noaffirmation" => "Te peate kinnitama, et Teie poolt üleslaetavad failid
-ei riku kellegi autoriõigusi.",
 "ignorewarning"	=> "Ignoreeri hoiatust ja salvesta sellest hoolimata.",
 "minlength"		=> "Pildi nimi peab sisaldama vähemalt kolme tähte.",
 "badfilename"	=> "Pildi nimi on muudetud. Uus nimi on \"$1\".",
@@ -951,7 +901,6 @@ pages that were vandalized).",
 "ipbreason"		=> "Põhjus",
 "ipbsubmit"		=> "Blokeeri see aadress",
 "badipaddress"	=> "The IP address is badly formed.",
-"noblockreason" => "You must supply a reason for the block.",
 "blockipsuccesssub" => "Block succeeded",
 "blockipsuccesstext" => "IP-aadress \"$1\" on blokeeritud.
 <br />See [[Special:Ipblocklist|IP block list]] to review blocks.",
@@ -990,20 +939,6 @@ Please confirm that this is what you intend to do.",
 <br />Kui Teie hooldustöö on läbi, ärge unustage kirjutuspääsu taastada!",
 "unlockdbsuccesstext" => "Andmebaasi kirjutuspääs on taastatud.",
 
-# SQL query
-#
-"asksql"		=> "SQL query",
-"asksqltext"	=> "Use the form below to make a direct query of the
-Wikipedia database.
-Use single quotes ('like this') to delimit string literals.
-This can often add considerable load to the server, so please use
-this function sparingly.",
-"sqlquery"		=> "Enter query",
-"querybtn"		=> "Submit query",
-"selectonly"	=> "Queries other than \"SELECT\" are restricted to
-Wikipedia developers.",
-"querysuccessful" => "Query successful",
-
 # Move page
 #
 "movepage"		=> "Teisalda artikkel",
@@ -1045,12 +980,12 @@ kasutajaks ja [[Special:Userlogin|sisse logima]]",
 "talkpagemoved" => "Ka vastav arutelulehekülg on teisaldatud.",
 "talkpagenotmoved" => "Vastav arutelulehekülg jäi teisaldamata.",
  #Math
-   'mw_math_png' => "Alati PNG",
-   'mw_math_simple' => "Kui väga lihtne, siis HTML, muidu PNG",
-   'mw_math_html' => "Võimaluse korral HTML, muidu PNG",
-   'mw_math_source' => "Säilitada TeX (tekstibrauserite puhul)",
-   'mw_math_modern' => "Soovitatav moodsate brauserite puhul",
-   'mw_math_mathml' => 'MathML',
+ 'mw_math_png' => "Alati PNG",
+ 'mw_math_simple' => "Kui väga lihtne, siis HTML, muidu PNG",
+ 'mw_math_html' => "Võimaluse korral HTML, muidu PNG",
+ 'mw_math_source' => "Säilitada TeX (tekstibrauserite puhul)",
+ 'mw_math_modern' => "Soovitatav moodsate brauserite puhul",
+ 'mw_math_mathml' => 'MathML',
 
 );
 
@@ -1064,6 +999,11 @@ class LanguageEt extends LanguageUtf8 {
 		return $wgBookstoreListEt ;
 	}
 
+	function getDateFormats() {
+		global $wgDateFormatsEt;
+		return $wgDateFormatsEt;
+	}
+
 	function getNamespaces() {
 		global $wgNamespaceNamesEt;
 		return $wgNamespaceNamesEt;
@@ -1079,21 +1019,6 @@ class LanguageEt extends LanguageUtf8 {
 		return $wgSkinNamesEt;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesEt;
-		return $wgValidSpecialPagesEt;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesEt;
-		return $wgSysopSpecialPagesEt;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesEt;
-		return $wgDeveloperSpecialPagesEt;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesEt;
 		if( isset( $wgAllMessagesEt[$key] ) ) {
@@ -1122,5 +1047,120 @@ class LanguageEt extends LanguageUtf8 {
 		}
 	}
 
+
+
+
+	/**
+	 * @access public
+	 * @param mixed  $ts the time format which needs to be turned into a
+	 *               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	 * @param bool   $adj whether to adjust the time output according to the
+	 *               user configured offset ($timecorrection)
+	 * @param mixed  $format what format to return, if it's false output the
+	 *               default one.
+	 * @param string $timecorrection the time offset as returned by
+	 *               validateTimeZone() in Special:Preferences
+	 * @return string
+	 */
+	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
+		global $wgAmericanDates, $wgUser;
+
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+
+		$datePreference = $this->dateFormat($format);
+
+		if ($datePreference == '0'
+		    || $datePreference == '' ) {$datePreference = $wgAmericanDates ? '0' : '2';}
+
+		$month = $this->getMonthName( substr( $ts, 4, 2 ) );
+		$day = $this->formatNum( 0 + substr( $ts, 6, 2 ) );
+		$year = $this->formatNum( substr( $ts, 0, 4 ), true );
+		$lat_month = $this->monthByLatinNumber( substr ($ts, 4, 2));
+
+		switch( $datePreference ) {
+			case '2': return "$day. $month $year";
+			case '3': return "$day. $lat_month $year";
+			case 'ISO 8601': return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
+			default: return substr($ts, 6, 2). '.' . substr($ts, 4, 2). '.' .substr($ts, 0, 4);
+		}
+	}
+
+
+
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*	       date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*	       user configured offset ($timecorrection)
+	* @param mixed  $format what format to return, if it's false output the
+	*	       default one (default true)
+	* @param string $timecorrection the time offset as returned by
+	*	       validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
+		global $wgUser, $wgAmericanDates;
+
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+		$datePreference = $this->dateFormat($format);
+
+		if ($datePreference == '0') {$datePreference = $wgAmericanDates ? '0' : '2';}
+
+		if ( $datePreference === 'ISO 8601' ) {
+			$t = substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 );
+			$t .= ':' . substr( $ts, 12, 2 );
+		} else {
+			$t = substr( $ts, 8, 2 ) . '&#46;' . substr( $ts, 10, 2 );
+		}
+		return $this->formatNum( $t );
+	}
+
+
+
+
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*	       date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*	       user configured offset ($timecorrection)
+	* @param mixed  $format what format to return, if it's false output the
+	*	       default one (default true)
+	* @param string $timecorrection the time offset as returned by
+	*	       validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
+		global $wgUser, $wgAmericanDates;
+
+		$datePreference = $this->dateFormat($format);
+		switch ( $datePreference ) {
+			case 'ISO 8601': return $this->date( $ts, $adj, $datePreference, $timecorrection ) . ' ' .
+				$this->time( $ts, $adj, $datePreference, $timecorrection );
+			default: return $this->date( $ts, $adj, $datePreference, $timecorrection ) . ', kell ' .
+				$this->time( $ts, $adj, $datePreference, $timecorrection );
+
+		}
+
+	}
+
+
+	/**
+	* retuns latin number corresponding to given month number
+	* @access public
+	* @param number
+	* @return string
+	*/
+	function monthByLatinNumber( $key ) {
+		$latinNumbers= array(
+			'I', 'II', 'III', 'IV', 'V', 'VI',
+			'VII','VIII','IX','X','XI','XII'
+		);
+
+		return $latinNumbers[$key-1];
+	}
+
+
 }
 ?>
diff --git a/languages/LanguageFa.php b/languages/LanguageFa.php
index d3bea03c807d..1e2b04e6bf7e 100644
--- a/languages/LanguageFa.php
+++ b/languages/LanguageFa.php
@@ -13,32 +13,22 @@ require_once("LanguageUtf8.php");
 # Language-specific text
 #--------------------------------------------------------------------------
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# NOTE: To turn off "Disclaimers" in the title links,
-# set "disclaimers" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
+/** TODO: fix me! */
 /* private */ $wgNamespaceNamesFa = array(
-	-2	=> "مدیا",
-	-1	=> "ویژه",
-	0	=> "",
-	1	=> "بحث",
-	2	=> "کاربر",
-	3	=> "بحث_کاربر",
-	4	=> "ویکی‌پدیا",
-	5	=> "بحث_ویکی‌پدیا",
-	6	=> "تصویر",
-	7	=> "بحث_تصویر",
-	8	=> "مدیاویکی",
-	9	=> "بحث_مدیاویکی",
-	10  => "Template",
-	11  => "Template_talk"
+	NS_MEDIA	        => "مدیا",
+	NS_SPECIAL        => "ویژه",
+	NS_MAIN	          => '',
+	NS_TALK	          => "بحث",
+	NS_USER           => "کاربر",
+	NS_USER_TALK      => "بحث_کاربر",
+	NS_PROJECT        => "ویکی‌پدیا",
+	NS_PROJECT_TALK   => "بحث_ویکی‌پدیا",
+	NS_IMAGE          => "تصویر",
+	NS_IMAGE_TALK     => "بحث_تصویر",
+	NS_MEDIAWIKI      => "مدیاویکی",
+	NS_MEDIAWIKI_TALK	=> "بحث_مدیاویکی",
+	NS_TEMPLATE       => "Template",
+	NS_TEMPLATE_TALK  => "Template_talk"
 
 ) + $wgNamespaceNamesEn;
 
@@ -52,68 +42,7 @@ require_once("LanguageUtf8.php");
 	'cologneblue' => "آبی کلون",
 	'smarty' => "پدینگتون",
 	'montparnasse' => "مون‌پارناس",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
-
-
-
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesFa = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "تنظیم ترجیحات کاربر",
-	"Watchlist"		=> "فهرست تعقیبات من",
-	"Recentchanges" => "صفحات اخیراً به‌روزشده",
-	"Upload"		=> "بار کردن پرونده‌های تصویری",
-	"Imagelist"		=> "فهرست تصاویر",
-	"Listusers"		=> "کاربران ثبت‌شده",
-	"Statistics"	=> "آمارهای وب‌گاه",
-	"Randompage"	=> "مقاله‌ی تصادفی",
-
-	"Lonelypages"	=> "مقاله‌های یتیم",
-	"Unusedimages"	=> "تصاویر یتیم",
-	"Popularpages"	=> "مقاله‌های محبوب",
-	"Wantedpages"	=> "مقاله‌های با بیشترین درخواست",
-	"Shortpages"	=> "مقاله‌های کوتاه",
-	"Longpages"		=> "مقاله‌های طولانی",
-	"Newpages"		=> "مقاله‌های تازه‌ایجادشده",
-	"Ancientpages"	=> "قدیمی‌ترین مقاله‌ها",
-        "Deadendpages"  => "صفحات بن‌بست",
-#	"Intl"                => "پیوندهای بین‌زبانی",
-	"Allpages"		=> "همه‌ی صفحات بر اساس عنوان",
-
-	"Ipblocklist"	=> "کاربران/نشانی‌های IP بسته‌شده",
-	"Maintenance"	=> "صفحه‌ی نگهداری",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "منابع خارجی کتاب‌ها",
-#	"Categories"	=> "رده‌های صفحات",
-	"Export"		=> "صدور صفحه‌ی XML",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesFa = array(
-	"Blockip"		=> "بستن کاربر/نشانی IP",
-	"Asksql"		=> "پرس‌وجوی پایگاه داده",
-	"Undelete"		=> "احیای صفحات حذف‌شده"
-);
-
-/* private */ $wgDeveloperSpecialPagesFa = array(
-	"Lockdb"		=> "فقط‌خواندنی کردن پایگاه داده",
-	"Unlockdb"		=> "احیای دسترسی نوشتن به پایگاه داده",
-	"Debug"			=> "اطلاعات اشکال‌زدایی"
-);
+) + $wgSkinNamesEn;
 
 #-------------------------------------------------------------------
 # Default messages
@@ -188,11 +117,9 @@ require_once("LanguageUtf8.php");
 "aboutpage"		=> "ویکی‌پدیا:درباره",
 "help"			=> "راهنما",
 "helppage"		=> "ویکی‌پدیا:راهنما",
-"wikititlesuffix" => "ویکی‌پدیا",
 "bugreports"	=> "گزارش اشکالات",
 "bugreportspage" => "ویکی‌پدیا:گزارش اشکالات",
 "sitesupport"   => "کمک مالی",
-"sitesupportpage" => "ویکی‌پدیا:کمک_مالی", # If not set, won't appear. Can be wiki page or URL
 "faq"			=> "سؤالات معمول",
 "faqpage"		=> "ویکی‌پدیا:سؤالات معمول",
 "edithelp"		=> "راهنمای ویرایش کردن",
@@ -237,7 +164,6 @@ require_once("LanguageUtf8.php");
 "redirectedfrom" => "(تغییر مسیر از $1)",
 "lastmodified"	=> "این صفحه آخرین بار در $1 تغییر کرده است.",
 "viewcount"		=> "این صفحه $1 بار دیده شده است.",
-"gnunote" => "کلیه‌ی متون تحت شرایط <a class=internal href='http://en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License'>اجازه‌نامه‌ی مستندات آزاد گنو</a> در دسترسند.",
 "printsubtitle" => "(از {{SERVER}})",
 "protectedpage" => "صفحه‌ی محافظت‌شده",
 "administrators" => "ویکی‌پدیا:مدیران",
@@ -336,7 +262,7 @@ The administrator who locked it offered this explanation:
 "newusersonly"	=> " (فقط کاربران جدید)",
 "remembermypassword" => "کلمه‌ی عبور بین نشست‌ها به خاطر سپرده شود.",
 "loginproblem"	=> "<b>ورود شما به سیستم با مشکلی مواجه شد.</b><br />دوباره تلاش کنید!",
-"alreadyloggedin" => "<font color=red><b>کاربر $1, شما از قبل وارد سیستم شده‌اید!</b></font><br />\n",
+"alreadyloggedin" => "<strong>کاربر $1, شما از قبل وارد سیستم شده‌اید!</strong><br />\n",
 
 "login"			=> "ورود به سیستم",
 "loginprompt"           => "برای ورود به ویکی‌پدیا باید cookieها را فعال کنید.",
@@ -411,7 +337,7 @@ You should log in and change your password now.",
 "showpreview"	=> "پیش‌نمایش نمایش یابد",
 "blockedtitle"	=> "کاربر بسته شده است",
 "blockedtext"	=> "نام کاربری یا نشانی IP شما توسط $1 بسته شده است.
-دلیل داده‌شده این است:<br />''$2''<p>شما می‌توانید با $1 یا یکی از 
+دلیل داده‌شده این است:<br />''$2''<p>شما می‌توانید با $1 یا یکی از
 [[ویکی‌پدیا:مدیران|مدیران]] تماس بگیرید و در این باره صحبت کنید.
 
 توجه کنید که شما نمی‌توانید از امکان «فرستادن پست الکترونیکی به این کاربر» استفاده کنید مگر اینکه نشانی پست الکترونیکی
@@ -485,7 +411,7 @@ You should log in and change your password now.",
 بنابراین نمی‌توانید ویرایش‌هایتان را همین الآن ذخیره کنید.
 اگر می‌خواهید متن را در یک پرونده‌ی متنی ببرید و بچسبانید و برای آینده ذخیره‌اش کنید.</strong>",
 "protectedpagewarning" => "<strong>هشدار: این صفحه قفل شده است تا فقط کاربران با امتیاز اپراتور سیستم بتوانند ویرایشش کنند.
-مطمئن شوید که از 
+مطمئن شوید که از
 [[ویکی‌پدیا:توصیه‌های صفحات محافظت‌شده|توصیه‌های صفحات محافظت‌شده]] پیروی می‌کنید.<strong>",
 
 # History pages
@@ -544,26 +470,7 @@ containing all of the search terms will appear in the result).",
 جستجو در فضاهای نام :<br />
 $1<br />
 $2 تغییرمسیرها فهرست شوند &nbsp; جستجو برای $3 $9",
-"searchdisabled" => "<p>شرمنده! جستجوی کل متن موقتاً از کار انداخته شده, for performance reasons. In the meantime, you can use the Google search below, which may be out of date.</p>
-
-<!-- SiteSearch Google -->
-<FORM method=GET action=\"http://www.google.com/search\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td>
-<A HREF=\"http://www.google.com/\">
-<IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
-border=\"0\" ALT=\"گوگل\"></A>
-</td>
-<td>
-<INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
-<INPUT type=submit name=btnG VALUE=\"جستجوی گوگل\">
-<font size=-1>
-<input type=hidden name=domains value=\"{$wgServer}\"><br /><input type=radio name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch value=\"{$wgServer}\" checked> {$wgServer} <br />
-<input type='hidden' name='ie' value='$2'>
-<input type='hidden' name='oe' value='$2'>
-</font>
-</td></tr></TABLE>
-</FORM>
-<!-- SiteSearch Google -->",
+"searchdisabled" => "<p>شرمنده! جستجوی کل متن موقتاً از کار انداخته شده, for performance reasons. In the meantime, you can use the Google search below, which may be out of date.</p>",
 "blanknamespace" => "(اصلی)",
 
 # Preferences page
@@ -646,7 +553,7 @@ border=\"0\" ALT=\"گوگل\"></A>
 "uploadnologintext"	=> "برای بار کردن پرونده‌ها باید [[ویژه:Userlogin|وارد سیستم شوید]].",
 "uploaderror"	=> "خطا در بار کردن",
 "uploadtext"	=> "'''ایست!''' قبل از این که چیزی اینجا بار کنید،
-مطمئن شوید که 
+مطمئن شوید که
 [[Project:سیاست_استفاده_از_تصاویر|سیاست استفاده از تصاویر]]
 را خوانده‌اید و از آن پیروی می‌کنید.
 
@@ -694,11 +601,9 @@ you may be blocked from uploading if you abuse the system.",
 "filedesc"		=> "خلاصه",
 "filestatus" => "وضعیت حق تکثیر",
 "filesource" => "منبع",
-"affirmation"	=> "من تأیید می‌کنم که دارنده‌ی حق انحصاری تکثیر این پرونده موافق است که تحت شرایط $1 منتشر شود.",
 "copyrightpage" => "ویکی‌پدیا:حق_تکثیر",
 "copyrightpagename" => "حق تکثیر ویکی‌پدیا",
 "uploadedfiles"	=> "پرونده‌های بارشده",
-"noaffirmation" => "شما باید تأیید کنید که این بار کردن شما هیچ حق انحصاری تکثیری را زیر پا نمی‌گذارد.",
 "ignorewarning"	=> "هشدار نادیده گرفته شود و پرونده به‌هرحال ذخیره شود.",
 "minlength"		=> "نام پرونده باید حداقل سه‌حرفی باشد.",
 "badfilename"	=> "نام پرونده به «$1» تغییر کرد.",
@@ -713,7 +618,7 @@ you may be blocked from uploading if you abuse the system.",
 "savefile"		=> "ذخیره‌ی پرونده",
 "uploadedimage" => "«[[$1]]» بار شد",
 "uploaddisabled" => "شرمنده، بار کردن از کار افتاده است.",
-				       
+
 # Image list
 #
 "imagelist"		=> "فهرست تصاویر",
@@ -789,7 +694,7 @@ They should link to the appropriate topic instead.<br />A page is treated as dis
 "randompage"	=> "صفحه‌ی تصادفی",
 "shortpages"	=> "صفحات کوتاه",
 "longpages"		=> "صفحات بلند",
-"deadendpages"  => "صفحات بن‌بست",				       
+"deadendpages"  => "صفحات بن‌بست",
 "listusers"		=> "فهرست کاربران",
 "specialpages"	=> "صفحات ویژه",
 "spheading"		=> "صفحات ویژه‌ی همه‌ی کاربران",
@@ -910,11 +815,11 @@ consequences, and that you are doing this in accordance with
 "rollbackfailed" => "Rollback failed",
 "cantrollback"	=> "نمی‌توان ویرایش را برگرداند؛ آخرین مشارکت‌کننده تنها مؤلف این مقاله است.",
 "alreadyrolled"	=> "Cannot rollback last edit of [[$1]]
-by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the article already. 
+by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the article already.
 
 آخرین ویرایش توسط [[کاربر:$3|$3]] ([[بحث کاربر:$3|بحث]]). ",
 #   only shown if there is an edit comment
-"editcomment" => "توضیح ویرایش این بود: \"<i>$1</i>\".", 
+"editcomment" => "توضیح ویرایش این بود: \"<i>$1</i>\".",
 "revertpage"	=> "ویرایش $2 برگردانده شد، به آخرین تغییری که  $1 انجام داده است",
 "protectlogpage" => "سیاهه‌ی_محافظت",
 "protectlogtext" => "در زیر فهرست قفل کردن‌ها/ازقفل‌درآوردن‌های صفحات آمده است.
@@ -970,7 +875,6 @@ by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled bac
 "ipbreason"		=> "دلیل",
 "ipbsubmit"		=> "این کاربر بسته شود",
 "badipaddress"	=> "کاربری با این نام وجود ندارد.",
-"noblockreason" => "شما باید دلیلی برای بستن مشخص کنید.",
 "blockipsuccesssub" => "بستن با موفقیت انجام شد",
 "blockipsuccesstext" => "«$1» بسته شده است.
 <br />برای بررسی بسته‌شدن‌ها، به [[ویژه:فهرستIPهای‌بسته|فهرست IPهای بسته]] مراجعه کنید.",
@@ -1016,18 +920,6 @@ Please confirm that this is what you intend to do.",
 <br />فراموش نکنید که پس از اتمام نگهداری قفل را بردارید.",
 "unlockdbsuccesstext" => "پایگاه داده از قفل در آمد.",
 
-# SQL query
-#
-"asksql"		=> "پرس‌وجوی SQL",
-"asksqltext"	=> "برای پرس‌وجوی مستقیم پایگاه داده از فرم زیر استفاده کنید.
-برای محدود کردن رشته‌های دقیق از نقل قول تکی ('مثل این') استفاده کنید.
-این پرس‌وجوها معمولاً بار قابل ملاحظه‌ای به خادم اضافه می‌کند، پس از این توانایی با صرفه‌جویی استفاده کنید.",
-"sqlislogged"	=> "لطفاً توجه کنید که همه‌ی پرس‌وجوها ثبت می‌شوند.",
-"sqlquery"		=> "ورود پرس‌وجو",
-"querybtn"		=> "فرستادن پرس‌وجو",
-"selectonly"	=> "فقط پرس‌وجوهای فقط‌خواندنی مجازند.",
-"querysuccessful" => "پرس‌وجو با موفقیت انجام شد",
-
 # Move page
 #
 "movepage"		=> "انتقال صفحه",
@@ -1054,7 +946,7 @@ Please confirm that this is what you intend to do.",
 In those cases, you will have to move or merge the page manually if desired.",
 "movearticle"	=> "انتقال صفحه",
 "movenologin"	=> "به سیستم وارد نشده‌اید",
-"movenologintext" => "برای انتقال صفحات باید کاربر ثبت‌شده بوده و 
+"movenologintext" => "برای انتقال صفحات باید کاربر ثبت‌شده بوده و
 [[ویژه:Userlogin|به سیستم وارد شوید]].",
 "newtitle"		=> "به عنوان جدید",
 "movepagebtn"	=> "صفحه منتقل شود",
@@ -1088,11 +980,11 @@ In those cases, you will have to move or merge the page manually if desired.",
 
 # Math
 
-	'mw_math_png' => "همیشه PNG کشیده شود",
-	'mw_math_simple' => "اگر خیلی ساده بودHTML وگرنه PNG",
-	'mw_math_html' => "اگر ممکن بود HTML وگرنه PNG",
-	'mw_math_source' => "در قالب TeX باقی بماند (برای مرورگرهای متنی)",
-	'mw_math_modern' => "توصیه برای مرورگرهای امروزی",
+'mw_math_png' => "همیشه PNG کشیده شود",
+'mw_math_simple' => "اگر خیلی ساده بودHTML وگرنه PNG",
+'mw_math_html' => "اگر ممکن بود HTML وگرنه PNG",
+'mw_math_source' => "در قالب TeX باقی بماند (برای مرورگرهای متنی)",
+'mw_math_modern' => "توصیه برای مرورگرهای امروزی",
 
 );
 
@@ -1105,7 +997,7 @@ class LanguageFa extends LanguageUtf8 {
 		"0" => "۰",
 		"1" => "۱",
 		"2" => "۲",
-		"3" => "۳", 
+		"3" => "۳",
 		"4" => "۴",
 		"5" => "۵",
 		"6" => "۶",
@@ -1139,21 +1031,6 @@ class LanguageFa extends LanguageUtf8 {
 		return $wgSkinNamesFa;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesFa;
-		return $wgValidSpecialPagesFa;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesFa;
-		return $wgSysopSpecialPagesFa;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesFa;
-		return $wgDeveloperSpecialPagesFa;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesFa;
 		if(array_key_exists($key, $wgAllMessagesFa))
diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index b3f8a82cca3b..1b96dff3272e 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -10,43 +10,51 @@ require_once( 'LanguageUtf8.php' );
 # Revised 2005-06-22 for MediaWiki 1.5a2 and CVS -- Nikerabbit
 
 /* private */ $wgNamespaceNamesFi = array(
-  NS_MEDIA            => 'Media',
-  NS_SPECIAL          => 'Toiminnot',
-  NS_MAIN             => '',
-  NS_TALK             => 'Keskustelu',
-  NS_USER             => 'Käyttäjä',
-  NS_USER_TALK        => 'Keskustelu_käyttäjästä',
-  NS_PROJECT          => $wgMetaNamespace,
-  NS_PROJECT_TALK     => FALSE,  # Set in constructor
-  NS_IMAGE            => 'Kuva',
-  NS_IMAGE_TALK       => 'Keskustelu_kuvasta',
-  NS_MEDIAWIKI        => 'MediaWiki',
-  NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
-  NS_TEMPLATE         => 'Malline',
-  NS_TEMPLATE_TALK    => 'Keskustelu_mallineesta',
-  NS_HELP             => 'Ohje',
-  NS_HELP_TALK        => 'Keskustelu_ohjeesta',
-  NS_CATEGORY         => 'Luokka',
-  NS_CATEGORY_TALK    => 'Keskustelu_luokasta'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Toiminnot',
+	NS_MAIN             => '',
+	NS_TALK             => 'Keskustelu',
+	NS_USER             => 'Käyttäjä',
+	NS_USER_TALK        => 'Keskustelu_käyttäjästä',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => FALSE,  # Set in constructor
+	NS_IMAGE            => 'Kuva',
+	NS_IMAGE_TALK       => 'Keskustelu_kuvasta',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
+	NS_TEMPLATE         => 'Malline',
+	NS_TEMPLATE_TALK    => 'Keskustelu_mallineesta',
+	NS_HELP             => 'Ohje',
+	NS_HELP_TALK        => 'Keskustelu_ohjeesta',
+	NS_CATEGORY         => 'Luokka',
+	NS_CATEGORY_TALK    => 'Keskustelu_luokasta'
 
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsFi = array(
-  'Ei mitään', 'Tekstin mukana, vasen', 'Tekstin mukana, oikea', 'Pysyen vasemmalla'
+	'Ei mitään', 'Tekstin mukana, vasen', 'Tekstin mukana, oikea', 'Pysyen vasemmalla'
 );
 
 /* private */ $wgSkinNamesFi = array(
-  'standard'          => 'Perus',
-  'cologneblue'       => 'Kölnin sininen',
-  'myskin'            => 'Oma tyylisivu'
+	'standard'          => 'Perus',
+	'cologneblue'       => 'Kölnin sininen',
+	'myskin'            => 'Oma tyylisivu'
 ) + $wgSkinNamesEn;
 
+/* private */ $wgDateFormatsFi = array(
+	'Ei valintaa',
+	'15. tammikuuta 2001 kello 16.12',
+	'15. tammikuuta 2001 kello 16:12:34',
+	'15.1.2001 16.12',
+	'ISO 8601' => '2001-01-15 16:12:34'
+);
+
 /* private */ $wgBookstoreListFi = array(
-  'Akateeminen kirjakauppa'       => 'http://www.akateeminen.com/search/tuotetieto.asp?tuotenro=$1',
-  'Bookplus'                      => 'http://www.bookplus.fi/product.php?isbn=$1',
-  'Helsingin yliopiston kirjasto' => 'http://pandora.lib.hel.fi/cgi-bin/mhask/monihask.py?volname=&author=&keyword=&ident=$1&submit=Hae&engine_helka=ON',
-  'Pääkaupunkiseudun kirjastot'   => 'http://www.helmet.fi/search*fin/i?SEARCH=$1',
-  'Tampereen seudun kirjastot'    => 'http://pandora.lib.hel.fi/cgi-bin/mhask/monihask.py?volname=&author=&keyword=&ident=$1-1&lang=kaikki&mat_type=kaikki&submit=Hae&engine_tampere=ON'
+	'Akateeminen kirjakauppa'       => 'http://www.akateeminen.com/search/tuotetieto.asp?tuotenro=$1',
+	'Bookplus'                      => 'http://www.bookplus.fi/product.php?isbn=$1',
+	'Helsingin yliopiston kirjasto' => 'http://pandora.lib.hel.fi/cgi-bin/mhask/monihask.py?volname=&author=&keyword=&ident=$1&submit=Hae&engine_helka=ON',
+	'Pääkaupunkiseudun kirjastot'   => 'http://www.helmet.fi/search*fin/i?SEARCH=$1',
+	'Tampereen seudun kirjastot'    => 'http://pandora.lib.hel.fi/cgi-bin/mhask/monihask.py?volname=&author=&keyword=&ident=$1-1&lang=kaikki&mat_type=kaikki&submit=Hae&engine_tampere=ON'
 ) + $wgBookstoreListEn;
 
 # Current practices (may be changed if not good ones)
@@ -116,18 +124,18 @@ require_once( 'LanguageUtf8.php' );
 'october'     => 'lokakuu',
 'november'    => 'marraskuu',
 'december'    => 'joulukuu',
-'jan'         => 'tammi',
-'feb'         => 'helmi',
-'mar'         => 'maalis',
-'apr'         => 'huhti',
-'may'         => 'touko',
-'jun'         => 'kesä',
-'jul'         => 'heinä',
-'aug'         => 'elo',
-'sep'         => 'syys',
-'oct'         => 'loka',
-'nov'         => 'marras',
-'dec'         => 'joulu',
+'jan'         => 'tammikuu',
+'feb'         => 'helmikuu',
+'mar'         => 'maaliskuu',
+'apr'         => 'huhtikuu',
+'may'         => 'toukokuu',
+'jun'         => 'kesäkuu',
+'jul'         => 'heinäkuu',
+'aug'         => 'elokuu',
+'sep'         => 'syyskuu',
+'oct'         => 'lokakuu',
+'nov'         => 'marraskuu',
+'dec'         => 'joulukuu',
 
 # Bits of text used by many pages:
 #
@@ -147,7 +155,6 @@ require_once( 'LanguageUtf8.php' );
 'article'             => 'Sivu',
 'help'                => 'Ohje',
 'helppage'            => 'Help:Ohje',
-'wikititlesuffix'     => '{{SITENAME}}',
 'bugreports'          => 'Ongelmat ja parannusehdotukset',
 'bugreportspage'      => 'Project:Ongelmat ja parannusehdotukset',
 'sitesupport'         => 'Lahjoitukset', # Set a URL in $wgSiteSupportPage in LocalSettings.php
@@ -245,6 +252,8 @@ require_once( 'LanguageUtf8.php' );
 'showtoc'             => 'näytä',
 'hidetoc'             => 'piilota',
 'thisisdeleted'       => 'Näytä tai palauta $1.',
+'viewdeleted'         => 'Näytä $1?',
+'restorelink1'        => 'yksi poistettu muokkaus.',
 'restorelink'         => '$1 poistettua muokkausta',
 'feedlinks'           => 'Uutissyötteet:',
 'sitenotice'          => '', # the equivalent to wgSiteNotice
@@ -319,7 +328,7 @@ Sivun lähdekoodi:',
 'yourdomainname'      => 'Verkkonimi',
 'externaldberror'     => 'Tapahtui virhe ulkoisen autentikointitietokannan käytössä tai sinulla ei ole lupaa päivittää tunnustasi.',
 'loginproblem'        => '<b>Sisäänkirjautuminen ei onnistunut.</b><br />Yritä uudelleen!',
-'alreadyloggedin'     => '<font color=red><b>Käyttäjä $1, olet jo kirjautunut sisään!</b></font><br />\n',
+'alreadyloggedin'     => '<strong>Käyttäjä $1, olet jo kirjautunut sisään!</strong><br />\n',
 'login'               => 'Kirjaudu sisään',
 'loginprompt'         => '<!-- -->',
 'userlogin'           => 'Kirjaudu sisään tai luo tunnus',
@@ -330,17 +339,17 @@ Sivun lähdekoodi:',
 'createaccountmail'   => 'sähköpostitse',
 'badretype'           => 'Syöttämäsi salasanat ovat erilaiset.',
 'userexists'          => 'Pyytämäsi käyttäjänimi on jo käytössä. Ole hyvä ja valitse toinen käyttäjänimi.',
-'youremail'           => 'Sähköpostiosoite²',
-'yourrealname'        => 'Nimi¹',
+'youremail'           => 'Sähköpostiosoite',
+'yourrealname'        => 'Nimi',
 'yourlanguage'        => 'Käyttöliittymän kieli',
 'yourvariant'         => 'Kielivariantti', // TODO: CHECK ME (language varian)
 'yournick'            => 'Nimimerkki allekirjoituksia varten',
 'email'               => 'Sähköpostitoiminnot',
 'emailforlost'        => '&nbsp;',
 'prefs-help-email-enotif' => 'Tätä osoitetta käytetään myös artikkelien muuttumisilmoituksiin, jos ominaisuus on käytössä.',
-'prefs-help-realname' => '¹ Nimi (vapaaehtoinen): Nimeäsi käytetään antaamaan kunnia työllesi.',
+'prefs-help-realname' => 'Nimi (vapaaehtoinen): Nimeäsi käytetään antaamaan kunnia työllesi.',
 'loginerror'          => 'Sisäänkirjautumisvirhe',
-'prefs-help-email'    => '² Sähköpostiosoite (vapaaehtoinen): Muut käyttäjät voivat ottaa sinuun yhteyttä sähköpostilla ilman, että osoitteesi paljastuu.',
+'prefs-help-email'    => 'Sähköpostiosoite (vapaaehtoinen): Muut käyttäjät voivat ottaa sinuun yhteyttä sähköpostilla ilman, että osoitteesi paljastuu.',
 
 'nocookiesnew'        => 'Käyttäjä luotiin, mutta et ole kirjautunut sisään. {{SITENAME}} käyttää evästeitä sisäänkirjautumisen yhteydessä. Selaimesi ei salli evästeistä. Kytke ne päälle, ja sitten kirjaudu sisään juuri luomallasi käyttäjänimellä ja salasanalla.',
 'nocookieslogin'      => '{{SITENAME}} käyttää evästeitä sisäänkirjautumisen yhteydessä. Selaimesi ei salli evästeitä. Ota ne käyttöön, ja yritä uudelleen.',
@@ -433,7 +442,7 @@ Sivun lähdekoodi:',
 'noarticletext'       => '<big>\'\'\'{{GRAMMAR:inessive|{{SITENAME}}}} ei ole tämän nimistä sivua.\'\'\'</big>
 * Voit kirjoittaa uuden sivun \'\'\'<span class="plainlinks">[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} {{PAGENAME}}]</span>.\'\'\'
 * Jos olet luonut sivun tällä nimellä, se on saatettu poistaa — katso [[Special:Log/delete|poistoloki]].',
-'clearyourcache'      => '\'\'\'Huomautus:\'\'\' Selaimen välimuisti pitää tyhjentää asetusten tallentamisen jälkeen, jotta muutokset tulisivat voimaan: \'\'\'Mozilla, Konqueror ja Safari:\'\'\' napsauta shift-näppäin pohjassa päivitä tai  paina \'\'shift-ctrl-r\'\', \'\'\'IE:\'\'\' \'\'ctrl-f5\'\' tai  \'\'\'Opera:\'\'\' \'\'F5\'\'.',
+'clearyourcache'      => '\'\'\'Huomautus:\'\'\' Selaimen välimuisti pitää tyhjentää asetusten tallentamisen jälkeen, jotta muutokset tulisivat voimaan: \'\'\'Mozilla, Firefox ja Safari:\'\'\' napsauta shift-näppäin pohjassa päivitä tai  paina \'\'shift-ctrl-r\'\' / \'\'shift-cmd-r\'\', \'\'\'IE:\'\'\' \'\'ctrl-f5\'\' tai \'\'\'Konqueror:\'\'\' \'\'F5\'\'.',
 'usercssjsyoucanpreview' => '\'\'\'Vinkki:\'\'\' Käytä esikatselupainiketta testataksesi uutta CSS:ää tai JavaScriptiä ennen tallennusta.',
 'usercsspreview'      => '\'\'\'Tämä on vasta CSS:n testaus ja esikatselu.\'\'\'',
 'userjspreview'       => '\'\'\'Tämä on vasta JavaScriptin testaus ja esikatselu.\'\'\'',
@@ -451,7 +460,7 @@ Sivun lähdekoodi:',
 'nonunicodebrowser'   => '\'\'\'Varoitus: Selaimesi ei ole Unicode-yhteensopiva. Ole hyvä ja vaihda selainta, ennen kuin muokkaat sivua.\'\'\'',
 'editingold'          => '<center><strong>Varoitus</strong>: Olet muokkaamassa vanhaa versiota tämän sivun tekstistä. Jos tallennat sen, kaikki tämän version jälkeen tehdyt muutokset katoavat.</center>',
 'yourdiff'            => 'Eroavaisuudet',
-'copyrightwarning'    => '<strong>Muutoksesi astuvat voimaan välittömästi.</strong> Jos haluat harjoitella muokkaamista, ole hyvä ja käytä [[Project:Hiekkalaatikko|hiekkalaatikkoa]].<br/><br/>Kaikki {{GRAMMAR:illative|{{SITENAME}}}} tehtävät tuotokset katsotaan julkaistuksi GNU Free Documentation -lisenssin mukaisesti ([[Project:{{SITENAME}} ja tekijänoikeudet|lisätietoja]]). Jos et halua, että kirjoitustasi muokataan armottomasti ja uudelleenkäytetään vapaasti, älä tallenna kirjoitustasi. Tallentamalla muutoksesi lupaat, että kirjoitit tekstisi itse, tai kopioit sen jostain vapaasta lähteestä. <strong>ÄLÄ KÄYTÄ TEKIJÄNOIKEUDEN ALAISTA MATERIAALIA ILMAN LUPAA!</strong>',
+'copyrightwarning'    => '<strong>Muutoksesi astuvat voimaan välittömästi.</strong> Jos haluat harjoitella muokkaamista, ole hyvä ja käytä [[Project:Hiekkalaatikko|hiekkalaatikkoa]].<br /><br />Kaikki {{GRAMMAR:illative|{{SITENAME}}}} tehtävät tuotokset katsotaan julkaistuksi GNU Free Documentation -lisenssin mukaisesti ([[Project:{{SITENAME}} ja tekijänoikeudet|lisätietoja]]). Jos et halua, että kirjoitustasi muokataan armottomasti ja uudelleenkäytetään vapaasti, älä tallenna kirjoitustasi. Tallentamalla muutoksesi lupaat, että kirjoitit tekstisi itse, tai kopioit sen jostain vapaasta lähteestä. <strong>ÄLÄ KÄYTÄ TEKIJÄNOIKEUDEN ALAISTA MATERIAALIA ILMAN LUPAA!</strong>',
 'copyrightwarning2'   => '<br />Huomaa, että kuka tahansa voi muokata, muuttaa ja poistaa kaikkia sivustolle tekemiäsi lisäyksiä ja muutoksia. Muokkaamalla sivustoa luovutat sivuston käyttäjille tämän oikeuden ja takaat, että lisäämäsi aineisto on joko itse kirjoittamaasi tai peräisin jostain vapaasta lähteestä. <strong>TEKIJÄNOIKEUDEN ALAISEN MATERIAALIN KÄYTTÄMINEN ILMAN LUPAA ON EHDOTTOMASTI KIELLETTYÄ!</strong>',
 'longpagewarning'     => '<center>Tämän sivun tekstiosuus on $1 binäärikilotavua pitkä. Harkitse, voisiko sivun jakaa pienempiin osiin.</center>',
 'readonlywarning'     => '<strong>Varoitus</strong>: Tietokanta on lukittu huoltoa varten, joten voi olla ettet pysty tallentamaan muokkauksiasi juuri nyt. Saattaa olla paras leikata ja liimata tekstisi omaan tekstitiedostoosi ja tallentaa se tänne myöhemmin.',
@@ -555,7 +564,7 @@ Sivun lähdekoodi:',
 'contextlines'        => 'Rivien määrä tulosta kohti',
 'contextchars'        => 'Sisällön merkkien määrä riviä kohden',
 'stubthreshold'       => 'Tynkäsivun osoituskynnys',
-'recentchangescount'  => 'Otsikoiden määrä viimeisimmissä muutoksissa',
+'recentchangescount'  => 'Sivujen määrä tuoreissa muutoksissa',
 'savedprefs'          => 'Asetuksesi tallennettiin.',
 'timezonelegend'      => 'Aikavyöhyke',
 'timezonetext'        => 'Paikallisen ajan ja palvelimen ajan (UTC) välinen aikaero tunteina.',
@@ -572,10 +581,10 @@ Sivun lähdekoodi:',
 #
 
 # switching pan
-'groups-lookup-group' => 'Manage group rights',
+/*'groups-lookup-group' => 'Manage group rights',
 'groups-group-edit' => 'Existing groups: ',
 'editgroup' => 'Edit Group',
-'addgroup' => 'Add Group',
+'addgroup' => 'Add Group',*/
 
 'userrights-lookup-user'   => 'Käyttöoikeuksien hallinta',
 'userrights-user-editname' => 'Käyttäjätunnus: ',
@@ -590,7 +599,7 @@ Sivun lähdekoodi:',
 'userrights-groupshelp' => 'Valitse ryhmät, jotka haluat poistaa tai lisätä. Valitsemattomia ryhmiä ei muuteta. Voit poistaa valinnan pitämällä Ctrl-näppäintä pohjassa napsautuksen aikana.',
 
 # Default group names and descriptions
-# 
+#
 'group-anon-name'       => 'Anonyymi',
 'group-anon-desc'       => 'Käyttäjät, joilla ei ole tunnusta tai jotka eivät ole kirjautuneet sisään',
 'group-loggedin-name'   => 'Käyttäjä',
@@ -983,6 +992,7 @@ Palaute ja lisäapu osoitteessa:
 'ipusubmit'           => 'Poista esto',
 'ipusuccess'          => 'IP-osoitteen tai käyttäjän <b>$1<b> esto poistettu', // TODO NOWIKIMARKUP
 'ipblocklist'         => 'Lista estetyistä IP-osoitteista',
+'ipblocklistempty'    => 'Estolista on tyhjä.',
 'blocklistline'       => '$1 — $2 on estänyt käyttäjän $3 ($4)',
 'infiniteblock'       => 'ikuisesti',
 'expiringblock'       => 'vanhenee $1',
@@ -1311,147 +1321,211 @@ Jos tämä tunnus ei ole sinun, ÄLÄ seuraa linkkiä. Varmennuskoodi vanhenee $
 );
 
 
-  #--------------------------------------------------------------------------
-  # Internationalisation code
-  #--------------------------------------------------------------------------
+	#--------------------------------------------------------------------------
+	# Internationalisation code
+	#--------------------------------------------------------------------------
 
 class LanguageFi extends LanguageUtf8 {
-  function LanguageFi() {
-    global $wgNamespaceNamesFi, $wgMetaNamespace;
-    LanguageUtf8::LanguageUtf8();
-    $wgNamespaceNamesFi[NS_PROJECT_TALK] = 'Keskustelu_' . $this->convertGrammar( $wgMetaNamespace, 'elative' );
-  }
-
-  function getBookstoreList () {
-    global $wgBookstoreListFi ;
-    return $wgBookstoreListFi ;
-  }
-
-  function getNamespaces() {
-    global $wgNamespaceNamesFi;
-    return $wgNamespaceNamesFi;
-  }
-
-  function getQuickbarSettings() {
-    global $wgQuickbarSettingsFi;
-    return $wgQuickbarSettingsFi;
-  }
-
-  function getSkinNames() {
-    global $wgSkinNamesFi;
-    return $wgSkinNamesFi;
-  }
-
-  function date( $ts, $adj = false ) {
-    if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-
-    $d = (0 + substr( $ts, 6, 2 )) . '. ' .
-    $this->getMonthName( substr( $ts, 4, 2 ) ) . 'ta ' . substr( $ts, 0, 4 );
-    return $d;
-  }
-
-  function time( $ts, $adj = false, $seconds = true ) {
-    if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-
-    $t = substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 );
-    if ( $seconds ) {
-    $t .= ':' . substr( $ts, 12, 2 );
-    }
-    return $t;
-  }
-
-  function timeanddate( $ts, $adj = false ) {
-    return $this->date( $ts, $adj ) . ' kello ' . $this->time( $ts, $adj );
-  }
-
-  function getMessage( $key ) {
-    global $wgAllMessagesFi;
-    if( isset( $wgAllMessagesFi[$key] ) ) {
-      return $wgAllMessagesFi[$key];
-    } else {
-      return parent::getMessage( $key );
-    }
-  }
-
-  /**
-   * Finnish numeric formatting is 123 456,78.
-   * Notice that the space is non-breaking.
-   */
-  function formatNum( $number, $year = false ) {
-    return $year ? $number : strtr($this->commafy($number), '.,', ", " );
-  }
-
-  /**
-   * Avoid grouping whole numbers between 0 to 9999
-   */
-  function commafy($_) {
-    if (!preg_match('/^\d{1,4}$/',$_)) {
-      return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
-    } else {
-      return $_;
-    }
-  }
-
-  # Convert from the nominative form of a noun to some other case
-  # Invoked with {{GRAMMAR:case|word}}
-  function convertGrammar( $word, $case ) {
-    # These rules are not perfect, but they are currently only used for site names so it doesn't
-    # matter if they are wrong sometimes. Just add a special case for your site name if necessary.
-    switch ( $case ) {
-      case 'genitive':
-        if ( $word == 'Wikisitaatit' ) {
-          $word = 'Wikisitaattien';
-        } else {
-          $word .= 'n';
-        }
-      break;
-      case 'elative':
-        if ( $word == 'Wikisitaatit' ) {
-          $word = 'Wikisitaateista';
-        } else {
-          if ( mb_substr($word, -1) == 'y' ) {
-            $word .= 'stä';
-          } else {
-            $word .= 'sta';
-          }
-        }
-        break;
-      case 'partitive':
-        if ( $word == 'Wikisitaatit' ) {
-          $word = 'Wikisitaatteja';
-        } else {
-          if ( mb_substr($word, -1) == 'y' ) {
-            $word .= 'ä';
-          } else {
-            $word .= 'a';
-          }
-        }
-        break;
-      case 'illative':
-        # Double the last letter and add 'n'
-        # mb_substr has a compatibility function in GlobalFunctions.php
-        if ( $word == 'Wikisitaatit' ) {
-          $word = 'Wikisitaatteihin';
-        } else {
-          $word = $word . mb_substr($word,-1) . 'n';
-        }
-        break;
-      case 'inessive':
-        if ( $word == 'Wikisitaatit' ) {
-          $word = 'Wikisitaateissa';
-        } else {
-          if ( mb_substr($word, -1) == 'y' ) {
-            $word .= 'ssä';
-          } else {
-            $word .= 'ssa';
-          }
-        }
-        break;
-
-
-    }
-    return $word;
-  }
+	function LanguageFi() {
+		global $wgNamespaceNamesFi, $wgMetaNamespace;
+		LanguageUtf8::LanguageUtf8();
+		$wgNamespaceNamesFi[NS_PROJECT_TALK] = 'Keskustelu_' . $this->convertGrammar( $wgMetaNamespace, 'elative' );
+	}
+
+	function getBookstoreList () {
+		global $wgBookstoreListFi ;
+		return $wgBookstoreListFi ;
+	}
+
+	function getNamespaces() {
+		global $wgNamespaceNamesFi;
+		return $wgNamespaceNamesFi;
+	}
+
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsFi;
+		return $wgQuickbarSettingsFi;
+	}
+
+	function getSkinNames() {
+		global $wgSkinNamesFi;
+		return $wgSkinNamesFi;
+	}
+
+	function getDateFormats() {
+		global $wgDateFormatsFi;
+		return $wgDateFormatsFi;
+	}
+
+	/**
+	 * @access public
+	 * @param mixed  $ts the time format which needs to be turned into a
+	 *               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	 * @param bool   $adj whether to adjust the time output according to the
+	 *               user configured offset ($timecorrection)
+	 * @param mixed  $format what format to return, if it's false output the
+	 *               default one.
+	 * @param string $timecorrection the time offset as returned by
+	 *               validateTimeZone() in Special:Preferences
+	 * @return string
+	 */
+	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+
+		$yyyy = substr( $ts, 0, 4 );
+		$mm = substr( $ts, 4, 2 );
+		$m = 0 + $mm;
+		$mmmm = $this->getMonthName( $mm ) . 'ta';
+		$dd = substr( $ts, 6, 2 );
+		$d = 0 + $dd;
+
+		$datePreference = $this->dateFormat($format);
+		switch( $datePreference ) {
+			case '3': return "$d.$m.$yyyy";
+			case 'ISO 8601': return "$yyyy-$mm-$dd";
+			default: return "$d. $mmmm $yyyy";
+		}
+	}
+
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*               user configured offset ($timecorrection)
+	* @param mixed  $format what format to return, if it's false output the
+	*               default one (default true)
+	* @param string $timecorrection the time offset as returned by
+	*               validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+
+		$hh = substr( $ts, 8, 2 );
+		$mm =  substr( $ts, 10, 2 );
+		$ss = substr( $ts, 12, 2 );
+
+		$datePreference = $this->dateFormat($format);
+		switch( $datePreference ) {
+			case '2':
+			case 'ISO 8601': return "$hh:$mm:$ss";
+			default: return "$hh.$mm";
+		}
+	}
+
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*               user configured offset ($timecorrection)
+	* @param mixed  $format what format to return, if it's false output the
+	*               default one (default true)
+	* @param string $timecorrection the time offset as returned by
+	*               validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
+		$date = $this->date( $ts, $adj, $format, $timecorrection );
+		$time = $this->time( $ts, $adj, $format, $timecorrection );
+
+		$datePreference = $this->dateFormat($format);
+		switch( $datePreference ) {
+			case '3':
+			case 'ISO 8601': return "$date $time";
+			default: return "$date kello $time";
+		}
+	}
+
+	function getMessage( $key ) {
+		global $wgAllMessagesFi;
+		if( isset( $wgAllMessagesFi[$key] ) ) {
+			return $wgAllMessagesFi[$key];
+		} else {
+			return parent::getMessage( $key );
+		}
+	}
+
+	/**
+	 * Finnish numeric formatting is 123 456,78.
+	 * Notice that the space is non-breaking.
+	 */
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($this->commafy($number), '.,', ", " );
+	}
+
+	/**
+	 * Avoid grouping whole numbers between 0 to 9999
+	 */
+	function commafy($_) {
+		if (!preg_match('/^\d{1,4}$/',$_)) {
+			return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
+		} else {
+			return $_;
+		}
+	}
+
+	# Convert from the nominative form of a noun to some other case
+	# Invoked with {{GRAMMAR:case|word}}
+	function convertGrammar( $word, $case ) {
+		# These rules are not perfect, but they are currently only used for site names so it doesn't
+		# matter if they are wrong sometimes. Just add a special case for your site name if necessary.
+		switch ( $case ) {
+			case 'genitive':
+				if ( $word == 'Wikisitaatit' ) {
+					$word = 'Wikisitaattien';
+				} else {
+					$word .= 'n';
+				}
+			break;
+			case 'elative':
+				if ( $word == 'Wikisitaatit' ) {
+					$word = 'Wikisitaateista';
+				} else {
+					if ( mb_substr($word, -1) == 'y' ) {
+						$word .= 'stä';
+					} else {
+						$word .= 'sta';
+					}
+				}
+				break;
+			case 'partitive':
+				if ( $word == 'Wikisitaatit' ) {
+					$word = 'Wikisitaatteja';
+				} else {
+					if ( mb_substr($word, -1) == 'y' ) {
+						$word .= 'ä';
+					} else {
+						$word .= 'a';
+					}
+				}
+				break;
+			case 'illative':
+				# Double the last letter and add 'n'
+				# mb_substr has a compatibility function in GlobalFunctions.php
+				if ( $word == 'Wikisitaatit' ) {
+					$word = 'Wikisitaatteihin';
+				} else {
+					$word = $word . mb_substr($word,-1) . 'n';
+				}
+				break;
+			case 'inessive':
+				if ( $word == 'Wikisitaatit' ) {
+					$word = 'Wikisitaateissa';
+				} else {
+					if ( mb_substr($word, -1) == 'y' ) {
+						$word .= 'ssä';
+					} else {
+						$word .= 'ssa';
+					}
+				}
+				break;
+
+		}
+		return $word;
+	}
+
 }
 
 ?>
diff --git a/languages/LanguageFo.php b/languages/LanguageFo.php
index 20cf12ac6fd0..b04820e664cf 100644
--- a/languages/LanguageFo.php
+++ b/languages/LanguageFo.php
@@ -35,15 +35,6 @@ require_once( 'LanguageUtf8.php');
 	"Standardur", "Nostalgiskur", "Cologne-bláur", "Paddington", "Montparnasse"
 );
 
-/* private */ $wgMathNamesFo = array(
-	MW_MATH_PNG => 'mw_math_png',
-	MW_MATH_SIMPLE => 'mw_math_simple',
-	MW_MATH_HTML => 'mw_math_html',
-	MW_MATH_SOURCE => 'mw_math_source',
-	MW_MATH_MODERN => 'mw_math_modern',
-	MW_MATH_MATHML => 'mw_math_mathml'
-);
-
 /* private */ $wgDateFormatsFo = array(
 #	"Ongi forrættindi",
 );
@@ -52,59 +43,6 @@ require_once( 'LanguageUtf8.php');
 	"Bokasolan.fo" => "http://www.bokasolan.fo/vleitari.asp?haattur=bok.alfa&Heiti=&Hovindur=&Forlag=&innbinding=Oell&bolkur=Allir&prisur=Allir&Aarstal=Oell&mal=Oell&status=Oell&ISBN=$1",
 ) + $wgBookstoreListEn;
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesFo = array(
-	"Userlogin" => "",
-	"Userlogout" => "",
-	"Preferences" => "Minar brúkarainnstillingar",
-	"Watchlist" => "Mín vaka yvur listi",
-	"Recentchanges" => "Seinsastu broytingar",
-	"Upload" => "Leg fílur upp",
-	"Imagelist" => "Myndalisti",
-	"Listusers" => "Skrásettir brúkarir",
-	"Statistics" => "Hagtøl um síðuna",
-	"Randompage" => "Tilvildarlig grein",
-
-	"Lonelypages" => "Foreldreleysar greinir",
-	"Unusedimages" => "Foreldreleysir fílur",
-	"Popularpages" => "Umtóktar greinir",
-	"Wantedpages" => "Mest ynsktu greinir",
-	"Shortpages" => "Stytstu greinir",
-	"Longpages" => "Langar greinir",
-	"Newpages" => "Nýggjastu greinir",
-	"Ancientpages" => "Elstu greinir",
-	"Deadendpages" => "Blindsíður",
-	"Intl" => "Málávísing",
-	"Allpages" => "Allar síður eftur yvurskrift",
-
-	"Ipblocklist" => "Bannaðar IP-adressur",
-	"Maintenance" => "Viðlíkahaldssíðir",
-	"Specialpages" => "",
-	"Contributions" => "",
-	"Emailuser" => "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage" => "",
-	"Booksources" => "Útvortis bókakelda",
-	"Categories" => "síðubólkur",
-	"Export" => "Útflyt síðu í XML sniði",
-	"Version" => "Vís MediaWiki útgávu",
-);
-
-/* private */ $wgSysopSpecialPagesFo = array(
-	"Blockip"	      => "Bannað eina IP-adressu",
-	"Asksql"	      => "Ger ein fyrispurning í dátagrunnin",
-	"Undelete"	      => "Síggj og endurstovna strikaðar síður",
-	"Makesysop"	      => "Ber ein brúkara til umboðsstjóra"
-);
-
-/* private */ $wgDeveloperSpecialPagesFo = array(
-	"Lockdb"	      => "Skriviverj dátagrunnin", # Skrivivardur
-	"Unlockdb"	      => "Endurstovna skriviatgongd til dátagrunnin",
-);
 
 /* private */ $wgAllMessagesFo = array(
 
@@ -128,12 +66,12 @@ require_once( 'LanguageUtf8.php');
 "tog-nocache" => "Minst ikki til síðurnar til næstu ferð",
 
 # Dates
-'sunday' => 'sunnudagur', 
-'monday' => 'mánadagur', 
-'tuesday' => 'týsdagur', 
-'wednesday' => 'mikudagur', 
+'sunday' => 'sunnudagur',
+'monday' => 'mánadagur',
+'tuesday' => 'týsdagur',
+'wednesday' => 'mikudagur',
 'thursday' => 'hósdagur',
-'friday' => 'fríggjadagur', 
+'friday' => 'fríggjadagur',
 'saturday' => 'leygardagur',
 'january' => 'januar',
 'february' => 'februar',
@@ -197,7 +135,7 @@ class LanguageFo extends LanguageUtf8 {
 		return $wgDateFormatsFo;
 	}
 
-	
+
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
@@ -211,21 +149,6 @@ class LanguageFo extends LanguageUtf8 {
 		return $this->date( $ts, $adj ) . " kl. " . $this->time( $ts, $adj );
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesFo;
-		return $wgValidSpecialPagesFo;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesFo;
-		return $wgSysopSpecialPagesFo;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesFo;
-		return $wgDeveloperSpecialPagesFo;
-	}
-
 	function getMessage( $key ) {
 	    global $wgAllMessagesFo, $wgAllMessagesEn;
 	    $m = $wgAllMessagesFo[$key];
diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index cca0ad756140..ccb1efd62d26 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -4,9 +4,6 @@
   * @subpackage Language
   */
 
-// The names of the namespaces can be set here, but the numbers
-// are magical, so don't change or move them!  The Namespace class
-// encapsulates some of the magic-ness.
 require_once( 'LanguageUtf8.php' );
 
 /* private */ $wgNamespaceNamesFr = array(
@@ -37,14 +34,7 @@ require_once( 'LanguageUtf8.php' );
 /* private */ $wgSkinNamesFr = array(
 	'standard'		=> 'Standard',
 	'nostalgia'		=> 'Nostalgie',
-	'cologneblue'	=> 'Cologne Blue',
-	'smarty'		=> 'Paddington',
-	'montparnasse'	=> 'Montparnasse',
-	'davinci'		=> 'DaVinci',
-	'mono'			=> 'Mono',
-	'monobook'		=> 'MonoBook',
-	'myskin'		=> 'MySkin'
-);
+) + $wgSkinNamesEn;
 
 
 
@@ -56,61 +46,6 @@ require_once( 'LanguageUtf8.php' );
 );
 
 
-// All special pages have to be listed here: a description of ""
-// will make them not show up on the "Special Pages" page, which
-// is the right thing for some of them (such as the "targeted" ones).
-
-/* private */ $wgValidSpecialPagesFr = array(
-	'Userlogin'     => '',
-	'Userlogout'    => '',
-	'Preferences'   => 'Préférences',
-	'Watchlist'     => 'Liste de suivi',
-	'Recentchanges' => 'Modifications récentes',
-	'Upload'        => 'Copier un fichier',
-	'Imagelist'     => 'Liste des images',
-	'Listusers'     => 'Liste des participants',
-	'Statistics'    => 'Statistiques',
-	'Randompage'    => 'Une page au hasard',
-
-	'Lonelypages'   => 'Pages orphelines',
-	'Unusedimages'  => 'Images orphelines',
-	'Popularpages'  => 'Les plus populaires',
-	'Wantedpages'   => 'Les plus demandées',
-	'Shortpages'    => 'Articles courts',
-	'Longpages'     => 'Articles longs',
-	'Newpages'      => 'Nouvelles pages',
-	'Ancientpages'	=> 'Anciennes pages',
-	'Allpages'      => 'Toutes les pages',
-
-	'Ipblocklist'   => 'Adresses IP bloquées',
-	'Maintenance'   => 'Page de maintenance',
-	'Specialpages'  => '', // ces pages doivent rester vides !
-	'Contributions' => '',
-	'Emailuser'     => '',
-	'Whatlinkshere' => '',
-	'Recentchangeslinked' => '',
-	'Movepage'      => '',
-	'Booksources'   => 'Librairies en ligne',
-	'Categories'	=> 'Page des catégories',
-	'Export'	=> 'Exporter par XML',
-	'Version'	=> 'Version',
-	'Allmessages'	=> 'Messages système'
-);
-
-/* private */ $wgSysopSpecialPagesFr = array(
-	'Blockip'       => 'Bloquer une adresse IP',
-	'Asksql'        => 'Accès SQL',
-	'Makesysop'		=> 'Donner les droits d\'administrateur',
-
-	'Undelete'      => 'Gérer les pages effacées',
-	'Import'		=> 'Importer une page avec l\'historique'
-);
-
-/* private */ $wgDeveloperSpecialPagesFr = array(
-	'Lockdb'        => 'Bloquer la base de données',
-	'Unlockdb'      => 'Débloquer la base de données',
-);
-
 /* private */ $wgAllMessagesFr = array(
 
 # User Toggles
@@ -175,7 +110,7 @@ require_once( 'LanguageUtf8.php' );
 #
 'categories'	=> 'Catégories de la page',
 'category'	=> 'catégorie',
-'category_header' => 'Articles dans la catégorie "$1"',
+'category_header' => 'Articles dans la catégorie « $1 ».',
 'subcategories'	=> 'Sous-catégories',
 'uncategorizedcategories' => 'Catégories sans catégories',
 'uncategorizedpages' => 'Pages sans catégories',
@@ -183,26 +118,26 @@ require_once( 'LanguageUtf8.php' );
 'subcategorycount1' => 'Cette catégorie possède $1 sous-catégorie.',
 
 'allarticles'   => 'Tous les articles',
-'linktrail'     => "/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sD",
+'linktrail'     => '/^([a-zàâçéèêîôûäëïöüùÇÉÂÊÎÔÛÄËÏÖÜÀÈÙ]+)(.*)$/sD',
 'mainpage'      => 'Accueil',
 'mainpagetext'	=> 'Logiciel {{SITENAME}} installé.',
-'portal'        => 'Accueil communauté',
+'portal'        => 'Communauté',
 'portal-url'	=> '{{ns:4}}:Accueil',
 'about'         => 'À propos',
 'aboutsite'     => 'À propos de {{SITENAME}}',
 'aboutpage'     => '{{ns:4}}:À propos',
 'article'       => 'Article',
 'help'          => 'Aide',
-'helppage'      => '{{ns:4}}:Aide',
-'wikititlesuffix' => '{{SITENAME}}',
+'helppage'      => '{{ns:help}}:Aide',
 'bugreports'    => 'Rapport d\'erreurs',
 'bugreportspage' => '{{ns:4}}:Rapport d\'erreurs',
 'sitesupport'	=> 'Participer en faisant un don',
+'sitesupport'	=> 'Faire un don',
 'sitesupportpage'	=> '{{ns:4}}:Dons',
 'faq'           => 'FAQ',
 'faqpage'       => '{{ns:4}}:FAQ',
 'edithelp'      => 'Aide',
-'edithelppage'  => '{{ns:4}}:Comment éditer une page',
+'edithelppage'  => '{{ns:help}}:Comment éditer une page',
 'cancel'        => 'Annuler',
 'qbfind'        => 'Rechercher',
 'qbbrowse'      => 'Défiler',
@@ -253,21 +188,18 @@ require_once( 'LanguageUtf8.php' );
 'viewtalkpage'  => 'Page de discussion',
 'otherlanguages' => 'Autres langues',
 'redirectedfrom' => '(Redirigé depuis $1)',
-'lastmodified'  => 'Dernière modification de cette page : $1.',
+'lastmodified'  => 'Dernière modification de cette page le $1.',
 'viewcount'     => 'Cette page a été consultée $1 fois.',
 'copyright'	=> 'Contenu disponible sous $1.',
-'gnunote'       => 'Tous les textes sont disponibles sous les termes de la <a href="/wiki/GFDL">Licence de documentation libre GNU</a>.',
 'printsubtitle' => '(de {{SERVER}})',
 'protectedpage' => 'Page protégée',
 'administrators' => '{{ns:4}}:Administrateurs',
 'sysoptitle'    => 'Accès administrateur requis',
-'sysoptext'     => 'L\'action que vous avez tentée ne peut être effectuée que par un utilisateur ayant le statut d\'"administrateur".
+'sysoptext'     => 'L\'action que vous avez tentée ne peut être effectuée que par un utilisateur ayant le statut d\'« administrateur ».
 Voir $1.',
 'developertitle' => 'Accès développeur requis',
-'developertext' => 'L\'action que vous avez tentée ne peut être effectuée que par un utilisateur ayant le statut de "développeur".
+'developertext' => 'L\'action que vous avez tentée ne peut être effectuée que par un utilisateur ayant le statut de « développeur ».
 Voir $1.',
-'bureaucrattitle'	=> 'Un accès de "Bureaucrate" est requis',
-'bureaucrattext'	=> 'Cette action ne peut être réalisée que par des administrateurs ayant le statut de "Bureaucrate".',
 'nbytes'        => '$1 octets',
 'go'            => 'Consulter',
 'ok'            => 'OK',
@@ -293,7 +225,7 @@ Voir $1.',
 'nstab-user' => 'Page utilisateur',
 'nstab-media' => 'Média',
 'nstab-special' => 'Spécial',
-'nstab-wp' => 'A propos',
+'nstab-wp' => 'À propos',
 'nstab-image' => 'Image',
 'nstab-mediawiki' => 'Message',
 'nstab-template' => 'Modèle',
@@ -311,25 +243,25 @@ Voir $1.',
 #
 'error'		=> 'Erreur',
 'badaccess' => 'Erreur de permission',
-'badaccesstext' => 'L\'action entreprise est limitée aux utilisateurs possédant le droit "$2".
+'badaccesstext' => 'L\'action entreprise est limitée aux utilisateurs possédant le droit « $2 ».
 Voir $1',
 'databaseerror' => 'Erreur base de données',
-'dberrortext'	=> "Erreur de syntaxe dans la base de données. La dernière requête traitée par la base de données était :
+'dberrortext'	=> 'Erreur de syntaxe dans la base de données. La dernière requête traitée par la base de données était :
 <blockquote><tt>$1</tt></blockquote>
-depuis la fonction \"<tt>$2</tt>\".
-MySQL a renvoyé l'erreur \"<tt>$3: $4</tt>\".",
+depuis la fonction « <tt>$2</tt> ».
+MySQL a renvoyé l\'erreur « <tt>$3: $4</tt> ».',
 'dberrortextcl' => 'Une requête à la base de donnée comporte une erreur de syntaxe. La dernière requête envoyée était:
-"$1"
-effectuée par la fonction "$2"
-MySQL a retourné l\'erreur "$3 : $4".',
-'noconnect'	=> "Désolé! Suite à des problèmes techniques, il est impossible de se connecter à la base de données pour le moment.", //"Connexion impossible à la base de données sur $1",
+« $1 »
+effectuée par la fonction « $2 »
+MySQL a retourné l\'erreur « $3 : $4 ».',
+'noconnect'	=> 'Désolé! Suite à des problèmes techniques, il est impossible de se connecter à la base de données pour le moment.',
 'nodb'		=> 'Sélection impossible de la base de données $1',
 'cachederror'	=> 'Ceci est une copie de la page demandée et peut ne pas être à jour',
 'readonly'	=> 'Mises à jour bloquées sur la base de données',
 'enterlockreason' => 'Indiquez la raison du blocage, ainsi qu\'une estimation de la durée de blocage ',
-'readonlytext'	=> "Les ajouts et mises à jour sur la base de donnée {{SITENAME}} sont actuellement bloqués, probablement pour permettre la maintenance de la base, après quoi, tout rentrera dans l'ordre. Voici la raison pour laquelle l'administrateur a bloqué la base :
-<p>$1",
-'missingarticle' => 'La base de données n\'a pas pu trouver le texte d\'une page existante, dont le titre est "$1".
+'readonlytext'	=> 'Les ajouts et mises à jour sur la base de donnée {{SITENAME}} sont actuellement bloqués, probablement pour permettre la maintenance de la base, après quoi, tout rentrera dans l\'ordre. Voici la raison pour laquelle l\'administrateur a bloqué la base :
+<p>$1',
+'missingarticle' => 'La base de données n\'a pas pu trouver le texte d\'une page existante, dont le titre est « $1 ».
 Ce n\'est pas une erreur de la base de données, mais plus probablement un bogue du wiki.
 Veuillez rapporter cette erreur à un administrateur, en lui indiquant l\'adresse de la page fautive.',
 'internalerror' => 'Erreur interne',
@@ -337,11 +269,11 @@ Veuillez rapporter cette erreur à un administrateur, en lui indiquant l\'adress
 'fileinfo' => '$1Ko, type MIME: <tt>$2</tt>',
 'filerenameerror' => 'Impossible de renommer « $1 » en « $2 ».',
 'filedeleteerror' => 'Impossible de supprimer « $1 ».',
-'filenotfound'	=> 'Fichier "$1" introuvable.',
-'unexpected' => 'Valeur inattendue : "$1"="$2".',
+'filenotfound'	=> 'Le fichier « $1 » introuvable.',
+'unexpected' => 'Valeur inattendue : « $1 » = « $2 ».',
 'formerror'	=> 'Erreur: Impossible de soumettre le formulaire',
 'badarticleerror' => 'Cette action ne peut pas être effectuée sur cette page.',
-'cannotdelete'	=> "Impossible de supprimer la page ou l'image indiquée.",
+'cannotdelete'	=> 'Impossible de supprimer la page ou l\'image indiquée.',
 'badtitle'	=> 'Mauvais titre',
 'badtitletext'	=> 'Le titre de la page demandée est invalide, vide ou le lien interlangue est invalide',
 'laggedslavemode' => 'Attention : la page n\'intègre peut être pas les dernières éditions',
@@ -354,7 +286,6 @@ ne peut utiliser le wiki.',
 'protectedtext'	=> 'Cette page a été bloquée pour empêcher sa modification. Consulter [[{{ns:4}}:Page protégée]] pour voir les différentes raisons possibles.',
 'allmessagesnotsupportedDB' => 'Special:AllMessages n\'est pas disponible parce que wgUseDatabaseMessages est désactivé.',
 'allmessagesnotsupportedUI' => 'Special:AllMessages n\'accepte pas la langue de votre interface (<b>$1</b>) sur ce site.',
-'seriousxhtmlerrors' => 'Tidy a détecté de sérieuses erreurs xhtml.',
 'wrong_wfQuery_params' => 'Paramètres incorrects sur la commande wfQuery()<br />
 Fonction : $1<br />
 Requête : $2',
@@ -365,12 +296,11 @@ Requête : $2',
 # Login and logout pages
 #
 'logouttitle'	=> 'Déconnexion',
-'logouttext'	=> "Vous êtes à présent déconnecté(e).
-Vous pouvez continuer à utiliser {{SITENAME}} de façon anonyme, ou vous reconnecter, éventuellement sous un autre nom.\n",
-
-'welcomecreation' => "<h2>Bienvenue, $1!</h2><p>Votre compte d'utilisateur a été créé.
-N'oubliez pas de personnaliser votre {{SITENAME}} en consultant la page Préférences.",
+'logouttext'	=> 'Vous êtes à présent déconnecté(e).
+Vous pouvez continuer à utiliser {{SITENAME}} de façon anonyme, ou vous reconnecter, éventuellement sous un autre nom.',
 
+'welcomecreation' => '<h2>Bienvenue, $1!</h2><p>Votre compte d\'utilisateur a été créé.
+N\'oubliez pas de personnaliser votre {{SITENAME}} en consultant la page Préférences.',
 'loginpagetitle'     => 'Votre identifiant',
 'yourname'           => 'Votre nom d\'utilisateur',
 'yourpassword'       => 'Votre mot de passe',
@@ -378,7 +308,7 @@ N'oubliez pas de personnaliser votre {{SITENAME}} en consultant la page Préfér
 'newusersonly'       => ' (nouveaux utilisateurs uniquement)',
 'remembermypassword' => 'Se souvenir de mon mot de passe (cookie)',
 'loginproblem'       => '<b>Problème d\'identification.</b><br />Essayez à nouveau !',
-'alreadyloggedin'    => '<font color=red>\'\'\'Utilisateur $1, vous êtes déjà identifié!\'\'\'</font><br />',
+'alreadyloggedin'    => '<strong>\'\'\'Utilisateur $1, vous êtes déjà identifié!\'\'\'</strong><br />',
 
 'login'         => 'Identification',
 'loginprompt'	=> 'Vous devez activer les cookies pour vous connecter à {{SITENAME}}.',
@@ -389,34 +319,34 @@ N'oubliez pas de personnaliser votre {{SITENAME}} en consultant la page Préfér
 'createaccount' => 'Créer un nouveau compte',
 'createaccountmail'	=> 'par courriel',
 'badretype'     => 'Les deux mots de passe que vous avez saisis ne sont pas identiques.',
-'userexists'    => "Le nom d'utilisateur que vous avez saisi est déjà utilisé. Veuillez en choisir un autre.",
+'userexists'    => 'Le nom d\'utilisateur que vous avez saisi est déjà utilisé. Veuillez en choisir un autre.',
 'youremail'     => 'Mon adresse électronique',
 'yournick'      => 'Signature pour les discussions (avec <tt><nowiki>~~~</nowiki></tt>)&nbsp;',
-'yourrealname'	=> 'Votre nom réél*',
+'yourrealname'	=> 'Votre nom réel*',
 'emailforlost'  => 'Si vous égarez votre mot de passe, vous pouvez demander à ce qu\'un nouveau vous soit envoyé à votre adresse électronique.',
 'prefs-help-realname' => '* <strong>Votre nom</strong> (facultatif): si vous le spécifiez, il sera utilisé pour l\'attribution de vos contributions.',
 'prefs-help-email' => '* <strong>Adresse électronique</strong> (facultatif): permet de vous contacter depuis le site sans dévoiler votre adresse, et utilisée pour vous envoyer un nouveau mot de passe si vous l\'oubliez.',
 'loginerror'    => 'Problème d\'identification',
-'nocookiesnew'	=> "Le compte utilisateur a été créé, mais vous n'êtes pas connecté. {{SITENAME}} utilise des cookies pour la connexion mais vous avez les cookies désactives. Merci de les activer et de vous reconnecter.",
-'nocookieslogin' => "{{SITENAME}} utilise des cookies pour la connexion mais vous avez les cookies désactives. Merci de les activer et de vous reconnecter.",
-'noname'        => "Vous n'avez pas saisi de nom d'utilisateur.",
-'loginsuccesstitle' => "Identification réussie.",
-'loginsuccess'  => "Vous êtes actuellement connecté sur {{SITENAME}} en tant que \"$1\".",
-'nosuchuser'    => "L'utilisateur \"$1\" n'existe pas.
-Vérifiez que vous avez bien orthographié le nom, ou utilisez le formulaire ci-dessous pour créer un nouveau compte utilisateur.",
+'nocookiesnew'	=> 'Le compte utilisateur a été créé, mais vous n\'êtes pas connecté. {{SITENAME}} utilise des cookies pour la connexion mais vous avez les cookies désactives. Merci de les activer et de vous reconnecter.',
+'nocookieslogin' => '{{SITENAME}} utilise des cookies pour la connexion mais vous avez les cookies désactives. Merci de les activer et de vous reconnecter.',
+'noname'        => 'Vous n\'avez pas saisi de nom d\'utilisateur.',
+'loginsuccesstitle' => 'Identification réussie.',
+'loginsuccess'  => 'Vous êtes actuellement connecté sur {{SITENAME}} en tant que « $1 ».',
+'nosuchuser'    => 'L\'utilisateur « $1 » n\'existe pas.
+Vérifiez que vous avez bien orthographié le nom, ou utilisez le formulaire ci-dessous pour créer un nouveau compte utilisateur.',
 'nosuchusershort' => 'Il n\'y a pas de contributeur avec le nom « $1 ». Vérifiez l\'orthographe.',
 'wrongpassword' => 'Le mot de passe est incorrect. Essayez à nouveau.',
 'mailmypassword' => 'Envoyez-moi un nouveau mot de passe',
-'passwordremindertitle' => "Votre nouveau mot de passe sur {{SITENAME}}",
-'passwordremindertext' => "Quelqu'un (probablement vous) ayant l'adresse IP $1 a demandé à ce qu'un nouveau mot de passe vous soit envoyé pour votre accès au wiki.
-Le mot de passe de l'utilisateur \"$2\" est à présent \"$3\".
-Nous vous conseillons de vous connecter et de modifier ce mot de passe dès que possible.",
-'noemail'  => "Aucune adresse électronique n'a été enregistrée pour l'utilisateur \"$1\".",
-'passwordsent' => "Un nouveau mot de passe a été envoyé à l'adresse électronique de l'utilisateur \"$1\".
-Veuillez vous identifier dès que vous l'aurez reçu.",
+'passwordremindertitle' => 'Votre nouveau mot de passe sur {{SITENAME}}',
+'passwordremindertext' => 'Quelqu\'un (probablement vous) ayant l\'adresse IP $1 a demandé à ce qu\'un nouveau mot de passe vous soit envoyé pour votre accès au wiki.
+Le mot de passe de l\'utilisateur « $2 » est à présent « $3 ».
+Nous vous conseillons de vous connecter et de modifier ce mot de passe dès que possible.',
+'noemail'  => 'Aucune adresse électronique n\'a été enregistrée pour l\'utilisateur « $1 ».',
+'passwordsent' => 'Un nouveau mot de passe a été envoyé à l\'adresse électronique de l\'utilisateur « $1 ».
+Veuillez vous identifier dès que vous l\'aurez reçu.',
 'loginend'	=> '&nbsp;',
 'mailerror'	=> 'Erreur en envoyant le courriel : $1',
-'acct_creation_throttle_hit' => 'Désolé, vous avez déjà créé $1 compte(s). Vous ne pouvez pas en créer de nouveaux.',
+'acct_creation_throttle_hit' => 'Désolé, vous avez déjà créé $1 comptes. Vous ne pouvez pas en créer de nouveaux.',
 
 # Edit page toolbar
 'bold_sample'   => 'Texte gras',
@@ -438,7 +368,7 @@ Veuillez vous identifier dès que vous l'aurez reçu.",
 'media_sample'  => 'Exemple.ogg',
 'media_tip'     => 'Lien fichier média',
 'sig_tip'       => 'Votre signature avec la date',
-'hr_tip'        => 'Lien horizontale (ne pas en abuser)',
+'hr_tip'        => 'Lien horizontal (ne pas en abuser)',
 'infobox'       => 'Cliquez ce bouton pour avoir un exemple de texte',
 'infobox_alert'	=> "Veuillez entrer le texte que vous voulez formater.\\n Il sera affiché dans la boîte pour être copié et collé.\\nExemple\\n$1\\ndeviendra:\\n$2",
 
@@ -452,13 +382,13 @@ Veuillez vous identifier dès que vous l'aurez reçu.",
 'preview'      => 'Prévisualiser',
 'showpreview'  => 'Prévisualisation',
 'blockedtitle' => 'Utilisateur bloqué',
-"blockedtext"  => "Votre compte utilisateur ou votre adresse IP ont été bloqués par $1 pour la raison suivante :<br />$2<p>Vous pouvez contacter $1 ou un des autres [[{{ns:4}}:Administrateurs|administateurs]] pour en discuter.",
+'blockedtext'  => 'Votre compte utilisateur ou votre adresse IP ont été bloqués par $1 pour la raison suivante :<br />$2<p>Vous pouvez contacter $1 ou un des autres [[{{ns:4}}:Administrateurs|administateurs]] pour en discuter.',
 'whitelistedittitle' => 'Login requis pour rédiger',
 'whitelistedittext' => 'Vous devez être [[Special:Userlogin|connecté]] pour pouvoir rédiger',
 'whitelistreadtitle' => 'Login requis pour lire',
 'whitelistreadtext' => 'Vous devez être [[Special:Userlogin|connecté]] pour pouvoir lire les articles',
 'whitelistacctitle' => 'Vous n\'êtes pas autorisé à créer un compte',
-'whitelistacctext' => 'Pour pouvoir créer un compte sur ce Wiki vous devez être [[Special:Userlogin|connecté]] et avoir les permissions appropriées', // Looxix 
+'whitelistacctext' => 'Pour pouvoir créer un compte sur ce Wiki vous devez être [[Special:Userlogin|connecté]] et avoir les permissions appropriées', // Looxix
 'loginreqtitle'	=> 'Nom d\'utilisateur nécessaire',
 'loginreqtext'	=> "Vous devez vous [[Special:Userlogin|connecter]] pour voir les autres pages.",
 'accmailtitle' => 'Mot de passe envoyé.',
@@ -466,39 +396,39 @@ Veuillez vous identifier dès que vous l'aurez reçu.",
 
 'newarticle'   => '(Nouveau)',
 'newarticletext' => 'Saisissez ici le texte de votre article.',
-'anontalkpagetext' => "---- ''Ceci est la page de discussion pour un utilisateur anonyme qui n'a pas encore créé un compte ou qui ne l'utilise pas. Pour cette raison, nous devons utiliser l'[[adresse IP]] numérique pour l'identifier. Une adresse de ce type peut être partagée entre plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:Userlogin|créer un compte ou vous connecter]] afin d'éviter toute future confusion à l'avenir.", 
-'noarticletext' => "(Il n'y a pour l'instant aucun texte sur cette page)",
-'clearyourcache'    => "'''Note:''' Après avoir sauvegardé, vous devez forcer le rechargement de la page pour voir les changements : Mozilla / Konqueror : ctrl-r, Firefox / IE / Opera : ctrl-f5, Safari : cmd-r.",
+'anontalkpagetext' => '---- \'\'Vous êtes sur la page de discussion d\'un utilisateur anonyme qui n\'a pas encore créé un compte ou qui ne l\'utilise pas. Pour cette raison, nous devons utiliser l\'[[adresse IP]] numérique pour l\'identifier. Une adresse de ce type peut être partagée entre plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:Userlogin|créer un compte ou vous connecter]] afin d\'éviter toute future confusion.\'\'',
+'noarticletext' => '(Il n\'y a pour l\'instant aucun texte sur cette page)',
+'clearyourcache'    => '\'\'\'Note :\'\'\' Après avoir sauvegardé, vous devez forcer le rechargement de la page pour voir les changements : \'\'\'Mozilla / Firefox\'\'\' : \'\'ctrl-shift-r\'\', \'\'\'IE\'\'\' : \'\'ctrl-f5\'\', \'\'\'Safari\'\'\' : \'\'cmd-shift-r\'\'; \'\'\'Konqueror\'\'\' : \'\'f5\'\'.',
 'updated'      => '(Mis à jour)',
 'note'         => '<strong>Note :</strong> ',
-'previewnote'  => "Attention, ce texte n'est qu'une prévisualisation et n'a pas encore été sauvegardé!",
-'previewconflict' => "La prévisualisation montre le texte de cette page tel qu'il apparaîtra une fois sauvegardé.",
+'previewnote'  => 'Attention, ce texte n\'est qu\'une prévisualisation et n\'a pas encore été sauvegardé!',
+'previewconflict' => 'La prévisualisation montre le texte de cette page tel qu\'il apparaîtra une fois sauvegardé.',
 'editing'         => 'modification de $1',
 'editingsection'  => 'modification de $1 (section)',
 'editingcomment'  => 'modification de $1 (commentaire)',
 'editconflict' => 'Conflit de modification : $1',
-'explainconflict' => "<b>Cette page a été sauvegardée après que vous avez commencé à la modifier.
-La zone d'édition supérieure contient le texte tel qu'il est enregistré actuellement dans la base de données. Vos modifications apparaissent dans la zone d'édition inférieure. Vous allez devoir apporter vos modifications au texte existant. Seul le texte de la zone supérieure sera sauvegardé.<br />",
+'explainconflict' => '<b>Cette page a été sauvegardée après que vous avez commencé à la modifier.
+La zone d\'édition supérieure contient le texte tel qu\'il est enregistré actuellement dans la base de données. Vos modifications apparaissent dans la zone d\'édition inférieure. Vous allez devoir apporter vos modifications au texte existant. Seul le texte de la zone supérieure sera sauvegardé.<br />',
 'yourtext'     => 'Votre texte',
 'storedversion' => 'Version enregistrée',
-"editingold"   => "<strong>Attention : vous êtes en train de modifier une version obsolète de cette page. Si vous sauvegardez, toutes les modifications effectuées depuis cette version seront perdues.</strong>",
-"yourdiff"  => "Différences",
-"copyrightwarning" => "Toutes les contributions à {{SITENAME}} sont considérées comme publiées sous les termes de la GNU Free Documentation Licence, une licence de documentation libre (Voir $1 pour plus de détails). Si vous ne désirez pas que vos écrits soient édités et distribués à volonté, ne les envoyez pas. De même, merci de ne contribuer qu'en apportant vos propres écrits ou des écrits issus d'une source libre de droits. <b>N'UTILISEZ PAS DE TRAVAUX SOUS COPYRIGHT SANS AUTORISATION EXPRESSE!</b>",
-"longpagewarning" => "<strong>AVERTISSEMENT : cette page a une longueur de $1 ko;
+'editingold'   => '<strong>Attention : vous êtes en train de modifier une version obsolète de cette page. Si vous sauvegardez, toutes les modifications effectuées depuis cette version seront perdues.</strong>',
+'yourdiff'  => 'Différences',
+'copyrightwarning' => 'Toutes les contributions à {{SITENAME}} sont considérées comme publiées sous les termes de la GNU Free Documentation Licence, une licence de documentation libre (Voir $1 pour plus de détails). Si vous ne désirez pas que vos écrits soient édités et distribués à volonté, ne les envoyez pas. De même, merci de ne contribuer qu\'en apportant vos propres écrits ou des écrits issus d\'une source libre de droits. <b>N\'UTILISEZ PAS DE TRAVAUX SOUS COPYRIGHT SANS AUTORISATION EXPRESSE!</b>',
+'longpagewarning' => '\'\'\'AVERTISSEMENT : cette page a une longueur de $1 ko;
 quelques navigateurs gèrent mal les pages approchant ou dépassant 32 ko lors de leur rédaction.
-Peut-être serait-il mieux que vous divisiez la page en sections plus petites.</strong>",
-"readonlywarning" => "<strong>AVERTISSEMENT : cette page a été bloquée pour maintenance,
-vous ne pourrez donc pas sauvegarder vos modifications maintenant. Vous pouvez copier le texte dans un fichier et le sauver pour plus tard.</strong>",
-"protectedpagewarning" => "<strong>AVERTISSEMENT : cette page a été bloquée.
-Seuls les utilisateurs ayant le statut d'administrateur peuvent la modifier. Soyez certain que
-vous suivez les [[Project:Page_protégée|directives concernant les pages protégées]].<strong>",
+Peut-être serait-il mieux que vous divisiez la page en sections plus petites.\'\'\'',
+'readonlywarning' => '\'\'\'AVERTISSEMENT : cette page a été bloquée pour maintenance,
+vous ne pourrez donc pas sauvegarder vos modifications maintenant. Vous pouvez copier le texte dans un fichier et le sauver pour plus tard.\'\'\'',
+'protectedpagewarning' => '\'\'\'AVERTISSEMENT : cette page a été bloquée.
+Seuls les utilisateurs ayant le statut d\'administrateur peuvent la modifier. Soyez certain que
+vous suivez les [[Project:Page_protégée|directives concernant les pages protégées]].\'\'\'',
 
 # History pages
 #
 'revhistory'   => 'Versions précédentes',
-'nohistory'    => "Il n'existe pas d'historique pour cette page.",
+'nohistory'    => 'Il n\'existe pas d\'historique pour cette page.',
 'revnotfound'  => 'Version introuvable',
-'revnotfoundtext' => "La version précédente de cette page n'a pas pu être retrouvée. Vérifiez l'URL que vous avez utilisée pour accéder à cette page.\n",
+'revnotfoundtext' => 'La version précédente de cette page n\'a pas pu être retrouvée. Vérifiez l\'URL que vous avez utilisée pour accéder à cette page.',
 
 'loadhist'     => 'Chargement de l\'historique de la page',
 'currentrev'   => 'Version actuelle',
@@ -507,8 +437,8 @@ vous suivez les [[Project:Page_protégée|directives concernant les pages proté
 'next'   => 'suiv',
 'last'   => 'dern',
 'orig'   => 'orig',
-'histlegend' => "Légende : (actu) = différence avec la version actuelle ,
-(dern) = différence avec la version précédente, M = modification mineure",
+'histlegend' => 'Légende : (actu) = différence avec la version actuelle ,
+(dern) = différence avec la version précédente, <b>m</b> = modification mineure',
 'selectnewerversionfordiff' => 'Choisir une version plus récente',
 'selectolderversionfordiff' => 'Choisir une version plus ancienne',
 'previousdiff' => '← Différence précédente',
@@ -519,9 +449,9 @@ vous suivez les [[Project:Page_protégée|directives concernant les pages proté
 
 # Category pages
 #
-'categoriespagetext' => "Les catégories suivantes existent sur le wiki :",
-'categoryarticlecount' => "Il y a $1 articles dans cette catégorie.",
-'categoryarticlecount1' => "Il y a $1 article dans cette catégorie.",
+'categoriespagetext' => 'Les catégories suivantes existent sur le wiki :',
+'categoryarticlecount' => 'Il y a $1 articles dans cette catégorie.',
+'categoryarticlecount1' => 'Il y a $1 article dans cette catégorie.',
 
 
 #  Diffs
@@ -535,52 +465,44 @@ vous suivez les [[Project:Page_protégée|directives concernant les pages proté
 # Search results
 #
 'searchresults' => 'Résultat de la recherche',
-'searchresulttext' => "Pour plus d'informations sur la recherche dans {{SITENAME}}, voir [[Project:Recherche|Chercher dans {{SITENAME}}]].",
-'searchquery' => "Pour la requête \"$1\"",
+'searchresulttext' => 'Pour plus d\'informations sur la recherche dans {{SITENAME}}, voir [[Project:Recherche|Chercher dans {{SITENAME}}]].',
+'searchquery' => 'Pour la requête « $1 »',
 'badquery'  => 'Requête mal formulée',
-'badquerytext' => "Nous n'avons pas pu traiter votre requête.
-Vous avez probablement recherché un mot d'une longueur inférieure
-à trois lettres, ce qui n'est pas encore possible. Vous avez
-aussi pu faire une erreur de syntaxe, telle que \"poisson et
-et écailles\".
-Veuillez essayer une autre requête.",
-'matchtotals' => "La requête \"$1\" correspond à $2 titre(s)
-d'article et au texte de $3 article(s).",
-'nogomatch' => "Aucune page avec ce titre n'existe, essai avec la recherche complète.",
-'titlematches' => "Correspondances dans les titres",
-'notitlematches' => "Aucun titre d'article ne contient le(s) mot(s) demandé(s)",
-'textmatches' => "Correspondances dans les textes",
-'notextmatches' => "Aucun texte d'article ne contient le(s) mot(s) demandé(s)",
+'badquerytext' => 'Nous n\'avons pas pu traiter votre requête.
+Vous avez probablement recherché un mot d\'une longueur inférieure à trois lettres, ce qui n\'est pas encore possible. Vous avez aussi pu faire une erreur de syntaxe, telle que « poisson et écailles ». 
+Veuillez essayer une autre requête.', // FIXME
+'matchtotals' => 'La requête « $1 » correspond à $2 titre(s) d\'article et au texte de $3 article(s).',
+'nogomatch' => 'Aucune page avec ce titre n\'existe, essai avec la recherche complète.',
+'titlematches' => 'Correspondances dans les titres',
+'notitlematches' => 'Aucun titre d\'article ne contient le(s) mot(s) demandé(s)',
+'textmatches' => 'Correspondances dans les textes',
+'notextmatches' => 'Aucun texte d\'article ne contient le(s) mot(s) demandé(s)',
 'prevn'   => '$1 précédents',
 'nextn'   => '$1 suivants',
 'viewprevnext' => 'Voir ($1) ($2) ($3).',
-'showingresults' => "Affichage de <b>$1</b> résultats à partir du #<b>$2</b>.",
-'showingresultsnum' => "Affichage de <b>$3</b> résultats à partir du #<b>$2</b>.",
-'nonefound'  => "<strong>Note</strong>: l'absence de résultat est souvent due à l'emploi de termes de recherche trop courants, comme \"à\" ou \"de\",
-qui ne sont pas indexés, ou à l'emploi de plusieurs termes de recherche (seules les pages
-contenant tous les termes apparaissent dans les résultats).",
-'powersearch' => "Recherche",
-'powersearchtext' => "
-Rechercher dans les espaces :<br />
+'showingresults' => 'Affichage de <b>$1</b> résultats à partir du #<b>$2</b>.',
+'showingresultsnum' => 'Affichage de <b>$3</b> résultats à partir du #<b>$2</b>.',
+'nonefound'  => '<strong>Note</strong>: l\'absence de résultat est souvent due à l\'emploi de termes de recherche trop courants, comme « à » ou « de »,
+qui ne sont pas indexés, ou à l\'emploi de plusieurs termes de recherche (seules les pages
+contenant tous les termes apparaissent dans les résultats).',
+'powersearch' => 'Recherche',
+'powersearchtext' => 'Rechercher dans les espaces :<br />
 $1<br />
-$2 Inclure les page de redirections &nbsp; Rechercher $3 $9",
-'searchdisabled' => "<p>La fonction de recherche sur l'entièreté du texte a été temporairement désactivée à cause de la grande charge que cela impose au serveur. Nous espérons la rétablir prochainement lorsque nous disposerons d'un serveur plus puissant. En attendant, vous pouvez faire la recherche avec Google:</p>
-                                                                                                                                                        
-",
-"blanknamespace" => "(Principal)",	// FIXME FvdP: trad de "(Main)"
+$2 Inclure les page de redirections &nbsp; Rechercher $3 $9',
+'searchdisabled' => '<p>La fonction de recherche sur l\'intégralité du texte a été temporairement désactivée à cause de la grande charge que cela impose au serveur. Nous espérons la rétablir prochainement lorsque nous disposerons d\'un serveur plus puissant. En attendant, vous pouvez faire la recherche avec Google:</p>
+', // FIXME wikipedia specific
+'blanknamespace' => '(Principal)',	// FIXME FvdP: translation of "(Main)"
 
 # Preferences page
 #
 'preferences'       => 'Préférences',
 'prefsnologin'      => 'Non connecté',
-'prefsnologintext'  => "Vous devez être [[Special:Userlogin|connecté]]
-pour modifier vos préférences d'utilisateur.",
-"prefslogintext" => "Je suis connecté(e) en tant que $1 avec le numéro d'utilisateur $2.
+'prefsnologintext'  => 'Vous devez être [[Special:Userlogin|connecté]] pour modifier vos préférences d\'utilisateur.',
+'prefslogintext' => 'Je suis connecté(e) en tant que $1 avec le numéro d\'utilisateur $2.
 
-Voir [[{{ns:4}}:Aide pour les préférences]] pour les explications concernant les options.",
+Voir [[{{ns:4}}:Aide pour les préférences]] pour les explications concernant les options.',
 'prefsreset'        => 'Les préférences ont été rétablies à partir de la version enregistrée.',
 'qbsettings'        => 'Personnalisation de la barre outils',
-'qbsettingsnote'	=> "Cette préférence ne fonctionne que pour les skins 'Standard' et 'CologneBlue'.",
 'changepassword'    => 'Modification du mot de passe',
 'skin'              => 'Apparence',
 'math'				=> 'Rendu des maths',
@@ -590,10 +512,10 @@ Voir [[{{ns:4}}:Aide pour les préférences]] pour les explications concernant l
 'math_unknown_function'	=> 'fonction inconnue',
 'math_lexing_error'	=> 'erreur lexicale',
 'math_syntax_error'	=> 'erreur de syntaxe',
-'math_image_error'	=> "La conversion en PNG a échouée, vérifiez l'installation de Latex, dvips, gs et convert",
-'math_bad_tmpdir'	=> "Ne peux pas crééer ou écrire dans le répertoire temporaire",
-'math_bad_output'	=> "Ne peux pas crééer ou écrire dans le répertoire de sortie",
-'math_notexvc'		=> "L'éxécutable 'texvc' est introuvable. Lisez math/README pour le configurer.",
+'math_image_error'	=> 'La conversion en PNG a échouée, vérifiez l\'installation de Latex, dvips, gs et convert',
+'math_bad_tmpdir'	=> 'Ne peux pas crééer ou écrire dans le répertoire temporaire',
+'math_bad_output'	=> 'Ne peux pas crééer ou écrire dans le répertoire de sortie',
+'math_notexvc'		=> 'L\'éxécutable « texvc » est introuvable. Lisez math/README pour le configurer.',
 'prefs-personal'    => 'Informations personnelles',
 'prefs-rc'          => 'Modifications récentes et affichage des ébauches',
 'prefs-misc'        => 'Préférences diverses',
@@ -613,20 +535,20 @@ Voir [[{{ns:4}}:Aide pour les préférences]] pour les explications concernant l
 'recentchangescount' => 'Nombre de titres dans les modifications récentes',
 'savedprefs'        => 'Les préférences ont été sauvegardées.',
 'timezonelegend'    => 'Zone horaire',
-'timezonetext'      => "Si vous ne précisez pas de décalage horaire, c'est l'heure de l'Europe de l'ouest qui sera utilisée.",
+'timezonetext'      => 'Si vous ne précisez pas de décalage horaire, c\'est l\'heure de l\'Europe de l\'ouest qui sera utilisée.',
 'localtime'         => 'Heure locale',
 'timezoneoffset'    => 'Décalage horaire',
 'servertime'	    => 'Heure du serveur',
 'guesstimezone'     => 'Utiliser la valeur du navigateur',
-"emailflag"         => "Ne pas recevoir de courrier électronique<br /> des autres utilisateurs",
-"defaultns"         => "Par défaut, rechercher dans ces espaces :",
-'yourlanguage' => "Langue de l'interface&nbsp;",
+'emailflag'         => 'Ne pas recevoir de courrier électronique<br /> des autres utilisateurs',
+'defaultns'         => 'Par défaut, rechercher dans ces espaces :',
+'yourlanguage' => 'Langue de l\'interface',
 
 # Recent changes
 #
-"changes"	=> "modifications",
-"recentchanges" => "Modifications récentes",
-"recentchangestext" => "Suivez sur cette page les dernières modifications de {{SITENAME}}.
+'changes'	=> 'modifications',
+'recentchanges' => 'Modifications récentes',
+'recentchangestext' => "Suivez sur cette page les dernières modifications de {{SITENAME}}.
 [[{{ns:4}}:Bienvenue|Bienvenue]] aux nouveaux participants!
 Jetez un coup d'&oelig;il sur ces pages&nbsp;: [[{{ns:4}}:FAQ|foire aux questions]],
 [[{{ns:4}}:Recommandations et règles à suivre|recommandations et règles à suivre]]
@@ -635,19 +557,19 @@ Jetez un coup d'&oelig;il sur ces pages&nbsp;: [[{{ns:4}}:FAQ|foire aux question
 et [[{{ns:4}}:Les faux-pas les plus courants|les faux-pas les plus courants]].
 
 Si vous voulez que {{SITENAME}} connaisse le succès, merci de ne pas y inclure pas de matériaux protégés par des [[{{ns:4}}:Copyright|copyrights]]. La responsabilité juridique pourrait en effet compromettre le projet. ",
-'rcloaderr'  => "Chargement des dernières modifications",
-'rcnote'  => "Voici les <strong>$1</strong> dernières modifications effectuées au cours des <strong>$2</strong> derniers jours.",
-'rcnotefrom'	=> "Voici les modifications effectuées depuis le <strong>$2</strong> (<b>$1</b> au maximum).",
-'rclistfrom'	=> "Afficher les nouvelles modifications depuis le $1.",
+'rcloaderr'  => 'Chargement des dernières modifications',
+'rcnote'  => 'Voici les <strong>$1</strong> dernières modifications effectuées au cours des <strong>$2</strong> derniers jours.',
+'rcnotefrom'	=> 'Voici les modifications effectuées depuis le <strong>$2</strong> (<b>$1</b> au maximum).',
+'rclistfrom'	=> 'Afficher les nouvelles modifications depuis le $1.',
 # "rclinks"  => "Afficher les $1 dernières modifications effectuées au cours des $2 dernières heures / $3 derniers jours",
 # "rclinks"  => "Afficher les $1 dernières modifications effectuées au cours des $2 derniers jours.",
-'showhideminor' => "$1 modifications mineures | $2 robots | $3 utilisateurs enregistrés | $4 patrolled edits",
-'rclinks'	=> "Afficher les $1 dernières modifications effectuées au cours des $2 derniers jours; $3 modifications mineures.",	// Looxix
-'rchide'  => "in $4 form; $1 modifications mineures; $2 espaces secondaires; $3 modifications multiples.", // FIXME
-'rcliu'	=> "; $1 modifications par des contributeurs connectés",
+'showhideminor' => '$1 modifications mineures | $2 robots | $3 utilisateurs enregistrés | $4 patrolled edits',
+'rclinks'	=> 'Afficher les $1 dernières modifications effectuées au cours des $2 derniers jours; $3 modifications mineures.',
+'rchide'  => 'in $4 form; $1 modifications mineures; $2 espaces secondaires; $3 modifications multiples.', // FIXME
+'rcliu'	=> '; $1 modifications par des contributeurs connectés',
 'diff'            => 'diff',
 'hist'            => 'hist',
-'hide'            => 'cacher',
+'hide'            => 'masquer',
 'show'            => 'montrer',
 'tableform'       => 'table',
 'listform'        => 'liste',
@@ -664,9 +586,8 @@ Si vous voulez que {{SITENAME}} connaisse le succès, merci de ne pas y inclure
 'reuploaddesc' => 'Retour au formulaire.',
 
 'uploadnologin' => 'Non connecté(e)',
-'uploadnologintext' => "Vous devez être [[Special:Userlogin|connecté]]
-pour copier des fichiers sur le serveur.",
-'uploaderror'  => "Erreur",
+'uploadnologintext' => 'Vous devez être [[Special:Userlogin|connecté]] pour copier des fichiers sur le serveur.',
+'uploaderror'  => 'Erreur',
 'uploadtext'   => "'''STOP !''' Avant de copier votre fichier sur le serveur,
 prenez connaissance des [[Project:règles d'utilisation des images|règles d'utilisation des images]] de {{SITENAME}} et assurez-vous que vous les respectez.<br />
 N'oubliez pas de remplir la [[Project:Page de description d'une image|page de description de l'image]] quand celle-ci sera sur le serveur.
@@ -691,38 +612,36 @@ Pour incorporer l'image dans un article, placez dans celui-ci un lien rédigé c
 '''<nowiki>[[media:nom_du_fichier.ogg]]</nowiki>''' pour les sons.
 
 N'oubliez pas que, comme toutes les pages de {{SITENAME}}, les fichiers que vous copiez peuvent être modifiés ou supprimés par les autres utilisateurs s'ils estiment que cela est dans l'intérêt de l'encyclopédie. Sachez aussi que votre accès au serveur peut être bloqué si vous faites un mauvais usage du système.",
-"uploadlog"  => "log d'upload",		// FIXME
-"uploadlogpage" => "Log_d'upload",	// FIXME
-"uploadlogpagetext" => "Voici la liste des derniers fichiers copiés sur le serveur.
-L'heure indiquée est celle du serveur (UTC).
+'uploadlog'  => 'log d\'upload',
+'uploadlogpage' => 'Log_d\'upload',
+'uploadlogpagetext' => 'Voici la liste des derniers fichiers copiés sur le serveur.
+L\'heure indiquée est celle du serveur (UTC).
 <ul>
 </ul>
-",
-'filename'	=> 'Nom&nbsp;',
-'filedesc'	=> 'Description&nbsp;',
+',
+'filename'	=> 'Nom',
+'filedesc'	=> 'Description',
 'filestatus'	=> 'Statut du copyright',
-'filesource'	=> 'Source',	
-'affirmation'	=> "Je déclare que le détenteur du copyright de ce fichier accepte de le diffuser selon les termes de la $1.",
-'copyrightpage' => "{{ns:4}}:Copyright",
-'copyrightpagename' => "licence {{SITENAME}}",
-'uploadedfiles' => "Fichiers copiés",
-'noaffirmation' => "Vous devez confirmer que la copie de ce fichier ne viole aucun copyright.",
-'ignorewarning' => "Ignorer l'avertissement et copier le fichier quand même.",
-'minlength'	=> "Les noms des images doivent comporter au moins trois lettres.",
-'illegalfilename'	=> 'Le fichier « $1 » contient des caractères qui ne sont pas autorisés dans le titre d\'une page. Veuillez renommer le fichier et le réenvoyer.',
+'filesource'	=> 'Source',
+'copyrightpage' => '{{ns:4}}:Copyright',
+'copyrightpagename' => 'licence {{SITENAME}}',
+'uploadedfiles' => 'Fichiers copiés',
+'ignorewarning' => 'Ignorer l\'avertissement et copier le fichier quand même.',
+'minlength'	=> 'Les noms des images doivent comporter au moins trois lettres.',
+'illegalfilename'	=> 'Le nom de fichier « $1 » contient des caractères interdits dans les titres de pages. Merci de le renommer et de le copier à nouveau.',
 'badfilename' => 'L\'image a été renommée « $1 ».',
 'badfiletype' => '« .$1 » n\'est pas un format recommandé pour les fichiers images.',
-'largefile'  => 'La taille maximale conseillée pour les images est de 100Ko.',
+'largefile'  => 'La taille maximale conseillée pour les images est de 100 ko.',
 'successfulupload' => 'Copie réussie',
-'fileuploaded' => "Le fichier \"$1\" a été copié sur le serveur.
-Suivez ce lien: ($2) pour accéder à la page de description, et donner des informations sur le fichier, par exemple son origine, sa date de création, son auteur, ou tout autre renseignement en votre possession.",
+'fileuploaded' => 'Le fichier « $1 » a été copié sur le serveur.
+Suivez ce lien ($2) pour accéder à la page de description, et donner des informations sur le fichier, par exemple son origine, sa date de création, son auteur, ou tout autre renseignement en votre possession.',
 'uploadwarning' => 'Attention !',
 'savefile'  => 'Sauvegarder le fichier',
 'uploadedimage' => '« [[$1]] » copié sur le serveur',
 'uploaddisabled' => 'Désolé, l\'envoi de fichier est désactivé.',
-'uploadcorrupt' => "Ce fichier est corrompu, a une taille nulle ou possède une extension invalide.
-Veuillez vérifer le fichier.",
-'fileexists' => "Un fichier avec ce nom existe déjà. Merci de vérifier $1. Êtes-vous certain de vouloir modifier ce fichier ?",
+'uploadcorrupt' => 'Ce fichier est corrompu, a une taille nulle ou possède une extension invalide.
+Veuillez vérifer le fichier.',
+'fileexists' => 'Un fichier avec ce nom existe déjà. Merci de vérifier $1. Êtes-vous certain de vouloir modifier ce fichier ?',
 'filemissing' => 'Fichier non présent',
 
 
@@ -738,16 +657,16 @@ Veuillez vérifer le fichier.",
 'bysize'  => 'par taille',
 'imgdelete'  => 'suppr',
 'imgdesc'  => 'descr',
-'imglegend'  => "Légende: (descr) = afficher/modifier la description de l'image.",
+'imglegend'  => 'Légende : (descr) = afficher/modifier la description de l\'image.',
 'imghistory' => 'Historique de l\'image',
 'revertimg'  => 'rétab',
 'deleteimg'  => 'suppr',
 'deleteimgcompletely'  => 'suppr',
-'imghistlegend' => "Légende: (actu) = ceci est l'image actuelle, (suppr) = supprimer
+'imghistlegend' => 'Légende : (actu) = ceci est l\'image actuelle, (suppr) = supprimer
 cette ancienne version, (rétab) = rétablir cette ancienne version.
-<br /><i>Cliquez sur la date pour voir l'image copiée à cette date</i>.",
+<br /><i>Cliquez sur la date pour voir l\'image copiée à cette date</i>.',
 'imagelinks' => 'Liens vers l\'image',
-'linkstoimage' => 'Les pages ci-dessous comportent un lien vers cette image:',
+'linkstoimage' => 'Les pages ci-dessous comportent un lien vers cette image :',
 'nolinkstoimage' => 'Aucune page ne comporte de lien vers cette image.',
 'showbigimage' => 'Télécharger une version haute résolution ($1x$2, $3 Ko)',
 
@@ -758,27 +677,25 @@ cette ancienne version, (rétab) = rétablir cette ancienne version.
 'userstats'  => 'Statistiques utilisateur',
 'sitestatstext' => 'La base de données contient actuellement <b>$1</b> pages.
 
-Ce chiffre inclut les pages "discussion", les pages relatives à {{SITENAME}}, les pages minimales ("bouchons"),  les pages de redirection, ainsi que d\'autres pages qui ne peuvent sans doute pas être considérées comme des articles.
+Ce chiffre inclut les pages « discussion », les pages relatives à {{SITENAME}}, les pages minimales ("bouchons"),  les pages de redirection, ainsi que d\'autres pages qui ne peuvent sans doute pas être considérées comme des articles.
 Si l\'on exclut ces pages, il reste <b>$2</b> pages qui sont probablement de véritables articles.<p>
-<b>$3</b> pages ont été consultées et <b>$4</b> pages modifiées
+<b>$3</b> pages ont été consultées et <b>$4</b> pages modifiées.
 
-depuis la mise à jour du logiciel (31 octobre 2002).
-Cela représente une moyenne de <b>$5</b> modifications par page et de <b>$6</b> consultations pour une modification.",
-"userstatstext" => "Il y a <b>$1</b> utilisateurs enregistrés.
-Parmi ceux-ci, <b>$2</b> ont le statut d\'administrateur (voir $3).',
+Cela représente une moyenne de <b>$5</b> modifications par page et de <b>$6</b> consultations pour une modification.',
+'userstatstext' => 'Il y a <b>$1</b> utilisateurs enregistrés. Parmi ceux-ci, <b>$2</b> ont le statut d\'administrateur (voir $3).',
 
 
 # Maintenance Page
 #
 'maintenance'		=> 'Page de maintenance',
-'maintnancepagetext'	=> "Cette page inclut plusieurs utilitaires pour la maintenance quotidienne. Certains de ces outils ont tendance à charger la base de données; ne rechargez pas la page a chaque modification.",
+'maintnancepagetext'	=> 'Cette page inclut plusieurs utilitaires pour la maintenance quotidienne. Certains de ces outils ont tendance à charger la base de données; ne rechargez pas la page a chaque modification.',
 'maintenancebacklink'	=> 'Retour à la page de maintenance',
 'disambiguations'	=> 'Pages d\'homonymie',
-'disambiguationspage'	=> "{{ns:4}}:Liens_aux_pages_d'homonymie",
-'disambiguationstext'	=> "Les articles suivants sont liés à une <i>page d'homonymie</i>. Or, ils devraient être liés au sujet.<br />Une page est considérée comme page d'homonymie si elle est liée à partir de $1.<br />Les liens à partir d'autres <i>espaces</i> ne sont pas pris en compte.",
-'doubleredirects'	=> "Double redirection",
-'doubleredirectstext'	=> "<b>Attention:</b> cette liste peut contenir des \"faux positifs\". Dans ce cas, c'est probablement la page du premier #REDIRECT contient aussi du texte.<br />Chaque ligne contient les liens à la 1re et 2e page de redirection, ainsi que la première ligne de cette dernière, qui donne normalement la \"vraie\" destination. Le premier #REDIRECT devrait lier vers cette destination.",
-'brokenredirects'	=> 'Redirections cassées', 
+'disambiguationspage'	=> '{{ns:template}}:Homonymie',
+'disambiguationstext'	=> 'Les articles suivants sont liés à une <i>page d\'homonymie</i>. Or, ils devraient être liés au sujet.<br />Une page est considérée comme page d\'homonymie si elle est liée à partir de $1.<br />Les liens à partir d\'autres <i>espaces</i> ne sont pas pris en compte.',
+'doubleredirects'	=> 'Double redirection',
+'doubleredirectstext'	=> '<b>Attention:</b> cette liste peut contenir des « faux positifs ». Dans ce cas, c\'est probablement la page du premier #REDIRECT contient aussi du texte.<br />Chaque ligne contient les liens à la 1re et 2e page de redirection, ainsi que la première ligne de cette dernière, qui donne normalement la « vraie » destination. Le premier #REDIRECT devrait lier vers cette destination.',
+'brokenredirects'	=> 'Redirections cassées',
 'brokenredirectstext'	=> 'Ces redirections mènent a une page qui n\'existe pas.',
 'selflinks'		=> 'Page avec un lien circulaire',
 'selflinkstext'		=> 'Les pages suivantes contiennent un lien vers elles-mêmes, ce qui n\'est pas permis.',
@@ -786,10 +703,10 @@ Parmi ceux-ci, <b>$2</b> ont le statut d\'administrateur (voir $3).',
 'mispeelingstext'               => 'Les pages suivantes contiennent une faute d\'orthographe courante (la liste de celles-ci est sur $1). L\'orthographe correcte est peut-être (ceci).',
 'mispeelingspage'       => 'Liste de fautes d\'orthographe courantes',
 
-# les 3 messages suivants ne sont plus utilisés (plus de page Special:Intl)
+# FIXME les 3 messages suivants ne sont plus utilisés (plus de page Special:Intl)
 'missinglanguagelinks'  => 'Liens inter-langues manquants',
 'missinglanguagelinksbutton'    => 'Je n\'ai pas trouvé de lien/langue pour cette page',
-'missinglanguagelinkstext'      => "Ces articles ne lient pas à leur 'contrepartie' in $1. Les redirections et les liens ne sont pas affichés.",
+'missinglanguagelinkstext'      => 'Ces articles ne lient pas à leur contrepartie sur $1. Les redirections et les liens ne sont pas affichés.',
 
 
 # Miscellaneous special pages
@@ -810,27 +727,24 @@ Parmi ceux-ci, <b>$2</b> ont le statut d\'administrateur (voir $3).',
 'spheading'     => 'Pages spéciales',
 'protectpage'   => 'Protéger la page',
 'recentchangeslinked' => 'Suivi des liens',
-'rclsub'        => "(des pages liées à \"$1\")",
+'rclsub'        => '(des pages liées à « $1 »)',
 'debug'         => 'Déboguer',
 'newpages'      => 'Nouvelles pages',
 'ancientpages'	=> 'Articles les plus anciens',
 'move'		=> 'renommer',
 'movethispage'  => 'Renommer la page',
-'unusedimagestext' => "<p>N'oubliez pas que d'autres sites, comme certains Wikipédias non francophones, peuvent contenir un lien direct vers cette image, et que celle-ci peut être placée dans cette liste alors qu'elle est en réalité utilisée.",
-'booksources'   => "Ouvrages de référence",
-'booksourcetext' => "Voici une liste de liens vers d'autres sites qui vendent des livres neufs et d'occasion et sur lesquels vous trouverez peut-être des informations sur les ouvrages que vous cherchez. {{SITENAME}} n'étant liée à aucune de ces sociétés, elle n'a aucunement l'intention d'en faire la promotion.",
+'unusedimagestext' => '<p>N\'oubliez pas que d\'autres sites, comme certains Wikipédias non francophones, peuvent contenir un lien direct vers cette image, et que celle-ci peut être placée dans cette liste alors qu\'elle est en réalité utilisée.',
+'booksources'   => 'Ouvrages de référence',
+'booksourcetext' => 'Voici une liste de liens vers d\'autres sites qui vendent des livres neufs et d\'occasion et sur lesquels vous trouverez peut-être des informations sur les ouvrages que vous cherchez. {{SITENAME}} n\'étant liée à aucune de ces sociétés, elle n\'a aucunement l\'intention d\'en faire la promotion.',
 'alphaindexline' => '$1 à $2',
 'version' => 'Version',
 
 # All pages
 #
-'allinnamespace' => "Toutes les pages (espace $1)",
-'allpagesnext' => "Suivant",
-'allpagesprev' => "Précédent",
-'allpagessubmit' => "Valider",
-'allpagesformtext1' => 'Montrer les pages à partir de : $1',
-'allpagesformtext2' => 'Choisissez l\'espace : $1 $2',
-'allpagesnamespace' => '(articles)',
+'allinnamespace' => 'Toutes les pages (espace $1)',
+'allpagesnext' => 'Suivant',
+'allpagesprev' => 'Précédent',
+'allpagessubmit' => 'Valider',
 
 # Email this user
 #
@@ -839,11 +753,11 @@ Parmi ceux-ci, <b>$2</b> ont le statut d\'administrateur (voir $3).',
 et avoir indiqué une adresse électronique valide dans vos [[Special:Preferences|préférences]]
 pour pouvoir envoyer un message à un autre utilisateur.',
 'emailuser'  => 'Envoyer un message à cet utilisateur',
-'emailpage'  => 'Email user',
-'emailpagetext' => "Si cet utilisateur a indiqué une adresse électronique valide dans ses préférences, le formulaire ci-dessous lui enverra un message.
-L'adresse électronique que vous avez indiquée dans vos préférences apparaîtra dans le champ \"Expéditeur\" de votre message, afin que le destinataire puisse vous répondre.",
+'emailpage'  => 'Envoyer un email à l\'utilisateur',
+'emailpagetext' => 'Si cet utilisateur a indiqué une adresse électronique valide dans ses préférences, le formulaire ci-dessous lui enverra un message.
+L\'adresse électronique que vous avez indiquée dans vos préférences apparaîtra dans le champ « Expéditeur » de votre message afin que le destinataire puisse vous répondre.',
 'noemailtitle' => 'Pas d\'adresse électronique',
-'noemailtext' => "Cet utilisateur n'a pas spécifié d'adresse électronique valide ou a choisi de ne pas recevoir de courrier électronique des autres utilisateurs.",
+'noemailtext' => 'Cet utilisateur n\'a pas spécifié d\'adresse électronique valide ou a choisi de ne pas recevoir de courrier électronique des autres utilisateurs.',
 
 'emailfrom'  => 'Expéditeur',
 'emailto'  => 'Destinataire',
@@ -859,59 +773,55 @@ L'adresse électronique que vous avez indiquée dans vos préférences apparaît
 #
 'watchlist'	=> 'Liste de suivi',
 'watchlistsub'	=> '(pour l\'utilisateur « $1 »)',
-'nowatchlist'	=> "Votre liste de suivi ne contient aucun article.",
-'watchnologin'	=> "Non connecté",
-'watchnologintext' => "Vous devez être [[Special:Userlogin|connecté]]
-pour modifier votre liste.",
+'nowatchlist'	=> 'Votre liste de suivi ne contient aucun article.',
+'watchnologin'	=> 'Non connecté',
+'watchnologintext' => 'Vous devez être [[Special:Userlogin|connecté]] pour modifier votre liste.',
 'addedwatch'	=> 'Ajouté à la liste',
-'addedwatchtext' => "<p>La page \"$1\" a été ajoutée à votre <a href=\"{{localurl:Special:Watchlist}}\">liste de suivi</a>.
-Les prochaines modifications de cette page et de la page discussion associée seront répertoriées ici, et la page apparaîtra <b>en gras</b> dans la <a href=\"{{localurl:Special:Recentchanges}}\">liste des modifications récentes</a> pour être repérée plus facilement.</p>
+'addedwatchtext' => 'La page « $1 » a été ajoutée à votre [[Special:Watchlist|liste de suivi]].
+Les prochaines modifications de cette page et de la page discussion associée seront répertoriées ici, et la page apparaîtra \'\'\'en gras\'\'\' dans la [[Special:Recentchanges|liste des modifications récentes]] pour être repérée plus facilement.
 
-<p>Pour supprimer cette page de votre liste de suivi, cliquez sur \"Ne plus suivre\" dans le cadre de navigation.</p>",
-'removedwatch'	=> "Supprimée de la liste de suivi",
-'removedwatchtext' => "La page « $1 » a été supprimée de votre liste de suivi.",
+Pour supprimer cette page de votre liste de suivi, cliquez sur « Ne plus suivre » dans le cadre de navigation.',
+'removedwatch'	=> 'Supprimée de la liste de suivi',
+'removedwatchtext' => 'La page « $1 » a été supprimée de votre liste de suivi.',
 'watch'		=> 'Suivre',
 'watchthispage'	=> 'Suivre cette page',
-'unwatch'	=> 'ne plus suivre',
+'unwatch'	=> 'Ne plus suivre',
 'unwatchthispage' => 'Ne plus suivre',
 'notanarticle'	=> 'Aucun article',
 'watchnochange' => "Aucune des pages que vous suivez n'a été modifiée pendant la période affichée",
-'watchdetails' => "Vous suivez $1 pages, sans compter les pages de discussion.  [$4 Afficher et modifier la liste complète].", // Looxix 
-'watchmethod-recent' => "vérification des modifications récentes des pages suivies", // Looxix 
-'watchmethod-list' => "vérification des pages suivies pour des modifications récentes", // Looxix 
-'removechecked' => "Retirer de la liste de suivi les articles sélectionnés",
-'watchlistcontains' => "Votre liste de suivi contient $1 pages",
-'watcheditlist' => "Ceci est votre liste de suivi par ordre alphabétique. Sélectionnez les pages que vous souhaitez retirer de la liste et cliquez le bouton \"retirer de la liste de suivi\" en bas de l'écran.",
-'removingchecked' => "Les articles sélectionnés sont retirés de votre liste de suivi...",
-'couldntremove' => "Impossible de retirer l'article « $1 »...",
-'iteminvalidname' => "Problème avec l'article « $1 » : le nom est invalide...",
-'wlnote' => "Ci-dessous se trouve les $1 dernières modifications depuis les <b>$2</b> dernières heures.", // Looxix 
-'wlshowlast' => "Montrer les dernières $1 heures $2 jours $3",
-'wlsaved' => "La liste de suivi n'est remise à jour qu'une fois par heure pour alléger la charge sur le serveur.",
+'watchdetails' => 'Vous suivez $1 pages, sans compter les pages de discussion.  [$4 Afficher et modifier la liste complète].',
+'watchmethod-recent' => 'vérification des modifications récentes des pages suivies',
+'watchmethod-list' => 'vérification des pages suivies pour des modifications récentes',
+'removechecked' => 'Retirer de la liste de suivi les articles sélectionnés',
+'watchlistcontains' => 'Votre liste de suivi contient $1 pages',
+'watcheditlist' => 'Ceci est votre liste de suivi par ordre alphabétique. Sélectionnez les pages que vous souhaitez retirer de la liste et cliquez le bouton « retirer de la liste de suivi » en bas de l\'écran.',
+'removingchecked' => 'Les articles sélectionnés sont retirés de votre liste de suivi...',
+'couldntremove' => 'Impossible de retirer l\'article « $1 »...',
+'iteminvalidname' => 'Problème avec l\'article « $1 » : le nom est invalide...',
+'wlnote' => 'Ci-dessous se trouvent les $1 dernières modifications depuis les <b>$2</b> dernières heures.',
+'wlshowlast' => 'Montrer les dernières $1 heures $2 jours $3',
+'wlsaved' => 'La liste de suivi n\'est remise à jour qu\'une fois par heure pour alléger la charge sur le serveur.',
 
 # Delete/protect/revert
 #
 'deletepage'	=> 'Supprimer une page',
 'confirm'	=> 'Confirmer',
-'excontent'	=> "contenant '$1'",
-'exbeforeblank' => "le contenu avant effacement était : '$1'",
+'excontent'	=> 'contenant « $1 »',
+'exbeforeblank' => 'Avant son blanchiment, cette page contenait : $1',
 'exblank'	=> 'page vide',
 'confirmdelete' => 'Confirmer la suppression',
-'deletesub'	=> '(Suppression de "$1")',
-'historywarning' => 'Attention: La page que vous êtes sur le point de supprimer à un historique: ',
-'confirmdeletetext' => "Vous êtes sur le point de supprimer définitivement de la base de données une page
-ou une image, ainsi que toutes ses versions antérieures.
-Veuillez confirmer que c'est bien là ce que vous voulez faire, que vous en comprenez les conséquences et que vous faites cela en accord avec les [[{{ns:4}}:Recommandations Et Règles à  Suivre|recommandations et règles à suivre]].",
+'deletesub'	=> '(Suppression de « $1 »)',
+'historywarning' => 'Attention : La page que vous êtes sur le point de supprimer a un historique : ',
+'confirmdeletetext' => 'Vous êtes sur le point de supprimer définitivement de la base de données une page ou une image, ainsi que toutes ses versions antérieures.
+
+Veuillez confirmer que c\'est bien là ce que vous voulez faire, que vous en comprenez les conséquences et que vous faites cela en accord avec les [[{{ns:4}}:Recommandations Et Règles à  Suivre|recommandations et règles à suivre]].',
 'actioncomplete' => 'Suppression effectuée',
-'deletedtext'	=> '"$1" a été supprimé.
+'deletedtext'	=> '« $1 » a été supprimé.
 Voir $2 pour une liste des suppressions récentes.',
-'deletedarticle' => 'effacement de "$1"',
+'deletedarticle' => 'a effacé « $1 »',
 'dellogpage'	=> 'Historique des effacements',
 'dellogpagetext' => 'Voici la liste des suppressions récentes.
-L\'heure indiquée est celle du serveur (UTC).
-<ul>
-</ul>
-',
+L\'heure indiquée est celle du serveur (UTC).',
 'deletionlog'	=> 'historique des effacements',
 'reverted'	=> 'Rétablissement de la version précédente',
 'deletecomment' => 'Motif de la suppression',
@@ -920,32 +830,30 @@ L\'heure indiquée est celle du serveur (UTC).
 'rollback_short' => 'Révoquer',
 'rollbacklink'	=> 'révoquer',
 'rollbackfailed' => 'La révocation a échoué',
-'cantrollback'	=> "Impossible de révoquer: dernier auteur est le seul à avoir modifié cet article",
-'alreadyrolled'	=> "Impossible de révoquer la dernière modification de [[$1]]
-par  [[User:$2|$2]] ([[User talk:$2|Talk]]); quelqu'un d'autre à déjà modifer ou révoquer l'article. 
+'cantrollback'	=> 'Impossible de révoquer : dernier auteur est le seul à avoir modifié cet article',
+'alreadyrolled'	=> 'Impossible de révoquer la dernière modification de « $1 » effectuée par [[User:$2|$2]] ([[User talk:$2|Talk]]); quelqu\'un d\'autre à déjà modifer ou révoquer l\'article.
 
-La dernière modificaion était de [[User:$3|$3]] ([[User talk:$3|Talk]]). ", //Looxix 
+La dernière modificaion a été effectuée par [[User:$3|$3]] ([[User talk:$3|Talk]]).', // FIXME: namespaces
 #   only shown if there is an edit comment
-'editcomment' => "Le résumé de la modification était: \"<i>$1</i>\".", //Looxix 
+'editcomment' => 'Le résumé de la modification était: <i>« $1 »</i>.',
 'revertpage'	=> 'restitution de la dernière modification de $1',
 'protectlogpage' => 'Log_de_protection',
 'protectlogtext' => "Voir les [[{{ns:4}}:Page protégée|directives concernant les pages protégées]].",
 'protectedarticle' => 'a protégé [[$1]]',
 'unprotectedarticle' => 'a déprotégé [[$1]]',
 
-'protectsub' => '(Bloque "$1")',
-'confirmprotect' => 'Confimer le bloquage',
-'confirmprotecttext' => 'Voulez vous vraiment protéger cette page ?',
+'protectsub' => '(Protéger « $1 »)',
+'confirmprotect' => 'Confimer la protection',
+'confirmprotecttext' => 'Voulez-vous réellement protéger cette page ?',
 'protectcomment' => 'Raison du bloquage',
 
-'unprotectsub' => '(Débloque "$1")',
+'unprotectsub' => '(Débloque « $1 »)',
 'confirmunprotecttext' => 'Voulez-vous réellement déprotéger cette page ?',
-'confirmunprotect' => 'Raison du débloquage',
+'confirmunprotect' => 'Raison de la déprotection',
 'unprotectcomment' => 'Raison du débloquage',
 'protectmoveonly' => 'Protéger uniquement les déplacements',
 
 
-
 # Groups
 #
 'addgroup' => 'Ajouter un groupe',
@@ -961,15 +869,16 @@ La corbeille peut être effacée périodiquement.',
 
 'undeletearticle' => 'Restaurer les articles effacés',
 'undeleterevisions' => '$1 révisions archivées',
-'undeletehistory' => "Si vous restaurez la page, toutes les révisions seront restaurées dans l'historique.
-Si une nouvelle page avec le même nom a été crée depuis la suppression,
-les révisions restaurées apparaîtront dans l'historique antérieur et la version courante ne sera pas automatiquement remplacée.",
-"undeleterevision" => "Version effacée ($1)",
+'undeletehistory' => 'Si vous restaurez la page, toutes les révisions seront restaurées dans l\'historique.
+
+Si une nouvelle page avec le même nom a été crée depuis la suppression, les révisions restaurées apparaîtront dans l\'historique antérieur et la version courante ne sera pas automatiquement remplacée.',
+'undeleterevision' => 'Version effacée ($1)',
 'undeletebtn'	=> 'Restaurer!',
-'undeletedarticle' => "restauré \"$1\"",
-'undeletedtext'   => "L'article [[$1]] a été restauré avec succès.
-Voir [[{{ns:4}}:Trace des effacements]] pour la liste des suppressions et des restaurations récentes.",
-'undeletedrevisions' => "$1 versions ont été restaurées",
+'undeletedarticle' => 'restauré « $1 »',
+'undeletedtext'   => 'L\'article [[$1]] a été restauré avec succès.
+
+Voir [[{{ns:4}}:Trace des effacements]] pour la liste des suppressions et des restaurations récentes.',
+'undeletedrevisions' => '$1 versions ont été restaurées',
 
 # Contributions
 #
@@ -977,7 +886,7 @@ Voir [[{{ns:4}}:Trace des effacements]] pour la liste des suppressions et des re
 'mycontris'	=> 'Mes contributions',
 'contribsub'	=> 'Pour $1',
 'nocontribs'	=> 'Aucune modification correspondant à ces critères n\'a été trouvée.',
-'ucnote'	=> "Voici les <b>$1</b> dernières modifications effectuées par cet utilisateur au cours des <b>$2</b> derniers jours.",
+'ucnote'	=> 'Voici les <b>$1</b> dernières modifications effectuées par cet utilisateur au cours des <b>$2</b> derniers jours.',
 'uclinks'	=> 'Afficher les $1 dernières modifications; afficher les $2 derniers jours.',
 'uctop'		=> ' (dernière)',
 
@@ -987,96 +896,82 @@ Voir [[{{ns:4}}:Trace des effacements]] pour la liste des suppressions et des re
 'notargettitle' => 'Pas de cible',
 'notargettext'	=> 'Indiquez une page cible ou un utilisateur cible.',
 'linklistsub'	=> '(Liste de liens)',
-'linkshere'	=> 'Les pages ci-dessous contiennent un lien vers celle-ci:',
+'linkshere'	=> 'Les pages ci-dessous contiennent un lien vers celle-ci :',
 'nolinkshere'	=> 'Aucune page ne contient de lien vers celle-ci.',
 'isredirect'	=> 'page de redirection',
 
 # Block/unblock IP
 #
-'blockip'	=> 'Bloquer une adresse IP',
-'blockiptext'	=> "Utilisez le formulaire ci-dessous pour bloquer l'accès en écriture à partir d'une adresse IP donnée.
+'blockip'	=> 'Bloquer une adresse IP ou un utilisateur',
+'blockiptext'	=> 'Utilisez le formulaire ci-dessous pour bloquer l\'accès en écriture à partir d\'une adresse IP donnée ou d\'un nom d\'utilisateur.
+
 Une telle mesure ne doit être prise que pour empêcher le vandalisme et en accord avec [[{{ns:4}}:Recommandations et règles à suivre|recommandations et règles à suivre]].
-Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui ont été vandalisées).",
-'ipaddress'	=> 'Adresse IP',
+Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui ont été vandalisées).',
+'ipaddress'	=> 'Adresse IP ou pseudonyme',
 'ipbreason'	=> 'Motif du blocage',
 'ipbsubmit'	=> 'Bloquer cette adresse',
 'badipaddress'	=> 'L\'adresse IP n\'est pas correcte.',
-'noblockreason' => 'Vous devez indiquer le motif du blocage.',
 'blockipsuccesssub' => 'Blocage réussi',
-'blockipsuccesstext' => "L'adresse IP \"$1\" a été bloquée.
-<br />Vous pouvez consulter sur cette [[Special:Ipblocklist|page]] la liste des adresses IP bloquées.",
+'blockipsuccesstext' => 'L\'adresse IP « $1 » a été bloquée.<br />Vous pouvez consulter sur cette [[Special:Ipblocklist|page]] la liste des adresses IP bloquées.',
 'unblockip'	=> "Débloquer une adresse IP",
 'unblockiptext' => 'Utilisez le formulaire ci-dessous pour rétablir l\'accès en écriture
 à partir d\'une adresse IP précédemment bloquée.',
 'ipusubmit'	=> 'Débloquer cette adresse',
-'ipusuccess'	=> 'Adresse IP « $1 » débloquée',
-'ipblocklist'	=> 'Liste des adresses IP bloquées',
-'blocklistline' => '$1, $2 a bloqué $3 ($4)',
+'ipusuccess'	=> 'L\'adresse IP « $1 » débloquée.',
+'ipblocklist'	=> 'Liste des blocages',
+'blocklistline' => '$1 (expire le $4): $2 a bloqué $3',
 'blocklink'	=> 'bloquer',
 'unblocklink'	=> 'débloquer',
 'contribslink'	=> 'contribs',
-'autoblocker'	=> "Autobloqué parce que vous partagez une adresse IP avec \"$1\". Raison : \"$2\".",
+'autoblocker'	=> 'Bloqué automatiquement parce que vous partagez une adresse IP avec « $1 ». Raison : « $2 ».',
 'blocklogpage'	=> 'Log de blocage',
 'blocklogentry'	=> 'blocage de « $1 »',
-'blocklogtext'	=> "Ceci est la trace des blocages et déblocages des utilisateurs. Les adresses IP automatiquement bloquées ne sont pas listées. Consultez la [[Special:Ipblocklist|liste des utilisateurs bloqués]] pour voir qui est actuellement effectivement bloqué.",
-'unblocklogentry'	=> 'déblocage de "$1"',
+'blocklogtext'	=> 'Ceci est la trace des blocages et déblocages des utilisateurs. Les adresses IP automatiquement bloquées ne sont pas listées. Consultez la [[Special:Ipblocklist|liste des utilisateurs bloqués]] pour voir qui est actuellement effectivement bloqué.',
+'unblocklogentry'	=> 'déblocage de « $1 »',
 'ipb_expiry_invalid' => 'temps d\'expiration invalide.',
-'ip_range_invalid' => "Bloc IP incorrect.\n",
+'ip_range_invalid' => 'Bloc IP incorrect.',
 'proxyblocker' => 'Bloqueur de proxy',
-'proxyblockreason' => "Votre ip a été bloquée car c'est un proxy ouvert. Merci de contacter votre fournisseur d'accès internet ou votre support technique et de l'informer de ce problème de sécurité.",
-'proxyblocksuccess' => "Terminé.\n",
+'proxyblockreason' => 'Votre ip a été bloquée car c\'est un proxy ouvert. Merci de contacter votre fournisseur d\'accès internet ou votre support technique et de l\'informer de ce problème de sécurité.',
+'proxyblocksuccess' => 'Terminé.',
 'ipbexpiry' => 'Durée du blocage',
 
 # Developer tools
 #
 'lockdb'  => 'Verrouiller la base',
 'unlockdb'  => 'Déverrouiller la base',
-'lockdbtext' => "Le verrouillage de la base de données empêchera tous les utilisateurs de modifier des pages, de sauvegarder leurs préférences, de modifier leur liste de suivi et d'effectuer toutes les autres opérations nécessitant des modifications dans la base de données.
-Veuillez confirmer que c'est bien là ce que vous voulez faire et que vous débloquerez la base dès que votre opération de maintenance sera terminée.",
-'unlockdbtext' => "Le déverrouillage de la base de données permettra à nouveau à tous les utilisateurs de modifier des pages, de mettre à jour leurs préférences et leur liste de suivi, ainsi que d'effectuer les autres opérations nécessitant des modifications dans la base de données.
-Veuillez confirmer que c'est bien là ce que vous voulez faire.",
-"lockconfirm" => "Oui, je confirme que je souhaite verrouiller la base de données.",
-"unlockconfirm" => "Oui, je confirme que je souhaite déverrouiller la base de données.",
+'lockdbtext' => 'Le verrouillage de la base de données empêchera tous les utilisateurs de modifier des pages, de sauvegarder leurs préférences, de modifier leur liste de suivi et d\'effectuer toutes les autres opérations nécessitant des modifications dans la base de données.
+Veuillez confirmer que c\'est bien là ce que vous voulez faire et que vous débloquerez la base dès que votre opération de maintenance sera terminée.',
+'unlockdbtext' => 'Le déverrouillage de la base de données permettra à nouveau à tous les utilisateurs de modifier des pages, de mettre à jour leurs préférences et leur liste de suivi, ainsi que d\'effectuer les autres opérations nécessitant des modifications dans la base de données.
+
+Veuillez confirmer que c\'est bien là ce que vous voulez faire.',
+'lockconfirm' => 'Oui, je confirme que je souhaite verrouiller la base de données.',
+'unlockconfirm' => 'Oui, je confirme que je souhaite déverrouiller la base de données.',
 
 'lockbtn'  => 'Verrouiller la base',
 'unlockbtn'  => 'Déverrouiller la base',
 'locknoconfirm' => 'Vous n\'avez pas coché la case de confirmation.',
 'lockdbsuccesssub' => 'Verrouillage de la base réussi.',
 'unlockdbsuccesssub' => 'Base déverrouillée.',
-"lockdbsuccesstext" => "La base de données de {{SITENAME}} est verrouillée.
+'lockdbsuccesstext' => 'La base de données de {{SITENAME}} est verrouillée.
 
-<br />N'oubliez pas de la déverrouiller lorsque vous aurez terminé votre opération de maintenance.",
+N\'oubliez pas de la déverrouiller lorsque vous aurez terminé votre opération de maintenance.',
 'unlockdbsuccesstext' => 'La base de données de {{SITENAME}} est déverrouillée.',
 
-# Special:AskSQL
-#
-'asksql'	=> 'Requête SQL',
-'asksqlpheading' => 'Onglet requête SQL',
-'asksqltext'	=> "Utilisez le formulaire ci-dessous pour faire une requête directe sur la base de données de {{SITENAME}}.
-Utilisez des guillemets simples ('comme ceci') pour délimiter les chaînes de caractères.
-Cette opération peut surcharger considérablement le serveur, faites en usage
-avec modération.",
-'sqlislogged'	=> "Veillez noter que toutes les requêtes sont loguées",
-'sqlquery'	 => 'Saisir la requête',
-'querybtn'	=> 'Envoyer la requête',
-'selectonly'	=> "Les requêtes autres que \"SELECT\" sont réservées aux développeurs du wiki.",
-'querysuccessful' => 'Requête réussie',
-
 # Special:Makesysop
 'bureaucratlog'		=> 'Log_bureaucrate',
-'bureaucratlogentry'	=> 'Droits de l\'utilisateur « $1 » passés à « $2 »',
+'bureaucratlogentry'	=> 'Droits de l\'utilisateur « $1 » mis à « $2 »',
 'makesysoptitle'	=> 'Donne les droits d\'adminitrateur.',
 'makesysoptext'		=> 'Ce formulaire est utilisé par les bureaucrates pour donner les droits d\'administrateur.
 Tapez le nom de l\'utilisateur dans la boite et pressez le bouton pour lui donner les droits.',
 'makesysopname'		=> 'Nom de l\'utilisateur:',
 'makesysopsubmit'	=> 'Donner les droits d\'adminitrateur à cet utilisateur',
-'makesysopok'		=> "<b>L'utilisateur \"$1\" est maintenant administrateur</b>",
-'makesysopfail'		=> "<b>L'utilisateur \"$1\" n'a pas pu recevoir les droits d'adminitrateurs. (Avez vous entré le nom correctement?)</b>",
+'makesysopok'		=> '<b>L\'utilisateur « $1 » est désormais administrateur.</b>',
+'makesysopfail'		=> '<b>L\'utilisateur « $1 » n\'a pas pu recevoir les droits d\'adminitrateurs. (Avez vous entré le nom correctement?)</b>',
 'rights'			=> 'Droits:',
-'set_user_rights'	=> "Met les droits de l'utilisateur",
-'user_rights_set'	=> "<b>Les droits de l'utilisateur \"$1\" sont mis à jour</b>",
-'setbureaucratflag'	=> "Donne les droits bureaucrate",
-'set_rights_fail'	=> "<b>Les droits de l'utilisateur \"$1\" n'ont pas pu être mis en place. (Avez vous entré le nom correctement?)</b>",
+'set_user_rights'	=> 'Met les droits de l\'utilisateur',
+'user_rights_set'	=> '<b>Les droits de l\'utilisateur « $1 » sont mis à jour</b>',
+'setbureaucratflag'	=> 'Ajouter le statut de bureaucrate',
+'set_rights_fail'	=> '<b>Les droits de l\'utilisateur « $1 » n\'ont pas pu être mis en place. (Avez vous entré le nom correctement?)</b>',
 'makesysop'         => 'Donner les droits d\'adminitrateur à un utilisateur',
 
 # Special:Validate
@@ -1102,7 +997,7 @@ Tapez le nom de l\'utilisateur dans la boite et pressez le bouton pour lui donne
 'val_validate_article_namespace_only' => 'Seul les articles peuvent être validés. Cette page n\'est <i>pas</i> un article.',
 'val_validated' => 'Validation effectuée.',
 'val_validate_version' => 'Valider cette version',
-'val_version_of' => "Version de $1" ,
+'val_version_of' => 'Version de $1' ,
 'val_version' => 'Version',
 'val_view_version' => 'Voir cette version',
 'val_yes' => 'Oui',
@@ -1110,9 +1005,9 @@ Tapez le nom de l\'utilisateur dans la boite et pressez le bouton pour lui donne
 
 # Spam
 #
-'spamprotectionmatch' => "Le texte suivant a déclenché le détecteur de spam: $1",
-'spamprotectiontext' => "Page automatiquement protégée pour cause de spam",
-'spamprotectiontitle' => "Page automatiquement protégée pour cause de spam",
+'spamprotectionmatch' => 'Le texte suivant a déclenché le détecteur de spam: $1',
+'spamprotectiontext' => 'Page automatiquement protégée pour cause de spam',
+'spamprotectiontitle' => 'Page automatiquement protégée pour cause de spam',
 
 # Patrolling
 #
@@ -1120,40 +1015,36 @@ Tapez le nom de l\'utilisateur dans la boite et pressez le bouton pour lui donne
 'markaspatrolledtext' => 'Marquer cet article comme vérifié',
 'markedaspatrolled' => 'Marqué comme vérifié',
 'markedaspatrolledtext' => 'La version sélectionnée a été marquée comme vérifiée.',
-'rcpatroldisabledtext' => "La fonctionnalité de surveillance des modifications récentes n'est pas activée.",
+'rcpatroldisabledtext' => 'La fonctionnalité de surveillance des modifications récentes n\'est pas activée.',
 
 # Move page
 #
 'movepage'  => 'Renommer un article',
-"movepagetext" => "Utilisez le formulaire ci-dessous pour renommer un article, en déplaçant toutes ses versions antérieures vers le nouveau nom.
-Le titre précédent deviendra une page de redirection vers le nouveau titre.
-Les liens vers l'ancien titre ne seront pas modifiés et la page discussion, si elle existe, ne sera pas déplacée.
-
-'''ATTENTION!'''
-Il peut s'agir d'un changement radical et inattendu pour un article souvent consulté;
-assurez-vous que vous en comprenez bien les conséquences avant de procéder.",
-"movepagetalktext" => "La page de discussion associée, si présente, sera automatiquement renommée avec '''sauf si:'''
+'movepagetext' => 'Utilisez le formulaire ci-dessous pour renommer un article, en déplaçant toutes ses versions antérieures vers le nouveau nom.
+
+Le titre précédent deviendra une page de redirection vers le nouveau titre. Les liens vers l\'ancien titre ne seront pas modifiés et la page discussion, si elle existe, ne sera pas déplacée.
+
+\'\'\'ATTENTION!\'\'\'
+Il peut s\'agir d\'un changement radical et inattendu pour un article souvent consulté; assurez-vous que vous en comprenez bien les conséquences avant de procéder.',
+'movepagetalktext' => 'La page de discussion associée, si présente, sera automatiquement renommée avec \'\'\'sauf si:\'\'\'
 *Vous renommez une page vers un autre espace,
 *Une page de discussion existe déjà avec le nouveau nom, ou
 *Vous avez désélectionné le bouton ci-dessous.
 
-Dans ce cas, vous devrez renommer ou fusionner la page manuellement si vous le désirez.",
+Dans ce cas, vous devrez renommer ou fusionner la page manuellement si vous le désirez.',
 
 'movearticle'	=> 'Déplacer l\'article',
 'movenologin'	=> 'Non connecté',
-'movenologintext' => "Pour pouvoir renommer un article, vous devez être [[Special:Userlogin|connecté]] en tant qu'utilisateur enregistré.",
-'newtitle'	=> "Nouveau titre",
-'movepagebtn'	=> "Renommer l'article",
-'pagemovedsub' => "Déplacement réussi",
-'pagemovedtext' => "L'article \"[[$1]]\" a été déplacé vers \"[[$2]]\".",
-'articleexists' => "Il existe déjà un article portant ce titre, ou le titre que vous avez choisi n'est pas valide.
-Veuillez en choisir un autre.",
-'talkexists'	=> "La page elle-même a été déplacée avec succès, mais
-la page de discussion n'a pas pu être déplacée car il en existait déjà une
-sous le nouveau nom. S'il vous plait, fusionnez les manuellement.",
-'1movedto2_redir' => "$1 déplacé vers $2 (redirect)",
+'movenologintext' => 'Pour pouvoir renommer un article, vous devez être [[Special:Userlogin|connecté]] en tant qu\'utilisateur enregistré.',
+'newtitle'	=> 'Nouveau titre',
+'movepagebtn'	=> 'Renommer l\'article',
+'pagemovedsub' => 'Déplacement réussi',
+'pagemovedtext' => 'L\'article « [[$1]] » a été déplacé vers « [[$2]] ».',
+'articleexists' => 'Il existe déjà un article portant ce titre, ou le titre que vous avez choisi n\'est pas valide. Veuillez en choisir un autre.',
+'talkexists'	=> 'La page elle-même a été déplacée avec succès, mais la page de discussion n\'a pas pu être déplacée car il en existait déjà une sous le nouveau nom. S\'il vous plait, fusionnez les manuellement.',
+'1movedto2_redir' => '$1 déplacé vers $2 (redirect)',
 'movedto'  => 'renommé en',
-'movetalk'  => 'Renommer aussi la page "discussion", s\'il y a lieu.',
+'movetalk'  => 'Renommer aussi la page « discussion », s\'il y a lieu.',
 'talkpagemoved' => 'La page discussion correspondante a également été déplacée.',
 'talkpagenotmoved' => 'La page discussion correspondante n\'a <strong>pas</strong> été déplacée.',
 '1movedto2' => '$1 déplacé vers $2',
@@ -1162,8 +1053,8 @@ sous le nouveau nom. S'il vous plait, fusionnez les manuellement.",
 
 # Export page
 'export'	=> 'Exporter des pages',
-'exporttext'	=> "Vous pouvez exporter en XML le texte et l'historique d'une page ou d'un ensemble de pages; le résultat peut alores être importé dans un autre wiki fonctionnant avec le logiciel MediaWiki, transformé ou sauvegardé pour votre usage personnel.",
-'exportcuronly'	=> "Exporter uniquement la version courante sans l'historique",
+'exporttext'	=> 'Vous pouvez exporter en XML le texte et l\'historique d\'une page ou d\'un ensemble de pages; le résultat peut alores être importé dans un autre wiki fonctionnant avec le logiciel MediaWiki, transformé ou sauvegardé pour votre usage personnel.',
+'exportcuronly'	=> 'Exporter uniquement la version courante sans l\'historique',
 
 # Namespace 8 related
 
@@ -1173,109 +1064,39 @@ sous le nouveau nom. S'il vous plait, fusionnez les manuellement.",
 # Thumbnails
 
 'thumbnail-more'	=> 'Agrandir',
-'missingimage'		=> "<b>Image manquante</b><br /><i>$1</i>\n",
+'missingimage'		=> '<b>Image manquante</b><br /><i>$1</i>',
 
 # Special:Import
 'import'	=> 'Importer des pages',
-'importfailed'	=> 'L\'import a échoué: $1',
-'importhistoryconflict' => 'Des révisions dans l\'historique existent et sont en conflits (cette page à peut être déjà été importée avant)',
+'importfailed'	=> 'Échec de l\'import : $1',
+'importhistoryconflict' => 'Il y a un conflit dans l\'historique des versions (cette page à peut être déjà été importée avant)',
 'importnotext'	=> 'Vide ou sans texte',
-'importsuccess'	=> 'L\'import à réussi!',
+'importsuccess'	=> 'L\'import a réussi !',
 'importtext'	=> 'Exportez un fichier depuis le wiki source en utilisant la fonction Special:Export, sauvez la page sur votre disque puis envoyez là ici.',
 
 # Keyboard access keys for power users
-'accesskey-anontalk'		=> 'n',
-'accesskey-anonuserpage'	=> '.',
-'accesskey-article'			=> 'a',
 'accesskey-compareselectedversions' => 'v',
-'accesskey-contributions'	=> '',
-'accesskey-currentevents'	=> '',
-'accesskey-delete'			=> 'd',
-'accesskey-edit'			=> 'e',
-'accesskey-emailuser'		=> '',
-'accesskey-help'			=> '',
-'accesskey-history'			=> 'h',
-'accesskey-login'			=> 'o',
-'accesskey-logout'			=> 'o',
-'accesskey-mainpage'		=> 'z',
 'accesskey-minoredit'		=> 'i',
-'accesskey-move'			=> 'm',
-'accesskey-mycontris'		=> 'y',
-'accesskey-mytalk'			=> 'n',
-'accesskey-portal'			=> '',
 'accesskey-preferences'		=> '',
 'accesskey-preview'			=> 'p',
-'accesskey-protect'			=> '-',
-'accesskey-randompage'		=> 'x',
-'accesskey-recentchanges'	=> 'r',
-'accesskey-recentchangeslinked' => 'c',
 'accesskey-save'			=> 's',
 'accesskey-search'			=> 'f',
-'accesskey-sitesupport'		=> '',
-'accesskey-specialpage'		=> '',
-'accesskey-specialpages'	=> 'q',
-'accesskey-talk'			=> 't',
-'accesskey-undelete'		=> 'd',
-'accesskey-unwatch'			=> 'w',
-'accesskey-upload'			=> 'u',
-'accesskey-userpage'		=> '.',
-'accesskey-viewsource'		=> 'e',
-'accesskey-watch'			=> 'w',
-'accesskey-watchlist'		=> 'l',
-'accesskey-whatlinkshere'	=> 'b',
 
 # tooltip help for the main actions
-'tooltip-anontalk' => 'Discussion des éditions faites à partir de cette adresse ip [alt-n]',
-'tooltip-anonuserpage' => 'La page d\'utilisateur pour l\'adresse ip depuis laquelle vous éditez [alt-.]',
-'tooltip-article' => 'Voir l\'article [alt-a]',
-'tooltip-atom' => 'Flux Atom pour cette page',
 'tooltip-compareselectedversions' => 'Voir les différences entre les deux versions séléctionnées de cette page. [alt-v]',
-'tooltip-contributions' => 'Voir la liste des contributions de cet utilisateur',
-'tooltip-currentevents' => 'Trouver des informations sur les évenements actuels',
-'tooltip-delete' => 'Supprimer cette page [alt-d]',
-'tooltip-edit' => 'Vous pouvez éditer cette page. Merci d\'utiliser le bouton prévisualisation avant d\'enregistrer. [alt-e]',
-'tooltip-emailuser' => 'Envoyer un mail à cet utilisateur',
-'tooltip-help' => 'L\'endroit pour découvrir.',
-'tooltip-history' => 'Versions précédentes de cette page, [alt-h]',
-'tooltip-login' => 'Vous êtes encouragés à vous identifier avant d\'éditer, ce n\'est toutefois pas nécessaire.',
-'tooltip-logout' => 'Le bouton démarrer [alt-o]',
-'tooltip-mainpage' => 'Aller à la page principale',
 'tooltip-minoredit' => 'Marquer cette modification comme mineur [alt-i]',
-'tooltip-move' => 'Déplacer cette page [alt-m]',
-'tooltip-mycontris' => 'Liste de mes contributions',
-'tooltip-mytalk' => 'Ma page de discussion',
-'tooltip-portal' => 'A propos de ce projet, ce que vous pouvez faire, où trouver les choses',
-'tooltip-preferences' => 'Mes préférences',
-'tooltip-preview' => 'Prévisualiser les changements, merci de l\'utiliser avant de sauvegarder! [alt-p]',
-'tooltip-protect' => 'Protéger cette page [alt-"-"]',
-'tooltip-randompage' => 'Aller à une page au hasard [alt-x]',
-'tooltip-recentchanges' => 'La liste des modifications récentes dans le wiki. [alt-r]',
-'tooltip-recentchangeslinked' => 'Modifications récentes des pages liant à cette page [alt-c]',
-'tooltip-rss' => 'Flux RSS pour cette page',
 'tooltip-save' => 'Sauvegarder vos modifications [alt-s]',
 'tooltip-search' => 'Rechercher dans ce wiki',
-'tooltip-sitesupport' => 'Aider {{SITENAME}}',
-'tooltip-specialpage' => 'Ceci est une page spéciale, vous ne pouvez pas l\'éditer.',
-'tooltip-specialpages' => 'Liste de toutes les pages spéciales',
-'tooltip-talk' => 'Discussion sur l\'article [alt-t]',
-'tooltip-undelete' => 'Restaurer $1 éditions supprimées de cette page [alt-d]',
-'tooltip-unwatch' => 'Retirer cette page de votre liste de suivi',
-'tooltip-upload' => 'Copier sur le serveur des fichiers [alt-u]',
-'tooltip-userpage' => 'Ma page personelle',
-'tooltip-viewsource' => 'Cette page est protégée. Vous pouvez voir la source. [alt-e]',
-'tooltip-watch' => 'Ajouter cette page à votre liste de suivi',
-'tooltip-watchlist' => 'La liste de suivi est la liste des pages que vous monitorez. [alt-l]',
-'tooltip-whatlinkshere' => 'Liste de toutes les pages qui lient à ici [alt-b]',
 
 # Metadata
-'nocreativecommons' => "Les données méta 'Creative Commons RDF' sont désactivées sur ce serveur.",
-'nodublincore' => "Les données méta 'Dublin Core RDF' sont désactivées sur ce serveur.",
-'notacceptable' => "Ce serveur wiki ne peut pas fournir les données dans un format que votre client est capable de lire.",
+'nocreativecommons' => 'Les données méta « Creative Commons RDF » sont désactivées sur ce serveur.',
+'nodublincore' => 'Les données méta « Dublin Core RDF » sont désactivées sur ce serveur.',
+'notacceptable' => 'Ce serveur wiki ne peut pas fournir les données dans un format que votre client est capable de lire.',
 
 # Attribution
 'anonymous'	=> 'Utilisateur(s) anonyme(s) de {{SITENAME}}',
 'siteuser'	=> 'Utilisateur $1 de {{SITENAME}}',
-'lastmodifiedby' => "Cette page a été modifiée pour la dernière fois le $1 par $2",
+'lastmodifiedby' => 'Cette page a été modifiée pour la dernière fois le $1 par $2',
 'and'	=> 'et',
 'contributions' => 'Basé sur le travail de $1.',
 'siteusers'	=> 'Utilisateur(s) $1 de {{SITENAME}}',
@@ -1292,9 +1113,9 @@ sous le nouveau nom. S'il vous plait, fusionnez les manuellement.",
 'confirmemail_loggedin' => 'Votre adresse est maintenant confirmée',
 'confirmemail_error' => 'Un problème est survenu en voulant enregistrer votre confirmation',
 'confirmemail_subject' => '{{SITENAME}} email address confirmation',
-'confirmemail_body' => 'Quelqu\'un, probablement vous avec l\'adresse email $1, a enregistré un compte "$2" avec cette email sur le site {{SITENAME}}.
+'confirmemail_body' => 'Quelqu\'un, probablement vous avec l\'adresse email $1, a enregistré un compte « $2 » avec cette email sur le site {{SITENAME}}.
 
-Pour confirmer que ce compte vous appartiens vraiment et activer les fonctionalités de messagerie sur {{SITENAME}}, veuillez ouvrir le lien ci dessous dans votre navigateur :
+Pour confirmer que ce compte vous appartient vraiment et activer les fonctions de messagerie sur {{SITENAME}}, veuillez suivre le lien ci dessous dans votre navigateur :
 
 $3
 
@@ -1302,18 +1123,18 @@ Si il ne s\'agit pas de vous, n\'ouvrez pas le lien. Ce code de confirmation exp
 
 
 # Math
-'mw_math_png' => "Toujours produire une image PNG",  
-'mw_math_simple' => "HTML si très simple, autrement PNG", 
-'mw_math_html' => "HTML si possible, autrement PNG", 
-'mw_math_source' => "Laisser le code TeX original",
-'mw_math_modern' => "Pour les navigateurs modernes",
+'mw_math_html' => 'HTML si possible, autrement PNG',
 'mw_math_mathml' => 'MathML',
+'mw_math_modern' => 'Pour les navigateurs modernes',
+'mw_math_png' => 'Toujours produire une image PNG',
+'mw_math_simple' => 'HTML si très simple, autrement PNG',
+'mw_math_source' => 'Laisser le code TeX original',
 
 
 'usercssjsyoucanpreview' => "'''Astuce :''' utilisez le bouton '''Prévisualisation''' pour tester votre nouvelle feuille css/js avant de l'enregistrer.",
 'usercsspreview' => "'''Rappelez-vous que vous êtes en train de prévisualiser votre propre feuille css et qu'elle n'a pas encore été enregistrée !'''",
 'userjspreview' => "'''Rappelez-vous que vous êtes en train de visualiser ou de tester votre code javascript et qu'il n'a pas encore été enregistré !'''",
-'validate' => "Valider la page",
+'validate' => 'Valider la page',
 
 # EXIF
 'exif-imagewidth' => 'Largeur',
@@ -1326,7 +1147,7 @@ Si il ne s\'agit pas de vous, n\'ouvrez pas le lien. Ce code de confirmation exp
 'exif-jpeginterchangeformatlength' => 'Taille en octet des données JPEG',
 'exif-transferfunction' => 'Fonction de transfert',
 'exif-datetime' => 'Date et heure de changement du fichier',
-'exif-imagedescription' => 'Titre de l\image',
+'exif-imagedescription' => 'Titre de l\'image',
 'exif-make' => 'Fabricant de l\'appareil',
 'exif-model' => 'Modèle de l\'appareil',
 'exif-software' => 'Logiciel utilisé',
@@ -1348,12 +1169,9 @@ Si il ne s\'agit pas de vous, n\'ouvrez pas le lien. Ce code de confirmation exp
 'exif-orientation-6' => 'Tournée de 90° à droite',
 'exif-orientation-7' => 'Tournée de 90° à droite et inversée verticalement',
 'exif-orientation-8' => 'Tournée de 90° à gauche',
-'exif-resolutionunit-2' => 'pouces',
-'exif-resolutionunit-3' => 'centimètres',
 'exif-componentsconfiguration-0' => 'n\'existe pas',
 
 
-
 // exifgps:
 
 );
@@ -1370,16 +1188,15 @@ class LanguageFr extends LanguageUtf8 {
 		return $wgNamespaceNamesFr;
 	}
 
-
 	function getNsIndex( $text ) {
 		global $wgNamespaceNamesFr, $wgSitename;
 
 		foreach ( $wgNamespaceNamesFr as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
-		if( $wgSitename == "Wikipédia" ) {
-			if( 0 == strcasecmp( "Wikipedia", $text ) ) return 4;
-			if( 0 == strcasecmp( "Discussion_Wikipedia", $text ) ) return 5;
+		if( $wgSitename == 'Wikipédia' ) {
+			if( 0 == strcasecmp( 'Wikipedia', $text ) ) return 4;
+			if( 0 == strcasecmp( 'Discussion_Wikipedia', $text ) ) return 5;
 		}
 		return false;
 	}
@@ -1394,51 +1211,29 @@ class LanguageFr extends LanguageUtf8 {
 		return $wgSkinNamesFr;
 	}
 
-
-	// Inherit userAdjust()
-
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
-		$d = (0 + substr( $ts, 6, 2 )) . " " .
+		$d = (0 + substr( $ts, 6, 2 )) . ' ' .
 		  $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-		  " " . substr( $ts, 0, 4 );
+		  ' ' . substr( $ts, 0, 4 );
 		return $d;
 	}
 
 	function timeanddate( $ts, $adj = false ) {
-		return $this->date( $ts, $adj ) . " à " . $this->time( $ts, $adj );
+		return $this->date( $ts, $adj ) . ' à ' . $this->time( $ts, $adj );
 	}
 
 	var $digitTransTable = array(
 		',' => "\xc2\xa0", // @bug 2749
 		'.' => ','
 	);
-	
+
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, $this->digitTransTable ) : $number;
 	}
 
-	function isRTL() {
-		return false;
-	}
-
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesFr;
-		return $wgValidSpecialPagesFr;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesFr;
-		return $wgSysopSpecialPagesFr;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesFr;
-		return $wgDeveloperSpecialPagesFr;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesFr, $wgAllMessagesEn;
 		if( isset( $wgAllMessagesFr[$key] ) ) {
@@ -1447,7 +1242,7 @@ class LanguageFr extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 }
 
 ?>
diff --git a/languages/LanguageFur.php b/languages/LanguageFur.php
index 04fe2d212098..4553d15255f8 100644
--- a/languages/LanguageFur.php
+++ b/languages/LanguageFur.php
@@ -12,7 +12,7 @@ require_once( 'LanguageUtf8.php' );
 	NS_MAIN				=> '',
 	NS_TALK				=> 'Discussion',
 	NS_USER				=> 'Utent',
-	NS_USER_TALK			=> 'Discussion_utent',        
+	NS_USER_TALK			=> 'Discussion_utent',
 	NS_PROJECT			=> $wgMetaNamespace,
 	NS_PROJECT_TALK			=> 'Discussion_'.$wgMetaNamespace,
 	NS_IMAGE			=> 'Figure',
@@ -27,97 +27,80 @@ require_once( 'LanguageUtf8.php' );
 	NS_CATEGORY_TALK		=> 'Discussion_categorie'
 ) + $wgNamespaceNamesEn;
 
+
+
 /* private */ $wgQuickbarSettingsFur = array(
-	'Nissune', 'Fis a Çampe', 'Fis a Drete', 'Flutant a çampe'
+	'Nissune', 'Fis a Çampe', 'Fis a Drete', 'Flutuant a çampe'
 );
 
 /* private */ $wgSkinNamesFur = array(
 	'nostalgia'		=> 'Nostalgie',
 ) + $wgSkinNamesEn;
 
-// will make them not show up on the "Special Pages" page, which
-// is the right thing for some of them (such as the "targeted" ones).
-
-/* private */ $wgValidSpecialPagesFur = array(
-	'Userlogin'     => '',
-	'Userlogout'    => '',
-	'Preferences'   => 'Preferencis',
-	'Watchlist'     => 'Tignûts di voli',
-	'Recentchanges' => 'Ultins cambiaments',
-	'Upload'        => 'Cjame sù un file',
-	'Imagelist'     => 'Liste des figuris',
-	'Listusers'     => 'Liste dai utents',
-	'Statistics'    => 'Statistichis',
-	'Randompage'    => 'Une pagjine a câs',
-
-	'Lonelypages'   => 'Pagjinis solitaris',
-	'Unusedimages'  => 'Figuris no dopradis',
-	'Popularpages'  => 'Lis plui popolârs',
-	'Wantedpages'   => 'Lis plui desideradis',
-	'Shortpages'    => 'Articui curts',
-	'Longpages'     => 'Articui luncs',
-	'Newpages'      => 'Pagjinis gnovis',
-	'Ancientpages'	=> 'Pagjinis vieris',
-	'Allpages'      => 'Ducj i articui',
-
-	'Ipblocklist'   => 'Recapits IP blocâts',
-	'Maintenance'   => 'Pagjine di manutenzion',
-	'Specialpages'  => '', // ces pages doivent rester vides !
-	'Contributions' => '',
-	'Emailuser'     => '',
-	'Whatlinkshere' => '',
-	'Recentchangeslinked' => '',
-	'Movepage'      => '',
-	'Booksources'   => 'Libreriis in linee',
-	'Categories'	=> 'Pagjine des categoriis',
-	'Export'	=> 'Espuartâ in XML',
-	'Version'	=> 'Version',
-	'Allmessages'	=> 'Ducj i messaç di sistem'
-);
-
-/* private */ $wgSysopSpecialPagesFur = array(
-	'Blockip'       => 'Bloche un recapit IP',
-	'Asksql'        => 'Acès SQL',
-	'Makesysop'		=> 'Dâ i dirits di aministradôr',
-                                               
-	'Undelete'      => 'Recupere lis pagjinis eliminadis',
-	'Import'		=> 'Impuarte une pagjine cul storic'
-);
-
-/* private */ $wgDeveloperSpecialPagesFur = array(
-	'Lockdb'        => 'Bloche la base di dâts',
-	'Unlockdb'      => 'Gjave il bloc ae base di dâts',
-);
-
 $wgAllMessagesFur = array(
+'1movedto2'		=> "$1 movût in $2",
 'about' => "Informazions",
-'aboutsite' => "Informazions su la {{SITENAME}}",
+'aboutsite' => "Informazions su {{SITENAME}}",
+'addedwatch'		=> "Zontât aes pagjinis tignudis di voli",
+'addedwatchtext'	=> "La pagjine \"$1\" e je stade zontade ae [[Special:Watchlist|liste di chês tignudis di voli]].
+Tal futûr i cambiaments a cheste pagjine e ae pagjine di discussion relative a saran segnalâts ca,
+e la pagjine e sarà '''gruessute''' te [[Special:Recentchanges|liste dai ultins cambiaments]] cussì che tu puedis notâle daurman.
+
+<p>Se tu vuelis gjavâle de liste pi indevant, frache su \"No stâ tignî di voli\" te sbare in alt.",
+
+'administrators' => "Project:Aministradôrs",
 'allarticles' => "Ducj i articui",
-'allmessages' => "Ducj i messaç di sistem",
+'allinnamespace'	=> "Dutis lis pagjinis (non dal spazi $1)",
+'allmessages' => "Ducj i messaçs di sisteme",
 'allmessagescurrent' => "Test curint",
 'allmessagesdefault' => "Test predeterminât",
 'allmessagesname' => "Non",
+'allmessagestext'	=> "Cheste e je une liste dai messaçs di sisteme disponibii tal non dal spazi MediaWiki:",
+'allnonarticles'	=> "Ducj i no-articui",
+'allnotinnamespace'	=> "Dutis lis pagjinis (no tal non dal spazi $1)",
 'allpages' => "Dutis lis pagjinis",
+'allpagesfrom'		=> "Mostre pagjinis scomençant di:",
+'allpagesnext'		=> "Prossim",
+'allpagesprev'		=> "Precedent",
 'allpagessubmit' => "Va",
+'and' => 'e',
+'anontalk'		=> 'Discussion par chest IP',
+'anonymous' => 'Utent(s) anonim(s) di {{SITENAME}}',
 'apr' => "Avr",
 'april' => "Avrîl",
-'articlenamespace' => "(articui)",
+'articleexists' => 'Une pagjine cun chest non e esist za, o il non sielt nol è valit.
+Sielç par plasê un altri non.',
 'aug' => "Avo",
 'august' => "Avost",
+'badfilename'	=> 'File non gambiât in "$1".',
+'badretype'		=> "Lis peraulis clâfs inseridis no son compagnis.",
+'blockedtitle'	=> 'Utent blocât',
 'blocklink' => "bloche",
+'bold_sample'=>'Test in gruessut',
+'bold_tip'=>'Test in gruessut',
+'byname'		=> 'par non',
+'bydate'		=> 'par date',
+'bysize'		=> 'par dimension',
 'cancel' => "Scancele",
 'categories' => "Categoriis",
+'categoriespagetext' => 'Te wiki a esistin lis categoriis ca sot.',
 'category' => "categorie",
 'category_header' => "Articui inte categorie \"$1\"",
 'categoryarticlecount' => "In cheste categorie tu puedis cjatâ $1 articui.",
 'categoryarticlecount1' => "In cheste categorie tu puedis cjatâ $1 articul.",
+'changepassword' => 'Gambie peraule clâf',
+'changes' => 'cambiaments',
+'compareselectedversions' => 'Confronte versions selezionadis',
 'confirm' => "Conferme",
 'confirmdelete' => "Conferme eliminazion",
 'confirmprotect' => "Conferme protezion",
 'confirmprotecttext' => "Vuelistu pardabon protezi cheste pagjine?",
 'confirmunprotect' => "Conferme par gjavâ la protezion",
 'confirmunprotecttext' => "Vuelistu pardabon gjavâ la protezion a cheste pagjine?",
+'contextlines'	=> 'Riis par risultât',
 'contributions' => "Contribûts dal utent",
+'contribsub'    => "Par $1",
+'contribs-showhideminor' => '$1 piçulis modifichis',
 'copyright' => "Il contignût al è disponibil sot de $1",
 'copyrightwarning' => "<!-- Perché i link non abbiano l'aspetto di link esterni: -->
 <div class=\"plainlinks\">
@@ -135,102 +118,298 @@ $wgAllMessagesFur = array(
 
 </div>",
 'createaccount' => "Cree une gnove identitât",
+'createarticle' => "Cree articul",
+'creditspage' => 'Pagjine dai ricognossiments',
+'cur' => "cor",
 'currentevents' => "Lis gnovis",
+'data'	=> 'Dâts',
+'dateformat'		=> 'Formât de date',
+'deadendpages'  => 'Pagjinis cence usite',
 'dec' => "Dic",
 'december' => "Dicembar",
+'default' => "predeterminât",
 'delete' => "Elimine",
+'delete_and_move' => 'Elimine e môf',
+'deletecomment'	=> 'Reson pe eliminazion',
+'deletedarticle' => "eliminât \"$1\"",
+'deletedtext'	=> "\"$1\" al è stât eliminât.
+Cjale $2 par une liste des ultimis eliminazions.",
+'deleteimg' => "eli",
+'deletepage' => "Elimine pagjine",
+'deletesub' => "(Eliminant \"$1\")",
 'deletethispage' => "Elimine cheste pagjine",
+'deletionlog'	=> 'regjistri eliminazions',
+'dellogpage'	=> 'Regjistri des eliminazions',
+'destfilename' => 'Non dal file di destinazion',
+'diff' => "difarencis",
+'difference' => "(Difarence jenfri des revisions)",
+'disambiguations'	=> 'Pagjinis di disambiguazion',
+'disambiguationspage'	=> 'Template:disambig',
+'disclaimers' => "Avîs legâi",
+'doubleredirects'	=> 'Reindirizaments doplis',
+'edit-externally' => 'Modifiche chest file cuntune aplicazion esterne',
+'edit-externally-help' => 'Cjale [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] par altris informazions.',
 'edit' => "Modifiche",
-'editing' => "Modifiche di $1",
+'editcurrent'	=> 'Modifiche la version corinte di cheste pagjine',
+'editing' => "Modificant $1",
+'edithelp'		=> "Jutori pe modifiche",
+'edithelppage'	=> "Jutori:Modifiche",
+'editingsection' => "Modificant $1 (sezion)",
 'editsection' => "modifiche",
 'editthispage' => "Modifiche cheste pagjine",
+'emailflag'		=> 'No vueli email da altris utents',
+'emailmessage' => "Messaç",
 'emailuser' => "Messaç di pueste a chest utent",
 'error' => "Erôr",
 'errorpagetitle' => "Erôr",
+'exbeforeblank' => "il contignût prime di disvuedâ al jere: '$1'",
+'exblank' => 'pagjine vueide',
+'excontent' => "il contignût al jere: '$1'",
+'excontentauthor' => "il contignût al jere: '$1' (e al veve contribuît dome '$2')",
+'export' => "Espuarte pagjinis",
+'exportcuronly'	=> 'Inclût dome la revision corinte, no dut il storic',
 'feb' => "Fev",
 'february' => "Fevrâr",
 'filedesc' => "Descrizion",
+'fileinfo' => '$1KB, gjenar MIME: <code>$2</code>',
+'filemissing' => "File mancjant",
 'filename' => "Non dal file",
+'filenotfound' => "No si pues cjatâ il file \"$1\".",
+'filesource' => 'Surzint',
+'filestatus' => 'Stât dal copyright',
 'friday' => "Vinars",
 'go' => "Va",
+'googlesearch' => "
+<div style=\"margin-left: 2em\">
+
+<!-- Google search -->
+<div style=\"width:130px;float:left;text-align:center;position:relative;top:-8px\"><a href=\"http://www.google.com/\" style=\"padding:0;background-image:none\"><img src=\"http://www.google.com/logos/Logo_40wht.gif\" alt=\"Google\" style=\"border:none\" /></a></div>
+
+<form method=\"get\" action=\"http://www.google.com/search\" style=\"margin-left:135px\">
+  <div>
+    <input type=\"hidden\" name=\"domains\" value=\"{{SERVER}}\" />
+    <input type=\"hidden\" name=\"num\" value=\"50\" />
+    <input type=\"hidden\" name=\"ie\" value=\"$2\" />
+    <input type=\"hidden\" name=\"oe\" value=\"$2\" />
+
+    <input type=\"text\" name=\"q\" size=\"31\" maxlength=\"255\" value=\"$1\" />
+    <input type=\"submit\" name=\"btnG\" value=\"Cîr cun Google\" />
+  </div>
+  <div style=\"font-size:90%\">
+    <input type=\"radio\" name=\"sitesearch\" id=\"gwiki\" value=\"{{SERVER}}\" checked=\"checked\" /><label for=\"gwiki\">{{SITENAME}}</label>
+    <input type=\"radio\" name=\"sitesearch\" id=\"gWWW\" value=\"\" /><label for=\"gWWW\">WWW</label>
+  </div>
+</form>
+
+</div>",
+'guesstimezone' => "Cjape impostazions dal sgarfadôr",
 'help' => "Jutori",
 'helppage' => "Jutori:Contignûts",
 'hide' => "plate",
 'hidetoc' => "plate",
-'hist' => "stor",
+'hist' => "storic",
 'history' => "Storic de pagjine",
+'history_copyright' => "-",
 'history_short' => "Storic",
+'historywarning' => 'Atenzion: la pagjine che tu stâs eliminant e à un storic.',
+'hr_tip' => "Rie orizontâl (no stâ doprâle masse spes)",
 'ilsubmit' => "Cîr",
+'image_sample' => "Esempli.jpg",
+'imagelinks' => "Leams de figure",
+'imagelist' => "Liste des figuris",
+'imagelistall' => 'ducj',
+'imagelisttext'	=> "Ca sot e je une liste di $1 files ordenâts $2.",
+'imagepage' => "Cjale pagjine de figure",
+'imgdelete' => "eli",
+'imgdesc' => "desc",
+'imghistlegend' => "Legenda: (cor) = cheste e je la figure corinte, (eli) = elimine
+cheste vecje version, (rip) = torne a ripristinâ cheste vecje version.
+<br /><i>Frache su une date par viodi la figure cjamade su chê volte</i>.",
+'imghistory' => "Storic de figure",
+'imglegend' => "Legenda: (desc) = mostre/modifiche descrizion de figure.",
+'import'	=> 'Impuarte pagjinis',
+'importfailed'	=> "Impuartazion falide: $1",
 'importnotext' => "Vueit o cence test",
+'importsuccess'	=> 'Impuartât cun sucès!',
+'info_short' => "Informazions",
+'infosubtitle' => 'Informazions pe pagjine',
+'intl'		=> 'Leams interlengâi',
+'invert' => "Invertìs selezion",
 'ipbsubmit' => "Bloche chest utent",
+'isbn' => "ISBN",
+'isredirect' => "pagjine di reindirizament",
+'italic_sample'=>'Test in corsîf',
+'italic_tip'=>'Test in corsîf',
 'jan' => "Zen",
 'january' => "Zenâr",
 'jul' => "Lui",
 'jun' => "Zug",
 'june' => "Zugn",
-'lastmodified' => "Modificât par l'ultime volte il $1",
-'lastmodifiedby' => "Modificât par l'ultime volte il $1 di",
+'largefile' => "Si racomande che lis figuris no sedin pi grandis di 100KB.",
+'last' => "ultime",
+'lastmodified' => "Modificât par l'ultime volte il ai $1",
+'lastmodifiedby' => "Modificât par l'ultime volte ai $1 di",
+'lineno' => "Rie $1:",
 'link_sample' => "Titul dal leam",
+'link_tip' => "Leams internis",
+'linklistsub' => "(Liste di leams)",
+'linkshere' => "Lis pagjinis ca sot a son leadis a cheste:",
+'linkstoimage' => "Lis pagjinis ca sot a son leadis a cheste figure:",
+'linktrail' => "/^([a-z]+)(.*)$/sD",
 'listform' => "liste",
+'listingcontinuesabbrev' => " cont.",
 'listusers' => "Liste dai utents",
+'lockbtn' => "Bloche base di dâts",
+'lockdb' => "Bloche base di dâts",
+'log'		=> 'Regjistris',
 'login' => "Jentre",
+'loginend' => "&nbsp;",
+'loginerror' => "Erôr te jentrade",
 'loginpagetitle' => "Jentrade dal utent",
+'loginreqtitle'	=> 'Si scugne jentrâ',
+'loginreqpagetext'	=> 'Tu scugnis [[{{ns:special}}:Userlogin|jentrâ']] par viodi lis altris pagjinis.',
+'loginsuccess' => "Cumò tu sês jentrât te {{SITENAME}} sicu \"$1\".",
 'loginsuccesstitle' => "Jentrât cun sucès",
 'logout' => "Jes",
+'lonelypages'	=> 'Pagjinis solitaris',
+'longpages'		=> 'Pagjinis lungjis',
+'mailmypassword' 	=> "Mandimi une gnove peraule clâf",
 'mainpage' => "Pagjine principâl",
+'math'			=> 'Matematiche',
 'may' => "Mai",
 'may_long' => "Mai",
+'media_sample' => "Esempli.mp3",
+'media_tip' => "Leam a un file multimediâl",
+'minlength' => "Il non di une figure al à di jessi lunc al mancul trê letaris.",
 'minoredit' => "Cheste e je une piçule modifiche",
 'minoreditletter' => "p",
+'missingimage'		=> "<b>Figure mancjante</b><br /><i>$1</i>\n",
 'monday' => "Lunis",
+'Monobook.css' => '/* modifiche chest file par personalizâ la mascare monobook par dut il sît */',
+'moredotdotdot'	=> 'Plui...',
 'move' => "Môf",
 'movearticle' => "Môf l'articul",
 'movedto' => "Movude in",
+'movelogpage' => 'Regjistri des pagjinis movudis',
+'movelogpagetext' => 'Ca sot e je une liste des pagjinis movudis.',
 'movenologin' => "No tu sês jentrât",
+'movenologintext' => "Tu âs di jessi un utent regjistrât e <a href=\"{{localurl:Special:Userlogin}}\">jentrât</a> par movi une pagjine.",
 'movepage' => "Môf pagjine",
+'movepagetext'	=> 'Cun il formulari ca sot tu puedis gambiâ il non a une pagjine, movint dut il sô storic al gnûf non.
+Il vieri titul al deventarà une pagjine di reindirizament al gnûf titul. I leams ae vecje pagjine no saran gambiâts; verifiche
+par plasê che no sedin reindirizaments doplis o no funzionants.
+Tu sês responsabil che i leams a continui a mandâ tal puest just.
+
+Note che la pagjine \'\'\'no\'\'\' sarà movude se e je za une pagjine cul gnûf titul, a mancul che no sedi vueide o un reindirizament e
+cence un storic. Chest al vûl dî che tu puedis tornâ a movi la pagjine tal titul precedent, se
+tu \'nd âs sbaliât e che no tu puedis sorescrivi une pagjine esistìnte.
+
+<b>ATENZION!</b>
+Chest al pues jessi un cambiament drastic e surprendint par une pagjine popolâr;
+tu âs di cognossi lis conseguencis prime di lâ indevant.',
 'movepagebtn' => "Môf pagjine",
+'movereason'	=> 'Reson',
+'movetalk'		=> 'Môf ancje la pagjine di discussion, se pussibil.',
 'movethispage' => "Môf cheste pagjine",
-'mycontris' => "Gno contribûts",
+'mw_math_png' => 'Torne simpri PNG',
+'mw_math_simple' => 'HTML se une vore sempliç, se no PNG',
+'mw_math_html' => 'HTML se pussibil se no PNG',
+'mw_math_source' => 'Lassile come TeX (par sgarfadôrs testuâi)',
+'mw_math_modern' => 'Racomandât pai sgarfadôrs testuâi',
+'mw_math_mathml' => 'MathML se pussibil (sperimentâl)',
+'mycontris' => "Miei contribûts",
+'mypage' => "Mê pagjine",
+'mytalk' => "Mês discussions",
 'navigation' => "somari",
+'nbytes' => "$1 bytes",
+'namespace' => 'Non dal spazi:',
+'nchanges' => "$1 cambiaments",
 'newarticle' => "(Gnûf)",
 'newarticletext' => "Tu âs seguît un leam a une pagjine che no esist ancjemò. Par creâ une pagjine, scomence a scrivi tal spazi ca sot (cjale il [[Jutori:Contignûts|jutori]] par altris informazions). Se tu sês ca par erôr, frache semplicementri il boton '''Indaûr''' dal to sgarfadôr.",
+'newimages' => "Galarie dai gnûfs files",
 'newmessages' => "Tu âs $1.",
-'newmessageslink' => "gnûf(s) messaç",
+'newmessageslink' => "gnûf(s) messaç(s)",
 'newpage' => "Gnove pagjine",
 'newpageletter' => "G",
 'newpages' => "Gnovis pagjinis",
+'newpassword'	=> 'Gnove peraule clâf',
+'newtitle' => "Al gnûf titul",
 'newusersonly' => "(dome gnûfs utents)",
 'newwindow' => "(al vierç un gnûf barcon)",
+'nextdiff' => "Prossime difarence &rarr;",
 'nlinks' => "$1 leams",
 'noarticletext' => "(Par cumò nol è nuie in cheste pagjine)",
+'nocontribs'    => 'Nissun cambiament che al rispiete chescj criteris cjatât.',
+'nocredits' => 'Nissune informazion sui ricognossiments disponibil par cheste pagjine.',
+'nogomatch' => "No esist nissune pagjine cun chest titul esat, provant la ricercje in dut il test.",
+'nohistory' => "Nol è presint un storic des modifichis par cheste pagjine.",
+'noimages' => "Nuie di viodi.",
 'nolinkshere' => "Nissune pagjine e à leams a chest articul",
+'nolinkstoimage' => 'No son pagjinis leadis a chest file.',
+'nowatchlist'		=> 'No tu stâs tignint di voli nissun element.',
 'nov' => "Nov",
 'november' => "Novembar",
+'nowatchlist' => "Nissun element al è tignût di voli.",
 'nstab-category' => "Categorie",
 'nstab-help' => "Jutori",
 'nstab-image' => "Figure",
 'nstab-main' => "Articul",
+'nstab-media' => "Media",
 'nstab-mediawiki' => "Messaç",
 'nstab-special' => "Speciâl",
 'nstab-template' => "Model",
 'nstab-user' => "Pagjine dal utent",
 'nstab-wp' => "Informazions",
+'numauthors' => 'Numar di autôrs diviers (articul): $1',
+'numedits' => 'Numar di modifichis (articul): $1',
+'numtalkauthors' => 'Numar di autôrs diviers (pagjine di discussion): $1',
+'numtalkedits' => 'Numar di modifichis (pagjine di discussion): $1',
+'numwatchers' => 'Numar di chei che e àn cjalât: $1',
 'oct' => "Otu",
 'october' => "Otubar",
+'ok' => "OK",
+'oldpassword'	=> 'Vecje peraule clâf',
+'orig' => "orig",
+'orphans'		=> 'Pagjinis solitaris',
+'othercontribs' => 'Basât sul lavôr di $1.',
 'otherlanguages' => "Altris lenghis",
+'others' => 'altris',
+'pagemovedsub'	=> 'Movude cun sucès',
 'pagemovedtext' => "Pagjine \"[[$1]]\" movude in \"[[$2]]\".",
+'passwordtooshort' => "La tô peraule clâf e je masse curte, e à di jessi lungje almancul $1 caratars.",
+'popularpages'	=> 'Pagjinis popolârs',
 'portal' => "Ostarie",
 'portal-url' => "Vichipedie:Ostarie",
+'poweredby' => "{{SITENAME}} e dopre [http://www.mediawiki.org/ MediaWiki], un motôr wiki a risultive vierte.",
 'powersearch' => "Cîr",
+'powersearchtext' => "
+Cîr tai nons dai spazis :<br />
+$1<br />
+$2 Liste redirezions &nbsp; Cîr $3 $9",
 'preferences' => "Preferencis",
+'prefs-personal' => 'Dâts utents',
+'prefs-rc' => 'Ultins cambiaments & stubs',
+'prefs-misc' => 'Variis',
+'prefs-help-realname' 	=> "* Non vêr (opzionâl): se tu sielzis di inserîlu al vignarà doprât par dâti un ricognossiment dal tô lavôr.",
+'prefs-help-email'      => "* Email (opzionâl): Permet ai altris di contatâti vie la to pagjine utent o di discussion cence scugnî mostrâ a ducj la tô identitât.",
+'prefslogintext' => "Tu sês jentrât come \"$1\".
+Il to numar identificatîf interni al è $2.
+
+Cjale [[Project:Preferencis utent]] par un aiût a lis diviersis opzions.",
 'preview' => "Anteprime",
 'previewnote' => "Visiti che cheste e je dome une anteprime, e no je stade ancjemò salvade!",
+'previousdiff' => "&larr; Difarence precedente",
 'printableversion' => "Version stampabil",
 'printsubtitle' => "(Articul dal sît {{SERVER}})",
 'protect' => "Protêç",
 'protectcomment' => "Reson pe protezion",
 'protectedarticle' => "$1 protezût",
 'protectedpage' => "Pagjine protezude",
+'protectedtext' => "Cheste pagjine e je stade blocade par prevignî la modifiche; a son
+diviersis resons par chest fat, cjale par plasê
+[[Project:Pagjinis protezudis]].
+
+Tu puedis instès viodi e copiâ la risultive di cheste pagjine:",
 'protectmoveonly' => "Protêç dome dai spostaments",
 'protectpage' => "Protêç pagjine",
 'protectsub' => "(Protezint \"$1\")",
@@ -238,54 +417,209 @@ $wgAllMessagesFur = array(
 'qbbrowse' => "Sgarfe",
 'qbedit' => "Modifiche",
 'qbfind' => "Cjate",
+'qbmyoptions'	=> "Mês pagjinis",
+'qbpageinfo'	=> "Contest",
+'qbpageoptions' => "Cheste pagjine",
+'qbsettings' => "Sbare svelte",
 'qbspecialpages' => "Pagjinis speciâls",
 'randompage' => "Une pagjine a câs",
 'rclinks' => "Mostre i ultins $1 cambiaments tes ultimis $2 zornadis<br />$3",
 'rclistfrom' => "Mostre i ultins cambiaments dal $1",
-'rcnote' => "Ca sot tu cjatis i ultins <strong>$1</strong> cambiaments te ultimis <strong>$2</strong> zornadis.",
+'rcnote' => "Ca sot tu cjatis i ultins <strong>$1</strong> cambiaments tes ultimis <strong>$2</strong> zornadis.",
 'recentchanges' => "Ultins cambiaments",
+'recentchangesall' => 'ducj',
+'recentchangescount' => "Numar di titui tai ultins cambiaments",
 'recentchangeslinked' => "Cambiaments leâts",
 'recentchangestext' => "Cheste pagjine e mostre i plui recents cambiaments inte Vichipedie.",
+'rclsub'		=> "(aes pagjinis leadis di \"$1\")",
 'redirectedfrom' => "(Inviât ca di $1)",
+'remembermypassword' => "Visiti di me",
+'removedwatch'		=> 'Gjavade de liste',
+'removedwatchtext' 	=> "La pagjine \"$1\" e je stade gjavade de liste di chês tignudis di voli.",
+'resetprefs'	=> 'Predeterminât',
+'restorelink' => "$1 modifichis eliminadis",
+'restrictedpheading'	=> 'Pagjinis speciâls cun restrizions',
+'resultsperpage' => 'Risultâts par pagjine',
 'retrievedfrom' => "Cjapât fûr di $1",
 'returnto' => "Torne a $1.",
+'retypenew'		=> 'Torne a scrivi chê gnove',
 'reupload' => "Torne a cjamâ sù",
+'revertimg' => "rip",
+'revertmove'	=> 'ripristine',
 'revhistory' => "Storic des revisions",
+'rows' => "Riis",
 'saturday' => "Sabide",
 'savearticle' => "Salve la pagjine",
 'savedprefs' => "Lis preferencis a son stadis salvadis",
+'savefile' => "Salve file",
 'saveprefs' => "Salve lis preferencis",
+'scarytranscludedisabled' => '[Inclusion dai interwikis no ative]',
+'scarytranscludefailed' => '[Recupar dal model falît par $1; o si scusin]',
+'scarytranscludetoolong' => '[URL masse lungje; o si scusin]',
 'search' => "Cîr",
+'searchresults' => "Risultâts de ricercje",
+'searchresulttext' => "Par plui informazions su lis ricercjis in {{SITENAME}}, cjale [[Project:Ricercje|Ricercje in {{SITENAME}}]].",
+
+'sep' => "Set",
+'september' => "Setembar",
+'sharedupload' => 'Chest file al è condivîs e al pues jessi doprât di altris progjets.',
+'shareduploadwiki' => 'Cjale par plasê la [pagjine di descrizion dal file $1] par altris informazions.',
+'shareddescriptionfollows' => '-',
+'shortpages'	=> 'Pagjinis curtis',
 'show' => "mostre",
+'showbigimage' => "Discjame version a alte risoluzion ($1x$2, $3 KB)",
+'showdiff'	=> 'Mostre cambiaments',
 'showhideminor' => "$1 piçulis modifichis | $2 bots | $3 utents jentrâts | $4 modifichis verificadis",
+'showlast'		=> "Mostre i ultins $1 files ordenâts $2.",
 'showpreview' => "Mostre anteprime",
 'showtoc' => "mostre",
+'sig_tip' => "La tô firme cun ore e date",
 'sitestats' => "Statistichis dal sît",
+'sitestatstext' => "Tu puedis cjatâ in dut '''$1''' pagjine inte base di dâts.
+Chest numar al inclût pagjinis \"discussion\", pagjinis su la {{SITENAME}}, pagjinis cun pocjis peraulis, reindirizaments, e altris che probabilmentri no si puedin considerâ pardabon come pagjinis di contignût.
+Gjavant chestis, o vin '''$2''' pagjinis che a son probabilmentri pagjinis di contignût legjitimis.
+
+O vin vût in dut '''$3''' viodudis de pagjinis e '''$4''' modifichis aes pagjinis di cuant che la wiki e je stade implantade.
+Chest al vûl dî une medie di '''$5''' modifichis par pagjine, e '''$6''' viodudis par modifiche.",
 'sitesubtitle' => "L'enciclopedie libare",
+'sitesupport' => 'Doninus',
+'sitesupport-url' => 'Project:Supuarte il sît',
+'siteuser' => 'Utent di {{SITENAME}} $1',
+'siteusers' => 'Utents di {{SITENAME}} $1',
+'skin'			=> 'Mascare',
+'sourcefilename' => 'Non dal file origjinâl',
 'specialloguserlabel' => "Utent:",
+'speciallogtitlelabel' => "Titul: ",
 'specialpage' => "Pagjine speciâl",
 'specialpages' => "Pagjinis speciâls",
+'spheading'		=> 'Pagjinis speciâls par ducj i utents',
 'statistics' => "Statistichis",
+'subcategories' => "Sot categoriis",
+'successfulupload' => "Cjamât sù cun sucès",
 'summary' => "Somari",
 'sunday' => "Domenie",
-'tagline' => "De {{SITENAME}}, l'enciclopedie libare dute in marilenghe.",
+'tableform' => "tabele",
+'tagline' => "Di {{SITENAME}}",
+'talk' => "Discussion",
+'talkexists'	=> "'''La pagjine e je stade movude cun sucès, ma no si à podût movi la pagjine di discussion parcè che e esist za tal gnûf titul. Trasferìs il contignût a man par plasê.'''",
 'talkpage' => "Fevelin di cheste pagjine",
+'talkpagemoved' => "Ancje la pagjine di discussion corispondente e je stade movude.",
+'talkpagenotmoved' => "La pagjine di discussion corispondente <strong>no</strong> je stade movude.",
+'templatesused' => "Modei doprâts par cheste pagjine:",
 'textboxsize' => "Modifiche",
+'thisisdeleted' => "Vuelistu cjalâ o ripristinâ $1?",
 'thumbnail-more' => "Slargje",
 'thursday' => "Joibe",
+'timezonelegend' => "Fûs orari",
 'toc' => "Indis",
+'tog-highlightbroken' => 'Mostre leams sbaliâts <a href="" class="new">cussì</a> (invezit di cussì<a href="" class="internal">?</a>).',
+'tog-justify'	=> 'Justifiche paragraf',
+'tog-hideminor' => 'Plate modifichis piçulis tai ultins cambiaments',
+'tog-usenewrc' => 'Ultins cambiaments avanzâts (JavaScript)',
+'tog-numberheadings' => 'Numerazion automatiche dai titui',
+'tog-editondblclick' => 'Modifiche pagjinis fracant dôs voltis (JavaScript)',
+'tog-editsection'		=> 'Inserìs un leam [modifiche] pe editazion veloç di une sezion',
+'tog-editsectiononrightclick'	=> 'Modifiche une sezion fracant cul tast diestri<br /> sui titui des sezions (JavaScript)',
+'tog-showtoc'			=> 'Mostre indis (par pagjinis cun plui di 3 sezions)',
+'tog-editwidth' => 'Il spazi pe modifiche al è larc il plui pussibil',
+'tog-minordefault' => 'Imposte come opzion predeterminade dutis lis modifichis come piçulis',
+'tog-previewontop' => 'Mostre anteprime parsore dal spazi pe modifiche',
+'tog-previewonfirst' => 'Mostre anteprime te prime modifiche',
+'tog-nocache' => 'No stâ tignî in memorie (caching) lis pagjinis',
+'tog-enotifwatchlistpages' 	=> 'Mandimi une email se la pagjine e gambie',
+'tog-enotifusertalkpages' 	=> 'Mandimi une email cuant che la mê pagjine di discussion e gambie',
+'tog-enotifminoredits' 		=> 'Mandimi une email ancje pes modifichis piçulis ae pagjine',
+'tog-enotifrevealaddr' 		=> 'Distapone fûr il gno recapit email tai messaçs di notifiche',
+'tog-shownumberswatching' 	=> 'Mostre il numar di utents che a stan tignint di voli',
+'tog-fancysig' => 'Firmis crudis (cence leam automatic)',
+'tog-externaleditor' => 'Dopre editôr esterni come opzion predeterminade',
+'tog-externaldiff' => 'Dopre editôr difarencis esterni come opzion predeterminade',
+'tog-rememberpassword' => 'Visiti tes prossimis sessions',
+'tog-showtoolbar'		=> 'Mostre sbare dai imprescj di modifiche (JavaScript)',
+'tog-underline' => 'Sotlinee leams',
+'tog-watchdefault' => 'Zonte pagjinis che o modifichi inte liste di chês tignudis di voli',
 'toolbox' => "imprescj",
+'tooltip-compareselectedversions' => 'Viôt lis difarencis framieç lis dôs versions di cheste pagjine selezionadis. [alt-v]',
+'tooltip-diff' => 'Mostre i cambiaments che tu âs fat al test. [alt-d]',
+'tooltip-minoredit' => "Segne cheste come une piçule modifiche [alt-i]",
+'tooltip-preview' => "Anteprime dai tiei cambiaments, doprile par plasê prime di salvâ! [alt-p]",
+'tooltip-save' => "Salve i tiei cambiaments [alt-s]",
+'tooltip-search' => "Cîr in cheste wiki [alt-f]",
+'tooltip-watch' => "Zonte cheste pagjine ae liste di chês tignudis di voli [alt-w]",
 'tuesday' => "Martars",
+'ucnote'        => "Ca sot a son i ultins <b>$1</b> cambiaments dal utent tes ultimis <b>$2</b> zornadis.",
+'uclinks'       => "Viôt i ultins $1 cambiaments; viôt lis ultimis $2 zornadis.",
+'uctop' => " (su)",
+'uncategorizedpages'	=> 'Pagjinis cence categorie',
+'uncategorizedcategories'	=> 'Categoriis cence categorie',
+'underline-always' => "Simpri",
+'underline-never' => "Mai",
+'underline-default' => "Predeterminât dal sgarfadôr",
+'unusedimages'	=> 'Files no doprâts',
+'unwatch' => 'No stâ tignî di voli',
+'unwatchthispage' 	=> 'No stâ tignî di voli plui',
+'updated' => "(Inzornât)",
+'upload' => "Cjame sù un file",
+'uploadbtn' => "Cjame sù un file",
+'uploaddisabled' => "Nus displâs, par cumò no si pues cjamâ sù robe.",
+'uploadedfiles' => "Files cjamâts sù",
+'uploadedimage' => "cjamât sù \"$1\"",
+'uploaderror' => "Erôr cjamant sù",
+'uploadlink' => "Cjame sù figuris",
+'uploadlog'		=> 'regjistri cjamâts sù',
+'uploadlogpagetext' => 'Ca sot e je une liste dai file cjamâts su di recent.',
+'uploadnologin' => 'No jentrât',
+'userexists'	=> "Il non utent inserît al è za doprât. Sielç par plasê un non diferent.",
 'userlogin' => "Regjistriti o jentre",
 'userlogout' => "Jes",
+'userpage' => "Cjale pagjine dal utent",
+'userstats' => "Statistichis dai utents",
+'userstatstext'  => "A son '''$1''' utents regjistrâts, di chescj '''$2''' (il '''$4%''') a son aministradôrs (cjale $3).",
+'val_tab' => "Convalide",
+'val_version' => "Version",
+'val_version_of' => "Version di $1",
+'val_view_version' => "Cjale cheste version",
+'validate' => "Convalide la pagjine",
+'version' => "Version",
+'viewcount' => "Cheste pagjine e je stade viodude $1 voltis.",
+'viewprevnext' => "Cjale ($1) ($2) ($3).",
 'viewsource' => "Cjale risultive",
+'wantedpages'	=> 'Pagjinis desideradis',
 'watch' => "Ten di voli",
 'watchlist' => "Tignûts di voli",
+'watchlistall1' => "ducj",
+'watchlistall2' => "dutis",
 'watchlistcontains' => "Tu stâs tignint di voli $1 pagjinis.",
+'watchlistsub'		=> "(par l'utent \"$1\")",
+'watchnochange' 	=> 'Nissun element di chei tignûts di voli al è stât modificât tal periodi mostrât.',
+'watchdetails'		=> "* $1 pagjinis tignudis di voli cence contâ lis pagjinis di discussion
+* [[Special:Watchlist/edit|Mostre e modfiche la liste complete]]",
+'watchnologin'		=> 'No tu sês jentrât',
+'watchnologintext'	=> "Tu 'nd âs di [[Speciâl:Userlogin|jentrâ]] par modificâ la liste des pagjinis tignudis di voli.",
 'watchthis' => "Ten di voli cheste pagjine",
 'watchthispage' => "Ten di voli cheste pagjine",
 'wednesday' => "Miercus",
+'welcomecreation' => "== Mandi e benvignût $1! ==
+
+La tô identitât e je stade creade. No stâ dismenteâti di gambiâ lis preferencis de {{SITENAME}}.",
 'whatlinkshere' => "Leams a chest articul",
+'wikipediapage' => "Cjale pagjine dal progjet",
+'wlheader-enotif' 		=> "* Notifiche par email ativade.",
+'wlheader-showupdated'   => "* Lis pagjinis gambiadis de ultime volte che tu lis âs cjaladis a son mostradis in '''gruessut'''",
+'wlnote' 		=> 'Ca sot a son i ultins $1 cambiaments tes ultimis <b>$2</b> oris.',
+'wlshowlast' 		=> 'Mostre ultimis $1 oris $2 zornadis $3',
+'wlsaved'		=> 'This is a saved version of your watchlist.',
+'wlhideshowown'   	=> '$1 lis mês modifichis.',
+'wlshow'		=> 'Mostre',
+'wlhide'		=> 'Plate',
+'wrongpassword' => "La peraule clâf zontade no je juste. Torne par plasê a provâ.",
+'yourdiff' => "Difarencis",
+'youremail'		=> "Email *",
+'yourlanguage' => "Lenghe di mostrâ",
+'yourpassword'	=> "Peraule clâf",
+'yourpasswordagain' => "Torne a scrivile",
+'yourrealname'		=> "Non vêr *",
+'yourvariant' => 'Varietât',
 );
 
 class LanguageFur extends LanguageUtf8 {
@@ -294,7 +628,7 @@ class LanguageFur extends LanguageUtf8 {
 		global $wgNamespaceNamesFur;
 		return $wgNamespaceNamesFur;
 	}
-	
+
 	function getQuickbarSettings() {
 		global $wgQuickbarSettingsFur;
 		return $wgQuickbarSettingsFur;
@@ -306,46 +640,34 @@ class LanguageFur extends LanguageUtf8 {
 	}
 
 
-	// Inherit userAdjust()
+	function getDateFormats() {
+		return false;
+	}
+
 
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
-		$d = (0 + substr( $ts, 6, 2 )) . " " .
+		$d = (0 + substr( $ts, 6, 2 )) . " di " .
 		  $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
 		  " " . substr( $ts, 0, 4 );
 		return $d;
 	}
 
 	function timeanddate( $ts, $adj = false ) {
-		return $this->date( $ts, $adj ) . " à " . $this->time( $ts, $adj );
+		return $this->date( $ts, $adj ) . " a lis " . $this->time( $ts, $adj );
 	}
 
 	var $digitTransTable = array(
 		',' => "\xc2\xa0", // @bug 2749
 		'.' => ','
 	);
-	
+
 	function formatNum( $number ) {
 		return strtr($number, $this->digitTransTable);
 	}
 
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesFur;
-		return $wgValidSpecialPagesFur;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesFur;
-		return $wgSysopSpecialPagesFur;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesFur;
-		return $wgDeveloperSpecialPagesFur;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesFur;
 		if( isset( $wgAllMessagesFur[$key] ) ) {
@@ -354,7 +676,7 @@ class LanguageFur extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 }
 
 ?>
diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php
index 307ac63f05a9..8bbd02d3daf4 100644
--- a/languages/LanguageFy.php
+++ b/languages/LanguageFy.php
@@ -4,39 +4,30 @@
   * @subpackage Language
   */
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
 require_once( "LanguageUtf8.php" );
 
 if($wgMetaNamespace === FALSE)
 	$wgMetaNamespace = str_replace( " ", "_", $wgSitename );
 
 /* private */ $wgNamespaceNamesFy = array(
-	-2	=> "Media",
-	-1	=> "Wiki",
-	0	=> "",
-	1	=> "Oerlis",
-	2	=> "Meidogger",
-	3	=> "Meidogger_oerlis",
-	4	=> $wgMetaNamespace,
-	5	=> $wgMetaNamespace . "_oerlis",
-	6	=> "Ofbyld",
-	7	=> "Ofbyld_oerlis",
-	8	=> "MediaWiki",
-	9	=> "MediaWiki_oerlis",
-	10  => "Berjocht",
-	11  => "Berjocht_oerlis",
-            12  => "Hulp",
-            13  => "Hulp_oerlis",
-            14  => "Kategory",
-            15  => "Kategory_oerlis"
-
+	NS_MEDIA          => "Media",
+	MS_SPECIAL        => "Wiki",
+	NS_MAIN           => "",
+	NS_TALK           => "Oerlis",
+	NS_USER           => "Meidogger",
+	NS_USER_TALK      => "Meidogger_oerlis",
+	NS_PROJECT        => $wgMetaNamespace,
+	NS_PROJECT_TALK   => $wgMetaNamespace . "_oerlis",
+	NS_IMAGE          => "Ofbyld",
+	NS_IMAGE_TALK     => "Ofbyld_oerlis",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "MediaWiki_oerlis",
+	NS_TEMPLATE       => "Berjocht",
+	NS_TEMPLATE_TALK  => "Berjocht_oerlis",
+	NS_HELP           => "Hulp",
+	NS_HELP_TALK      => "Hulp_oerlis",
+	NS_CATEGORY       => "Kategory",
+	NS_CATEGORY_TALK  => "Kategory_oerlis"
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsFy = array(
@@ -46,14 +37,7 @@ if($wgMetaNamespace === FALSE)
 /* private */ $wgSkinNamesFy = array(
 	'standard' => "Standert",
 	'nostalgia' => "Nostalgy",
-	'cologneblue' => "Keuls blau",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgDateFormatsFy = array(
@@ -67,57 +51,6 @@ if($wgMetaNamespace === FALSE)
 /* private */ $wgBookstoreListFy = array(
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesFy = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Ynstellings",
-	"Watchlist"		=> "Folchlist",
-	"Recentchanges"   => "Koarts feroare",
-	"Upload"		=> "Ofbyld oanbiede",
-	"Imagelist"		=> "Ofbyld list",
-	"Listusers"		=> "Bekinde brûkers",
-	"Statistics"	=> "Statistyk",
-	"Randompage"	=> "Samar in side",
-
-	"Lonelypages"	=> "Lossteande siden",
-	"Unusedimages"	=> "Lossteande ôfbylden",
-	"Popularpages"	=> "Grage siden",
-	"Wantedpages"	=> "Nedige siden",
-	"Shortpages"	=> "Koarte siden",
-	"Longpages"		=> "Lange siden",
-	"Newpages"		=> "Nije siden",
-	"Ancientpages"	=> "Alde siden",
-	"Allpages"		=> "Alle titels",
-
-	"Ipblocklist"	=> "Utsletten brûkers/Ynternet-adressen",
-	"Maintenance"     => "Underhâldsside",
-	"Specialpages"    => "Bysûndere siden",
-	"Contributions"   => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere"   => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "",
-#	"Categories"      => "Kategoryen",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesFy = array(
-	"Blockip"		=> "Utsletten brûker/Ynternet-adres",
-	"Asksql"		=> "Freegje de databank",
-	"Undelete"		=> "Set wisse siden wer teplak"
-);
-
-/* private */ $wgDeveloperSpecialPagesFy = array(
-	"Lockdb"  		=> "Meitsje de databank Net-Skriuwe",
-	"Unlockdb"  	=> "Meitsje de databank skriuwber",
-);
-
 /* private */ $wgAllMessagesFy = array(
 # User Toggles
 
@@ -179,17 +112,16 @@ if($wgMetaNamespace === FALSE)
 "mainpage"		=> "Haadside",
 "mainpagetext"	=> "Wiki-programma goed installearre.",
 "about"		=> "Ynfo",
-"aboutsite"      	=> "Oer de $wgSitename",
-"aboutpage"		=> "$wgMetaNamespace:Ynfo",
+"aboutsite"      	=> "Oer de {{SITENAME}}",
+"aboutpage"		=> "{{ns:project}}:Ynfo",
 "help"		=> "Help",
-"helppage"		=> "$wgMetaNamespace:Help",
-"wikititlesuffix" => "$wgSitename",
+"helppage"		=> "{{ns:project}}:Help",
 "bugreports"	=> "Brekmelding",
-"bugreportspage"	=> "$wgMetaNamespace:Brekmelding",
+"bugreportspage"	=> "{{ns:project}}:Brekmelding",
 "faq"			=> "FAQ",
-"faqpage"		=> "$wgMetaNamespace:FAQ",
+"faqpage"		=> "{{ns:project}}:FAQ",
 "edithelp"		=> "Siden bewurkje",
-"edithelppage"	=> "$wgMetaNamespace:Bewurk-rie",
+"edithelppage"	=> "{{ns:project}}:Bewurk-rie",
 "cancel"		=> "Ferlitte",
 "qbfind"		=> "Sykje",
 "qbbrowse"		=> "Blêdzje",
@@ -202,7 +134,7 @@ if($wgMetaNamespace === FALSE)
 "currentevents" 	=> "Hjoeddeis",
 "errorpagetitle" 	=> "Fout",
 "returnto"		=> "Werom nei \"$1\".",
-"tagline"      	=> "Fan $wgSitename, de frije ensyklopedy.", # FIXME
+"tagline"      	=> "Fan {{SITENAME}}, de frije ensyklopedy.", # FIXME
 "whatlinkshere"	=> "Siden mei in keppeling hjirhinne",
 "help"		=> "Help",
 "search"		=> "Sykje",
@@ -225,10 +157,9 @@ if($wgMetaNamespace === FALSE)
 "redirectedfrom" 	=> "(Trochwiisd fan \"$1\")",
 "lastmodified"	=> "Lêste kear bewurke op $1.",
 "viewcount"		=> "Disse side is $1 kear iepenslein.",
-"gnunote" 		=> "Alle tekst is beskiber ûnder de betingsten fan de <a class=internal href='$wgScriptPath/GNU_Vrije_Documentatie_Licentie'>GNU Iepen Dokumentaasje Lisinsje</a>.",
 "printsubtitle" 	=> "(Fan {{SERVER}})",
 "protectedpage" 	=> "Beskerme side",
-"administrators" 	=> "$wgMetaNamespace:Behear",
+"administrators" 	=> "{{ns:project}}:Behear",
 "sysoptitle"	=> "Allinnich foar behearders",
 "sysoptext"		=> "Om dit te dwaan moatte jo behearder wêze. Sjoch \"$1\".",
 "developertitle"  => "Allinich foar untwiklers",
@@ -236,7 +167,7 @@ if($wgMetaNamespace === FALSE)
 "nbytes"		=> "$1 byte",
 "go"			=> "Side",
 "ok"			=> "Goed",
-"sitetitle"		=> $wgSitename,
+"sitetitle"		=> '{{SITENAME}}',
 "sitesubtitle"	=> "De frije ensyklopedy",
 "retrievedfrom" 	=> "Untfongen fan \"$1\"",
 "newmessages" 	=> "Jo hawwe $1.",
@@ -278,7 +209,7 @@ MySQL joech fout \"<tt>$3: $4</tt>\" werom.",
 "readonly"			=> "Databank is Net-skriuwe",
 "enterlockreason" 	=> "Skriuw wêrom de databank net-skriuwe makke is,
 en sawat hoenear't de men wêr skriuwe kin",
-"readonlytext"	=> "De $wgSitename databank is ôfsletten foar nije siden en oare wizigings,
+"readonlytext"	=> "De {{SITENAME}} databank is ôfsletten foar nije siden en oare wizigings,
 nei alle gedachten is it foar ûnderhâld, en kinne jo der letter gewoan wer brûk fan meitsje.
 De behearder hat dizze útlis joen:
 <p>$1</p>",
@@ -286,7 +217,7 @@ De behearder hat dizze útlis joen:
 "missingarticle" 		=> "De databank kin in side net fine, nammentlik: \"$1\".
 <p>Faak is dit om't in âlde ferskil-, of skiednisside opfreege wurdt fan in side dy't wiske is.
 <p>As dat it hjir net is, dan hawwe jo faaks in brek yn it programa fûn.
-Jou dat asjebleaft troch oan de [[$wgMetaNamespace:Brekmelding|behearder]], tegearre mei de URL.",
+Jou dat asjebleaft troch oan de [[{{ns:project}}:Brekmelding|behearder]], tegearre mei de URL.",
 
 "internalerror" 		=> "Ynwindige fout",
 "filecopyerror" 		=> "Koe bestân \"$1\" net kopiearje as \"$2\".",
@@ -294,11 +225,11 @@ Jou dat asjebleaft troch oan de [[$wgMetaNamespace:Brekmelding|behearder]], tege
 "filedeleteerror" 	=> "Koe bestân \"$1\" net wiskje.",
 "filenotfound"		=> "Koe bestân \"$1\" net fine.",
 "unexpected"		=> "Hommelse wearde: \"$1\"=\"$2\".",
-"formerror"			=> "Fout: koe formulier net oerlizze",	
+"formerror"			=> "Fout: koe formulier net oerlizze",
 "badarticleerror" 	=> "Dit kin op dizze side net dien wurden.",
 "cannotdelete"		=> "Koe de oantsjutte side of ôfbyld net wiskje. (Faaks hat in oar dat al dien.)",
 "badtitle"			=> "Misse titel",
-"badtitletext"		=> "De opfreeche side titel wie ûnjildich, leech, of in 
+"badtitletext"		=> "De opfreeche side titel wie ûnjildich, leech, of in
 miskeppele ynter-taal of ynter-wiki titel.",
 "perfdisabled" 		=> "Sorry! Dit ûnderdiel is tydlik út set om't it de databank sa starich makket
 dat gjinien de wiki brûke kin.",
@@ -309,7 +240,7 @@ dat gjinien de wiki brûke kin.",
 #
 "logouttitle" 	=> "Ofmelde",
 "logouttext"	=> "Jo binne no ôfmeld.
-Jo kinne de $wgSitename fierders anonym brûke,
+Jo kinne de {{SITENAME}} fierders anonym brûke,
 of jo op 'e nij [[Wiki:Userlogin|oanmelde]] ûnder in oare namme.\n",
 "welcomecreation" => "<h2>Wolkom, $1!</h2><p>Jo ynstellings bin oanmakke.
 Ferjit net se oan jo foarkar oan te passen.",
@@ -321,7 +252,7 @@ Ferjit net se oan jo foarkar oan te passen.",
 "newusersonly" 	=> " (allinnich foar nije brûkers)",
 "remembermypassword" => "Oare kear fansels oanmelde.",
 "loginproblem" 	=> "<b>Der wie wat mis mei jo oanmelden.</b><br />Besykje it nochris, a.j.w.",
-"alreadyloggedin" => "<font color=red><b>Brûker $1, jo binne al oanmeld!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Brûker $1, jo binne al oanmeld!</strong><br />\n",
 "login"		=> "Oanmelde",
 "userlogin"		=> "Oanmelde",
 "logout"		=> "Ofmelde",
@@ -340,7 +271,7 @@ sûnder dat se dat adres witte. (Dat leste kin ek wer útset by de instellings.)
 "loginerror"	=> "Oanmeldflater",
 "noname"		=> "Jo moatte in brûkersnamme opjaan.",
 "loginsuccesstitle" => "Oanmelden slagge.",
-"loginsuccess"	=> "Jo binne no oanmelde op de $wgSitename as: $1.",
+"loginsuccess"	=> "Jo binne no oanmelde op de {{SITENAME}} as: $1.",
 "nosuchuser"	=> "Brûkersnamme en wachtwurd hearre net by elkoar.
 Besykje op 'e nij, of fier it wachtwurd twa kear yn en meitsje neie brûkersynstellings.",
 
@@ -348,9 +279,9 @@ Besykje op 'e nij, of fier it wachtwurd twa kear yn en meitsje neie brûkersynst
 Besykje op 'e nij, of fier it wachtwurd twa kear yn en meitsje neie brûkersynstellings.",
 
 "mailmypassword" 	=> "Stjoer my in nij wachtwurd.",
-"passwordremindertitle" => "Nij wachtwurd foar de $wgSitename",
+"passwordremindertitle" => "Nij wachtwurd foar de {{SITENAME}}",
 "passwordremindertext" => "Immen (nei alle gedachten jo, fan Ynternet-adres $1)
-hat frege en stjoer jo in nij $wgSitename wachtwurd.
+hat frege en stjoer jo in nij {{SITENAME}} wachtwurd.
 I wachtwurd foar brûker \"$2\" is no \"$3\".
 Meld jo no oan, en feroarje jo wachtwurd.",
 "noemail"		=> "Der is gjin e-postadres foar brûker \"$1\".",
@@ -368,7 +299,7 @@ Please log in again after you receive it.",
 "showpreview"	=> "Oerlêze foar de side fêstlein is",
 "blockedtitle"	=> "Brûker is útsletten troch",
 "blockedtext"	=> "Jo brûkersname of Ynternet-adres is útsletten.
-As reden is opjûn:<br />''$2''<p>As jo wolle, kinne jo hjiroer kontakt op nimme meid de behearder. 
+As reden is opjûn:<br />''$2''<p>As jo wolle, kinne jo hjiroer kontakt op nimme meid de behearder.
 
 (Om't in Ynternet-adressen faak mar foar ien sessie tawiisd wurde, kin it wêze
 dat it eins gjit om in oar dy't deselde tagongferskaffer hat as jo hawwe. As it jo
@@ -384,8 +315,8 @@ e-postadres opjûn hawwe in jo [[Wiki:Preferences|ynstellings]].",
 "newarticle"	=> "(Nij)",
 "newarticletext" =>
 "Jo hawwe in keppeling folge nei in side dêr't noch gjin tekst op stiet.
-Om sels tekst te meistjsen kinne jo dy gewoan yntype in dit bewurkingsfjild 
-([[$wgMetaNamespace:Bewurk-rie|Mear ynformaasje oer bewurkjen]].)
+Om sels tekst te meistjsen kinne jo dy gewoan yntype in dit bewurkingsfjild
+([[{{ns:project}}:Bewurk-rie|Mear ynformaasje oer bewurkjen]].)
 Oars kinne jo tebek mei de tebek-knop fan jo blêdzjer.",
 
 "anontalkpagetext" => "---- ''Dit is de oerlisside fan in unbekinde brûker; in brûker
@@ -403,31 +334,31 @@ jo jo [[Wiki:Userlogin|oanmelde]], dat jo allinnich opmerkings foar josels krije
 "editing"		=> "Bewurkje \"$1\" (nije opmerking)",
 "editconflict"	=> "Tagelyk bewurke: \"$1\"",
 "explainconflict" => "In oar hat de side feroare sûnt jo begûn binne mei it bewurkjen.
-It earste bewurkingsfjild is hoe't de tekst wilens wurde is. 
+It earste bewurkingsfjild is hoe't de tekst wilens wurde is.
 Jo feroarings stean yn it twadde fjild.
 Dy wurde allinnich tapasse safier as jo se yn it earste fjild ynpasse.
 <b>Allinnich</b> de tekst út it earste fjild kin fêstlein wurde.<br />",
 "yourtext"		=> "Jo tekst",
 "storedversion" => "Fêstleine ferzje",
-"editingold"	=> "<strong><font color=red>Waarskôging</font>: Jo binne dwaande mei in âldere ferzje fan dizze side.
+"editingold"	=> "<strong>Waarskôging: Jo binne dwaande mei in âldere ferzje fan dizze side.
 Soenen jo dizze fêstlizze, dan is al wat sûnt dy tiid feroare is kwyt.</strong>",
 "yourdiff"		=> "Feroarings",
 # REPLACE THE COPYRIGHT WARNING IF YOUR SITE ISN'T GFDL!
-"copyrightwarning" => "Alle bydragen ta de $wgSitename wurde sjoen
+"copyrightwarning" => "Alle bydragen ta de {{SITENAME}} wurde sjoen
 as fallend ûnder de GNU Iepen Dokumentaasje Lisinsje
 (sjoch fierders: \"$1\").
 As jo net wolle dat jo skriuwen ûnferbidlik oanpast en frij ferspraat wurdt,
-dan is it baas, en set it net op de $wgSitename.<br />
+dan is it baas, en set it net op de {{SITENAME}}.<br />
 Jo ferklare ek dat jo dit sels skreaun hawwe, of it oernaam hawwe út in
 publyk eigendom of in oare iepen boarne.
 <strong><big>Foeg gjin wurk ûnder auteursrjocht ta sûnder tastimming!</big></strong>",
-"longpagewarning" => "<strong><font color=red>Waarskôging</font>: Dizze side is $1 kilobyte lang; 
+"longpagewarning" => "<strong>Waarskôging: Dizze side is $1 kilobyte lang;
 der binne blêdzjers dy problemen hawwe mei siden fan tsjin de 32kb. of langer.
 Besykje de side yn lytsere stikken te brekken.</strong>",
-"readonlywarning" => "<strong><font color=red>Waarskôging</font>: De databank is ôfsletten foar
+"readonlywarning" => "<strong>Waarskôging: De databank is ôfsletten foar
 ûnderhâld, dus jo kinne jo bewurkings no net fêstlizze.
 It wie baas en nim de tekst foar letter oer yn in tekstbestân.</strong>",
-"protectedpagewarning" => "<strong><font color=red>Waarskôging</font>: Dizze side is beskerme, dat
+"protectedpagewarning" => "<strong>Waarskôging: Dizze side is beskerme, dat
 gewoane brûkers dy net bewurkje kinne. Tink om de
 [[Project:Beskerm-rie|rie oer beskerme siden]].</strong>",
 
@@ -486,10 +417,10 @@ Sykje in nammeromten :<br />
 $1<br />
 $2 List trochferwizings &nbsp; Sykje nei \"$3\" \"$9\"",
 
-"searchdisabled" => "<p>Op it stuit stjit it trochsykjen fan tekst net oan, om't de 
+"searchdisabled" => "<p>Op it stuit stjit it trochsykjen fan tekst net oan, om't de
 tsjinner it net oankin. Mei't we nije apparatuer krije wurdt it nei alle gedanken wer
 mooglik. Foar now kinne jo sykje fia Google:</p>",
-"blanknamespace" => "($wgSitename)",
+
 
 
 # Preferences page
@@ -501,10 +432,10 @@ mooglik. Foar now kinne jo sykje fia Google:</p>",
 "prefslogintext" 		=> "Jo binne oanmeld, $1.
 Jo Wiki-nûmer is $2.
 
-([[$wgMetaNamespace:Ynstelling-rie|Help by de ynstellings]].",
+([[{{ns:project}}:Ynstelling-rie|Help by de ynstellings]].",
 
 "prefsreset"		=> "De ynstellings binne tebek set sa't se fêstlein wienen.",
-"qbsettings"		=> "Menu", 
+"qbsettings"		=> "Menu",
 "changepassword" 		=> "Wachtword feroarje",
 "skin"			=> "Side-oansjen",
 "math"			=> "Formules",
@@ -541,8 +472,8 @@ Jo Wiki-nûmer is $2.
 #
 "changes" 			=> "feroarings",
 "recentchanges" 		=> "Koarts feroare",
-# This is the default text, and can be overriden by editing [[$wgMetaNamespace::Recentchanges]]
-"recentchangestext" 	=> "De lêste feroarings fan de $wgSitename.",
+# This is the default text, and can be overriden by editing [[{{ns:project}}::Recentchanges]]
+"recentchangestext" 	=> "De lêste feroarings fan de {{SITENAME}}.",
 "rcloaderr"			=> "Koarts feroare ...",
 "rcnote"			=> "Dit binne de lêste <strong>$1</strong> feroarings yn de lêste <strong>$2</strong> dagen.",
 "rcnotefrom"		=> "Dit binne de feroarings sûnt <b>$2</b> (maksimaal <b>$1</b>).",
@@ -593,7 +524,7 @@ Om it ôfbyld yn in side op te nimmen, meitsje jo dêr sa'n keppeling:<br />
 '''<nowiki>[[ôfbyld:jo_logo.png|omskriuwing]]</nowiki>''';
 en foar lûden '''<nowiki>[[media:jo_lûd.ogg]]</nowiki>'''.
 
-Tink derom dat oaren bewurkje kinne wat jo oanbiede, as dat better is foar de $wgSitename,
+Tink derom dat oaren bewurkje kinne wat jo oanbiede, as dat better is foar de {{SITENAME}},
 krekt's sa't dat foar siden jildt, en dat jo útsletten wurde kinne as jo misbrûk
 meitsje fan it systeem..",
 
@@ -607,13 +538,9 @@ meitsje fan it systeem..",
 
 "filename"		=> "Bestânsnamme",
 "filedesc"		=> "Omskriuwing",
-"affirmation"	=> "Ik befêstigje dat de eigner fan de rjochten op dit bestân 
-ynstimt mei fersprieding ûnder de betingsten fan de $1.",
-
-"copyrightpage" 	=> "$wgMetaNamespace:Auteursrjocht",
-"copyrightpagename" => "$wgSitename auteursrjocht",
+"copyrightpage" 	=> "{{ns:project}}:Auteursrjocht",
+"copyrightpagename" => "{{SITENAME}} auteursrjocht",
 "uploadedfiles"	=> "Oanbeane bestannen",
-"noaffirmation" => "Jo moatte befestigje dat wat jo oanbiede gjin rjochten skeint.",
 "ignorewarning"	=> "Sjoch oer de warskôging hinne en lis bestân dochs fêst.",
 "minlength"		=> "Ofbyldnammen moatte trije letters of mear wêze.",
 "badfilename"	=> "De ôfbyldnamme is feroare nei \"$1\".",
@@ -622,7 +549,7 @@ ynstimt mei fersprieding ûnder de betingsten fan de $1.",
 "successfulupload" => "Oanbieden slagge.",
 "fileuploaded"	=> "Bestân \"$1\" goed oanbean.
 Gean no fierder nei de beskriuwingsside: ($2). Dêr kinne jo oanjaan
-wêr't it bestân wei kaam, hoenear it oanmakke is en wa't it makke hat, 
+wêr't it bestân wei kaam, hoenear it oanmakke is en wa't it makke hat,
 en wat jo fierder mar oan ynformaasje hawwe.",
 
 "uploadwarning" 	=> "Oanbied waarskôging",
@@ -660,8 +587,8 @@ en wat jo fierder mar oan ynformaasje hawwe.",
 "statistics"	=> "Statistyk",
 "sitestats"		=> "Side statistyk",
 "userstats"		=> "Brûker statistyk",
-"sitestatstext" => "It tal fan siden in de $wgSitename is: <b>$2</b>.<br />
-(Oerlissiden, siden oer de $wgSitename, oare bysûndere siden,  stobben en
+"sitestatstext" => "It tal fan siden in de {{SITENAME}} is: <b>$2</b>.<br />
+(Oerlissiden, siden oer de {{SITENAME}}, oare bysûndere siden,  stobben en
 trochferwizings yn de databank binne dêrby net meiteld.)<br />
 It tal fan siden in de databank is: <b>$1</b>.
 <p>
@@ -682,9 +609,9 @@ eltse oanpassing daalks in fernijde side op.",
 
 "maintenancebacklink"	=> "Werom nei Underhâldside",
 "disambiguations"		=> "Trochverwizings",
-"disambiguationspage"	=> "$wgMetaNamespace:trochferwizing",
+"disambiguationspage"	=> "{{ns:project}}:trochferwizing",
 "disambiguationstext"	=> "Dizze siden binne keppele fia in
-[[$wgMetaNamespace:trochferwizing]]. 
+[[{{ns:project}}:trochferwizing]].
 Se soenen mei de side sels keppele wurde moatte.<br />
 (Allinnich siden út deselde nammeromte binne oanjûn.)",
 
@@ -773,7 +700,7 @@ of hat oanjaan gjin post fan oare brûkers krije te wollen.",
 "watchnologintext"=> "Jo moatte [[Wiki:Userlogin|oanmeld]] wêze om jo folchlist te feroarjen.",
 
 "addedwatch"	=> "Oan folchlist tafoege",
-"addedwatchtext"	=> "De side \"$1\" is tafoege oan jo <a href=\"" 
+"addedwatchtext"	=> "De side \"$1\" is tafoege oan jo <a href=\""
 . "{{localurle:Wiki:Watchlist}}\">folchlist</a>.
 As dizze side sels, of de oerlisside, feroare wurd, dan komt dat dêr yn,
 en de side stiet dan ek <b>fet</b> yn de <a href=\"" .
@@ -815,8 +742,8 @@ Jou oan hokfoar siden jo net mear folgje wolle, en befêstigje dat ûnderoan de
 "historywarning"	=> "Waarskôging: De side dy't jo wiskje wolle hat skiednis: ",
 "confirmdeletetext" => "Jo binne dwaande mei it foar altyd wiskjen fan in side
 of ôfbyld, tegearre mei alle skiednis, út de databank.
-Befêstigje dat jo dat wier dwaan wolle. Befêstigje dat dat is wat jo witte wat it gefolch 
-is en dat jo dit dogge neffens de [[$wgMetaNamespace:wisk-rie]].",
+Befêstigje dat jo dat wier dwaan wolle. Befêstigje dat dat is wat jo witte wat it gefolch
+is en dat jo dit dogge neffens de [[{{ns:project}}:wisk-rie]].",
 
 "actioncomplete"	=> "Dien",
 "deletedtext"	=> "\"$1\" is wiske.
@@ -843,7 +770,7 @@ inoar hat de feroaring tebekset, of oars wat oan de side feroare.
 
 De lêste feroaring wie fan [[Brûker:$3|$3]] ([[Brûker oerlis:$3|Oerlis]]). ",
 #   only shown if there is an edit comment
-"editcomment"	=> "De gearfetting wie: \"<i>$1</i>\".", 
+"editcomment"	=> "De gearfetting wie: \"<i>$1</i>\".",
 "revertpage"	=> "Tebek set ta de ferzje fan \"$1\"",
 
 # Undelete
@@ -860,7 +787,7 @@ troch de lêste ferzje út dy weromsette skiednis ferfangen.",
 "undeletebtn" 	=> "Weromset!",
 "undeletedarticle" => "\"$1\" weromset",
 "undeletedtext"   => "It weromsette fan side [[$1]] is slagge.
-(List fan resint [[$wgMetaNamespace:wisk-loch|wiske of weromsette siden]].",
+(List fan resint [[{{ns:project}}:wisk-loch|wiske of weromsette siden]].",
 
 # Contributions
 #
@@ -887,13 +814,12 @@ troch de lêste ferzje út dy weromsette skiednis ferfangen.",
 "blockip"		=> "Slut brûker út",
 "blockiptext"	=> "Brûk dizze fjilden om in brûker fan skriuwtagong út te sluten.
 Dit soe allinnich omwillens fan fandalisme dwaan wurde moatte, sa't de
-[[$wgMetaNamespace:Utslut-rie|útslut-rie]] it oanjout.
+[[{{ns:project}}:Utslut-rie|útslut-rie]] it oanjout.
 Meld de krekte reden! Begelyk, neam de siden dy't oantaaste waarden.",
 "ipaddress"		=> "Brûkernamme of Ynternet-adres",
 "ipbreason"		=> "Reden",
 "ipbsubmit"		=> "Slut dizze brûker út",
 "badipaddress"	=> "Dy brûker bestiet net",
-"noblockreason"	=> "Jo moatte de krekte reden opjaan.",
 "blockipsuccesssub" => "Utsluting slagge",
 "blockipsuccesstext" => "Brûker \"$1\" is útsletten.<br />
 (List fan [[Wiki:Ipblocklist|útslette brûkers]].)",
@@ -927,30 +853,16 @@ Befêstigje dat dit is wat jo wolle.",
 "locknoconfirm"	=> "Jo hawwe jo hanneling net befêstige.",
 "lockdbsuccesssub" => "Databank is 'Net-skriuwe'",
 "unlockdbsuccesssub" => "Database is skriuwber",
-"lockdbsuccesstext" => "De $wgSitename databank is 'Net-skriuwe' makke.
+"lockdbsuccesstext" => "De {{SITENAME}} databank is 'Net-skriuwe' makke.
 <br />Tink derom en meitsje de databank skriuwber as jo ûnderhâld ree is.",
-"unlockdbsuccesstext" => "De $wgSitename databank is skriuwber makke.",
-
-# SQL query
-#
-"asksql"		=> "SQL-fraach",
-"asksqltext"	=> "Brûk dizze fjilden foar in databank-fraach oan de $wgSitename databank.
-Brûk inkele oanheltekens ('likas dit') foar tekst.
-Dit kin in foar de tsjinner in soad wurk betsjutte. Brûk dit dus net ûnnedig.",
-"sqlislogged"	=> "(Alle fragen komme yn in lochbestân.)",
-"sqlquery"		=> "Fraach",
-"querybtn"		=> "Bied de fraach oan",
-"selectonly"	=> "Oare fragen as \"SELECT\" binne foarbehâlden oan
-$wgSitename ûntwiklers.",
-"querysuccessful" => "Fraach slagge",
-
+"unlockdbsuccesstext" => "De {{SITENAME}} databank is skriuwber makke.",
 
 # Move page
 #
 "movepage"		=> "Werneam side",
 "movepagetext"	=> "Dit werneamt in side, mei alle sideskiednis.
 De âlde titel wurdt in trochferwizing nei de nije.
-Keppelings mei de âlde side wurde net feroare; 
+Keppelings mei de âlde side wurde net feroare;
 gean sels nei of't der dûbele of misse ferwizings binne.
 It hinget fan jo ôf of't de siden noch keppelen binne sa't it mient wie.
 
@@ -977,7 +889,7 @@ In dizze gefallen is it oan jo hoe't jo de oerlisside werneame of ynfoegje wolle
 of oars is de namme dy't jo oanjûn hawwe net tastean.
 Besykje it op 'e nij.",
 
-"talkexists"	=> "It werneamen op sich is slagge, mar de eardere oerlisside is 
+"talkexists"	=> "It werneamen op sich is slagge, mar de eardere oerlisside is
 net mear keppele om't der foar de nije namme el al in oerlisside wie.
 Gearfoegje de oerlissiden hânmjittig.",
 
@@ -985,12 +897,12 @@ Gearfoegje de oerlissiden hânmjittig.",
 "talkpagemoved"	=> "De oerlisside is al noch keppele.",
 "talkpagenotmoved" => "De oerlisside is <strong>net</strong> mear keppele.",
 # Math
-           'mw_math_png' => "Altiten as PNG ôfbyldzje",
-           'mw_math_simple' => "HTML foar ienfâldiche formules, oars PNG",
-           'mw_math_html' => "HTML as mooglik, oars PNG",
-           'mw_math_source' => "Lit de TeX ferzje stean (foar tekstblêdzjers)",
-           'mw_math_modern' => "Oanbefelle foar resinte blêdzjers",
-	   'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Altiten as PNG ôfbyldzje",
+'mw_math_simple' => "HTML foar ienfâldiche formules, oars PNG",
+'mw_math_html' => "HTML as mooglik, oars PNG",
+'mw_math_source' => "Lit de TeX ferzje stean (foar tekstblêdzjers)",
+'mw_math_modern' => "Oanbefelle foar resinte blêdzjers",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -1014,7 +926,7 @@ class LanguageFy extends LanguageUtf8 {
 		foreach ( $wgNamespaceNamesFy as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
-		if ( 0 == strcasecmp( "Brûker", $text ) ) return 2; 
+		if ( 0 == strcasecmp( "Brûker", $text ) ) return 2;
 		if ( 0 == strcasecmp( "Brûker_oerlis", $text ) ) return 3;
 		if ( 0 == strcasecmp( "Special", $text ) ) return -1;
 		return false;
@@ -1036,12 +948,11 @@ class LanguageFy extends LanguageUtf8 {
 		return $wgDateFormatsFy;
 	}
 
-  
 	function date( $ts, $adj = false ) {
 		global $wgUser;
 
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		switch ( $wgUser->getOption( 'date' ) ) {
 			# jan 8, 2001
 			case '0': case '1': return $d = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) )
@@ -1057,35 +968,17 @@ class LanguageFy extends LanguageUtf8 {
 				. ' ' . (0 + substr( $ts, 6, 2 ));
 		}
 	}
+
 	function timeanddate( $ts, $adj = false ) {
 		global $wgUser;
-		
+
 		switch ( $wgUser->getOption( 'date' ) ) {
-			case 'ISO 8601': return $this->date( $ts, $adj ) . ' ' . $this->time( $ts, $adj ); 
+			case 'ISO 8601': return $this->date( $ts, $adj ) . ' ' . $this->time( $ts, $adj );
 			default: return $this->time( $ts, $adj ) . ', ' . $this->date( $ts, $adj );
 		}
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesFy;
-		return $wgValidSpecialPagesFy;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesFy;
-		return $wgSysopSpecialPagesFy;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesFy;
-		return $wgDeveloperSpecialPagesFy;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesFy;
 		if( isset( $wgAllMessagesFy[$key] ) ) {
 			return $wgAllMessagesFy[$key];
diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index 0507043db201..fd452fa2118b 100755
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -34,8 +34,8 @@ DISCUSSION!
 	NS_USER_TALK        => 'Plé_úsáideora',
 	NS_PROJECT          => 'Vicipéid',
 	NS_PROJECT_TALK     => 'Plé_Vicipéide', # NOTE TO DEVELOPERS: A different genitive spelling is needed for
-	                            # each Wiki name, as can be seen. So the $wgMetaNamespace tag has not been used
-	                            # here for the moment in some cases, and in other places with a FIXME flag.
+	                                        # each Wiki name, as can be seen. So the $wgMetaNamespace tag has not been used
+	                                        # here for the moment in some cases, and in other places with a FIXME flag.
 	NS_IMAGE            => 'Íomhá',
 	NS_IMAGE_TALK       => 'Plé_í­omhá',
 	NS_MEDIAWIKI        => 'MediaWiki',
@@ -44,12 +44,12 @@ DISCUSSION!
 	NS_TEMPLATE_TALK    => 'Plé_múnla',
 	NS_HELP             => 'Cabhair',
 	NS_HELP_TALK        => 'Plé_cabhrach',
-	NS_CATEGORY	    => 'Rang',
+	NS_CATEGORY         => 'Rang',
 	NS_CATEGORY_TALK    => 'Plé_ranga'
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsGa = array(
-    "Faic", "Greamaithe ar chlé", "Greamaithe ar an taobh deas", "Ag faoileáil ar chlé"
+	"Faic", "Greamaithe ar chlé", "Greamaithe ar an taobh deas", "Ag faoileáil ar chlé"
 );
 
 /* private */ $wgSkinNamesGa = array(
@@ -61,8 +61,8 @@ DISCUSSION!
 	'davinci' => "DaVinci",
 	'mono' => "Aondath",
 	'monobook' => "ÚrLeabhar",
- "myskin" => "Sean-nós Nua"
-);
+	'myskin' => "Sean-nós Nua"
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgDateFormatsGa = array(
@@ -73,90 +73,34 @@ DISCUSSION!
 
 /* private */ $wgMagicWordsGa = array(
 #   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    "#redirect", "#athsheoladh"              ),
-    MAG_NOTOC                => array( 0,    "__NOTOC__"              ),
-    MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__"      ),
-    MAG_START                => array( 0,    "__START__"              ),
-    MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH", "MÍREATHA"           ),
-    MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "AINMMHÍREATHA"       ),
-    MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "LÁREATHA"             ),
-    MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "AINMLAEREATHA"         ),
-    MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "BLIAINREATHA"            ),
-    MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "AMREATHA"            ),
-    MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES", "MÉIDAILT"       ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN"    ), #FIXME - what is this?
-    MAG_SUBST                => array( 1,    "SUBST:"                 ),
-    MAG_MSGNW                => array( 1,    "MSGNW:"                 ),
+	MAG_REDIRECT             => array( 0,    "#redirect", "#athsheoladh"              ),
+	MAG_NOTOC                => array( 0,    "__NOTOC__"              ),
+	MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__"      ),
+	MAG_START                => array( 0,    "__START__"              ),
+	MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH", "MÍREATHA"           ),
+	MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "AINMMHÍREATHA"       ),
+	MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "LÁREATHA"             ),
+	MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "AINMLAEREATHA"         ),
+	MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "BLIAINREATHA"            ),
+	MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "AMREATHA"            ),
+	MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES", "MÉIDAILT"       ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN"    ), #FIXME - what is this?
+	MAG_SUBST                => array( 1,    "SUBST:"                 ),
+	MAG_MSGNW                => array( 1,    "MSGNW:"                 ),
 	MAG_END                  => array( 0,    "__END__", "__DEIREADH__"             ),
-    MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb", "reamhspléach", "beag"     ),
-    MAG_IMG_RIGHT            => array( 1,    "right", "taobhdeas"                  ),
-    MAG_IMG_LEFT             => array( 1,    "left", "clé"                   ),
-    MAG_IMG_NONE             => array( 1,    "none", "faic"                   ),
-    MAG_IMG_WIDTH            => array( 1,    "$1px"                   ),
-    MAG_IMG_CENTER           => array( 1,    "center", "centre", "lár"       ),
-    MAG_INT                  => array( 0,    "INT:"                   ) #FIXME - what is this?
+	MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb", "reamhspléach", "beag"     ),
+	MAG_IMG_RIGHT            => array( 1,    "right", "taobhdeas"                  ),
+	MAG_IMG_LEFT             => array( 1,    "left", "clé"                   ),
+	MAG_IMG_NONE             => array( 1,    "none", "faic"                   ),
+	MAG_IMG_WIDTH            => array( 1,    "$1px"                   ),
+	MAG_IMG_CENTER           => array( 1,    "center", "centre", "lár"       ),
+	MAG_INT                  => array( 0,    "INT:"                   ) #FIXME - what is this?
 
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesGa = array(
-    "Userlogin"     => "",
-    "Userlogout"    => "",
-    "Preferences"   => "Athraigh mo socruithe",
-    "Watchlist"     => "Mo fairechlár", # List of pages, which the user has chosen to watch
-    "Recentchanges" => "Leathanaigh leasaithe le déanaí­",
-    "Upload"        => "Suaslódáil comhaid agus í­omhánna",
-    "Imagelist"     => "Liosta í­omhánna",
-    "Listusers"     => "Úsáideoirí­ cláraithe",
-    "Statistics"    => "Staitistic an shuí­omh",
-    "Randompage"    => "Leathanach fánach",
-
-    "Lonelypages"   => "Leathanaigh dí­lleachtaí­",
-    "Unusedimages"  => "Íomhánna dí­lleachtaí­",
-    "Popularpages"  => "Ailt coitianta",
-    "Wantedpages"   => "Ailt santaithe",
-    "Shortpages"    => "Ailt gairide",
-    "Longpages"     => "Ailt fada",
-    "Newpages"      => "Ailt nua",
-    "Ancientpages"  => "Ailt ársa",
-#   "Intl"      => "Lúibí­ní­ idirtheangacha",
-    "Allpages"      => "Gach leathanach de réir ainm",
-
-    "Ipblocklist"   => "Úsáideoirí­/IP-sheolaidh coisctha",
-    "Maintenance"   => "Leathanach coiméadta",
-    "Specialpages"  => "",
-    "Contributions" => "",
-    "Emailuser"     => "",
-    "Whatlinkshere" => "",
-    "Recentchangeslinked" => "",
-    "Movepage"      => "",
-    "Booksources"   => "Leabharfhoinsí­ seachtraí­",
-#   "Categories"    => "Ranganna leathanaigh",
-    "Export"        => "Onnmhairigh XML",
-    "Version"		=> "Leagan",
-);
-
-/* private */ $wgSysopSpecialPagesGa = array(
-    "Blockip"       => "Cuir cosc ar úsáideoir/IP-sheoladh",
-    "Asksql"        => "Cuir ceist ar an bhunachar sonraí­",
-    "Undelete"      => "Cuir leathanaigh scriosaithe ar ais"
-);
-
-/* private */ $wgDeveloperSpecialPagesGa = array(
-    "Lockdb"        => "Cuir glas ar an mbunachar sonraí­",
-    "Unlockdb"      => "Bain an glas den bunachar sonraí­",
-    "Debug"     => "Eolas chun fadhtanna a réitigh"
-);
-
 #-------------------------------------------------------------------
 # Default messages
 #-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
 
 /* private */ $wgAllMessagesGa = array(
 # User Toggles
@@ -241,7 +185,6 @@ agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar ú
 "aboutpage"     => "Vicipéid:Faoi",
 "help"      => "Cabhair",
 "helppage"      => "Vicipéid:Cabhair",
-"wikititlesuffix" => "Vicipéid",
 "bugreports"    => "Fabht-thuairiscí­",
 "bugreportspage"    => "Vicipéid:Fabht-thuairiscí­",
 "faq"           => "Ceisteanna Coiteanta",
@@ -306,7 +249,6 @@ agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar ú
 "viewcount"     => "Rochtainí­odh an leathanach seo $1 uair.",
 'copyright'	=> "Tá an t-ábhar le fáil faoin $1.",
 'poweredby'	=> "Cumhachtaítear an Vicipéid le [http://www.mediawiki.org/ MediaWiki], inneall mearshuímh shaor-fhoinse.",
-"gnunote"       => "Tá an téacs ar fad le fáil faoi na téarmaí­ an <a class=internal href='$wgScriptPath/GNU_FDL'>GNU Free Documentation License</a>.",
 "printsubtitle" => "(Ó {{SERVER}})",
 "protectedpage" => "Lch faoi ghlas",
 "administrators"    => "Vicipéid:Riarthóirí­",
@@ -318,9 +260,6 @@ Féach ar $1.",
 "developertext" => "Ní mór duit bheith i do \"cumadóir\"
 chun an gní­omh seo a dhéanamh.
 Féach ar $1.",
-'bureaucrattitle'	=> 'Tá cuntas maorlathaigh riachtanach',
-"bureaucrattext"	=> "Ní mór duit bheith i do \"maorlathach\"
-chun an gníomh seo a dhéanamh.",
 "nbytes"        => "$1 ochtáin",
 "go"            => "Dul",
 "ok"            => "Déan",
@@ -411,10 +350,10 @@ Feidhm: $1<br />
 "viewsource" => "Féach ar fhoinse",
 "protectedtext" => "Chuirtear ghlas ar an leathanach seo chun é a chosaint in aghaidh athruithe. Tá go leor
 cúiseanna féideartha don scéal seo. Féach ar
-[[$wgMetaNamespace:Leathanach faoi ghlas]] más é do thoil é.
+[[{{ns:project}}:Leathanach faoi ghlas]] más é do thoil é.
 
 Is féidir leat foinse an leathanaigh seo a féachaint agus a chóipeáil:",
-'seriousxhtmlerrors' => 'Chonacthas earráidí tábhachtacha xhtml i rith an glanadh.',
+
 
 # Login and logout pages
 #
@@ -434,12 +373,7 @@ Ná déan dearmad do sainroghanna phearsanta a athrú.",
 "newusersonly"  => " (D'úsáideoirí­ úrnua amháin)",
 "remembermypassword" => "Cuimhnigh m'fhocal faire.",
 "loginproblem"  => "<b>Bhí­ fadhb leis an logáil isteach.</b><br />Déan iarracht eile!",
-"alreadyloggedin" => "<font color=red><b>A húsáideoir $1, tá tú logáilte isteach cheana féin!</b></font><br />\n",
-
-"areyounew"     => "Má tá tú i do núí­osach chuig an Vicipéid agus tá cuntas úsáideora ag teastáil uait,
-iontráil ainm úsáideora, agus ansin iontráil agus athiontráil focal faire.
-Níl an seoladh rí­omhphoist ach rud roghnach; dá scríobhfá d'fhocal faire, is feidir leat a iarradh
-go seolfar é chuig an seoladh rí­omhphoist a thug tú.<br />\n",
+"alreadyloggedin" => "<strong>A húsáideoir $1, tá tú logáilte isteach cheana féin!</strong><br />\n",
 
 "login"     => "Log ann",
 'loginprompt'   => "Tá chomhaid aithintáin (<i>cookies</i>) riachtanach chun logáil isteach san {{SITENAME}} a dhéanamh.",
@@ -518,7 +452,7 @@ Agus atá sé agat, logáil isteach arí­s leis le do thoil.",
 "blockedtitle"  => "Tá an úsáideoir seo faoi chosc",
 "blockedtext"   => "Chuir $1 cosc ar d'ainm úsáideora nó do seoladh IP.
 Seo é an cúis a thugadh:<br />''$2''<p>Is féidir leat teagmháil a dhéanamh le $1 nó le ceann eile de na
-[[$wgMetaNamespace:Riarthóirí­|riarthóirí­]] chun an cosc a phléigh.
+[[{{ns:project}}:Riarthóirí­|riarthóirí­]] chun an cosc a phléigh.
 
 Tabhair faoi deara nach bhfuil cead agat an gné \"cuir rí­omhphost chuig an úsáideoir seo\" a úsáid
 mura bhfuil seoladh rí­omhphoist bailí­ cláraithe i do [[Speisialta:Preferences|shainroghanna úsáideora]].
@@ -549,7 +483,7 @@ i do úsáideoir gan ainm agus má tá sé do thuairim go rinneadh léiriuithe n
 [[Special:Userlogin|cruthaigh cuntas nó logáil isteach]] le do thoil chun mearbhall le húsáideoirí­ eile
 gan ainmneacha a héalaigh amach anseo.'' ",
 "noarticletext" => "(Ní­l aon téacs ar an leathanach seo faoi láthair)",
-'clearyourcache' => "'''Tabhair faoi deara:''' Tar éis duit ábhar a shábháil, ní mór duit taisce do líonléitheora chun na hathruithe a fheiceáil After saving, you have to clear your browser cache to see the changes: '''Mozilla / Netscape:''' roghnaigh ''Athlódáil'' (nó ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'clearyourcache' => "'''Tabhair faoi deara:''' Tar éis duit ábhar a shábháil, ní mór duit taisce do líonléitheora chun na hathruithe a fheiceáil: '''Mozilla / Firefox / Netscape:''' ''Ctrl-Shift-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'usercssjsyoucanpreview' => "<strong>Leid:</strong> Sula sábhálaím tú, úsáid an cnaipe 'Reamhspléach' chun do CSS/JS nua a tástáil.",
 'usercsspreview' => "'''Cuimhnigh nach bhfuil seo ach reamhspléachadh do CSS úsáideora - níor sábháladh é go fóill!'''",
 'userjspreview' => "'''Cuimhnigh nach bhfuil seo ach reamhspléachadh do JavaScript úsáideora - níor sábháladh é go fóill!'''",
@@ -665,7 +599,6 @@ Is é $2 d'uimhir aitheantais inmhéanach.
 Féach ar [[{{ns:4}}:Cabhair do sainroghanna úsáideora]] chun cabhair a fháil mar gheall ar na roghanna.",
  "prefsreset"    => "D'athraí­odh do chuid sainroghanna ar ais chuig an leagan bunúsach ón stóras.",
 "qbsettings"    => "Sainroghanna an bosca uirlisí­",
-'qbsettingsnote'	=> 'Ní oibríonn an sainrogha seo ach sna cumaí \'Gnáth\' agus \'Gorm Colóin\'.',
 "changepassword" => "Athraigh d'fhocal faire",
 "skin"          => "Cuma",
 "math"          => "Ag aistriú an matamaitic",
@@ -787,13 +720,9 @@ Is am an friothálaí­ (UTC) iad na hamanna atá anseo thí­os.
 "filedesc"      => "Achoimriú",
 "filestatus" => "Stádas cóipchirt",
 "filesource" => "Foinse",
-"affirmation"   => "Dearbhaí­m go aontaí­onn coimeádaí­ cóipchirt an comhaid seo
-é a ceadúnaigh de réir na téarmaí­ an $1.",
 "copyrightpage" => "Vicipéid:Cóipchearta",
 "copyrightpagename" => "Cóipcheart Vicipéide",
 "uploadedfiles" => "Comhaid suaslódálaithe",
-"noaffirmation" => "Ní mór duit a dearbhaigh nach sáraí­onn do suaslódáil
-aon cóipchearta.",
 "ignorewarning" => "Scaoil tharat an rabhadh agus sábháil an comhad ar aon chaoi.",
 "minlength"     => "Caithfidh trí­ litreacha ar a laghad bheith ann sa ainm í­omhá.",
 'illegalfilename'	=> 'Tá litreacha san comhadainm  "$1" a nach ceadaítear in ainm leathanaigh. Athainmnigh an comhad agus déan athiarracht, más é do thoil é.',
@@ -1034,7 +963,7 @@ Ba é [[Úsáideoir:$3|$3]] ([[Plé úsáideora:$3|Plé]]) an té a rinne an ath
 "revertpage"    => "D'athúsáideadh an athrú seo caite le $1",
 "protectlogpage" => "Cuntas_cosanta",
 "protectlogtext" => "Seo é liosta de glais a cuireadh ar / baineadh de leathanaigh.
-Féach ar [[$wgMetaNamespace:Leathanach faoi ghlas]] chun a thuilleadh eolais a fháil.",
+Féach ar [[{{ns:project}}:Leathanach faoi ghlas]] chun a thuilleadh eolais a fháil.",
 "protectedarticle" => "faoi ghlas [[$1]]",
 "unprotectedarticle" => "gan ghlas [[$1]]",
 'protectsub' =>"(Ag curadh \"$1\" faoi ghlas)",
@@ -1099,7 +1028,6 @@ leathanaigh áirithe a rinne an duine damáiste ar).",
 "ipbreason"     => "Cúis",
 "ipbsubmit"     => "Coisc an úsáideoir seo",
 "badipaddress"  => "Ní­l aon úsáideoir ann leis an ainm seo.",
-"noblockreason" => "Ní mór duit cúis a thabhairt don cosc.",
 "blockipsuccesssub" => "D'éirigh leis an cosc",
 "blockipsuccesstext" => "Choisceadh \"$1\".
 <br />Féach ar [[Speisialta:Ipblocklist|Liosta coisc IP]] chun coisc a athbhreithnigh.",
@@ -1153,18 +1081,6 @@ Cinntigh go bhfuil an scéal seo d'intinn agat.",
 <br />Cuimhnigh nach mór duit an glas a bhaint tar éis do chuid coinneála.",
 "unlockdbsuccesstext" => "Baineadh an glas den bunachar sonraí­ Vicipéide.",
 
-# SQL query
-#
-"asksql"        => "Órdú SQL",
-"asksqltext"    => "Úsáid an foirm anseo thí­os chun órdú dí­reach a chur chuig an bunachar sonraí­ Vicipéide.
-Úsáid comharthaí­ athfhriotail singile ('mar sin') chun teorainn a chur le litriúla sraithe. Úsáid an gné seo go coigilteach.",
-"sqlislogged"   => "Tabhair faoi deara go cuirtear gach órdú i gcuntas.",
-"sqlquery"      => "Iontráil órdú",
-"querybtn"      => "Cuir órdú",
-"selectonly"    => "Ní­l na ceisteanna ina theannta \"SELECT\" ann ach amháin do
-cumadóirí­ Vicipéide.",
-"querysuccessful" => "D'éirigh leis an t-órdú",
-
 # Make sysop
 'makesysoptitle'	=> 'Déan ceannasaí de úsáideoir',
 'makesysoptext'		=> 'Úsáideann maorlathaigh an fhoirm seo chun riarthóirí a dhéanamh de ghnáthúsáideoirí.
@@ -1308,7 +1224,7 @@ air, nó is féidir leat é a coinniú do do chuid shiamsa féin.",
 
 # Attribution
 
-'anonymous' => "Úsáideoir(í) gan ainm ar $wgSitename",
+'anonymous' => "Úsáideoir(í) gan ainm ar {{SITENAME}}",
 'siteuser' => "Úsáideoir Vicipéide $1", #FIXME - genitive needed here
 'lastmodifiedby' => "Athraíodh an leathanach seo go deireanach ag $1 le $2.",
 'and' => 'agus',
@@ -1338,12 +1254,12 @@ Is dócha gur mhaith leat an gnáth-leagan seo a seiceáil chun patrúin a fheic
 
 # Math options
 
-    'mw_math_png' => "Déan PNG-í­omhá gach uair",
-    'mw_math_simple' => "Déan HTML má tá sin an-easca, nó PNG ar mhodh eile",
-    'mw_math_html' => "Déan HTML más féidir, nó PNG ar mhodh eile",
-    'mw_math_source' => "Fág mar cló TeX (do teacsleitheoirí­)",
-    'mw_math_modern' => "Inmholta do lí­onleitheoirí­ nua",
-    'mw_math_mathml' => 'MathML más féidir (turgnamhach)',
+'mw_math_png' => "Déan PNG-í­omhá gach uair",
+'mw_math_simple' => "Déan HTML má tá sin an-easca, nó PNG ar mhodh eile",
+'mw_math_html' => "Déan HTML más féidir, nó PNG ar mhodh eile",
+'mw_math_source' => "Fág mar cló TeX (do teacsleitheoirí­)",
+'mw_math_modern' => "Inmholta do lí­onleitheoirí­ nua",
+'mw_math_mathml' => 'MathML más féidir (turgnamhach)',
 
 # Monobook.js: tooltips and access keys for monobook
 'Monobook.js' => '/* leideanna uirlisí agus cnaipí rochtana */
@@ -1423,21 +1339,6 @@ class LanguageGa extends LanguageUtf8 {
 		return $wgDateFormatsGa;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesGa;
-		return $wgValidSpecialPagesGa;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesGa;
-		return $wgSysopSpecialPagesGa;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesGa;
-		return $wgDeveloperSpecialPagesGa;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesGa;
 		if( isset( $wgAllMessagesGa[$key] ) ) {
diff --git a/languages/LanguageGem_alsatian.php b/languages/LanguageGem_alsatian.php
index e199ef629f64..068e1f961e47 100644
--- a/languages/LanguageGem_alsatian.php
+++ b/languages/LanguageGem_alsatian.php
@@ -5,7 +5,7 @@
   */
 
 /*
-<Melancholie> for the moment it would be the best if LanguageAls.php would be 
+<Melancholie> for the moment it would be the best if LanguageAls.php would be
               the same like LanguageDe.php. That would help us a lot at als.
 <Melancholie> at the moment all is in English
 <TimStarling> ok
diff --git a/languages/LanguageHe.php b/languages/LanguageHe.php
index 46a271594ff6..42951dca816c 100644
--- a/languages/LanguageHe.php
+++ b/languages/LanguageHe.php
@@ -6,32 +6,25 @@
 
 require_once("LanguageUtf8.php");
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesHe = array(
-	-2	=> "Media",
-	-1	=> "מיוחד",
-	0	=> "",
-	1	=> "שיחה",
-	2	=> "משתמש",
-	3	=> "שיחת_משתמש",
-	4	=> $wgMetaNamespace,
-	5	=> "שיחת_" . $wgMetaNamespace,
-	6	=> "תמונה",
-	7	=> "שיחת_תמונה",
-	8	=> "MediaWiki",
-	9	=> "שיחת_MediaWiki",
-	10	=> "תבנית",
-	11	=> "שיחת_תבנית",
-	12	=> "עזרה",
-	13	=> "שיחת_עזרה",
-	14	=> "קטגוריה",
-	15	=> "שיחת_קטגוריה",
+	NS_MEDIA          => "Media",
+	NS_SPECIAL        => "מיוחד",
+	NS_MAIN           => "",
+	NS_TALK           => "שיחה",
+	NS_USER           => "משתמש",
+	NS_USER_TALK      => "שיחת_משתמש",
+	NS_PROJECT        => $wgMetaNamespace,
+	NS_PROJECT_TALK   => "שיחת_" . $wgMetaNamespace,
+	NS_IMAGE          => "תמונה",
+	NS_IMAGE_TALK     => "שיחת_תמונה",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "שיחת_MediaWiki",
+	NS_TEMPLATE       => "תבנית",
+	NS_TEMPLATE_TALK  => "שיחת_תבנית",
+	NS_HELP           => "עזרה",
+	NS_HELP_TALK      => "שיחת_עזרה",
+	NS_CATEGORY       => "קטגוריה",
+	NS_CATEGORY_TALK  => "שיחת_קטגוריה",
 ) + $wgNamespaceNamesEn;
 
 /* Custom namespaces for portal and portal_talk */
@@ -49,11 +42,7 @@ $wgExtraNamespaces = array(
 	'cologneblue' => "מים כחולים",
 	'smarty' => "Paddington",
 	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+) + $wgSkinNamesEn;
 
 
 
@@ -65,56 +54,6 @@ $wgExtraNamespaces = array(
 );
 
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesHe = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "קבע העדפות משתמש",
-	"Watchlist"		=> "רשימת המעקב שלי",
-	"Recentchanges" => "דפים שעודכנו לאחרונה",
-	"Upload"		=> "העלה קובץ לשרת",
-	"Imagelist"		=> "רשימת תמונות",
-	"Listusers"		=> "משתמשים רשומים",
-	"Statistics"	=> "סטטיסטיקות האתר",
-	"Randompage"	=> "מאמר אקראי",
-
-	"Lonelypages"	=> "מאמרים יתומים",
-	"Unusedimages"	=> "תמונות יתומות",
-	"Popularpages"	=> "מאמרים פופלריים",
-	"Wantedpages"	=> "דפים מבוקשים ביותר",
-	"Shortpages"	=> "מאמרים קצרים",
-	"Longpages"		=> "מאמרים ארוכים",
-	"Newpages"		=> "מאמרים חדשים",
-	"Ancientpages"		=> "Oldest pages",
-	"Allpages"		=> "כל המאמרים לפי כותרת",
-
-	"Ipblocklist"	=> "כתובות IP חסומות",
-	"Maintenance" => "דף תחזוקה",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "משאבי ספרות חיצוניים",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesHe = array(
-	"Blockip"		=> "חסום כתובת IP",
-	"Asksql"		=> "שאילתא לבסיס-הנתונים",
-	"Undelete"		=> "צפה ושחזר דפים מחוקים"
-);
-
-/* private */ $wgDeveloperSpecialPagesHe = array(
-	"Lockdb"		=> "הפוך את בסיס-הנתונים לקריא-בלבד",
-	"Unlockdb"		=> "החזר הרשאת כתיבה לבסיס-הנתונים",
-);
-
 /* private */ $wgAllMessagesHe = array(
 
 # User Toggles
@@ -182,7 +121,6 @@ $wgExtraNamespaces = array(
 'article' => 'מאמר', #????
 "help"			=> "עזרה",
 "helppage"		=> "ויקיפדיה:עזרה",
-"wikititlesuffix" => "ויקיפדיה",
 "bugreports"	=> "דווח על באגים",
 "bugreportspage" => "ויקיפדיה:דווח_על_באגים",
 "faq"			=> "שאלות ותשובות",
@@ -227,7 +165,6 @@ $wgExtraNamespaces = array(
 "redirectedfrom" => "(הופנה מ - $1)",
 "lastmodified"	=> "שונה לאחרונה ב $1.",
 "viewcount"		=> "דף זה נצפה $1 פעמים.",
-"gnunote" => "מוגש תחת הרשיון לשימוש חופשי <a class=internal href='/wiki/GNU_FDL'>GNU FDL</a>.",
 "printsubtitle" => "(מ - {{SERVER}})",
 "protectedpage" => "דף מוגן",
 "administrators" => "ויקיפדיה:מפעיל_מערכת",
@@ -258,7 +195,7 @@ $wgExtraNamespaces = array(
 "error"			=> "שגיאה",
 "databaseerror" => "שגיאת בסיס-נתונים",
 "dberrortext"	=> "ארעה שגיאת תחביר בשאילתא לבסיס-הנתונים.
-השאילתה האחרונה שבוצעה לבסיס-הנתונים היתה: 
+השאילתה האחרונה שבוצעה לבסיס-הנתונים היתה:
 <blockquote><tt>$1</tt></blockquote>
 מהפונקציה \"<tt>$2</tt>\".
 בסיס-הנתונים החזיר את השגיאה: \"<tt>$3: $4</tt>\" ",
@@ -278,7 +215,7 @@ $1",
 "filedeleteerror" => "מחיקת \"$1\" לא הצליחה.",
 "filenotfound"	=> "הקובץ \"$1\" לא נמצא.",
 "unexpected"	=> "ערך לא צפוי: \"$1\"=\"$2\"",
-"formerror"		=> "שגיאה: לא יכול לשלוח טופס.",	
+"formerror"		=> "שגיאה: לא יכול לשלוח טופס.",
 "badarticleerror" => "לא ניתן לבצע פעולה זו בדף זה.",
 "cannotdelete"	=> "מחיקת הדף או קובץ התמונה לא הצליחה. (יתכן שנמחקה כבר על-ידי מישהו אחר)",
 "badtitle"		=> "כותרת שגויה",
@@ -298,7 +235,7 @@ $1",
 "newusersonly"	=> " (רק אם את/ה משתמש חדש)",
 "remembermypassword" => "זכור את הסיסמא שלי בפעם הבאה.",
 "loginproblem"	=> "<b>ארעה שגיאה בכניסה לאתר. </b><br />!נסה שנית",
-"alreadyloggedin" => "<font color=red><b> משתמש $1, כבר ביצעת כניסה לאתר!</b></font><br />\n",
+"alreadyloggedin" => "<strong> משתמש $1, כבר ביצעת כניסה לאתר!</strong><br />\n",
 
 "login"			=> "כניסה לחשבון",
 "userlogin"		=> "כניסה לחשבון",
@@ -358,7 +295,7 @@ $1",
 "editingold"	=> "<strong>זהירות: את/ה עורך/ת גירסה לא עדכנית של הדף הזה.
 אם תשמור/י, כל השינויים שנעשו מאז גירסה זו יאבדו. </strong>",
 "yourdiff"		=> "הבדלים",
-"copyrightwarning" => "אנא שים/י לב שכל תרומה לויקיפידיה מוצאת לאור תחת הרשיון לשימוש חופשי במסמכים של GNU (ראה $1 לפרטים). אם אינך רוצה שעבודתך תהיה זמינה לעריכה על ידי אחרים, ותופץ לעיני כל, אל תפרסם/י אותה פה. כמו-כן, את/ה מבטיח/ה לנו כי את/ה כתבת את הטקסט הזה בעצמך, או העתקת אותו ממקור שאינו מוגן על-ידי זכויות יוצרים. 
+"copyrightwarning" => "אנא שים/י לב שכל תרומה לויקיפידיה מוצאת לאור תחת הרשיון לשימוש חופשי במסמכים של GNU (ראה $1 לפרטים). אם אינך רוצה שעבודתך תהיה זמינה לעריכה על ידי אחרים, ותופץ לעיני כל, אל תפרסם/י אותה פה. כמו-כן, את/ה מבטיח/ה לנו כי את/ה כתבת את הטקסט הזה בעצמך, או העתקת אותו ממקור שאינו מוגן על-ידי זכויות יוצרים.
 <strong> אל תעשו שימוש בחומר המוגן בזכויות יוצרים ללא רשות! </strong>",
 "longpagewarning" => "<strong>אזהרה: גודל דף זה הוא $1 קילובייט. בדפדפנים מסוימים יהיו בעיות בעריכת דף הגדול מ32 קילובייט. אנא שיקלו לחלק דף זה לדפים קטנים יותר</strong>",
 "readonlywarning" => "<strong>אזהרה: בסיס-הנתונים ננעל לצורך תחזוקה. אי אפשר לשמור את העריכות בזמן זה. אתם יכולים להשתמש בעורך חיצוני עד שתסוים התחזוקה. אנו מתנצלים על התקלה.</strong>",
@@ -423,7 +360,7 @@ $3 $9",
 "prefsnologintext"	=> "עליך להיכנס לחשבון כדי לשנות העדפות משתמש",
 "prefslogintext" => "נכנסת בשם \"$1\", מספרך הסידורי הוא $2.",
 "prefsreset"	=> "העדפותיך שוחזרו מברירת המחדל.",
-"qbsettings"	=> "הגדרות סרגל מהיר", 
+"qbsettings"	=> "הגדרות סרגל מהיר",
 "changepassword" => "שנה סיסמא",
 "skin"			=> "רקע",
 "math"			=> "תצוגת נוסחאות מתמטיות",
@@ -498,7 +435,7 @@ $3 $9",
 הפורמט המועדף הוא JPEG לתצלומים, PNG לאיורים, שרטוטים וסמלים, ו-OGG לקבצי קול.
 
 אנא תן לקובץ שם המייצג היטב את תוכנו כדי למנוע בלבול.
-כדי לכלול את התמונה במאמר, צור קישור מסוג 
+כדי לכלול את התמונה במאמר, צור קישור מסוג
 '''<nowiki>[[image:file.jpg]]</nowiki>''' או '''<nowiki>[[image:file.png|alt text]]</nowiki>'''
 או '''<nowiki>[[media:file.ogg]]</nowiki>''' לקבצי קול.
 
@@ -512,11 +449,9 @@ $3 $9",
 ",
 "filename"		=> "שם הקובץ",
 "filedesc"		=> "תקציר",
-"affirmation"	=> "אני מצהיר/ה שבעל זכויות היוצרים על קובץ זה מתיר לי להפיץ אותו תחת תנאי $1.",
 "copyrightpage" => "ויקיפדיה:זכויות_יוצרים",
 "copyrightpagename" => "זכויות היוצרים של ויקיפדיה",
 "uploadedfiles"	=> "קבצים שהועלו",
-"noaffirmation" => "עליך להבטיח שהעלאת הקובץ אינה מפירה זכויות יוצרים.",
 "ignorewarning"	=> "התעלם מהאזהרה ושמור את הקובץ בכל זאת.",
 "minlength"		=> "שמות של קובצי תמונה צריכים להיות בני שלושה תווים לפחות.",
 "badfilename"	=> "שם התמונה שונה ל - \"$1\".",
@@ -723,7 +658,6 @@ $3 $9",
 "ipbreason"		=> "סיבה",
 "ipbsubmit"		=> "חסום כתובת זו",
 "badipaddress"	=> ".כתובת ה-IP אינה כתובה נכון",
-"noblockreason" => ".עליך לציין סיבה לחסימה",
 "blockipsuccesssub" => "החסימה הצליחה",
 "blockipsuccesstext" => "הכתובת \"$1\" נחסמה.
 <br />ראה את [[מיוחד:רשימת כתובות IP חסומות|רשימת הכתובות החסומות]] כדי לצפות בחסימות",
@@ -756,16 +690,6 @@ $3 $9",
 <br />זכור לשחרר את הנעילה לאחר שפעולת התחזוקה הסתיימה.",
 "unlockdbsuccesstext" => "שוחררה הנעילה מבסיס-הנתונים של ויקיפדיה",
 
-# SQL query
-#
-"asksql"		=> "שאילתת SQL",
-"asksqltext"	=> "השתמש/י בטופס שלהלן לביצוע שאילתא ישירה לבסיס-הנתונים של ויקיפדיה.
-אנא עשה/י שימוש בגרשיים בודדים ('כך') כדי לתחום שרשראות תווים. (String literals). פעולה זו יוצרת לעיתים קרובות עומס רב על השרת, אנא השתמשו באפשרות זו כמה שפחות.",
-"sqlquery"		=> "הזן שאילתא",
-"querybtn"		=> "בצע שאילתא",
-"selectonly"	=> "שאילתות שאינן \"SELECT\" אפשריות רק למפתחי ויקיפדיה.",
-"querysuccessful" => "השאילתא הצליחה",
-
 # Move page
 #
 "movepage"		=> "העבר דף",
@@ -802,12 +726,12 @@ $3 $9",
 
 # Math
 
-	'mw_math_png' =>  "תמיד הצג כ-PNG",
-	'mw_math_simple' => "HTML אם פשוט, אחרת PNG",
-	'mw_math_html' => "HTML אם אפשר, אחרת PNG",
-	'mw_math_source' => "השאר כקוד TeX",
-	'mw_math_modern' => "מומלץ לדפדפנים עדכניים",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' =>  "תמיד הצג כ-PNG",
+'mw_math_simple' => "HTML אם פשוט, אחרת PNG",
+'mw_math_html' => "HTML אם אפשר, אחרת PNG",
+'mw_math_source' => "השאר כקוד TeX",
+'mw_math_modern' => "מומלץ לדפדפנים עדכניים",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -839,21 +763,6 @@ class LanguageHe extends LanguageUtf8 {
 		return $wgSkinNamesHe;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesHe;
-		return $wgValidSpecialPagesHe;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesHe;
-		return $wgSysopSpecialPagesHe;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesHe;
-		return $wgDeveloperSpecialPagesHe;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesHe;
 		if(array_key_exists($key, $wgAllMessagesHe))
@@ -864,7 +773,7 @@ class LanguageHe extends LanguageUtf8 {
 
 	function isRTL() { return true; }
 
-	function fallback8bitEncoding() { return "iso8859-8"; }                
+	function fallback8bitEncoding() { return "iso8859-8"; }
 
 }
 
diff --git a/languages/LanguageHi.php b/languages/LanguageHi.php
index 2084ba6a6e5c..527045817dd5 100644
--- a/languages/LanguageHi.php
+++ b/languages/LanguageHi.php
@@ -6,13 +6,6 @@
 
 require_once( "LanguageUtf8.php" );
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesHi = array(
 	NS_MEDIA          => 'Media',
 	NS_SPECIAL        => 'विशेष',
@@ -78,7 +71,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "विकिपीडिया:अबाउट",
 "help"			=> "सहायता",
 "helppage"		=> "विकिपीडिया:सहायता",
-"wikititlesuffix"       => "विकिपीडिया",
 "bugreports"	        => "Bug reports",
 "bugreportspage"        => "विकिपीडिया:Bug_reports",
 "faq"			=> "FAQ",
@@ -120,7 +112,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom"        => "($1 से भेजा गया)",
 "lastmodified"	        => "अन्तिम परिवर्तन $1.",
 "viewcount"		=> "यह पृष्ठ $1 बार देखा गया है",
-"gnunote" => "All text is available under the terms of the <a class=internal href='/wiki/GNU_FDL'>GNU Free Documentation License</a>.",
 "printsubtitle"         => "(From {{SERVER}})",
 "protectedpage"         => "सुरक्षित पृष्ठ",
 "administrators"        => "विकिपीडिया:प्रबन्धक",
@@ -177,8 +168,7 @@ class LanguageHi extends LanguageUtf8 {
 		return $wgNamespaceNamesHi;
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesHi;
 		if(array_key_exists($key, $wgAllMessagesHi))
 			return $wgAllMessagesHi[$key];
@@ -194,6 +184,7 @@ class LanguageHi extends LanguageUtf8 {
 			return $number;
 		}
 	}
+
 }
 
 ?>
diff --git a/languages/LanguageHu.php b/languages/LanguageHu.php
index 32b6fa84f9b2..67ac7bb0de89 100644
--- a/languages/LanguageHu.php
+++ b/languages/LanguageHu.php
@@ -9,35 +9,32 @@
 
 require_once("LanguageUtf8.php");
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( " ", "_", $wgSitename );
+	$wgMetaNamespace = str_replace( " ", "_", $wgSitename );
 
 # suffixed project name (Wikipédia -> Wikipédiá) -- ról, ba, k
 $wgSitenameROL = $wgSitename . "ról";
 $wgSitenameBA = $wgSitename . "ba";
 $wgSitenameK = $wgSitename . "k";
-if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) { 
+if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 	$wgSitenameROL = "Wikipédiáról";
 	$wgSitenameBA  = "Wikipédiába";
-	$wgSitenameK   = "Wikipédiák";	
+	$wgSitenameK   = "Wikipédiák";
 
-} elseif( 0 == strcasecmp( "Wikidézet", $wgSitename ) ) { 
+} elseif( 0 == strcasecmp( "Wikidézet", $wgSitename ) ) {
 	$wgSitenameROL = "Wikidézetről";
 	$wgSitenameBA  = "Wikidézetbe";
-	$wgSitenameK   = "Wikidézetek";	
+	$wgSitenameK   = "Wikidézetek";
 
-} elseif( 0 == strcasecmp( "Wikiszótár", $wgSitename ) ) { 
+} elseif( 0 == strcasecmp( "Wikiszótár", $wgSitename ) ) {
 	$wgSitenameROL = "Wikiszótárról";
 	$wgSitenameBA  = "Wikiszótárba";
-	$wgSitenameK   = "Wikiszótárak";	
+	$wgSitenameK   = "Wikiszótárak";
 
-} elseif( 0 == strcasecmp( "Wikikönyvek", $wgSitename ) ) { 
+} elseif( 0 == strcasecmp( "Wikikönyvek", $wgSitename ) ) {
 	$wgSitenameROL = "Wikikönyvekről";
 	$wgSitenameBA  = "Wikikönyvekbe";
-	$wgSitenameK   = "Wikikönyvek";	
+	$wgSitenameK   = "Wikikönyvek";
 }
 
 /* private */ $wgNamespaceNamesHu = array(
@@ -61,7 +58,7 @@ if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 	NS_CATEGORY_TALK	=> "Kategória_vita"
 ) + $wgNamespaceNamesEn;
 
-/* Inherit default options; make specific changes via 
+/* Inherit default options; make specific changes via
    custom getDefaultUserOptions() if needed. */
 
 /* private */ $wgQuickbarSettingsHu = array(
@@ -71,78 +68,14 @@ if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 /* private */ $wgSkinNamesHu = array(
 	'standard' => "Alap",
 	'nostalgia' => "Nosztalgia",
-	'cologneblue' => "Kölni kék",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+	'cologneblue' => "Kölni kék"
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgDateFormatsHu = array(
 #	"Mindegy",
 );
 
-
-/* Change bookstore list through the wiki page [[hu:{$wgMetaNamespace}:Külső könyvinformációk]] */
-
-/* Language names should be the native names. Inherit common array from Language.php */
-
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesHu = array(
-	"Userlogin"	=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Beállításaim",
-	"Watchlist"	=> "Figyelőlistám",
-	"Recentchanges" => "Frissen változtatott oldalak",
-	"Upload"	=> "Képek feltöltése",
-	"Imagelist"	=> "Képek listája",
-	"Listusers"	=> "Regisztrált felhasználók",
-	"Statistics"	=> "Weblap statisztika",
-	"Randompage"	=> "Egy lap találomra",
-	
-	"Lonelypages"	=> "Árva szócikkek",
-	"Unusedimages"	=> "Árva képek",
-	"Popularpages"	=> "Népszerű szócikkek",
-	"Wantedpages"	=> "Hiányszócikkek",
-	"Shortpages"	=> "Rövid szócikkek",
-	"Longpages"	=> "Hosszú szócikkek",
-	"Newpages"	=> "Újonnan készült szócikkek",
-	"Ancientpages"	=> "Ősi szócikkek",
-#	"Intl"	=> "Nyelvek közötti linkek",
-	"Allpages"	=> "Az összes lap cím szerint",
-	
-	"Ipblocklist"	=> "Blokkolt IP címek",
-	"Maintenance" => "Karbantartási lap",
-	"Specialpages"  => "Speciális lapok",
-	"Contributions" => "Hozzájárulások",
-	"Emailuser"	=> "Email írása",
-	"Whatlinkshere" => "Mi mutat ide",
-	"Recentchangeslinked" => "Kapcsolódó változások",
-	"Movepage"	=> "Lap mozgatása",
-	"Booksources"	=> "Külső könyvinformációk",
-	"Categories" => "Lapkategóriák",
-	"Export" => "XML export",
-	"Version" => "Version",
-);
-
-/* private */ $wgSysopSpecialPagesHu = array(
-	"Blockip"	=> "Block an IP address",
-	"Asksql"	=> "Query the database",
-	"Undelete"	=> "Restore deleted pages"
-);
-
-/* private */ $wgDeveloperSpecialPagesHu = array(
-	"Lockdb"	=> "Make database read-only",
-	"Unlockdb"	=> "Restore DB write access",
-);
-
 /* private */ $wgAllMessagesHu = array(
 
 # User Toggles
@@ -212,17 +145,16 @@ if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 "mainpage"		=> "Kezdőlap",
 "mainpagetext"	=> "Wiki szoftver sikeresen telepítve.",
 "about"			=> "Névjegy",
-"aboutsite"      => "A $wgSitenameROL",
-"aboutpage"		=> "{$wgMetaNamespace}:Névjegy",
+"aboutsite"      => "A {{SITENAME}}ROL",
+"aboutpage"		=> "{{{ns:project}}}:Névjegy",
 "help"			=> "Segítség",
-"helppage"		=> "{$wgMetaNamespace}:Segítség",
-"wikititlesuffix" => $wgSitename,
+"helppage"		=> "{{{ns:project}}}:Segítség",
 "bugreports"	=> "Hibajelentés",
-"bugreportspage" => "{$wgMetaNamespace}:Hibajelentések",
+"bugreportspage" => "{{{ns:project}}}:Hibajelentések",
 "faq"			=> "GyIK",
-"faqpage"		=> "{$wgMetaNamespace}:GyIK",
+"faqpage"		=> "{{{ns:project}}}:GyIK",
 "edithelp"		=> "Segítség a szerkesztéshez",
-"edithelppage"	=> "{$wgMetaNamespace}:Hogyan_szerkessz_egy_lapot",
+"edithelppage"	=> "{{{ns:project}}}:Hogyan_szerkessz_egy_lapot",
 "cancel"		=> "Vissza",
 "qbfind"		=> "Keresés",
 "qbbrowse"		=> "Böngészés",
@@ -259,10 +191,9 @@ if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 "redirectedfrom" => "(Átirányítva $1 cikkből)",
 "lastmodified"	=> "A lap utolsó módosítása $1.",
 "viewcount"		=> "Ezt a lapot eddig $1 alkalommal látogatták.",
-"gnunote" 		=> "Minden szöveg a <a class=internal href='/wiki/GNU_FDL'>GNU Szabad Dokumentációk Liszensze</a> feltételei mellett érhető el.",
 "printsubtitle" => "(From {{SERVER}})",
 "protectedpage" => "Védett lap",
-"administrators" => "{$wgMetaNamespace}:Adminisztrátorok",
+"administrators" => "{{{ns:project}}}:Adminisztrátorok",
 "sysoptitle"	=> "Sysop hozzáférés szükséges",
 "sysoptext"		=> "Az általad kért tevékenységet csak \"sysopok\" végezhetik el.
 Lásd $1.",
@@ -273,7 +204,7 @@ See $1.",
 "nbytes"		=> "$1 byte",
 "go"			=> "Menj",
 "ok"			=> "OK",
-"sitetitle"		=> $wgSitename,
+"sitetitle"		=> "{{SITENAME}}",
 "sitesubtitle"	=> "A szabad enciklopédia",
 "retrievedfrom" => "Retrieved from \"$1\"",
 "newmessages" 	=> "$1 van.",
@@ -288,10 +219,10 @@ See $1.",
 # Main script and global functions
 #
 "nosuchaction"	=> "Nincs ilyen tevékenység",
-"nosuchactiontext" => "Az URL által megadott tevékenységet a $wgSitename
+"nosuchactiontext" => "Az URL által megadott tevékenységet a {{SITENAME}}
 software nem ismeri fel",
 "nosuchspecialpage" => "Nincs ilyen speciális lap",
-"nospecialpagetext" => "Olyan speciális lapot kértél amit a $wgSitename
+"nospecialpagetext" => "Olyan speciális lapot kértél amit a {{SITENAME}}
 software nem ismer fel.",
 
 # General errors
@@ -314,8 +245,8 @@ A MySQL hiba \"$3: $4\".\n",
 "readonly"		=> "Adatbázis lezárva",
 "enterlockreason" => "Add meg a lezárás indoklását valamint egy becslést,
 hogy mikor kerül a lezárás feloldásra",
-"readonlytext"	=> "A $wgSitename adatbázis jelenleg le van zárva az új
-szócikkek és módosítások elől, valószínűleg adatbázis karbantartás miatt, 
+"readonlytext"	=> "A {{SITENAME}} adatbázis jelenleg le van zárva az új
+szócikkek és módosítások elől, valószínűleg adatbázis karbantartás miatt,
 aminek a végén minden visszaáll a régi kerékvágásba.
 Az adminisztrátor aki a lezárást elvégezte az alábbi magyarázatot adta:
 <p>$1",
@@ -341,7 +272,7 @@ találtál a software-ben. Kérlek értesíts erről egy adminisztrátort,
 "badtitletext"	=> "A kért cím helytelen, üres vagy hibásan hivatkozik
 egy nyelvek közötti vagy wikik közötti címre.",
 "perfdisabled" 	=> "Bocsánat! Ez a lehetőség időszakosan nem elérhető
-mert annyira lelassítja az adatbázist, hogy senki nem tudja a 
+mert annyira lelassítja az adatbázist, hogy senki nem tudja a
 wikit használni.",
 "perfdisabledsub" => "Íme $1 egy elmentett másolata:",
 
@@ -349,12 +280,12 @@ wikit használni.",
 #
 "logouttitle"	=> "Kilépés",
 "logouttext"	=> "Kiléptél.
-Folytathatod a $wgSitename használatát név nélkül, vagy beléphetsz
+Folytathatod a {{SITENAME}} használatát név nélkül, vagy beléphetsz
 újra vagy másik felhasználóként.\n",
 
 "welcomecreation" => "<h2>Üdvözöllek, $1!</h2><p>A felhasználói környezeted
 létrehoztam.
-Ne felejtsd el átnézni a személyes $wgSitename beállításaidat.",
+Ne felejtsd el átnézni a személyes {{SITENAME}} beállításaidat.",
 
 "loginpagetitle" => "Belépés",
 "yourname"		=> "A felhasználói neved",
@@ -363,7 +294,7 @@ Ne felejtsd el átnézni a személyes $wgSitename beállításaidat.",
 "newusersonly"	=> " (csak új felhasználóknak)",
 "remembermypassword" => "Jelszó megjegyzése a használatok között.",
 "loginproblem"	=> "<b>Valami probléma van a belépéseddel.</b><br />Kérlek próbáld ismét!",
-"alreadyloggedin" => "<font color=red><b>Kedves $1, már be vagy lépve!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Kedves $1, már be vagy lépve!</strong><br />\n",
 
 "login"			=> "Belépés",
 "userlogin"		=> "Belépés",
@@ -383,12 +314,12 @@ elfelejted a jelszavadat.",
 "loginerror"	=> "Belépési hiba.",
 "noname"		=> "Nem adtál meg érvényes felhasználói nevet.",
 "loginsuccesstitle" => "Sikeres belépés",
-"loginsuccess"	=> "Beléptél a $wgSitenameBA \"$1\"-ként.",
+"loginsuccess"	=> "Beléptél a {{SITENAME}}BA \"$1\"-ként.",
 "nosuchuser"	=> "Nincs olyan felhasználó hogy \"$1\".
 Ellenőrizd a gépelést, vagy készíts új nevet a fent látható űrlappal.",
 "wrongpassword"	=> "A megadott jelszó helytelen.",
 "mailmypassword" => "Küldd el nekem a jelszavamat emailben",
-"passwordremindertitle" => "$wgSitename jelszó emlékeztető",
+"passwordremindertitle" => "{{SITENAME}} jelszó emlékeztető",
 "passwordremindertext" => "Valaki (vélhetően te, a $1 IP számról)
 azt kérte, hogy küldjük el a jelszavadat.
 A jelszavad a \"$2\" felhasználóhoz most \"$3\".
@@ -410,7 +341,7 @@ Lépj be a levélben található adatokkal.",
 "blockedtext"	=> "A felhasználói neved vagy IP számod $1 letiltotta.
 Az indoklás:<br />''$2''
 <p>Felveheted a kapcsolatot $1 adminnal vagy bármely más
-[[{$wgMetaNamespace}:adminisztrátorok|adminisztrátorral]] hogy megvitasd a letiltást.",
+[[{{{ns:project}}}:adminisztrátorok|adminisztrátorral]] hogy megvitasd a letiltást.",
 "whitelistedittitle" => "A szerkesztéshez be kell lépned",
 "whitelistedittext" => "A szócikkek szerkesztéséhez [[Special:Userlogin|be kell lépned]].",
 "whitelistreadtitle" => "Az olvasáshoz be kell lépned",
@@ -423,7 +354,7 @@ Az indoklás:<br />''$2''
 "newarticletext" =>
 "Egy olyan lapra jutottál ami még nem létezik.
 A lap létrehozásához kezdd el írni a szövegét lenti keretbe
-(a [[{$wgMetaNamespace}:Segítség|segítség]] lapon lelsz további 
+(a [[{{{ns:project}}}:Segítség|segítség]] lapon lelsz további
 információkat).
 Ha tévedésből jöttél ide, csak nyomd meg a böngésző '''Vissza/Back'''
 gombját.",
@@ -448,18 +379,18 @@ A módosításaid az alsó ablakban láthatóak.
 a \"Lap mentését\" választod.<br />",
 "yourtext"		=> "A te szöveged",
 "storedversion" => "A tárolt változat",
-"editingold"	=> "<strong>VIGYÁZAT! A lap egy elavult 
+"editingold"	=> "<strong>VIGYÁZAT! A lap egy elavult
 változatát szerkeszted.
-Ha elmented, akkor az ezen változat után végzett összes 
+Ha elmented, akkor az ezen változat után végzett összes
 módosítás elvész.</strong>",
 "yourdiff"		=> "Eltérések",
 "copyrightwarning" => "Kérlek vedd figyelembe hogy minden
-$wgSitenameBA küldött anyag a GNU Szabad Dokumentum Licenc alatti
+{{SITENAME}}BA küldött anyag a GNU Szabad Dokumentum Licenc alatti
 publikálásnak számít (lásd $1 a részletekért).
 Ha nem akarod, hogy az írásod könyörtelenül módosíthassák vagy
 tetszés szerint terjesszék, akkor ne küldd be ide.<br />
 A beküldéssel együtt azt is garantálod hogy mindezt saját
-magad írtad, vagy másoltad be egy szabadon elérhető vagy 
+magad írtad, vagy másoltad be egy szabadon elérhető vagy
 közkincs (public domain) forrásból.
 <strong>ENGEDÉLY NÉLKÜL NE KÜLDJ BE JOGVÉDETT ANYAGOKAT!</strong>",
 "longpagewarning" => "<strong>FIGYELEM: Ez a lap $1 kilobyte hosszú;
@@ -488,8 +419,8 @@ Kérlek ellenőrizd az URL-t amivel erre a lapra jutottál.\n",
 "last"			=> "előző",
 "orig"			=> "eredeti",
 "histlegend"	=> "Jelmagyarázat: (akt) = eltérés az aktuális változattól,
-(előző) = eltérés az előző változattól, 
-Legend: (cur) = difference with current version, 
+(előző) = eltérés az előző változattól,
+Legend: (cur) = difference with current version,
 A = Apró változtatás",
 
 # Diffs
@@ -524,7 +455,7 @@ próbálom a keresést a cikkek szövegében.",
 "showingresults" => "Lent látható <b>$1</b> találat, az eleje #<b>$2</b>.",
 "showingresultsnum" => "Lent látható <b>$3</b> találat, az eleje #<b>$2</b>.",
 "nonefound"		=> "<strong>Megyjegyzés</strong>: a sikertelen keresések
-gyakori oka olyan szavak keresése (pl. \"have\" és \"from\") amiket a 
+gyakori oka olyan szavak keresése (pl. \"have\" és \"from\") amiket a
 rendszer nem indexel fel, vagy több független keresési szó szerepeltetése
 (csak minden megadott szót tartalmazó találatok jelennek meg a
 végeredményben).",
@@ -540,12 +471,12 @@ $2 Átirányítások listája &nbsp; Keresés:$3 $9",
 #
 "preferences"	=> "Beállítások",
 "prefsnologin"	=> "Nem vagy belépve",
-"prefsnologintext"	=> "Ahhoz hogy a 
+"prefsnologintext"	=> "Ahhoz hogy a
 beállításaidat rögzíthesd [[Speciális:Belépés|be kell lépned]].",
 "prefslogintext" => "Be vagy lépve \"$1\" néven.
 A belső azonosítód $2.",
 "prefsreset"	=> "A beállítások törlődtek a tárolóból vett értékekre.",
-"qbsettings"	=> "Gyorsmenü beállítások", 
+"qbsettings"	=> "Gyorsmenü beállítások",
 "changepassword" => "Jelszó változtatása",
 # látvány? bőr?!
 "skin"			=> "Skin",
@@ -586,14 +517,14 @@ idő a GMT-től eltér (Magyarországon nyáron 2, télen 1).",
 
 "changes" 		=> "változtatás",
 "recentchanges" => "Friss változtatások",
-"recentchangestext" => "Ezen a lapon követheted a {{SITENAME}} történt legutóbbi 
-változtatásokat. [[{$wgMetaNamespace}:Üdvözlünk_látogató|Üdvözlünk, látogató]]!
-Légy szíves ismerkedj meg az alábbi lapokkal: [[{$wgMetaNamespace}:GyIK|$wgSitename GyIK]],
-[[{$wgMetaNamespace}:Irányelvek]] (különösen az [[{$wgMetaNamespace}:Elnevezési szokások|elnevezési szokásokat]],
-a [[{$wgMetaNamespace}:Semleges nézőpont|semleges nézőpontot]]), és a
-[[{$wgMetaNamespace}:Legelterjedtebb baklövések|legelterjedtebb baklövéseket]].
-Ha azt szeretnéd hogy a Wikipedia sikeres legyen akkor nagyon fontos, hogy 
-soha ne add hozzá mások [[{$wgMetaNamespace}:Copyright|jogvédett és nem felhasználható]]
+"recentchangestext" => "Ezen a lapon követheted a {{SITENAME}} történt legutóbbi
+változtatásokat. [[{{{ns:project}}}:Üdvözlünk_látogató|Üdvözlünk, látogató]]!
+Légy szíves ismerkedj meg az alábbi lapokkal: [[{{{ns:project}}}:GyIK|{{SITENAME}} GyIK]],
+[[{{{ns:project}}}:Irányelvek]] (különösen az [[{{{ns:project}}}:Elnevezési szokások|elnevezési szokásokat]],
+a [[{{{ns:project}}}:Semleges nézőpont|semleges nézőpontot]]), és a
+[[{{{ns:project}}}:Legelterjedtebb baklövések|legelterjedtebb baklövéseket]].
+Ha azt szeretnéd hogy a Wikipedia sikeres legyen akkor nagyon fontos, hogy
+soha ne add hozzá mások [[{{{ns:project}}}:Copyright|jogvédett és nem felhasználható]]
 anyagait.
 A jogi problémák komolyan árthatnak a projektnek ezért kérünk arra, hogy ne tegyél
 ilyet.",
@@ -648,16 +579,16 @@ nem sértesz meg semmilyen szerzői jogot.
 A \"Felküldés\" gombbal fejezheted be a küldést.
 Ez lassú internet kapcsolat esetén eltarthat egy kis ideig.
 
-A javasolt formátumok JPG a fotókhoz, PNG a rajzokhoz és 
+A javasolt formátumok JPG a fotókhoz, PNG a rajzokhoz és
 ikon jellegű képekhez és OGG a hanganyagokhoz.
 Kérünk arra, hogy a file-jaidnak jellemző, beszélő nevet adj hogy
-elkerüld a félreértéseket. A képet a cikkbe a 
+elkerüld a félreértéseket. A képet a cikkbe a
 '''<nowiki>[[kép:file.jpg]]</nowiki>''' vagy
 '''<nowiki>[[kép:file.png|leírás]]</nowiki>'''
-formában használhatod és '''<nowiki>[[media:file.ogg]]</nowiki>''' formában 
+formában használhatod és '''<nowiki>[[media:file.ogg]]</nowiki>''' formában
 a hanganyagokat.
 
-Kérünk hogy vedd figyelembe azt, hogy mint minden $wgSitename 
+Kérünk hogy vedd figyelembe azt, hogy mint minden {{SITENAME}}
 lap esetében bárki szerkesztheti vagy törölheti a felküldésedet
 ha úgy ítéli meg, hogy az hasznos a lexikonnak, vagy letiltásra
 kerülhetsz a felküldési lehetőségről ha visszaélsz a rendszerrel.",
@@ -672,13 +603,9 @@ Minden időpont a server idejében (UTC) van megadva.
 "filedesc"		=> "Összefoglaló",
 "filestatus" 	=> "Szerzői jogi állapot",
 "filesource" 	=> "Forrás",
-"affirmation"	=> "Igazolom hogy ezen file szerzői jogainak tulajdonosa
-elfogadja azt, hogy az anyag a $1 licenc alapján publikálásra kerül.",
-"copyrightpage" => "{$wgMetaNamespace}:Copyright",
-"copyrightpagename" => "$wgSitename copyright",
+"copyrightpage" => "{{{ns:project}}}:Copyright",
+"copyrightpagename" => "{{SITENAME}} copyright",
 "uploadedfiles"	=> "Felküldött file-ok",
-"noaffirmation" => "Igazolnod kell azt, hogy a felküldött file-ok 
-nem sértenek szerzői jogokat!",
 "ignorewarning"	=> "Mentés a figyelmeztetés figyelmen kívül hagyásával.",
 "minlength"		=> "A kép nevének legalább három betűből kell állnia.",
 "badfilename"	=> "A kép új neve \"$1\".",
@@ -724,12 +651,12 @@ más információ amit meg tudsz adni.",
 "sitestats"		=> "Server statisztika",
 "userstats"		=> "User statisztika",
 "sitestatstext" => "Az adatbázisban összesen <b>$1</b> lap található.
-Ebben benne vannak a \"vita\" lapok, a $wgSitenameROL szóló lapok, a
+Ebben benne vannak a \"vita\" lapok, a {{SITENAME}}ROL szóló lapok, a
 minimális \"csonk\" lapok, átirányítások és hasonlók amik vélhetően nem
-számítanak igazi szócikkeknek. 
+számítanak igazi szócikkeknek.
 Ezeket nem számítva <b>$2</b> lapunk van ami valószínűleg igazi szócikknek
 számít.<p>
-A magyar $wgSitename indítása óta (2003 júl 8) <b>$3</b> alkalommal néztek meg
+A magyar {{SITENAME}} indítása óta (2003 júl 8) <b>$3</b> alkalommal néztek meg
 lapokat a rendszeren, és <b>$4</b> alkalommal szerkesztett valaki lapot.
 Ezek alapján átlagosan egy lapot <b>$5</b> alkalommal szerkesztettek, és
 szerkesztésenként <b>$6</b> alkalommal nézték meg.",
@@ -742,7 +669,7 @@ Ebből <b>$2</b> darab adminisztrátor (lásd $3).",
 "maintnancepagetext" => "Ezen a lapon a mindennapi karbantartáshoz hasznos dologkat lelsz. Mivel ezek az adatbázist a szokásosnál jobban terhelik kérlek ne nyomj minden kijavított cikk után reloadot ;-)",
 "maintenancebacklink" => "Vissza a karbantartás lapra",
 "disambiguations" => "Egyértelműsítő lapok",
-"disambiguationspage" => "{$wgMetaNamespace}:Egyértelműsítő lapok",
+"disambiguationspage" => "{{ns:project}}:Egyértelműsítő lapok",
 "disambiguationstext"	=> "The following articles link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br />A page is treated as dismbiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
 "doubleredirects"	=> "Double Redirects",
 "doubleredirectstext"	=> "<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first #REDIRECT.<br />\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" taget article, which the first redirect should point to.",
@@ -752,7 +679,7 @@ Ebből <b>$2</b> darab adminisztrátor (lásd $3).",
 "selflinkstext"	=> "The following pages contain a link to themselves, which they should not.",
 "mispeelings"           => "Pages with misspellings",
 "mispeelingstext"	=> "The following pages contain a common misspelling, which are listed on $1. The correct spelling might be given (like this).",
-"mispeelingspage"	=> "{$wgMetaNamespace}:Gyakori elírások listája",
+"mispeelingspage"	=> "{{ns:project}}:Gyakori elírások listája",
 "missinglanguagelinks"  => "Missing Language Links",
 "missinglanguagelinksbutton"    => "Find missing language links for",
 "missinglanguagelinkstext"      => "These articles do <i>not</i> link to their counterpart in $1. Redirects and subpages are <i>not</i> shown.",
@@ -785,14 +712,14 @@ Ebből <b>$2</b> darab adminisztrátor (lásd $3).",
 "intl"			=> "Nyelvek közötti linkek",
 "movethispage"	=> "Mozgasd ezt a lapot",
 "unusedimagestext" => "<p>Vedd figyelembe azt hogy más
-lapok - mint például a nemzetközi $wgSitenameK - közvetlenül
+lapok - mint például a nemzetközi {{SITENAME}}K - közvetlenül
 hivatkozhatnak egy file URL-jére, ezért szerepelhet itt annak
 ellenére hogy aktívan használják.",
 "booksources"	=> "Könyvforrások",
 "booksourcetext" => "Lentebb néhány hivatkozás található olyan lapokra,
 ahol új vagy használt könyveket árusítanak, vagy további információkkal
 szolgálhatnak az általad vizsgált könyvről.
-A $wgSitename semmilyen módon nem áll kapcsolatba ezen cégekkel és
+A {{SITENAME}} semmilyen módon nem áll kapcsolatba ezen cégekkel és
 ezt a listát semmiképpen ne tekintsd bármiféle ajánlásnak.",
 # FIXME: huh?
 "alphaindexline" => "$1 -> $2",
@@ -832,7 +759,7 @@ nem kíván másoktól leveleket kapni.",
   "{{localurle:Speciális:Figyelőlista}}\">figyelőlistádhoz</a>.
 Ezután minden a lapon vagy annak vitalapján történő változást ott fogsz
 látni, és a lap <b>vastagon</b> fog szerepelni a <a href=\"" .
-  "{{localurle:Speciális:Friss_változtatások}}\">friss változtatások</a> 
+  "{{localurle:Speciális:Friss_változtatások}}\">friss változtatások</a>
 lapon, hogy könnyen észrevehető legyen.</p>
 
 <p>Ha később el akarod távolítani a lapot a figyelőlistádról, akkor ezt az
@@ -842,8 +769,8 @@ oldalmenü \"Figyelés vége\" pontjával teheted meg.",
 "watchthispage"	=> "Lap figyelése",
 "unwatchthispage" => "Figyelés vége",
 "notanarticle"	=> "Nem szócikk",
-"watchdetails" => "($1 lap figyelése a vitalapokon kívül, 
-$2 lap változott az adott határokon belül, 
+"watchdetails" => "($1 lap figyelése a vitalapokon kívül,
+$2 lap változott az adott határokon belül,
 $3...
 [$4 teljes lista áttekintés és szerkesztés].)",
 "watchmethod-recent" => "a figyelt lapokon belüli legfrissebb szerkesztések",
@@ -894,11 +821,11 @@ All times shown are server time (UTC).
 "rollbackfailed" => "Rollback failed",
 "cantrollback"	=> "Cannot revert edit; last contributor is only author of this article.",
 "alreadyrolled"	=> "Cannot rollback last edit of [[$1]]
-by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the article already. 
+by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the article already.
 
 Last edit was by [[User:$3|$3]] ([[User talk:$3|Talk]]). ",
 #   only shown if there is an edit comment
-"editcomment" => "The edit comment was: \"<i>$1</i>\".", 
+"editcomment" => "The edit comment was: \"<i>$1</i>\".",
 "revertpage"	=> "Reverted to last edit by $1",
 
 # Undelete
@@ -939,7 +866,7 @@ See [[Wikipedia:Deletion_log]] for a record of recent deletions and restorations
 "isredirect"	=> "átirányítás",
 
 # Block/unblock IP
-# 
+#
 #FIXME:
 "blockip"		=> "Block IP address",
 "blockiptext"	=> "Use the form below to block write access
@@ -952,7 +879,6 @@ pages that were vandalized).",
 "ipbreason"		=> "Reason",
 "ipbsubmit"		=> "Block this address",
 "badipaddress"	=> "The IP address is badly formed.",
-"noblockreason" => "You must supply a reason for the block.",
 "blockipsuccesssub" => "Block succeeded",
 "blockipsuccesstext" => "The IP address \"$1\" has been blocked.
 <br />See [[Speciális:Ipblocklist|IP block list]] to review blocks.",
@@ -969,7 +895,7 @@ to a previously blocked IP address.",
 "autoblocker"	=> "Autoblocked because you share an IP address with \"$1\". Reason \"$2\".",
 "blocklogpage"	=> "Block_log",
 "blocklogentry"	=> 'blocked "$1"',
-"blocklogtext"	=> "This is a log of user blocking and unblocking actions. Automatically 
+"blocklogtext"	=> "This is a log of user blocking and unblocking actions. Automatically
 blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
 the list of currently operational bans and blocks.",
 "unblocklogentry"	=> 'unblocked "$1"',
@@ -999,35 +925,20 @@ Please confirm that this is what you intend to do.",
 <br />Remember to remove the lock after your maintenance is complete.",
 "unlockdbsuccesstext" => "The Wikipedia database has been unlocked.",
 
-# SQL query
-#
-"asksql"		=> "SQL query",
-"asksqltext"	=> "Use the form below to make a direct query of the
-Wikipedia database.
-Use single quotes ('like this') to delimit string literals.
-This can often add considerable load to the server, so please use
-this function sparingly.",
-"sqlislogged"	=> "Please note that all queries are logged.",
-"sqlquery"		=> "Enter query",
-"querybtn"		=> "Submit query",
-"selectonly"	=> "Queries other than \"SELECT\" are restricted to
-Wikipedia developers.",
-"querysuccessful" => "Query successful",
-
 # Move page
 #
 "movepage"		=> "Lap mozgatása",
-"movepagetext"	=> "A lentebb található űrlap segítségével legetséges 
+"movepagetext"	=> "A lentebb található űrlap segítségével legetséges
 egy lapot átnevezni, és átmozgatni a teljes történetével együtt egy
 új névre.
 A régi név átirányítássá válik az új címszóra.
-A régi címszóra hivatkozások nem változnak meg; 
+A régi címszóra hivatkozások nem változnak meg;
 [[Speciális:Karbantartás|győződj meg arról]] hogy nem hagysz
 magad után a régi címszóra hivatkozó linkeket. A te feladatod
 biztosítani hogy a linkek oda mutassanak, ahova kell nekik.
 
 Vedd figyelembe azt hogy az átnevezés '''nem''' történik meg
-akkorr, ha már létezik olyan nevű lap, kivéve ha az üres, 
+akkorr, ha már létezik olyan nevű lap, kivéve ha az üres,
 átirányítás vagy nincs szerkesztési története. Ez azt jelenti
 hogy vissza tudsz nevezni egy tévedésből átnevezett lapot, de
 nem tudsz egy már létező aktív lapot felülírni.
@@ -1073,27 +984,24 @@ rendszerbe való importálásra, átalakításra vagy a saját szórakoztatásod
 
 # Math
 
-	'mw_math_png' => "Mindig készítsen PNG-t",
-	'mw_math_simple' => "HTML ha nagyon egyszerű, egyébként PNG",
-	'mw_math_html' => "HTML ha lehetséges, egyébként PNG",
-	'mw_math_source' => "Hagyja TeX formában (szöveges böngészőknek)",
-	'mw_math_modern' => "Modern böngészőknek ajánlott beállítás",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Mindig készítsen PNG-t",
+'mw_math_simple' => "HTML ha nagyon egyszerű, egyébként PNG",
+'mw_math_html' => "HTML ha lehetséges, egyébként PNG",
+'mw_math_source' => "Hagyja TeX formában (szöveges böngészőknek)",
+'mw_math_modern' => "Modern böngészőknek ajánlott beállítás",
+'mw_math_mathml' => 'MathML',
 );
 
 class LanguageHu extends LanguageUtf8 {
-	
-	/* inherit getDefaultUserOptions() */
-	/* inherit stub getBookstoreList() */
-	
+
 	function getNamespaces() {
 		global $wgNamespaceNamesHu;
 		return $wgNamespaceNamesHu;
 	}
-	
+
 	function getNsIndex( $text ) {
 		global $wgNamespaceNamesHu;
-		
+
 		foreach ( $wgNamespaceNamesHu as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
@@ -1103,37 +1011,22 @@ class LanguageHu extends LanguageUtf8 {
 		if( 0 == strcasecmp( "Wikipedia_talk", $text ) ) { return 5; }
 		return false;
 	}
-	
+
 	function getQuickbarSettings() {
 		global $wgQuickbarSettingsHu;
 		return $wgQuickbarSettingsHu;
 	}
-	
+
 	function getSkinNames() {
 		global $wgSkinNamesHu;
 		return $wgSkinNamesHu;
 	}
-	
+
 	function getDateFormats() {
 		global $wgDateFormatsHu;
 		return $wgDateFormatsHu;
 	}
-	
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesHu;
-		return $wgValidSpecialPagesHu;
-	}
-	
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesHu;
-		return $wgSysopSpecialPagesHu;
-	}
-	
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesHu;
-		return $wgDeveloperSpecialPagesHu;
-	}
-	
+
 	function getMessage( $key ) {
 		global $wgAllMessagesHu;
 		if(array_key_exists($key, $wgAllMessagesHu))
@@ -1141,7 +1034,7 @@ class LanguageHu extends LanguageUtf8 {
 		else
 			return parent::getMessage($key);
 	}
-	
+
 	function fallback8bitEncoding() {
 		return "iso8859-2";
 	}
@@ -1149,18 +1042,17 @@ class LanguageHu extends LanguageUtf8 {
 	# localised date and time
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		$d = substr( $ts, 0, 4 ) . ". " .
 		$this->getMonthName( substr( $ts, 4, 2 ) ) . " ".
 			(0 + substr( $ts, 6, 2 )) . ".";
 		return $d;
 	}
-	
-	function timeanddate( $ts, $adj = false )
-	{
+
+	function timeanddate( $ts, $adj = false ) {
 		return $this->date( $ts, $adj ) . ", " . $this->time( $ts, $adj );
 	}
-	
+
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, '.,', ',.' ) : $number;
diff --git a/languages/LanguageIa.php b/languages/LanguageIa.php
index 9f20750d5fea..7c6187fe8dcb 100644
--- a/languages/LanguageIa.php
+++ b/languages/LanguageIa.php
@@ -4,30 +4,22 @@
   * @subpackage Language
   */
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
+/** TODO: fixme */
 /* private */ $wgNamespaceNamesIa = array(
-	-2	=> "Media",
-	-1	=> "Special",
-	0	=> "",
-	1	=> "Discussion",
-	2	=> "Usator",
-	3	=> "Discussion_Usator",
-	4	=> "Wikipedia",
-	5	=> "Discussion_Wikipedia",
-	6	=> "Imagine",
-	7	=> "Discussion_Imagine",
-	8	=> "MediaWiki",
-	9	=> "Discussion_MediaWiki",
-	10  => "Template",
-	11  => "Template_talk"
-
-
+	NS_MEDIA          => "Media",
+	NS_SPECIAL        => "Special",
+	NS_MAIN           => "",
+	NS_TALK           => "Discussion",
+	NS_USER           => "Usator",
+	NS_USER_TALK      => "Discussion_Usator",
+	NS_PROJECT        => "Wikipedia",
+	NS_PROJECT_TALK   => "Discussion_Wikipedia",
+	NS_IMAGE          => "Imagine",
+	NS_IMAGE_TALK     => "Discussion_Imagine",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "Discussion_MediaWiki",
+	NS_TEMPLATE       => "Template",
+	NS_TEMPLATE_TALK  => "Template_talk"
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsIa = array(
@@ -39,58 +31,6 @@
 ) + $wgSkinNamesEn;
 
 
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesIa = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Preferentias del usator",
-	"Watchlist"		=> "Paginas sub observation",
-	"Recentchanges" => "Modificationes recente",
-	"Upload"		=> "Cargar imagines al servitor",
-	"Imagelist"		=> "Lista de imagines",
-	"Listusers"		=> "Usatores registerate",
-	"Statistics"	=> "Statisticas de accesso",
-	"Randompage"	=> "Articulo aleatori",
-
-	"Lonelypages"	=> "Articulos orphanos",
-	"Unusedimages"	=> "Imagines orphanas",
-	"Popularpages"	=> "Articulos popular",
-	"Wantedpages"	=> "Articulos plus demandate",
-	"Shortpages"	=> "Articulos curte",
-	"Longpages"		=> "Articulos longe",
-	"Newpages"		=> "Articulos nove",
-#	"Intl"                => "Interlanguage Links",
-	"Allpages"		=> "Tote le paginas (per titulo)",
-
-	"Ipblocklist"	=> "Adresses de IP blocate",
-	"Maintenance" => "Pagina de mantenentia",
-	"Specialpages"  => "", # "Paginas special",
-	"Contributions" => "", # "Contributiones",
-	"Emailuser"		=> "", # "Inviar email al usator(?)",
-	"Whatlinkshere" => "", # "Referentias a iste pagina",
-	"Recentchangeslinked" => "", # "Ultime modificationes (?)",
-	"Movepage"		=> "", # "Mover pagina",
-	"Booksources"	=> "Fontes externe (libros)",
-#	"Categories"	=> "Page categories",
-	"Export"		=> "Exportar in XML",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesIa = array(
-	"Blockip"		=> "Blocar un adresse de IP",
-	"Asksql"		=> "Consultar base de datos",
-	"Undelete"		=> "Vider e restaurar paginas eliminate"
-);
-
-/* private */ $wgDeveloperSpecialPagesIa = array(
-	"Lockdb"		=> "Suspender modificationes",
-	"Unlockdb"		=> "Permitter modificationes",
-);
-
 /* private */ $wgAllMessagesIa = array(
 
 # User Toggles
@@ -155,7 +95,6 @@
 "aboutpage"		=> "Wikipedia:A_proposito",
 "help"			=> "Adjuta",
 "helppage"		=> "Wikipedia:Adjuta",
-"wikititlesuffix" => "Wikipedia",
 "bugreports"	=> "Reportos de disfunctiones",
 "bugreportspage" => "Wikipedia:Reportos_de_disfunctiones",
 "faq"			=> "Questiones frequente",
@@ -197,7 +136,6 @@
 "redirectedfrom" => "(Redirigite de $1)",
 "lastmodified"	=> "Ultime modification: $1.",
 "viewcount"		=> "Iste pagina esseva accessate $1 vices.",
-"gnunote" => "Tote le texto es disponibile sub le terminos del <a class=internal href='$wgScriptPath/GNU_FDL'>Licentia de documentation libere GNU</a>.",
 "printsubtitle" => "(De {{SERVER}})",
 "protectedpage" => "Pagina protegite",
 "administrators" => "Wikipedia:Administratores",
@@ -259,7 +197,7 @@ indicante le URL.",
 "filedeleteerror" => "Impossibile eliminar file \"$1\".",
 "filenotfound"	=> "Impossibile trovar file \"$1\".",
 "unexpected"	=> "Valor impreviste: \"$1\"=\"$2\".",
-"formerror"		=> "Error: impossibile submitter formulario",	
+"formerror"		=> "Error: impossibile submitter formulario",
 "badarticleerror" => "Iste action non pote esser effectuate super iste pagina.",
 "cannotdelete"	=> "Impossibile eliminar le pagina o imagine specificate. (Illo pote ja haber essite eliminate per un altere persona.)",
 "badtitle"		=> "Titulo incorrecte",
@@ -287,7 +225,7 @@ Non oblida personalisar Wikipedia secundo tu preferentias.",
 "newusersonly"	=> " (solmente pro nove usatores)",
 "remembermypassword" => "Recordar contrasigno inter sessiones.",
 "loginproblem"	=> "<b>Occurreva problemas pro initiar tu session.</b><br />Tenta de nove!",
-"alreadyloggedin" => "<font color=red><b>Usator $1, tu session ja es aperte!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Usator $1, tu session ja es aperte!</strong><br />\n",
 
 "login"			=> "Aperir session",
 "userlogin"		=> "Aperir session",
@@ -440,7 +378,7 @@ pro definir tu preferentias.",
 "prefslogintext" => "Tu es identificate como \"$1\".
 Tu numero interne de ID es $2.",
 "prefsreset"	=> "Tu preferentias salvate previemente ha essite restaurate.",
-"qbsettings"	=> "Configuration del barra de utensiles", 
+"qbsettings"	=> "Configuration del barra de utensiles",
 "changepassword" => "Cambiar contrasigno",
 "skin"			=> "Apparentia",
 "math"			=> "Exhibition de formulas",
@@ -559,13 +497,9 @@ Tote le tempores monstrate es in le fuso horari del servitor (UCT).
 ",
 "filename"		=> "Nomine del file",
 "filedesc"		=> "Description",
-"affirmation"	=> "Io declara que le detentor del derecto de autor de iste file
-consenti in licentiar lo sub le terminos del $1.",
 "copyrightpage" => "Wikipedia:Copyright",
 "copyrightpagename" => "Wikipedia e derectos de autor (copyright)",
 "uploadedfiles"	=> "Files cargate",
-"noaffirmation" => "Tu debe declarar que le files cargate per te non viola
-derectos de autor (copyrights).",
 "ignorewarning"	=> "Ignorar advertimentos e salvar le file totevia.",
 "minlength"		=> "Le nomines de imagines debe haber al minus tres litteras.",
 "badfilename"	=> "Le nomine del imagine esseva cambiate a \"$1\".",
@@ -812,7 +746,6 @@ specific que ha essite vandalisate).",
 "ipbreason"		=> "Motivo",
 "ipbsubmit"		=> "Blocar iste adresse",
 "badipaddress"	=> "Adresse IP mal formate.",
-"noblockreason" => "Tu debe fornir un motivo pro le blocage.",
 "blockipsuccesssub" => "Blocage con successo",
 "blockipsuccesstext" => "Le adresse IP \"$1\" ha essite blocate.
 <br />Vide [[Special:Ipblocklist|Lista de IPs blocate]] pro revider le blocages.",
@@ -851,19 +784,6 @@ Per favor confirma que iste es tu intention.",
 <br />Rememora te de disblocar lo post completar tu mantenentia.",
 "unlockdbsuccesstext" => "Le base de datos de Wikipedia ha essite disblocate.",
 
-# SQL query
-#
-"asksql"		=> "Consulta SQL",
-"asksqltext"	=> "Usa le formulario infra pro facer un consulta directe al
-base de datos de Wikipedia.
-Usa apostrophos ('como istes') pro delimitar catenas de characteres.
-Iste function pote supercargar le servitor, alora usa lo con moderation.",
-"sqlquery"		=> "Scribe consulta",
-"querybtn"		=> "Inviar consulta",
-"selectonly"	=> "Consultas differente de \"SELECT\" es restricte al
-disveloppatores de Wikipedia.",
-"querysuccessful" => "Consulta effectuate con successo",
-
 # Move page
 #
 "movepage"		=> "Mover pagina",
@@ -911,12 +831,12 @@ nove titulo. Per favor fusiona los manualmente.",
 
 # Math
 
-	'mw_math_png' => "Sempre produce PNG",
-	'mw_math_simple' => "HTML si multo simple, alteremente PNG",
-	'mw_math_html' => "HTML si possibile, alteremente PNG",
-	'mw_math_source' => "Lassa lo como TeX (pro navigatores in modo texto)",
-	'mw_math_modern' => "Recommendate pro navigatores moderne",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Sempre produce PNG",
+'mw_math_simple' => "HTML si multo simple, alteremente PNG",
+'mw_math_html' => "HTML si possibile, alteremente PNG",
+'mw_math_source' => "Lassa lo como TeX (pro navigatores in modo texto)",
+'mw_math_modern' => "Recommendate pro navigatores moderne",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -939,8 +859,7 @@ class LanguageIa extends LanguageUtf8 {
 		return $wgSkinNamesIa;
 	}
 
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
@@ -949,31 +868,11 @@ class LanguageIa extends LanguageUtf8 {
 		return $d;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		return $this->time( $ts, $adj ) . " " . $this->date( $ts, $adj );
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesIa;
-		return $wgValidSpecialPagesIa;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesIa;
-		return $wgSysopSpecialPagesIa;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesIa;
-		return $wgDeveloperSpecialPagesIa;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesIa, $wgAllMessagesEn;
 		$m = $wgAllMessagesIa[$key];
 
diff --git a/languages/LanguageId.php b/languages/LanguageId.php
index 4e20b2bc884d..dc911e918bf3 100644
--- a/languages/LanguageId.php
+++ b/languages/LanguageId.php
@@ -1,37 +1,31 @@
-<?php 
+<?php
 #
-# This localisation is originally based on a file kindly donated by the folks at MIMOS 
-# http://www.asiaosc.org/enwiki/page/Knowledgebase_Home.html 
+# This localisation is originally based on a file kindly donated by the folks at MIMOS
+# http://www.asiaosc.org/enwiki/page/Knowledgebase_Home.html
 #
-# NOTE: To turn off "Current Events" in the sidebar, 
-# set "currentevents" => "-" 
-#
-# The names of the namespaces can be set here, but the numbers 
-# are magical, so don't change or move them!  The Namespace class 
-# encapsulates some of the magic-ness. 
-# 
+
 
 require_once( "LanguageUtf8.php" );
 
 /* private */ $wgNamespaceNamesId = array(
-        NS_MEDIA            => "Media",
-        NS_SPECIAL          => "Istimewa",
-        NS_MAIN             => "",
-        NS_TALK             => "Bicara",
-        NS_USER             => "Pengguna",
-        NS_USER_TALK        => "Bicara_Pengguna",
-        NS_PROJECT          => $wgMetaNamespace, 
-        NS_PROJECT_TALK     => "Pembicaraan_" . $wgMetaNamespace, 
-        NS_IMAGE            => "Gambar",
-        NS_IMAGE_TALK       => "Pembicaraan_Gambar",
-        NS_MEDIAWIKI        => "MediaWiki",
-        NS_MEDIAWIKI_TALK   => "Pembicaraan_MediaWiki",
-        NS_TEMPLATE         => "Templat",
-        NS_TEMPLATE_TALK    => "Pembicaraan_Templat",
-        NS_HELP             => "Bantuan",
-        NS_HELP_TALK        => "Pembicaraan_Bantuan",
-        NS_CATEGORY         => "Kategori",
-        NS_CATEGORY_TALK    => "Pembicaraan_Kategori" 
+	NS_MEDIA            => "Media",
+	NS_SPECIAL          => "Istimewa",
+	NS_MAIN             => "",
+	NS_TALK             => "Bicara",
+	NS_USER             => "Pengguna",
+	NS_USER_TALK        => "Bicara_Pengguna",
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => "Pembicaraan_" . $wgMetaNamespace,
+	NS_IMAGE            => "Gambar",
+	NS_IMAGE_TALK       => "Pembicaraan_Gambar",
+	NS_MEDIAWIKI        => "MediaWiki",
+	NS_MEDIAWIKI_TALK   => "Pembicaraan_MediaWiki",
+	NS_TEMPLATE         => "Templat",
+	NS_TEMPLATE_TALK    => "Pembicaraan_Templat",
+	NS_HELP             => "Bantuan",
+	NS_HELP_TALK        => "Pembicaraan_Bantuan",
+	NS_CATEGORY         => "Kategori",
+	NS_CATEGORY_TALK    => "Pembicaraan_Kategori"
 ) + $wgNamespaceNamesEn;
 
 # For backwards compatibility: some talk namespaces were
@@ -41,62 +35,55 @@ $wgNamespaceAlternatesId = array(
 	NS_MEDIAWIKI_TALK   => "MediaWiki_Pembicaraan",
 	NS_TEMPLATE_TALK    => "Templat_Pembicaraan",
 	NS_HELP_TALK        => "Bantuan_Pembicaraan",
-	NS_CATEGORY_TALK    => "Kategori_Pembicaraan" 
+	NS_CATEGORY_TALK    => "Kategori_Pembicaraan"
 );
 
 /* private */ $wgQuickbarSettingsId = array(
-        "Tidak ada", "Tetap sebelah kiri", "Tetap sebelah kanan", "Mengambang sebelah kiri" 
+	"Tidak ada", "Tetap sebelah kiri", "Tetap sebelah kanan", "Mengambang sebelah kiri"
 );
 
 /* private */ $wgSkinNamesId = array(
-        'standard'    => "Standar",
-        'nostalgia'   => "Nostalgia",
-        'cologneblue' => "Cologne Blue",
-        'davinci'     => "DaVinci",
-        'mono'        => "Mono",
-        'monobook'    => 'MonoBook',
-        'myskin'      => 'MySkin',
-        'chick'       => 'Chick'
-);
+	'standard'    => "Standar",
+) + $wgSkinNamesEn;
 
-# Validation types 
+# Validation types
 $wgValidationTypesId = array (
-        '0' => "Gaya tulisan|Sangat buruk|Sangat baik|5",
-        '1' => "Legalitas|Ilegal|Legal|5",
-        '2' => "Kelengkapan|Stub|Sangat lengkap|5",
-        '3' => "Fakta|Meragukan|Kuat|5",
-        '4' => "Layak untuk 1.0 (Cetak)|Tidak|Ya|2",
-        '5' => "Layak untuk 1.0 (CD)|Tidak|Ya|2"
+	'0' => "Gaya tulisan|Sangat buruk|Sangat baik|5",
+	'1' => "Legalitas|Ilegal|Legal|5",
+	'2' => "Kelengkapan|Stub|Sangat lengkap|5",
+	'3' => "Fakta|Meragukan|Kuat|5",
+	'4' => "Layak untuk 1.0 (Cetak)|Tidak|Ya|2",
+	'5' => "Layak untuk 1.0 (CD)|Tidak|Ya|2"
 );
 
 /* private */ $wgDateFormatsId = array();
 
 /* private */ $wgBookstoreListId = array(
-        # Local bookstores
-        "Gramedia Cyberstore (via Google)" => 'http://www.google.com/search?q=%22ISBN+:+$1%22+%22product_detail%22+site:www.gramediacyberstore.com+OR+site:www.gramediaonline.com+OR+site:www.kompas.com&hl=id',
-        "Bhinneka.com bookstore" => 'http://www.bhinneka.com/Buku/Engine/search.asp?fisbn=$1',
-
-        //# Default (EN) Bookstores
-        //"AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
-        //"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
-        //"Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
-        //"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1" 
+	# Local bookstores
+	"Gramedia Cyberstore (via Google)" => 'http://www.google.com/search?q=%22ISBN+:+$1%22+%22product_detail%22+site:www.gramediacyberstore.com+OR+site:www.gramediaonline.com+OR+site:www.kompas.com&hl=id',
+	"Bhinneka.com bookstore" => 'http://www.bhinneka.com/Buku/Engine/search.asp?fisbn=$1',
+
+	//# Default (EN) Bookstores
+	//"AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
+	//"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
+	//"Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
+	//"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1"
 ) + $wgBookstoreListEn;
 
 /* private */ $wgAllMessagesId = array(
 # User preference toggles
-'tog-hover' => 'Tampilkan hoverbox di atas pautan wiki',
+
 'tog-underline' => 'Garisbawahi pautan',
 'tog-highlightbroken' => 'Beri tanda pautan yang berpaut ke topik kosong <a href="" class="new">seperti ini</a> (alternatif: seperti ini<a href="" class="internal">?</a>)',
 'tog-justify'   => 'Ratakan paragraf',
 'tog-hideminor' => 'Sembunyikan suntingan kecil dalam perubahan terbaru',
 'tog-usenewrc' => 'Tampilkan perubahan terbaru dalam tampilan yang lebih baik (tidak untuk semua browser)',
-'tog-numberheadings' => 'Beri nomor judul secara otomatis', 
+'tog-numberheadings' => 'Beri nomor judul secara otomatis',
 'tog-showtoolbar' => 'Tampilkan batang alat penyuntingan',
 'tog-editondblclick' => 'Sunting halaman dengan klik ganda (JavaScript)',
 'tog-editsection'=> 'Sunting bagian melalui pautan [edit]',
 'tog-editsectiononrightclick' => 'Sunting bagian dengan mengklik kanan<br />judul bagian (JavaScript)',
-'tog-showtoc' => 'Tampilkan daftar isi<br />(untuk artikel yang mempunyai lebih dari 3 judul)', 
+'tog-showtoc' => 'Tampilkan daftar isi<br />(untuk artikel yang mempunyai lebih dari 3 judul)',
 'tog-rememberpassword' => 'Ingat kata sandi pada setiap sesi',
 'tog-editwidth' => 'Kotak sunting memiliki lebar penuh',
 'tog-watchdefault' => 'Tambahkan halaman yang Anda sunting ke daftar pemantauan',
@@ -104,7 +91,7 @@ $wgValidationTypesId = array (
 'tog-previewontop' => 'Tampilkan pratilik sebelum kotak sunting dan bukan sesudahnya',
 'tog-previewonfirst' => 'Tampilkan pratilik pada suntingan pertama',
 'tog-nocache' => 'Matikan cache halaman',
-'tog-fancysig' => 'Tanda tangan teks murni', 
+'tog-fancysig' => 'Tanda tangan teks murni',
 
 # dates
 'sunday' => 'Minggu',
@@ -138,19 +125,17 @@ $wgValidationTypesId = array (
 'oct' => 'Okt',
 'nov' => 'Nov',
 'dec' => 'Des',
-# Bits of text used by many pages: 
-# 
+# Bits of text used by many pages:
+#
 "categories" => "Kategori",
 "category" => "kategori",
 "category_header" => "Artikel dalam kategori \"$1\"",
 "subcategories" => "Subkategori",
 
 "linktrail" => "/^([a-z]+)(.*)\$/sD",
-"mainpage" => "Halaman Utama",  
+"mainpage" => "Halaman Utama",
 "mainpagetext" => "Perangkat lunak wiki berhasil dipasang.",
 "mainpagedocfooter" => "Silakan lihat [http://meta.wikipedia.org/wiki/MediaWiki_i18n dokumentasi tentang kastamisasi antarmuka] dan [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide petunjuk pengguna] untuk bantuan pemakaian dan konfigurasi.",
-# NOTE: To turn off "Community portal" in the title links,
-# set "portal" => "-"
 
 'portal' => 'Portal Komunitas',
 'portal-url' => 'Project:Portal_Komunitas',
@@ -160,7 +145,6 @@ $wgValidationTypesId = array (
 'article' => 'Artikel',
 "help" => "Bantuan",
 "helppage" => "Help:Isi",
-"wikititlesuffix" => "{{SITENAME}}",
 "bugreports" => "Laporan Bug",
 "bugreportspage" => "Project:Laporan_Bug",
 "sitesupport" => "-", # "-" untuk mematikan
@@ -168,7 +152,7 @@ $wgValidationTypesId = array (
 "faq" => "FAQ",
 "faqpage" => "Project:FAQ",
 "edithelp" => "Bantuan penyuntingan",
-"newwindow" => "(terbuka dalam jendela baru)", 
+"newwindow" => "(terbuka dalam jendela baru)",
 "edithelppage" => "Help:Penyuntingan",
 "cancel" => "Batalkan",
 "qbfind" => "Cari",
@@ -183,16 +167,8 @@ $wgValidationTypesId = array (
 "mytalk" => "Pembicaraan saya",
 "anontalk" => "Pembicaraan IP ini",
 'navigation' => 'Navigasi',
-
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-                                       
 "currentevents" => "Kejadian Terkini",
 'currentevents-url' => 'Kejadian Terkini',
-
-# NOTE: To turn off "Disclaimers" in the title links,
-# set "disclaimers" => "-"
-
 "disclaimers" => "Penyangkalan",
 "disclaimerpage" => "Project:Penyangkalan_Umum",
 "errorpagetitle" => "Kesalahan",
@@ -204,7 +180,7 @@ $wgValidationTypesId = array (
 "go" => "Tampil",
 "history" => "Sejarah halaman",
 'history_short' => 'Sejarah',
-'info_short'	=> 'Informasi', 
+'info_short' => 'Informasi',
 "printableversion" => "Versi untuk dicetak",
 'edit' => 'Sunting',
 "editthispage" => "Sunting halaman ini",
@@ -242,8 +218,6 @@ $wgValidationTypesId = array (
 "sysoptext" => "Tindakan yang Anda minta hanya dapat dilakukan oleh pengguna dengan status \"sysop\". Lihat $1.",
 "developertitle" => "Akses Pengembang Diperlukan",
 "developertext" => "Tindakan yang Anda minta hanya dapat dilakukan oleh pengguna dengan status \"pengembang\". Lihat $1.",
-"bureaucrattitle" => "Akses Birokrat Diperlukan",
-"bureaucrattext" => "Tindakan yang Anda minta hanya dapat dilakukan oleh sysop dengan status \"birokrat\"",
 "nbytes" => "$1 byte",
 "ok" => "OK",
 "sitetitle" => "{{SITENAME}}",
@@ -261,7 +235,7 @@ $wgValidationTypesId = array (
 'feedlinks' => 'Feed:',
 'sitenotice' => '-', # the equivalent to wgSiteNotice
 
-# Short words for each namespace, by default used in the 'article' tab in monobook 
+# Short words for each namespace, by default used in the 'article' tab in monobook
 'nstab-main' => 'Artikel',
 'nstab-user' => 'Halaman pengguna',
 'nstab-media' => 'Media',
@@ -273,15 +247,15 @@ $wgValidationTypesId = array (
 'nstab-help' => 'Bantuan',
 'nstab-category' => 'Kategori',
 
-# Main script and global functions 
-# 
+# Main script and global functions
+#
 "nosuchaction" => "Tidak Ada Tindakan Tersebut",
 "nosuchactiontext" => "Tindakan yang dispesifikasikan oleh URL tersebut tidak dikenal oleh wiki.",
 "nosuchspecialpage" => "Tidak Ada Halaman Istimewa Tersebut",
 "nospecialpagetext" => "Anda telah meminta halaman istimewa yang tidak dikenal oleh wiki.",
 
-# General errors 
-# 
+# General errors
+#
 "error" => "Kesalahan",
 "databaseerror" => "Kesalahan Basis Data",
 "dberrortext" => "Ada kesalahan sintaks pada permintaan basis data. Kesalahan ini mungkin menandakan adanya bug dalam perangkat lunak. Permintaan basis data yang terakhir adalah: <blockquote><tt>$1</tt></blockquote> dari dalam fungsi \"<tt>$2</tt>\". Kesalahan MySQL \"<tt>$3: $4</tt>\".",
@@ -289,7 +263,7 @@ $wgValidationTypesId = array (
 "noconnect" => "Maaf! wiki ini mengalami masalah teknis dan tidak dapat menghubungi basis data.",
 "nodb" => "Tidak dapat memilih basis data $1",
 "cachederror" => "Berikut ini adalah salinan cache dari halaman yang diminta, yang mungkin tidak up-to-date.",
-'laggedslavemode'   => 'Peringatan: Halaman mungkin tidak berisi perubahan terbaru.', 
+'laggedslavemode'   => 'Peringatan: Halaman mungkin tidak berisi perubahan terbaru.',
 "readonly" => "Basis data dikunci",
 "enterlockreason" => "Masukkan alasan penguncian, termasuk perkiraan kapan kunci akan dibuka",
 "readonlytext" => "Basis data sedang dikunci terhadap masukan baru. Administrator yang melakukan penguncian memberikan penjelasan sebagai berikut: <p>$1",
@@ -303,7 +277,6 @@ $wgValidationTypesId = array (
 "formerror" => "Kesalahan: Tidak dapat mengirimkan formulir",
 "badarticleerror" => "Tindakan ini tidak dapat dilaksanakan di halaman ini.",
 "cannotdelete" => "Tidak dapat menghapus halaman atau gambar yang telah ditentukan.",
-'block_compress_delete' => "Artikel ini tidak dapat dihapus karena artikel ini berisi revisi yang terkompresi-blok. Ini adalah kondisi sementara yang diketahui para pengembang, dan akan diperbaiki dalam satu atau dua bulan mendatang. Silakan tandai artikel tersebut untuk dihapus, dan tunggu para pengembang memperbaiki perangkat lunak.", 
 "badtitle" => "Judul Tidak Sah",
 "badtitletext" => "Judul halaman yang diminta tidak sah, kosong, atau judul antarbahasa atau antarwiki yang salah sambung.",
 "perfdisabled" => "Maaf! fitur ini dimatikan sementara karena fitur ini memperlambat pengkalan data sampai-sampai basis data tidak dapat digunakan lagi.",
@@ -312,11 +285,10 @@ $wgValidationTypesId = array (
 "wrong_wfQuery_params" => "Parameter salah ke wfQuery()<br />Fungsi: $1<br />Kueri: $2",
 "viewsource" => "Lihat sumber",
 "protectedtext" => "Halaman ini telah dikunci untuk menghindari penyuntingan; ada beberapa alasan mengapa hal ini terjadi, silakan lihat [[Project:Halaman_dilindungi]].\n\nAnda dapat melihat dan menyalin sumber halaman ini:",
-'seriousxhtmlerrors' => 'Ada kesalahan markah xhtml serius yang dideteksi oleh tidy.',
-'sqlhidden' => '(Kueri SQL disembunyikan)', 
+'sqlhidden' => '(Kueri SQL disembunyikan)',
 
-# Login and logout pages 
-# 
+# Login and logout pages
+#
 "logouttitle" => "Pengguna Logout",
 "logouttext" => "Anda telah logout dari sistem. Anda dapat terus menggunakan {{SITENAME}} secara anonim, atau Anda dapat login lagi sebagai pengguna yang sama atau pengguna yang lain. Perhatikan bahwa beberapa halaman mungkin masih terus menunjukkan bahwa Anda masih login sampai Anda membersihkan cache browser Anda\n",
 
@@ -331,9 +303,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "newusersonly" => "(hanya pengguna baru)",
 "remembermypassword" => "Selalu ingat kata sandi.",
 "loginproblem" => "<b>Ada masalah dengan data login Anda.</b><br />Silakan coba lagi!",
-"alreadyloggedin" => "<font color=red><b>Pengguna $1, Anda sudah login!</b></font><br />\n",
-
-"areyounew" => "Apabila Anda baru dalam {{SITENAME}} dan ingin mendapatkan akun pengguna, masukkanlah nama pengguna, kemudian ketikkan kata sandi, dan ulang kembali kata sandi. Alamat e-mail tidak diwajibkan. Walaupun begitu, apabila Anda lupa kata sandi Anda, Anda dapat memperolehnya kembali dengan cara meminta kami mengirimkan kata sandi ke e-mail yang diberikan.<br />\n",
+"alreadyloggedin" => "<strong>Pengguna $1, Anda sudah login!</strong><br />\n",
 
 "login" => "Login",
 "loginprompt" => "Anda harus mengaktifkan cookies untuk dapat login ke {{SITENAME}}.",
@@ -347,8 +317,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "userexists" => "Nama pengguna yang Anda masukkan telah dipakai. Silakan pilih nama yang lain.",
 "youremail" => "e-mail Anda*",
 "yourrealname" => "Nama asli Anda*",
-'yourlanguage'  => 'Bahasa antarmuka', 
-'yourvariant'  => 'Varian bahasa', 
+'yourlanguage'  => 'Bahasa antarmuka',
+'yourvariant'  => 'Varian bahasa',
 "yournick" => "Nama samaran (untuk tanda tangan)",
 "emailforlost" => "Isian yang bertanda * tidak harus diisi. Walaupun demikian, dengan memberikan alamat e-mail Anda, orang lain dapat menghubungi Anda melalui situs web tanpa perlu memberikan alamat e-mail Anda kepada mereka, dan e-mail Anda juga dapat digunakan untuk mendapatkan kata sandi yang baru (dengan cara dikirimkan ke alamat e-mail Anda) apabila Anda lupa kata sandi Anda.<br /><br />Nama asli, jika Anda memberikannya, akan digunakan untuk memberikan pengenalan atas kerja Anda.",
 'prefs-help-realname' => '* <strong>Nama asli</strong> (tidak wajib): jika Anda memberikannya, nama asli Anda akan digunakan untuk memberi pengenalan atas hasil kerja Anda.<br />',
@@ -360,7 +330,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "loginsuccesstitle" => "Login Berhasil",
 "loginsuccess" => "Berhasil login ke {{SITENAME}} sebagai \"$1\".",
 "nosuchuser" => "Tidak ada pengguna dengan nama \"$1\". Periksalah ejaan Anda, atau gunakan formulir di bawah ini untuk membuka akun baru.",
-'nosuchusershort' => "Tidak ada pengguna dengan nama \"$1\". Periksalah ejaan Anda.", 
+'nosuchusershort' => "Tidak ada pengguna dengan nama \"$1\". Periksalah ejaan Anda.",
 "wrongpassword" => "Kata sandi yang Anda masukkan salah. Silakan coba lagi.",
 "mailmypassword" => "e-mailkan kata sandi baru",
 "passwordremindertitle" => "Peringatan Kata Sandi dari {{SITENAME}}",
@@ -370,9 +340,9 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "passwordsent" => "Kata sandi baru telah dikirimkan kepada e-mail yang didaftarkan untuk \"$1\". Silakan login kembali setelah menerima e-mail tersebut.", #Please log in again after you receive it.",
 "loginend" => " ",
 "mailerror" => "Kesalahan dalam mengirimkan e-mail: $1",
-'acct_creation_throttle_hit' => 'Maaf, Anda telah membuat $1 akun. Anda tidak dapat membuat akun lagi.', 
+'acct_creation_throttle_hit' => 'Maaf, Anda telah membuat $1 akun. Anda tidak dapat membuat akun lagi.',
 
-# Edit page toolbar 
+# Edit page toolbar
 "bold_sample" => "Teks ini akan dicetak tebal",
 "bold_tip" => "Cetak tebal",
 "italic_sample" => "Teks ini akan dicetak miring",
@@ -394,11 +364,11 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "sig_tip" => "Tanda tangan Anda dengan tanda waktu",
 "hr_tip" => "Garis horisontal (gunakan dengan hemat)",
 "infobox" => "Klik sebuah tombol untuk mendapatkan teks contoh",
-# alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror 
+# alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror
 "infobox_alert" => "Silakan masukkan teks yang ingin diformat.\\n Teks tersebut akan ditampilkan di infobox untuk penyalinan dan penempelan.\\nContoh:\\n$1\\nakan menjadi:\\n$2",
 
-# Edit pages 
-# 
+# Edit pages
+#
 "summary" => "Ringkasan",
 "subject" => "Subjek/headline",
 "minoredit" => "Ini adalah suntingan kecil.",
@@ -423,33 +393,31 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "talkpagetext" => "<!-- MediaWiki:talkpagetext -->",
 "anontalkpagetext" => "---- ''Ini adalah halaman diskusi seorang pengguna anonim yang belum membuat akun atau tidak menggunakannya. Karena Ia tidak membuat akun, kami terpaksa harus memakai [[alamat IP]]-nya untuk mengenalinya. Alamat IP seperti ini dapat dipakai oleh beberapa pengguna yang berbeda. Jika Anda adalah seorang pengguna anonim dan merasa mendapatkan komentar-komentar miring, silakan [[Special:Userlogin|membuat akun atau login]] untuk menghindari kerancuan dengan pengguna anonim lain di lain waktu.'' ",
 "noarticletext" => "(Tidak ada teks dalam halaman ini)",
-'clearyourcache' => "'''Catatan:''' Setelah menyimpan konfigurasi, Anda perlu membersihkan cache browser Anda untuk melihat perubahan: '''Mozilla:''' klik ''reload'' (atau ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.", #'''Note:''' After saving, you have to clear your browser cache to see the changes: '''Mozilla:''' click ''reload''(or ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.
+'clearyourcache' => "'''Catatan:''' Setelah menyimpan konfigurasi, Anda perlu membersihkan cache browser Anda untuk melihat perubahan: '''Mozilla / Firefox:''' ''Ctrl-Shift-R'', '''IE:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.", 
 'usercssjsyoucanpreview' => "<strong>Tips:</strong> Gunakan tombol 'Tampilkan pratilik' untuk menguji css/js baru Anda sebelum menyimpannya.", #<strong>Tip:</strong> Use the 'Show preview' button to test your new css/js before saving.
 'usercsspreview' => "'''Ingatlah bahwa yang Anda lihat hanyalah pratilik CSS Anda, dan bahwa pratilik tersebut belum disimpan!'''", #'''Remember that you are only previewing your user css, it has not yet been saved!'''
 'userjspreview' => "'''Ingatlah bahwa yang Anda lihat hanyalah pratilik JavaScript Anda, dan bahwa pratilik tersebut belum disimpan!'''", #'''Remember that you are only testing/previewing your user javascript, it has not yet been saved!'''
 "updated" => "(Diperbarui)",
 "note" => "<strong>Catatan:</strong> ",
 "previewnote" => "Ingatlah bahwa ini hanyalah pratilik yang belum disimpan!",
-"previewconflict" => "Pratilik ini mencerminkan teks pada bagian atas sebagaimana Ia akan terlihat bila Anda menyimpannya.",  
+"previewconflict" => "Pratilik ini mencerminkan teks pada bagian atas sebagaimana Ia akan terlihat bila Anda menyimpannya.",
 "editing" => "Menyunting $1",
-"sectionedit" => "Menyunting $1 (bagian)",
-"commentedit" => "Menyunting $1 (komentar)",
 "editconflict" => "Konflik penyuntingan: $1",
 "explainconflict" => "Orang lain telah menyunting halaman ini sejak Anda mulai menyuntingnya. Bagian atas teks ini mengandung teks halaman saat ini. Perubahan yang Anda lakukan ditunjukkan pada bagian bawah teks. Anda hanya perlu menggabungkan perubahan Anda dengan teks yang telah ada. <b>Hanya</b> teks pada bagian atas halamanlah yang akan disimpan apabila Anda menekan \"Simpan halaman\".\n<p>",
 "yourtext" => "Teks Anda",
 "storedversion" => "Versi tersimpan",
-'nonunicodebrowser' => "<strong>PERINGATAN: Browser Anda tidak mendukung Unicode, silakan ganti browser Anda sebelum menyunting artikel.</strong>", 
+'nonunicodebrowser' => "<strong>PERINGATAN: Browser Anda tidak mendukung Unicode, silakan ganti browser Anda sebelum menyunting artikel.</strong>",
 "editingold" => "<strong>PERINGATAN: Anda menyunting revisi lama suatu halaman. Jika Anda menyimpannya, perubahan-perubahan yang dibuat sejak revisi ini akan hilang.</strong>",
 "yourdiff" => "Perbedaan",
-"copyrightwarning" => "Perhatikan bahwa semua sumbangan terhadap {{SITENAME}} dianggap dilisensikan di bawah lisensi $2 (lihat $1 untuk informasi lebih lanjut). Jika Anda tidak menginginkan tulisan Anda disunting dan disebarkan ke halaman web yang lain, jangan kirimkan artikel Anda ke sini.<br /> Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau Anda menyalinnya dari sumber milik umum atau sumber bebas yang lain. <p><strong><font color=\"red\">JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!</font></strong></p> <p><strong><font color=\"red\">JANGAN SALIN ARTIKEL DARI HALAMAN WEB LAIN.</font></strong></p> ",
-'copyrightwarning2' => "Perhatikan bahwa semua sumbangan terhadap {{SITENAME}} dapat disunting, diubah, atau dihapus oleh penyumbang lainnya. Jika Anda tidak ingin artikel anda disunting, jangan kirimkan artikel Anda ke sini.<br /> Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain (lihat $1 untuk informasi lebih lanjut).<strong>JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!</strong>", 
+"copyrightwarning" => "Perhatikan bahwa semua sumbangan terhadap {{SITENAME}} dianggap dilisensikan di bawah lisensi $2 (lihat $1 untuk informasi lebih lanjut). Jika Anda tidak menginginkan tulisan Anda disunting dan disebarkan ke halaman web yang lain, jangan kirimkan artikel Anda ke sini.<br /> Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau Anda menyalinnya dari sumber milik umum atau sumber bebas yang lain. <p><strong>JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!</strong></p> <p><strong>JANGAN SALIN ARTIKEL DARI HALAMAN WEB LAIN.</strong></p> ",
+'copyrightwarning2' => "Perhatikan bahwa semua sumbangan terhadap {{SITENAME}} dapat disunting, diubah, atau dihapus oleh penyumbang lainnya. Jika Anda tidak ingin artikel anda disunting, jangan kirimkan artikel Anda ke sini.<br /> Anda juga berjanji bahwa ini adalah hasil karya Anda sendiri, atau disalin dari sumber milik umum atau sumber bebas yang lain (lihat $1 untuk informasi lebih lanjut).<strong>JANGAN KIRIMKAN KARYA YANG DILINDUNGI HAK CIPTA TANPA IZIN!</strong>",
 "longpagewarning" => "<strong>PERINGATAN: Halaman ini panjangnya adalah $1 kilobyte; beberapa browser mungkin mengalami masalah dalam menyunting halaman yang panjangnya 32 kB atau lebih. Pertimbangkan memecah halaman menjadi beberapa halaman kecil.</strong>",
 "readonlywarning" => "<strong>PERINGATAN: Basis data sedang dikunci karena pemeliharaan, sehingga saat ini Anda tidak akan dapat menyimpan hasil penyuntingan Anda. Anda mungkin perlu memindahkan hasil penyuntingan Anda ini ke tempat lain untuk disimpan belakangan.</strong>",
 "protectedpagewarning" => "<strong>PERINGATAN:  Halaman ini telah dikunci sehingga hanya pemakai dengan status sysop saja yang dapat menyuntingnya. Pastikan Anda mengikuti [[Project:Petunjuk_halaman_dilindungi|aturan halaman yang dilindungi]].</strong>",
-'templatesused' => 'Templat yang digunakan di halaman ini:', 
+'templatesused' => 'Templat yang digunakan di halaman ini:',
 
-# History pages 
-# 
+# History pages
+#
 "revhistory" => "Sejarah revisi",
 "nohistory" => "Tidak ada sejarah penyuntingan untuk halaman ini",
 "revnotfound" => "Revisi tidak ditemukan",
@@ -457,19 +425,19 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "loadhist" => "Memuat halaman sejarah",
 "currentrev" => "Revisi sekarang",
 "revisionasof" => "Revisi per $1",
-'revisionasofwithlink'  => 'Revisi per $1; $2<br />$3 | $4', 
-'previousrevision'      => '←Revisi yang lebih tua', 
-'nextrevision'          => 'Revisi yang lebih baru→', 
-'currentrevisionlink'   => 'lihat revisi sekarang', 
+'revisionasofwithlink'  => 'Revisi per $1; $2<br />$3 | $4',
+'previousrevision'      => '←Revisi yang lebih tua',
+'nextrevision'          => 'Revisi yang lebih baru→',
+'currentrevisionlink'   => 'lihat revisi sekarang',
 "cur" => "kini",
 "next" => "berikut",
 "last" => "akhir",
 "orig" => "asli",
-"histlegend" => "Cara membandingkan: tandai radio button versi-versi yang ingin dibandingkan, lalu tekan ENTER atau tombol di bawah.<br />Legenda: (kini) = perbedaan dengan versi sekarang, (akhir) = perbedaan dengan versi sebelumnya, m = suntingan kecil", 
+"histlegend" => "Cara membandingkan: tandai radio button versi-versi yang ingin dibandingkan, lalu tekan ENTER atau tombol di bawah.<br />Legenda: (kini) = perbedaan dengan versi sekarang, (akhir) = perbedaan dengan versi sebelumnya, m = suntingan kecil",
 'history_copyright' => '-',
 
-# Diffs 
-# 
+# Diffs
+#
 "difference" => "(Perbedaan antarrevisi)",
 "loadingrev" => "memuat revisi untuk dibandingkan",
 "lineno" => "Baris $1:",
@@ -478,11 +446,9 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 'selectolderversionfordiff' => 'Pilih sebuah versi yang lebih tua untuk perbandingan',
 'compareselectedversions' => 'Bandingkan versi terpilih',
 
-# Search results 
-# 
+# Search results
+#
 "searchresults" => "Hasil Pencarian",
-"searchhelppage" => "{{ns:4}}:Pencarian",
-"searchingwikipedia" => "Mencari {{SITENAME}}",
 "searchresulttext" => "Untuk informasi lebih lanjut tentang pencarian di {{SITENAME}}, lihat [[Project:Pencarian|Mencari {{SITENAME}}]].",
 "searchquery" => "Untuk kueri \"$1\"",
 "badquery" => "Format kueri pencarian salah",
@@ -529,16 +495,15 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 </div>',
 "blanknamespace" => "(Utama)",
 
-# Preferences page 
-# 
+# Preferences page
+#
 "preferences" => "Konfigurasi",
 "prefsnologin" => "Belum login",
 "prefsnologintext" => "Anda harus [[Special:Userlogin|login]] untuk menetapkan konfigurasi Anda.",
-"prefslogintext" => "Anda telah login sebagai \"$1\".\nNomor ID Anda adalah $2.\n\nLihat [[Project:Bantuan Konfigurasi]] untuk cara mengatur konfigurasi Anda.", 
+"prefslogintext" => "Anda telah login sebagai \"$1\".\nNomor ID Anda adalah $2.\n\nLihat [[Project:Bantuan Konfigurasi]] untuk cara mengatur konfigurasi Anda.",
 
-"prefsreset" => "Konfigurasi telah dikembalikan ke asal dari storage.", 
+"prefsreset" => "Konfigurasi telah dikembalikan ke asal dari storage.",
 "qbsettings" => "Pengaturan quickbar",
-'qbsettingsnote' => 'Konfigurasi ini hanya berlaku pada skin \'Standar\' dan \'CologneBlue\'.',
 "changepassword" => "Ganti kata sandi",
 "skin" => "Skin",
 "math" => "Penggambaran math",
@@ -584,27 +549,19 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 #
 
 # switching pan
-'userlevels-group-edit' => 'Kelompok yang telah ada: ',
 'editgroup' => 'Sunting Kelompok',
 'addgroup' => 'Tambah Kelompok',
 
-'userlevels-lookup-user' => 'Atur kelompok pengguna',
 'editusergroup' => 'Sunting Kelompok Pengguna',
 
 # group editing
-'userlevels-editgroup' => 'Sunting kelompok',
-'userlevels-addgroup' => 'Tambah kelompok',
-'userlevels-editgroup-name' => 'Nama kelompok: ',
-'userlevels-editgroup-description' => 'Keterangan kelompok (maks. 255 karakter):<br />',
 'savegroup' => 'Simpan Kelompok',
 
 # user groups editing
-'userlevels-editusergroup' => 'Sunting kelompok pengguna',
 'saveusergroups' => 'Simpan Kelompok Pengguna',
-'userlevels-groupsavailable' => 'Kelompok yang tersedia:',
 
 # Recent changes
-# 
+#
 "changes" => "perubahan",
 "recentchanges" => "Perubahan Terbaru",
 'recentchanges-url' => 'Special:Recentchanges',
@@ -615,7 +572,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "rclistfrom" => "Tampilkan perubahan baru sejak $1",
 # "rclinks" => "Show last $1 changes in last $2 hours / last $3 days",
 # "rclinks" => "Show last $1 changes in last $2 days.",
-"showhideminor" => "$1 suntingan kecil | $2 bot | $3 pengguna yang login | $4 suntingan diperiksa", 
+"showhideminor" => "$1 suntingan kecil | $2 bot | $3 pengguna yang login | $4 suntingan diperiksa",
 "rclinks" => "Tampilkan $1 perubahan terakhir dalam $2 hari terakhir<br />$3",
 "rchide" => "dalam bentuk $4; $1 suntingan kecil; $2 namespace sekunder; $3 suntingan berganda.",
 "rcliu" => "; $1 penyuntingan dari pengguna yang login",
@@ -630,8 +587,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "newpageletter" => "B",
 'sectionlink' => '→',
 
-# Upload 
-# 
+# Upload
+#
 "upload" => "Unggah",
 "uploadbtn" => "Unggahkan file",
 "uploadlink" => "Unggahkan gambar",
@@ -640,7 +597,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "uploadnologin" => "Belum login",
 "uploadnologintext" => "Anda harus <a href=\"{{localurl:Special:Userlogin}}\">login</a> untuk dapat mengunggahkan file.",
 "uploaderror" => "Kesalahan Pengunggahan",
-"uploadtext" => "'''STOP!''' Sebelum Anda mengunggahkan di sini, pastikan bahwa Anda telah membaca dan menaati [[Special:Image_use_policy|kebijaksanaan penggunaan gambar]].\n\nJika ada sebuah file dalam wiki yang mempunyai nama yang sama dengan file yang akan Anda unggahkan, file tersebut akan ditimpa tanpa peringatan dengan file yang akan Anda unggahkan. Jadi, kecuali Anda ingin memperbarui sebuah file, Anda sangat disarankan untuk memeriksa apakah sudah ada file dengan nama yang sama dengan file yang akan Anda unggahkan.\n\nUntuk melihat atau mencari gambar-gambar yang telah diunggahkan, silakan kunjungi [[Special:Imagelist|daftar gambar yang diunggahkan]]}}. Semua pengunggahan dan penghapusan dicatat dalam [[Project:Catatan_Unggah|catatan pengunggahan]].\n\nGunakan formulir berikut ini untuk mengunggahkan file gambar baru untuk dipakai dalam mengilustrasikan artikel Anda. Pada kebanyakan browser, Anda akan melihat tombol \"Browse...\", yang akan menampilkan dialog buka file sistem operasi Anda. Memilih sebuah file akan mengisikan namanya dalam kotak teks di sebelah tombol tersebut. Anda juga harus memberi tanda cek pada kotak cek, menandakan bahwa Anda tidak melanggar hak cipta apapun dengan mengunggahkan file tersebut. Tekan tombol \"Unggah\" untuk menyelesaikan proses pengunggahan. Proses ini mungkin akan memakan waktu agak lama jika Anda memiliki koneksi internet yang lambat. <p>Format file yang disukai adalah JPEG untuk foto, PNG untuk gambar dan simbol, dan OGG untuk suara. Mohon beri nama file Anda secara deskriptif untuk menghindari kebingungan. Untuk memasukkan sebuah gambar ke dalam artikel, gunakan link dalam bentuk '''<nowiki>[[{{ns:6}}:file.jpg]]</nowiki>''' atau '''<nowiki>[[{{ns:6}}:file.png|teks alternatif]]</nowiki>''' atau '''<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>''' untuk suara.\n\nMohon diperhatikan bahwa sebagaimana dengan halaman {{SITENAME}} yang lain, orang lain dapat menyunting atau menghapus file Anda jika mereka menganggap hal itu perlu, dan Anda juga dapat diblokir bila Anda menyalahgunakan sistem.", 
+"uploadtext" => "'''STOP!''' Sebelum Anda mengunggahkan di sini, pastikan bahwa Anda telah membaca dan menaati [[Special:Image_use_policy|kebijaksanaan penggunaan gambar]].\n\nJika ada sebuah file dalam wiki yang mempunyai nama yang sama dengan file yang akan Anda unggahkan, file tersebut akan ditimpa tanpa peringatan dengan file yang akan Anda unggahkan. Jadi, kecuali Anda ingin memperbarui sebuah file, Anda sangat disarankan untuk memeriksa apakah sudah ada file dengan nama yang sama dengan file yang akan Anda unggahkan.\n\nUntuk melihat atau mencari gambar-gambar yang telah diunggahkan, silakan kunjungi [[Special:Imagelist|daftar gambar yang diunggahkan]]}}. Semua pengunggahan dan penghapusan dicatat dalam [[Project:Catatan_Unggah|catatan pengunggahan]].\n\nGunakan formulir berikut ini untuk mengunggahkan file gambar baru untuk dipakai dalam mengilustrasikan artikel Anda. Pada kebanyakan browser, Anda akan melihat tombol \"Browse...\", yang akan menampilkan dialog buka file sistem operasi Anda. Memilih sebuah file akan mengisikan namanya dalam kotak teks di sebelah tombol tersebut. Anda juga harus memberi tanda cek pada kotak cek, menandakan bahwa Anda tidak melanggar hak cipta apapun dengan mengunggahkan file tersebut. Tekan tombol \"Unggah\" untuk menyelesaikan proses pengunggahan. Proses ini mungkin akan memakan waktu agak lama jika Anda memiliki koneksi internet yang lambat. <p>Format file yang disukai adalah JPEG untuk foto, PNG untuk gambar dan simbol, dan OGG untuk suara. Mohon beri nama file Anda secara deskriptif untuk menghindari kebingungan. Untuk memasukkan sebuah gambar ke dalam artikel, gunakan link dalam bentuk '''<nowiki>[[{{ns:6}}:file.jpg]]</nowiki>''' atau '''<nowiki>[[{{ns:6}}:file.png|teks alternatif]]</nowiki>''' atau '''<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>''' untuk suara.\n\nMohon diperhatikan bahwa sebagaimana dengan halaman {{SITENAME}} yang lain, orang lain dapat menyunting atau menghapus file Anda jika mereka menganggap hal itu perlu, dan Anda juga dapat diblokir bila Anda menyalahgunakan sistem.",
 
 "uploadlog" => "catatan pengunggahan",
 "uploadlogpage" => "Catatan_Unggah",
@@ -649,11 +606,9 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "filedesc" => "Ringkasan",
 "filestatus" => "Status hak cipta",
 "filesource" => "Sumber",
-"affirmation" => "Saya menegaskan bahwa pemilik hak cipta file ini telah setuju untuk melisensikan file tersebut di bawah aturan $1.",
 "copyrightpage" => "Project:Hak_Cipta",
 "copyrightpagename" => "Hak cipta {{SITENAME}}",
 "uploadedfiles" => "File yang telah diunggahkan",
-"noaffirmation" => "Anda harus menegaskan bahwa file yang akan diunggahkan tidak melanggar hak cipta apapun.",
 "ignorewarning" => "Abaikan peringatan dan simpan file",
 "minlength" => "Nama gambar sekurang-kurangnya harus tiga huruf.",
 'illegalfilename' => 'Nama file "$1" mengandung karakter yang tidak diizinkan dalam judul halaman. Silakan ubah nama file tersebut dan cobalah mengunggahkannya kembali.',
@@ -670,14 +625,13 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "uploaddisabled" => "Maaf, pengunggahan dimatikan.",
 'uploadcorrupt' => 'File tersebut rusak atau ekstensinya salah. Silakan periksa file tersebut dan unggahkanlah kembali.',
 
-# Image list 
-# 
+# Image list
+#
 "imagelist" => "Daftar Gambar",
 "imagelisttext" => "Di bawah ini adalah daftar gambar yang telah diurutkan $2.",
 "getimagelist" => "memperoleh daftar gambar",
 "ilsubmit" => "Cari",
 "showlast" => "Tampilkan $1 gambar terakhir yang telah diurutkan $2.",
-"all" => "semua",
 "byname" => "berdasarkan nama",
 "bydate" => "berdasarkan tanggal",
 "bysize" => "berdasarkan ukuran",
@@ -686,24 +640,24 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "imglegend" => "Legenda: (desc) = lihat/sunting deskripsi gambar.",
 "imghistory" => "Sejarah gambar",
 "revertimg" => "revert",
-"deleteimg" => "hapus", 
-'deleteimgcompletely'		=> 'Hapus semua revisi',
+"deleteimg" => "hapus",
+'deleteimgcompletely' => 'Hapus semua revisi',
 "imghistlegend" => "Legend: (kini) = ini adalah gambar yang sekarang, (hapus) = hapus versi lama ini, (rv) = kembalikan ke versi lama ini. <br /><i>Klik pada tanggal untuk melihat gambar yang diunggahkan pada tanggal tersebut</i>.",
 "imagelinks" => "Pautan gambar",
 "linkstoimage" => "Halaman-halaman berikut berpaut ke gambar ini:",
 "nolinkstoimage" => "Tidak ada halaman yang berpaut ke gambar ini.",
-"sharedupload" => "File ini adalah unggahan bersama yang mungkin juga dipakai oleh proyek lain.", 
+"sharedupload" => "File ini adalah unggahan bersama yang mungkin juga dipakai oleh proyek lain.",
 
-# Statistics 
-# 
+# Statistics
+#
 "statistics" => "Statistik",
 "sitestats" => "Statistik situs",
 "userstats" => "Statistik pengguna",
 "sitestatstext" => "Ada sejumlah <b>$1</b> halaman dalam basis data. Ini termasuk halaman \"pembicaraan\", halaman tentang {{SITENAME}}, halaman minimum \"stub\", peralihan halaman, dan halaman-halaman lain yang mungkin bukan artikel. Selain itu, ada <b>$2</b> halaman yang mungkin adalah artikel yang sah.<p> Ada sejumlah <b>$3</b> penampilan halaman, dan sejumlah <b>$4</b> penyuntingan sejak wiki ini dimulai. Ini berarti rata-rata <b>$5</b> suntingan per halaman, dan <b>$6</b> penampilan per penyuntingan.",
-"userstatstext" => "Ada <b>$1</b> pengguna terdaftar. <b>$2</b> diantaranya adalah administrator (lihat $3).",  
+"userstatstext" => "Ada <b>$1</b> pengguna terdaftar. <b>$2</b> diantaranya adalah administrator (lihat $3).",
 
-# Maintenance Page 
-# 
+# Maintenance Page
+#
 "maintenance" => "Halaman Pemeliharaan",
 "maintnancepagetext" => "Halaman ini mengandung beberapa peralatan untuk pemeliharaan harian. Kebanyakan fungsi yang terdapat di sini cenderung membebani basis data, jadi mohon jangan tekan tombol 'reload' setelah melakukan perbaikan ;-)",
 "maintenancebacklink" => "Kembali ke halaman pemeliharaan",
@@ -724,14 +678,14 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "missinglanguagelinkstext" => "Halaman ini <i>tidak</i> menyambung ke halaman rekannya di $1. Peralihan dan sub halaman <i>tidak</i> ditunjukkan.",
 
 
-# Miscellaneous special pages 
-# 
+# Miscellaneous special pages
+#
 "orphans" => "Halaman Yatim",
-'geo' => 'Koordinat GEO', 
-'validate' => 'Sahkan halaman', 
+'geo' => 'Koordinat GEO',
+'validate' => 'Sahkan halaman',
 "lonelypages" => "Halaman Yatim",
 'uncategorizedpages' => 'Halaman Tak Berkategori',
-'uncategorizedcategories' => 'Kategori Tak Berkategori', 
+'uncategorizedcategories' => 'Kategori Tak Berkategori',
 "unusedimages" => "Gambar yang Tidak Digunakan",
 "popularpages" => "Halaman Populer",
 "nviews" => "$1 penampilan",
@@ -760,26 +714,24 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "booksources" => "Sumber Buku",
 'categoriespagetext' => 'Kategori-kategori berikut ada dalam wiki.',
 'data'  => 'Data',
-'userlevels' => 'Pengelolaan tingkatan pengguna', 
 "booksourcetext" => "Di bawah ini adalah daftar pautan ke situs lain yang menjual buku baru dan bekas, dan mungkin juga mempunyai informasi lebih lanjut mengenai buku yang sedang Anda cari. {{SITENAME}} tidak berkepentingan dengan situs-situs web di atas, dan daftar ini seharusnya tidak dianggap sebagai sebuah dukungan.",
 "isbn" => "ISBN",
 "rfcurl" =>  "http://www.faqs.org/rfcs/rfc$1.html",
 'pubmedurl' =>  'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1',
 "alphaindexline" => "$1 ke $2",
 "version" => "Versi",
-'log' => 'Catatan-Catatan', 
-'alllogstext' => 'Tampilan gabungan catatan pengunggahan, penghapusan, perlindungan, pemblokiran, dan sysop. Anda dapat melakukan pembatasan tampilan dengan memilih jenis catatan, nama pengguna, atau nama halaman.', 
+'log' => 'Catatan-Catatan',
+'alllogstext' => 'Tampilan gabungan catatan pengunggahan, penghapusan, perlindungan, pemblokiran, dan sysop. Anda dapat melakukan pembatasan tampilan dengan memilih jenis catatan, nama pengguna, atau nama halaman.',
 
 # Special:Allpages
 'nextpage'          => 'Halaman berikutnya ($1)',
 'allarticles'       => 'Semua artikel',
 'allpagesprev'      => 'Sebelumnya',
 'allpagesnext'      => 'Selanjutnya',
-'allpagesnamespace' => 'Semua halaman (namespace $1)',
 'allpagessubmit'    => 'Go',
 
-# Email this user 
-# 
+# Email this user
+#
 "mailnologin" => "Tidak ada alamat e-mail",
 "mailnologintext" => "Anda harus [[Special:Userlogin|login]] dan mempunyai alamat e-mail yang sah di dalam [[Special:Preferences|konfigurasi]] untuk mengirimkan e-mail kepada pengguna lain.",
 
@@ -801,8 +753,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "emailsent" => "e-mail terkirim",
 "emailsenttext" => "e-mail Anda telah dikirimkan.",
 
-# Watchlist 
-# 
+# Watchlist
+#
 "watchlist" => "Daftar Pemantauan",
 "watchlistsub" => "(untuk pengguna \"$1\")",
 "nowatchlist" => "Daftar pemantauan Anda kosong.",
@@ -831,8 +783,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "wlshowlast" => "Tampilkan $1 jam $2 hari $3 terakhir",
 "wlsaved" => "Ini adalah versi tersimpan dari daftar pemantauan Anda.",
 
-# Delete/protect/revert 
-# 
+# Delete/protect/revert
+#
 "deletepage" => "Hapus halaman",
 "confirm" => "Konfirmasikan",
 "excontent" => "isi sebelumnya: '$1'",
@@ -842,7 +794,6 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "deletesub" => "(Menghapus \"$1\")",
 "historywarning" => "Peringatan: Halaman yang ingin Anda hapus mempunyai sejarah:",
 "confirmdeletetext" => "Anda akan menghapus halaman atau gambar ini secara permanen berikut semua sejarahnya dari basis data.  Pastikan bahwa Anda memang ingin berbuat demikian, mengetahui segala akibatnya, dan apa yang Anda lakukan ini adalah sejalan dengan [[Project:Kebijaksanaan|kebijaksanaan Wikipedia]].",
-"confirmcheck" => "Ya, saya benar-benar ingin menghapus halaman ini",
 "actioncomplete" => "Proses selesai",
 "deletedtext" => "\"$1\" telah dihapus. Lihat $2 untuk catatan terkini halaman yang telah dihapus.",
 "deletedarticle" => "menghapus \"$1\"",
@@ -860,22 +811,22 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "alreadyrolled" => "Tidak dapat melakukan rollback terhadap penyuntingan terakhir dari [[$1]] oleh [[Pengguna:$2|$2]] ([[Bicara_pengguna:$2|Pembicaraan); orang lain telah mengedit atau menlakukan rollback terhadap artikel tersebut.\n\nEdit terakhir oleh [[Pengguna:$3|$3]] ([[Bicara_pengguna:$3|Pembicaraan]]).",
 "editcomment" => "Komentar penyuntingan adalah: \"<i>$1</i>\".",
 "revertpage" => "Dikembalikan oleh $1",
-'sessionfailure' => 'Kelihatannya ada masalah dengan sesi login Anda; tindakan ini dibatalkan sebagai pencegahan terhadap pembajakan sesi. Silakan tekan "back", lalu reload-lah halaman yang sebelumnya Anda kunjungi, dan cobalah tindakan tersebut sekali lagi.', 
+'sessionfailure' => 'Kelihatannya ada masalah dengan sesi login Anda; tindakan ini dibatalkan sebagai pencegahan terhadap pembajakan sesi. Silakan tekan "back", lalu reload-lah halaman yang sebelumnya Anda kunjungi, dan cobalah tindakan tersebut sekali lagi.',
 "protectlogpage" => "Catatan_Perlindungan",
-"protectlogtext" => "Di bawah ini adalah daftar catatan perlindungan/penghilangan perlindungan halaman. Lihat [[Project:Halaman_dilindungi]] untuk informasi lebih lanjut.", 
+"protectlogtext" => "Di bawah ini adalah daftar catatan perlindungan/penghilangan perlindungan halaman. Lihat [[Project:Halaman_dilindungi]] untuk informasi lebih lanjut.",
 "protectedarticle" => "melindungi [[$1]]",
 "unprotectedarticle" => "menghilangkan perlindungan [[$1]]",
 "protectsub" =>"(Melindungi \"$1\")",
 "confirmprotecttext" => "Apakah Anda benar-benar ingin melindungi halaman ini?",
 "confirmprotect" => "Konfirmasi Perlindungan",
-'protectmoveonly' => 'Lindungi dari perpindahan saja', 
+'protectmoveonly' => 'Lindungi dari perpindahan saja',
 "protectcomment" => "Alasan perlindungan",
 "unprotectsub" =>"(Menghilangkan perlindungan terhadap \"$1\")",
 "confirmunprotecttext" => "Apakah Anda benar-benar ingin menghilangkan perlindungan terhadap halaman ini?",
 "confirmunprotect" => "Konfirmasi Penghilangan Perlindungan",
 "unprotectcomment" => "Alasan penghilangan perlindungan",
 
-# Undelete 
+# Undelete
 "undelete" => "Kembalikan Halaman yang Telah Dihapus",
 "undeletepage" => "Lihat dan Kembalikan Halaman yang Telah Dihapus",
 "undeletepagetext" => "Halaman-halaman berikut ini telah dihapus tapi masih ada di dalam arsip dan dapat dikembalikan. Arsip tersebut mungkin akan dibersihkan secara berkala.",
@@ -885,22 +836,22 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "undeleterevision" => "Revisi yang telah dihapus per $1",
 "undeletebtn" => "Kembalikan!",
 "undeletedarticle" => "\"$1\" telah dikembalikan",
-'undeletedrevisions' => "$1 revisi telah dikembalikan", 
+'undeletedrevisions' => "$1 revisi telah dikembalikan",
 "undeletedtext" => "Halaman [[$1]] berhasil dikembalikan. Lihat [[Project:Catatan/Penghapusan]] untuk catatan terkini penghapusan dan pengembalian halaman.",
 
-# Contributions 
-# 
+# Contributions
+#
 "contributions" => "Sumbangan Pengguna",
 "mycontris" => "Sumbangan saya",
 "contribsub" => "Untuk $1",
 "nocontribs" => "Tidak ada perubahan yang cocok dengan kriteria-kriteria ini.",
 "ucnote" => "Di bawah ini adalah <b>$1</b> perubahan terakhir pengguna dalam <b>$2</b> hari terakhir.",
 "uclinks" => "Tampilkan $1 perubahan terbaru; tampilkan $2 hari terakhir",
-"uctop" => " (atas)" , 
-'newbies' => 'pengguna baru', 
+"uctop" => " (atas)" ,
+'newbies' => 'pengguna baru',
 
-# What links here 
-# 
+# What links here
+#
 "whatlinkshere" => "Pautan ke halaman ini",
 "notargettitle" => "Tidak Ada Sasaran",
 "notargettext" => "Anda tidak menentukan halaman atau pengguna tujuan fungsi ini.",
@@ -909,8 +860,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "nolinkshere" => "Tidak ada halaman yang berpaut ke sini.",
 "isredirect" => "halaman peralihan",
 
-# Block/unblock IP 
-# 
+# Block/unblock IP
+#
 "blockip" => "Blokir IP",
 "blockiptext" => "Gunakan formulir di bawah untuk memblokir kemampuan menulis sebuah alamat IP atau pengguna tertentu. Ini perlu dilakukan untuk mencegah vandalisme, dan sejalan dengan [[Project:Kebijaksanaan|kebijaksanaan Wikipedia]]. Masukkan alasan Anda di bawah (contohnya mengambil halaman tertentu yang telah dirusak).",
 "ipaddress" => "Alamat IP atau pengguna",
@@ -918,7 +869,6 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "ipbreason" => "Alasan",
 "ipbsubmit" => "Kirimkan",
 "badipaddress" => "Format alamat IP atau nama pengguna salah.",
-"noblockreason" => "Anda harus memberikan alasan pemblokiran tersebut.",
 "blockipsuccesssub" => "Pemblokiran sukses",
 "blockipsuccesstext" => "Alamat IP atau pengguna \"$1\" telah diblokir. <br />Lihat [[Special:Ipblocklist|Daftar IP dan pengguna diblokir]] untuk melihat kembali pemblokiran.",
 "unblockip" => "Hilangkan blokir terhadap alamat IP atau pengguna",
@@ -942,10 +892,10 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "proxyblockreason" => "Alamat IP Anda telah diblokir karena alamat IP Anda adalah proxy terbuka. Silakan hubungi penyedia jasa internet Anda atau dukungan teknis dan beritahukan mereka masalah keamanan serius ini.",
 "proxyblocksuccess" => "Selesai.\n",
 'sorbs' => 'SORBS DNSBL',
-'sorbsreason' => 'Alamat IP anda terdaftar sebagai proxy terbuka di [http://www.sorbs.net SORBS] DNSBL.', 
-'sorbs_create_account_reason' => 'Alamat IP anda terdaftar sebagai proxy terbuka di [http://www.sorbs.net SORBS] DNSBL. Anda tidak dapat membuat akun.', 
+'sorbsreason' => 'Alamat IP anda terdaftar sebagai proxy terbuka di [http://www.sorbs.net SORBS] DNSBL.',
+'sorbs_create_account_reason' => 'Alamat IP anda terdaftar sebagai proxy terbuka di [http://www.sorbs.net SORBS] DNSBL. Anda tidak dapat membuat akun.',
 
-# Make sysop 
+# Make sysop
 "makesysoptitle" => "Buat Seorang Pengguna Menjadi Sysop",
 "makesysoptext" => "Formulir ini digunakan oleh para birokrat untuk menjadikan pengguna biasa menjadi seorang administrator. Ketikkan nama pengguna yang dimaksud dalam kotak dan tekan tombol untuk menjadikan pengguna tersebut seorang administrator",
 "makesysopname" => "Nama pengguna:",
@@ -954,7 +904,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "makesysopfail" => "<b>Pengguna \"$1\" tidak dapat dijadikan sysop. (Apakah Anda mengetikkan namanya dengan benar?)</b>",
 "setbureaucratflag" => "Atur flag birokrat",
 "bureaucratlog" => "Catatan_Birokrat",
-'rightslogtext' => 'Ini adalah catatan perubahan terhadap hak-hak pengguna.', 
+'rightslogtext' => 'Ini adalah catatan perubahan terhadap hak-hak pengguna.',
 "bureaucratlogentry" => "Hak-hak pengguna \"$1\" diatur \"$2\"",
 "rights" => "Hak-hak:",
 "set_user_rights" => "Atur hak-hak pengguna",
@@ -962,8 +912,8 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "set_rights_fail" => "<b>Hak-hak pengguna \"$1\" tidak dapat diatur. (Apakah Anda mengetikkan namanya dengan benar?)</b>",
 "makesysop" => "Buat Seorang Pengguna Menjadi Sysop",
 
-# Developer tools 
-# 
+# Developer tools
+#
 "lockdb" => "Kunci Basis Data",
 "unlockdb" => "Buka Kunci Basis Data",
 "lockdbtext" => "Mengunci basis data akan menghentikan kemampuan semua pengguna dalam menyunting halaman, mengubah konfigurasi pengguna, menyunting daftar pemantauan mereka, dan hal-hal lain yang memerlukan perubahan terhadap basis data. Pastikan bahwa ini adalah yang ingin Anda lakukan, dan bahwa Anda akan membuka kunci basis data setelah pemeliharaan selesai.",
@@ -978,17 +928,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "lockdbsuccesstext" => "Basis data telah dikunci. <br />Pastikan Anda membuka kuncinya setelah pemeliharaan selesai.",
 "unlockdbsuccesstext" => "Kunci basis data telah dibuka.",
 
-# SQL query 
-# 
-"asksql" => "Kueri SQL",
-"asksqltext" => "Gunakan formulir di bawah untuk membuat kueri langsung terhadap basis data. Gunakan tanda kutip tunggal ('seperti ini') untuk membatasi literal string.  Fungsi ini sering membebani server, jadi silakan gunakan fungsi ini dengan hemat.",
-"sqlislogged" => "Perhatikan bahwa semua kueri akan dicatat.",
-"sqlquery" => "Masukkan kueri",
-"querybtn" => "Kirimkan kueri",
-"selectonly" => "Kueri selain \"SELECT\" hanya dapat dilakukan oleh pengembang Wikipedia.",
-"querysuccessful" => "Kueri berhasil",
-
-# Validation 
+# Validation
 'val_clear_old' => 'Hapus data pengesahan saya yang lainnya untuk $1',
 'val_merge_old' => 'Gunakan penilaian saya sebelumnya jika saya memilih \'Abstain\'',
 'val_form_note' => '<b>Petunjuk:</b> Menggabungkan data Anda berarti bahwa untuk revisi pengesahan yang Anda pilih, semua pilihan Anda yang <i>Abstain</i> akan diganti dengan pilihan dan komentar dari revisi yang paling baru yang mana untuk pilihan tersebut Anda tidak abstain. Sebagai contoh, jika Anda ingin mengganti pilihan tunggal dengan revisi yang lebih baru, tetapi tidak ingin mengganti pilihan Anda yang lainnya untuk revisi artikel ini, pilih pilihan mana yang ingin anda ubah, dan penggabungan akan mengisi pilihan lainnya dengan pilihan Anda sebelumnya.',
@@ -1006,13 +946,13 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 'val_validate_version' => 'Sahkan versi ini',
 'val_user_validations' => 'Penggung ini telah mengesahkan $1 halaman.',
 'val_no_anon_validation' => 'Anda harus login untuk dapat mengesahkan artikel.',
-'val_validate_article_namespace_only' => 'Hanya artikel saja yang dapat disahkan. Halaman ini <i>tidak</i> berada dalam namespace artikel.', 
+'val_validate_article_namespace_only' => 'Hanya artikel saja yang dapat disahkan. Halaman ini <i>tidak</i> berada dalam namespace artikel.',
 'val_validated' => 'Pengesahan selesai.',
 'val_article_lists' => 'Daftar artikel yang telah disahkan',
 'val_page_validation_statistics' => 'Statistik pengesahan halaman untuk $1',
 
 # Move page
-# 
+#
 "movepage" => "Pindahkan Halaman",
 "movepagetext" => "Formulir di bawah ini digunakan untuk mengubah nama suatu halaman dan memindahkan semua data sejarah ke nama baru. Judul yang lama akan menjadi halaman peralihan menuju judul yang baru. Pautan kepada judul lama tidak akan berubah. Pastikan untuk memeriksa terhadap peralihan halaman yang rusak atau berganda setelah pemindahan. Anda bertanggung jawab untuk memastikan bahwa pautan terus menyambung ke halaman yang seharusnya.\n\nPerhatikan bahwa halaman '''tidak''' akan dipindah apabila telah ada halaman di pada judul yang baru, kecuali bila halaman tersebut kosong atau merupakan halaman peralihan dan tidak mempunyai sejarah penyuntingan. Ini berarti Anda dapat mengubah nama halaman kembali seperti semula apabila Anda membuat kesalahan, dan Anda tidak dapat menimpa halaman yang telah ada.\n\n<b>PERINGATAN!</b> Ini dapat mengakibatkan perubahan yang tak terduga dan drastis  bagi halaman yang populer. Pastikan Anda mengerti konsekuensi dari perbuatan ini sebelum melanjutkan.",
 "movepagetalktext" => "Halaman pembicaraan yang berkaitan, jika ada, juga akan dipindahkan secara otomatis '''kecuali apabila:'''\n*Anda memindahkan halaman melintasi namespace,\n*Sebuah halaman pembicaraan yang tidak kosong telah ada di bawah judul baru, atau\n*Anda tidak memberi tanda cek pada kotak cek di bawah ini.\n\nDalam kasus tersebut, apabila diinginkan, Anda dapat memindahkan atau menggabungkan halaman secara manual.",
@@ -1032,29 +972,29 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "1movedto2" => "$1 dipindahkan ke $2",
 '1movedto2_redir' => '$1 dipindahkan ke $2 melalui peralihan',
 
-# Export 
+# Export
 
 "export" => "Ekspor Halaman",
-'exporttext'    => 'Anda dapat mengekspor teks dan sejarah penyuntingan suatu halaman tertentu atau sejumlah halaman terbungkus dalam XML tertentu. Di masa depan, hasil ekspor ini dapat diimpor di wiki lainnya yang menggunakan perangkat lunak MediaWiki, meskipun fitur impor belum tersedia dalam versi ini.\n\nUntuk mengekspor halaman-halaman artikel, masukkan judul-judul dalam kotak teks di bawah ini, satu judul per baris, dan pilih apakah anda ingin mengekspor versi sekarang dengan versi sebelumnya, dengan catatan sejarah halaman, atau hanya versi sekarang dengan catatan penyuntingan terakhir.\n\nJika Anda hanya ingin mengimpor versi sekarang, Anda juga dapat melakukan hal ini dengan lebih cepat dengan cara menggunakan pautan khusus, sebagai contoh: [[{{ns:Special}}:Export/Train]] untuk mengekspor artikel [[Train]].', 
+'exporttext'    => 'Anda dapat mengekspor teks dan sejarah penyuntingan suatu halaman tertentu atau sejumlah halaman terbungkus dalam XML tertentu. Di masa depan, hasil ekspor ini dapat diimpor di wiki lainnya yang menggunakan perangkat lunak MediaWiki, meskipun fitur impor belum tersedia dalam versi ini.\n\nUntuk mengekspor halaman-halaman artikel, masukkan judul-judul dalam kotak teks di bawah ini, satu judul per baris, dan pilih apakah anda ingin mengekspor versi sekarang dengan versi sebelumnya, dengan catatan sejarah halaman, atau hanya versi sekarang dengan catatan penyuntingan terakhir.\n\nJika Anda hanya ingin mengimpor versi sekarang, Anda juga dapat melakukan hal ini dengan lebih cepat dengan cara menggunakan pautan khusus, sebagai contoh: [[{{ns:Special}}:Export/Train]] untuk mengekspor artikel [[Train]].',
 "exportcuronly" => "Hanya ekspor revisi sekarang, bukan seluruh sejarah",
 
-# Namespace 8 related 
+# Namespace 8 related
 
 "allmessages" => "Semua Pesan Sistem",
-'allmessagesname' => 'Nama', 
-'allmessagesdefault' => 'Teks baku', 
-'allmessagescurrent' => 'Teks sekarang', 
-'allmessagestext' => 'Ini adalah daftar semua pesan sistem yang tersedia dalam namespace MediaWiki:', 
-'allmessagesnotsupportedUI' => 'Bahasa antarmuka Anda saat ini, <b>$1</b> tidak didukung oleh Istimewa:AllMessages di situs ini.', 
-'allmessagesnotsupportedDB' => 'Istimewa:AllMessages tidak didukung karena wgUseDatabaseMessages dimatikan.', 
+'allmessagesname' => 'Nama',
+'allmessagesdefault' => 'Teks baku',
+'allmessagescurrent' => 'Teks sekarang',
+'allmessagestext' => 'Ini adalah daftar semua pesan sistem yang tersedia dalam namespace MediaWiki:',
+'allmessagesnotsupportedUI' => 'Bahasa antarmuka Anda saat ini, <b>$1</b> tidak didukung oleh Istimewa:AllMessages di situs ini.',
+'allmessagesnotsupportedDB' => 'Istimewa:AllMessages tidak didukung karena wgUseDatabaseMessages dimatikan.',
 
-# Thumbnails 
+# Thumbnails
 
 "thumbnail-more" => "Perbesar",
 "missingimage" => "<b>Gambar hilang</b><br /><i>$1</i>\n",
-'filemissing' => 'File hilang', 
+'filemissing' => 'File hilang',
 
-# Special:Import 
+# Special:Import
 "import" => "Impor Halaman",
 "importtext" => "Silakan ekspor file dari wiki asal menggunakan utilitas Istimewa:Export, simpan ke disk, dan unggahkan ke sini.",
 "importfailed" => "Impor gagal: $1",
@@ -1062,112 +1002,40 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "importsuccess" => "Impor sukses!",
 "importhistoryconflict" => "Terjadi konflik revisi sejarah (mungkin pernah mengimpor halaman ini sebelumnya)",
 
-# Keyboard access keys for power users 
-'accesskey-article' => 'a',
-'accesskey-talk' => 't',
-'accesskey-edit' => 'e',
-'accesskey-addsection' => '+',
-'accesskey-viewsource' => 'e',
-'accesskey-history' => 'h',
-'accesskey-protect' => '=',
-'accesskey-delete' => 'd',
-'accesskey-undelete' => 'd',
-'accesskey-move' => 'm',
-'accesskey-watch' => 'w',
-'accesskey-unwatch' => 'w',
-'accesskey-watchlist' => 'l',
-'accesskey-userpage' => '.',
-'accesskey-anonuserpage' => '.',
-'accesskey-mytalk' => 'n',
-'accesskey-anontalk' => 'n',
-'accesskey-preferences' => '',
-'accesskey-mycontris' => 'y',
-'accesskey-login' => 'o',
-'accesskey-logout' => 'o',
+# Keyboard access keys for power users
 'accesskey-search' => 'f',
-'accesskey-mainpage' => 'z',
-'accesskey-portal' => '',
-'accesskey-randompage' => 'x',
-'accesskey-currentevents' => '',
-'accesskey-sitesupport' => '',
-'accesskey-help' => '',
-'accesskey-recentchanges' => 'r',
-'accesskey-recentchangeslinked' => 'c',
-'accesskey-whatlinkshere' => 'b',
-'accesskey-specialpages' => 'q',
-'accesskey-specialpage' => '',
-'accesskey-upload' => 'u',
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
 'accesskey-compareselectedversions' => 'v',
-'accesskey-contributions' => '',
-'accesskey-emailuser' => '',
-
-# tooltip help for the main actions 
-'tooltip-atom' => 'Atom feed untuk halaman ini',
-'tooltip-article' => 'Lihat artikel [alt-a]',
-'tooltip-talk' => 'Diskusi mengenai artikel [alt-t]',
-'tooltip-edit' => 'Anda dapat menyunting halaman ini. Silakan pakai tombol pratilik sebelum menyimpan. [alt-e]',
-'tooltip-addsection' => 'Tambahkan komenter ke halaman ini. [alt-+]',
-'tooltip-viewsource' => 'Halaman ini dilindungi. Anda hanya dapat melihat sumbernya. [alt-e]',
-'tooltip-history' => 'Versi-versi sebelumnya dari halaman ini, [alt-h]',
-'tooltip-protect' => 'Lindungi halaman ini [alt-=]',
-'tooltip-delete' => 'Hapus halaman ini [alt-d]',
-'tooltip-undelete' => "Kembalikan $1 suntingan yang dihapus ke halaman ini [alt-d]",
-'tooltip-move' => 'Pindahkan halaman ini [alt-m]',
-'tooltip-nomove' => 'Anda tidak mempunyai izin untuk memindahkan halaman ini',
+
+# tooltip help for the main actions
 'tooltip-watch' => 'Tambahkan halaman ini ke daftar pemantauan Anda [alt-w]',
-'tooltip-unwatch' => 'Hapus halaman ini dari daftar pemantauan Anda [alt-w]',
-'tooltip-watchlist' => 'Daftar halaman yang Anda pantau perubahannya. [alt-l]',
-'tooltip-userpage' => 'Halaman pengguna saya [alt-.]',
-'tooltip-anonuserpage' => 'Halaman pengguna IP Anda [alt-.]',
-'tooltip-mytalk' => 'Halaman pembicaraan saya [alt-n]',
-'tooltip-anontalk' => 'Diskusi mengenai penyuntingan oleh alamat IP ini [alt-n]',
-'tooltip-preferences' => 'Konfigurasi saya',
-'tooltip-mycontris' => 'Daftar sumbangan saya [alt-y]',
-'tooltip-login' => 'Anda disarankan untuk login, meskipun hal itu tidak diwajibkan. [alt-o]',
-'tooltip-logout' => 'Tombol mulai [alt-o]',
 'tooltip-search' => 'Cari dalam wiki ini [alt-f]',
-'tooltip-mainpage' => 'Kunjungi Halaman Utama [alt-z]',
-'tooltip-portal' => 'Tentang proyek ini, apa yang dapat Anda lakukan, di mana mencari sesuatu',
-'tooltip-randompage' => 'Muat sebuah halaman acak [alt-x]',
-'tooltip-currentevents' => 'Temukan informasi tentang kejadian terkini',
-'tooltip-sitesupport' => 'Dukung {{SITENAME}}',
-'tooltip-help' => 'Tempat mencari bantuan.',
-'tooltip-recentchanges' => 'Daftar perubahan terbaru dalam wiki ini. [alt-r]',
-'tooltip-recentchangeslinked' => 'Perubahan terbaru dari halaman yang berpaut ke halaman ini [alt-c]',
-'tooltip-whatlinkshere' => 'Daftar semua halaman wiki yang berpaut ke sini [alt-b]',
-'tooltip-specialpages' => 'Daftar semua halaman istimewa [alt-q]',
-'tooltip-upload' => 'Unggahkan gambar atau file media [alt-u]',
-'tooltip-specialpage' => 'Halaman ini adalah halaman istimewa, Anda tidak dapat mengeditnya.',
 'tooltip-minoredit' => 'Tandai ini sebagai suntingan kecil [alt-i]',
 'tooltip-save' => 'Simpan perubahan Anda [alt-s]',
 'tooltip-preview' => 'Pratilik perubahan Anda -- mohon gunakan ini sebelum menyimpan! [alt-p]',
 'tooltip-compareselectedversions' => 'Lihat perbedaan antara dua versi halaman yang dipilih. [alt-v]',
-'tooltip-contributions' => 'Lihat daftar sumbangan pengguna ini',
-'tooltip-emailuser' => 'Kirimkan e-mail kepada pengguna ini',
-'tooltip-rss' => 'RSS feed untuk halaman ini',
 
 # stylesheets
 
-'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
+#'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
 #'Monobook.js' => '/* edit this file to change js things in the monobook skin */',
 
-# Metadata 
+# Metadata
 "nodublincore" => "Metadata Dublin Core RDF dimatikan di server ini.",
 "nocreativecommons" => "Metadata Creative Commons RDF dimatikan di server ini.",
 "notacceptable" => "Server wiki tidak dapat menyediakan data dalam format yang dapat dibaca oleh client Anda.",
 
-# Attribution 
+# Attribution
 
-"anonymous" => "Pengguna(-pengguna) anonim $wgSitename",
-"siteuser" => "Pengguna $wgSitename $1",
+"anonymous" => "Pengguna(-pengguna) anonim {{SITENAME}}",
+"siteuser" => "Pengguna {{SITENAME}} $1",
 "lastmodifiedby" => "Halaman ini terakhir kali diubah $1 oleh $2.",
 "and" => "dan",
 "othercontribs" => "Didasarkan pada karya $1.",
 'others' => 'lainnya',
-"siteusers" => "Pengguna(-pengguna) $wgSitename $1",
+"siteusers" => "Pengguna(-pengguna) {{SITENAME}} $1",
 'creditspage' => 'Penghargaan halaman',
 'nocredits' => 'Tidak ada informasi penghargaan yang tersedia untuk halaman ini.',
 
@@ -1175,13 +1043,13 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 
 'spamprotectiontitle' => 'Filter Pencegah Spam',
 'spamprotectiontext' => 'Halaman yang ingin Anda simpan diblokir oleh filter spam. Ini mungkin disebabkan oleh pautan ke situs luar.\n\nAnda dapat memeriksa regular expression berikut terhadap pola-pola yang diblokir:',
-'spamprotectionmatch' => 'Teks berikut ini memancing filter spam kami: $1', 
+'spamprotectionmatch' => 'Teks berikut ini memancing filter spam kami: $1',
 'subcategorycount' => "Ada $1 subkategori dalam kategori ini.",
-'subcategorycount1' => "Ada $1 subkategori dalam kategori ini.", 
+'subcategorycount1' => "Ada $1 subkategori dalam kategori ini.",
 'categoryarticlecount' => "Ada $1 artikel dalam kategori ini.",
-'categoryarticlecount1' => "Ada $1 artikel dalam kategori ini.", 
+'categoryarticlecount1' => "Ada $1 artikel dalam kategori ini.",
 'usenewcategorypage' => "1\n\nUbah karakter pertama menjadi \"0\" untuk mematikan tata letak halaman kategori yang baru.",
-'listingcontinuesabbrev' => " lanjut", 
+'listingcontinuesabbrev' => " lanjut",
 
 # Info page
 "infosubtitle" => "Informasi halaman",
@@ -1191,7 +1059,7 @@ Akun Anda telah dibuat. Jangan lupa mengatur konfigurasi {{SITENAME}} Anda.",
 "numauthors" => "Jumlah pengarang yang berbeda (artikel): $1",
 "numtalkauthors" => "Jumlah pengarang yang berbeda (halaman diskusi): $1",
 
-# Math options 
+# Math options
 'mw_math_png' => "Selalu buat PNG",
 'mw_math_simple' => "HTML jika sangat sederhana atau PNG",
 'mw_math_html' => "HTML jika mungkin atau PNG",
@@ -1274,8 +1142,6 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Lihat halaman kategori\');
 'newimages' => 'Galeri-Gambar Baru',
 'noimages'  => 'Tidak ada yang dilihat.',
 
-'sitesettings'                  => 'Pengaturan Situs',
-
 # labels for User: and Title: on Special:Log pages
 'specialloguserlabel' => 'Pengguna: ',
 'speciallogtitlelabel' => 'Judul: ',
@@ -1294,7 +1160,6 @@ class LanguageId extends LanguageUtf8 {
 		return $wgNamespaceNamesId;
 	}
 
-
 	function getNsIndex( $text ) {
 		global $wgNamespaceNamesId, $wgNamespaceAlternatesId;
 
@@ -1304,7 +1169,7 @@ class LanguageId extends LanguageUtf8 {
 		foreach ( $wgNamespaceAlternatesId as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
-		
+
 		# For backwards compatibility
 		global $wgNamespaceNamesEn;
 		foreach ( $wgNamespaceNamesEn as $i => $n ) {
@@ -1322,14 +1187,13 @@ class LanguageId extends LanguageUtf8 {
 		global $wgSkinNamesId;
 		return $wgSkinNamesId;
 	}
-	
+
 	function getDateFormats() {
 		global $wgDateFormatsId;
 		return $wgDateFormatsId;
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesId;
 		if( isset( $wgAllMessagesId[$key] ) ) {
 			return $wgAllMessagesId[$key];
@@ -1337,7 +1201,7 @@ class LanguageId extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, '.,', ',.' ) : $number;
diff --git a/languages/LanguageIs.php b/languages/LanguageIs.php
index d340b107cd41..9288486086f8 100644
--- a/languages/LanguageIs.php
+++ b/languages/LanguageIs.php
@@ -3,12 +3,6 @@
  * @package MediaWiki
  * @subpackage Language
  */
-   
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 
 # Most of this was written by Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 
@@ -43,12 +37,8 @@ require_once( 'LanguageUtf8.php' );
 	'standard'	=> 'Klassískt',
 	'nostalgia'	=> 'Gamaldags',
 	'cologneblue'	=> 'Kölnarblátt',
-	'davinci'	=> 'DaVinci',
-	'mono'		=> 'Mono',
-	'monobook'	=> 'MonoBook',
 	'myskin'	=> 'Mitt þema',
-	'chick'		=> 'Chick'
-);
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsIs = array(
 	'Sjálfgefið',
@@ -81,53 +71,53 @@ $wgAllMessagesIs = array(
 ",
 'Monobook.js' => "/* tooltips and access keys */
 ta = new Object();
-ta['pt-userpage'] = new Array('.','Notendasíðan mín'); 
-ta['pt-anonuserpage'] = new Array('.','Notendasíðan fyrir IP töluna þína'); 
-ta['pt-mytalk'] = new Array('n','Spallsíðan mín'); 
-ta['pt-anontalk'] = new Array('n','Spjallsíðan fyrir þessa IP tölu'); 
-ta['pt-preferences'] = new Array('','Almennar stillingar'); 
-ta['pt-watchlist'] = new Array('l','Vaktlistinn.'); 
-ta['pt-mycontris'] = new Array('y','Listi yfir framlög þín'); 
-ta['pt-login'] = new Array('o','Þú ert hvattur/hvött til að innskrá þig, það er hinsvegar ekki nauðsynlegt.'); 
-ta['pt-anonlogin'] = new Array('o','Þú ert hvattur/hvött til að innskrá þig, það er hinsvegar ekki nauðsynlegt.'); 
-ta['pt-logout'] = new Array('o','Útskráning'); 
-ta['ca-talk'] = new Array('t','Spallsíða þessarar síðu'); 
-ta['ca-edit'] = new Array('e','Þú getur breytt síðu þessari, vinsamlegast notaðu „forskoða“ hnappinn áður en þú vistar'); 
-ta['ca-addsection'] = new Array('+','Viðbótarumræða.'); 
-ta['ca-viewsource'] = new Array('e','Síða þessi er vernduð, þú getur þó skoðað frumkóða hennar.'); 
-ta['ca-history'] = new Array('h','Eldri útgáfur af síðunni.'); 
-ta['ca-protect'] = new Array('=','Vernda þessa síðu'); 
-ta['ca-delete'] = new Array('d','Eyða þessari síðu'); 
-ta['ca-undelete'] = new Array('d','Endurvekja breytingar á síðu þessari fyrir en henni var tortímt'); 
-ta['ca-move'] = new Array('m','Færa þessa síðu'); 
-ta['ca-watch'] = new Array('w','Bæta þessari síðu við á vaktlistann'); 
-ta['ca-unwatch'] = new Array('w','Fjarlægja þessa síðu af vaktlistanum'); 
-ta['search'] = new Array('f','Leit'); 
-ta['p-logo'] = new Array('','Forsíða'); 
-ta['n-mainpage'] = new Array('z','Forsíða {{SITENAME}}'); 
-ta['n-portal'] = new Array('','Um verkefnið, hvernig er hægt að hjálpa og hvar á að byrja'); 
-ta['n-currentevents'] = new Array('','Líðandi stund'); 
-ta['n-recentchanges'] = new Array('r','Listi yfir nýlegar breytingar.'); 
-ta['n-randompage'] = new Array('x','Handahófsvalin síða'); 
-ta['n-help'] = new Array('','Efnisyfirlit yfir hjálparsíður.'); 
-ta['n-sitesupport'] = new Array('','Fjárframlagssíða Wikimedia'); 
-ta['t-whatlinkshere'] = new Array('j','Listi yfir síður sem tengjast í þessa'); 
-ta['t-recentchangeslinked'] = new Array('k','Nýlegar breitingar á ítengdum síðum'); 
-ta['feed-rss'] = new Array('','RSS fyrir þessa síðu'); 
-ta['feed-atom'] = new Array('','Atom fyrir þessa síðu'); 
-ta['t-contributions'] = new Array('','Sýna framlagslista þessa notanda'); 
-ta['t-emailuser'] = new Array('','Senda notanda þessum póst'); 
-ta['t-upload'] = new Array('u','Innhlaða myndum eða margmiðlunarskrám'); 
-ta['t-specialpages'] = new Array('q','Listi yfir kerfissíður'); 
-ta['ca-nstab-main'] = new Array('c','Sýna síðuna'); 
-ta['ca-nstab-user'] = new Array('c','Sýna notendasíðuna'); 
-ta['ca-nstab-media'] = new Array('c','Sýna margmiðlunarsíðuna'); 
-ta['ca-nstab-special'] = new Array('','Þetta er kerfissíða, þér er óhæft að breyta henni.'); 
-ta['ca-nstab-wp'] = new Array('a','Sýna verkefnasíðuna'); 
-ta['ca-nstab-image'] = new Array('c','Sýna myndasíðuna'); 
-ta['ca-nstab-mediawiki'] = new Array('c','Sýna kerfisskilaboðin'); 
-ta['ca-nstab-template'] = new Array('c','View the template'); 
-ta['ca-nstab-help'] = new Array('c','Sýna hjálparsíðuna'); 
+ta['pt-userpage'] = new Array('.','Notendasíðan mín');
+ta['pt-anonuserpage'] = new Array('.','Notendasíðan fyrir IP töluna þína');
+ta['pt-mytalk'] = new Array('n','Spallsíðan mín');
+ta['pt-anontalk'] = new Array('n','Spjallsíðan fyrir þessa IP tölu');
+ta['pt-preferences'] = new Array('','Almennar stillingar');
+ta['pt-watchlist'] = new Array('l','Vaktlistinn.');
+ta['pt-mycontris'] = new Array('y','Listi yfir framlög þín');
+ta['pt-login'] = new Array('o','Þú ert hvattur/hvött til að innskrá þig, það er hinsvegar ekki nauðsynlegt.');
+ta['pt-anonlogin'] = new Array('o','Þú ert hvattur/hvött til að innskrá þig, það er hinsvegar ekki nauðsynlegt.');
+ta['pt-logout'] = new Array('o','Útskráning');
+ta['ca-talk'] = new Array('t','Spallsíða þessarar síðu');
+ta['ca-edit'] = new Array('e','Þú getur breytt síðu þessari, vinsamlegast notaðu „forskoða“ hnappinn áður en þú vistar');
+ta['ca-addsection'] = new Array('+','Viðbótarumræða.');
+ta['ca-viewsource'] = new Array('e','Síða þessi er vernduð, þú getur þó skoðað frumkóða hennar.');
+ta['ca-history'] = new Array('h','Eldri útgáfur af síðunni.');
+ta['ca-protect'] = new Array('=','Vernda þessa síðu');
+ta['ca-delete'] = new Array('d','Eyða þessari síðu');
+ta['ca-undelete'] = new Array('d','Endurvekja breytingar á síðu þessari fyrir en henni var tortímt');
+ta['ca-move'] = new Array('m','Færa þessa síðu');
+ta['ca-watch'] = new Array('w','Bæta þessari síðu við á vaktlistann');
+ta['ca-unwatch'] = new Array('w','Fjarlægja þessa síðu af vaktlistanum');
+ta['search'] = new Array('f','Leit');
+ta['p-logo'] = new Array('','Forsíða');
+ta['n-mainpage'] = new Array('z','Forsíða {{SITENAME}}');
+ta['n-portal'] = new Array('','Um verkefnið, hvernig er hægt að hjálpa og hvar á að byrja');
+ta['n-currentevents'] = new Array('','Líðandi stund');
+ta['n-recentchanges'] = new Array('r','Listi yfir nýlegar breytingar.');
+ta['n-randompage'] = new Array('x','Handahófsvalin síða');
+ta['n-help'] = new Array('','Efnisyfirlit yfir hjálparsíður.');
+ta['n-sitesupport'] = new Array('','Fjárframlagssíða Wikimedia');
+ta['t-whatlinkshere'] = new Array('j','Listi yfir síður sem tengjast í þessa');
+ta['t-recentchangeslinked'] = new Array('k','Nýlegar breitingar á ítengdum síðum');
+ta['feed-rss'] = new Array('','RSS fyrir þessa síðu');
+ta['feed-atom'] = new Array('','Atom fyrir þessa síðu');
+ta['t-contributions'] = new Array('','Sýna framlagslista þessa notanda');
+ta['t-emailuser'] = new Array('','Senda notanda þessum póst');
+ta['t-upload'] = new Array('u','Innhlaða myndum eða margmiðlunarskrám');
+ta['t-specialpages'] = new Array('q','Listi yfir kerfissíður');
+ta['ca-nstab-main'] = new Array('c','Sýna síðuna');
+ta['ca-nstab-user'] = new Array('c','Sýna notendasíðuna');
+ta['ca-nstab-media'] = new Array('c','Sýna margmiðlunarsíðuna');
+ta['ca-nstab-special'] = new Array('','Þetta er kerfissíða, þér er óhæft að breyta henni.');
+ta['ca-nstab-wp'] = new Array('a','Sýna verkefnasíðuna');
+ta['ca-nstab-image'] = new Array('c','Sýna myndasíðuna');
+ta['ca-nstab-mediawiki'] = new Array('c','Sýna kerfisskilaboðin');
+ta['ca-nstab-template'] = new Array('c','View the template');
+ta['ca-nstab-help'] = new Array('c','Sýna hjálparsíðuna');
 ta['ca-nstab-category'] = new Array('c','Sýna efnisflokkasíðuna');",
 'about' => "Um",
 'aboutpage' => "Project:Um",
@@ -137,14 +127,13 @@ ta['ca-nstab-category'] = new Array('c','Sýna efnisflokkasíðuna');",
 'acct_creation_throttle_hit' => "Fyrirgefðu, þú hefur nú þegar búið til $1 aðgang(a). Þú getur ekki búið til fleiri.",
 'actioncomplete' => "Aðgerð lokið",
 'addedwatch' => "Bætt á vaktlistann",
-'addedwatchtext' => "Síðunni „$1“ hefur verið bætt á [[Special:Watchlist|Vaktlistann]] þinn. 
+'addedwatchtext' => "Síðunni „$1“ hefur verið bætt á [[Special:Watchlist|Vaktlistann]] þinn.
 Frekari breytingar á henni eða spallsíðu hennar munu verða sýndar þar.
 Þar að auki verður síða þessi '''feitletruð''' á [[Special:Recentchanges|Nýlegum breytingum]]
 svo auðveldara sé að sjá hana þar meðal fjöldans.
 
 <p>Til að fjarlægja síðu þessa af vaktlistanum þarft þú að ýta á tengilinn er merktur er „afvakta“.",
 'administrators' => "{{ns:4}}:Stjórnendur",
-'affirmation' => "Ég staðfesti að rétthafi þessa efnis veitir leyfi fyrir notkun þess undir $1.. Eða að efni þetta er ekki verndað af höfundalögum.",
 'allmessages' => "Kerfismeldingar",
 'allmessagescurrent' => "Núverandi texti",
 'allmessagesdefault' => "Sjálfgefinn texti",
@@ -152,15 +141,14 @@ svo auðveldara sé að sjá hana þar meðal fjöldans.
 'allmessagestext' => "Listi yfir meldingar í „{{ns:8}}“ nafnarýminu.",
 'allpages' => "Allar síður",
 'alphaindexline' => "$1 til $2",
-'alreadyloggedin' => "<font color=red><b>Notandinn $1 er þegar innskráður!</b></font><br/>",
+'alreadyloggedin' => "<strong>Notandinn $1 er þegar innskráður!</strong><br />",
 'ancientpages' => "Elstu síður",
 'anontalkpagetext' => "----Þetta er spjallsíða fyrir óskráðan notanda sem hefur ekki búið til aðgang enn þá eða notar hann ekki, slíkir notendur þekkjast á [[IP tala|IP tölu]] sinni. Það getur gerst að margir notendur deili sömu IP tölu þannig að athugasemdum sem beint er til eins notanda geta birst á spjallsíðu annars. [[Special:Userlogin|Skráðu þig sem notanda]] til að koma í veg fyrir svona misskilning.''",
 'apr' => "apr",
 'april' => "apríl",
-'articleexists' => "Annaðhvort er þegar til síða undir þessum titli, 
-eða sá titill sem þú hefur valið er ekki gildur. 
+'articleexists' => "Annaðhvort er þegar til síða undir þessum titli,
+eða sá titill sem þú hefur valið er ekki gildur.
 Vinsamlegast veldu annan titil.",
-'asksql' => "Gagnagrunnsfyrirspurn",
 'aug' => "ágú",
 'august' => "ágúst",
 'badfilename' => "Skáarnafninu hefur verið breytt í „$1“.",
@@ -169,7 +157,7 @@ Vinsamlegast veldu annan titil.",
 'badtitletext' => "Umbeðin síðutitill er ógildur.",
 'blanknamespace' => "(Aðalnafnrýmið)",
 'blockip' => "Banna notanda",
-'blockipsuccesstext' => "„$1“ hefur verið bannaður.<br/>
+'blockipsuccesstext' => "„$1“ hefur verið bannaður.<br />
 Sjá [[Special:Ipblocklist|bannaðar notendur og IP tölur]] fyrir yfirlit yfir núverandi bönn.",
 'blockiptext' => "Hægt er að hindra einstaka notendur eða IP tölur í að gera breytingar á {{SITENAME}}
 
@@ -181,14 +169,12 @@ Sjá [[meta:Range blocks|Range blocks]] á meta fyrir yfirlit yfir [[CIDR]] töl
 'infiniteblock' => 'rennur út infinite', //fixme
 'expiringblock' => 'rennur út  $1',
 'blocklogpage' => "Bönnunarskrá",
-'blocklogtext' => "This is a log of user blocking and unblocking actions. Automatically 
+'blocklogtext' => "This is a log of user blocking and unblocking actions. Automatically
 blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
 the list of currently operational bans and blocks.",
 'bold_sample' => "Feitletraður texti",
 'bold_tip' => "Feitletraður texti",
 'booksources' => "Bókabúðir",
-'bureaucratlog' => "Möppudýraskrá",
-'bureaucratlogentry' => "Réttindi „$1“ stillt á „$2“",
 'bureaucrattext' => "[[{{ns:4}}:Möppudýr|Möppudýrsréttindi]] eru skilyrði fyrir því að nota þessa kerfissíðu.",
 'bureaucrattitle' => "Möppudýrsréttinda þörf",
 'bydate' => "eftir dagsetningu",
@@ -204,7 +190,7 @@ the list of currently operational bans and blocks.",
 'categoryarticlecount1' => "Það er $1 síða í þessum flokki.",
 'changepassword' => "Breyta lykilorði",
 'changes' => "Breytingar",
-'clearyourcache' => "'''Ath:''' Eftir að þú hefur vistað breytingar þarf að hreynsa flýtiskrár vafrarans til að sjá þær, í '''Mozilla / Konqueror''' ''CTRL-r'', '''IE / Opera:''' ''CTRL-F5'', '''Safari:''' ''CMD-r''.",
+'clearyourcache' => "'''Ath:''' Eftir að þú hefur vistað breytingar þarf að hreynsa flýtiskrár vafrarans til að sjá þær, í '''Mozilla / Firefox''' ''CTRL-Shift-R'', '''IE:''' ''CTRL-F5'', '''Safari:''' ''CMD-Shift-R'', '''Konqueror:''' ''F5''.",
 'columns' => "Dálkar",
 'compareselectedversions' => "Bera saman valdar útgáfur",
 'confirm' => "Staðfesta",
@@ -249,7 +235,7 @@ the list of currently operational bans and blocks.",
 'diff' => "breyting",
 'difference' => "(Munur milli útgáfa)",
 'disambiguations' => "Aðgreiningarsíður",
-'disambiguationstext' => "The following pages link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br/>A page is treated as dismbiguation if it is linked from $1.<br/>Links from other namespaces are <i>not</i> listed here.",
+'disambiguationstext' => "The following pages link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br />A page is treated as dismbiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
 'disclaimerpage' => "Project:Almennur fyrirvari",
 'disclaimers' => "Fyrirvarar",
 'edit' => "Breyta",
@@ -323,7 +309,7 @@ upplýsingar um hana.",
 
 Legend: (nú) = núverandi útgáfa,
 (eyða) = eyða þessari útgáfu, (nota) = nota þessa útgáfu í stað núverandi útgáfu.
-<br/><em>Fylgdu dagsetningartenglunum til að sjá mynd sem hlaðið var inn á þeim tíma</em>.",
+<br /><em>Fylgdu dagsetningartenglunum til að sjá mynd sem hlaðið var inn á þeim tíma</em>.",
 'imghistory' => "Breytingaskrá myndar",
 'imglegend' => "Skýringar: (lýsing) = sýna og/eða breyta lýsingu skráar.",
 'ipaddress' => "IP Tala/notendanafn",
@@ -380,7 +366,7 @@ Legend: (nú) = núverandi útgáfa,
 'media_sample' => "Sýnishorn.ogg",
 'media_tip' => "Tengill í margmiðlunarskrá",
 'minoredit' => "Minniháttar breyting",
-'missingimage' => "<b>Mynd vantar</b><br/><i>$1</i>",
+'missingimage' => "<b>Mynd vantar</b><br /><i>$1</i>",
 'monday' => "mánudagur",
 'move' => "Færa",
 'movearticle' => "Færa",
@@ -402,7 +388,7 @@ tilvísanir, það er á þína ábyrgð að tryggja það að tenglar haldi áf
 að vísa á rétta síðu.
 
 Athugaðu að síðan mun '''ekki''' verða færð ef það er þegar síða á nafninu
-sem þú hyggst færa hana á, nema síða sú sé tóm eða tilvísun sem á sér enga 
+sem þú hyggst færa hana á, nema síða sú sé tóm eða tilvísun sem á sér enga
 breytingarsögu. Þú getur þar með fært síðuna aftur til baka án þess að
 missa breytingarsöguna, en ekki fært hana venjulega síðu.
 
@@ -433,7 +419,6 @@ mjög rótækar breytingar á vinsælum síðum og valdið titringi hjá öðrum
 'nextdiff' => "Næsta breyting →",
 'nextn' => "næstu $1",
 'nextrevision' => "Næsta útgáfa→",
-'noaffirmation' => "Staðfesta þarf að skráin brjóti ekki á höfundarrétti.",
 'noarticletext' => "<div style=\"border: 1px solid #ccc; padding: 7px; background: white;\">'''Það er ekki enn grein undir þessu nafni á [[{{SITENAME}}]].'''
 * '''[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} Skrifa grein undir nafninu „{{PAGENAME}}“]'''
 * [[{{ns:special}}:Search/{{PAGENAME}}|Leita að „{{PAGENAME}}“]] í öðrum greinum og síðum.
@@ -474,8 +459,8 @@ mjög rótækar breytingar á vinsælum síðum og valdið titringi hjá öðrum
 'portal' => "Samfélagsgátt",
 'portal-url' => "Project:Samfélagsgátt",
 'powersearch' => "Leita",
-'powersearchtext' => "Leita í eftirfarandi nafnrýmum :<br/>
-$1<br/>
+'powersearchtext' => "Leita í eftirfarandi nafnrýmum :<br />
+$1<br />
 $2 Sýna tilvísarnir &nbsp; Leita að $3 $9",
 'preferences' => "Stillingar",
 'prefs-misc' => "Aðrar stillingar",
@@ -502,9 +487,8 @@ to set user preferences.",
 'protectsub' => "(Vernda „$1“)",
 'qbedit' => "Breyta",
 'qbsettings' => "Valblað",
-'querybtn' => "Senda inn fyrirspurn",
 'randompage' => "Handahófsvalin síða",
-'rclinks' => "Sýna síðustu $1 breytingar síðustu $2 daga<br/>$3",
+'rclinks' => "Sýna síðustu $1 breytingar síðustu $2 daga<br />$3",
 'rclistfrom' => "Sýna breytingar frá og með $1",
 'rclsub' => "(á síðum sem tengd er í frá „$1“)",
 'rcnote' => "Að neðan eru síðustu <strong>$1</strong> breytingar síðustu <strong>$2</strong> daga.",
@@ -572,19 +556,18 @@ to set user preferences.",
 Þar fyrir utan eru '''$2''' síður sem líklega teljast fullgildar greinar.
 
 '''$3''' síður hafa verið skoðaðar og '''$4''' breytingar hafa verið gerðar
-síðan vefurinn var settur up. Það reiknast sem '''$5''' breytingar 
+síðan vefurinn var settur up. Það reiknast sem '''$5''' breytingar
 á hverja síðu að meðaltali, og '''$6''' fléttingar fyrir hverja breytingu.",
 'sitesubtitle' => "Frjálsa alfræðiorðabókin",
 'sitesupport' => "Framlög",
 'sitetitle' => "Wikipedia",
 'skin' => "Þema",
-'spamprotectiontext' => "The page you wanted to save was blocked by the spam filter. This is probably caused by a link to an external site. 
+'spamprotectiontext' => "The page you wanted to save was blocked by the spam filter. This is probably caused by a link to an external site.
 
 You might want to check the following regular expression for patterns that are currently blocked:",
 'specialpage' => "Kerfissíða",
 'specialpages' => "Kerfissíður",
 'spheading' => "Almennar",
-'sqlquery' => "Fyrirspurn",
 'statistics' => "Tölfræði",
 'storedversion' => "Geymd útgáfa",
 'stubthreshold' => "Stubbamerkja allt undir",
@@ -686,7 +669,7 @@ to upload files.",
 'wantedpages' => "Eftirsóttar síður",
 'watch' => "Vakta",
 'val_tab' => 'Votta',
-'watchdetails' => "Fyrir utan spjallsíður eru $1 síða/síður á vaktlistanum þínum. Hægt er að 
+'watchdetails' => "Fyrir utan spjallsíður eru $1 síða/síður á vaktlistanum þínum. Hægt er að
 [$4 sýna heildarlistann og breyta honum].",
 'watcheditlist' => "Þetta er listi yfir þínar vöktuðu síður raðað í
 stafrófsröð. Merktu við þær síður sem þú vilt fjarlægja
@@ -713,12 +696,11 @@ Ekki gleyma að breyta Wikipedia stillingunum þínum.",
 'whitelistreadtext' => "Þú verður að [[Special:Userlogin|skrá þig inn]] til að lesa síður.",
 'whitelistreadtitle' => "Notandi verður að skrá sig inn til að geta lesið.",
 'wikipediapage' => "Sýna verkefnissíðu",
-'wikititlesuffix' => "Wikipedia, frjálsa alfræðiorðabókin",
 'wlnote' => "Að neðan eru síðustu <b>$1</b> breytingar síðustu <b>$2</b> klukkutíma.",
 'wlsaved' => "Þetta er vistuð útgáfa af vaktlistanum þínum.",
 'wlshowlast' => "Sýna síðustu $1 klukkutíma, $2 daga, $3",
-'wrong_wfQuery_params' => "Incorrect parameters to wfQuery()<br/>
-Function: $1<br/>
+'wrong_wfQuery_params' => "Incorrect parameters to wfQuery()<br />
+Function: $1<br />
 Query: $2",
 'wrongpassword' => "Uppgefið lykilorð er rangt. Vinsamlegast reyndu aftur.",
 'yourdiff' => "Mismunur",
@@ -766,7 +748,7 @@ class LanguageIs extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	function getAllMessages() {
 		global $wgAllMessagesIs;
 		return $wgAllMessagesIs;
@@ -776,12 +758,12 @@ class LanguageIs extends LanguageUtf8 {
 		global $wgMagicWordsIs;
 		return $wgMagicWordsIs;
 	}
-	
+
 	function date( $ts, $adj = false, $format = true) {
 		global $wgUser;
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); } # Adjust based on the timezone setting.
 		$format = $this->dateFormat($format);
-		
+
 		switch( $format ) {
 			# 15. jan. 2001 kl. 16:12 || 16:12, 15. jan. 2001
 			case '2': case '4': return (0 + substr( $ts, 6, 2 )) . '. ' .
@@ -795,15 +777,15 @@ class LanguageIs extends LanguageUtf8 {
 				$this->getMonthName( substr( $ts, 4, 2 ) ) . ' ' .
 				substr($ts, 0, 4);
 		}
-		
+
 	}
 
 	function time($ts, $adj = false, $format = true) {
 		global $wgUser;
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); } # Adjust based on the timezone setting.
-		
+
 		$format = $this->dateFormat($format);
-		
+
 		switch( $format ) {
 			# 2001-01-15 16:12:34
 			case 'ISO 8601': return substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 ) . ':' . substr( $ts, 12, 2 );
@@ -814,9 +796,9 @@ class LanguageIs extends LanguageUtf8 {
 
 	function timeanddate( $ts, $adj = false, $format = true) {
 		global $wgUser;
-		
+
 		$format = $this->dateFormat($format);
-		
+
 		switch ( $format ) {
 			# 16:12, 15. janúar 2001 || 16:12, 15. jan. 2001
 			case '3': case '4': return $this->time( $ts, $adj, $format ) . ', ' . $this->date( $ts, $adj, $format );
@@ -824,11 +806,11 @@ class LanguageIs extends LanguageUtf8 {
 			case 'ISO 8601': return $this->date( $ts, $adj, $format ) . ' ' . $this->time( $ts, $adj, $format );
 			# 15. janúar 2001 kl. 16:12 || 15. jan. 2001 kl. 16:12
 			default: return $this->date( $ts, $adj, $format ) . ' kl. ' . $this->time( $ts, $adj, $format );
-			
+
 		}
 
 	}
-	
+
 	/**
 	 * The Icelandic number style uses dots where English would use commas
 	 * and commas where English would use dots, e.g. 201.511,17 not 201,511.17
diff --git a/languages/LanguageIt.php b/languages/LanguageIt.php
index c9227bc46352..380697bd0b83 100644
--- a/languages/LanguageIt.php
+++ b/languages/LanguageIt.php
@@ -4,32 +4,25 @@
   * @subpackage Language
   */
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesIt = array(
-    NS_MEDIA            => 'Media',
-    NS_SPECIAL          => 'Speciale',
-    NS_MAIN             => '',
-    NS_TALK             => 'Discussione',
-    NS_USER             => 'Utente',
-    NS_USER_TALK        => 'Discussioni_utente',
-    NS_PROJECT          => $wgMetaNamespace,
-    NS_PROJECT_TALK     => 'Discussioni_'.$wgMetaNamespace,
-    NS_IMAGE            => 'Immagine',
-    NS_IMAGE_TALK       => 'Discussioni_immagine',
-    NS_MEDIAWIKI        => 'MediaWiki',
-    NS_MEDIAWIKI_TALK   => 'Discussioni_MediaWiki',
-    NS_TEMPLATE         => 'Template',
-    NS_TEMPLATE_TALK    => 'Discussioni_template',
-    NS_HELP             => 'Aiuto',
-    NS_HELP_TALK        => 'Discussioni_aiuto',
-    NS_CATEGORY         => 'Categoria',
-    NS_CATEGORY_TALK    => 'Discussioni_categoria'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Speciale',
+	NS_MAIN             => '',
+	NS_TALK             => 'Discussione',
+	NS_USER             => 'Utente',
+	NS_USER_TALK        => 'Discussioni_utente',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => 'Discussioni_'.$wgMetaNamespace,
+	NS_IMAGE            => 'Immagine',
+	NS_IMAGE_TALK       => 'Discussioni_immagine',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Discussioni_MediaWiki',
+	NS_TEMPLATE         => 'Template',
+	NS_TEMPLATE_TALK    => 'Discussioni_template',
+	NS_HELP             => 'Aiuto',
+	NS_HELP_TALK        => 'Discussioni_aiuto',
+	NS_CATEGORY         => 'Categoria',
+	NS_CATEGORY_TALK    => 'Discussioni_categoria'
 
 ) + $wgNamespaceNamesEn;
 
@@ -37,55 +30,6 @@
 	"Nessuno", "Fisso a sinistra", "Fisso a destra", "Fluttuante a sinistra"
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesIt = array(
-	"Userlogin"		=> "", # These two intentionally left blank
-	"Userlogout"	=> "", #...
-	"Preferences"	=> "Preferenze",
-	"Watchlist"		=> "Osservati Speciali",
-	"Recentchanges" => "Ultime modifiche",
-	"Upload"		=> "Salva immagini",
-	"Imagelist"		=> "Elenco Immagini",
-	"Listusers"		=> "Utenti registrati",
-	"Statistics"	=> "Statistiche",
-	"Randompage"	=> "Una pagina a caso",
-
-	"Lonelypages"	=> "Articoli orfani",
-	"Unusedimages"	=> "Immagini orfane",
-	"Popularpages"	=> "Articoli più letti",
-	"Wantedpages"	=> "Articoli più richiesti",
-	"Shortpages"	=> "Articoli più corti",
-	"Longpages"		=> "Articoli più lunghi",
-	"Newpages"		=> "Articoli nuovi",
-	"Ancientpages"		=> "Oldest pages",
-	"Allpages"		=> "Tutti i titoli",
-
-	"Ipblocklist"	=> "Indirizzi IP bloccati",
-	"Maintenance" => "Manutenzioni",
-	"Specialpages"  => "", # From here on intentionally left blank!
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesIt = array(
-	"Blockip"		=> "Blocca indirizzo IP",
-	"Asksql"		=> "Interroga database",
-	"Undelete"		=> "Leggi e ripara pagine cancellate"
-);
-
-/* private */ $wgDeveloperSpecialPagesIt = array(
-	"Lockdb"		=> "Rendi il database read-only (di sola lettura, blocca le modifiche)",
-	"Unlockdb"		=> "Ripristina scrittura su database (lettura\/scrittura)",
-);
 
 /* private */ $wgAllMessagesIt = array(
 # User Toggles
@@ -150,7 +94,6 @@
 "aboutpage"		=> "Wikipedia:About",
 "help"			=> "Aiuto",
 "helppage"		=> "Wikipedia:Aiuto",
-"wikititlesuffix" => "Wikipedia",
 "bugreports"	=> "Malfunzionamenti",
 "bugreportspage" => "Wikipedia:Malfunzionamenti",
 "faq"			=> "FAQ",
@@ -238,7 +181,7 @@ Per favore, segnalate l'accaduto ad un amministratore di sistema, segnalando la
 "filedeleteerror" => "Non è stato possibile cancellare il file \"$1\".",
 "filenotfound"	=> " Non è stato possibile trovare il file \"$1\".",
 "unexpected"	=> "Valore imprevisto: \"$1\"=\"$2\".",
-"formerror"		=> "Errore: il modulo non è stato inviato correttamente",	
+"formerror"		=> "Errore: il modulo non è stato inviato correttamente",
 "badarticleerror" => "Questa operazione non è consentita su questa pagina.",
 "cannotdelete"	=> "Impossibile cancellare la pagina o l'immagine richiesta.",
 "badtitle"		=> "Titolo non corretto",
@@ -260,7 +203,7 @@ Ora puoi continuare ad usare Wikipedia come utente anonimo (ma il tuo indirizzo
 "newusersonly"	=> " (solo per nuovi Utenti)",
 "remembermypassword" => "Ricorda la mia password per più sessioni (richiede uso dei cookies).",
 "loginproblem"	=> "<b>Si è verificato un errore durante il tuo tentativo di login.</b><br />Riprova, sarai più fortunato!",
-"alreadyloggedin" => "<font color=red><b>Ehi, Utente $1, hai già fatto il login, sei già connesso al nostro server!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Ehi, Utente $1, hai già fatto il login, sei già connesso al nostro server!</strong><br />\n",
 
 "login"			=> "Log in",
 "userlogin"		=> "Log in",
@@ -282,7 +225,7 @@ Controlla per favore il nome digitato, oppure usa il modulo qui sotto per creare
 "mailmypassword" => "Spediscimi una nuova password in posta elettronica",
 "passwordremindertitle" => "Servizio Password Reminder di Wikipedia",
 "passwordremindertext" => "Qualcuno (probabilmente tu, con indirizzo IP $1)
-ha richiesto l'invio di una nuova password per il login a Wikipedia. 
+ha richiesto l'invio di una nuova password per il login a Wikipedia.
 La password per l'Utente \"$2\" è ora \"$3\".
 Per evidenti ragioni di sicurezza, dovresti fare un log in il prima possibile, e cambiare la password immediatamente.",
 "noemail"		=> "Nessuna casella e-mail risulta registrata per l'Utente \"$1\".",
@@ -310,8 +253,8 @@ La motivazione del blocco è la seguente:<br />:''$2''<p>Se lo desideri, puoi co
 "editing"		=> "Modifica di $1",
 "editconflict"	=> "Conflitto di edizione: $1",
 "explainconflict" => "Qualcun altro ha salvato una sua versione dell'articolo nel tempo in cui tu stavi preparando la tua versione.<br />
-La casella di modifica di sopra contiene il testo dell'articolo nella sua forma attuale (cioè il testo attualmente online). Le tue modifiche sono invece contenute nella casella di modifica inferiore. 
-Dovrai inserire, se lo desideri, le tue modifiche nel testo esistente, e perciò scriverle nella casella di sopra. 
+La casella di modifica di sopra contiene il testo dell'articolo nella sua forma attuale (cioè il testo attualmente online). Le tue modifiche sono invece contenute nella casella di modifica inferiore.
+Dovrai inserire, se lo desideri, le tue modifiche nel testo esistente, e perciò scriverle nella casella di sopra.
 <b>Soltanto</b> il testo nella casella di sopra sarà salvato se premerai il bottone \"Salva\".<br />",
 "yourtext"		=> "Il tuo testo",
 "storedversion" => "Versione in archivio",
@@ -384,7 +327,7 @@ per poter personalizzare le tue preferenze.",
 "prefslogintext" => "Sei connesso a Wikipedia come \"$1\".
 Il tuo numero identificativo (ID) interno è $2.",
 "prefsreset"	=> "Le tue Preferenze sono state ripescate dalla memoria di sistema del potente server di Wikipedia.",
-"qbsettings"	=> "Settaggio barra menu", 
+"qbsettings"	=> "Settaggio barra menu",
 "changepassword" => "Cambia password",
 "skin"			=> "Aspetto",
 "saveprefs"		=> "Salva preferenze",
@@ -465,7 +408,7 @@ Il caricamento può richiedere qualche minuto se hai una connessione ad Internet
 
 I formati immagine preferibili sono il JPEG per immagini fotografiche, il PNG
 per disegni ed altre immagini iconiche o simboliche, l' OGG per i suoni.
-Per cortesia, rinomina i tuoi files, prima di caricarli, usando un nome il più possibile descrittivo del contenuto, così da evitare confusioni. 
+Per cortesia, rinomina i tuoi files, prima di caricarli, usando un nome il più possibile descrittivo del contenuto, così da evitare confusioni.
 Per inserire poi la nuova immagine in un articolo, usa semplicemente un link nella forma
 '''<nowiki>[[image:file.jpg]]</nowiki>''' o
 '''<nowiki>[[image:file.png|alt text, testo alternativo]]</nowiki>''' o
@@ -481,11 +424,9 @@ Tutti i tempi indicati sono calcolati sul fuso orario del server (UTC).
 ",
 "filename"		=> "Nome del file",
 "filedesc"		=> "Oggetto",
-"affirmation"	=> "Io dichiaro che il titolare dei diritti di autore (copyright, (c)) su questo file consente a cederlo in licenza di uso nei termini del $1.",
 "copyrightpage" => "Wikipedia:Copyrights",
 "copyrightpagename" => "Wikipedia copyright",
 "uploadedfiles"	=> "Files Caricati in Wikipedia",
-"noaffirmation" => "Devi dichiarare che il caricamento di questo file non viola, in alcun modo, alcun tipo di diritto altrui, e segnatamente non infrange nessun diritto di autore (copyright - (c)).",
 "ignorewarning"	=> "Ignora le avvertenze e salva comunque il file.",
 "minlength"		=> "I nomi dei file immagine debbono essere lunghi almeno tre caratteri, ma è preferibile usare nomi lumghi, purché descrittìvi.",
 "badfilename"	=> "Il nome del file immagine è stato convertito in \"$1\".",
@@ -633,7 +574,7 @@ Le future modifiche a questa pagina ed alla relativa pagina di discussione saran
 "confirmdelete" => "Conferma cancellazione",
 "deletesub"		=> "(Cancellazione di \"$1\")",
 "confirmdeletetext" => "Stai per cancellare permanentemente dal database una pagina o una immagine, insieme a tutta la sua cronologia.<p>
-Per cortesia, conferma che è tua intenzione procedere a tale cancellazione, conferma che hai piena consapevolezza delle conseguenze della tua azione, e conferma che la tua azione è pienamente ottemperante alle regole stabilite nella 
+Per cortesia, conferma che è tua intenzione procedere a tale cancellazione, conferma che hai piena consapevolezza delle conseguenze della tua azione, e conferma che la tua azione è pienamente ottemperante alle regole stabilite nella
 [[Wikipedia:Policy]].",
 "actioncomplete" => "Azione completata",
 "deletedtext"	=> "La pagina \"$1\" è stata cancellata.
@@ -690,13 +631,12 @@ Vedi [[Wikipedia:Deletion_log]] per un elenco delle pagine cancellate e recupera
 #
 "blockip"		=> "Blocca indirizzo IP",
 "blockiptext"	=> "Usa il modulo sottostante per bloccare l'accesso con diritto di scrittura da uno specifico indirizzo IP.<br />
-Questo blocco deve essere operato SOLO per prevenire atti di vandalismo, ed in stretta osservanza dei principi tutti della [[Wikipedia:Policy|policy di Wikipedia]].<br />Il blocco non può in nessun caso essere applicato per motivi ideologici.<p> 
+Questo blocco deve essere operato SOLO per prevenire atti di vandalismo, ed in stretta osservanza dei principi tutti della [[Wikipedia:Policy|policy di Wikipedia]].<br />Il blocco non può in nessun caso essere applicato per motivi ideologici.<p>
 Scrivi un motivo specifico per il quale questo indirizzo IP dovrebbe a tuo avviso essere bloccato (per esempio, cita i titoli di pagine eventualmente già oggetto di vandalismo editoriale).",
 "ipaddress"		=> "Indirizzo IP (IP Address)",
 "ipbreason"		=> "Motivazione",
 "ipbsubmit"		=> "Blocca questo indirizzo IP",
 "badipaddress"	=> "L'indirizzo IP indicato non è corretto.",
-"noblockreason" => "Devi obbligatoriamente fornire una motivazione per il blocco.",
 "blockipsuccesssub" => "Blocco eseguito",
 "blockipsuccesstext" => " L'indirizzo IP \"$1\" è stato bloccato.
 <br />Vedi [[Special:Ipblocklist|lista IP bloccati]].",
@@ -729,22 +669,11 @@ Per cortesia, conferma che questo è effettivamente quanto tu intendi ora effett
 <br />Ricordati di rimuovere il blocco non appena avrai terminatoi le tue manutenzioni.",
 "unlockdbsuccesstext" => " Il database di Wikipedia è stato sbloccato.",
 
-# SQL query
-#
-"asksql"		=> "Interrogazione SQL",
-"asksqltext"	=> "Usa il modulo sottostante per effettuare una interrogazione diretta (query) al database di Wikipedia.
-Usa singole virgolette ('come queste') per delimitare una stringa letterale.
-Questo può considerevolmente sovraccaricare e di fatto rallentare il server, perciò per cortesia usa questa funzionalità solo quando necessario.",
-"sqlquery"		=> "Immetti stringa da ricercare",
-"querybtn"		=> "Invia interrogazione",
-"selectonly"	=> "Interrogazioni diverse da \"SELECT\" sono riservate agli sviluppatori di Wikipedia (developers).",
-"querysuccessful" => "Interrogazione riuscita",
-
 # Move page
 #
 "movepage"		=> "Spostamento di pagina",
 "movepagetext"	=> "Con il modulo sottostante puoi rinominare una pagina, spostando anche tutta la sua cronologia al nuovo nome.
-Il vecchio titolo diverrà automaticamente un redirect che punta al nuovo titolo. 
+Il vecchio titolo diverrà automaticamente un redirect che punta al nuovo titolo.
 I link alla vecchia pagina non saranno aggiornati (e punteranno quindi al redirect); accertati di [[Special:Manutenzioni|controllare con cura]] che non si creino doppi redirects o redirects interrotti.
 Resta nella tua responsabilità di accertarti che i link continuino a puntare verso dove devono dirigersi.
 
@@ -788,7 +717,7 @@ class LanguageIt extends LanguageUtf8 {
 		global $wgQuickbarSettingsIt;
 		return $wgQuickbarSettingsIt;
 	}
-	
+
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
@@ -798,21 +727,6 @@ class LanguageIt extends LanguageUtf8 {
 		return $d;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesIt;
-		return $wgValidSpecialPagesIt;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesIt;
-		return $wgSysopSpecialPagesIt;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesIt;
-		return $wgDeveloperSpecialPagesIt;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesIt;
 		if(array_key_exists($key, $wgAllMessagesIt))
diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php
index 68052cad18b3..1dc06a74da07 100644
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -6,13 +6,6 @@
 global $IP;
 require_once( "LanguageUtf8.php" );
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-# 名前空間の名前はここで設定できますが、番号は特別なので、
-# 変更したり移動したりしないでね! 名前空間クラスは特殊性を幾らか
-# 隠匿します。
-#
 /* private */ $wgNamespaceNamesJa = array(
 	NS_MEDIA          => "Media", /* Media */
 	NS_SPECIAL        => "特別", /* Special */
@@ -42,13 +35,7 @@ require_once( "LanguageUtf8.php" );
 	'standard' => "標準",
 	'nostalgia' => "ノスタルジア",
 	'cologneblue' => "ケルンブルー",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
-	'myskin' => "MySkin"
-);
+) + $wgSkinNamesEn;
 
 
 
@@ -57,58 +44,6 @@ require_once( "LanguageUtf8.php" );
 );
 
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-# 全ての特殊頁はここに列挙しないといけません。
-# "" (空文字列) という説明にすると「特殊頁」頁に掲載しません。
-# これは幾つか (「targeted」とか) に対しては適当なことです。
-
-/* private */ $wgValidSpecialPagesJa = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "ユーザー設定を保存",
-	"Watchlist"		=> "ウォッチリスト",
-	"Recentchanges" => "最近更新したページ",
-	"Upload"		=> "画像をアップロードする",
-	"Imagelist"		=> "画像リスト",
-	"Listusers"		=> "登録済みユーザー",
-	"Statistics"	=> "サイトの統計",
-	"Randompage"	=> "ランダム記事",
-
-	"Lonelypages"	=> "孤立したページ",
-	"Unusedimages"	=> "孤立した画像",
-	"Popularpages"	=> "人気の記事",
-	"Wantedpages"	=> "執筆が待望されている記事",
-	"Shortpages"	=> "短い記事",
-	"Longpages"		=> "長い記事",
-	"Newpages"		=> "新しく登場した記事",
-	"Ancientpages"	=> "Oldest articles",
-	"Allpages"		=> "タイトル別全ページ",
-
-	"Ipblocklist"	=> "ブロックされたIPアドレス",
-	"Maintenance" => "管理ページ",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "外部の参考文献",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesJa = array(
-	"Blockip"		=> "IPアドレスをブロック",
-	"Asksql"		=> "データベースに問い合わせ",
-	"Undelete"		=> "消去されたページを閲覧し、復帰させる"
-);
-
-/* private */ $wgDeveloperSpecialPagesJa = array(
-	"Lockdb"		=> "データベースを読み出し専用にする",
-	"Unlockdb"		=> "データベースを書き込み可能にする",
-);
 
 /* private */ $wgAllMessagesJa = array(
 # User Toggles
@@ -172,7 +107,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "{{ns:4}}:About",
 "help"			=> "ヘルプ",
 "helppage"		=> "{{ns:4}}:Help",
-"wikititlesuffix" => "{{ns:4}}",
 "bugreports"	=> "バグの報告",
 "bugreportspage" => "{{ns:4}}:バグの報告",
 "faq"			=> "FAQ",
@@ -289,7 +223,7 @@ again as the same or as a different user.\n",
 "newusersonly"	=> " (新規ユーザのみ)",
 "remembermypassword" => "セッションをまたがってパスワードを保持する。",
 "loginproblem"	=> "<b>ログインでエラーが発生しました。</b><br />再度実行してください。",
-"alreadyloggedin" => "<font color=red><b>ユーザ $1 は、すでにログイン済みです。</b></font><br />\n",
+"alreadyloggedin" => "<strong>ユーザ $1 は、すでにログイン済みです。</strong><br />\n",
 
 "login"			=> "ログイン",
 "userlogin"		=> "ログイン",
@@ -398,7 +332,6 @@ Please check the URL you used to access this page.\n",
 # 検索結果（Search results）
 #
 "searchresults" => "検索結果" /* "Search results" */,
-"searchingwikipedia" => "{{SITENAME}} を検索中" /* "Searching Wikipedia" */,
 "searchresulttext" => "{{SITENAME}} の検索についての詳しい情報は、 $1 をご覧下さい。"
   /* "For more information about searching Wikipedia, see $1." */ ,
 "searchquery"	=> "問い合わせ \"$1\" について、" /* "For query \"$1\"" */,
@@ -593,19 +526,10 @@ All times shown are server time (UTC). */,
 
 "filename"		=> "ファイル名",
 "filedesc"		=> "ファイルの概要",
-"affirmation"	=> "このファイルの著作権者は$1のライセンスに基づく
-使用を許可したことをここに表明します。
-
-I affirm that the copyright holder of this file
-agrees to license it under the terms of the $1.",
 "copyrightpage" => "{{ns:4}}:Copyrights",
 
 "copyrightpagename" => "ウィキペディアの著作権",
 "uploadedfiles"	=> "アップロードされたファイル",
-"noaffirmation" => "あなたのアップロードが著作権の侵害にあたらない旨を
-表明して下さい。"
-/* "You must affirm that your upload does not violate
-any copyrights." */,
 "ignorewarning"	=> "警告を無視し、保存してしまう" /* "Ignore warning and save file anyway." */,
 "minlength"		=> "ファイル名は3文字以上である必要があります。" /* "Image names must be at least three letters." */,
 "badfilename"	=> "ファイル名は\"$1\"へ変更されました。" /* "Image name has been changed to \"$1\"." */,
@@ -834,7 +758,6 @@ pages that were vandalized).",
 "ipbreason"		=> "Reason",
 "ipbsubmit"		=> "Block this address",
 "badipaddress"	=> "The IP address is badly formed.",
-"noblockreason" => "You must supply a reason for the block.",
 "blockipsuccesssub" => "Block succeeded",
 "blockipsuccesstext" => "The IP address \"$1\" has been blocked.
 <br />See [[Special:Ipblocklist|IP block list]] to review blocks.",
@@ -873,20 +796,6 @@ Please confirm that this is what you intend to do.",
 <br />Remember to remove the lock after your maintenance is complete.",
 "unlockdbsuccesstext" => "The {{SITENAME}} database has been unlocked.",
 
-# SQL query     （この部分は管理者用なので当面英文を残しておきます。）
-#
-"asksql"		=> "SQL query",
-"asksqltext"	=> "Use the form below to make a direct query of the
-{{SITENAME}} database.
-Use single quotes ('like this') to delimit string literals.
-This can often add considerable load to the server, so please use
-this function sparingly.",
-"sqlquery"		=> "Enter query",
-"querybtn"		=> "Submit query",
-"selectonly"	=> "Queries other than \"SELECT\" are restricted to
-{{SITENAME}} developers.",
-"querysuccessful" => "Query successful",
-
 # Move page ページの移動
 #
 "movepage"		=> "ページの移動",
@@ -927,12 +836,12 @@ Please choose another name." */,
 
 # Math
 
-	'mw_math_png' => "常にPNG",
-	'mw_math_simple' => "シンプルな数式はHTML、それ以外はPNG",
-	'mw_math_html' => "できる限りHTML、さもなければPNG",
-	'mw_math_source' => "TeXのままにする (テキストブラウザ向け)",
-        'mw_math_modern' => "可能ならばMathMLを使う (実験中の機能)",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "常にPNG",
+'mw_math_simple' => "シンプルな数式はHTML、それ以外はPNG",
+'mw_math_html' => "できる限りHTML、さもなければPNG",
+'mw_math_source' => "TeXのままにする (テキストブラウザ向け)",
+'mw_math_modern' => "可能ならばMathMLを使う (実験中の機能)",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -953,11 +862,13 @@ class LanguageJa extends LanguageUtf8 {
 		return $wgSkinNamesJa;
 	}
 
-	
-	function date( $ts, $adj = false )
-	{
+	function getDateFormats() {
+		return false;
+	}
+
+	function date( $ts, $adj = false, $format = false, $tc = false ) {
 		global $wgWeekdayAbbreviationsJa;
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
 
 		$x = getdate(mktime(( (int)substr( $ts, 8, 2) ),
 			(int)substr( $ts, 10, 2 ), (int)substr( $ts, 12, 2 ),
@@ -970,41 +881,18 @@ class LanguageJa extends LanguageUtf8 {
 		return $d;
 	}
 
-	function time( $ts, $adj = false )
-	{
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+	function time( $ts, $adj = false, $format = false, $tc = false ) {
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
 
 		$t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
 		return $t;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
-		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
-	}
-
-		
-
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesJa;
-		return $wgValidSpecialPagesJa;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesJa;
-		return $wgSysopSpecialPagesJa;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesJa;
-		return $wgDeveloperSpecialPagesJa;
+	function timeanddate( $ts, $adj = false, $format = false, $tc = false ) {
+		return $this->date( $ts, $adj, $format, $tc ) . " " . $this->time( $ts, $adj, $format, $tc );
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesJa;
 		if(array_key_exists($key, $wgAllMessagesJa))
 			return $wgAllMessagesJa[$key];
@@ -1041,8 +929,7 @@ class LanguageJa extends LanguageUtf8 {
 
 	# Italic is not appropriate for Japanese script
 	# Unfortunately most browsers do not recognise this, and render <em> as italic
-	function emphasize( $text )
-	{
+	function emphasize( $text ) {
 		return $text;
 	}
 }
diff --git a/languages/LanguageKn.php b/languages/LanguageKn.php
index dc8d2745c1a2..56fea08d7896 100644
--- a/languages/LanguageKn.php
+++ b/languages/LanguageKn.php
@@ -44,8 +44,6 @@ require_once( 'LanguageUtf8.php' );
 
 <p>ಈ ಪುಟವನ್ನು ವೀಕ್ಷಣಾ ಪಟ್ಟಿಯಿ೦ದ ತೆಗೆಯಬಯಸಿದಲ್ಲಿ, ಮೇಲ್ಪಟ್ಟಿಯಲ್ಲಿ ಕಾಣಿಸಿರುವ \"ವೀಕ್ಷಣಾ ಪುಟದಿ೦ದ ತೆಗೆ\" ಅನ್ನು ಕ್ಲಿಕ್ಕಿಸಿ.",
 'administrators' => "ವಿಕಿಪೀಡಿಯ:ನಿರ್ವಾಹಕರು",
-'affirmation' => "ಈ ಫೈಲ್ ನ ಕೃತಿಸ್ವಾಮ್ಯವನ್ನು ಹೊ೦ದಿರುವವರು ಇದನ್ನು $1 ಅಡಿ ಉಪಯೋಗಿಸಲು ಪರವಾನಗಿ ನೀಡಿದ್ದಾರೆ೦ಬುದನ್ನು ತಿಳಿಸುತ್ತೇನೆ.",
-'all' => "ಎಲ್ಲ",
 'alphaindexline' => "$1 ಇಂದ $2",
 'ancientpages' => "ಹಳೆಯ ಪುಟಗಳು",
 'and' => "ಮತ್ತು",
@@ -54,7 +52,6 @@ require_once( 'LanguageUtf8.php' );
 'apr' => "ಎಪ್ರಿಲ್",
 'article' => "ಲೇಖನ ಪುಟ",
 'articlepage' => "ಲೇಖನ ಪುಟವನ್ನು ವೀಕ್ಷಿಸಿ",
-'asksql' => "ಎಸ್‌ಕ್ಯುಎಲ್ ಕ್ವೈರಿ",
 
 
 'badarticleerror' => "ಈ ಪುಟದ ಮೇಲೆ ನೀವು ಪ್ರಯತ್ನಿಸಿದ ಕಾರ್ಯವನ್ನು ನಡೆಸಲಾಗದು.",
@@ -87,7 +84,6 @@ require_once( 'LanguageUtf8.php' );
 'changes' => "ಬದಲಾವಣೆಗಳು",
 'compareselectedversions' => "ಆಯ್ಕೆ ಮಾಡಿದ ಆವೃತ್ತಿಗಳನ್ನು ಹೊಂದಾಣಿಕೆ ಮಾಡಿ ನೋಡಿ",
 'confirm' => "ಧೃಡಪಡಿಸು",
-'confirmcheck' => "ಹೌದು, ನಾನು ಇದನ್ನು ನಿಜವಾಗಿಯೂ ಅಳಿಸಿಹಾಕಲಿಚ್ಛಿಸುತ್ತೇನೆ.",
 'confirmdelete' => "ಅಳಿಸುವಿಕೆ ಧೃಡಪಡಿಸು",
 'confirmdeletetext' => "ಪುಟ ಅಥವಾ ಚಿತ್ರ ಮತ್ತು ಅದರ ಸ೦ಪೂರ್ಣ ಇತಿಹಾಸವನ್ನು ನೀವು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿಹಾಕುತ್ತಿದ್ದೀರಿ. ಇದನ್ನು ನೀವು ಮಾಡಬಯಸುವಿರಿ, ಇದರ ಪರಿಣಾಮಗಳನ್ನು ಬಲ್ಲಿರಿ, ಮತ್ತು [[Wikipedia:Policy]] ನ ಅನುಸಾರ ಇದನ್ನು ಮಾಡುತ್ತಿದ್ದೀರಿ ಎ೦ದು ದೃಢಪಡಿಸಿ.",
 'confirmprotect' => "ಸಂರಕ್ಷಣೆ ಧೃಡಪಡಿಸಿ",
@@ -160,7 +156,7 @@ require_once( 'LanguageUtf8.php' );
 'filename' => "ಕಡತದ ಹೆಸರು",
 'filenotfound' => "\"$1\" ಫೈಲನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ.",
 'filesource' => "ಆಕರ",
-'fileuploaded' => "ಫೈಲ್ \"$1\" ಯಶಸ್ವಿಯಾಗಿ ಅಪ್‍ಲೋಡ್ ಆಯಿತು. ದಯವಿಟ್ಟು ಕೆಳಗಿನ ಸ೦ಪರ್ಕವನ್ನು ಕ್ಲಿಕ್ಕಿಸಿ ಈ ಫೈಲ್ ನ ಬಗ್ಗೆ ಮಾಹಿತಿಯನ್ನು ತು೦ಬಿಸಿ. ಉದಾಹರಣೆಗೆ: ಈ ಫೈಲ್ ಎಲ್ಲಿ೦ದ ಬ೦ದಿತು, ಯಾವಾಗ ಯಾರಿ೦ದ ಸೃಷ್ಟಿಯಾದದ್ದು, ಮತ್ತು ನಿಮಗೆ ತಿಳಿದಿರುವ ಇತರ ಯಾವುದೇ ಮಾಹಿತಿ. 
+'fileuploaded' => "ಫೈಲ್ \"$1\" ಯಶಸ್ವಿಯಾಗಿ ಅಪ್‍ಲೋಡ್ ಆಯಿತು. ದಯವಿಟ್ಟು ಕೆಳಗಿನ ಸ೦ಪರ್ಕವನ್ನು ಕ್ಲಿಕ್ಕಿಸಿ ಈ ಫೈಲ್ ನ ಬಗ್ಗೆ ಮಾಹಿತಿಯನ್ನು ತು೦ಬಿಸಿ. ಉದಾಹರಣೆಗೆ: ಈ ಫೈಲ್ ಎಲ್ಲಿ೦ದ ಬ೦ದಿತು, ಯಾವಾಗ ಯಾರಿ೦ದ ಸೃಷ್ಟಿಯಾದದ್ದು, ಮತ್ತು ನಿಮಗೆ ತಿಳಿದಿರುವ ಇತರ ಯಾವುದೇ ಮಾಹಿತಿ.
 
 $2",
 'formerror' => "ದೋಷ: ಅರ್ಜಿ ಕಳುಹಿಸಲಾಗಲಿಲ್ಲ",
@@ -249,7 +245,6 @@ $2",
 'nextn' => "ಮು೦ದಿನ $1",
 'nextpage' => "ಮು೦ದಿನ ಪುಟ ($1)",
 'nlinks' => "$1 ಸ೦ಪರ್ಕಗಳು",
-'noaffirmation' => "ನಿಮ್ಮ ಅಪ್‍ಲೋಡ್ ಯಾವುದೇ ಕೃತಿಸ್ವಾಮ್ಯಗಳನ್ನು ಮೀರುವುದಿಲ್ಲ ಎ೦ಬುದನ್ನು ನೀವು ದೃಢಪಡಿಸಬೇಕು.",
 'noarticletext' => "(ಈ ಪುಟದಲ್ಲಿ ಸದ್ಯಕ್ಕೆ ಏನೂ ಇಲ್ಲ)",
 'nosuchuser' => "\"$1\" ಹೆಸರಿನ ಯಾವ ಸದಸ್ಯರೂ ಇಲ್ಲ.
 ಕಾಗುಣಿತವನ್ನು ಪರೀಕ್ಷಿಸಿ, ಅಥವಾ ಕೆಳಗಿನ ಫಾರ್ಮ್ ಅನ್ನು ಉಪಯೋಗಿಸಿ ಹೊಸ ಸದಸ್ಯತ್ವವನ್ನು ಸೃಷ್ಟಿಸಿ.",
@@ -307,7 +302,7 @@ $2",
 'showtoc' => "ತೋರಿಸು",
 'sitestats' => "ತಾಣದ ಅಂಕಿಅಂಶಗಳು",
 'sitestatstext' => "ಒಟ್ಟು '''$1''' ಪುಟಗಳು ಡೇಟಾಬೇಸ್‌ನಲ್ಲಿವೆ.
-ಈ ಸಂಖ್ಯೆ \"ಚರ್ಚೆ\" ಪುಟಗಳನ್ನು, ವಿಕಿಪೀಡಿಯಾದ ಬಗೆಗಿನ ಪುಟಗಳನ್ನು, ಹಾಗೂ ಪುಟ್ಟ \"ಚುಟುಕು\" ಪುಟಗಳನ್ನೂ, ರೆಡೈರೆಕ್ಟ್ ಮಾಡಿದ ಪುಟಗಳನ್ನು ಹಾಗೂ ಬೇರೆಲ್ಲೂ ಸೇರಿಸಲಾಗದ ಕೆಲವು ಇತರೆ ಪುಟಗಳನ್ನು ಒಳಗೊಂಡಿದೆ. 
+ಈ ಸಂಖ್ಯೆ \"ಚರ್ಚೆ\" ಪುಟಗಳನ್ನು, ವಿಕಿಪೀಡಿಯಾದ ಬಗೆಗಿನ ಪುಟಗಳನ್ನು, ಹಾಗೂ ಪುಟ್ಟ \"ಚುಟುಕು\" ಪುಟಗಳನ್ನೂ, ರೆಡೈರೆಕ್ಟ್ ಮಾಡಿದ ಪುಟಗಳನ್ನು ಹಾಗೂ ಬೇರೆಲ್ಲೂ ಸೇರಿಸಲಾಗದ ಕೆಲವು ಇತರೆ ಪುಟಗಳನ್ನು ಒಳಗೊಂಡಿದೆ.
 
 ಇವುಗಳನ್ನು ಬಿಟ್ಟು, ಒಟ್ಟು '''$2''' ಬಹುಶಃ ನಿಜವಾದ ಲೇಖನಗಳಿಂದ ಕೂಡಿದ ಪುಟಗಳಿವೆ.",
 'sitesubtitle' => "ಒಂದು ಮುಕ್ತ ವಿಶ್ವಕೋಶ",
diff --git a/languages/LanguageKo.php b/languages/LanguageKo.php
index 5b0a821a683e..83954845e709 100644
--- a/languages/LanguageKo.php
+++ b/languages/LanguageKo.php
@@ -6,10 +6,6 @@
   */
 require_once('LanguageUtf8.php');
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-
 /* private */ $wgNamespaceNamesKo = array(
 	NS_MEDIA	    => 'Media',
 	NS_SPECIAL	  => '특수기능',
@@ -47,9 +43,9 @@ require_once('LanguageUtf8.php');
 #  in the 'date' function down at the bottom. --Brion)
 #
 # Thanks. And it's usual that the time comes after dates.
-# So I've change the timeanddate function, just exchanged $time and $date 
+# So I've change the timeanddate function, just exchanged $time and $date
 # But you should check before you install it, 'cause I'm quite stupid about
-# the programming. 
+# the programming.
 #
 
 /* private */ $wgWeekdayAbbreviationsKo = array(
@@ -118,7 +114,6 @@ require_once('LanguageUtf8.php');
 'aboutpage'	   => '{{ns:4}}:소개',
 'help'			=> '도움말',
 'helppage'	    => '{{ns:4}}:도움말',
-'wikititlesuffix' => '{{SITENAME}}',
 'bugreports'  => '벌레 발견',
 'bugreportspage' => '{{ns:4}}:벌레_발견',
 'faq'		 => '잦은질문(FAQ)',
@@ -202,7 +197,7 @@ require_once('LanguageUtf8.php');
 'newusersonly'	=> ' (새내기 사용자)',
 'remembermypassword' => '세쎤동안 암호를 기억합니다.',
 'loginproblem'	=> '<b>들어가는 데 문제가 있습니다.</b><br />다시 해 보세요!',
-'alreadyloggedin' => '<font color=red><b>$1 님, 벌써 들어와 있습니다!</b></font><br />\n',
+'alreadyloggedin' => '<strong>$1 님, 벌써 들어와 있습니다!</strong><br />\n',
 
 'login'		       => '들어가기',
 'userlogin'	   => '들어가기',
@@ -255,12 +250,12 @@ require_once('LanguageUtf8.php');
 'previewconflict' => 'This preview reflects the text in the upper
 text editing area as it will appear if you choose to save.',
 
-'editing'	     => '$1 고쳐쓰기', 
+'editing'	     => '$1 고쳐쓰기',
 'editconflict'	=> '고치기 충돌: $1',
 'explainconflict' => '문서를 고쳐쓰는 동안, 문서가 바뀌었습니다.
 위쪽이 바뀐 현재 문서이고, 아래쪽이 당신이 고쳐쓴 내용입니다.
 당신이 고쳐쓴 내용을 현재 문서에 다시 집어 넣어야 할 것입니다.
-지금 \'저장\'을 눌러도, 
+지금 \'저장\'을 눌러도,
 <strong>오직</strong> 위쪽에 있는 내용만 저장됩니다.<br />',
 'yourtext'	    => '당신이 고쳐쓴 것',
 'storedversion' => '바뀐 현재 문서',
@@ -339,7 +334,7 @@ text editing area as it will appear if you choose to save.',
 'prefslogintext' => '당신은 \'$1\', 맞죠?
 당신의 내부 ID 번호는 $2입니다.',
 'prefsreset'  => '개인 맞춤을 보통으로 되돌렸습니다.',
-'qbsettings'  => '빨리가기 맞춤', 
+'qbsettings'  => '빨리가기 맞춤',
 'changepassword' => '암호 바꾸기',
 'skin'			=> '옷',
 'saveprefs'	   => '맞춤 저장',
@@ -377,7 +372,7 @@ text editing area as it will appear if you choose to save.',
 {{SITENAME}}가 성공하려면, 여러분이 저작권에 저촉되는 내용을 이곳에 써 넣지 않는 것이
 매우 중요합니다.\' [[{{ns:4}}:저작권|저작권]].
 법적 문제가 프로젝트를 망칠 수 있습니다. 저작권에 유의해 주세요.
-또, [http://meta.wikipedia.org/wiki/Special:Recentchanges 최근 메타 토론]도 
+또, [http://meta.wikipedia.org/wiki/Special:Recentchanges 최근 메타 토론]도
 읽어 보세요.',
 'rcloaderr'	   => '최근 바뀜을 받고 있습니다.',
 'rcnote'	      => '다음이 최근 <strong>$2</strong>일간 바뀐  <strong>$1</strong>개의 문서입니다.',
@@ -419,7 +414,7 @@ text editing area as it will appear if you choose to save.',
 원하는 파일을 고르면, 단추 옆의 공간에 파일이름이 채워질 것입니다.
 또한, 저작권에 저촉되지 않는 파일을 올린다는 사실도
 확인해야 합니다.
-마지막으로, \'올리기\' 단추를 누르면 올라갑니다. 누리그물 연결이 느리면, 
+마지막으로, \'올리기\' 단추를 누르면 올라갑니다. 누리그물 연결이 느리면,
 시간이 걸릴 수 있습니다.
 
 {{SITENAME}}는 사진은 JPEG형식을, 보통 그림, 아이콘은 PNG형식을, 소리는
@@ -441,13 +436,9 @@ OGG형식을 더 좋아합니다.
 ',
 'filename'	    => '파일이름',
 'filedesc'	    => '짧은설명',
-'affirmation' => '파일의 저작권자가
-$1의 조건으로 사용을 허가했음을 확인합니다.',
 'copyrightpage' => '{{ns:4}}:저작권',
 'copyrightpagename' => '{{SITENAME}} 저작권',
 'uploadedfiles'       => '파일 올리기',
-'noaffirmation' => '올리는 파일이 어떤 저작권에도 저촉되지 않음을
-확인해야 합니다.',
 'ignorewarning'       => '경고 무시하고, 파일 저장',
 
 # three alphabets and how many for Korean character?
@@ -458,7 +449,7 @@ $1의 조건으로 사용을 허가했음을 확인합니다.',
 'largefile'	   => '그림크기는 100k이하를 권장합니다.',
 'successfulupload' => '올리기 성공',
 'fileuploaded'	=> '\'$1\'가 올라갔습니다.
-다음 고리($2)를 따라 가서, 설명문서에 파일에 대한 정보를(어디서 구했는지, 
+다음 고리($2)를 따라 가서, 설명문서에 파일에 대한 정보를(어디서 구했는지,
 누가 언제 만들었는지, 또 그 이외 필요한 사항들을) 채우세요.',
 'uploadwarning' => '올리기 경고',
 'savefile'	    => '파일 저장',
@@ -494,11 +485,11 @@ $1의 조건으로 사용을 허가했음을 확인합니다.',
 'sitestats'	   => '누리터 통계',
 'userstats'	   => '사용자 통계',
 'sitestatstext' => '이곳 정보창고(DB)에는 총 <b>$1</b>개의 문서가 있습니다.
-이 숫자는 \'토론\' 문서, {{SITENAME}} 자체에 관한 문서, 자라기를 기다리는 \'씨앗\' 문서, 
+이 숫자는 \'토론\' 문서, {{SITENAME}} 자체에 관한 문서, 자라기를 기다리는 \'씨앗\' 문서,
 넘겨주기 문서, 그리고 아직 사전항목으로 부족한 문서들을 모두 포함한 것입니다.
 이들을 제외하면, <b>$2</b>개의 문서가 있습니다.<p>
-또, 무른모 업그레이드가 있었던 2002년 7월 20일 이래, 여러분은 총 <b>$3</b>번 문서를 
-읽었고, <b>$4</b>번 고쳤습니다. 
+또, 무른모 업그레이드가 있었던 2002년 7월 20일 이래, 여러분은 총 <b>$3</b>번 문서를
+읽었고, <b>$4</b>번 고쳤습니다.
 따라서, 평균적으로 문서 하나가 <b>$5</b>번 바뀌었고, 한번 바뀔 때마다 <b>$6</b>번 읽힌
 셈이 됩니다.',
 'userstatstext' => '<b>$1</b>명의 사용자가 등록되어 있습니다.
@@ -526,7 +517,7 @@ $1의 조건으로 사용을 허가했음을 확인합니다.',
 'rclsub'	      => '(\'$1\'의 고리들이 가리키는)',
 'newpages'	    => '새 문서',
 'movethispage'	=> '문서 옮기기',
-'unusedimagestext' => '<p>다음 그림중 어떤 것은, 다른 언어의 {{SITENAME}}등 다른 
+'unusedimagestext' => '<p>다음 그림중 어떤 것은, 다른 언어의 {{SITENAME}}등 다른
 누리터에서 URL바로걸기로 사용하고 있을 지도 모릅니다.',
 'booksources' => '외부 책방',
 'booksourcetext' => '새책이나 헌책을 파는 몇몇 누리터입니다. 찾고 있는 책의
@@ -538,7 +529,7 @@ $1의 조건으로 사용을 허가했음을 확인합니다.',
 #
 'mailnologin' => '누리편지주소 없음',
 'mailnologintext' => '{{SITENAME}}에 [[Special:Userlogin|들어와]] 있을 때, 또,
-[[Special:Preferences|개인 맞춤]]에 
+[[Special:Preferences|개인 맞춤]]에
 자기의 누리편지주소를 기억시켰을 때에만,
 다른 사용자에게 편지를 보낼 수 있습니다.',
 'emailuser'	   => '사용자에게 편지쓰기',
@@ -569,7 +560,7 @@ $1의 조건으로 사용을 허가했음을 확인합니다.',
 'addedwatch'  => '눈여겨 봅니다.',
 'addedwatchtext' => '앞으로 \'$1\'문서와 딸린 토론를
 <a href=\'{{localurle:Special:Watchlist}}\'>눈여겨보기 목록</a>에서
-관찰할 수 있으며,<a href=\'{{localurle:Special:Recentchanges}}\'>최근 바뀜</a>에는 금방 눈에 
+관찰할 수 있으며,<a href=\'{{localurle:Special:Recentchanges}}\'>최근 바뀜</a>에는 금방 눈에
 띄도록 <b>두터운 글씨체</b>로 나타납니다.</p>
 
 <p>더 이상 눈여겨 보지 않아도 될 때에는, 옆의 \'눈여겨 보지 않음\'을 누르면 됩니다.',
@@ -601,7 +592,7 @@ $1의 조건으로 사용을 허가했음을 확인합니다.',
 # Move page
 #
 'movepage'	    => '문서 옮기기',
-'movepagetext'	=> '아래 틀을 채워 문서이름을 바꾸세요. 
+'movepagetext'	=> '아래 틀을 채워 문서이름을 바꾸세요.
 문서역사도 함께 새문서로 갑니다.
 기존의 문서는 새이름의 문서로 넘겨주는 역할만 하는 넘겨주기 문서가 됩니다.
 기존 문서로의 고리도 바뀌지 않습니다. 딸린토론이 있어도, 옮기지
@@ -656,7 +647,6 @@ class LanguageKo extends LanguageUtf8 {
 		return $wgSkinNamesKo;
 	}
 
-	 
 	function date( $ts, $adj = false ) {
 		global $wgWeekdayAbbreviationsKo;
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
@@ -666,7 +656,7 @@ class LanguageKo extends LanguageUtf8 {
 			(int)substr( $ts, 10, 2 ), (int)substr( $ts, 12, 2 ),
 			(int)substr( $ts, 4, 2 ), (int)substr( $ts, 6, 2 ),
 			(int)substr( $ts, 0, 4 )));
-	
+
 		$d = substr( $ts, 0, 4 ) . "년 " .
 			$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . "월 " .
 			(0 + substr( $ts, 6, 2 )) . "일 " .
@@ -678,32 +668,15 @@ class LanguageKo extends LanguageUtf8 {
 		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
 	}
 
-	# inherit function rfc1123( $ts )
-
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesKo;
-		return $wgValidSpecialPagesKo;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesKo;
-		return $wgSysopSpecialPagesKo;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesKo;
-		return $wgDeveloperSpecialPagesKo;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesKo;
 		return isset($wgAllMessagesKo[$key]) ? $wgAllMessagesKo[$key] : parent::getMessage($key);
 	}
-	
+
 	function firstChar( $s ) {
 		preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
 		'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})/', $s, $matches);
-		
+
 		if ( isset( $matches[1] ) ) {
 			if ( strlen( $matches[1] ) != 3 ) {
 				return $matches[1];
@@ -745,7 +718,7 @@ class LanguageKo extends LanguageUtf8 {
 		} else {
 			return "";
 		}
-	}       
+	}
 }
 
 ?>
diff --git a/languages/LanguageKu.php b/languages/LanguageKu.php
index e59ed4bea1fe..fa72b688bc09 100644
--- a/languages/LanguageKu.php
+++ b/languages/LanguageKu.php
@@ -7,28 +7,28 @@
 require_once( "LanguageUtf8.php" );
 
 if ( $wgMetaNamespace == "Wikipedia" ) {
-        $wgMetaNamespace = "Wîkîpediya";
+	$wgMetaNamespace = "Wîkîpediya";
 }
 
 /* private */ $wgNamespaceNamesKu = array(
-        NS_MEDIA            => 'Medya',
-        NS_SPECIAL          => 'Taybet',
-        NS_MAIN             => '',
-        NS_TALK             => 'Nîqaş',
-        NS_USER             => 'Bikarhêner',
-        NS_USER_TALK        => 'Bikarhêner_nîqaş',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => $wgMetaNamespace . '_nîqaş',
-        NS_IMAGE            => 'Wêne',
-        NS_IMAGE_TALK       => 'Wêne_nîqaş',
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'MediaWiki_nîqaş',
-        NS_TEMPLATE         => 'Şablon',
-        NS_TEMPLATE_TALK    => 'Şablon_nîqaş',
-        NS_HELP             => 'Alîkarî',
-        NS_HELP_TALK        => 'Alîkarî_nîqaş',
-        NS_CATEGORY         => 'Kategorî',
-        NS_CATEGORY_TALK    => 'Kategorî_nîqaş'
+	NS_MEDIA            => 'Medya',
+	NS_SPECIAL          => 'Taybet',
+	NS_MAIN             => '',
+	NS_TALK             => 'Nîqaş',
+	NS_USER             => 'Bikarhêner',
+	NS_USER_TALK        => 'Bikarhêner_nîqaş',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaNamespace . '_nîqaş',
+	NS_IMAGE            => 'Wêne',
+	NS_IMAGE_TALK       => 'Wêne_nîqaş',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_nîqaş',
+	NS_TEMPLATE         => 'Şablon',
+	NS_TEMPLATE_TALK    => 'Şablon_nîqaş',
+	NS_HELP             => 'Alîkarî',
+	NS_HELP_TALK        => 'Alîkarî_nîqaş',
+	NS_CATEGORY         => 'Kategorî',
+	NS_CATEGORY_TALK    => 'Kategorî_nîqaş'
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgAllMessagesKy = array (
@@ -84,7 +84,7 @@ You can narrow down the view by selecting a log type, the user name, or the affe
 #'already_bureaucrat' => 'This user is already a bureaucrat',
 #'already_steward' => 'This user is already a steward',
 #'already_sysop' => 'This user is already an administrator',
-'alreadyloggedin' => '<font color=red><b>Bikarhêner $1, tu jixwe têketî!</b></font><br />',
+'alreadyloggedin' => '<strong>Bikarhêner $1, tu jixwe têketî!</strong><br />',
 /* 'alreadyrolled' => 'Cannot rollback last edit of [[$1]]
 by [[User:$2|$2]] ([[User talk:$2|Talk]]); someone else has edited or rolled back the page already.
 
@@ -123,11 +123,11 @@ Please try another query.', */
 /* 'badtitletext' => 'The requested page title was invalid, empty, or
 an incorrectly linked inter-language or inter-wiki title.', */
 #'blanknamespace' => '(Main)',
-'blockedtext' => 'Navê bikarhêner an jî navnîşana IP ya te ji aliyê $1 hat bloke kirin. Sedema vê ev  e:<br>\'\'$2\'\'<p>Tu dikarî bi $1 an yek ji [Wikipedia:Koordînator|koordînatorên din]] re ser vê blokê nîqaş bikî. 
+'blockedtext' => 'Navê bikarhêner an jî navnîşana IP ya te ji aliyê $1 hat bloke kirin. Sedema vê ev  e:<br />\'\'$2\'\'<p>Tu dikarî bi $1 an yek ji [{{ns:project}}:Koordînator|koordînatorên din]] re ser vê blokê nîqaş bikî.
 
 Têbînî: Tu nikarî fonksiyona "Ji vê bikarhêner re E-mail bişîne" bi kar bîne eger te navnîşana email a xwe di "[[Special:Preferences|Tercîhên min]]" de nenivîsand.
 
-Navnîşana te ya IP $3 ye. Ji kerema xwe eger pirsên te hebe vê navnîşanê bibêje. 
+Navnîşana te ya IP $3 ye. Ji kerema xwe eger pirsên te hebe vê navnîşanê bibêje.
 
 ==Note to AOL users==
 Due to continuing acts of vandalism by one particular AOL user, Wikipedia often blocks AOL proxies. Unfortunately, a single proxy server may be used by a large number of AOL users, and hence innocent AOL users are often inadvertently blocked. We apologise for any inconvenience caused.
@@ -137,7 +137,7 @@ If this happens to you, please email an administrator, using an AOL email addres
 'blockip' => 'Bikarhêner asteng bike',
 'blockipsuccesssub' => 'Blok serkeftî',
 'blockipsuccesstext' => '"$1" hat asteng kirin.
-<br>Bibîne [[Special:Ipblocklist|Lîsteya IP\'yan hatî asteng kirin]] ji bo lîsteya blokan.',
+<br />Bibîne [[Special:Ipblocklist|Lîsteya IP\'yan hatî asteng kirin]] ji bo lîsteya blokan.',
 /* 'blockiptext' => 'Use the form below to block write access
 from a specific IP address or username.
 This should be done only only to prevent vandalism, and in
@@ -182,7 +182,7 @@ this list should not be construed as an endorsement.', */
 #'changegrouplogentry' => 'Changed group $2',
 'changepassword' => 'Şîfre biguherîne',
 'changes' => 'guherandin',
-#'clearyourcache' => '\'\'\'Note:\'\'\' After saving, you have to clear your browser cache to see the changes: \'\'\'Mozilla:\'\'\' click \'\'Reload\'\' (or \'\'Ctrl-R\'\'), \'\'\'IE / Opera:\'\'\' \'\'Ctrl-F5\'\', \'\'\'Safari:\'\'\' \'\'Cmd-R\'\', \'\'\'Konqueror\'\'\' \'\'Ctrl-R\'\'.',
+#'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools&rarr;Preferences''.",
 'columns' => 'stûn',
 'compareselectedversions' => 'Guhertoyan bide ber hev',
 'confirm' => 'Teyît bike',
@@ -232,14 +232,14 @@ link in your browser to confirm that your e-mail address is valid.', */
 {|border=0|
 |
 [[metawikipedia:Help:Special_characters|Nîşanên taybet]]:
-<charinsert>Ç ç </charinsert> · 
-<charinsert>Ê ê </charinsert> · 
+<charinsert>Ç ç </charinsert> ·
+<charinsert>Ê ê </charinsert> ·
 <charinsert>Î î </charinsert> ·
-<charinsert>Ş ş </charinsert> · 
-<charinsert>Û û </charinsert> · 
-<charinsert>&ndash; &mdash; </charinsert> · 
-<charinsert>[+] [[+]] {{+}} </charinsert> · 
-<charinsert>~ | °</charinsert> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+<charinsert>Ş ş </charinsert> ·
+<charinsert>Û û </charinsert> ·
+<charinsert>&ndash; &mdash; </charinsert> ·
+<charinsert>[+] [[+]] {{+}} </charinsert> ·
+<charinsert>~ | °</charinsert> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 |<div class="plainlinks" dir="rtl" align="right">
 <charinsert>ئا  </charinsert> ·
 <charinsert>ڵ </charinsert> ·
@@ -655,67 +655,13 @@ article [[Train]].
 Ji kerema xwe, biçe: $2 û agahî li der barê dosyayê binivîse (ji ku derê hat girtin, kîngê hat çêkirin, kê çêkir û hwd.)
 
 Heke ev dosya wêneyek be, bi vî rengî bi kar bîne:
-<br>
+<br />
 <tt><nowiki>[[Wêne:$1|thumb|Binnivîs]]</nowiki></tt>',
 #'formerror' => 'Error: could not submit form',
 'friday' => 'În',
 #'geo' => 'GEO coordinates',
 #'getimagelist' => 'fetching file list',
 'go' => 'Gotar',
-'googlesearch' => '<p>
-<table border="0" bgcolor="#FFFFFF">
-
-<!-- SiteSearch Google -->
-<tr><td valign="top" align="center">
-<a href="http://www.google.com/">
-<img src="http://www.google.com/logos/Logo_40wht.gif" border="0" alt="Google" title="Google">
-</a>
-</td>
-<td width="100%">
-<form method=get action="http://www.google.com/search">
-<input type="text" name="q" size=31 maxlength=255 value="$1">
-<input type="submit" name="btnG" value="Google Lêgerîn">
-<input type="hidden" name="domains" value="http://ku.wikipedia.org">
-<input type="hidden" name="ie" value="$2">
-<input type="hidden" name="oe" value="$2">
-<br>
-<font size=-1>
-<input type="radio" name="sitesearch" value="">WWW
-<input type="radio" name="sitesearch" value="http://ku.wikipedia.org" checked>http://ku.wikipedia.org
-</font>
-</form>
-</td></tr>
-<!-- SiteSearch Google -->
-
-<!-- Spacing -->
-<tr><td colspan=2>&nbsp;</td></tr>
-<!-- Spacing -->
-
-<!-- Yahoo search -->
-<tr><td valign="top" align="center">
-<a href="http://search.yahoo.com/">
-<img src="http://us.i1.yimg.com/us.yimg.com/i/us/search/ysan/ysanlogo.gif" border="0" alt="Yahoo!"vspace="5">
-</a>
-</td>
-<td width="100%">
-<form method=get action="http://search.yahoo.com/search">
-<input type="hidden" name="x" value="op">
-<input type="hidden" name="va_vt" value="any">
-<input type="text" name="va" size="31" value="$1">
-<input type="submit" value="Yahoo! Lêgerîn">
-<br>
-<font size=-1>
-<input type="radio" name="vs" value="">WWW
-<input type="radio" name="vs" value="ku.wikipedia.org" checked>http://ku.wikipedia.org
-</font>
-</form>
-</td>
-
-</table>
-
-Bi vê grêdanê tu dikarî vê gotarê çêkî an biguherînî: <a href="/w/wiki.phtml?title=$1&action=edit">$1</a>
-<br><br>
-<b>Note</b>: We recommend you search Wikipedia before creating a new article to avoid duplicatory effort. <br>The article you are trying to create may already exist under a different name/spelling.',
 #'group-admin-desc' => 'Trusted users able to block users and delete articles',
 #'group-admin-name' => 'Administrator',
 #'group-anon-desc' => 'Anonymous users',
@@ -854,9 +800,8 @@ unlock the database when your maintenance is done.', */
 #'loginend' => '&nbsp;',
 'loginerror' => 'Çewtî (Login error)',
 'loginpagetitle' => 'Qeyda bikarhêner (User login)',
-'loginproblem' => '<b>Di qeyda te (login) de pirsgirêkek derket.</b><br>Careke din biceribîne!',
+'loginproblem' => '<b>Di qeyda te (login) de pirsgirêkek derket.</b><br />Careke din biceribîne!',
 'loginprompt' => '<b>Eger tu xwe nû qeyd bikî, nav û şîfreya xwe hilbijêre.</b> Ji bo xwe qeyd kirinê di Wîkîpediya de divê ku \'\'cookies\'\' gengaz be.',
-#'loginreqtext' => 'You must [[special:Userlogin|login]] to view other pages.',
 'loginreqtitle' => 'Têketin pêwîst e',
 'loginsuccess' => 'Tu niha di Wîkîpediya de qeydkirî yî wek "$1".',
 'loginsuccesstitle' => 'Têketin serkeftî!',
@@ -949,7 +894,7 @@ Please report this to an administrator, making note of the URL.', */
 to move a page.', */
 'movepage' => 'Vê rûpelê bigerîne',
 'movepagebtn' => 'Vê rûpelê bigerîne',
-'movepagetalktext' => 'Rûpela axaftinê (talk) giredayî ji vê rûpelê re wê bê gerandin jî. 
+'movepagetalktext' => 'Rûpela axaftinê (talk) giredayî ji vê rûpelê re wê bê gerandin jî.
 \'\'\'Îstisna:\'\'\'
 *You are moving the page across namespaces,
 *A non-empty talk page already exists under the new name, or
@@ -992,8 +937,8 @@ proceeding.', */
 'nchanges' => '$1 guherandin',
 'newarticle' => '(Nû)',
 'newarticletext' => '<div style="font-size:small;color:#003333;border-width:1px;border-style:solid;border-color:#aaaaaa;padding:3px">
-Ev rûpel hîn tune. Eger tu bixwazî vê rûpelê çêkî, dest bi nivîsandinê bike û piştre qeyd bike. \'\'\'Wêrek be\'\'\', biceribîne!<br>
-Ji bo alîkarî binêre: [[Wîkîpediya:Alîkarî|Alîkarî]].<br>
+Ev rûpel hîn tune. Eger tu bixwazî vê rûpelê çêkî, dest bi nivîsandinê bike û piştre qeyd bike. \'\'\'Wêrek be\'\'\', biceribîne!<br />
+Ji bo alîkarî binêre: [[Wîkîpediya:Alîkarî|Alîkarî]].<br />
 Eger tu bi şaştî hatî, bizivire rûpela berê.
 </div>',
 'newbies' => 'ecemî',
@@ -1034,11 +979,10 @@ features will not work.', */
 /* 'noemailtext' => 'This user has not specified a valid e-mail address,
 or has chosen not to receive e-mail from other users.', */
 'noemailtitle' => 'Navnîşana e-name tune',
-'nogomatch' => 'Rûpeleke wek vî navî tune. 
+'nogomatch' => 'Rûpeleke wek vî navî tune.
 
 Tu dixwazî <b><a href="$1" class="new">vê gotarê binivîsî</a></b> ?',
 #'nohistory' => 'There is no edit history for this page.',
-#'noimage' => 'No file by this name exists, you can [$1 upload it]',
 #'noimages' => 'Nothing to see.',
 'nolinkshere' => 'Ji hîç rûpel ji vê re lînk tune.',
 'nolinkstoimage' => 'Rûpeleke ku ji vê wêneyê re lînk dike tune.',
@@ -1150,7 +1094,7 @@ text editing area as it will appear if you choose to save.', */
 'protectcomment' => 'Sedema parastinê',
 'protectedarticle' => 'parastî [[$1]]',
 'protectedpage' => 'Rûpela parastî',
-'protectedpagewarning' => 'ŞIYARÎ:  Ev rûpel hat qefl kirin. Bi tenê bikarhênerên ku xwediyên mafan "sysop" ne dikarin vê rûpelê biguherînin. <br>
+'protectedpagewarning' => 'ŞIYARÎ:  Ev rûpel hat qefl kirin. Bi tenê bikarhênerên ku xwediyên mafan "sysop" ne dikarin vê rûpelê biguherînin. <br />
 Be sure you are following the
 <a href=\'/wiki/Wîkîpediya:Protected_page_guidelines\'>protected page
 guidelines</a>.',
@@ -1230,15 +1174,15 @@ the text into a text file and save it for later.</strong>', */
 [[bg:Специални:Recentchanges]]
 [[bs:Special:Recentchanges]]
 [[ca:RecentChanges]]
-[[cs:Special:Recentchanges]] 
-[[cy:Special:Recentchanges]] 
+[[cs:Special:Recentchanges]]
+[[cy:Special:Recentchanges]]
 [[da:Speciel:Recentchanges]]
 [[de:Spezial:Recentchanges]]
 [[el:Special:Recentchanges]]
 [[en:Special:Recentchanges]]
 [[eo:Lastaj_Sxangxoj]]
 [[es:Cambios Recientes]]
-[[et:Recent Changes]] 
+[[et:Recent Changes]]
 [[eu:Special:Recentchanges]]
 [[fa:%D9%88%DB%8C%DA%98%D9%87:Recentchanges]]
 [[fi:Toiminnot:Recentchanges]]
@@ -1249,8 +1193,8 @@ the text into a text file and save it for later.</strong>', */
 [[he:מיוחד:Recentchanges]]
 [[hi:%E0%A4%B5%E0%A4%BF%E0%A4%B6%E0%A5%87%E0%A4%B7:Recentchanges]]
 [[hr:Special:Recentchanges]]
-[[hu:Speciális:Recentchanges]] 
-[[ia:Special:Recentchanges]]  
+[[hu:Speciális:Recentchanges]]
+[[ia:Special:Recentchanges]]
 [[id:Recent_Changes]]
 [[is:Special:Recentchanges]]
 [[it:Speciale:Recentchanges]]
@@ -1259,13 +1203,13 @@ the text into a text file and save it for later.</strong>', */
 [[ko:특수기능:Recentchanges]]
 [[la:Recent_Changes]]
 [[lb:Special:Recentchanges]]
-[[mh:Special:Recentchanges]] 
-[[ms:Special:Recentchanges]] 
+[[mh:Special:Recentchanges]]
+[[ms:Special:Recentchanges]]
 [[na:Special:Recentchanges]]
 [[nds:Special:Recentchanges]]
 [[nl:Speciaal:Recentchanges]]
 [[no:Spesial:Recentchanges]]
-[[oc:Especial:Recentchanges]] 
+[[oc:Especial:Recentchanges]]
 [[pl:Specjalna:Recentchanges]]
 [[pt:Especial:Recentchanges]]
 [[rm:Special:Recentchanges]]
@@ -1357,7 +1301,6 @@ Please hit "back" and reload the page you came from, then try again.', */
 #'setstewardflag' => 'Set steward flag',
 #'shareddescriptionfollows' => '-',
 #'sharedupload' => 'This file is a shared upload and may be used by other projects.',
-#'shareduploadwiki' => 'Please see the [$1 file description page] for further information.',
 'shortpages' => 'Rûpelên kurt',
 'show' => 'nîşan bide',
 'showbigimage' => 'Versyona mezin bibîne an daxe ($1x$2, $3 KB).',
@@ -1372,7 +1315,7 @@ Please hit "back" and reload the page you came from, then try again.', */
 'sitestats' => 'Statîstîkên sîteyê',
 'sitestatstext' => 'Di \'\'database\'\' de <b>$1</b> rûpel hene. Tê de rûpelên nîqaşê, rûpelên der barê Wîkîpediyayê, rûpelên pir kurt (stub), rûpelên ragihandinê (redirect) û rûpelên din ku qey ne gotar in hene.
 
-Derve wan, \'\'\'$2\'\'\' rûpel hene ku qey \'\'\'gotarên rewa\'\'\' ne. 
+Derve wan, \'\'\'$2\'\'\' rûpel hene ku qey \'\'\'gotarên rewa\'\'\' ne.
 
 Ji 28\'ê çileya 2004 heta roja îro <b>$4</b> carî rûpel hatin guherandin.
 
@@ -1412,7 +1355,7 @@ Fonksiyonên ku hîn rast naxebitin:
 'successfulupload' => 'Barkirin serkeftî',
 'summary' => 'Kurte û çavkanî',
 'sunday' => 'yekşem',
-'sysoptext' => 'Çalakiya ku te xwest bi tenê bikarhêneran bi mafên "sysop" dikarin çêkin. 
+'sysoptext' => 'Çalakiya ku te xwest bi tenê bikarhêneran bi mafên "sysop" dikarin çêkin.
 Binêre $1.',
 #'sysoptitle' => 'Sysop access required',
 'tableform' => 'tablo',
@@ -1568,7 +1511,7 @@ Unselected groups will not be changed. You can deselect a group with CTRL + Left
 'userrights-user-editname' => 'Enter a username:',
 'userstats' => 'Statistîkên bikarhêneran',
 'userstatstext' => '<b>$1</b> bikarhênerên qeydkirî hene. Ji wan <b>$2</b> administrator/koordînator in. (Binêre $3).
-<br><br>
+<br /><br />
 Ji bo statîstîkên din ser serûpelê biçe: <b>Statîstîk</b>',
 #'val_add' => 'Add',
 #'val_article_lists' => 'List of validated articles',
@@ -1660,7 +1603,6 @@ to modify your watchlist.', */
 #'whitelistreadtext' => 'You have to [[Special:Userlogin|login]] to read pages.',
 #'whitelistreadtitle' => 'Login required to read',
 'wikipediapage' => 'Rûpela meta temaşe bike',
-'wikititlesuffix' => 'Wîkîpediya, ensîklopediya azad a kurdî',
 #'wlheader-enotif' => '* Email notification is enabled.',
 #'wlheader-showupdated' => '* Pages which have been changed since you last visited them are shown in \'\'\'bold\'\'\'',
 #'wlhide' => 'Hide',
@@ -1688,8 +1630,7 @@ Query: $2
 );
 
 
-class LanguageKu extends LanguageUtf8
-{
+class LanguageKu extends LanguageUtf8 {
 	function getNamespaces() {
 		global $wgNamespaceNamesKu;
 		return $wgNamespaceNamesKu;
diff --git a/languages/LanguageLa.php b/languages/LanguageLa.php
index c858933047cc..3dbf45aa0227 100644
--- a/languages/LanguageLa.php
+++ b/languages/LanguageLa.php
@@ -32,66 +32,9 @@
 /* private */ $wgSkinNamesLa = array(
 	'standard' => 'Norma',
 	'nostalgia' => 'Nostalgia',
-	'cologneblue' => 'Caerulus Colonia',
-	'smarty' => 'Paddington',
-	'montparnasse' => 'Montparnasse',
-	'davinci' => 'DaVinci',
-	'mono' => 'Mono',
-	'monobook' => 'MonoBook',
-	'myskin' => 'MySkin' 
-);
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesLa = array(
-	'Userlogin'		=> '',
-	'Userlogout'	=> '',
-	'Preferences'	=> 'Praeferentiae usoris',
-	'Watchlist'		=> 'Paginae custoditae',
-	'Recentchanges' => 'Mutationes recentes',
-	'Upload'		=> 'Onerare fascicula',
-	'Imagelist'		=> 'Index imaginum',
-	'Listusers'		=> 'Usores perscripti',
-	'Statistics'	=> 'Statisticas',
-	'Randompage'	=> 'Pagina fortuita',
-
-	'Lonelypages'	=> 'Paginae orbatae',
-	'Unusedimages'	=> 'Imagines orbatae',
-	'Popularpages'	=> 'Res populares',
-	'Wantedpages'	=> 'Res desideratissimae',
-	'Shortpages'	=> 'Res breves',
-	'Longpages'		=> 'Res longae',
-	'Newpages'		=> 'Res novae',
-#	"Intl"                => "Interlanguage Links",
-	"Allpages"		=> "Totae paginae (ex indice)",
-
-	"Ipblocklist"	=> "Loci IP obstructi",
-	"Maintenance" => "Pagina alimentori",
-	"Specialpages"  => "", # "Paginae specialiae",
-	"Contributions" => "", # "Conlationes",
-	"Emailuser"		=> "", # "Mittere litteras electronicas ad usorum(?)",
-	"Whatlinkshere" => "", # "Nexi ad hanc paginam",
-	"Recentchangeslinked" => "", # "Mutationes conlata (?)",
-	"Movepage"		=> "", # "Motare hanc paginam",
-	"Booksources"	=> "Fontes externi (libri)",
-#	"Categories"	=> "Page categories",
-	"Export"		=> "Exportare in XML",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesLa = array(
-	'Blockip'		=> 'Obstruere locum IP',
-	'Asksql'		=> 'Quaerere basem dati',
-	'Undelete'		=> 'Videre et restituere paginas deletas'
-);
+	'cologneblue' => 'Caerulus Colonia'
+) + $wgSkinNamesEn;
 
-/* private */ $wgDeveloperSpecialPagesLa = array(
-	'Lockdb'		=> 'Suspendere mutationes',
-	'Unlockdb'		=> 'Permittere mutationes',
-	'Debug'			=> 'Nuntii de refectis'
-);
 
 $wgAllMessagesLa = array(
 
@@ -145,12 +88,12 @@ $wgAllMessagesLa = array(
 'dec' => 'dec',
 
 # Math
-	'mw_math_png' => "Semper vertere PNG",
-	'mw_math_simple' => "HTML si admodum simplex, alioqui PNG",
-	'mw_math_html' => "HTML si fieri potest, alioqui PNG",
-	'mw_math_source' => "Stet ut TeX (pro navigatri texti)",
-	'mw_math_modern' => "Commendatum pro navigatri recentes",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Semper vertere PNG",
+'mw_math_simple' => "HTML si admodum simplex, alioqui PNG",
+'mw_math_html' => "HTML si fieri potest, alioqui PNG",
+'mw_math_source' => "Stet ut TeX (pro navigatri texti)",
+'mw_math_modern' => "Commendatum pro navigatri recentes",
+'mw_math_mathml' => 'MathML',
 );
 
 require_once( "LanguageUtf8.php" );
@@ -168,7 +111,6 @@ class LanguageLa extends LanguageUtf8 {
 		return $wgNamespaceNamesLa;
 	}
 
-
 	function getNsIndex( $text ) {
 		global $wgNamespaceNamesLa;
 		global $wgMetaNamespace;
@@ -176,7 +118,7 @@ class LanguageLa extends LanguageUtf8 {
 		foreach ( $wgNamespaceNamesLa as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
-		
+
 		# Backwards compatibility hacks
 		if( $wgMetaNamespace == 'Vicipaedia' || $wgMetaNamespace == 'Victionarium' ) {
 			if( 0 == strcasecmp( 'Wikipedia', $text ) ) return NS_PROJECT;
@@ -195,8 +137,7 @@ class LanguageLa extends LanguageUtf8 {
 		return $wgSkinNamesLa;
 	}
 
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
@@ -205,29 +146,10 @@ class LanguageLa extends LanguageUtf8 {
 		return $d;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		return $this->time( $ts, $adj ) . " " . $this->date( $ts, $adj );
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesLa;
-		return $wgValidSpecialPagesLa;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesLa;
-		return $wgSysopSpecialPagesLa;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesLa;
-		return $wgDeveloperSpecialPagesLa;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesLa;
 		if( isset( $wgAllMessagesLa[$key] ) ) {
diff --git a/languages/LanguageLi.php b/languages/LanguageLi.php
index 487c192ebb78..5d68f5242ff7 100644
--- a/languages/LanguageLi.php
+++ b/languages/LanguageLi.php
@@ -37,68 +37,7 @@ $wgNamespaceNamesLi = array(
 	'standard' => "Standaard",
 	'nostalgia' => "Nostalgie",
 	'cologneblue' => "Keuls blauw",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
-
-/* private */ $wgUserTogglesLi = array(
- "highlightbroken" => "Links noa lege pagina's loate oplichte",
- "justify" => "Paragrafen oetvullen",
- "hideminor" => "Kleine wiezigingen verbergen in recente wijzigingen",
- "numberheadings" => "Koppen automatisch nummeren",
- "rememberpassword" => "Wachtwoord onthouwe",
- "editwidth" => "Bewirkingsveld euver ganse breidte",
- "editondblclick" => "Dubbelklikke levert bewerkingspagina (vereist JavaScript)",
- "watchdefault" => "Artikelen die u wijzigt automatisch volgen",
- "minordefault" => "Maak 'kleine' veranderingen mien standaard"
-);
-
-/* private */ $wgValidSpecialPagesLi = array(
- "Userlogin"  => "Aanmelden",
- "Userlogout" => "Afmelden",
- "Preferences" => "Mien gebroekersvoorkeuren einsjtille",
- "Watchlist"  => "Mien volgliest loate zeen",
- "Recentchanges" => "Recent biegewirkte pagina's loate zeen",
- "Upload"  => "Afbeeldingen uploade",
- "Imagelist"  => "Liest ge-uploade plètjes loate zeen",
- "Listusers"  => "Geregistreerde gebroekers loate zeen",
- "Statistics" => "Statistieken tonen",
- "Randompage" => "Ga naar een willekeurig artikel",
-
- "Lonelypages" => "Neet-gelinkte artikels tonen",
- "Unusedimages" => "Neet-gelinkte afbeeldingen tonen",
- "Popularpages" => "Populaire artikels tonen",
- "Wantedpages" => "Meist gewunsjte artikels tonen",
- "Shortpages" => "Korte artikels tonen",
- "Longpages"  => "Lange artikels tonen",
- "Newpages"  => "Nieuwe artikels tonen",
- "Allpages"  => "Alle paginatitels tonen",
-
- "Ipblocklist" => "Geblokkierde IP-adressen tonen",
- "Maintenance" => "Ongerhoudspagina",
- "Specialpages"  => "Speciale pagina's",
- "Contributions" => "Bijdragen per gebroeker",
- "Emailuser"  => "E-mail gebroeker",
- "Whatlinkshere" => "Verwijzende pagina's",
- "Recentchangeslinked" => "verwante verangeringen",
- "Movepage"  => "Pagina verplaatsen",
- "Booksources" => "Bookwinkels"
-);
-
-/* private */ $wgSysopSpecialPagesLi = array(
- "Blockip"  => "Blokkier un IP-adres",
- "Asksql"  => "Raadpleeg de database",
- "Undelete" => "Verwiederde pagina's truukzitten"
-);
-
-/* private */ $wgDeveloperSpecialPagesLi = array(
- "Lockdb"  => "Maak de database alleen-lèze",
- "Unlockdb"  => "Maak de database euversjriefbaar",
-);
+) + $wgSkinNamesEn;
 
 /* private */ $wgAllMessagesLi = array(
 
@@ -139,12 +78,10 @@ $wgNamespaceNamesLi = array(
 "linktrail" => "/^([àáèéìíòóùúâêîôûäöüïëça-z]+)(.*)$/sDu",
 "mainpage"  => "Hoofdpagina",
 "about"   => "Info",
-"aboutwikipedia" => "Euver Wikipedia",
 'aboutsite' => 'Euver {{SITENAME}}',
 "aboutpage"  => "Wikipedia:info",
 "help"   => "Help",
 "helppage"  => "Wikipedia:Help",
-"wikititlesuffix" => "Wikipedia",
 "bugreports" => "Foutenrapportage",
 "bugreportspage" => "Wikipedia:Foutenrapportage",
 "faq"   => "FAQ",
@@ -163,7 +100,6 @@ $wgNamespaceNamesLi = array(
 "currentevents" => "In het nuuis",
 "errorpagetitle" => "Fout",
 "returnto"  => "Truuk noa $1.",
-"fromwikipedia" => " ",
 "whatlinkshere" => "Pagina's die hierheen verwijzen",
 "help"   => "Hulp",
 "search"  => "Zeuke",
@@ -183,7 +119,6 @@ $wgNamespaceNamesLi = array(
 "redirectedfrom" => "(Doorverwezen vanaf $1)",
 "lastmodified" => "Deze pagina werd het laatst gewijzigd op $1.",
 "viewcount"  => "Deze pagina werd $1 maal bekeken.",
-"gnunote" => "Deze pagina valt onder de  <a class=internal href='/wiki/Gnu_Vrije_Documentatie_Licentie'>GNU FDL</a>.",
 "printsubtitle" => "(Uit {{SERVER}})",
 "protectedpage" => "Beveiligde pagina",
 "administrators" => "Wikipedia:Systeembeheerders",
@@ -211,7 +146,7 @@ $wgNamespaceNamesLi = array(
 "databaseerror" => "Database fout",
 "dberrortext" => "Bie ut zeuke is un syntaxfout in de database opgetreden.
 Dit kan zijn veroorzaakt door een illegale zoekactie (zie $5),
- of het duidt op een fout in de software. 
+ of het duidt op een fout in de software.
 De laatste zoekpoging in de database was:
 <blockquote><tt>$1</tt></blockquote>
 vanuit de functie \"<tt>$2</tt>\".
@@ -230,10 +165,10 @@ De verantwoordelijke systeembeheerder gaf hiervoor volgende reden op:
 "filedeleteerror" => "Kos bestjand \"$1\" neet weghoale.",
 "filenotfound" => "Kos bestjand \"$1\" neet vinge.",
 "unexpected" => "Onverwachte waarde: \"$1\"=\"$2\".",
-"formerror"  => "Fout: kos formulier neet verzenden", 
+"formerror"  => "Fout: kos formulier neet verzenden",
 "badarticleerror" => "Deze handeling kan op deze pagina neet worden uitgevoerd.",
 "cannotdelete" => "Kos de pagina of afbeelding neet verwijderen.",
-"badtitle"              => "Ongeldige paginatitel", 
+"badtitle"              => "Ongeldige paginatitel",
 "badtitletext"  => "De opgevraagde pagina is neet beschikbaar of leeg.",
 "perfdisabled" => "Om te veurkomme dat de database weurt euverbelast is deze pagina allein tusje 03:00 en 15:00 (West-Europese zomertied) beschikbaar.",
 
@@ -252,10 +187,7 @@ U kan Wikipedia anoniem blijven gebruiken, of u opnieuw aanmelden onder dezelfde
 "newusersonly" => " (alleen nieuwe gebroekers)",
 "remembermypassword" => "mien wachtwoord onthouden voor latere sessies.",
 "loginproblem" => "<b>Er is een probleem met het aanmelden.</b><br />Probeer het opnieuw a.u.b.",
-"alreadyloggedin" => "<font color=red><b>gebroeker $1, u bent al aangemeld.</b></font><br />\n",
-
-"areyounew"  => "Bent u nieuw op Wikipedia en wilt u een gebroekersprofiel aanmaken, voer dan een gebroekersnaam in en voer tweemaal hetzelfde wachtwoord in.
-Invoeren van uw e-mailadres is neet verplicht; het is handig als u uw wachtwoord bent vergeten; dat kan dan per e-mail worden opgestuurd.<br />\n",
+"alreadyloggedin" => "<strong>gebroeker $1, u bent al aangemeld.</strong><br />\n",
 
 "login"   => "Aanmelden",
 "userlogin"  => "Aanmelden",
@@ -332,8 +264,6 @@ Gelieve na ontvangst opnieuw aan te melden.",
 # Search results
 # Zoek resultaten
 "searchresults" => "Zoekresultaten",
-"searchhelppage" => "Wikipedia:Zoeken",
-"searchingwikipedia" => "Zoeken op Wikipedia",
 "searchresulttext" => "Voor meer informatie over zoeken op Wikipedia: zie $1.",
 "searchquery" => "Voor zoekopdracht \"$1\"",
 "badquery"  => "Slecht geformuleerde zoekopdracht",
@@ -349,10 +279,10 @@ Gelieve na ontvangst opnieuw aan te melden.",
 "showingresults" => "Hieronder de resultaten <b>$1</b> beginnend met #<b>$2</b>.",
 "nonefound"  => "<strong>Merk op:</strong> wanneer een zoekopdracht mislukt komt dat vaak door gebruik van (in het Engels) veel voorkomende woorden zoals \"of\" en \"be\", die neet geïndexeerd zijn, of door verschillende zoektermen tegelijk op te geven (u krijgt dan alleen in pagina's waaarin alle opgegeven termen voorkomen).",
 "powersearch" => "Zoeken",
-"powersearchtext" => "   
+"powersearchtext" => "
  Zoek in naamruimten :<br />
 $1<br />
-$2 Toon redirects   Zoek: $3 $9",   
+$2 Toon redirects   Zoek: $3 $9",
 
 # Preferences page
 # Voorkeuren
@@ -361,7 +291,7 @@ $2 Toon redirects   Zoek: $3 $9",
 "prefsnologintext" => "U dient [[Special:Userlogin|aangemeld]] te zijn om voorkeuren te kunnen instellen.",
 "prefslogintext" => "U bent aangemeld als \"$1\". Uw interne identificatienummer is $2.",
 "prefsreset" => "Standaardvoorkeuren hersteld.",
-"qbsettings" => "Menubalkinstellingen", 
+"qbsettings" => "Menubalkinstellingen",
 "changepassword" => "Wachtwoord wijzigen",
 "skin"   => "Wikipedia-Uiterlijk",
 "saveprefs"  => "Voorkeuren opslaan",
@@ -429,7 +359,7 @@ Uploads en verwijderingen worden bijgehouden in het
 
 Gebroek het onderstaande formulier om bestanden zoals afbeeldingen en geluidsbestanden die relevant zijn voor uw artikel te u-loaden. Bij de meeste browers zoals 'Internet Explorer' en 'Mozilla' zult u een \"Bladeren...\" of \"Browse..\" knop zien die een standaard dialoogscherm van uw bestuuringssysteem oproept. Kiest u een bestand, dan zal het ingevuld worden in het veld naast de \"Bladeren...\" knop. U dient ook het vakje aan te vinken waarmee u bevestigt dat er geen schending van auteursrechten plaatsvindt door het gebruik van dat bestand. Vul het veld \"Omschrijving\" in. Druk op de \"Upload\" knop om het uploaden te voltooien. Dit kan even duren als u een langzame internetverbinding gebruikt.
 
-Gebroek bij voorkeur JPEG voor foto's, PNG voor tekeningen en dergelijke en OGG voor geluid. 
+Gebroek bij voorkeur JPEG voor foto's, PNG voor tekeningen en dergelijke en OGG voor geluid.
 Geef uw bestanden een duidelijk omschrijvende naam om verwarring te voorkomen. Om het bestand in een pagina te laten verschijnen, kunt u het volgende doen;  <b><nowiki>[[afbeelding:uw_foto.jpg]]</nowiki></b> of <b><nowiki>[[afbeelding:uw_logo.png|alt text]]</nowiki></b> of <b><nowiki>[[media:uw_geluid.ogg]]</nowiki></b> voor audio.
 
 Vergeet neet dat net als met andere pagina's op Wikipedia anderen de ge-uploade bestanden kunnen verwijderen indien men denkt dat dat in het voordeel van het project is. Bij misbruik van dit systeem kan u de toegang tot Wikipedia ontzegd worden.",
@@ -441,11 +371,9 @@ Vergeet neet dat net als met andere pagina's op Wikipedia anderen de ge-uploade
 ",
 "filename"  => "Bestandsnaam",
 "filedesc"  => "Beschrijving",
-"affirmation" => "Ik verklaar dat de eigenaar van de rechten op dit bestand toestemt om het onder de voorwaarden van $1 te verspreiden.",
 "copyrightpage" => "Wikipedia:Auteursrechten",
 "copyrightpagename" => "Wikipedia auteursrechten",
 "uploadedfiles" => "Ge-uploade bestanden",
-"noaffirmation" => "U dient te bevestigen dat deze handeling geen inbreuk maakt op auteursrechten.",
 "ignorewarning" => "Negeer de waarschuwing en sla het bestand op.",
 "minlength"  => "De naam van het bestand moet uit ten minste drie tekens bestaan.",
 "badfilename" => "De naam van het bestand is gewijzigd in \"$1\".",
@@ -488,7 +416,7 @@ Vergeet neet dat net als met andere pagina's op Wikipedia anderen de ge-uploade
 Er is in totaal $3 maal een pagina bekeken, en $4 maal een pagina bewerkt. Dat geeft een gemiddelde van $5 bewerkingen per pagina, en $6 paginabezoeken per wijziging.",
 "userstatstext" => "Er zijn momenteel $1 geregistreerde gebroekers; hiervan zijn er $2 systeembeheerders (zie $3).",
 
-# Maintenance Page   
+# Maintenance Page
 #
 "maintenance"           => "Onderhoudspagina",
 "maintnancepagetext"    => "Op deze pagina vindt u een aantal handige zoekopdrachten om kleine alledaagse problemen in de Wikipedia te verhelpen. Sommige van deze zoekopdrachten vormen een grote belasting voor de database; ga dus neet na elke paar pagina's die u hersteld heeft, de pagina opnieuw laden.",
@@ -564,7 +492,7 @@ to send e-mail to other users.",
 te zijn.",
 "addedwatch" => "Toegevoegd aan volgliest",
 "addedwatchtext" => "De pagina \"$1\" is aan uw [[Special:Watchlist|volgliest]] toegevoegd.
-Toekomstige wijzigingen aan deze pagina en euverlikpagina zullen hier vermeld worden. 
+Toekomstige wijzigingen aan deze pagina en euverlikpagina zullen hier vermeld worden.
 Ook zullen deze pagina's in het <b>vet</b> verschijnen in de [[Special:Recentchanges|liest van recente wijzigingen]] zodat u ze eenvoudiger kan opmerken.
 
 Indien u een pagina wenst te verwijderen van uw volgliest klik dan op \"Van volgliest verwijderen\" in de menubalk.",
@@ -636,7 +564,6 @@ Indien u een pagina wenst te verwijderen van uw volgliest klik dan op \"Van volg
 "ipbreason"  => "Reden",
 "ipbsubmit"  => "Blokkier dit IP-adres",
 "badipaddress" => "Het IP-adres heeft een ongeldige opmaak.",
-"noblockreason" => "U dient een reden op te geven voor het blokkeren van een IP-adres.",
 "blockipsuccesssub" => "Blokkering gelukt",
 "blockipsuccesstext" => "Het IP-adres \"$1\" is geBlokkierd.<br />
 Zie de [[Special:Ipblocklist|liest van geBlokkierde IP-adressen]].",
@@ -667,15 +594,6 @@ Zie de [[Special:Ipblocklist|liest van geBlokkierde IP-adressen]].",
 Vergeet neet de database opnieuw te de-blokkeren zodra u klaar bent met uw onderhoud.",
 "unlockdbsuccesstext" => "Blokkering van de database van Wikipedia LI is opgeheven.",
 
-# SQL query
-# SQL raadplegen
-"asksql"  => "SQL raadplegen",
-"asksqltext" => "Gebroek het onderstaande formulier om een direct verzoek naar de database van Wikipedia te zenden. Gebroek enkelvoudige aanhalingstekens ('zoals hier') voor letterlijke teksten. Een ingewikkelde aanvraag kan de sever vaak extra belasten. Gelieve deze mogelijkheid daarom spaarzaam te gebruiken. Zie ook: [[Wikipedia:SQL opdrachten]].",
-"sqlquery"  => "Voer opdracht in",
-"querybtn"  => "Verstuur opdracht",
-"selectonly" => "Opdrachten anders dan \"SELECT\" zijn voorbehouden aan Wikipedia ontwikkelaars.",
-"querysuccessful" => "Opdracht succesvol",
-
 # Move page
 # Verplaats pagina
 "movepage"  => "Verplaats pagina",
@@ -738,7 +656,7 @@ De kins ouch 'n log type, de gebroekersname of de betriffende pazjena selectiere
 'categoryarticlecount' => "D'r zunt $1 artikele in dees kategorie.",
 'categoryarticlecount1' => "D'r is $1 artikel in dees kategorie.",
 'changes' => "verangeringe",
-'clearyourcache' => "'''Mèrk op:''' Nao 't opsjlaon, kins e diene browsercache wisse om de verangeringe te zeen: '''Mozilla:''' klik ''Reload'' (of ''Ctrl-R''), '''Firefox / IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'clearyourcache' => "'''Mèrk op:''' Nao 't opsjlaon, kins e diene browsercache wisse om de verangeringe te zeen: '''Mozilla / Firefox:''' ''Ctrl-Shift-R'', '''Internet Explorer:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror''' ''F5''.",
 'compareselectedversions' => "Vergeliek geselecteerde versies",
 'confirmemail_body' => "Someone, probably you from IP address $1, has registered an
 account \"$2\" with this e-mail address on {{SITENAME}}.
@@ -967,9 +885,9 @@ class LanguageLi extends LanguageUtf8 {
 
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		$d = (0 + substr( $ts, 6, 2 )) . " " .
-		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . " " . 
+		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . " " .
 		substr( $ts, 0, 4 );
 		return $d;
 	}
@@ -978,21 +896,6 @@ class LanguageLi extends LanguageUtf8 {
 		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesLi;
-		return $wgValidSpecialPagesLi;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesLi;
-		return $wgSysopSpecialPagesLi;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesLi;
-		return $wgDeveloperSpecialPagesLi;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesLi;
 		if( isset( $wgAllMessagesLi[$key] ) ) {
diff --git a/languages/LanguageLt.php b/languages/LanguageLt.php
index 37dad672219b..252b92a152bd 100644
--- a/languages/LanguageLt.php
+++ b/languages/LanguageLt.php
@@ -8,141 +8,101 @@ require_once( "LanguageUtf8.php" );
 
 
 /* private */ $wgQuickbarSettingsLt = array(
-        "Nerodyti", "Fiksuoti kairėje", "Fiksuoti dešinėje", "Plaukiojantis kairėje"
+	"Nerodyti", "Fiksuoti kairėje", "Fiksuoti dešinėje", "Plaukiojantis kairėje"
 );
 
 /* private */ $wgSkinNamesLt = array(
-        'standard' => "Standartinė",
-        'nostalgia' => "Nostalgija",
-        'cologneblue' => "Kiolno Mėlyna",
-        'davinci' => "Da Vinči",
-        'mono' => "Mono",
-        'monobook' => "MonoBook",
-	'myskin' => "MySkin"
-);
-
-# Note to translators: 
-#   Please include the English words as synonyms.  This allows people 
-#   from other wikis to contribute more easily.
-# 
-/* private */ $wgMagicWordsLt = array(
-#   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    "#redirect"              ),
-    MAG_NOTOC                => array( 0,    "__NOTOC__"              ),
-    MAG_FORCETOC             => array( 0,    "__FORCETOC__"           ),
-    MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__"      ),
-    MAG_START                => array( 0,    "__START__"              ),
-    MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH"           ),
-    MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME"       ),
-    MAG_CURRENTDAY           => array( 1,    "CURRENTDAY"             ),
-    MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME"         ),
-    MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR"            ),
-    MAG_CURRENTTIME          => array( 1,    "CURRENTTIME"            ),
-    MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES"       ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN"    ),
-        MAG_SUBST                => array( 0,    "SUBST:"                 ),
-    MAG_MSGNW                => array( 0,    "MSGNW:"                 ),
-        MAG_END                  => array( 0,    "__END__"                ),
-    MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb"     ),
-    MAG_IMG_RIGHT            => array( 1,    "right"                  ),
-    MAG_IMG_LEFT             => array( 1,    "left"                   ),
-    MAG_IMG_NONE             => array( 1,    "none"                   ),
-    MAG_IMG_WIDTH            => array( 1,    "$1px"                   ),
-    MAG_IMG_CENTER           => array( 1,    "center", "centre"       ),
-    MAG_INT                  => array( 0,    "INT:"                   ),
-    MAG_SITENAME             => array( 1,    "SITENAME"               ),
-    MAG_NS                   => array( 0,    "NS:"                    ),
-        MAG_LOCALURL             => array( 0,    "LOCALURL:"              ),
-        MAG_LOCALURLE            => array( 0,    "LOCALURLE:"             ),
-        MAG_SERVER               => array( 0,    "SERVER"                 )
-);
-
+	'standard' => "Standartinė",
+	'nostalgia' => "Nostalgija",
+	'cologneblue' => "Kiolno Mėlyna",
+	'davinci' => "Da Vinči",
+) + $wgSkinNamesEn;
 
 $wgAllMessagesLt = array(
-'january' => "Sausio", 
-'february' => "Vasario", 
-'march' => "Kovo", 
-'april' => "Balandžio", 
-'may_long' => "Gegužės", 
+'january' => "Sausio",
+'february' => "Vasario",
+'march' => "Kovo",
+'april' => "Balandžio",
+'may_long' => "Gegužės",
 'june' => "Birželio",
-'july' => "Liepos", 
-'august' => "Rugpjūčio", 
+'july' => "Liepos",
+'august' => "Rugpjūčio",
 'september' => "Rugsėjo",
 'october' => "Spalio",
 'november' => "Lapkričio",
 'december' => "Gruodžio",
 
-'jan' => "Sau", 
-'feb' => "Vas", 
-'mar' => "Kov", 
-'apr' => "Bal", 
-'may' => "Geg", 
-'jun' => "Bir", 
-'jul' => "Lie", 
+'jan' => "Sau",
+'feb' => "Vas",
+'mar' => "Kov",
+'apr' => "Bal",
+'may' => "Geg",
+'jun' => "Bir",
+'jul' => "Lie",
 'aug' => "Rgp",
-'sep' => "Rgs", 
-'oct' => "Spa", 
-'nov' => "Lap", 
+'sep' => "Rgs",
+'oct' => "Spa",
+'nov' => "Lap",
 'dec' => "Gru",
 
-'sunday' => "Sekmadienis", 
-'monday' => "Pirmadienis", 
-'tuesday' => "Antradienis", 
-'wednesday' => "Trečiadienis", 
+'sunday' => "Sekmadienis",
+'monday' => "Pirmadienis",
+'tuesday' => "Antradienis",
+'wednesday' => "Trečiadienis",
 'thursday' => "Ketvirtadienis",
-'friday' => "Penktadienis", 
+'friday' => "Penktadienis",
 'saturday' => "Šeštadienis",
 
 '1movedto2' => "Straipsnis '$1' pervadintas į '$2'",
 'Monobook.js' => "/* tooltips and access keys */
 ta = new Object();
-ta['pt-userpage'] = new Array('.','Mano vartotojo puslapis'); 
-ta['pt-anonuserpage'] = new Array('.','Vartotojo puslapis jūsų ip ardesui'); 
-ta['pt-mytalk'] = new Array('n','Mano diskusijų puslapis'); 
-ta['pt-anontalk'] = new Array('n','Diskusijos apie pakeitimus, darytus naudojant šį IP adresą'); 
-ta['pt-preferences'] = new Array('','Mano nustatymai'); 
-ta['pt-watchlist'] = new Array('l','Sąrašas straipsnių, kuriuos jūs pasirinkote stebėti.'); 
-ta['pt-mycontris'] = new Array('y','Mano darytų keitimų sąrašas'); 
-ta['pt-login'] = new Array('o','Rekomenduojame prisijungti, nors tai nėra privaloma.'); 
-ta['pt-anonlogin'] = new Array('o','Rekomenduojame prisijungti, nors tai nėra privaloma.'); 
-ta['pt-logout'] = new Array('o','Atsijungti'); 
-ta['ca-talk'] = new Array('t','Diskusijos apie šį straipsnį'); 
-ta['ca-edit'] = new Array('e','Jūs galite redaguoti šį straipsnį. Nepamirškite peržiūrėti pakeitimų prieš užsaugodami.'); 
-ta['ca-addsection'] = new Array('+','Pradėti naują temą diskusijose.'); 
-ta['ca-viewsource'] = new Array('e','Puslapis yra užrakintas. Galite tik pažiūrėti turinį.'); 
-ta['ca-history'] = new Array('h','Ankstesnės puslapio versijos.'); 
-ta['ca-protect'] = new Array('=','Uždrausti šį puslapį'); 
-ta['ca-delete'] = new Array('d','Ištrinti šį puslapį'); 
-ta['ca-undelete'] = new Array('d','Atstatyti puslapį su visais darytais keitimais'); 
-ta['ca-move'] = new Array('m','Pervadinti straipsnį'); 
-ta['ca-watch'] = new Array('w','Pridėti straipsnį į stebimųjų sąrašą'); 
-ta['ca-unwatch'] = new Array('w','Išimti straipsnį iš stebimųjų sąrašo'); 
-ta['search'] = new Array('f','Ieškoti lietuviškoje Wikipedijoje'); 
-ta['p-logo'] = new Array('','Į pradinį puslapį'); 
-ta['n-mainpage'] = new Array('z','Apsilankykite pradiniame puslapyje'); 
-ta['n-portal'] = new Array('','About the project, what you can do, where to find things'); 
-ta['n-currentevents'] = new Array('','Find background information on current events'); 
-ta['n-recentchanges'] = new Array('r','Sąrašas paskutinių keitimų.'); 
-ta['n-randompage'] = new Array('x','Parinkti atsitiktinį straipsnį'); 
-ta['n-help'] = new Array('','Vieta, kur rasite rūpimus atsakymus.'); 
-ta['n-sitesupport'] = new Array('','Aukokite projektui'); 
-ta['t-whatlinkshere'] = new Array('j','Sąrašas straipsnių, rodančių į čia'); 
-ta['t-recentchangeslinked'] = new Array('k','Paskutiniai keitimai straipsniuose, pasiekiamuose iš šio straipsnio'); 
-ta['feed-rss'] = new Array('','RSS feed for this page'); 
-ta['feed-atom'] = new Array('','Atom feed for this page'); 
-ta['t-contributions'] = new Array('','Pažiūrėti vartotojo įnašą - darytus keitimus'); 
-ta['t-emailuser'] = new Array('','Siųsti el.laišką vartotojui'); 
-ta['t-upload'] = new Array('u','Įdėti paveikslėlį ar media failą'); 
-ta['t-specialpages'] = new Array('q','Specialiųjų puslapių sąrašas'); 
-ta['ca-nstab-main'] = new Array('c','Pereiti į straipsnio turinį'); 
-ta['ca-nstab-user'] = new Array('c','Rodyti vartotojo puslapį'); 
-ta['ca-nstab-media'] = new Array('c','Rodyti media puslapį'); 
-ta['ca-nstab-special'] = new Array('','Šis puslapis yra specialusis - jo negalima redaguoti.'); 
-ta['ca-nstab-wp'] = new Array('a','Rodyti projekto puslapį'); 
-ta['ca-nstab-image'] = new Array('c','Rodyti paveikslėlio puslapį'); 
-ta['ca-nstab-mediawiki'] = new Array('c','Rodyti sisteminį pranešimą'); 
-ta['ca-nstab-template'] = new Array('c','Rodyti šabloną'); 
-ta['ca-nstab-help'] = new Array('c','Rodyti pagalbos puslapį'); 
+ta['pt-userpage'] = new Array('.','Mano vartotojo puslapis');
+ta['pt-anonuserpage'] = new Array('.','Vartotojo puslapis jūsų ip ardesui');
+ta['pt-mytalk'] = new Array('n','Mano diskusijų puslapis');
+ta['pt-anontalk'] = new Array('n','Diskusijos apie pakeitimus, darytus naudojant šį IP adresą');
+ta['pt-preferences'] = new Array('','Mano nustatymai');
+ta['pt-watchlist'] = new Array('l','Sąrašas straipsnių, kuriuos jūs pasirinkote stebėti.');
+ta['pt-mycontris'] = new Array('y','Mano darytų keitimų sąrašas');
+ta['pt-login'] = new Array('o','Rekomenduojame prisijungti, nors tai nėra privaloma.');
+ta['pt-anonlogin'] = new Array('o','Rekomenduojame prisijungti, nors tai nėra privaloma.');
+ta['pt-logout'] = new Array('o','Atsijungti');
+ta['ca-talk'] = new Array('t','Diskusijos apie šį straipsnį');
+ta['ca-edit'] = new Array('e','Jūs galite redaguoti šį straipsnį. Nepamirškite peržiūrėti pakeitimų prieš užsaugodami.');
+ta['ca-addsection'] = new Array('+','Pradėti naują temą diskusijose.');
+ta['ca-viewsource'] = new Array('e','Puslapis yra užrakintas. Galite tik pažiūrėti turinį.');
+ta['ca-history'] = new Array('h','Ankstesnės puslapio versijos.');
+ta['ca-protect'] = new Array('=','Uždrausti šį puslapį');
+ta['ca-delete'] = new Array('d','Ištrinti šį puslapį');
+ta['ca-undelete'] = new Array('d','Atstatyti puslapį su visais darytais keitimais');
+ta['ca-move'] = new Array('m','Pervadinti straipsnį');
+ta['ca-watch'] = new Array('w','Pridėti straipsnį į stebimųjų sąrašą');
+ta['ca-unwatch'] = new Array('w','Išimti straipsnį iš stebimųjų sąrašo');
+ta['search'] = new Array('f','Ieškoti lietuviškoje Wikipedijoje');
+ta['p-logo'] = new Array('','Į pradinį puslapį');
+ta['n-mainpage'] = new Array('z','Apsilankykite pradiniame puslapyje');
+ta['n-portal'] = new Array('','About the project, what you can do, where to find things');
+ta['n-currentevents'] = new Array('','Find background information on current events');
+ta['n-recentchanges'] = new Array('r','Sąrašas paskutinių keitimų.');
+ta['n-randompage'] = new Array('x','Parinkti atsitiktinį straipsnį');
+ta['n-help'] = new Array('','Vieta, kur rasite rūpimus atsakymus.');
+ta['n-sitesupport'] = new Array('','Aukokite projektui');
+ta['t-whatlinkshere'] = new Array('j','Sąrašas straipsnių, rodančių į čia');
+ta['t-recentchangeslinked'] = new Array('k','Paskutiniai keitimai straipsniuose, pasiekiamuose iš šio straipsnio');
+ta['feed-rss'] = new Array('','RSS feed for this page');
+ta['feed-atom'] = new Array('','Atom feed for this page');
+ta['t-contributions'] = new Array('','Pažiūrėti vartotojo įnašą - darytus keitimus');
+ta['t-emailuser'] = new Array('','Siųsti el.laišką vartotojui');
+ta['t-upload'] = new Array('u','Įdėti paveikslėlį ar media failą');
+ta['t-specialpages'] = new Array('q','Specialiųjų puslapių sąrašas');
+ta['ca-nstab-main'] = new Array('c','Pereiti į straipsnio turinį');
+ta['ca-nstab-user'] = new Array('c','Rodyti vartotojo puslapį');
+ta['ca-nstab-media'] = new Array('c','Rodyti media puslapį');
+ta['ca-nstab-special'] = new Array('','Šis puslapis yra specialusis - jo negalima redaguoti.');
+ta['ca-nstab-wp'] = new Array('a','Rodyti projekto puslapį');
+ta['ca-nstab-image'] = new Array('c','Rodyti paveikslėlio puslapį');
+ta['ca-nstab-mediawiki'] = new Array('c','Rodyti sisteminį pranešimą');
+ta['ca-nstab-template'] = new Array('c','Rodyti šabloną');
+ta['ca-nstab-help'] = new Array('c','Rodyti pagalbos puslapį');
 ta['ca-nstab-category'] = new Array('c','Rodyti kategorijos puslapį');",
 'about' => "Apie",
 'aboutsite'      => "Apie Wikipediją",
@@ -156,14 +116,12 @@ taip pat bus '''paryškinti''' [[Special:Recentchanges|naujausių keitimų sąra
 
 <p>Jei bet kuriuo metu užsinorėtumėte nustoti stebėti straipsnį, spustelkite \"nebestebėti\" viršutiniame meniu.",
 'administrators' => "Wikipedia:Administrators",
-'affirmation' => "Aš patvirtinu, kad šio failo autorius ar teisių turėtojas
-sutinka jog failas bus viešinamas $1 licenzijos sąlygomis.",
 'allmessages' => "Visi sistemos tekstai bei pranešimai",
 'allmessagestext' => "Čia pateikiami visi sisteminiai tekstai bei pranešimai, esantys MediaWiki: vardų ervėje.",
 'allpages' => "Visi straipsniai",
 'alphaindexline' => "Nuo $1 iki $2",
-'alreadyloggedin' => "<font color=red><b>Jūs jau esate prisijungęs kaip vartotojas User $1!</b></font><br />",
-'alreadyrolled' => "Nepavyko atmesti paskutinio [[User:$2|$2]] ([[User talk:$2|Diskusijos]]) daryto straipsnio [[$1]] keitimo; kažkas jau pakeitė straipsnį arba suspėjo pirmas atmesti keitimą. 
+'alreadyloggedin' => "<strong>Jūs jau esate prisijungęs kaip vartotojas User $1!</strong><br />",
+'alreadyrolled' => "Nepavyko atmesti paskutinio [[User:$2|$2]] ([[User talk:$2|Diskusijos]]) daryto straipsnio [[$1]] keitimo; kažkas jau pakeitė straipsnį arba suspėjo pirmas atmesti keitimą.
 
 Paskutimas keitimas darytas vartotojo [[User:$3|$3]] ([[User talk:$3|Diskusijos]]).",
 'ancientpages' => "Seniausi straipsniai",
@@ -198,7 +156,7 @@ Pasirinkite kitą pavadinimą.",
 kartu su visa istorija iš duomenų bazės.
 Prašome patvirtinti kad jūs norite tai padaryti,
 žinote kokios yra veiksmo pasekmės,
-ir kad jūs tai darote nenusižengdamas 
+ir kad jūs tai darote nenusižengdamas
 [[Wikipedia:Policy|Wikipedijos Politikai]].",
 'confirmprotect' => "Užrakinimo patvirtinimas",
 'confirmprotecttext' => "Ar jūs tikrai norite užrakinti šį straipsnį?",
@@ -297,7 +255,7 @@ P.S.:  kai kuriuose puslapiuose ir toliau gali rodyti lyg būtumėte prisijungę
 'navigation' => "Navigacija",
 'nbytes' => "$1 B",
 'newarticletext' => "Jūs patekote į neegzistuojančio straipsnio puslapį.
-Norėdami sukurti straipsnį, pradėkite žemiau esančiame įvedimo lauke 
+Norėdami sukurti straipsnį, pradėkite žemiau esančiame įvedimo lauke
 (daugiau informacijos [[Wikipedia:Help|pagalbos puslapyje]]).
 Jei patekote čia per klaidą, paprasčiausiai spustelkite  naršyklės mygtuką 'atgal' ('''back''').",
 'newpages' => "Naujausi straipsniai",
@@ -422,43 +380,36 @@ esantį mygtuką 'Išmesti iš stebimų'.",
 #--------------------------------------------------------------------------
 
 class LanguageLt extends LanguageUtf8  {
-        # Inherent default user options unless customization is desired
-
-        function getQuickbarSettings() {
-                global $wgQuickbarSettingsLt;
-                return $wgQuickbarSettingsLt;
-        }
+	# Inherent default user options unless customization is desired
 
-        function getSkinNames() {
-                global $wgSkinNamesLt;
-                return $wgSkinNamesLt;
-        }
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsLt;
+		return $wgQuickbarSettingsLt;
+	}
 
-        function getDateFormats() {
-                global $wgDateFormatsLt;
-                return $wgDateFormatsLt;
-        }
+	function getSkinNames() {
+		global $wgSkinNamesLt;
+		return $wgSkinNamesLt;
+	}
 
 	function fallback8bitEncoding() {
 		return "windows-1257";
 	}
 
-        function getMessage( $key )
-        {
-                global $wgAllMessagesLt;
+	function getMessage( $key ) {
+		global $wgAllMessagesLt;
 
-                if(array_key_exists($key, $wgAllMessagesLt))
-                        return $wgAllMessagesLt[$key];
-                else
-                        return parent::getMessage($key);
-        }
+		if(array_key_exists($key, $wgAllMessagesLt))
+			return $wgAllMessagesLt[$key];
+		else
+			return parent::getMessage($key);
+	}
+
+	function getAllMessages() {
+		global $wgAllMessagesLt;
+		return $wgAllMessagesLt;
+	}
 
-        function getAllMessages()
-        {
-                global $wgAllMessagesLt;
-                return $wgAllMessagesLt;
-        }
-	
 	function formatNum( $number ) {
 		return strtr($number, '.,', ',.' );
 	}
diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index d709c930c357..c29bbe1d945a 100644
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -39,19 +39,7 @@
 	'monobook'			=>	'Monobook',
 	'myskin'			=>	'Моја маска',
 	'chick'				=>	'Шик'
-
-);
-
-
-/* private */ $wgMathNamesMk = array(
-	MW_MATH_PNG			=>	'mw_math_png',
-	MW_MATH_SIMPLE			=>	'mw_math_simple',
-	MW_MATH_HTML			=>	'mw_math_html',
-	MW_MATH_SOURCE			=>	'mw_math_source',
-	MW_MATH_MODERN			=>	'mw_math_modern',
-	MW_MATH_MATHML			=>	'mw_math_mathml'
-);
-
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsMk = array(
  "Без преференции",
@@ -104,55 +92,6 @@
 	MAG_REVISIONID			=>	array( 1, 'REVISIONID' ),
 );
 
-
-/* private */ $wgValidSpecialPagesMk = array(
-	"Userlogin"			=>	"",
-	"Userlogout"			=>	"",
-	"Preferences"			=>	"Мои прилагодувања",
-	"Watchlist"			=>	"Набљудувани страници",
-	"Recentchanges"			=>	"Скорешни промени",
-	"Upload"			=>	"Подигни датотеки со слики",
-	"Imagelist"			=>	"Листа на слики",
-	"Listusers"			=>	"Регистрирани корисници",
-	"Statistics"			=>	"Статистики",
-	"Randompage"			=>	"Случајна статија",
-	"Lonelypages"			=>	"Сами страници",
-	"Unusedimages"			=>	"Некористени слики",
-	"Popularpages"			=>	"Популарни статии",
-	"Wantedpages"			=>	"Најбарани статии",
-	"Shortpages"			=>	"Кратки статии",
-	"Longpages"			=>	"Долги статии",
-	"Newpages"			=>	"Нови статии",
-	"Ancientpages"			=>	"Најстари статии",
-	"Deadendpages"			=>	"Мртви страници",
-	"Allpages"			=>	"Сите страници по наслов",
-	"Ipblocklist"			=>	"Блокирани корисници/IP адреси",
-	"Maintenance"			=>	"Одржување",
-	"Specialpages"			=>	"",
-	"Contributions"			=>	"",
-	"Emailuser"			=>	"",
-	"Whatlinkshere"			=>	"",
-	"Recentchangeslinked"		=>	"",
-	"Movepage"			=>	"",
-	"Booksources"			=>	"Надворешни извори за книги",
-	"Categories"			=>	"Категории",
-	"Export"			=>	"Извезување во XML",
-	"Version"			=>	"МедијаВики верзија",
-);
-
-/* private */ $wgSysopSpecialPagesMk = array(
-	"Blockip"			=>	"Блокирај корисник/IP адреса",
-	"Asksql"			=>	"Барање до базата",
-	"Allmessages"			=>	"Сите системски пораки",
-	"Undelete"			=>	"Обнови ги избришаните страници",
-	"Makesysop"			=>	"Претвори корисник во администратор"
-);
-
-/* private */ $wgDeveloperSpecialPagesMk = array(
-	"Lockdb"			=>	"Заклучување на базата",
-	"Unlockdb"			=>	"Отклучување на базата"
-);
-
 global $wgRightsText;
 
 /* private */ $wgAllMessagesMk = array(
@@ -181,8 +120,6 @@ global $wgRightsText;
 	'tog-enotifminoredits'		=>	'Испрати ми е-пошта за ситни промени на страници, истотака',
 	'tog-enotifrevealaddr'		=>	'Откриј ја мојата е-поштенска адреса во пораките за известување',
 	'tog-shownumberswatching'		=>	'Прикажи го бројот на корисници кои набљудуваат',
-	'tog-rcusemodstyle'		=>	'Прикажи ги скорешните промени во UseMod стил: само последната промена на некоја страница е прикажана.',
-	'tog-showupdated'		=>	'Прикажи означувач за ажурирање ',
 	'tog-fancysig'			=>	'Без променување на потписот во врска кон корисничката страница',
 	'tog-externaleditor'		=>	'Користи надворешен уредувач по основно',
 	'tog-externaldiff'		=>	'Користи надворешна програма за разлики по основно',
@@ -235,7 +172,6 @@ global $wgRightsText;
 	'article'			=>	'Статија',
 	'help'				=>	'Помош',
 	'helppage'			=>	'Help:Помош',
-	'wikititlesuffix'		=>	'{{SITENAME}}',
 	'bugreports'			=>	'Извештаи за грешки',
 	'bugreportspage'		=>	'Project:Извештаи за грешки',
 	'sitesupport'			=>	'Донации',
@@ -314,8 +250,6 @@ global $wgRightsText;
 	'sysoptext'			=>	"Бараната функција може да ја изврши само корисник со статус \"администратор\". Види $1.",
 	'developertitle'		=>	'Се бара развивачки пристап',
 	'developertext'			=>	"Бараната функција може да ја изврши само корисник со статус \"развивач\". Види $1.",
-	'bureaucrattitle'		=>	'Се бара бирократски пристап',
-	"bureaucrattext"		=>	"Бараната функција може да ја изврши само корисник со статус \"бирократ\".",
 	'nbytes'			=>	'$1 бајти',
 	'ok'				=>	'Во ред',
 	'sitetitle'			=>	"{{SITENAME}}",
@@ -375,14 +309,13 @@ global $wgRightsText;
 	'perfdisabled'			=>	'Грешка! Оваа можност е привремено исклучена бидејќи ја успорува базата до ниво кога никој неможе да го користи вики.',
 	'perfdisabledsub'		=>	"Еве зачувана копија од $1:",
 	'perfcached'			=>	'Следните податоци се кеширани и може да не бидат целосно ажурирани:',
-	'wrong_wfQuery_params'		=>	"Грешни параметри до wfQuery()<br> Функција: $1<br> Прашалник: $2",
+	'wrong_wfQuery_params'		=>	"Грешни параметри до wfQuery()<br /> Функција: $1<br /> Прашалник: $2",
 	'viewsource'			=>	'Види код',
 	'protectedtext'			=>	"Оваа страница е заклучена; има повеќе причини за тоа, ве молиме погледнете ја [[Project:Заштитена_страница]].",
-	'seriousxhtmlerrors'		=>	'tidy пронајде сериозни грешки во кодот на XHTML.',
 	'sqlhidden'			=>	'(Скриен SQL прашалник)',
 
 	'logouttitle'			=>	'',
-	'logouttext'			=>	"Сега си одјавен.<br/> Можеш да продолжиш да го користиш {{SITENAME}} анонимно, или можеш да се најавиш под истото или различно корисничко име. Некои страници може да продолжат да се прикажуваат како да сте најавени, се додека не го исчистите кеш-от на вашиот пребарувач\n",
+	'logouttext'			=>	"Сега си одјавен.<br /> Можеш да продолжиш да го користиш {{SITENAME}} анонимно, или можеш да се најавиш под истото или различно корисничко име. Некои страници може да продолжат да се прикажуваат како да сте најавени, се додека не го исчистите кеш-от на вашиот пребарувач\n",
 	'welcomecreation'		=>	"== Добредојде, $1! == Сега сте регистрирани. Не заборавај да ги промениш прилагодувањата за {{SITENAME}}.",
 	'loginpagetitle'		=>	'Најавување',
 	'yourname'			=>	'Корисничко име',
@@ -390,8 +323,8 @@ global $wgRightsText;
 	'yourpasswordagain'		=>	'Повторно лозинка',
 	'newusersonly'			=>	' (само нови корисници)',
 	'remembermypassword'		=>	'Запамти ја лозинката за повеќе сесии.',
-	'loginproblem'			=>	'<b>Има проблем со вашето најавување.</b><br>Обидете се повторно!',
-	'alreadyloggedin'		=>	"<font color=red><b>Корисник $1, веќе сте најавени!</b></font><br>\n",
+	'loginproblem'			=>	'<b>Има проблем со вашето најавување.</b><br />Обидете се повторно!',
+	'alreadyloggedin'		=>	"<strong>Корисник $1, веќе сте најавени!</strong><br />\n",
 	"login"				=>	"Најавување",
 	"loginprompt"			=>	"Морате да користите колачиња за да се најавите на {{SITENAME}}.",
 	"userlogin"			=>	"Најави се",
@@ -419,9 +352,8 @@ global $wgRightsText;
 	'nosuchusershort'		=>	"Нема корисник со името \"$1\". Проверете ја синтаксата.",
 	"wrongpassword"			=>	"Внесовте погрешна лозинка. Обидете се повторно.",
 	"mailmypassword"		=>	"Испрати ми по пошта нова лозинка",
-	'mailmypasswordauthent'		=>	'Испрати ми по пошта нова лозинка',
-	"passwordremindermailsubject"	=>	"Потсетник за лозинка од {{SITENAME}}",
-	"passwordremindermailbody"	=>	"Некој (најверојатно вие, од IP адреса $1) побара да ви испратиме нова {{SITENAME}} лозинка. Лозинката за корисникот \"$2\" сега е \"$4\". Треба да се најавите и да ја промените лозинката сега. Сега можете да се логирате со оваа привремена позинка, која е валидна само за едно логирање. Можете да продолжите да ја користите старата лозинка ако ја памтите или да поставите нова. {{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}",
+	"passwordremindertitle"		=>	"Потсетник за лозинка од {{SITENAME}}",
+	"passwordremindertext"		=>	"Некој (најверојатно вие, од IP адреса $1) побара да ви испратиме нова {{SITENAME}} лозинка. Лозинката за корисникот \"$2\" сега е \"$4\". Треба да се најавите и да ја промените лозинката сега. Сега можете да се логирате со оваа привремена позинка, која е валидна само за едно логирање. Можете да продолжите да ја користите старата лозинка ако ја памтите или да поставите нова. {{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}",
 	"noemail"			=>	"Нема внесено е-поштенска адреса за корисникот \"$1\".",
 	"passwordsent"			=>	"Нова лозинка е испратена на корисникот \"$1\". Најавете се повторно откако ќе ја примите пораката.",
 	"loginend"			=>	"",
@@ -466,7 +398,7 @@ global $wgRightsText;
 	"preview"			=>	"Прегледај",
 	"showpreview"			=>	"Прегледај",
 	"blockedtitle"			=>	"Корисникот е блокиран",
-	"blockedtext"			=>	"Вашето корисничко име или IP адреса беше блокирано од $1 заради:<br>''$2''<p>Можеш да контактираш со $1 или еден од дргуите [[Project:Администратори|администратори]] за блокадата. Забелешка: Неможете да ја користите \"е-пошта до корисникот\" опцијата ако немате внесено валидна адреса во вашите [[Special:Прилагодувања|прилагодувања]]. Вашата IP адреса е $3. Ве молиме вклучете ја оваа адреса во сите барања што ќе ги приложите.",
+	"blockedtext"			=>	"Вашето корисничко име или IP адреса беше блокирано од $1 заради:<br />''$2''<p>Можеш да контактираш со $1 или еден од дргуите [[Project:Администратори|администратори]] за блокадата. Забелешка: Неможете да ја користите \"е-пошта до корисникот\" опцијата ако немате внесено валидна адреса во вашите [[Special:Прилагодувања|прилагодувања]]. Вашата IP адреса е $3. Ве молиме вклучете ја оваа адреса во сите барања што ќе ги приложите.",
 	"whitelistedittitle"		=>	"Морате да бидете најавени за менување на статии",
 	"whitelistedittext"		=>	"Морате да се [[Special:Userlogin|најавите]] за да менувате статии.",
 	"whitelistreadtitle"		=>	"Мора да сте најавени за да читате статии",
@@ -480,7 +412,7 @@ global $wgRightsText;
 	'talkpagetext'			=>	'<!-- МедијаВики:talkpagetext -->',
 	"anontalkpagetext"		=>	"---- ''Ова е страница за разговор за анонимен корисник кој сеуште не е регистриран или не ја користи. Затоа мораме да ја користиме неговата нумеричка [[IP адреса]] за идентификација. Една IP може да биде делена од повеќе корисници. Ако сте анонимен корисник и сметате дека ирелевантни коментари се насочени кон вас, ве молиме [[Special:Userlogin|Регистрирајте или најавете се]] за да избегнете забуна со други корисници.'' ",
 	"noarticletext"			=>	"(Моментално нема текст на оваа страница)",
-	'clearyourcache'		=>	"'''Забелешка:''' По зачувување морате да го исчистите кешот на вашиот прелистувач за да ги видите промените: '''Mozilla:''' кликнете ''Reload'' (или ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+	'clearyourcache'		=>	"'''Забелешка:''' По зачувување морате да го исчистите кешот на вашиот прелистувач за да ги видите промените: '''Mozilla / Firefox:''' ''Ctrl-Shift-R'', '''IE:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror''' ''F5''.",
 	'usercssjsyoucanpreview'	=>	"<strong>Совет:</strong> Користете го копчето Прегледај за да го испробате новиот CSS/JS код пред зачувувањето.",
 	'usercsspreview'		=>	"'''Запомнете дека ова е само преглед на вашиот CSS код, и страницата сеуште не е зачувана!'''",
 	'userjspreview'			=>	"'''Запомнете дека ова е само преглед на вашиот JavaScript код, и страницата сеуште не е зачувана!'''",
@@ -489,8 +421,6 @@ global $wgRightsText;
 	"previewnote"			=>	"Запомнете дека ова е само преглед, и страницата сеуште не е зачувана!",
 	"previewconflict"		=>	"Овој преглед го прикажува текстот од внесен во горниот дел како ќе изгледа кога ќе се зачува страницата.",
 	"editing"			=>	"Уредување на $1",
-	"sectionedit"			=>	" (секција)",
-	"commentedit"			=>	" (коментар)",
 	"editconflict"			=>	"Конфликтни уредувања: $1",
 	"explainconflict"		=>	"Некој друг ја променил страницата откако почнавте да ја менувате. Горниот дел за тест ја содржи страницата како што сега постои. Вашите промени се прикажани во долниот дел. Ќе морате да ги споите вашите промени со постоечкиот текст. <b>Само</b> текстот во горниот дел ќе биде зачуван кога ќе кликнете на \"Зачувај\".\n<p>",
 	"yourtext"			=>	"Ваш текст",
@@ -498,9 +428,9 @@ global $wgRightsText;
 	'nonunicodebrowser'		=>	"<strong>ПРЕДУПРЕДУВАЊЕ: Вашиот прелистувач не Уникод компатибилен, ве молиме променете го пред да уредувате статија.</strong>",
 	"editingold"			=>	"<strong>ПРЕДУПРЕДУВАЊЕ: Менувате застарена ревизија на оваа страница Ако ја зачувате, сите промени по оваа ревизија ќе се изгубат.</strong>\n",
 	"yourdiff"			=>	"Разлики",
-	"copyrightwarning"		=>	"Сите придонеси до {{SITENAME}} се претпоставува дека се издадени под GNU Free Documentation License (види $1 за детали). Ако не сакате вашиот текст да биде менуван и редистрибуиран слободно, не го испраќајте овде.<br> Исто така потврдувате дека текстот сте го напишале сами, или сте го копирале од јавен домен или сличен слободен извор. <strong>НЕ ПРАЌАЈТЕ ЗАШТИТЕНИ ТЕКСТОВИ БЕЗ ДОЗВОЛА!</strong>",
+	"copyrightwarning"		=>	"Сите придонеси до {{SITENAME}} се претпоставува дека се издадени под GNU Free Documentation License (види $1 за детали). Ако не сакате вашиот текст да биде менуван и редистрибуиран слободно, не го испраќајте овде.<br /> Исто така потврдувате дека текстот сте го напишале сами, или сте го копирале од јавен домен или сличен слободен извор. <strong>НЕ ПРАЌАЈТЕ ЗАШТИТЕНИ ТЕКСТОВИ БЕЗ ДОЗВОЛА!</strong>",
 	'copyrightwarning2'		=>	"Ве молиме, имајте во предвид дека сите придонеси кон {{SITENAME}} можат да бидат уредувани, менувани или отстранети од други корисници. Ако не сакате вашиот текст да биде менуван и редистрибуиран слободно, не го испраќајте овде.<br /> Исто така потврдувате дека текстот сте го напишале сами, или сте го копирале од јавен домен или сличен слободен извор (видет $1 за детали). <strong>НЕ ПРАЌАЈТЕ ЗАШТИТЕНИ ТЕКСТОВИ БЕЗ ДОЗВОЛА!</strong>",
-	"longpagewarning"		=>	"ПРЕДУПРЕДУВАЊЕ: Оваа страница е $1 килобајти долга; некои пребарувачи може да имаат проблеми со менување на страни подолги од 32kb. Размислете за разделување на страницата во помали делови.", 
+	"longpagewarning"		=>	"ПРЕДУПРЕДУВАЊЕ: Оваа страница е $1 килобајти долга; некои пребарувачи може да имаат проблеми со менување на страни подолги од 32kb. Размислете за разделување на страницата во помали делови.",
 	"readonlywarning"		=>	"ЗАБЕЛЕШКА: Базата е заклучена заради проверка, па нема да можете да ги зачувате вашите промени сега. Пробајте да го зачувате текстот локално и да го пратите подоцна.",
 	"protectedpagewarning"		=>	"ПРЕДУПРЕДУВАЊЕ: Оваа страница е заклучена па само корисници со администраторски привилегии може да ја менуваат. Прочитајте го [[Project:Protected_page_guidelines|упатството за заштитени страници]].",
 	'templatesused'			=>	'Шаблони користени на оваа страница:',
@@ -545,7 +475,7 @@ global $wgRightsText;
 	"showingresultsnum"		=>	"Прикажувам под <b>$3</b> резултати во #<b>$2</b>.",
 	"nonefound"			=>	"<strong>Забелешка</strong>: неуспешни барања најчесто се предизвикани од барање на чести зборови како \"има\" и \"од\", кои не се индексираат, или со внесување на повеќе од еден критериуми (само страници кои ги содржат сите барани зборови се прикажуваат).",
 	"powersearch"			=>	"Барај",
-	"powersearchtext"		=>	"Барај во имиња :<br>$1<br>$2 Листа пренасочува Барај $3 $9",
+	"powersearchtext"		=>	"Барај во имиња :<br />$1<br />$2 Листа пренасочува Барај $3 $9",
 	"searchdisabled"		=>	"<p>Целосно барање на текстови е привремено исклучено, заради подобри перформанси. Во меѓувреме, можете да барате преку Google (подолу), што може да даде застарени резултати.</p>",
 	'googlesearch'			=>	'<form method="get" action="http://www.google.com/search" id="googlesearch">
  <input type="hidden" name="domains" value="{{SERVER}}" />
@@ -657,7 +587,7 @@ global $wgRightsText;
 	"rcnotefrom"			=>	"Подолу се промените од <b>$2</b> (се прикажуваат до <b>$1</b>).",
 	"rclistfrom"			=>	"Прикажи нови промени почнувајќи од $1",
 	"showhideminor"			=>	"$1 ситни промени | $2 бота | $3 најавени корисници ",
-	"rclinks"			=>	"Прикажи последни $1 промени во последните $2 дена<br>$3",
+	"rclinks"			=>	"Прикажи последни $1 промени во последните $2 дена<br />$3",
 	"rchide"			=>	"во $4 форма; $1 ситни промени; $2 секундарни namespaces; $3 повеќекратни промени.",
 	"rcliu"				=>	"; $1 промени од најавени корисници",
 	"diff"				=>	"diff",
@@ -681,7 +611,6 @@ global $wgRightsText;
 	"uploadnologin"			=>	"Не сте најавени",
 	'uploadnologintext'		=>	"Морате да бидете [[Special:Userlogin|најавени]] за да подигнувате датотеки.",
 	'upload_directory_read_only'	=>	'The upload directory ($1) is not writable by the webserver.',
-	"uploadfile"			=>	"Подигнување слики, звуци, документи и сл.",
 	"uploaderror"			=>	"Грешка во подигнувањето",
 	'uploadtext' 			=>	"Користете го долниот формулар за да подигнете нови датотеки, да гледате или пребарувате претходно подигнати слики одете на [[Special:Imagelist|листата на подигнати датотеки]], подигнувањата и бришењата се истотака запишани во [[Special:Log|дневникот на проектот]]. Истотака морате да го штиклирате полето дека не прекршувате некои авторски права со подигнување на датотеката. Притиснете го \"Подигни датотека\" копчето за да го завршите подигнувањето. За да внесете слика во страница, користете врска во обликот '''<nowiki>[[{{ns:6}}:file.jpg]]</nowiki>''','''<nowiki>[[{{ns:6}}:file.png|alt text]]</nowiki>''' или '''<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>''' за директно поврзување со датотеката.",
 	"uploadlog"			=>	"дневник за подигнувањата",
@@ -691,11 +620,9 @@ global $wgRightsText;
 	"filedesc"			=>	"Опис",
 	"filestatus"			=>	"Авторски права",
 	"filesource"			=>	"Извор",
-	"affirmation"			=>	"Потврдувам дека корисникот на авторски права на оваа датотека се согласува да ја лиценцира под условите наведени во $1.",
 	'copyrightpage'			=>	"Project:Copyrights",
 	'copyrightpagename'		=>	"{{SITENAME}} авторско право",
 	"uploadedfiles"			=>	"Пратени датотеки",
-	"noaffirmation"			=>	"Морате да потврдите дека вашето подигнување не прекршува некакви авторски права.",
 	"ignorewarning"			=>	"Игнорирај предупредувања и зачувај ја датотеката.",
 	"minlength"			=>	"Имињата на сликите мораат да имаат барем три букви.",
 	'illegalfilename'		=>	'Името на датотеката "$1" содржи знаци што не се дозволени во наслов на страници. Ве молиме преименувајте ја датотеката и подигнете ја пак.',
@@ -733,7 +660,7 @@ global $wgRightsText;
 	"revertimg"			=>	"врт",
 	"deleteimg"			=>	"избр",
 	'deleteimgcompletely'		=>	'Избриши ги сите ревизии',
-	"imghistlegend"			=>	"Легенда: (мом) = ова е моменталната слика, (избр) = ја брише оваа стара верзија, (врт) = врати кон оваа стара верзија. <br><i>Кликни на датум за да ги видиш сите слики пратени на тој датум</i>.",
+	"imghistlegend"			=>	"Легенда: (мом) = ова е моменталната слика, (избр) = ја брише оваа стара верзија, (врт) = врати кон оваа стара верзија. <br /><i>Кликни на датум за да ги видиш сите слики пратени на тој датум</i>.",
 	"imagelinks"			=>	"Врски кон слики",
 	"linkstoimage"			=>	"Следните страници покажуваат кон оваа слика:",
 	"nolinkstoimage"		=>	"Нема страници кои покажуваат кон оваа слика.",
@@ -753,7 +680,7 @@ global $wgRightsText;
 	"maintenancebacklink"		=>	"Назад до страницата за одржување",
 	"disambiguations"		=>	"Нејасни страници",
 	"disambiguationspage"		=>	"Project:Links_to_disambiguating_pages",
-	"disambiguationstext"		=>	"Следните статии покажуваат кон <i>нејасна страница</i>. Тие треба да покажуваат кон соодветниот наслов.<br>Страница се третира како нејасно ако е поврзана од $1.<br>Врски од други namespaces <i>НЕ</i> се листаат овде.",
+	"disambiguationstext"		=>	"Следните статии покажуваат кон <i>нејасна страница</i>. Тие треба да покажуваат кон соодветниот наслов.<br />Страница се третира како нејасно ако е поврзана од $1.<br />Врски од други namespaces <i>НЕ</i> се листаат овде.",
 	"doubleredirects"		=>	"Двојни пренасочувања",
 	"doubleredirectstext"		=>	"Секој ред содржи врски кон првото и второто пренасочување, којашто обично ја посочува <i>вистинската</i> целна страница кон кое првото пренасочување би требало да насочува",
 	"brokenredirects"		=>	"Прекинати пренасочувања",
@@ -961,8 +888,8 @@ global $wgRightsText;
 	'ipusuccess'			=>	"\"[[$1]]\" деблокиран",
 	'ipblocklist'			=>	'Листа на блокирани IP адреси и кориснички имиња',
 	'blocklistline'			=>	"$1, $2 го блокираше $3 ($4)",
-	'infiniteblock'			=> 'истекува на infinite', //fixme
-	'expiringblock'			=> 'истекува на $1',
+	'infiniteblock' => 'истекува на infinite', //fixme
+	'expiringblock' => 'истекува на $1',
 	'blocklink'			=>	'блокирај',
 	'unblocklink'			=>	'деблокирај',
 	'contribslink'			=>	'придонеси',
@@ -994,14 +921,6 @@ global $wgRightsText;
 	'lockdbsuccesstext'		=>	'Базата е заклучена. <br />Сетете се да ја отклучите кога ќе завршите со нејзиното одржување.',
 	'unlockdbsuccesstext'		=>	'Базата е отклучена.',
 
-	'asksql'			=>	'SQL прашалник',
-	'asksqltext'			=>	"Користете го долниот формулар за да направите директен прашалник кон базата. Користете наводници ('како овие') за ограничување на низите. Ова често може да доведе до оптеретување на серверот, па затоа ве молиме користете ја оваа функција штедливо.",
-	'sqlislogged'			=>	'Имајте во предвид дека сите прашалници се логирани.',
-	'sqlquery'			=>	'Внеси прашалник',
-	'querybtn'			=>	'Поднеси прашалник',
-	'selectonly'			=>	'Дозволени се само прашалници само за читање.',
-	'querysuccessful'		=>	'Прашалникот е успешен',
-
 	'makesysoptitle'		=>	'Претвори корисник во администратор',
 	'makesysoptext'			=>	'Овој формулар е користен од бирократи, за претворање на обични корисници во администратори. Напишете го името на корисникот во полето и притиснете го копчето да го претворите корисникот во администратор',
 	'makesysopname'			=>	'Име на корисникот:',
@@ -1218,7 +1137,6 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Видете ја страница
 	'showbigimage'			=>	'Преземете ја верзијата со висока резолуција ($1x$2, $3 KB)',
 	'newimages'			=>	'Галерија на нови слики',
 	'noimages'			=>	'Нема ништо.',
-	'sitesettings'			=>	'Поставки на сајтот',
 	'specialloguserlabel'		=>	'Корисник: ',
 	'speciallogtitlelabel'		=>	'Наслов: ',
 	'passwordtooshort'		=>	'Вашата лозинка е прекратка. Мора да има најмалку $1 знаци.',
@@ -1235,7 +1153,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Видете ја страница
 	'imagelistall'				=>	'сите',
 	'watchlistall1'				=>	'сите',
 	'watchlistall2'				=>	'сите',
-	'namespacesall'				=>	'сите',
+	'namespacesall'			=>	'сите',
 );
 
 
@@ -1287,33 +1205,6 @@ class LanguageMk extends LanguageUtf8 {
 		return $wgDateFormatsMk;
 	}
 
-	/**
- 	 * Exports $wgValidSpecialPagesMk
-	 * @return array
-	 */
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesMk;
-		return $wgValidSpecialPagesMk;
-	}
-
-	/**
-	 * Exports $wgSysopSpecialPagesMk
-	 * @return array
-	 */
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesMk;
-		return $wgSysopSpecialPagesMk;
-	}
-
-	/**
-	 * Exports $wgDeveloperSpecialPagesMk
-	 * @return array
-	 */
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesMk;
-		return $wgDeveloperSpecialPagesMk;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesMk;
 		if ( isset( $wgAllMessagesMk[$key] ) ) {
diff --git a/languages/LanguageMs.php b/languages/LanguageMs.php
index 507c5089593e..ec103e02d44d 100644
--- a/languages/LanguageMs.php
+++ b/languages/LanguageMs.php
@@ -7,28 +7,21 @@
 # This localisation is based on a file kindly donated by the folks at MIMOS
 # http://www.asiaosc.org/enwiki/page/Knowledgebase_Home.html
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesMs = array(
-	-2	=> "Media",
-	-1	=> "Istimewa", #Special
-	0	=> "",
-	1	=> "Perbualan",#Talk
-	2	=> "Pengguna",#User
-	3	=> "Perbualan_Pengguna",#User_talk
-	4	=> "Wikipedia",#Wikipedia
-	5	=> "Perbualan_Wikipedia",#Wikipedia_talk
-	6	=> "Imej",#Image
-	7	=> "Imej_Perbualan",#Image_talk
-	8	=> "MediaWiki",
-	9	=> "MediaWiki_Perbualan",
-	10  => "Template",
-	11  => "Template_talk"
+	NS_MEDIA          => "Media",
+	NS_SPECIAL        => "Istimewa", #Special
+	NS_MAIN           => "",
+	NS_TALK           => "Perbualan",#Talk
+	NS_USER           => "Pengguna",#User
+	NS_USER_TALK      => "Perbualan_Pengguna",#User_talk
+	NS_PROJECT        => "Wikipedia",#Wikipedia
+	NS_PROJECT_TALK   => "Perbualan_Wikipedia",#Wikipedia_talk
+	NS_IMAGE          => "Imej",#Image
+	NS_IMAGE_TALK     => "Imej_Perbualan",#Image_talk
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "MediaWiki_Perbualan",
+	NS_TEMPLATE       => "Template",
+	NS_TEMPLATE_TALK  => "Template_talk"
 
 ) + $wgNamespaceNamesEn;
 
@@ -36,82 +29,10 @@
 	"Tiada", "Tetap sebelah kiri", "Tetap sebelah kanan", "Berubah-ubah sebelah kiri"
 );
 
-/* private */ $wgSkinNamesMs = array(
-	'standard' => "Standard",
-	'nostalgia' => "Nostalgia",
-	'cologneblue' => "Cologne Blue",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin"
-);
-
 /* private */ $wgDateFormatsMs = array(
 #	"Tiada pilihan", # "No preference",
 );
 
-
-/* private */ $wgBookstoreListMs = array(
-	"AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
-	"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
-	"Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
-	"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1"
-);
-
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesMs = array(
-	"Userlogin"		=> "Laluan masuk pengguna", #"Login Pengguna",
-	"Userlogout"	=> "Laluan keluar pengguna", #"Logout Pengguna",
-	"Preferences"	=> "Ubah konfigurasi saya", #"Set my user preferences",
-	"Watchlist"		=> "Senarai pilihan",#My watchlist",
-	"Recentchanges" => "Halaman terkini setelah diubah",#Recently updated pages",
-	"Upload"		=> "Muatnaik fail imej", #"Upload image files"
-	"Imagelist"		=> "Senarai imej",#Image list",
-	"Listusers"		=> "Senarai pengguna",#List of users",
-	"Statistics"	=> "Statistik halaman",#site statistics",
-	"Randompage"	=> "Halaman Rawak",#Random article",
-
-	"Lonelypages"	=> "Halaman yatim", # pages",
-	"Unusedimages"	=> "Imej yatim", #"Orphaned images",
-	"Popularpages"	=> "Halaman popular", #"Popular pages",
-	"Wantedpages"	=> "Halaman yang paling dikehendaki", #"Most wanted pages",
-	"Shortpages"	=> "Halaman pendek", #"Short pages",
-	"Longpages"		=> "Halaman panjang", #"Long pages",
-	"Newpages"		=> "Halaman yang baru dicipta", #"Newly created pages",
-	"Ancientpages"	=> "Rencana tertua", #Oldest articles
-	"Intl"		=> "Pautan antarabahasa", #Interlanguage links
-	"Allpages"		=> "Semua halaman mengikut tajuk", #"All pages by title",
-
-	"Ipblocklist"	=> "IP dan pengguna yang diblok", #"Blocked IPs and users",
-	"Maintenance" => "Halaman penyelenggaraan", #"Maintenance page",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "Sumber buku luaran", #"External book sources"
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesMs = array(
-	"Blockip"		=> "Sekat IP dan pengguna", #"Block IP or user",
-	"Asksql"		=> "Kueri terhadap pangkalan data", #"Query the database",
-	"Undelete"		=> "Papar dan masukkan semula halaman yang telah dibuang", #"View and restore deleted pages",
-);
-
-/* private */ $wgDeveloperSpecialPagesEn = array(
-	"Lockdb"		=> "Membuat pangkalan data hanya untuk dibaca", #"Make database read-only",
-	"Unlockdb"		=> "Memperbaharui cara kemasukan pangkalan data", #"Restore database write access",
-);
-
 /* private */ $wgAllMessagesMs = array(
 
 # User Toggles
@@ -179,7 +100,6 @@
 "aboutpage"		=> "Wikipedia:Perihal", #"Wikipedia:About",
 "help"			=> "Bantuan",
 "helppage"		=> "Wikipedia:Bantuan",
-"wikititlesuffix"       => "Wikipedia",
 "bugreports"	        => "Laporan Pepijat",
 "bugreportspage"        => "Wikipedia:Laporan Pepijat",
 "faq"			=> "FAQ",
@@ -221,7 +141,6 @@
 "redirectedfrom"        => "(Dialih dari $1)", #"(Redirected from $1)",
 "lastmodified"	        => "Halaman ini diubah kali terakhir pada $1.", #"The page was last modified $1.",
 "viewcount"		=> "Halaman ini telah diakses sebanyak $1 kali.", #"This page has been accessed $1 times.",
-"gnunote"		=> "Halaman ini tertakluk di bawah istilah <a class=internal href='$wgScriptPath/GNU_FDL'>GNU Free Documentation License</a>.", #"This page is released under the terms of the $1.",
 "printsubtitle"         => "(From {{SERVER}})",
 "protectedpage"         => "Halaman yang dilindungi", #"Protected page",
 "administrators"        => "Istimewa:Listadministrators", #"Special:Listadministrators",
@@ -276,11 +195,6 @@ kemasukan baru.
 Pentadbir yang menutup
 memberikan penjelasan berikut:
 <p>$1",
-"rencana hilang"=>"Pengkalan data tidak menjumpai teks bagi laman yang patut dijumpai, bernama\"$1\".
-
-<p>Ini biasanya disebabkan oleh lewat tarikh diff atau sejarah pautan kepada laman telah dipadamkan.
-
-<p>Jika ini bukan sebabnya, anda mungkin menjumpai pepijat dalam aturcara. Sila lapurkan kepada penyelia, catitkan URL, # If this is not the case, you may have found a bug in the software. Please report this to an administrator, making note of the URL.",
 # "missingarticle" => "The database did not find the text of a page that it should have found, named \"$1\".
 # This is usually caused by following an outdated diff or history link to a page that has been deleted.
 "internalerror" => "Ralat dalaman", # Internal error",
@@ -313,12 +227,7 @@ Sila kemaskini konfigurasi butir-butir diri anda.", #"<h2>Welcome, $1!</h2><p>Yo
 "newusersonly"	 => "(Hanya pengguna baru)", # (new users only)",
 "remembermypassword" => "Sentiasa ingatan kata laluan.", # Remember my password across sessions.",
 "loginproblem"	=> "<b>Terdapat masalah dengan data kemasukan.</b><br />Cuba semula!", # There has been a problem with your login.</b><br />Try again!",
-"alreadyloggedin" => "<font color=red><b>Pengguna $1, anda telah berjaya masuk!</b></font><br />\n",
-
-"areyounew"		=>"Sekiranya anda baru dalam Wikipedia dan ingin mendapatkan akaun pengguna,
-masukan nama pengguna, kemudia taip kata laluan dan ulang semula kata laluan.
-Alamat email anda adalah tidak diwajibkan;sekiranya kehilangan kata laluan
-boleh diminta melalui email yg diberikan.<br />\n",
+"alreadyloggedin" => "<strong>Pengguna $1, anda telah berjaya masuk!</strong><br />\n",
 
 "login"			=> "Masuk", #Log in
 "userlogin"		=> "Laluan masuk", #Log in
@@ -401,7 +310,7 @@ Jika anda tidak mahu tulisan anda disunting dan/atau disebarkan ke halaman
 web percuma yang lain, jangan hantarnya ke sini.
 Anda juga perlu akui bahawa ini adalah hasil tulisan anda sendiri, atau anda
 menyalinnya daripada domain awam atau mana-mana sumber percuma yang sama.
-<p><strong><font color=\"red\">JANGAN HANTAR SEBARANG KARYA HAK CIPTA ORANG LAIN TANPA KEBENARAN.</font></strong></p> <p><strong><font color=\"red\">JANGAN SALIN DARIPADA HALAMAN WEB YANG LAIN.</font></strong></p> ",
+<p><strong>JANGAN HANTAR SEBARANG KARYA HAK CIPTA ORANG LAIN TANPA KEBENARAN.</strong></p> <p><strong>JANGAN SALIN DARIPADA HALAMAN WEB YANG LAIN.</strong></p> ",
 "longpagewarning" => "<strong>WARNING: This page is $1 kilobytes long; some
 browsers may have problems editing pages approaching or longer than 32kb.
 Please consider breaking the page into smaller sections.</strong>",
@@ -570,13 +479,9 @@ Semua waktu yang ditunjukkan adalah waktu pelayan (UTC).
 ",
 "filename"		=> "Filename",
 "filedesc"		=> "Ringkasan", #"Summary",
-"affirmation"	=> "Saya berikrar bahawa pemilik hak cipta fail ini
-telah bersetuju untuk melesenkannya di bawah terma $1.", #"I affirm that the copyright holder of this file agrees to license it under the terms of the $1.",
 "copyrightpage" => "Wikipedia:Hak cipta",
 "copyrightpagename" => "Hak cipta Wikipedia",
 "uploadedfiles"	=> "Fail yang telah dimuatnaik", #"Uploaded files",
-"noaffirmation" => "Anda mesti berikrar bahawa fail yang dimuatnaik tidak
-tertakluk di bawah sebarang hak cipta.", #"You must affirm that your upload does not violate any copyrights.",
 "ignorewarning"	=> "Abaikan amaran dan simpan fail sahaja", #"Ignore warning and save file anyway.",
 "minlength"		=> "Nama imej mesti sekurang-kurangnya tiga huruf.", #"Image names must be at least three letters.",
 "badfilename"	=> "Nama imej telah ditukar kepada \"$1\".", #"Image name has been changed to \"$1\".",
@@ -830,7 +735,6 @@ halaman tertentu yang telah dirosakkan).",
 "ipbreason"		=> "Alasan", #"Reason",
 "ipbsubmit"		=> "Hantar", #"Submit",
 "badipaddress"	=> "Alamat IP atau pengguna ini dalam format yang tidak betul.", #"The IP address or username is badly formed.",
-"noblockreason" => "Anda mesti sediakan alasan untuk pemblokan tersebut.", #"You must supply a reason for the block.",
 "blockipsuccesssub" => "Pemblokan berjaya", #"Block succeeded",
 "blockipsuccesstext" => "Alamat IP atau pengguna \"$1\" telah diblok.
 <br />Lihat [[Istimewa:Ipblocklist|IP and user block list]] untuk semak pemblokan.", #"The IP address or username \"$1\" has been blocked.
@@ -869,21 +773,6 @@ kemaskini terhadap pangkalan data.  Sila pastikan anda mahu berbuat demikian.",
 <br />Pastikan anda membukanya semula dari dikunci setelah penyelenggaraan selesai.",
 "unlockdbsuccesstext" => "Pangkalan data Wikipedia telah dibuka semula dari dikunci.", #"The Wikipedia database has been unlocked.",
 
-# SQL query
-#
-"asksql"		=> "Kueri SQL", #"SQL query",
-"asksqltext"	=> "Gunakan borang di bawah untuk membuat kueri langsung
-bagi pangkalan data Wikipedia.
-Gunakan pembuka kata tunggal ('seperti ini') untuk menghadkan rangkaian
-string.  Ini selalunya menambah beban terhadap pelayan, jadi sila gunakan
-fungsi ini dengan cermat.",
-"sqlislogged"	=> "Harap maklum semua pertanyaan dilogkan.",
-"sqlquery"		=> "Masukkan kueri", #"Enter query",
-"querybtn"		=> "Hantar kueri", #"Submit query",
-"selectonly"	=> "Kueri selain dari \"SELECT\" adalah tidak dibenarkan
-kepada pembangun Wikipedia.", #"Queries other than \"SELECT\" are restricted to
-"querysuccessful" => "Kueri berjaya", #"Query successful",
-
 # Move page
 #
 "movepage"	=> "Alih Halaman",  #"Move page",
@@ -943,11 +832,6 @@ require_once( "LanguageUtf8.php" );
 
 class LanguageMs extends LanguageUtf8 {
 
-	function getBookstoreList () {
-		global $wgBookstoreListMs;
-		return $wgBookstoreListMs;
-	}
-
 	function getNamespaces() {
 		global $wgNamespaceNamesMs;
 		return $wgNamespaceNamesMs;
@@ -958,36 +842,12 @@ class LanguageMs extends LanguageUtf8 {
 		return $wgQuickbarSettingsMs;
 	}
 
-	function getSkinNames() {
-		global $wgSkinNamesMs;
-		return $wgSkinNamesMs;
-	}
-
 	function getDateFormats() {
 		global $wgDateFormatsMs;
 		return $wgDateFormatsMs;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesMs;
-		return $wgValidSpecialPagesMs;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesMs;
-		return $wgSysopSpecialPagesMs;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesMs;
-		return $wgDeveloperSpecialPagesMs;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesMs;
 		if( isset( $wgAllMessagesMs[$key] ) ) {
 			return $wgAllMessagesMs[$key];
diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php
index 5a7c14dce9de..e7a4b07e651d 100644
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -15,31 +15,31 @@ require_once( 'LanguageUtf8.php' );
 # See Language.php for notes.
 
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
+	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
 /* private */ $wgNamespaceNamesNds = array(
-        NS_MEDIA            => 'Media',
-        NS_SPECIAL          => 'Spezial',
-        NS_MAIN             => '',
-        NS_TALK             => 'Diskuschoon',
-        NS_USER             => 'Bruker',
-        NS_USER_TALK        => 'Bruker_Diskuschoon',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => $wgMetaNamespace . '_Diskuschoon',
-        NS_IMAGE            => 'Bild',
-        NS_IMAGE_TALK       => 'Bild_Diskuschoon',
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskuschoon',
-        NS_TEMPLATE         => 'Vörlaag',
-        NS_TEMPLATE_TALK    => 'Vörlaag_Diskuschoon',
-        NS_HELP             => 'Hülp',
-        NS_HELP_TALK        => 'Hülp_Diskuschoon',
-        NS_CATEGORY         => 'Kategorie',
-        NS_CATEGORY_TALK    => 'Kategorie_Diskuschoon'
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Spezial',
+	NS_MAIN             => '',
+	NS_TALK             => 'Diskuschoon',
+	NS_USER             => 'Bruker',
+	NS_USER_TALK        => 'Bruker_Diskuschoon',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaNamespace . '_Diskuschoon',
+	NS_IMAGE            => 'Bild',
+	NS_IMAGE_TALK       => 'Bild_Diskuschoon',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskuschoon',
+	NS_TEMPLATE         => 'Vörlaag',
+	NS_TEMPLATE_TALK    => 'Vörlaag_Diskuschoon',
+	NS_HELP             => 'Hülp',
+	NS_HELP_TALK        => 'Hülp_Diskuschoon',
+	NS_CATEGORY         => 'Kategorie',
+	NS_CATEGORY_TALK    => 'Kategorie_Diskuschoon'
 );
 
 /* private */ $wgQuickbarSettingsNds = array(
-        'Keen', 'Links, fast', 'Rechts, fast', 'Links, sweven'
+	'Keen', 'Links, fast', 'Rechts, fast', 'Links, sweven'
 );
 
 # Note to translators:
@@ -48,110 +48,59 @@ if($wgMetaNamespace === FALSE)
 #
 /* private */ $wgMagicWordsNds = array(
 #   ID                                 CASE  SYNONYMS
-        MAG_REDIRECT             => array( 0,    '#redirect',                   '#wiederleiden'          ),
-        MAG_NOTOC                => array( 0,    '__NOTOC__',                   '__KEENINHOLTVERTEKEN__' ),
-        MAG_FORCETOC             => array( 0,    '__FORCETOC__',                '__WIESINHOLTVERTEKEN__' ),
-        MAG_TOC                  => array( 0,    '__TOC__',                     '__INHOLTVERTEKEN__'     ),
-        MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__',           '__KEENÄNNERNLINK__'     ),
-        MAG_START                => array( 0,    '__START__'                                             ),
-        MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH',                'AKTMAAND'               ),
-        MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME',            'AKTMAANDNAAM'           ),
-        MAG_CURRENTDAY           => array( 1,    'CURRENTDAY',                  'AKTDAG'                 ),
-        MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME',              'AKTDAGNAAM'             ),
-        MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR',                 'AKTJOHR'                ),
-        MAG_CURRENTTIME          => array( 1,    'CURRENTTIME',                 'AKTTIED'                ),
-        MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES',            'ARTIKELTALL'            ),
-        MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN',         'AKTMAANDNAAMGEN'        ),
-        MAG_PAGENAME             => array( 1,    'PAGENAME',                    'SIETNAAM'               ),
-        MAG_PAGENAMEE            => array( 1,    'PAGENAMEE',                   'SIETNAAME'              ),
-        MAG_NAMESPACE            => array( 1,    'NAMESPACE',                   'NAAMRUUM'               ),
-        MAG_SUBST                => array( 0,    'SUBST:'                                                ),
-        MAG_MSGNW                => array( 0,    'MSGNW:'                                                ),
-        MAG_END                  => array( 0,    '__END__',                     '__ENN__'                ),
-        MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb',          'duum'                   ),
-        MAG_IMG_RIGHT            => array( 1,    'right',                       'rechts'                 ),
-        MAG_IMG_LEFT             => array( 1,    'left',                        'links'                  ),
-        MAG_IMG_NONE             => array( 1,    'none',                        'keen'                   ),
-        MAG_IMG_WIDTH            => array( 1,    '$1px',                        '$1px'                   ),
-        MAG_IMG_CENTER           => array( 1,    'center', 'centre',            'merrn'                  ),
-        MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame', 'rahmt'                  ),
-        MAG_INT                  => array( 0,    'INT:'                                                  ),
-        MAG_SITENAME             => array( 1,    'SITENAME',                    'STEEDNAAM'              ),
-        MAG_NS                   => array( 0,    'NS:',                         'NR:'                    ),
-        MAG_LOCALURL             => array( 0,    'LOCALURL:',                   'STEEDURL:'              ),
-        MAG_LOCALURLE            => array( 0,    'LOCALURLE:',                  'STEEDURLE:'             ),
-        MAG_SERVER               => array( 0,    'SERVER',                      'SERVER'                 ),
-        MAG_GRAMMAR              => array( 0,    'GRAMMAR:',                    'GRAMMATIK:'             )
+	MAG_REDIRECT             => array( 0,    '#redirect',                   '#wiederleiden'          ),
+	MAG_NOTOC                => array( 0,    '__NOTOC__',                   '__KEENINHOLTVERTEKEN__' ),
+	MAG_FORCETOC             => array( 0,    '__FORCETOC__',                '__WIESINHOLTVERTEKEN__' ),
+	MAG_TOC                  => array( 0,    '__TOC__',                     '__INHOLTVERTEKEN__'     ),
+	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__',           '__KEENÄNNERNLINK__'     ),
+	MAG_START                => array( 0,    '__START__'                                             ),
+	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH',                'AKTMAAND'               ),
+	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME',            'AKTMAANDNAAM'           ),
+	MAG_CURRENTDAY           => array( 1,    'CURRENTDAY',                  'AKTDAG'                 ),
+	MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME',              'AKTDAGNAAM'             ),
+	MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR',                 'AKTJOHR'                ),
+	MAG_CURRENTTIME          => array( 1,    'CURRENTTIME',                 'AKTTIED'                ),
+	MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES',            'ARTIKELTALL'            ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN',         'AKTMAANDNAAMGEN'        ),
+	MAG_PAGENAME             => array( 1,    'PAGENAME',                    'SIETNAAM'               ),
+	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE',                   'SIETNAAME'              ),
+	MAG_NAMESPACE            => array( 1,    'NAMESPACE',                   'NAAMRUUM'               ),
+	MAG_SUBST                => array( 0,    'SUBST:'                                                ),
+	MAG_MSGNW                => array( 0,    'MSGNW:'                                                ),
+	MAG_END                  => array( 0,    '__END__',                     '__ENN__'                ),
+	MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb',          'duum'                   ),
+	MAG_IMG_RIGHT            => array( 1,    'right',                       'rechts'                 ),
+	MAG_IMG_LEFT             => array( 1,    'left',                        'links'                  ),
+	MAG_IMG_NONE             => array( 1,    'none',                        'keen'                   ),
+	MAG_IMG_WIDTH            => array( 1,    '$1px',                        '$1px'                   ),
+	MAG_IMG_CENTER           => array( 1,    'center', 'centre',            'merrn'                  ),
+	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame', 'rahmt'                  ),
+	MAG_INT                  => array( 0,    'INT:'                                                  ),
+	MAG_SITENAME             => array( 1,    'SITENAME',                    'STEEDNAAM'              ),
+	MAG_NS                   => array( 0,    'NS:',                         'NR:'                    ),
+	MAG_LOCALURL             => array( 0,    'LOCALURL:',                   'STEEDURL:'              ),
+	MAG_LOCALURLE            => array( 0,    'LOCALURLE:',                  'STEEDURLE:'             ),
+	MAG_SERVER               => array( 0,    'SERVER',                      'SERVER'                 ),
+	MAG_GRAMMAR              => array( 0,    'GRAMMAR:',                    'GRAMMATIK:'             )
 );
 
 /* private */ $wgSkinNamesNds = array(
-        'standard'      => 'Klassik',
-        'nostalgia'     => 'Nostalgie',
-        'cologneblue'   => 'Kölsch Blau',
-        'smarty'        => 'Paddington',
-        'montparnasse'  => 'Montparnasse',
-        'davinci'       => 'DaVinci',
-        'mono'          => 'Mono',
-        'monobook'      => 'MonoBook',
-        'myskin'        => 'MySkin',
-        'chick'         => 'Küken'
-);
+	'standard'      => 'Klassik',
+	'nostalgia'     => 'Nostalgie',
+	'cologneblue'   => 'Kölsch Blau',
+	'smarty'        => 'Paddington',
+	'chick'         => 'Küken'
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgBookstoreListNds = array(
-        'Verteken vun leverbore Böker' => 'http://www.buchhandel.de/sixcms/list.php?page=buchhandel_profisuche_frameset&suchfeld=isbn&suchwert=$1=0&y=0',
-        'abebooks.de'                   => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1',
-        'Amazon.de'                     => 'http://www.amazon.de/exec/obidos/ISBN=$1',
-        'Lehmanns Fachbuchhandlung'     => 'http://www.lob.de/cgi-bin/work/suche?flag=new&stich1=$1',
+	'Verteken vun leverbore Böker' => 'http://www.buchhandel.de/sixcms/list.php?page=buchhandel_profisuche_frameset&suchfeld=isbn&suchwert=$1=0&y=0',
+	'abebooks.de'                   => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1',
+	'Amazon.de'                     => 'http://www.amazon.de/exec/obidos/ISBN=$1',
+	'Lehmanns Fachbuchhandlung'     => 'http://www.lob.de/cgi-bin/work/suche?flag=new&stich1=$1',
 );
 
 
-/* private */ $wgValidSpecialPagesNds = array(
-  'Userlogin'           => '',
-  'Userlogout'          => '',
-  'Preferences'         => 'Mien Brukerinstellen',
-  'Watchlist'           => 'Mien Oppasslist',
-  'Recentchanges'       => 'Letzte Ännern',
-  'Upload'              => 'Datei hoochladen',
-  'Imagelist'           => 'Hoochladene Datein',
-  'Listusers'           => 'Registreerte Bruker',
-  'Statistics'          => 'Sietenstatistik',
-  'Randompage'          => 'Tofällige Siet',
-
-  'Lonelypages'         => 'Weetsieten',
-  'Unusedimages'        => 'Weetdatein',
-  'Popularpages'        => 'Veel opropene Sieten',
-  'Wantedpages'         => 'Wünschte Sieten',
-  'Shortpages'          => 'Kotte Sieten',
-  'Longpages'           => 'Lange Sieten',
-  'Newpages'            => 'Niege Sieten',
-  'Ancientpages'        => 'Ole Sieten',
-  'Allpages'            => 'Alle Sieten',
-
-  'Ipblocklist'         => 'Blockte IP-Adressen',
-  'Maintenance'         => 'Pleegsieten',
-  'Specialpages'        => 'Spezialsieten',
-  'Contributions'       => 'Brukerbidreeg',
-  'Movepage'            => 'Siet schuven',
-  'Emailuser'           => 'dissen Bruker en E-Mail schrieven',
-  'Whatlinkshere'       => 'Wat wiest hierher',
-  'Recentchangeslinked' => 'Ännern vun verlinkte Sieten',
-  'Booksources'         => 'Externe Bookhöker',
-  'Categories'          => 'Kategorien',
-  'Export'              => 'XML-Sietenexport',
-  'Version'              => 'Historie',
-);
-
-/* private */ $wgSysopSpecialPagesNds = array(
-        'Blockip'              => 'Block en IP-Adress',
-        'Asksql'               => 'Datenbank-Affraag',
-        'Undelete'             => 'Löschte Sieten weerholen'
-);
-
-/* private */ $wgDeveloperSpecialPagesNds = array(
-        'Lockdb'               => 'Datenbank sparren',
-        'Unlockdb'             => 'Datenbank freegeven',
-);
 
 /* private */ $wgAllMessagesNds = array(
 # Schalter för de Brukers
@@ -226,15 +175,14 @@ un dat [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 'article'               => 'Artikel',
 'help'                          => 'Hülp',
 'helppage'                      => '{{ns:4}}:Hülp',
-'wikititlesuffix'       => '{{SITENAME}}',
 'bugreports'               => 'Kontakt',
 'bugreportspage'        => '{{ns:4}}:Kontakt',
 'sitesupport'           => 'Gaven',
 'faq'                                   => 'Faken stellte Fragen',
-'faqpage'                       => '{{SITENAME}}:Faken stellte Fragen',
+'faqpage'                       => '{{ns:project}}:Faken stellte Fragen',
 'newwindow'                     => '(apent sik in en nieg Finster)',
 'edithelp'                          => 'Bearbeidenshülp',
-'edithelppage'           => '{{SITENAME}}:Editeerhülp',
+'edithelppage'           => '{{ns:project}}:Editeerhülp',
 'cancel'                              => 'Afbreken',
 'qbfind'                              => 'Finnen',
 'qbbrowse'                          => 'Blädern',
@@ -290,15 +238,12 @@ un dat [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Brukerhandbook]
 'copyright'             => 'De Inholt is verfögbor ünner de $1.',
 'poweredby'                 => '{{SITENAME}} bruukt [http://www.mediawiki.org/ MediaWiki], en Wiki-Software mit apen Borntext.',
 'printsubtitle'         => '(Vun {{SERVER}})',
-'gnunote'               => 'Disse Siet is ünner de <a class=\'internal\' href=\'$wgScriptPath/GNU_FDL\'>GNU FDL</a> verfögbor.',
 'protectedpage'         => 'Schulte Sieten',
 'administrators'        => '{{ns:4}}:Administratern',
 'sysoptitle'               => 'Sysop-Togang notwennig',
 'sysoptext'                     => 'Dissen Vörgang kann ut Sekerheitsgrünnen blots vun Brukern mit „Sysop“-Rechten dörföhrt warrn. Kiek ok $1.',
 'developertitle'        => 'Entwickler-Togang notwennig',
 'developertext'         => 'Dissen Vörgang kann ut Sekerheitsgrünnen blots vun Brukern mit „Entwickler“-Rechten dörföhrt warrn. Kiek ok $1.',
-'bureaucrattitle'       => 'Bürokraten-Rechten notwennig',
-'bureaucrattext'               => 'Dissen Vörgang kann blots vun Brukern mit „Bürokrat“-Rechten dörföhrt warrn.',
 'nbytes'                              => '$1 Bytes',
 'go'                                     => 'Los',
 'ok'                                    => 'OK',
@@ -401,7 +346,6 @@ Query: $2
 'protectedtext'         => 'Disse Siet is för dat Bearbeiden sparrt. Dorför kann dat verschedene Grünn geven; kiek [[{{ns:4}}:Schulte Sieten]].
 
 Du kannst den Borntext vun disse Siet ankieken un kopeern:',
-'seriousxhtmlerrors'    => 'Tidy hett swore Fehler in\'n XHTML-Markup funnen.',
 
 
 # Login- un Logoutsieten
@@ -419,7 +363,7 @@ Vergeet nich, dien [[Special:Preferences|Instellen]] antopassen.',
 'newusersonly'          => ' (blots för niege Liddmaten)',
 'remembermypassword'    => 'Duersam inloggen',
 'loginproblem'           => '<b>Dor weer en Problem mit dien Anmellen.</b><br />Versöök dat noch eenmal!',
-'alreadyloggedin'       => '<font color=\'red\'><b>Bruker $1, du büst al anmellt!</b></font><br />',
+'alreadyloggedin'       => '<strong>Bruker $1, du büst al anmellt!</strong><br />',
 
 'login'                         => 'Anmellen',
 'loginprompt'           => 'Üm sik bi {{SITENAME}} antomellen, musst du Cookies aktiveert hebben.',
@@ -438,9 +382,9 @@ Vergeet nich, dien [[Special:Preferences|Instellen]] antopassen.',
 'yourvariant'           => 'Dien Spraak',
 'emailforlost'          => 'Wenn du dien Password vergeten hest, kann en nieg Password an dien E-Mail-Adress send warrn.',
 // FIXME: following should be split to 'prefs-help-realname' & 'prefs-help-email'
-'prefs-help-userdata'   => '* <strong>E-Mail</strong> (kene Plicht): Wenn du en E-Mailadress angiffst, könen annere di E-Mails sennen,
-ahn dat diene Adress no buten künnig warrt. Wenn du dien ol Password vergeten hest,
-kannst du ok blots denn en nieg Passwort kriegen, wenn du en E-Mailadress angeven hest.',
+#'prefs-help-userdata'   => '* <strong>E-Mail</strong> (kene Plicht): Wenn du en E-Mailadress angiffst, könen annere di E-Mails sennen,
+#ahn dat diene Adress no buten künnig warrt. Wenn du dien ol Password vergeten hest,
+#kannst du ok blots denn en nieg Passwort kriegen, wenn du en E-Mailadress angeven hest.',
 'loginerror'               => 'Fehler bi dat Anmellen',
 'noname'                              => 'Du muttst en Brukernaam angeven.',
 'loginsuccesstitle'     => 'Anmellen hett Spood',
@@ -490,8 +434,7 @@ dat disse Kommentaren nich an di richt sünd, denn [[Special:Userlogin|mell di d
 'noarticletext'          => '(Disse Siet hett in\'n Momang kenen Text)',
 'usercsspreview'         => "'''Denk doran, dat du blots en Vörschau vun dien CSS ankiekst, dat is noch nich spiekert!'''",
 'userjspreview'          => "'''Denk doran, dat du blots en Vörschau vun dien JS ankiekst, dat is noch nich spiekert!'''",
-'clearyourcache'         => "'''Denk doran:''' No den Spiekern muttst du dien Browser noch seggen, de niege Version to laden:
-'''Mozilla:''' Klick op ''Neu laden''(oder ''Strg-R''), '''IE / Opera:''' ''Strg-F5'', '''Safari:''' ''Cmd-r'', '''Konqueror''' ''Strg-R''.',
+'clearyourcache'         => "'''Denk doran:''' No den Spiekern muttst du dien Browser noch seggen, de niege Version to laden: '''Mozilla/Firefox:''' ''Strg-Shift-R'', '''IE:''' ''Strg-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'usercssjsyoucanpreview' => '<strong>Tipp:</strong> Bruuk den Vörschau-Knoop, üm dien nieg CSS/JS vör dat Spiekern to testen.',
 'updated'                       => '(Ännert)',
 'note'                          => '<strong>Henwies:</strong> ',
@@ -514,7 +457,7 @@ Föög diene Ännern in dat Textfeld baven in.
 Wenn du spiekerst, warrn alle niegeren Versionen överschrieven.</strong>',
 'yourdiff'                      => 'Ünnerscheed',
 'copyrightwarning'       => "
-<b><font size='+1'>Kopeer kene Websieten</font>, de nich dien egen sünd un bruuk <font size='+1'>kene Warken, de enen Oorheverrecht ünnerliggt,</font>
+<b><big>Kopeer kene Websieten</big>, de nich dien egen sünd un bruuk <big>kene Warken, de enen Oorheverrecht ünnerliggt,</big>
 ahn Verlööv vun de Copyright-Inhebbers!</b>
 <p>Du giffst hiermit dien Tosaag, dat du dien Text <strong>sülvst verfaat</strong> hest, dat de Text Gemeengood
 (<strong>„Public Domain“</strong>) is, oder dat de <strong>Copyright-Inhebber</strong> sien <strong>Tostimmen</strong> geven hett.
@@ -612,7 +555,6 @@ de aver nich jümmer den aktuellsten Stand weerspegelt.<p>',
 Dien interne ID-Nummer is $2.',
 'prefsreset'            => 'Instellen sünd op Standard trüchsett.',
 'qbsettings'         => 'Sietenliest',
-'qbsettingsnote'            => 'Disse Instellen funktschoneert blots mit den Skins „Standard“ un „CologneBlue“.',
 'changepassword'     => 'Password ännern',
 'skin'                          => 'Utsehn vun de Steed',
 'math'                          => 'TeX',
@@ -703,16 +645,13 @@ Alle Tieden sünd UTC.
 <ul>
 
 </ul>",
-'uploadlogtext'     => 'Hoochladene un löschte Datein warrn in $1 utwiest.',
 'filename'                      => 'Dateinaam',
 'filedesc'                      => 'Beschrieven',
 'filestatus'        => 'Copyright-Status',
 'filesource'        => 'Born',
-'affirmation'           => 'Hiermit bestätige ik, dat ik de Inhebber vun dat Copyright vun disse Datei bün, un de Datei ünner $1 apentlich maak, oder dat de Datei Gemeengood („Public Domain“) is.',
 'copyrightpage'     => '{{ns:4}}:Copyright',
 'copyrightpagename' => '{{SITENAME}} Copyright',
 'uploadedfiles'         => 'Hoochladene Datein',
-'noaffirmation'     => 'Du muttst bestätigen, dat dat Hoochladen vun de Datei kenen Copyright-Brook is.',
 'ignorewarning'         => 'Warnen ignoreern un Datei liekers spiekern.',
 'minlength'             => 'Bilddatein möten tominnst dree Bookstaven hebben.',
 'badfilename'           => 'De Bildnaam is in „$1“ ännert worrn.',
@@ -822,14 +761,12 @@ In Klammern angevene Wöör geven de korrekte Schrievwies weer.',
 'debug'                                 => 'Fehlerkorregeern',
 'newpages'                              => 'Niege Sieten',
 'ancientpages'            => 'Öllste Sieten',
-'Intl'                    => 'annere Spraken',
 'move'                    => 'Schuven',
 'movethispage'                  => 'Siet schuven',
 'unusedimagestext'        => 'Denk doran, dat annere Wikis mööglicherwies en poor vun disse Biller bruken.',
 'booksources'               => 'Bookhannel',
 'categoriespagetext'      => 'Disse Kategorien existeern in dissen Wiki',
 'data'                     => 'Daten',
-'userlevels'              => 'Brukerrechten-Verwalten',
 'booksourcetext'          => 'Dit is en List mit Links to Internetsieten, de niege un bruukte Böker verkööpt.
 Dor kann dat ok mehr Informatschonen över de Böker geven, de di interesseert.
 {{SITENAME}} is mit kenen vun disse Höker warflich verbunnen.',
@@ -911,7 +848,6 @@ $3... [$4 komplette List wiesen un bearbeiden].)',
 'historywarning'        => 'Wohrscho: De Siet, de du versöökst to löschen, hett en Versionshistorie: ',
 'confirmdeletetext'     => 'Du büst dorbi, en Siet oder en Bild un alle ölleren Versionen duersam ut de Datenbank to löschen.
 Segg to, dat du över de Folgen Bescheed weetst un dat du in Övereenstimmen mit uns [[{{ns:4}}:Leidlienen|Leidlienen]] hannelst.',
-'confirmcheck'            => 'Ja, ik will mit den Löschvörgang wiedermaken.',
 'actioncomplete'        => 'Aktschoon beennt',
 'deletedtext'           => '„$1“ is löscht.
 In $2 kannst du en List vun de letzten Löschen finnen.',
@@ -986,7 +922,6 @@ Ok den Grund för dat Blocken indregen.',
 'ipbreason'                     => 'Grund',
 'ipbsubmit'                        => 'Adress blocken',
 'badipaddress'          => 'De IP-Adress hett en falsch Format.',
-'noblockreason'         => 'Du muttst en Grund för dat Blocken angeven.',
 'blockipsuccesssub'     => 'Blocken hett Spood',
 'blockipsuccesstext'    => 'De IP-Adress „$1“ is nu blockt.
 
@@ -1021,17 +956,6 @@ Schall de Datenbank-Sparr redig beennt warrn?',
 <br />Du muttst de Datenbank weer freegeven, wenn de Pleegarbeiden beennt sünd.',
 'unlockdbsuccesstext'   => 'De {{SITENAME}}-Datenbank is weer freegeven.',
 
-# SQL-Affraag
-#
-'asksql'                              => 'SQL-Affraag',
-'asksqltext'                 => 'Bruuk dat Formular för en direkte Datenbank-Affraag. Bruuk enkelte Hoochkommata (\'so\'), üm Text to begrenzen.
-Disse Funktschoon kann de Datenbank bannig in Anspröök nehmen, dorum vörsichtig bruken.',
-'sqlislogged'           => 'Bedenk dat alle SQL-Affragen mitprotokolleert warrn.',
-'sqlquery'                            => 'Affraag ingeven',
-'querybtn'                          => 'Affraag starten',
-'selectonly'                 => 'Annere Affragen as \'SELECT\' köönt eenzig vun Entwicklern bruukt warrn.',
-'querysuccessful'       => 'Affraag hett Spood',
-
 # Siet schuven
 #
 'movepage'                           => 'Siet schuven',
@@ -1067,89 +991,18 @@ Diskuschoonssiet nich, vun wegen dat dor al en Siet mit dissen Titel existeert.
 'missingimage'          => '<b>Bild fehlt</b><br /><i>$1</i>',
 
 #Tooltips:
-'tooltip-atom'          => 'Atom-Feed vun disse Siet',
-'tooltip-addsection'    => 'En Kommentar to disse Siet hentofögen. [alt-+]',
-'tooltip-article'       => 'Siet ankieken [alt-a]',
-'tooltip-talk'          => 'Disse Siet diskuteern [alt-t]',
-'tooltip-edit'          => 'Du kannst disse Siet bearbeiden. Bitte bruuk de Vörschau, vördem du de Siet spiekerst. [alt-e]',
-'tooltip-viewsource'    => 'Disse Siet is schuult. Du kannst den Borntext ankieken. [alt-e]',
-'tooltip-history'       => 'Öllere Versionen vun disse Siet. [alt-h]',
-'tooltip-protect'       => 'Disse Siet schulen [alt--]',
-'tooltip-delete'        => 'Disse Siet löschen [alt-d]',
-'tooltip-undelete'      => '$1 Versionen vun disse Siet weerholen. [alt-d]',
-'tooltip-move'          => 'Disse Siet schuven. [alt-m]',
 'tooltip-watch'         => 'Op disse Siet oppassen. [alt-w]',
-'tooltip-unwatch'       => 'Op disse Siet nich mehr oppassen. [alt-w]',
-'tooltip-watchlist'     => 'De List vun de Sieten, op de du oppasst. [alt-l]',
-'tooltip-userpage'      => 'Mien Brukersiet [alt-.]',
-'tooltip-anonuserpage'  => 'De Brukersiet vun dien IP-Adress [alt-.]',
-'tooltip-mytalk'        => 'Mien Brukerdiskuschoon [alt-n]',
-'tooltip-anontalk'      => 'Diskuschonen to Bearbeiden, de vun disse IP-Adress mookt warrn. [alt-n]',
-'tooltip-preferences'   => 'Mien Instellen',
-'tooltip-mycontris'     => 'List vun mien Bidreeg [alt-y]',
-'tooltip-login'         => 'Du kannst di geern anmellen, dat is aver nich neudig, üm Sieten to bearbeiden. [alt-o]',
-'tooltip-logout'        => 'De Startknoop [alt-o]',
 'tooltip-search'        => 'Söken [alt-f]',
-'tooltip-mainpage'      => 'To de Hööftsiet [alt-z]',
-'tooltip-portal'        => 'över dat Projekt, wat du doon kannst, woans du de Saken finnen kannst',
-'tooltip-randompage'    => 'Tofällige Siet [alt-x]',
-'tooltip-currentevents' => 'Achtergrünn to aktuellen Schehn finnen',
-'tooltip-sitesupport'   => 'Hülp de {{SITENAME}} mit Gaven',
-'tooltip-help'          => 'Hier kriegst du Hülp.',
-'tooltip-recentchanges' => 'De letzten Ännern in dissen Wiki. [alt-r]',
-'tooltip-recentchangeslinked' => 'De letzten Ännern an Sieten, de vun disse Siet verlinkt sünd. [alt-c]',
-'tooltip-whatlinkshere' => 'List vun alle Sieten, de op disse Siet wiesen [alt-b]',
-'tooltip-specialpages'  => 'List vun alle Spezialsieten [alt-q]',
-'tooltip-upload'        => 'Biller oder annere Medien hoochladen [alt-u]',
-'tooltip-specialpage'   => 'Dit is en Spezialsiet, de nich bearbeid warrn kann.',
 'tooltip-minoredit'     => 'Disse Ännern as lütt markeern. [alt-i]',
 'tooltip-save'          => 'Ännern spiekern [alt-s]',
 'tooltip-preview'       => 'Vörschau vun de Ännern an disse Siet. Bruuk dat vör dat Spiekern. [alt-p]',
-'tooltip-contributions' => 'List vun de Bidreeg vun dissen Bruker.',
-'tooltip-emailuser'     => 'Send en E-Mail an dissen Bruker',
-'tooltip-rss'           => 'RSS-Feed vun disse Siet.',
 'tooltip-compareselectedversions' => 'Ünnerscheed twüschen twee utwählte Versionen vun disse Siet verglieken. [alt-v]',
 
 #Tastatur-Shortcuts
-'accesskey-article'                 => 'a',
-'accesskey-addsection'              => '+',
-'accesskey-talk'                    => 't',
-'accesskey-edit'                    => 'e',
-'accesskey-viewsource'              => 'e',
-'accesskey-history'                 => 'h',
-'accesskey-protect'                 => '-',
-'accesskey-delete'                  => 'd',
-'accesskey-undelete'                => 'd',
-'accesskey-move'                    => 'm',
-'accesskey-watch'                   => 'w',
-'accesskey-unwatch'                 => 'w',
-'accesskey-watchlist'               => 'l',
-'accesskey-userpage'                => '.',
-'accesskey-anonuserpage'            => '.',
-'accesskey-mytalk'                  => 'n',
-'accesskey-anontalk'                => 'n',
-'accesskey-preferences'             => '',
-'accesskey-mycontris'               => 'y',
-'accesskey-login'                   => 'o',
-'accesskey-logout'                  => 'o',
 'accesskey-search'                  => 'f',
-'accesskey-mainpage'                => 'z',
-'accesskey-portal'                  => '',
-'accesskey-randompage'              => 'x',
-'accesskey-currentevents'           => '',
-'accesskey-sitesupport'             => '',
-'accesskey-help'                    => '',
-'accesskey-recentchanges'           => 'r',
-'accesskey-recentchangeslinked'     => 'c',
-'accesskey-whatlinkshere'           => 'b',
-'accesskey-specialpages'            => 'q',
-'accesskey-specialpage'             => '',
-'accesskey-upload'                  => 'u',
 'accesskey-minoredit'               => 'i',
 'accesskey-save'                    => 's',
 'accesskey-preview'                 => 'p',
-'accesskey-contributions'           => '',
-'accesskey-emailuser'               => '',
 'accesskey-compareselectedversions' => 'v',
 
 'makesysoptitle'        => 'Maak en Bruker to en Administrater',
@@ -1325,7 +1178,6 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Kategoriesiet ankieken\');',
 
 'newimages'                             => 'Galeree vun niege Biller',
 
-'sitesettings'                          => 'Sietenwiet Instellen',
 
 # Validatschoon
 'val_clear_old'                         => 'Maak mien annere Validatschoonsdaten för $1 weg.',
@@ -1356,29 +1208,16 @@ sett de annern Optschonen mit dien vörige Instellen.',
 'val_page_validation_statistics'        => 'Sietenvalideer-Statistik för $1',
 
 # Schalttafel
-'userlevels-lookup-group'               => 'Gruppenrechten verwalten',
-'userlevels-group-edit'                 => 'Existeern Gruppen: ',
 'editgroup'                             => 'Grupp bearbeiden',
 'addgroup'                              => 'Grupp hentofögen',
 
-'userlevels-lookup-user'                => 'Brukergruppen verwalten',
-'userlevels-user-editname'              => 'Brukernaam ingeven: ',
 'editusergroup'                         => 'Brukergruppen bearbeiden',
 
 # Gruppen bearbeiden
-'userlevels-editgroup'                  => 'Grupp bearbeiden',
-'userlevels-addgroup'                   => 'Grupp hentofögen',
-'userlevels-editgroup-name'             => 'Gruppennaam: ',
-'userlevels-editgroup-description'      => 'Gruppenbeschrieven (max. 255 Teken):<br />',
 'savegroup'                             => 'Grupp spiekern',
 
 # Brukergruppen bearbeiden
-'userlevels-editusergroup'              => 'Brukergruppen bearbeiden',
 'saveusergroups'                        => 'Brukergruppen spiekern',
-'userlevels-groupsmember'               => 'Liddmaat vun:',
-'userlevels-groupsavailable'            => 'verfögbore Brukergruppen:',
-'userlevels-groupshelp'                 => 'Wähl de Gruppen ut, bi de de Bruker hentofögt oder rutnommen warrn schall.
-Gruppen, de nich wählt warrn, warrn nich ännert. Du kannst de Utwahl vun en Grupp trüchnehmen, wenn du Strg (CTRL) un en Klick mit de linke Muustast maakst.',
 
 # Metadata
 'nodublincore'                          => 'Dublin-Core-RDF-Metadaten sünd för dissen Server nich aktiveert.',
@@ -1424,59 +1263,44 @@ Gruppen, de nich wählt warrn, warrn nich ännert. Du kannst de Utwahl vun en Gr
 
 class LanguageNds extends LanguageUtf8 {
 
-        function getBookstoreList() {
-                global $wgBookstoreListNds;
-                return $wgBookstoreListNds;
-        }
-
-        function getNamespaces() {
-                global $wgNamespaceNamesNds;
-                return $wgNamespaceNamesNds;
-        }
-
-        function getQuickbarSettings() {
-                global $wgQuickbarSettingsNds;
-                return $wgQuickbarSettingsNds;
-        }
-
-        function getSkinNames() {
-                global $wgSkinNamesNds;
-                return $wgSkinNamesNds;
-        }
-
-        function date( $ts, $adj = false ) {
-                if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-
-                $d = (0 + substr( $ts, 6, 2 )) . '. ' .
-                $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-                  ' ' .
-                  substr( $ts, 0, 4 );
-                return $d;
-        }
-
-        function getValidSpecialPages() {
-                global $wgValidSpecialPagesNds;
-                return $wgValidSpecialPagesNds;
-        }
-
-        function getSysopSpecialPages() {
-                global $wgSysopSpecialPagesNds;
-                return $wgSysopSpecialPagesNds;
-        }
-
-        function getDeveloperSpecialPages() {
-                global $wgDeveloperSpecialPagesNds;
-                return $wgDeveloperSpecialPagesNds;
-        }
-
-        function getMessage( $key ) {
-                global $wgAllMessagesNds;
-                if( isset( $wgAllMessagesNds[$key] ) ) {
-                        return $wgAllMessagesNds[$key];
-                } else {
+	function getBookstoreList() {
+		global $wgBookstoreListNds;
+		return $wgBookstoreListNds;
+	}
+
+	function getNamespaces() {
+		global $wgNamespaceNamesNds;
+		return $wgNamespaceNamesNds;
+	}
+
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsNds;
+		return $wgQuickbarSettingsNds;
+	}
+
+	function getSkinNames() {
+		global $wgSkinNamesNds;
+		return $wgSkinNamesNds;
+	}
+
+	function date( $ts, $adj = false ) {
+		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
+
+		$d = (0 + substr( $ts, 6, 2 )) . '. ' .
+		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
+		  ' ' .
+		  substr( $ts, 0, 4 );
+		return $d;
+	}
+
+	function getMessage( $key ) {
+		global $wgAllMessagesNds;
+		if( isset( $wgAllMessagesNds[$key] ) ) {
+			return $wgAllMessagesNds[$key];
+		} else {
 			return parent::getMessage( $key );
-                }
-        }
+		}
+	}
 
 	function formatNum( $number, $year = false ) {
 		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
diff --git a/languages/LanguageNl.php b/languages/LanguageNl.php
index a88c365dcbc0..10116e5fae64 100644
--- a/languages/LanguageNl.php
+++ b/languages/LanguageNl.php
@@ -13,10 +13,6 @@
 
 require_once( "LanguageUtf8.php" );
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-
 /* private */ $wgNamespaceNamesNl = array(
 	NS_MEDIA			=> "Media",
 	NS_SPECIAL			=> "Speciaal",
@@ -47,67 +43,9 @@ require_once( "LanguageUtf8.php" );
 	'standard' => "Standaard",
 	'nostalgia' => "Nostalgie",
 	'cologneblue' => "Keuls blauw",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
-
-
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesNl = array(
- "Userlogin"  => "",
- "Userlogout" => "",
- "Preferences" => "Mijn gebruikersvoorkeuren instellen",
- "Watchlist"  => "Mijn volglijst",
- "Recentchanges" => "Recent bijgewerkte pagina's",
- "Upload"  => "Afbeeldingen uploaden",
- "Imagelist"  => "Lijst ge-uploade afbeeldingen",
- "Listusers"  => "Geregistreerde gebruikers",
- "Statistics" => "Statistieken",
- "Randompage" => "Ga naar een willekeurig artikel",
-
- "Lonelypages" => "Niet-gelinkte artikels",
- "Unusedimages" => "Niet-gelinkte afbeeldingen",
- "Popularpages" => "Populaire artikels",
- "Wantedpages" => "Meest gewenste artikels",
- "Shortpages" => "Korte artikels",
- "Longpages"  => "Lange artikels",
- "Newpages"  => "Nieuwe artikels",
- "Ancientpages" => "Oudste artikels",
-#"Intl" => "Taallinks",
- "Allpages"  => "Alle paginatitels",
-
- "Ipblocklist" => "Geblokkeerde IP-adressen",
- "Maintenance" => "Onderhoudspagina",
- "Specialpages"  => "",
- "Contributions" => "",
- "Emailuser"  => "",
- "Whatlinkshere" => "",
- "Recentchangeslinked" => "",
- "Movepage"  => "",
- "Booksources" => "",
-# "Categories" => "Rubrieken",
- "Export" => "XML export",
- "Version" => "Version",
-);
+) + $wgSkinNamesEn;
 
-/* private */ $wgSysopSpecialPagesNl = array(
- "Blockip"  => "Blokkeer een IP-adres of gebruiker",
- "Asksql"  => "Raadpleeg de database",
- "Undelete" => "Verwijderde pagina's herstellen"
-);
 
-/* private */ $wgDeveloperSpecialPagesNl = array(
- "Lockdb"  => "Maak de database alleen-lezen",
- "Unlockdb"  => "Maak de database overschrijfbaar",
-);
 
 /* private */ $wgAllMessagesNl = array(
 # User Toggles
@@ -177,7 +115,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"  => "{{ns:4}}:info",
 "help"   => "Help",
 "helppage"  => "{{ns:4}}:Help",
-"wikititlesuffix" => "{{SITENAME}} NL",
 "bugreports" => "Foutenrapportage",
 "sitesupport" => "Financieel bijdragen",
 "bugreportspage" => "{{ns:4}}:Foutenrapportage",
@@ -221,7 +158,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(Doorverwezen vanaf $1)",
 "lastmodified" => "De laatste wijziging op deze pagina vond plaats op $1.",
 "viewcount"  => "Deze pagina werd $1 maal bekeken. ",
-"gnunote" => "Alle tekst op deze pagina valt onder de  <a class=internal href='/wiki/Gnu_Vrije_Documentatie_Licentie'>GNU FDL</a>.",
 "printsubtitle" => "(Uit {{SERVER}})",
 "protectedpage" => "Beveiligde pagina",
 "administrators" => "{{ns:4}}:Systeembeheerders",
@@ -279,10 +215,10 @@ De verantwoordelijke systeembeheerder gaf hiervoor volgende reden op:
 "filedeleteerror" => "Kon bestand \"$1\" niet verwijderen.",
 "filenotfound" => "Kon bestand \"$1\" niet vinden.",
 "unexpected" => "Onverwachte waarde: \"$1\"=\"$2\".",
-"formerror"  => "Fout: kon formulier niet verzenden", 
+"formerror"  => "Fout: kon formulier niet verzenden",
 "badarticleerror" => "Deze handeling kan op deze pagina niet worden uitgevoerd.",
 "cannotdelete" => "Kon de pagina of afbeelding niet verwijderen.",
-"badtitle"              => "Ongeldige paginatitel", 
+"badtitle"              => "Ongeldige paginatitel",
 "badtitletext"  => "De opgevraagde pagina is niet beschikbaar of leeg.",
 "perfdisabled" => "Om overbelasting van het systeem te voorkomen, is deze optie momenteel niet bruikbaar.",
 "perfdisabledsub" => "We kunnen u wel onderstaande kopie van $1 tonen; deze is echter mogelijk niet up-to-date.",
@@ -302,7 +238,7 @@ U kunt {{SITENAME}} anoniem blijven gebruiken, of u opnieuw aanmelden onder deze
 "newusersonly" => " (alleen nieuwe gebruikers)",
 "remembermypassword" => "Mijn wachtwoord onthouden voor latere sessies.",
 "loginproblem" => "<b>Er is een probleem met het aanmelden.</b><br />Probeer het opnieuw a.u.b.",
-"alreadyloggedin" => "<font color=red><b>Gebruiker $1, u bent al aangemeld.</b></font><br />\n",
+"alreadyloggedin" => "<strong>Gebruiker $1, u bent al aangemeld.</strong><br />\n",
 
 "login"   => "Aanmelden & Inschrijven",
 "userlogin"  => "Aanmelden",
@@ -412,32 +348,19 @@ Gelieve na ontvangst opnieuw aan te melden.",
 "showingresultsnum" => "Hieronder <b>$3</b> resultaten vanaf nummer <b>$2</b>.",
 "nonefound"  => "<strong>Merk op:</strong> wanneer een zoekopdracht mislukt komt dat vaak door gebruik van veel voorkomende woorden zoals \"de\" en \"het\", die niet geïndexeerd zijn, of door verschillende zoektermen tegelijk op te geven (u krijgt dan alleen in pagina's waaarin alle opgegeven termen voorkomen).
 
-Het kan natuurlijk dat er gewoon nog geen artikel aanwezig op {{SITENAME}} NL over dit onderwerp. Mogelijk is het aanwezig in een andere taal. Zoek met de <a HREF=\"http://pliny.wikipedia.org/tools/wikisearch.php\">multi-wikipedia zoeker</a> in de andere {{SITENAME}}'s, of buiten {{SITENAME}} in een <a href=\"http://encyclopedie.zoekhulp.nl/?refer=Wikipedia.nl\">andere encyclopedie</a>. Wanneer u gevonden heeft wat u zocht, kunt u wellicht daarover een artikel schrijven op {{SITENAME}} NL, zodat de volgende die zoekt wat u zocht het wel kan vinden. 
+Het kan natuurlijk dat er gewoon nog geen artikel aanwezig op {{SITENAME}} NL over dit onderwerp. Mogelijk is het aanwezig in een andere taal. Zoek met de <a HREF=\"http://pliny.wikipedia.org/tools/wikisearch.php\">multi-wikipedia zoeker</a> in de andere {{SITENAME}}'s, of buiten {{SITENAME}} in een <a href=\"http://encyclopedie.zoekhulp.nl/?refer=Wikipedia.nl\">andere encyclopedie</a>. Wanneer u gevonden heeft wat u zocht, kunt u wellicht daarover een artikel schrijven op {{SITENAME}} NL, zodat de volgende die zoekt wat u zocht het wel kan vinden.
 ",
 "powersearch" => "Zoeken",
-"powersearchtext" => "   
+"powersearchtext" => "
  Zoek in naamruimten :<br />
 $1<br />
-$2 Toon redirects &nbsp; Zoek: $3 $9",   
+$2 Toon redirects &nbsp; Zoek: $3 $9",
 "searchdisabled" => "Wegens een overbelasting van de server zijn sommige functies die het systeem extra belasten tijdelijk niet beschikbaar.
  Hierdoor is in de interne zoekfunctie van {{SITENAME}} (vermoedelijk) niet beschikbaar voor onbepaalde duur.<p>
-Via google kunt u zoeken op {{SITENAME}}. <br />
-<form method=\"get\" action=\"http://www.google.com/search\">
-<table bgcolor=\"#ffffff\" style=\"width: 752px; height: 76px;\"><tbody><tr><td>
-<a href=\"http://www.google.com/\">
-<img src=\"http://www.google.com/logos/Logo_40wht.gif\" border=\"0\" alt=\"Google\"></a>
-</td>
-<td>
-<input type=\"text\" name=\"q\" size=\"31\" maxlength=\"255\" value=\"\">
-<input type=\"submit\" name=\"btnG\" value=\"Met Google zoeken in {{SITENAME}}\">
-<font size=\"-1\">
-<input type=\"hidden\" name=\"domains\" value=\"http://nl.wikipedia.org\"><br /><input type=\"radio\" name=\"sitesearch\" value=\"\">Het volledige internet<input type=\"radio\" name=\"sitesearch\" value=\"http://nl.wikipedia.org\" checked=\"checked\">{{SITENAME}} NL<br />
-</font>
-</td></tr></tbody></table>
-</form>
-<p> U zal niet alle artikels kunnen vinden maar het zal niet veel schelen. 
-Als u zoekt via google op {{SITENAME}} zal u ook treffers vinden op {{SITENAME}} die geen artikels zijn. 
-{{SITENAME}} heeft bij de meeste artikels ook een \"overlegpagina\" en diverse soorten dienstpagina's. 
+Via google kunt u zoeken op {{SITENAME}}.
+<p> U zal niet alle artikels kunnen vinden maar het zal niet veel schelen.
+Als u zoekt via google op {{SITENAME}} zal u ook treffers vinden op {{SITENAME}} die geen artikels zijn.
+{{SITENAME}} heeft bij de meeste artikels ook een \"overlegpagina\" en diverse soorten dienstpagina's.
 Enkel de pagina's die geen prefix (zoals {{ns:4}}:, Gebruiker: of Overleg:) hebben zijn artikels.
 ",
 "blanknamespace" => "(encyclopedie)",
@@ -451,7 +374,7 @@ Enkel de pagina's die geen prefix (zoals {{ns:4}}:, Gebruiker: of Overleg:) hebb
 
 Een beschrijving van de verschillende opties staat op [[{{ns:4}}:Voorkeuren]].",
 "prefsreset" => "Standaardvoorkeuren hersteld.",
-"qbsettings" => "Menubalkinstellingen", 
+"qbsettings" => "Menubalkinstellingen",
 "changepassword" => "Wachtwoord wijzigen",
 "skin" => "{{SITENAME}}-Uiterlijk",
 "math" => "Wiskundige formules",
@@ -531,7 +454,7 @@ Uploads en verwijderingen worden bijgehouden in het
 
 Gebruik het onderstaande formulier om bestanden zoals afbeeldingen en geluidsbestanden die relevant zijn voor uw artikel te u-loaden. Bij de meeste browers zoals 'Internet Explorer' en 'Mozilla' zult u een \"Bladeren...\" of \"Browse..\" knop zien die een standaard dialoogscherm van uw bestuuringssysteem oproept. Kiest u een bestand, dan zal het ingevuld worden in het veld naast de \"Bladeren...\" knop. U dient ook het vakje aan te vinken waarmee u bevestigt dat er geen schending van auteursrechten plaatsvindt door het gebruik van dat bestand. Vul het veld \"Omschrijving\" in. Druk op de \"Upload\" knop om het uploaden te voltooien. Dit kan even duren als u een langzame internetverbinding gebruikt.
 
-Gebruik bij voorkeur JPEG voor foto's, PNG voor tekeningen en dergelijke en OGG voor geluid. 
+Gebruik bij voorkeur JPEG voor foto's, PNG voor tekeningen en dergelijke en OGG voor geluid.
 Geef uw bestanden een duidelijk omschrijvende naam om verwarring te voorkomen. Om het bestand in een pagina te laten verschijnen, kunt u het volgende doen;  '''<nowiki>[[afbeelding:uw_foto.jpg]]</nowiki>''' of '''<nowiki>[[afbeelding:uw_logo.png|alt text]]</nowiki>''' of '''<nowiki>[[media:uw_geluid.ogg]]</nowiki>''' voor audio.
 
 Vergeet niet dat net als met andere pagina's op {{SITENAME}} anderen de ge-uploade bestanden kunnen verwijderen indien men denkt dat dat in het voordeel van het project is. Bij misbruik van dit systeem kan u de toegang tot {{SITENAME}} NL ontzegd worden.",
@@ -545,11 +468,9 @@ Vergeet niet dat net als met andere pagina's op {{SITENAME}} anderen de ge-uploa
 "filedesc"  => "Beschrijving",
 "filestatus" => "Auteursrechtensituatie",
 "filesource" => "Auteur/bron",
-"affirmation" => "Ik verklaar dat de eigenaar van de rechten op dit bestand toestemt om het onder de voorwaarden van $1 te verspreiden.",
 "copyrightpage" => "{{ns:4}}:Auteursrechten",
 "copyrightpagename" => "{{SITENAME}} NL auteursrechten",
 "uploadedfiles" => "Ge-uploade bestanden",
-"noaffirmation" => "U dient te bevestigen dat deze handeling geen inbreuk maakt op auteursrechten.",
 "ignorewarning" => "Negeer de waarschuwing en sla het bestand op.",
 "minlength"  => "De naam van het bestand moet uit ten minste drie tekens bestaan.",
 "badfilename" => "De naam van het bestand is gewijzigd in \"$1\".",
@@ -594,7 +515,7 @@ Vergeet niet dat net als met andere pagina's op {{SITENAME}} anderen de ge-uploa
 Er is in totaal $3 maal een pagina bekeken, en $4 maal een pagina bewerkt. Dat geeft een gemiddelde van $5 bewerkingen per pagina, en $6 paginabezoeken per wijziging.",
 "userstatstext" => "Er zijn momenteel $1 geregistreerde gebruikers; hiervan zijn er $2 systeembeheerders (zie $3).",
 
-# Maintenance Page   
+# Maintenance Page
 #
 "maintenance"           => "Onderhoudspagina",
 "maintnancepagetext"    => "Op deze pagina vindt u een aantal handige zoekopdrachten om kleine alledaagse problemen in de {{SITENAME}} te verhelpen. Sommige van deze zoekopdrachten vormen een grote belasting voor de database; ga dus niet na elke paar pagina's die u hersteld heeft, de pagina opnieuw laden.",
@@ -674,7 +595,7 @@ te zijn.",
 "addedwatch" => "Toegevoegd aan volglijst",
 "addedwatchtext" => "De pagina \"$1\" is aan uw <a href=\"" .
   "{{localurle:Speciaal:Watchlist}}\">volglijst</a> toegevoegd.
-Toekomstige wijzigingen aan deze pagina en overlegpagina zullen hier vermeld worden. 
+Toekomstige wijzigingen aan deze pagina en overlegpagina zullen hier vermeld worden.
 Ook zullen deze pagina's in het <b>vet</b> verschijnen in de <a href=\"" .
   "{{localurle:Speciaal:Recentchanges}}\">lijst van recente wijzigingen</a> zodat u ze eenvoudiger kunt opmerken.</p>
 
@@ -769,7 +690,6 @@ op 'Verwijderen' onderaan deze pagina.",
 "ipbreason"  => "Reden",
 "ipbsubmit"  => "Blokkeer deze gebruiker",
 "badipaddress" => "Geen bestaande gebruikersnaam of geldig IP-adres",
-"noblockreason" => "U dient een reden op te geven voor het blokkeren van een gebruiker.",
 "blockipsuccesssub" => "Blokkering gelukt",
 "blockipsuccesstext" => "\"$1\" is geblokkeerd.<br />
 Zie de [[speciaal:Ipblocklist|Lijst van geblokkeerde IP-adressen]].",
@@ -801,16 +721,6 @@ Zie de [[speciaal:Ipblocklist|Lijst van geblokkeerde IP-adressen]].",
 Vergeet niet de database opnieuw te de-blokkeren zodra u klaar bent met uw onderhoud.",
 "unlockdbsuccesstext" => "Blokkering van de database van {{SITENAME}} NL is opgeheven.",
 
-# SQL query
-# SQL raadplegen
-"asksql"  => "SQL raadplegen",
-"asksqltext" => "Gebruik het onderstaande formulier om een direct verzoek naar de database van {{SITENAME}} NL te zenden. Gebruik enkelvoudige aanhalingstekens ('zoals hier') voor letterlijke teksten. Een ingewikkelde aanvraag kan de sever vaak extra belasten. Gelieve deze mogelijkheid daarom spaarzaam te gebruiken. Zie ook: [[{{ns:4}}:SQL opdrachten]].",
-"sqlislogged" => "Alle SQL Queries worden gelogd.",
-"sqlquery"  => "Voer opdracht in",
-"querybtn"  => "Verstuur opdracht",
-"selectonly" => "Opdrachten anders dan \"SELECT\" zijn voorbehouden aan {{SITENAME}} ontwikkelaars.",
-"querysuccessful" => "Opdracht succesvol",
-
 # Move page
 # Verplaats pagina
 "movepage"  => "Verplaats pagina",
@@ -835,60 +745,44 @@ te zijn om een pagina te verplaatsen.",
 "talkpagenotmoved" => "De bijhorende overlegpagina is <strong>niet</strong> verplaatst.",
 
 # Math
-           'mw_math_png' => "Altijd als PNG weergeven",
-           'mw_math_simple' => "HTML voor eenvoudige formules, anders PNG",
-           'mw_math_html' => "HTML indien mogelijk, anders PNG",
-           'mw_math_source' => "Laat de TeX broncode staan (voor tekstbrowsers)",
-           'mw_math_modern' => "Aanbevolen methode voor recente browsers",
-	   'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Altijd als PNG weergeven",
+'mw_math_simple' => "HTML voor eenvoudige formules, anders PNG",
+'mw_math_html' => "HTML indien mogelijk, anders PNG",
+'mw_math_source' => "Laat de TeX broncode staan (voor tekstbrowsers)",
+'mw_math_modern' => "Aanbevolen methode voor recente browsers",
+'mw_math_mathml' => 'MathML',
 );
 
 class LanguageNl extends LanguageUtf8 {
-	
+
 	function getNamespaces() {
 		global $wgNamespaceNamesNl;
 		return $wgNamespaceNamesNl;
 	}
-	
+
 	function getQuickbarSettings() {
 		global $wgQuickbarSettingsNl;
 		return $wgQuickbarSettingsNl;
 	}
-	
+
 	function getSkinNames() {
 		global $wgSkinNamesNl;
 		return $wgSkinNamesNl;
 	}
-	
-		
+
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		$d = (0 + substr( $ts, 6, 2 )) . " " .
-		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . " " . 
+		$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . " " .
 		substr( $ts, 0, 4 );
 		return $d;
 	}
-	
+
 	function timeanddate( $ts, $adj = false ) {
 		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
 	}
-	
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesNl;
-		return $wgValidSpecialPagesNl;
-	}	
-	
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesNl;
-		return $wgSysopSpecialPagesNl;
-	}
-	
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesNl;
-		return $wgDeveloperSpecialPagesNl;
-	}
-	
+
 	function getMessage( $key ) {
 		global $wgAllMessagesNl;
 		if( isset( $wgAllMessagesNl[$key] ) ) {
@@ -897,7 +791,7 @@ class LanguageNl extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	function formatNum( $number, $year = false ) {
 		return $year ? $number : strtr( $this->commafy( $number ), '.,', ',.' );
 	}
diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index 9e0d1e36a400..a08de382de5e 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -47,20 +47,16 @@ if($wgMetaNamespace === FALSE)
 	'standard'        => 'Klassisk',
 	'nostalgia'       => 'Nostalgi',
 	'cologneblue'     => 'Kölnerblå',
-	'davinci'         => 'DaVinci',
-	'mono'            => 'Mono',
-	'monobook'        => 'MonoBook',
-	'myskin'          => 'MiDrakt',
-	'chick'           => 'Chick'
-);
+	'myskin'          => 'MiDrakt'
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsNn = array(
-    'Standard',
-    '15. januar 2001 kl. 16:12',
-    '15. jan. 2001 kl. 16:12',
-    '16:12, 15. januar 2001',
-    '16:12, 15. jan. 2001',
-    'ISO 8601' => '2001-01-15 16:12:34'
+	'Standard',
+	'15. januar 2001 kl. 16:12',
+	'15. jan. 2001 kl. 16:12',
+	'16:12, 15. januar 2001',
+	'16:12, 15. jan. 2001',
+	'ISO 8601' => '2001-01-15 16:12:34'
 );
 
 /* private */ $wgBookstoreListNn = array(
@@ -81,55 +77,52 @@ if($wgMetaNamespace === FALSE)
 #
 /* private */ $wgMagicWordsNn = array(
 #   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    '#redirect', '#omdiriger'                                              ),
-    MAG_NOTOC                => array( 0,    '__NOTOC__', '__INGAINNHALDSLISTE__', '__INGENINNHOLDSLISTE__'         ),
-    MAG_FORCETOC             => array( 0,    '__FORCETOC__', '__ALLTIDINNHALDSLISTE__', '__ALLTIDINNHOLDSLISTE__'   ),
-    MAG_TOC                  => array( 0,    '__TOC__', '__INNHALDSLISTE__', '__INNHOLDSLISTE__'                    ),
-    MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__INGABOLKREDIGERING__', '__INGENDELREDIGERING__'),
-    MAG_START                => array( 0,    '__START__'                                                            ),
-    MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH', 'MÅNADNO', 'MÅNEDNÅ'                                   ),
-    MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME', 'MÅNADNONAMN', 'MÅNEDNÅNAVN'                       ),
-    MAG_CURRENTMONTHABBREV   => array( 1,    'CURRENTMONTHABBREV', 'MÅNADNOKORT', 'MÅNEDNÅKORT'                     ),
-    MAG_CURRENTDAY           => array( 1,    'CURRENTDAY', 'DAGNO', 'DAGNÅ'                                         ),
-    MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME', 'DAGNONAMN', 'DAGNÅNAVN'                             ),
-    MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR', 'ÅRNO', 'ÅRNÅ'                                          ),
-    MAG_CURRENTTIME          => array( 1,    'CURRENTTIME', 'TIDNO', 'TIDNÅ'                                        ),
-    MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES', 'INNHALDSSIDETAL', 'INNHOLDSSIDETALL'              ),
-    MAG_PAGENAME             => array( 1,    'PAGENAME', 'SIDENAMN', 'SIDENAVN'                                     ),
-    MAG_PAGENAMEE            => array( 1,    'PAGENAMEE', 'SIDENAMNE', 'SIDENAVNE'                                  ),
-    MAG_NAMESPACE            => array( 1,    'NAMESPACE', 'NAMNEROM', 'NAVNEROM'                                    ),
-    MAG_SUBST                => array( 0,    'SUBST:', 'LIMINN:'                                                    ),
-    MAG_MSGNW                => array( 0,    'MSGNW:', 'IKWIKMELD:'                                                 ),
-    MAG_END                  => array( 0,    '__END__', '__SLUTT__'                                                 ),
-    MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb', 'mini', 'miniatyr'                               ),
-    MAG_IMG_RIGHT            => array( 1,    'right', 'høgre', 'høyre'                                              ),
-    MAG_IMG_LEFT             => array( 1,    'left', 'venstre'                                                      ),
-    MAG_IMG_NONE             => array( 1,    'none', 'ingen'                                                        ),
-    MAG_IMG_WIDTH            => array( 1,    '$1px', '$1pk'                                                         ),
-    MAG_IMG_CENTER           => array( 1,    'center', 'centre', 'sentrum'                                          ),
-    MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame', 'ramme'                                 ),
-    MAG_INT                  => array( 0,    'INT:'                                                                 ),
-    MAG_SITENAME             => array( 1,    'SITENAME', 'NETTSTADNAMN'                                             ),
-    MAG_NS                   => array( 0,    'NS:', 'NR:'                                                           ),
-    MAG_LOCALURL             => array( 0,    'LOCALURL:', 'LOKALLENKJE:', 'LOKALLENKE:'                             ),
-    MAG_LOCALURLE            => array( 0,    'LOCALURLE:', 'LOKALLENKJEE:', 'LOKALLENKEE:'                          ),
-    MAG_SERVER               => array( 0,    'SERVER', 'TENAR', 'TJENER'                                            ),
-    MAG_SERVERNAME           => array( 0,    'SERVERNAME', 'TENARNAMN', 'TJENERNAVN'                                ),
-    MAG_SCRIPTPATH           => array( 0,    'SCRIPTPATH', 'SKRIPTSTI'                                              ),
-    MAG_GRAMMAR              => array( 0,    'GRAMMAR:', 'GRAMMATIKK:'                                              ),
-    MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__'                                       ),
-    MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__'                                     ),
-    MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK', 'VEKENRNO', 'UKENRNÅ'                                   ),
-    MAG_CURRENTDOW           => array( 1,    'CURRENTDOW', 'VEKEDAGNRNO', 'UKEDAGNRNÅ'                              ),
-    MAG_REVISIONID           => array( 1,    'REVISIONID', 'VERSJONSID'                                             )
+	MAG_REDIRECT             => array( 0,    '#redirect', '#omdiriger'                                              ),
+	MAG_NOTOC                => array( 0,    '__NOTOC__', '__INGAINNHALDSLISTE__', '__INGENINNHOLDSLISTE__'         ),
+	MAG_FORCETOC             => array( 0,    '__FORCETOC__', '__ALLTIDINNHALDSLISTE__', '__ALLTIDINNHOLDSLISTE__'   ),
+	MAG_TOC                  => array( 0,    '__TOC__', '__INNHALDSLISTE__', '__INNHOLDSLISTE__'                    ),
+	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__INGABOLKREDIGERING__', '__INGENDELREDIGERING__'),
+	MAG_START                => array( 0,    '__START__'                                                            ),
+	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH', 'MÅNADNO', 'MÅNEDNÅ'                                   ),
+	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME', 'MÅNADNONAMN', 'MÅNEDNÅNAVN'                       ),
+	MAG_CURRENTMONTHABBREV   => array( 1,    'CURRENTMONTHABBREV', 'MÅNADNOKORT', 'MÅNEDNÅKORT'                     ),
+	MAG_CURRENTDAY           => array( 1,    'CURRENTDAY', 'DAGNO', 'DAGNÅ'                                         ),
+	MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME', 'DAGNONAMN', 'DAGNÅNAVN'                             ),
+	MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR', 'ÅRNO', 'ÅRNÅ'                                          ),
+	MAG_CURRENTTIME          => array( 1,    'CURRENTTIME', 'TIDNO', 'TIDNÅ'                                        ),
+	MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES', 'INNHALDSSIDETAL', 'INNHOLDSSIDETALL'              ),
+	MAG_PAGENAME             => array( 1,    'PAGENAME', 'SIDENAMN', 'SIDENAVN'                                     ),
+	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE', 'SIDENAMNE', 'SIDENAVNE'                                  ),
+	MAG_NAMESPACE            => array( 1,    'NAMESPACE', 'NAMNEROM', 'NAVNEROM'                                    ),
+	MAG_SUBST                => array( 0,    'SUBST:', 'LIMINN:'                                                    ),
+	MAG_MSGNW                => array( 0,    'MSGNW:', 'IKWIKMELD:'                                                 ),
+	MAG_END                  => array( 0,    '__END__', '__SLUTT__'                                                 ),
+	MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb', 'mini', 'miniatyr'                               ),
+	MAG_IMG_RIGHT            => array( 1,    'right', 'høgre', 'høyre'                                              ),
+	MAG_IMG_LEFT             => array( 1,    'left', 'venstre'                                                      ),
+	MAG_IMG_NONE             => array( 1,    'none', 'ingen'                                                        ),
+	MAG_IMG_WIDTH            => array( 1,    '$1px', '$1pk'                                                         ),
+	MAG_IMG_CENTER           => array( 1,    'center', 'centre', 'sentrum'                                          ),
+	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame', 'ramme'                                 ),
+	MAG_INT                  => array( 0,    'INT:'                                                                 ),
+	MAG_SITENAME             => array( 1,    'SITENAME', 'NETTSTADNAMN'                                             ),
+	MAG_NS                   => array( 0,    'NS:', 'NR:'                                                           ),
+	MAG_LOCALURL             => array( 0,    'LOCALURL:', 'LOKALLENKJE:', 'LOKALLENKE:'                             ),
+	MAG_LOCALURLE            => array( 0,    'LOCALURLE:', 'LOKALLENKJEE:', 'LOKALLENKEE:'                          ),
+	MAG_SERVER               => array( 0,    'SERVER', 'TENAR', 'TJENER'                                            ),
+	MAG_SERVERNAME           => array( 0,    'SERVERNAME', 'TENARNAMN', 'TJENERNAVN'                                ),
+	MAG_SCRIPTPATH           => array( 0,    'SCRIPTPATH', 'SKRIPTSTI'                                              ),
+	MAG_GRAMMAR              => array( 0,    'GRAMMAR:', 'GRAMMATIKK:'                                              ),
+	MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__'                                       ),
+	MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__'                                     ),
+	MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK', 'VEKENRNO', 'UKENRNÅ'                                   ),
+	MAG_CURRENTDOW           => array( 1,    'CURRENTDOW', 'VEKEDAGNRNO', 'UKEDAGNRNÅ'                              ),
+	MAG_REVISIONID           => array( 1,    'REVISIONID', 'VERSJONSID'                                             )
 );
 
 #-------------------------------------------------------------------
 # Default messages
 #-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
 
 /* private */ $wgAllMessagesNn = array(
 # User preference toggles
@@ -212,7 +205,6 @@ if($wgMetaNamespace === FALSE)
 'article'                 => 'Innhaldsside',
 'help'			  => 'Hjelp',
 'helppage'		  => 'Help:Innhald',
-'wikititlesuffix'         => '{{SITENAME}}',
 'bugreports'	          => 'Feilmeldingar',
 'bugreportspage'          => 'Project:Feilmeldingar',
 'sitesupport'             => 'Gåver',
@@ -240,7 +232,7 @@ if($wgMetaNamespace === FALSE)
 'metadata'                => '<b>Metadata</b> (for forklaring, sjå <a href="$1">her</a>)',
 'metadata_page'           => 'Project:Metadata',
 
-'currentevents'           => 'Aktuelt', 
+'currentevents'           => 'Aktuelt',
 'currentevents-url'       => 'Aktuelt',
 
 'disclaimers'             => 'Vilkår',
@@ -359,7 +351,7 @@ Sletta oppføringar kan vanlegvis attopprettast.
 'filedeleteerror'         => 'Kunne ikkje slette fila «$1».',
 'filenotfound'	          => 'Kunne ikkje finne fila «$1».',
 'unexpected'	          => 'Uventa verdi: «$1»=«$2».',
-'formerror'		  => 'Feil: Kunne ikkje sende skjema',	
+'formerror'		  => 'Feil: Kunne ikkje sende skjema',
 'badarticleerror'         => 'Handlinga kan ikkje utførast på denne sida.',
 'cannotdelete'	          => 'Kunne ikkje slette fila. (Ho kan vera sletta av andre.)',
 'badtitle'	 	  => 'Feil i tittelen',
@@ -391,7 +383,7 @@ Brukarkontoen din har vorte oppretta. Det er tilrådd at du ser gjennom brukarin
 'yourdomainname'          => 'Domenet ditt',
 'externaldberror'         => 'Det var anten ein ekstern databasefeil i tilgjengekontrollen, eller du har ikkje løyve til å oppdatera den eksterne kontoen din.',
 'loginproblem'	          => '<b>Du vart ikkje innlogga.</b><br />Prøv om att!',
-'alreadyloggedin'         => '<font color=red><b>Brukar $1, du er allereie innlogga!</b></font><br />',
+'alreadyloggedin'         => '<strong>Brukar $1, du er allereie innlogga!</strong><br />',
 'login'			  => 'Logg inn',
 'loginprompt'             => 'Nettlesaren din må godta informasjonskapslar for at du skal kunna logge inn.',
 'userlogin'		  => 'Lag brukarkonto / logg inn',
@@ -499,7 +491,7 @@ IP-adressa di er $3. Legg henne ved eventuelle førespurnader.',
 'anontalkpagetext'        => '---- \'\'Dette er ei diskusjonsside for ein anonym brukar som ikkje har logga inn på eigen brukarkonto. Vi er difor nøydde til å bruke den numeriske IP-adressa knytt til internettoppkoplinga åt brukaren. Same IP-adressa kan vera knytt til fleire brukarar. Om du er ein anonym brukar og meiner at du har fått irrelevante kommentarar på ei slik side, [[{{ns:-1}}:Userlogin|logg inn]] slik at vi unngår framtidige forvekslingar med andre anonyme brukarar.\'\'',
 'noarticletext'           => '\'\'\'Sida «{{PAGENAME}}» finst ikkje på {{SITENAME}} enno.\'\'\'
 * Klikk på \'\'\'[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} endre]\'\'\' for å opprette sida.',
-'clearyourcache'          => '\'\'\'Merk:\'\'\' Etter lagring bør du tømme mellomlageret åt nettlesaren for å sjå endringane. \'\'\'Mozilla og Konqueror:\'\'\' trykk \'\'Ctrl-R\'\', \'\'\'Internet Explorer:\'\'\' \'\'Ctrl-F5\'\', \'\'\'Opera:\'\'\' \'\'F5\'\', \'\'\'Safari:\'\'\' \'\'Cmd-R\'\'.',
+'clearyourcache'          => '\'\'\'Merk:\'\'\' Etter lagring bør du tømme mellomlageret åt nettlesaren for å sjå endringane. \'\'\'Mozilla og Firefox:\'\'\' trykk \'\'Ctrl-Shift-R\'\', \'\'\'Internet Explorer:\'\'\' \'\'Ctrl-F5\'\', \'\'\'Safari:\'\'\' \'\'Cmd-Shift-R\'\', \'\'\'Konqueror:\'\'\' \'\'F5\'\'.',
 'usercssjsyoucanpreview'  => '<strong>Tip:</strong> Bruk «Førehandsvis»-knappen for å teste den nye CSS- eller JS-koden din føre du lagrar.',
 'usercsspreview'          => '\'\'\'Hugs at du berre testar ditt eige CSS, det har ikkje vorte lagra enno!\'\'\'',
 'userjspreview'           => '\'\'\'Hugs at du berre testar ditt eige JavaScript, det har ikkje vorte lagra enno!!\'\'\'',
@@ -525,7 +517,7 @@ Teksten må du ha skrive sjølv, eller kopiert frå ein ressurs som er kompatibe
 Teksten må du ha skrive sjølv eller ha kopiert frå ein ressurs som er kompatibel med vilkåra eller ikkje verna av opphavsrett (sjå $1 for detaljar).
 
 <strong>LEGG ALDRI INN MATERIALE SOM ANDRE HAR OPPHAVSRETT TIL UTAN LØYVE FRÅ DEI!</strong>',
-'longpagewarning'         => '<strong>ÅTVARING: Denne sida er $1 KB lang; nokre nettlesarar kan ha problem med å handsame endringar av sider som nærmar seg eller 
+'longpagewarning'         => '<strong>ÅTVARING: Denne sida er $1 KB lang; nokre nettlesarar kan ha problem med å handsame endringar av sider som nærmar seg eller
 er lengre enn 32KB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><br />',
 'readonlywarning'         => '<strong>ÅTVARING: Databasen er skriveverna på grunn av vedlikehald, difor kan du ikkje lagre endringane dine akkurat no. Det kan vera lurt å  kopiere teksten din åt ei tekstfil, så du kan lagre han her seinare.</strong><br />',
 'protectedpagewarning'    => '<strong>ÅTVARING: Denne sida er verna, slik at berre administratorar kan endre ho.</strong><br />',
@@ -678,7 +670,7 @@ Sjå [[Help:Brukarinnstillingar|Hjelp]] for ei forklaring på dei ulike innstill
 'userrights-logcomment' => 'Endra gruppemedlemskap frå $1 til $2',
 
 # Default group names and descriptions
-# 
+#
 'group-anon-name'       => 'Anonym',
 'group-anon-desc'       => 'Anonyme brukarar',
 'group-loggedin-name'   => 'Brukar',
@@ -743,11 +735,9 @@ For å laste opp ei fil bruker du «Bla gjennom...» eller «Browse...»-knappen
 'filedesc'		=> 'Samandrag',
 'filestatus'            => 'Opphavsrettsstatus',
 'filesource'            => 'Kjelde',
-'affirmation'	        => 'Eg stadfester at innehavaren av opphavsretten åt denne fila samtykkjer i at fila blir utgjeven under vilkåra for $1.',
 'copyrightpage'         => '{{ns:4}}:Opphavsrett',
 'copyrightpagename'     => '{{SITENAME}} opphavsrett',
 'uploadedfiles'	        => 'Filer som er opplasta',
-'noaffirmation'         => 'Du lyt stadfeste at du ikkje bryt nokon sin opphavsrett med å laste opp denne fila.',
 'ignorewarning'	        => 'Sjå bort frå åtvaringa og lagre fila likevel.',
 'minlength'		=> 'Namnet på fila må ha minst tre teikn.',
 'illegalfilename'	=> 'Filnamnet «$1» inneheld teikn som ikkje er tillatne i sidetitlar. Skift namn på fila og prøv på nytt.',
@@ -996,7 +986,7 @@ For hjelp og meir informasjon:
 'rollbacklink'	        => 'rull attende',
 'rollbackfailed'        => 'Kunne ikkje rulle attende',
 'cantrollback'	        => 'Kan ikkje rulle attende fordi den siste brukaren er den einaste forfattaren.',
-'alreadyrolled'	        => 'Kan ikkje rulle attende den siste endringa av [[$1]] gjort av [[{{ns:2}}:$2|$2]] ([[{{ns:3}}:$2|brukardiskusjon]]) fordi nokon andre allereie har endra sida att eller fjerna endringa. 
+'alreadyrolled'	        => 'Kan ikkje rulle attende den siste endringa av [[$1]] gjort av [[{{ns:2}}:$2|$2]] ([[{{ns:3}}:$2|brukardiskusjon]]) fordi nokon andre allereie har endra sida att eller fjerna endringa.
 
 Den siste endringa vart gjort av [[{{ns:2}}:$3|$3]] ([[{{ns:3}}:$3|brukardiskusjon]]).',
 # only shown if there is an edit comment
@@ -1023,7 +1013,7 @@ Den siste endringa vart gjort av [[{{ns:2}}:$3|$3]] ([[{{ns:3}}:$3|brukardiskusj
 'undeletepagetext'      => 'Dei følgjande sidene er sletta, men dei finst enno i arkivet og kan attopprettast. Arkivet blir periodevis sletta.',
 'undeletearticle'       => 'Attopprett sletta side',
 'undeleterevisions'     => '$1 versjonar arkiverte',
-'undeletehistory'       => 'Om du attopprettar sida, vil alle versjonane i historikken også bli attoppretta. Dersom ei ny side med same namnet 
+'undeletehistory'       => 'Om du attopprettar sida, vil alle versjonane i historikken også bli attoppretta. Dersom ei ny side med same namnet
 er oppretta sidan den gamle sida vart sletta, vil dei attoppretta versjonane dukke opp i historikken, og den nyaste versjonen vil bli verande som han er.',
 'undeleterevision'      => 'Sletta versjon frå $1',
 'undeletebtn'           => 'Attopprett!',
@@ -1151,7 +1141,6 @@ IP-adresser som blir automatisk blokkerte er ikkje lista her. Sjå [[{{ns:-1}}:I
 'val_validation_of'     => 'Vurdering av «$1»',
 'val_revision_of'       => 'Versjon $1',
 'val_revision_changes_ok' => 'Dine vurderingar er lagra!',
-'val_rev_stats_link'    => 'Sjå vurderingsstatistikk for «$1» <a href="$2">her</a>',
 'val_revision_stats_link' => 'detaljar',
 'val_iamsure'           => 'Kryss av dersom du verkeleg meiner det (det er ingen veg attende)!',
 'val_details_th'        => '<sub>Brukar</sub> \\ <sup>Emne</sup>',
@@ -1331,53 +1320,53 @@ Skriv "0" som første bokstav for å slå av den nye kategoriutsjånaden.',
 */
 /* verktøytips og snøggtastar */
 ta = new Object();
-ta[\'pt-userpage\']             = new Array(\'.\',\'Brukarsida mi\'); 
-ta[\'pt-anonuserpage\']         = new Array(\'.\',\'Brukarsida for ip-adressa du redigerer under\'); 
-ta[\'pt-mytalk\']               = new Array(\'n\',\'Diskusjonssida mi\'); 
-ta[\'pt-anontalk\']             = new Array(\'n\',\'Diskusjon om endringar gjorde av denne ip-adressa\'); 
-ta[\'pt-preferences\']          = new Array(\'\',\'Innstillingane mine\'); 
-ta[\'pt-watchlist\']            = new Array(\'l\',\'Liste over sidene du overvakar.\'); 
-ta[\'pt-mycontris\']            = new Array(\'y\',\'Liste over bidraga mine\'); 
-ta[\'pt-login\']                = new Array(\'o\',\'Det er ikkje obligatorisk å logga inn, men medfører mange fordelar.\'); 
-ta[\'pt-anonlogin\']            = new Array(\'o\',\'Det er ikkje obligatorisk å logga inn, men medfører mange fordelar.\'); 
-ta[\'pt-logout\']               = new Array(\'o\',\'Logg ut\'); 
-ta[\'ca-talk\']                 = new Array(\'t\',\'Diskusjon om innhaldssida\'); 
-ta[\'ca-edit\']                 = new Array(\'e\',\'Du kan endre denne sida. Bruk førehandsvisings-knappen før du lagrar.\'); 
-ta[\'ca-addsection\']           = new Array(\'+\',\'Legg til ein bolk på denne diskusjonssida.\'); 
-ta[\'ca-viewsource\']           = new Array(\'e\',\'Denne sida er verna, men du kan sjå kjeldeteksten.\'); 
-ta[\'ca-history\']              = new Array(\'h\',\'Eldre versjonar av denne sida.\'); 
-ta[\'ca-protect\']              = new Array(\'=\',\'Vern denne sida\'); 
-ta[\'ca-delete\']               = new Array(\'d\',\'Slett denne sida\'); 
-ta[\'ca-undelete\']             = new Array(\'d\',\'Attopprett denne sida\'); 
-ta[\'ca-move\']                 = new Array(\'m\',\'Flytt denne sida\'); 
-ta[\'ca-watch\']                = new Array(\'w\',\'Legg denne sida til i overvakingslista di\'); 
-ta[\'ca-unwatch\']              = new Array(\'w\',\'Fjern denne sida frå overvakingslista di\'); 
-ta[\'search\']                  = new Array(\'f\',\'Søk gjennom denne wikien\'); 
-ta[\'p-logo\']                  = new Array(\'\',\'Hovudside\'); 
-ta[\'n-mainpage\']              = new Array(\'z\',\'Gå til hovudsida\'); 
-ta[\'n-portal\']                = new Array(\'\',\'Om prosjektet, kva du kan gjera, kvar du finn saker og ting\'); 
-ta[\'n-currentevents\']         = new Array(\'\',\'Aktuelt\'); 
-ta[\'n-recentchanges\']         = new Array(\'r\',\'Liste over dei siste endringane som er gjort på wikien.\'); 
-ta[\'n-randompage\']            = new Array(\'x\',\'Vis ei tilfeldig side\'); 
-ta[\'n-help\']                  = new Array(\'\',\'Hjelp til å bruke alle funksjonane.\'); 
-ta[\'n-sitesupport\']           = new Array(\'\',\'Støtt oss!\'); 
-ta[\'t-whatlinkshere\']         = new Array(\'j\',\'Liste over alle wikisidene som har lenkjer hit\'); 
-ta[\'t-recentchangeslinked\']   = new Array(\'k\',\'Siste endringar på sider denne sida lenkjer til\'); 
-ta[\'feed-rss\']                = new Array(\'\',\'RSS-mating for denne sida\'); 
-ta[\'feed-atom\']               = new Array(\'\',\'Atom-mating for denne sida\'); 
-ta[\'t-contributions\']         = new Array(\'\',\'Sjå liste over bidrag frå denne brukaren\'); 
-ta[\'t-emailuser\']             = new Array(\'\',\'Send ein e-post til denne brukaren\'); 
-ta[\'t-upload\']                = new Array(\'u\',\'Last opp filer\'); 
-ta[\'t-specialpages\']          = new Array(\'q\',\'Liste over spesialsider\'); 
-ta[\'ca-nstab-main\']           = new Array(\'c\',\'Vis innhaldssida\'); 
-ta[\'ca-nstab-user\']           = new Array(\'c\',\'Vis brukarsida\'); 
-ta[\'ca-nstab-media\']          = new Array(\'c\',\'Direktelenkje (filpeikar) til fil\'); 
-ta[\'ca-nstab-special\']        = new Array(\'\',\'Dette er ei spesialside, du kan ikkje endre ho.\'); 
-ta[\'ca-nstab-wp\']             = new Array(\'c\',\'Vis prosjektside\'); 
-ta[\'ca-nstab-image\']          = new Array(\'c\',\'Vis filside\'); 
-ta[\'ca-nstab-mediawiki\']      = new Array(\'c\',\'Vis systemmelding\'); 
-ta[\'ca-nstab-template\']       = new Array(\'c\',\'Vis mal\'); 
-ta[\'ca-nstab-help\']           = new Array(\'c\',\'Vis hjelpeside\'); 
+ta[\'pt-userpage\']             = new Array(\'.\',\'Brukarsida mi\');
+ta[\'pt-anonuserpage\']         = new Array(\'.\',\'Brukarsida for ip-adressa du redigerer under\');
+ta[\'pt-mytalk\']               = new Array(\'n\',\'Diskusjonssida mi\');
+ta[\'pt-anontalk\']             = new Array(\'n\',\'Diskusjon om endringar gjorde av denne ip-adressa\');
+ta[\'pt-preferences\']          = new Array(\'\',\'Innstillingane mine\');
+ta[\'pt-watchlist\']            = new Array(\'l\',\'Liste over sidene du overvakar.\');
+ta[\'pt-mycontris\']            = new Array(\'y\',\'Liste over bidraga mine\');
+ta[\'pt-login\']                = new Array(\'o\',\'Det er ikkje obligatorisk å logga inn, men medfører mange fordelar.\');
+ta[\'pt-anonlogin\']            = new Array(\'o\',\'Det er ikkje obligatorisk å logga inn, men medfører mange fordelar.\');
+ta[\'pt-logout\']               = new Array(\'o\',\'Logg ut\');
+ta[\'ca-talk\']                 = new Array(\'t\',\'Diskusjon om innhaldssida\');
+ta[\'ca-edit\']                 = new Array(\'e\',\'Du kan endre denne sida. Bruk førehandsvisings-knappen før du lagrar.\');
+ta[\'ca-addsection\']           = new Array(\'+\',\'Legg til ein bolk på denne diskusjonssida.\');
+ta[\'ca-viewsource\']           = new Array(\'e\',\'Denne sida er verna, men du kan sjå kjeldeteksten.\');
+ta[\'ca-history\']              = new Array(\'h\',\'Eldre versjonar av denne sida.\');
+ta[\'ca-protect\']              = new Array(\'=\',\'Vern denne sida\');
+ta[\'ca-delete\']               = new Array(\'d\',\'Slett denne sida\');
+ta[\'ca-undelete\']             = new Array(\'d\',\'Attopprett denne sida\');
+ta[\'ca-move\']                 = new Array(\'m\',\'Flytt denne sida\');
+ta[\'ca-watch\']                = new Array(\'w\',\'Legg denne sida til i overvakingslista di\');
+ta[\'ca-unwatch\']              = new Array(\'w\',\'Fjern denne sida frå overvakingslista di\');
+ta[\'search\']                  = new Array(\'f\',\'Søk gjennom denne wikien\');
+ta[\'p-logo\']                  = new Array(\'\',\'Hovudside\');
+ta[\'n-mainpage\']              = new Array(\'z\',\'Gå til hovudsida\');
+ta[\'n-portal\']                = new Array(\'\',\'Om prosjektet, kva du kan gjera, kvar du finn saker og ting\');
+ta[\'n-currentevents\']         = new Array(\'\',\'Aktuelt\');
+ta[\'n-recentchanges\']         = new Array(\'r\',\'Liste over dei siste endringane som er gjort på wikien.\');
+ta[\'n-randompage\']            = new Array(\'x\',\'Vis ei tilfeldig side\');
+ta[\'n-help\']                  = new Array(\'\',\'Hjelp til å bruke alle funksjonane.\');
+ta[\'n-sitesupport\']           = new Array(\'\',\'Støtt oss!\');
+ta[\'t-whatlinkshere\']         = new Array(\'j\',\'Liste over alle wikisidene som har lenkjer hit\');
+ta[\'t-recentchangeslinked\']   = new Array(\'k\',\'Siste endringar på sider denne sida lenkjer til\');
+ta[\'feed-rss\']                = new Array(\'\',\'RSS-mating for denne sida\');
+ta[\'feed-atom\']               = new Array(\'\',\'Atom-mating for denne sida\');
+ta[\'t-contributions\']         = new Array(\'\',\'Sjå liste over bidrag frå denne brukaren\');
+ta[\'t-emailuser\']             = new Array(\'\',\'Send ein e-post til denne brukaren\');
+ta[\'t-upload\']                = new Array(\'u\',\'Last opp filer\');
+ta[\'t-specialpages\']          = new Array(\'q\',\'Liste over spesialsider\');
+ta[\'ca-nstab-main\']           = new Array(\'c\',\'Vis innhaldssida\');
+ta[\'ca-nstab-user\']           = new Array(\'c\',\'Vis brukarsida\');
+ta[\'ca-nstab-media\']          = new Array(\'c\',\'Direktelenkje (filpeikar) til fil\');
+ta[\'ca-nstab-special\']        = new Array(\'\',\'Dette er ei spesialside, du kan ikkje endre ho.\');
+ta[\'ca-nstab-wp\']             = new Array(\'c\',\'Vis prosjektside\');
+ta[\'ca-nstab-image\']          = new Array(\'c\',\'Vis filside\');
+ta[\'ca-nstab-mediawiki\']      = new Array(\'c\',\'Vis systemmelding\');
+ta[\'ca-nstab-template\']       = new Array(\'c\',\'Vis mal\');
+ta[\'ca-nstab-help\']           = new Array(\'c\',\'Vis hjelpeside\');
 ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 /*
 </pre>
@@ -1518,9 +1507,6 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 'exif-orientation-7'    => 'Rotert 90° medsols og spegla loddrett', // 0th row: right; 0th column: bottom
 'exif-orientation-8'    => 'Rotert 90° motsols', // 0th row: left; 0th column: bottom
 
-'exif-resolutionunit-2' => 'tommar',
-'exif-resolutionunit-3' => 'centimeter',
-
 'exif-componentsconfiguration-0' => 'finst ikkje',
 
 'exif-exposureprogram-0' => 'Ikkje bestemt',
@@ -1686,8 +1672,7 @@ class LanguageNn extends LanguageUtf8 {
 		return $wgBookstoreListNn ;
 	}
 
-	function getMagicWords() 
-	{
+	function getMagicWords() {
 		global $wgMagicWordsNn;
 		return $wgMagicWordsNn;
 	}
@@ -1705,12 +1690,12 @@ class LanguageNn extends LanguageUtf8 {
 		}
 
 	}
-	
+
 	function date( $ts, $adj = false, $format = true) {
 		global $wgUser;
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); } # Adjust based on the timezone setting.
 		$format = $this->dateFormat($format);
-		
+
 		switch( $format ) {
 			# 15. jan. 2001 kl. 16:12 || 16:12, 15. jan. 2001
 			case '2': case '4': return (0 + substr( $ts, 6, 2 )) . '. ' .
@@ -1724,14 +1709,14 @@ class LanguageNn extends LanguageUtf8 {
 				$this->getMonthName( substr( $ts, 4, 2 ) ) . ' ' .
 				substr($ts, 0, 4);
 		}
-		
+
 	}
-	
+
 	function timeanddate( $ts, $adj = false, $format = true) {
 		global $wgUser;
-		
+
 		$format = $this->dateFormat($format);
-		
+
 		switch ( $format ) {
 			# 16:12, 15. januar 2001 || 16:12, 15. jan. 2001
 			case '3': case '4': return $this->time( $ts, $adj, $format ) . ', ' . $this->date( $ts, $adj, $format );
@@ -1747,13 +1732,12 @@ class LanguageNn extends LanguageUtf8 {
 		',' => "\xc2\xa0",
 		'.' => ','
 	);
-	
+
 	function formatNum( $number, $year = false ) {
 		return $year ? $number : strtr($this->commafy($number), $this->digitTransTable);
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesNn;
 		if( isset( $wgAllMessagesNn[$key] ) ) {
 			return $wgAllMessagesNn[$key];
@@ -1764,4 +1748,4 @@ class LanguageNn extends LanguageUtf8 {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/languages/LanguageNo.php b/languages/LanguageNo.php
index 9cc89e00296d..c93365e9ecb2 100644
--- a/languages/LanguageNo.php
+++ b/languages/LanguageNo.php
@@ -4,13 +4,6 @@
   * @subpackage Language
   */
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesNo = array(
 	NS_MEDIA          => "Medium",
 	NS_SPECIAL        => "Spesial",
@@ -39,14 +32,8 @@
 /* private */ $wgSkinNamesNo = array(
 	'standard' => "Standard",
 	'nostalgia' => "Nostalgi",
-	'cologneblue' => "Kölnerblå",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+	'cologneblue' => "Kölnerblå"
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgBookstoreListNo = array(
@@ -57,58 +44,6 @@
 	"Mao.no" => "http://www.mao.no/"
 );
 
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesNo = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Brukerinnstillinger",
-	"Watchlist"		=> "Overvåkningsliste",
-	"Recentchanges" => "Siste endringer",
-	"Upload"		=> "Last opp fil",
-	"Imagelist"		=> "Billedliste",
-	"Listusers"		=> "Registrerte brukere",
-
-	"Statistics"	=> "Statistikk",
-	"Randompage"	=> "Tilfeldig artikkel",
-
-	"Lonelypages"	=> "Foreldreløse artikler",
-	"Unusedimages"	=> "Foreldreløse filer",
-	"Popularpages"	=> "Populære artikler",
-	"Wantedpages"	=> "Mest etterspurte artikler",
-	"Shortpages"	=> "Korte artikler",
-	"Longpages"		=> "Lange artikler",
-	"Newpages"		=> "Nyeste artikler",
-	"Ancientpages"	=> "Eldste artikler",
-	"Allpages"		=> "Alle sider etter tittel",
-
-	"Ipblocklist"	=> "Blokkerte IP-adresser",
-	"Maintenance" => "Vedlikeholdsside",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "Bokkilder",
-	"Export"		=> "XML export",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesNo = array(
-	"Blockip"		=> "Blokker IP-adresse",
-	"Asksql"		=> "Søk i databasen",
-	"Undelete"		=> "Vis og gjenopprett slettede sider"
-);
-
-/* private */ $wgDeveloperSpecialPagesNo = array(
-	"Lockdb"		=> "Skrivebeskytt databasen",
-	"Unlockdb"		=> "Gjenopprett tilgang til databasen",
-);
-
 /* private */ $wgAllMessagesNo = array(
 
 # User Toggles
@@ -181,11 +116,9 @@
 "aboutpage"		=> "Wikipedia:Om",
 "help"			=> "Hjelp",
 "helppage"		=> "Wikipedia:Hjelp",
-"wikititlesuffix" => "Wikipedia",
 "bugreports"	=> "Feilmeldinger",
 "bugreportspage" => "Wikipedia:Feilmeldinger",
 "sitesupport"   => "Donasjoner",
-"sitesupportpage" => "", # If not set, won't appear. Can be wiki page or URL
 "faq"			=> "OSS",
 "faqpage"		=> "Wikipedia:OSS",
 "edithelp"		=> "Hjelp til redigering",
@@ -226,7 +159,6 @@
 "redirectedfrom" => "(Omdirigert fra $1)",
 "lastmodified"	=> "Sist endret $1.",
 "viewcount"		=> "Denne siden er vist $1 ganger.",
-"gnunote" => "Artikkelen er utgitt under <a class=internal href='$wgScriptPath/GNU_FDL'>GNU fri dokumentasjonslisens</a>.",
 "printsubtitle" => "(fra {{SERVER}})",
 "protectedpage" => "Beskyttet side",
 "administrators" => "Wikipedia:Administratorer",
@@ -290,7 +222,7 @@ Send en rapport om dette til en administrator, oppgi adresse til siden.",
 "filedeleteerror" => "Kunne ikke slette filen \"$1\".",
 "filenotfound"	=> "Kunne ikke finne filen \"$1\".",
 "unexpected"	=> "Uventet verdi: \"$1\"=\"$2\".",
-"formerror"		=> "Feil: Kunne ikke sende skjema",	
+"formerror"		=> "Feil: Kunne ikke sende skjema",
 "badarticleerror" => "Handlingen kan ikke utføres på denne siden.",
 "cannotdelete"	=> "Kunne ikke slette filen. (den kan være slettet av noen andre.)",
 "badtitle"		=> "Feil tittel",
@@ -321,10 +253,8 @@ Hvis du vil, kan du personliggjøre brukerinnstillingene.",
 "newusersonly"	=> " (kun nye brukere)",
 "remembermypassword" => "Husk passordet til neste gang.",
 "loginproblem"	=> "<b>Du ble ikke logget inn.</b><br />Prøv igjen!",
-"alreadyloggedin" => "<font color=red><b>Bruker $1 er allerede logget inn!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Bruker $1 er allerede logget inn!</strong><br />\n",
 
-"areyounew"		=> "Hvis du er ny på Wikipedia og vil ha en brukerkonto, skriv inn et brukernavn og et passord, og bekreft passordet ved å skrive det inn en gang til.
-E-postadresse er frivillig; hvis du oppgir det, kan du få passordet tilsendt om du glemmer det.<br />\n",
 
 "login"			=> "Logg inn",
 "userlogin"		=> "Logg inn",
@@ -393,7 +323,7 @@ trykker \"Lagre siden\".<br />",
 "storedversion" => "Den lagrede versjonen",
 "editingold"	=> "<strong>ADVARSEL: Du redigerer en gammel versjon
 av denne siden.
-Hvis du lagrer den, vil alle endringer foretatt siden denne revisjonen bli 
+Hvis du lagrer den, vil alle endringer foretatt siden denne revisjonen bli
 overskrevet.</strong>",
 "yourdiff"		=> "Forskjeller",
 "copyrightwarning" => "Legg merke til at alle bidrag til Wikipedia er
@@ -404,16 +334,16 @@ forgodtbefinnende, kan du ikke legge den her.<br />
 Du lover oss også at du skrev teksten selv eller kopierte fra en
 ressurs som ikke er beskyttet av opphavsrett.
 
-<strong>LEGG ALDRI MATERIALE HER SOM ER BESKYTTET AV ANDRES OPPHAVSRETT UTEN 
+<strong>LEGG ALDRI MATERIALE HER SOM ER BESKYTTET AV ANDRES OPPHAVSRETT UTEN
 DERES TILLATELSE!</strong>",
 "longpagewarning" => "<strong>ADVARSEL: Denne siden er $1 kilobyte lang; noen
-nettlesere kan ha problemer med å redigere sider som nærmer seg eller 
+nettlesere kan ha problemer med å redigere sider som nærmer seg eller
 er lengre enn 32kb. Overvei om ikke siden kan deles opp i mindre deler.</strong>",
 "readonlywarning" => "<strong>ADVARSEL: Databasen er låst på grunn av vedlikehold,
-så du kan ikke lagre dine endringer akkurat nå. Det kan være en god idé å 
+så du kan ikke lagre dine endringer akkurat nå. Det kan være en god idé å
 kopiere teksten din til en tekstfil, så du kan lagre den til senere.</strong>",
 "protectedpagewarning" => "<strong>ADVARSEL: Denne siden er låst, så kun administratorer
-kan redigere den. Sørg for at du følger 
+kan redigere den. Sørg for at du følger
 [[Project:Retningslinjer_for_beskyttede_sider|retningslinjer for beskyttede sider]].</strong>",
 
 # History pages
@@ -429,7 +359,7 @@ kan redigere den. Sørg for at du følger
 "next"			=> "neste",
 "last"			=> "forrige",
 "orig"			=> "original",
-"histlegend"	=> "Forklaring: (nå) = forskjell fra den nåværende 
+"histlegend"	=> "Forklaring: (nå) = forskjell fra den nåværende
 versjonen, (forrige) = forskjell fra den forrige versjonen, M = mindre endring",
 
 # Diffs
@@ -442,7 +372,7 @@ versjonen, (forrige) = forskjell fra den forrige versjonen, M = mindre endring",
 # Search results
 #
 "searchresults" => "Søkeresultater",
-"searchresulttext" => "For mer informasjon om søking i Wikipedia, se 
+"searchresulttext" => "For mer informasjon om søking i Wikipedia, se
 $1.",
 "searchquery"	=> "For forespørsel \"$1\"",
 "badquery"		=> "Galt utformet forespørsel",
@@ -453,7 +383,7 @@ Det kan også være du har skrevet feil.
 Prøv igjen.",
 "matchtotals"	=> "Forespørselen \"$1\" ga treff på $2 artikkeltitler
 og på teksten i $3 artikler.",
-"nogomatch" => "Ingen sider med akkurat denne tittelen eksisterer, prøver 
+"nogomatch" => "Ingen sider med akkurat denne tittelen eksisterer, prøver
 fulltekstsøking i stedet. ",
 "titlematches"	=> "Artikkeltitler med treff på forespørselen",
 "notitlematches" => "Ingen artikkeltitler hadde treff på forespørselen",
@@ -462,12 +392,12 @@ fulltekstsøking i stedet. ",
 "prevn"			=> "forrige $1",
 "nextn"			=> "neste $1",
 "viewprevnext"	=> "Vis ($1) ($2) ($3).",
-"showingresults" => "Nedenfor vises <b>$1</b> resultater som starter med 
+"showingresults" => "Nedenfor vises <b>$1</b> resultater som starter med
 nummer <b>$2</b>.",
 "showingresultsnum" => "Nedenfor vises <b>$3</b> resultater som starter med nummer <b>$2</b>.",
-"nonefound"		=> "<strong>NB</strong>: søk uten resultat skyldes 
+"nonefound"		=> "<strong>NB</strong>: søk uten resultat skyldes
 at man søker etter alminnelige ord som \"har\" og \"fra\",
-som ikke er indeksert, eller ved å spesifisere mer enn et søkeord (da kun 
+som ikke er indeksert, eller ved å spesifisere mer enn et søkeord (da kun
 sider som inneholder alle søkeordene vil bli funnet).",
 "powersearch" => "Søk",
 "powersearchtext" => "
@@ -531,7 +461,7 @@ fra tjenerens tid.",
 # This is the default text, and can be overriden by editing [[Wikipedia::Recentchanges]]
 "recentchangestext" => "Se de sist endrede sider i Wikipedia på denne siden.",
 "rcloaderr"		=> "Laster sist endrede sider",
-"rcnote"		=> "Nedenfor er de siste <strong>$1</strong> endringer i de 
+"rcnote"		=> "Nedenfor er de siste <strong>$1</strong> endringer i de
 siste <strong>$2</strong> dagene.",
 "rcnotefrom"	=> "Nedenfor er endringene fra <b>$2</b> inntil <b>$1</b> vist.",
 "rclistfrom"	=> "Vis nye endringer med start fra $1",
@@ -570,7 +500,7 @@ Opplasting og slettinger er registrert i
 
 Bruk skjemaet nedenunder til å laste opp nye bilder som kan brukes
 til å illustrere dine artikler.
-På de fleste nettlesere vil du se en \"Browse...\"-knapp eller en 
+På de fleste nettlesere vil du se en \"Browse...\"-knapp eller en
 \"Bla igjennom...\"-knapp, som vil
 bringe deg til operativsystemets standarddialog for å åpne filer.
 Når du velger en fil, vil navnet på filen dukke opp i tekstfeltet
@@ -582,7 +512,7 @@ Dette kan godt ta litt tid hvis du har en langsom internettforbindelse.
 
 De foretrukne formatene er JPEG til fotografiske bilder, PNG
 til tegninger og andre små bilder, og OGG til lyd.
-Sørg for å gi filen et beskrivende navn for å unngå 
+Sørg for å gi filen et beskrivende navn for å unngå
 forvirring om innholdet.
 For å bruke bildet i en artikkel, bruk en lenke av dette slaget:
 
@@ -590,26 +520,22 @@ For å bruke bildet i en artikkel, bruk en lenke av dette slaget:
 '''<nowiki>[[bilde:fil.png|alternativ tekst]]</nowiki>''' eller
 '''<nowiki>[[medium:fil.ogg]]</nowiki>''' for lyd.
 
-Legg merke til at akkurat som med Wikipedia-sider, kan andre gjerne 
+Legg merke til at akkurat som med Wikipedia-sider, kan andre gjerne
 redigere eller
 slette de filene du har lastet opp, hvis de mener det hjelper encyklopedien, og
 du kan bli blokkert fra å laste opp hvis du misbruker systemet.",
 "uploadlog"		=> "opplastingslogg",
 "uploadlogpage" => "Upload_log",
-"uploadlogpagetext" => "Her er en liste med de filene som er lastet 
+"uploadlogpagetext" => "Her er en liste med de filene som er lastet
 opp sist. Alle de viste tidene er tjenerens tid (UTC).
 <ul>
 </ul>
 ",
 "filename"		=> "Filnavn",
 "filedesc"		=> "Beskrivelse",
-"affirmation"	=> "Jeg bekrefter at opphavsrettsinnehaveren til denne filen
-samtykker i at filen utgis under betingelsene for $1.",
 "copyrightpage" => "Wikipedia:Opphavsrett",
 "copyrightpagename" => "Wikipedia opphavsrett",
 "uploadedfiles"	=> "Filer som er lastet opp",
-"noaffirmation" => "Du må bekrefte at du ikke bryter noens opphavsrett
-ved å laste opp denne filen.",
 "ignorewarning"	=> "Ignorer advarselen og lagre filen likevel.",
 "minlength"		=> "Navnet på filen må bestå av minst tre bokstaver.",
 "badfilename"	=> "Navnet på filen er blitt endret til \"$1\".",
@@ -642,7 +568,7 @@ og av hvem, og andre ting du vet om filen.",
 "revertimg"		=> "gjenopprett",
 "deleteimg"		=> "slett",
 "deleteimgcompletely"		=> "slett",
-"imghistlegend" => "Forklaring: (nå) = dette er det nåværende bilde, 
+"imghistlegend" => "Forklaring: (nå) = dette er det nåværende bilde,
 (slett) = slett denne gamle versjonen, (gjenopprett) = gjenopprett en gammel versjon.
 <br /><i>Klikk på en dato for å se bildet som ble lastet opp da</i>.",
 "imagelinks"	=> "Billedlenker",
@@ -655,13 +581,13 @@ og av hvem, og andre ting du vet om filen.",
 "sitestats"		=> "Wikipedia-statistikk",
 "userstats"		=> "Brukerstatistikk",
 "sitestatstext" => "Der er i alt <b>$1</b> sider i databasen.
-Dette inkluderer diskusjonssider, sider om Wikipedia, 
+Dette inkluderer diskusjonssider, sider om Wikipedia,
 omdirigeringssider, og andre som sikkert ikke kvalifiserer til å være artikler.
-Hvis man ekskluderer disse, er det <b>$2</b> sider som sannsynligvis er 
+Hvis man ekskluderer disse, er det <b>$2</b> sider som sannsynligvis er
 ordinære artikler.<p>
 Der har i alt vært <b>$3</b> viste sider, og <b>$4</b> redigeringer av sider
 siden programvaren ble oppdatert (25. september 2002).
-Det vil si at det har vært <b>$5</b> gjennomsnittlige redigeringer per side, 
+Det vil si at det har vært <b>$5</b> gjennomsnittlige redigeringer per side,
 og <b>$6</b> visninger per redigering.",
 "userstatstext" => "Der er  <b>$1</b> registrerte brukere.
 <b>$2</b> av disse er administratorer (se $3).",
@@ -670,38 +596,38 @@ og <b>$6</b> visninger per redigering.",
 #
 "maintenance"		=> "Vedlikeholdsside",
 "maintnancepagetext"	=> "På denne siden er det forskjellige
-verktøyer for å vedlikeholde Wikipedia. Noen av disse funksjonene er 
-harde for databasen (de tar lang tid), så la være å oppdatere siden 
+verktøyer for å vedlikeholde Wikipedia. Noen av disse funksjonene er
+harde for databasen (de tar lang tid), så la være å oppdatere siden
 hver gang du har rettet en enkelt ting",
 "maintenancebacklink"	=> "Tilbake til vedlikeholdssiden",
 "disambiguations"	=> "Artikler med flertydige titler",
 "disambiguationspage"	=> "Wikipedia:Lenker til artikler med flertydige titler",
-"disambiguationstext"	=> "De følgende artikler har lenker til 
-<i>artikler med flertydige titler</i>. De burde ha lenke til en ikke-flertydig 
+"disambiguationstext"	=> "De følgende artikler har lenker til
+<i>artikler med flertydige titler</i>. De burde ha lenke til en ikke-flertydig
 tittel i stedet.<br />En artikkel blir behandlet som flertydig hvis den har
 lenker fra $1.<br />Lenker fra andre navnerom er <i>ikke</i> listet her.",
 "doubleredirects"	=> "Dobbelte omdirigeringer",
-"doubleredirectstext"	=> "<b>NB:</b> Denne listen kan inneholde gale 
+"doubleredirectstext"	=> "<b>NB:</b> Denne listen kan inneholde gale
 resultater. Det er som regel fordi siden inneholder ekstra tekst under den
-første #REDIRECT.<br />\nHver linje inneholder lenker til den første og den 
-anden omdirigeringen, og den første linjen fra den andre omdirigeringsteksten. 
-Det gir som regel den \"riktige\" målartikkelen, som den første omdirigeringen 
+første #REDIRECT.<br />\nHver linje inneholder lenker til den første og den
+anden omdirigeringen, og den første linjen fra den andre omdirigeringsteksten.
+Det gir som regel den \"riktige\" målartikkelen, som den første omdirigeringen
 skulle ha pekt på.",
 "brokenredirects"	=> "Dårlige omdirigeringer",
-"brokenredirectstext"	=> "De følgende omdirigeringer peker på en side som 
+"brokenredirectstext"	=> "De følgende omdirigeringer peker på en side som
 ikke eksisterer.",
 "selflinks"		=> "Sider som henviser til seg selv",
-"selflinkstext"		=> "De følgende sider inneholder henvisninger til seg selv, 
+"selflinkstext"		=> "De følgende sider inneholder henvisninger til seg selv,
 men det burde de ikke.",
 "mispeelings"           => "Sider med stavefeil",
-"mispeelingstext"               => "De følgende sider inneholder en av de 
-alminnelige stavefeilene som er listet på $1. Den korrekte stavemåte kan 
+"mispeelingstext"               => "De følgende sider inneholder en av de
+alminnelige stavefeilene som er listet på $1. Den korrekte stavemåte kan
 angis i paranteser etter den feilaktige stavemåten (som dette).",
 "mispeelingspage"       => "Liste over alminnelige stavefeil",
 "missinglanguagelinks"  => "Manglende språklenker",
 "missinglanguagelinksbutton"    => "Finn manglende språklenker for",
-"missinglanguagelinkstext"      => "Disse artiklene har <i>ikke</i> noen 
-lenker til den samme artikkel i $1. Omdirigeringer og underartikler er 
+"missinglanguagelinkstext"      => "Disse artiklene har <i>ikke</i> noen
+lenker til den samme artikkel i $1. Omdirigeringer og underartikler er
 <i>ikke</i> vist.",
 
 
@@ -735,7 +661,7 @@ en direkte URL, og kan være listet opp her, selv om det er
 i aktiv bruk.",
 "booksources"	=> "Bokkilder",
 "booksourcetext" => "Her er en liste over lenker til steder som
-låner ut og/eller selger nye og brukte bøker, og som kanskje også har 
+låner ut og/eller selger nye og brukte bøker, og som kanskje også har
 ytterligere informasjon om bøker du leter etter.
 Wikipedia er ikke assosiert med noen av disse stedene,
 og denne listen skal ikke sees på som en anbefaling av disse.",
@@ -750,7 +676,7 @@ for å sende e-post til andre brukere.",
 "emailuser"		=> "E-post til denne brukeren",
 "emailpage"		=> "E-post til bruker",
 "emailpagetext"	=> "Hvis denne brukeren har oppgitt en gyldig e-postadresse i
-sine brukerinnstillinger, vil dette skjemaet sende en enkelt 
+sine brukerinnstillinger, vil dette skjemaet sende en enkelt
 beskjed.
 Den e-postadressen du har satt i brukerinnstillingene dine, vil dukke opp
 i \"Fra\"-feltet på denne e-posten, så mottageren er i stand til å svare.",
@@ -776,15 +702,15 @@ for å kunne endre overvåkningslisten.",
 "addedwatch"	=> "Tilføyd til overvåkningslisten",
 "addedwatchtext" => "Siden \"$1\" er tilføyd <a href=\"" .
   "{{localurle:Spesial:Watchlist}}\">overvåkningslisten</a>.
-Fremtidige endringer til denne siden og den tilhørende diskusjonssiden vil 
+Fremtidige endringer til denne siden og den tilhørende diskusjonssiden vil
 bli listet opp her, og siden vil fremstå <b>fremhevet</b> i <a href=\"" .
-  "{{localurle:Spesial:Recentchanges}}\">listen med de siste 
+  "{{localurle:Spesial:Recentchanges}}\">listen med de siste
 endringene</a> for å gjøre det lettere å finne den.</p>
 
 <p>Hvis du senere vil fjerne siden fra overvåkningslisten, klikk
 \"Fjern overvåkning\" ute i siden.",
 "removedwatch"	=> "Fjernet fra overvåkningslisten",
-"removedwatchtext" => "Siden \"$1\" er fjernet fra 
+"removedwatchtext" => "Siden \"$1\" er fjernet fra
 overvåkningslisten.",
 "watchthispage"	=> "Overvåk side",
 "unwatchthispage" => "Fjern overvåkning",
@@ -799,7 +725,7 @@ $3...
 "removechecked" => "Fjern valgte sider fra overvåkningslisten",
 "watchlistcontains" => "Overvåkningslisten inneholder $1 sider.",
 "watcheditlist" => "Her er en alfabetisk liste over sidene i overvåkningslisten.
-Velg de sidene du vil fjerne fra overvåkningslisten 
+Velg de sidene du vil fjerne fra overvåkningslisten
 og klikk på 'fjern valgte sider fra overvåkningslisten'-knappen
 i bunnen av skjermen.",
 "removingchecked" => "Fjerner de valgte sidene fra overvåkningslisten ...",
@@ -840,15 +766,15 @@ Alle tider er serverens tid (UTC).
 "rollback"		=> "Fjern redigeringer",
 "rollbacklink"	=> "fjern redigering",
 "rollbackfailed" => "Kunne ikke fjerne redigeringen",
-"cantrollback"	=> "Kan ikke fjerne redigering; 
+"cantrollback"	=> "Kan ikke fjerne redigering;
 den siste brukeren er den eneste forfatteren.",
 "alreadyrolled"	=> "Kan ikke fjerne den siste redigeringen av [[$1]]
-foretatt av [[Bruker:$2|$2]] ([[Brukerdiskusjon:$2|diskusjon]]); 
-en annen har allerede redigert siden eller fjernet redigeringen. 
+foretatt av [[Bruker:$2|$2]] ([[Brukerdiskusjon:$2|diskusjon]]);
+en annen har allerede redigert siden eller fjernet redigeringen.
 
 Den siste redigeringen er foretatt av [[Bruker:$3|$3]] ([[Brukerdiskusjon:$3|diskusjon]]). ",
 #   only shown if there is an edit comment
-"editcomment" => "Kommentaren til redigeringen var: \"<i>$1</i>\".", 
+"editcomment" => "Kommentaren til redigeringen var: \"<i>$1</i>\".",
 "revertpage"	=> "Gjenopprettet siden til tidligere versjon redigert av $1",
 "protectlogpage" => "Beskyttelseslogg",
 "protectlogtext" => "Her er en liste over sider som er blitt beskyttet eller har fått fjernet beskyttelsen.
@@ -859,20 +785,20 @@ Se [[Wikipedia:Beskyttet side]] for mer informasjon.",
 # Undelete
 "undelete" => "Gjenopprett en slettet side",
 "undeletepage" => "Se og gjenopprett slettede sider",
-"undeletepagetext" => "De følgende sider er slettet, men de finnes 
+"undeletepagetext" => "De følgende sider er slettet, men de finnes
 stadig i arkivet og kan gjenopprettes. Arkivet blir periodevis slettet.",
 "undeletearticle" => "Gjenopprett slettet artikkel",
 "undeleterevisions" => "$1 revisjoner arkivert",
-"undeletehistory" => "Hvis du gjenoppretter siden, vil alle de historiske 
-revisjoner også bli gjenopprettet. Hvis en ny side med det samme navnet 
-er opprettet siden denne ble slettet, vil de gjenopprettede revisjonene 
-dukke opp i den tidligere historikken, og den nyeste revisjonen vil forbli 
+"undeletehistory" => "Hvis du gjenoppretter siden, vil alle de historiske
+revisjoner også bli gjenopprettet. Hvis en ny side med det samme navnet
+er opprettet siden denne ble slettet, vil de gjenopprettede revisjonene
+dukke opp i den tidligere historikken, og den nyeste revisjonen vil forbli
 på siden.",
 "undeleterevision" => "Slettet versjon fra $1",
 "undeletebtn" => "Gjenopprett!",
 "undeletedarticle" => "gjenopprettet \"$1\"",
 "undeletedtext"   => "Artikkelen [[$1]] er gjenopprettet.
-Se [[Wikipedia:Slettingslogg]] for en oversikt over nylige 
+Se [[Wikipedia:Slettingslogg]] for en oversikt over nylige
 slettinger og gjenopprettelser.",
 
 # Contributions
@@ -882,7 +808,7 @@ slettinger og gjenopprettelser.",
 "contribsub"	=> "For $1",
 "nocontribs"	=> "Ingen endringer er funnet som passer disse kriteriene.",
 
-"ucnote"	=> "Her er denne brukerens siste <b>$1</b> endringer i de 
+"ucnote"	=> "Her er denne brukerens siste <b>$1</b> endringer i de
 siste <b>$2</b> dagene.",
 "uclinks"	=> "Vis de siste $1 endringene; vis de siste $2 dagene.",
 "uctop"		=> " (topp)" ,
@@ -911,7 +837,6 @@ sider som har vært utsatt for vandalisme).",
 "ipbreason"		=> "Begrunnelse",
 "ipbsubmit"		=> "Blokker denne adressen",
 "badipaddress"	=> "IP-adressen er galt utformet.",
-"noblockreason" => "Du må angi en begrunnelse for denne blokkeringen.",
 "blockipsuccesssub" => "Blokkering utført",
 "blockipsuccesstext" => "IP-adressen \"$1\" er blokkert.
 <br />Se [[Spesial:Ipblocklist|IP-blokkeringslisten]] for alle blokkeringer.",
@@ -932,12 +857,12 @@ for en tidligere blokkert IP-adresse.",
 "lockdb"		=> "Lås database",
 "unlockdb"		=> "Lås opp database",
 "lockdbtext"	=> "Å låse databasen vil avbryte alle brukere fra å kunne
-redigere sider, endre deres innstillinger, redigere deres 
+redigere sider, endre deres innstillinger, redigere deres
 overvåkningsliste, og andre ting som krever endringer i databasen.
 Bekreft at du har til hensikt å gjøre dette, og at du vil
 låse opp databasen når vedlikeholdet er utført.",
-"unlockdbtext"	=> "Å låse opp databasen vil si at alle brukere igjen 
-kan redigere sider, endre sine innstillinger, redigere sin 
+"unlockdbtext"	=> "Å låse opp databasen vil si at alle brukere igjen
+kan redigere sider, endre sine innstillinger, redigere sin
 overvåkningsliste, og andre ting som krever endringer i databasen.
 Bekreft at du har til hensikt å gjøre dette.",
 "lockconfirm"	=> "Ja, jeg vil virkelig låse databasen.",
@@ -951,34 +876,19 @@ Bekreft at du har til hensikt å gjøre dette.",
 <br />Husk å fjerne låsen når du er ferdig med vedlikeholdet.",
 "unlockdbsuccesstext" => "Wikipedia-databasen er låst opp.",
 
-# SQL query
-#
-"asksql"		=> "SQL-forespørsel",
-"asksqltext"	=> "Bruk skjemaet nedenunder for direkte forespørsler 
-i Wikipedia-databasen.
-Bruk enkle anførselstegn ('som dette') for å skille strenger.
-Dette kan ofte belaste serveren kraftig, så bruk denne funksjonen
-med omtanke.",
-"sqlislogged"	=> "Vær oppmerksom på at alle SQL-forespørsler lagres i en loggfil.",
-"sqlquery"		=> "Tast inn forespørsel",
-"querybtn"		=> "Send forespørsel",
-"selectonly"	=> "Forespørsler andre enn \"SELECT\" er forbeholdt 
-Wikipedia-utviklere.",
-"querysuccessful" => "Forespørsel gjennomført",
-
 # Move page
 #
 "movepage"		=> "Flytt side",
-"movepagetext"	=> "Når du bruker skjemaet nedenunder, vil du få omdøpt en 
+"movepagetext"	=> "Når du bruker skjemaet nedenunder, vil du få omdøpt en
 side og flyttet hele historikken til det nye navnet.
 Den gamle tittelen vil bli en omdirigeringsside til den nye tittelen.
-Lenker til den gamle tittelen vil ikke bli endret. Sørg for å 
-sjekke for dobbelte eller dårlige omdirigeringer. 
-Du er ansvarlig for at alle lenker stadig peker dit det er 
+Lenker til den gamle tittelen vil ikke bli endret. Sørg for å
+sjekke for dobbelte eller dårlige omdirigeringer.
+Du er ansvarlig for at alle lenker stadig peker dit det er
 meningen de skal peke.
 
-Legg merke til at siden '''ikke''' kan flyttes hvis det allerede finnes en side 
-med den nye tittelen, med mindre den siden er tom eller er en omdirigering 
+Legg merke til at siden '''ikke''' kan flyttes hvis det allerede finnes en side
+med den nye tittelen, med mindre den siden er tom eller er en omdirigering
 uten noen historikk. Det betyr at du kan flytte en side tilbake dit
 den kom fra hvis du gjør en feil.
 
@@ -986,7 +896,7 @@ den kom fra hvis du gjør en feil.
 Dette kan være en drastisk og uventet endring for en populær side;
 vær sikker på at du forstår konsekvensene av dette før du
 fortsetter.",
-"movepagetalktext" => "Den tilhørende diskusjonssiden, hvis det finnes en, 
+"movepagetalktext" => "Den tilhørende diskusjonssiden, hvis det finnes en,
 vil automatisk bli flyttet med siden '''med mindre:'''
 *Du flytter siden til et annet navnerom,
 *En ikke-tom diskusjonsside allerede eksisterer under det nye navnet, eller
@@ -1003,21 +913,21 @@ for å flytte en side.",
 "pagemovedtext" => "Siden \"[[$1]]\" er flyttet til \"[[$2]]\".",
 "articleexists" => "En side med det navnet eksisterer allerede, eller det
 navnet du har valgt, er ikke gyldig. Velg et annet navn.",
-"talkexists"	=> "Siden ble flyttet korrekt, men den tilhørende 
-diskusjonssiden kunne ikke flyttes, fordi det allerede eksisterer en 
+"talkexists"	=> "Siden ble flyttet korrekt, men den tilhørende
+diskusjonssiden kunne ikke flyttes, fordi det allerede eksisterer en
 med den nye tittelen. Du er nødt til å flette dem sammen manuelt.",
 "movedto"		=> "flyttet til",
 "movetalk"		=> "Flytt også diskusjonssiden, hvis den eksisterer.",
 "talkpagemoved" => "Den tilhørende diskusjonssiden ble også flyttet.",
-"talkpagenotmoved" => "Den tilhørende diskusjonssiden ble 
+"talkpagenotmoved" => "Den tilhørende diskusjonssiden ble
 <strong>ikke</strong> flyttet.",
 # Math
-	'mw_math_png' => "Vis alltid som PNG",
-	'mw_math_simple' => "HTML hvis veldig enkel, ellers PNG",
-	'mw_math_html' => "HTML hvis mulig, ellers PNG",
-	'mw_math_source' => "Behold som TeX (for tekst-nettlesere)",
-	'mw_math_modern' => "Anbefalt for moderne nettlesere",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Vis alltid som PNG",
+'mw_math_simple' => "HTML hvis veldig enkel, ellers PNG",
+'mw_math_html' => "HTML hvis mulig, ellers PNG",
+'mw_math_source' => "Behold som TeX (for tekst-nettlesere)",
+'mw_math_modern' => "Anbefalt for moderne nettlesere",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -1045,9 +955,8 @@ class LanguageNo extends LanguageUtf8 {
 		return $wgSkinNamesNo;
 	}
 
-	
-	function date( $ts, $adj = false )
-	{
+
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = (0 + substr( $ts, 6, 2 )) . ". " .
@@ -1056,16 +965,14 @@ class LanguageNo extends LanguageUtf8 {
 		return $d;
 	}
 
-	function time( $ts, $adj = false )
-	{
+	function time( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
 		return $t;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		return $this->date( $ts, $adj ) . " kl." . $this->time( $ts, $adj );
 	}
 
@@ -1074,26 +981,7 @@ class LanguageNo extends LanguageUtf8 {
 		return $wgTranslateNumerals ? strtr($number, '.,', ',.' ) : $number;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesNo;
-		return $wgValidSpecialPagesNo;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesNo;
-		return $wgSysopSpecialPagesNo;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesNo;
-		return $wgDeveloperSpecialPagesNo;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesNo;
 		if( isset( $wgAllMessagesNo[$key] ) ) {
 			return $wgAllMessagesNo[$key];
diff --git a/languages/LanguageNv.php b/languages/LanguageNv.php
index 565d684442d4..26bacb2b1b6e 100755
--- a/languages/LanguageNv.php
+++ b/languages/LanguageNv.php
@@ -38,56 +38,15 @@ if($wgMetaNamespace === FALSE)
 );
 
 /* private */ $wgSkinNamesNv = array(
-	'standard' => 'Standard',
-	'nostalgia' => 'Nostalgia',
-	'cologneblue' => 'Cologne Blue',
-	'davinci' => 'DaVinci',
 	'mono' => 'Łáa\'ígíí',
-	'monobook' => 'NaaltsoosŁáa\'ígíí',
- 'myskin' => 'MySkin'
-);
+	'monobook' => 'NaaltsoosŁáa\'ígíí'
+) + $wgSkinNamesEn;
 
-/* private */ $wgMathNamesNv = array(
-	MW_MATH_PNG => 'Always render PNG',
-	MW_MATH_SIMPLE => 'HTML if very simple or else PNG',
-	MW_MATH_HTML => 'HTML if possible or else PNG',
-	MW_MATH_SOURCE => 'Leave it as TeX (for text browsers)',
-	MW_MATH_MODERN => 'Recommended for modern browsers',
-	MW_MATH_MATHML => 'MathML if possible (experimental)',
-);
 
 /* private */ $wgDateFormatsNv = array(
 #	'No preference',
 );
 
-/* private */ $wgUserTogglesNv = array(
-	'highlightbroken' => 'Format broken links <a href="" class="new">like
-this</a> (alternative: like this<a href="" class="internal">?</a>).',
-	'justify'	=> 'Justify paragraphs',
-	'hideminor' => 'Hide minor edits in recent changes',
-	'usenewrc' => 'Enhanced recent changes (not for all browsers)',
-	'numberheadings' => 'Auto-number headings',
-	'showtoolbar'=>'Show edit toolbar',
-	'editondblclick' => 'Edit pages on double click (JavaScript)',
-	'editsection'=>'Enable section editing via [edit] links',
-	'editsectiononrightclick'=>'Enable section editing by right clicking<br /> on section titles (JavaScript)',
-	'showtoc'=>'Hián-sī bo̍k-lo̍k<br />(3 ê piau-tê í-siōng ê ia̍h)',
-	'rememberpassword' => 'Kì tiâu góa ê bi̍t-bé (across sessions)',
-	'editwidth' => 'Pian-chi̍p keh-á thián hō· khui',
-	'watchdefault' => 'Kā lí pian-chi̍p ê ia̍h ka-ji̍p kàm-sī-toaⁿ',
-	'minordefault' => 'Siat-sú só·-ū ê pian-chi̍p lóng sió siu-kái',
-	'previewontop' => 'Show preview before edit box and not after it',
-	'nocache' => 'Naaltsoos doo nooh yishchí da'
-);
-
-/* private */ $wgBookstoreListNv = array(
-	"AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
-	"PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
-	"Barnes & Noble" => "http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
-	"Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1",
-	//"ISBN" => "$1"
-);
-
 /* private */ $wgWeekdayNamesNv = array(
 	'Damóogo', 'Damóo biiskání', 'Damóodóó naakiską́o', 'Damóodóó tágí jį́', 'Damóodóó dį́į́\' yiską́o',
 	'Nda\'iiníísh', 'Yiską́ damóo'
@@ -104,72 +63,12 @@ this</a> (alternative: like this<a href="" class="internal">?</a>).',
 	'Btsx', 'Ghąj', 'Ntss', 'Ntsx'
 );
 
-# Note to translators:
-#   Please include the English words as synonyms.  This allows people
-#   from other wikis to contribute more easily.
-#
-/* private */ $wgMagicWordsNv = array(
-#   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    '#redirect'              ),
-    MAG_NOTOC                => array( 0,    '__NOTOC__'              ),
-    MAG_FORCETOC             => array( 0,    '__FORCETOC__'           ),
-    MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__'      ),
-    MAG_START                => array( 0,    '__START__'              ),
-    MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH'           ),
-    MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME'       ),
-    MAG_CURRENTDAY           => array( 1,    'CURRENTDAY'             ),
-    MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME'         ),
-    MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR'            ),
-    MAG_CURRENTTIME          => array( 1,    'CURRENTTIME'            ),
-    MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES'       ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN'    ),
-	MAG_PAGENAME             => array( 1,    'PAGENAME'               ),
-	MAG_NAMESPACE            => array( 1,    'NAMESPACE'              ),
-	MAG_SUBST                => array( 0,    'SUBST:'                 ),
-    MAG_MSGNW                => array( 0,    'MSGNW:'                 ),
-	MAG_END                  => array( 0,    '__END__'                ),
-    MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb'     ),
-    MAG_IMG_RIGHT            => array( 1,    'right'                  ),
-    MAG_IMG_LEFT             => array( 1,    'left'                   ),
-    MAG_IMG_NONE             => array( 1,    'none'                   ),
-    MAG_IMG_WIDTH            => array( 1,    '$1px'                   ),
-    MAG_IMG_CENTER           => array( 1,    'center', 'centre'       ),
-    MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame' ),
-    MAG_INT                  => array( 0,    'INT:'                   ),
-    MAG_SITENAME             => array( 1,    'SITENAME'               ),
-    MAG_NS                   => array( 0,    'NS:'                    ),
-	MAG_LOCALURL             => array( 0,    'LOCALURL:'              ),
-	MAG_LOCALURLE            => array( 0,    'LOCALURLE:'             ),
-	MAG_SERVER               => array( 0,    'SERVER'                 )
-);
-
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
-
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => ""
-
-# NOTE: To turn off "Disclaimers" in the title links,
-# set "disclaimers" => ""
-
-# NOTE: To turn off "Community portal" in the title links,
-# set "portal" => ""
-
 #--------------------------------------------------------------------------
 # Internationalisation code
 #--------------------------------------------------------------------------
 
 class LanguageNv extends LanguageUtf8 {
 
-	function getBookstoreList () {
-		global $wgBookstoreListNv ;
-		return $wgBookstoreListNv ;
-	}
-
 	function getNamespaces() {
 		global $wgNamespaceNamesNv;
 		return $wgNamespaceNamesNv;
@@ -185,28 +84,12 @@ class LanguageNv extends LanguageUtf8 {
 		return $wgSkinNamesNv;
 	}
 
-	function getMathNames() {
-		global $wgMathNamesNv;
-		return $wgMathNamesNv;
-	}
-
 	function getDateFormats() {
 		global $wgDateFormatsNv;
 		return $wgDateFormatsNv;
 	}
 
-	function getUserToggles() {
-		global $wgUserTogglesNv;
-		return $wgUserTogglesNv;
-	}
-
-	function getUserToggle( $tog ) {
-		$togs =& $this->getUserToggles();
-		return $togs[$tog];
-	}
-
-	function getMonthName( $key )
-	{
+	function getMonthName( $key ) {
 		global $wgMonthNamesNv;
 		return $wgMonthNamesNv[$key-1];
 	}
@@ -226,42 +109,7 @@ class LanguageNv extends LanguageUtf8 {
 		return $wgWeekdayNamesNv[$key-1];
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesNv;
-		return $wgValidSpecialPagesNv;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesNv;
-		return $wgSysopSpecialPagesNv;
-	}
 
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesNv;
-		return $wgDeveloperSpecialPagesNv;
-	}
-
-/*
-	function getMessage( $key )
-	{
-		global $wgAllMessagesNv;
-		return @$wgAllMessagesNv[$key];
-	}
-
-	function getAllMessages()
-	{
-		global $wgAllMessagesNv;
-		return $wgAllMessagesNv;
-	}
-*/
-
-	function &getMagicWords()
-	{
-		global $wgMagicWordsNv;
-		return $wgMagicWordsNv;
-	}
 }
 
 ?>
diff --git a/languages/LanguageOc.php b/languages/LanguageOc.php
index 560db9fcf572..b45f588974af 100644
--- a/languages/LanguageOc.php
+++ b/languages/LanguageOc.php
@@ -6,24 +6,20 @@
 
 require_once( "LanguageUtf8.php" );
 
-// The names of the namespaces can be set here, but the numbers
-// are magical, so don't change or move them!  The Namespace class
-// encapsulates some of the magic-ness.
-
 /* private */ $wgNamespaceNamesOc = array(
-	-1 => "Especial",
-	0 => "",
-	1 => "Discutir",
-	2 => "Utilisator",
-	3 => "Discutida_Utilisator",
-	4 => "Oiquipedià",
-	5 => "Discutida_Oiquipedià",
-	6 => "Image",
-	7 => "Discutida_Image",
-	8	=> "MediaWiki",
-	9	=> "MediaWiki_talk",
-	10  => "Template",
-	11  => "Template_talk"
+	NS_SPECIAL        => "Especial",
+	NS_MAIN           => "",
+	NS_TALK           => "Discutir",
+	NS_USER           => "Utilisator",
+	NS_USER_TALK      => "Discutida_Utilisator",
+	NS_PROJECT        => "Oiquipedià",
+	NS_PROJECT_TALK   => "Discutida_Oiquipedià",
+	NS_IMAGE          => "Image",
+	NS_IMAGE_TALK     => "Discutida_Image",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "MediaWiki_talk",
+	NS_TEMPLATE       => "Template",
+	NS_TEMPLATE_TALK  => "Template_talk"
 
 ) + $wgNamespaceNamesEn;
 
@@ -35,72 +31,13 @@ require_once( "LanguageUtf8.php" );
 	'standard' => "Normal",
 	'nostalgia' => "Nostalgia",
 	'cologneblue' => "Còlonha Blau",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
-
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgBookstoreListOc = array(
 	"Amazon.fr" => "http://www.amazon.fr/exec/obidos/ISBN=$1"
 );
 
-
-// All special pages have to be listed here: a description of ""
-// will make them not show up on the "Special Pages" page, which
-// is the right thing for some of them (such as the "targeted" ones).
-
-/* private */ $wgValidSpecialPagesOc = array(
-	"Userlogin"     => "",
-	"Userlogout"    => "",
-	"Preferences"   => "Préférences",
-	"Watchlist"     => "Liste de suivi",
-	"Recentchanges" => "Modifications récentes",
-	"Upload"        => "Copier un fichier",
-	"Imagelist"     => "Liste des images",
-	"Listusers"     => "Liste des participants",
-	"Statistics"    => "Statistiques",
-	"Randompage"    => "Une page au hasard",
-
-	"Lonelypages"   => "Pages orphelines",
-	"Unusedimages"  => "Images orphelines",
-	"Popularpages"  => "Les plus populaires",
-	"Wantedpages"   => "Les plus demandées",
-	"Shortpages"    => "Articles courts",
-	"Longpages"     => "Articles longs",
-	"Newpages"      => "Nouvelles pages",
-	"Ancientpages"	=> "Anciennes pages",
-	"Allpages"      => "Toutes les pages",
-
-	"Ipblocklist"   => "Adresses IP bloquées",
-	"Maintenance"   => "Page de maintenance",
-	"Specialpages"  => "", // ces pages doivent rester vides !
-	"Contributions" => "",
-	"Emailuser"     => "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"      => "",
-	"Booksources"   => "Librairies en ligne",
-//	"Categories"	=> "Page des catégories"	// Looxix "Page categories"
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesOc = array(
-	"Blockip"       => "Bloquer une adresse IP",
-	"Asksql"        => "Accès SQL",
-	"Undelete"      => "Gérer les pages effacées"
-);
-
-/* private */ $wgDeveloperSpecialPagesOc = array(
-	"Lockdb"        => "Bloquer la base de données",
-	"Unlockdb"      => "Débloquer la base de données",
-);
-
 /* private */ $wgAllMessagesOc = array(
 
 # User Toggles
@@ -114,7 +51,7 @@ require_once( "LanguageUtf8.php" );
 "tog-showtoolbar" => "Show edit toolbar",
 "tog-editondblclick" => "Editar paginas amb un doble clic (JavaScript)",
 "tog-editsection"	=> "Éditer une section via les liens [éditer]", //Looxix (Enable section editing via [edit] links)
-"tog-editsectiononrightclick"	=> "Éditer une section en cliquant à droite<br /> sur le titre de la section", // Looxix 
+"tog-editsectiononrightclick"	=> "Éditer une section en cliquant à droite<br /> sur le titre de la section", // Looxix
 "tog-showtoc"	=> "Afficher la table des matières<br /> (pour les articles ayant plus de 3 sections)",
 "tog-rememberpassword" => "Se souvenir de mon mot de passe (cookie)",
 "tog-editwidth" => "La fenêtre d'édition s'affiche en pleine largeur",
@@ -169,17 +106,15 @@ require_once( "LanguageUtf8.php" );
 
 "linktrail"     => "/^([a-zàâçéèêîôû]+)(.*)\$/sD",
 "mainpage"      => "Accueil",
-"mainpagetext"	=> "Logiciel Wikipédia installé.",
+"mainpagetext"  => "Logiciel Wikipédia installé.",
 "about"         => "À propos",
-"aboutsite"      => "À propos de Wikipédia",
+"aboutsite"     => "À propos de Wikipédia",
 "aboutpage"     => "Wikipédia:À propos",
 "help"          => "Aide",
 "helppage"      => "Wikipédia:Aide",
-"wikititlesuffix" => "Wikipédia",
 "bugreports"    => "Rapport d'erreurs",
 "bugreportspage" => "Wikipédia:Rapport d'erreurs",
-"sitesupport"	=> "Participer en faisant un don",
-"sitesupportpage"	=> "Wikipédia:Donations",
+"sitesupport"   => "Participer en faisant un don",
 
 "faq"           => "FAQ",
 "faqpage"       => "Wikipédia:FAQ",
@@ -209,7 +144,7 @@ require_once( "LanguageUtf8.php" );
 "unprotectthispage" => "Déprotéger cette page",
 "newpage"       => "Nouvelle page",
 "talkpage"      => "Page de discussion",
-"postcomment"	=> "Ajouter un commentaire", // Looxix "Post a comment",	
+"postcomment"	=> "Ajouter un commentaire", // Looxix "Post a comment",
 "articlepage"	=> "Voir l'article",
 "subjectpage"   => "Page sujet",
 "userpage"      => "Page utilisateur",
@@ -220,7 +155,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(Redirigé depuis $1)",
 "lastmodified"  => "Dernière modification de cette page : $1.",
 "viewcount"     => "Cette page a été consultée $1 fois.",
-"gnunote"       => "Tous les textes sont disponibles sous les termes de la <a class=internal href='$wgScriptPath/GFDL'>Licence de documentation libre GNU</a>.",
 "printsubtitle" => "(de {{SERVER}})",
 "protectedpage" => "Page protégée",
 "administrators" => "Wikipédia:Administrateurs",
@@ -262,7 +196,7 @@ depuis la fonction \"<tt>$2</tt>\".
 MySQL a renvoyé l'erreur \"<tt>$3: $4</tt>\".",
 "noconnect"	=> "Désolé ! Suite à des problèmes techniques, il est impossible de se connecter à la base de données pour le moment.", //"Connexion impossible à la base de données sur $1",
 "nodb"		=> "Sélection impossible de la base de données $1",
-"cachederror"	=> "Ceci est une copie de la page demandée et peut ne pas être à jour", // Looxix 
+"cachederror"	=> "Ceci est une copie de la page demandée et peut ne pas être à jour", // Looxix
 "readonly"	=> "Mises à jour bloquées sur la base de données",
 "enterlockreason" => "Indiquez la raison du blocage, ainsi qu'une estimation de la durée de blocage ",
 "readonlytext"	=> "Les ajouts et mises à jour sur la base de données Wikipédia sont actuellement bloqués, probablement pour permettre la maintenance de la base, après quoi, tout rentrera dans l'ordre. Voici la raison pour laquelle l'administrateur a bloqué la base :
@@ -281,11 +215,11 @@ Veuillez rapporter cette erreur à un administrateur, en lui indiquant l'adresse
 "cannotdelete"	=> "Impossible de supprimer la page ou l'image indiquée.",
 
 "badtitle"	=> "Mauvais titre", // Looxix "Bad title",
-"badtitletext"	=> "Le titre de la page demandée est invalide, vide ou le lien interlangue est invalide", // Looxix 
+"badtitletext"	=> "Le titre de la page demandée est invalide, vide ou le lien interlangue est invalide", // Looxix
 "perfdisabled" => "Désolé ! Cette fonctionnalité est temporairement désactivée
 car elle ralentit la base de données à un point tel que plus personne
-ne peut utiliser le wiki.", // Looxix 
-"perfdisabledsub" => "Ceci est une copie de sauvegarde de $1:", // Looxix 
+ne peut utiliser le wiki.", // Looxix
+"perfdisabledsub" => "Ceci est une copie de sauvegarde de $1:", // Looxix
 "viewsource"	=> "Voir le texte source",
 "protectedtext"	=> "Cette page a été bloquée pour empêcher sa modification. Consultez [[Wikipédia:Page protégée]] pour voir les différentes raisons possibles.", // Looxix
 
@@ -305,7 +239,7 @@ N'oubliez pas de personnaliser votre Wikipédia en consultant la page Préféren
 "newusersonly"       => " (nouveaux utilisateurs uniquement)",
 "remembermypassword" => "Se souvenir de mon mot de passe (cookie)",
 "loginproblem"       => "<b>Problème d'identification.</b><br />Essayez à nouveau !",
-"alreadyloggedin"    => "<font color=red><b>Utilisateur $1, vous êtes déjà identifié !</b></font><br />\n",
+"alreadyloggedin"    => "<strong>Utilisateur $1, vous êtes déjà identifié !</strong><br />\n",
 
 "login"         => "Identification",
 "userlogin"     => "Identification",
@@ -346,25 +280,23 @@ Veuillez vous identifier dès que vous l'aurez reçu.",
 "blockedtitle" => "Utilisateur bloqué",
 "blockedtext"  => "Votre compte utilisateur ou votre adresse IP ont été bloqués par $1 pour la raison suivante :<br />$2<p> Vous pouvez contacter l'administrateur pour en discuter.",
 "whitelistedittitle" => "Login requis pour rédiger", // Looxix "Login required to edit",
-"whitelistedittext" => "Vous devez être [[Special:Userlogin|connecté]] pour pouvoir rédiger", // Looxix 
+"whitelistedittext" => "Vous devez être [[Special:Userlogin|connecté]] pour pouvoir rédiger", // Looxix
 "whitelistreadtitle" => "Login requis pour lire", // Looxix "Login required to read",
-"whitelistreadtext" => "Vous devez être [[Special:Userlogin|connecté]] pour pouvoir lire les articles", // Looxix 
-"whitelistacctitle" => "Vous n'êtes pas autorisé à créer un compte", // Looxix 
-"whitelistacctext" => "Pour pouvoir créer un compte sur ce Wiki vous devez être [[Special:Userlogin|connecté]] et avoir les permissions appropriées", // Looxix 
+"whitelistreadtext" => "Vous devez être [[Special:Userlogin|connecté]] pour pouvoir lire les articles", // Looxix
+"whitelistacctitle" => "Vous n'êtes pas autorisé à créer un compte", // Looxix
+"whitelistacctext" => "Pour pouvoir créer un compte sur ce Wiki vous devez être [[Special:Userlogin|connecté]] et avoir les permissions appropriées", // Looxix
 "accmailtitle" => "Mot de passe envoyé.", // Looxix "Password sent.",
-"accmailtext" => "Le mot de passe de '$1' a été envoyé à $2.", // Looxix 
+"accmailtext" => "Le mot de passe de '$1' a été envoyé à $2.", // Looxix
 
 "newarticle"   => "(Nouveau)",
 "newarticletext" => "Saisissez ici le texte de votre article.",
-"anontalkpagetext" => "---- ''Ceci est la page de discussion pour un utilisateur anonyme qui n'a pas encore créé un compte ou qui ne l'utilise pas. Pour cette raison, nous devons utiliser l'[[adresse IP]] numérique pour l'identifier. Une adresse de ce type peut être partagée entre plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:Userlogin|créer un compte ou vous connecter]] afin d'éviter toute future confusion à l'avenir.", 
+"anontalkpagetext" => "---- ''Ceci est la page de discussion pour un utilisateur anonyme qui n'a pas encore créé un compte ou qui ne l'utilise pas. Pour cette raison, nous devons utiliser l'[[adresse IP]] numérique pour l'identifier. Une adresse de ce type peut être partagée entre plusieurs utilisateurs. Si vous êtes un utilisateur anonyme et si vous constatez que des commentaires qui ne vous concernent pas vous ont été adressés, vous pouvez [[Special:Userlogin|créer un compte ou vous connecter]] afin d'éviter toute future confusion à l'avenir.",
 "noarticletext" => "(Il n'y a pour l'instant aucun texte sur cette page)",
 "updated"      => "(Mis à jour)",
 "note"         => "<strong>Note :</strong> ",
 "previewnote"  => "Attention, ce texte n'est qu'une prévisualisation et n'a pas encore été sauvegardé !",
 "previewconflict" => "La prévisualisation montre le texte de cette page tel qu'il apparaîtra une fois sauvegardé.",
 "editing"      => "modification de $1",
-"section edit"	=> " (section)",
-"comment edit"	=> " (commentaire)", // Looxix " (comment)",
 "editconflict" => "Conflit de modification : $1",
 "explainconflict" => "<b>Cette page a été sauvegardée après que vous avez commencé à la modifier.
 La zone d'édition supérieure contient le texte tel qu'il est enregistré actuellement dans la base de données. Vos modifications apparaissent dans la zone d'édition inférieure. Vous allez devoir apporter vos modifications au texte existant. Seul le texte de la zone supérieure sera sauvegardé.<br />",
@@ -377,7 +309,7 @@ La zone d'édition supérieure contient le texte tel qu'il est enregistré actue
 quelques navigateurs gèrent mal les pages approchant ou dépassant 32 ko lors de leur rédaction.
 Peut-être serait-il mieux que vous divisiez la page en sections plus petites.</strong>", // Panoramix
 "readonlywarning" => "<strong>AVERTISSEMENT : cette page a été bloquée pour maintenance,
-vous ne pourrez donc pas sauvegarder vos modifications maintenant. Vous pouvez copier le texte dans un fichier et le sauver pour plus tard.</strong>", // Looxix 
+vous ne pourrez donc pas sauvegarder vos modifications maintenant. Vous pouvez copier le texte dans un fichier et le sauver pour plus tard.</strong>", // Looxix
 "protectedpagewarning" => "<strong>AVERTISSEMENT : cette page a été bloquée.
 Seuls les utilisateurs ayant le statut d'administrateur peuvent la modifier. Soyez certain que
 vous suivez les [[Project:Page protégée|directives concernant les pages protégées]].</strong>", // Looxix
@@ -559,11 +491,9 @@ L'heure indiquée est celle du serveur (UTC).
 ",
 "filename"  => "Nom",
 "filedesc"  => "Description",
-"affirmation" => "Je déclare que le détenteur du copyright de ce fichier accepte de le diffuser selon les termes de la $1.",
 "copyrightpage" => "Wikipédia:Copyright",
 "copyrightpagename" => "licence Wikipédia",
 "uploadedfiles" => "Fichiers copiés",
-"noaffirmation" => "Vous devez confirmer que la copie de ce fichier ne viole aucun copyright.",
 "ignorewarning" => "Ignorer l'avertissement et copier le fichier quand même.",
 "minlength"  => "Les noms des images doivent comporter au moins trois lettres.",
 "badfilename" => "L'image a été renommée \"$1\".",
@@ -627,7 +557,7 @@ Parmi ceux-ci, <b>$2</b> ont le statut d'administrateur (voir $3).",
 "disambiguationstext"	=> "Les articles suivants sont liés à une <i>page d'homonymie</i>. Or, ils devraient être liés au sujet.<br />Une page est considérée comme page d'homonymie si elle est liée à partir de $1.<br />Les liens à partir d'autres <i>espaces</i> ne sont pas pris en compte.",
 "doubleredirects"	=> "Double redirection",
 "doubleredirectstext"	=> "<b>Attention:</b> cette liste peut contenir des \"faux positifs\". Dans ce cas, c'est probablement la page du premier #REDIRECT contient aussi du texte.<br />Chaque ligne contient les liens à la 1re et 2e page de redirection, ainsi que la première ligne de cette dernière, qui donne normalement la \"vraie\" destination. Le premier #REDIRECT devrait lier vers cette destination.",
-"brokenredirects"	=> "Redirections cassées", 
+"brokenredirects"	=> "Redirections cassées",
 "brokenredirectstext"	=> "Ces redirections mènent a une page qui n'existe pas.",
 "selflinks"		=> "Page avec un lien circulaire",
 "selflinkstext"		=> "Les pages suivantes contiennent un lien vers elles-mêmes, ce qui n'est pas permis.",
@@ -709,18 +639,18 @@ Les prochaines modifications de cette page et de la page discussion associée se
 "watchthispage"	=> "Suivre cette page",
 "unwatchthispage" => "Ne plus suivre",
 "notanarticle"	=> "Aucun article",
-"watchnochange" => "Aucune des pages que vous suivez n'a été modifiée pendant la période affichée.", // Looxix 
-"watchdetails" => "Vous suivez $1 pages, sans compter les pages de discussion.  [$4 Afficher et modifier la liste complète].", // Looxix 
-"watchmethod-recent" => "vérification des modifications récentes des pages suivies", // Looxix 
-"watchmethod-list" => "vérification des pages suivies pour des modifications récentes", // Looxix 
-
-"removechecked" => "Retirer de la liste de suivi les articles sélectionnés", // Looxix 
-"watchlistcontains" => "Votre liste de suivi contient $1 pages", // Looxix 
-"watcheditlist" => "Ceci est votre liste de suivi par ordre alphabétique. Sélectionnez les pages que vous souhaitez retirer de la liste et cliquez le bouton \"retirer de la liste de suivi\" en bas de l'écran.", // Looxix 
-"removingchecked" => "Les articles sélectionnés sont retirés de votre liste de suivi...", // Looxix 
+"watchnochange" => "Aucune des pages que vous suivez n'a été modifiée pendant la période affichée.", // Looxix
+"watchdetails" => "Vous suivez $1 pages, sans compter les pages de discussion.  [$4 Afficher et modifier la liste complète].", // Looxix
+"watchmethod-recent" => "vérification des modifications récentes des pages suivies", // Looxix
+"watchmethod-list" => "vérification des pages suivies pour des modifications récentes", // Looxix
+
+"removechecked" => "Retirer de la liste de suivi les articles sélectionnés", // Looxix
+"watchlistcontains" => "Votre liste de suivi contient $1 pages", // Looxix
+"watcheditlist" => "Ceci est votre liste de suivi par ordre alphabétique. Sélectionnez les pages que vous souhaitez retirer de la liste et cliquez le bouton \"retirer de la liste de suivi\" en bas de l'écran.", // Looxix
+"removingchecked" => "Les articles sélectionnés sont retirés de votre liste de suivi...", // Looxix
 "couldntremove" => "Impossible de retirer l'article '$1'...", // Looxix "Couldn't remove item '$1'...",
-"iteminvalidname" => "Problème avec l'article '$1': les nom est invalide...", // Looxix 
-"wlnote" => "Ci-dessous se trouve les $1 dernières modifications depuis les <b>$2</b> dernières heures.", // Looxix 
+"iteminvalidname" => "Problème avec l'article '$1': les nom est invalide...", // Looxix
+"wlnote" => "Ci-dessous se trouve les $1 dernières modifications depuis les <b>$2</b> dernières heures.", // Looxix
 
 
 # Delete/protect/revert
@@ -755,12 +685,12 @@ L'heure indiquée est celle du serveur (UTC).
 "rollbackfailed" => "La révocation a échoué",
 "cantrollback"	=> "Impossible de révoquer: dernier auteur est le seul à avoir modifié cet article",
 "alreadyrolled"	=> "Impossible de révoquer la dernière modification de [[$1]]
-par  [[User:$2|$2]] ([[User talk:$2|Talk]]); quelqu'un d'autre à déjà modifer ou révoquer l'article. 
+par  [[User:$2|$2]] ([[User talk:$2|Talk]]); quelqu'un d'autre à déjà modifer ou révoquer l'article.
 
-La dernière modificaion était de [[User:$3|$3]] ([[User talk:$3|Talk]]). ", //Looxix 
+La dernière modificaion était de [[User:$3|$3]] ([[User talk:$3|Talk]]). ", //Looxix
 
 #   only shown if there is an edit comment
-"editcomment" => "Le résumé de la modification était: \"<i>$1</i>\".", //Looxix 
+"editcomment" => "Le résumé de la modification était: \"<i>$1</i>\".", //Looxix
 "revertpage"	=> "restitution de la dernière modification de $1",
 
 # Undelete
@@ -774,12 +704,12 @@ La corbeille peut être effacée périodiquement.",
 "undeleterevisions" => "$1 révisions archivées", // Looxix "$1 revisions archived",
 "undeletehistory" => "Si vous restaurez la page, toutes les révisions seront restaurées dans l'historique.
 Si une nouvelle page avec le même nom a été crée depuis la suppression,
-les révisions restaurées apparaîtront dans l'historique antérieur et la version courante ne sera pas automatiquement remplacée.", // Looxix  
-"undeleterevision" => "Version effacée ($1)", // Looxix "Deleted revision as of $1",	
+les révisions restaurées apparaîtront dans l'historique antérieur et la version courante ne sera pas automatiquement remplacée.", // Looxix
+"undeleterevision" => "Version effacée ($1)", // Looxix "Deleted revision as of $1",
 "undeletebtn"	=> "Restaurer !", // Looxix "Restore!",
 "undeletedarticle" => "restauré \"$1\"",	// FvdP "restored \"$1\""
 "undeletedtext"   => "L'article [[$1]] a été restauré avec succès.
-Voir [[Wikipedia:Trace des effacements]] pour la liste des suppressions et des restaurations récentes.", // Looxix 
+Voir [[Wikipedia:Trace des effacements]] pour la liste des suppressions et des restaurations récentes.", // Looxix
 # Contributions
 #
 "contributions"	=> "Contributions",
@@ -810,7 +740,6 @@ Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui on
 "ipbreason"	=> "Motif",
 "ipbsubmit"	=> "Bloquer cette adresse",
 "badipaddress"	=> "L'adresse IP n'est pas correcte.",
-"noblockreason" => "Vous devez indiquer le motif du blocage.",
 "blockipsuccesssub" => "Blocage réussi",
 "blockipsuccesstext" => "L'adresse IP \"$1\" a été bloquée.
 <br />Vous pouvez consulter sur cette [[Special:Ipblocklist|page]] la liste des adresses IP bloquées.",
@@ -824,7 +753,7 @@ Donnez ci-dessous une raison précise (par exemple en indiquant les pages qui on
 "blocklink"	=> "bloquer",
 "unblocklink"	=> "débloquer",
 "contribslink"	=> "contribs",
-"autoblocker"	=> "Autobloqué parce que vous partagez un adresse IP avec \"$1\". Raison : \"$2\".", // Looxix 
+"autoblocker"	=> "Autobloqué parce que vous partagez un adresse IP avec \"$1\". Raison : \"$2\".", // Looxix
 
 
 # Developer tools
@@ -848,21 +777,6 @@ Veuillez confirmer que c'est bien là ce que vous voulez faire.",
 <br />N'oubliez pas de la déverrouiller lorsque vous aurez terminé votre opération de maintenance.",
 "unlockdbsuccesstext" => "La base de données de Wikipédia est déverrouillée.",
 
-# SQL query
-#
-"asksql"	=> "Requête SQL",
-"asksqltext"	=> "Utilisez le formulaire ci-dessous pour faire une requête directe sur la base de données de Wikipédia.
-Utilisez des guillemets simples ('comme ceci') pour délimiter les chaînes de caractères.
-Cette opération peut surcharger considérablement le serveur, faites en usage
-avec modération.",
-"sqlislogged"	=> "Veillez noter que toutes les requêtes sont loguées", // Looxix "Please note that all queries are logged.",	
-"sqlquery"	 => "Saisir la requête",
-
-"querybtn"	=> "Envoyer la requête",
-"selectonly"	=> "Les requêtes autres que \"SELECT\" sont réservées aux développeurs de
-Wikipédia.",
-"querysuccessful" => "Requête réussie",
-
 # Move page
 #
 "movepage"  => "Déplacer un article",
@@ -900,16 +814,16 @@ sous le nouveau nom. S'il vous plait, fusionnez les manuellement.", // Looxix
 
 # Math
 
-	'mw_math_png' => "Totjorn produsir una image PNG",  
-	'mw_math_simple' => "HTML si plan simpla, senon PNG", 
-	'mw_math_html' => "HTML si possibla, senon PNG", 
-	'mw_math_source' => "Laissar lo còdi TeX del origina",
-	'mw_math_modern' => "Per los navigaire modèrn",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Totjorn produsir una image PNG",
+'mw_math_simple' => "HTML si plan simpla, senon PNG",
+'mw_math_html' => "HTML si possibla, senon PNG",
+'mw_math_source' => "Laissar lo còdi TeX del origina",
+'mw_math_modern' => "Per los navigaire modèrn",
+'mw_math_mathml' => 'MathML',
 
 );
 
-class LanguageOc extends LanguageUtf8{ 
+class LanguageOc extends LanguageUtf8{
 
 	function getBookstoreList () {
 		global $wgBookstoreListOc ;
@@ -931,8 +845,6 @@ class LanguageOc extends LanguageUtf8{
 		return $wgSkinNamesOc;
 	}
 
-	// Inherit userAdjust()
-
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
@@ -946,21 +858,6 @@ class LanguageOc extends LanguageUtf8{
 		return $this->date( $ts, $adj ) . " à " . $this->time( $ts, $adj );
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesOc;
-		return $wgValidSpecialPagesOc;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesOc;
-		return $wgSysopSpecialPagesOc;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesOc;
-		return $wgDeveloperSpecialPagesOc;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesOc, $wgAllMessagesEn;
 		$m = $wgAllMessagesOc[$key];
diff --git a/languages/LanguageOs.php b/languages/LanguageOs.php
index c9032776edd2..1c416cfb1644 100644
--- a/languages/LanguageOs.php
+++ b/languages/LanguageOs.php
@@ -9,63 +9,56 @@
 require_once( "LanguageRu.php" );
 
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
+	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
 /* private */ $wgNamespaceNamesOs = array(
-       NS_MEDIA            => 'Media', //чтоб не писать "Мультимедия"
-        NS_SPECIAL          => 'Сæрмагонд',
-        NS_MAIN             => '',
-        NS_TALK             => 'Дискусси',
-        NS_USER             => 'Архайæг', 
-        NS_USER_TALK        => 'Архайæджы_дискусси',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => 'Дискусси_'+$wgMetaNamespace,
-        NS_IMAGE            => 'Ныв',
-        NS_IMAGE_TALK       => 'Нывы_тыххæй_дискусси', 
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'Дискусси_MediaWiki',
-        NS_TEMPLATE         => 'Шаблон',
-        NS_TEMPLATE_TALK    => 'Шаблоны_тыххæй_дискусси',
-        NS_HELP             => 'Æххуыс',
-        NS_HELP_TALK        => 'Æххуысы_тыххæй_дискусси', 
-        NS_CATEGORY         => 'Категори',
-        NS_CATEGORY_TALK    => 'Категорийы_тыххæй_дискусси',
+	NS_MEDIA            => 'Media', //чтоб не писать "Мультимедия"
+	NS_SPECIAL          => 'Сæрмагонд',
+	NS_MAIN             => '',
+	NS_TALK             => 'Дискусси',
+	NS_USER             => 'Архайæг',
+	NS_USER_TALK        => 'Архайæджы_дискусси',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => 'Дискусси_'+$wgMetaNamespace,
+	NS_IMAGE            => 'Ныв',
+	NS_IMAGE_TALK       => 'Нывы_тыххæй_дискусси',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Дискусси_MediaWiki',
+	NS_TEMPLATE         => 'Шаблон',
+	NS_TEMPLATE_TALK    => 'Шаблоны_тыххæй_дискусси',
+	NS_HELP             => 'Æххуыс',
+	NS_HELP_TALK        => 'Æххуысы_тыххæй_дискусси',
+	NS_CATEGORY         => 'Категори',
+	NS_CATEGORY_TALK    => 'Категорийы_тыххæй_дискусси',
 ) + $wgNamespaceNamesEn;
 
-if(isset($wgExtraNamespaces)) {
-        $wgNamespaceNamesOs=$wgNamespaceNamesOs+$wgExtraNamespaces;
-}
-
 /* private */ $wgQuickbarSettingsOs = array(
-        'Ма равдис', 'Галиуырдыгæй', 'Рахизырдыгæй', 'Рахизырдыгæй ленккæнгæ'
- ); 
+	'Ма равдис', 'Галиуырдыгæй', 'Рахизырдыгæй', 'Рахизырдыгæй ленккæнгæ'
+ );
 
 /* private */ $wgSkinNamesOs = array(
-        'standard' => 'Стандартон',
-        'nostalgia' => 'Æнкъард',
-        'cologneblue' => 'Кёльны æрхæндæг',
-        'davinci' => 'Да Винчи',
-        'mono' => 'Моно',
-        'monobook' => 'Моно-чиныг',
-        'myskin' => 'Мæхи',
-        'chick' => 'Карк'
- );
+	'standard' => 'Стандартон',
+	'nostalgia' => 'Æнкъард',
+	'cologneblue' => 'Кёльны æрхæндæг',
+	'davinci' => 'Да Винчи',
+	'mono' => 'Моно',
+	'monobook' => 'Моно-чиныг',
+	'myskin' => 'Мæхи',
+	'chick' => 'Карк'
+ ) + $wgSkinNamesEn;
 
 /* private */ $wgAllMessagesOs = array(
 'titlematches' => 'Статьяты сæргæндты æмцаутæ',
 'toc' => 'Сæргæндтæ',
 'addedwatch' => "Дæ цæст кæмæ дарыс, уыцы статьятæм бафтыд.",
-'all' => "æппæт",
 'allarticles' => "Æппæт статьятæ",
 'allmessages' => "Æппæт техникон фыстытæ",
 'allpages' => "Æппæт фæрстæ",
-'allpagesnamespace' => "Æппæт фæрстæ ($1)",
 'allpagesnext' => "дарддæр",
 'allpagesprev' => "фæстæмæ",
 'alphaindexline' => "$1 (уыдоны ’хсæн цы статьятæ ис, фен) $2",
 'ancientpages' => "Зæронддæр фæрстæ",
 'and' => "æмæ",
-'articlenamespace' => "(статьятæ)",
 'articlepage' => "Фен статья",
 'blanknamespace' => "(Сæйраг)",
 'bold_sample' => "Ацы текст бæзджын суыдзæн",
@@ -164,7 +157,7 @@ if(isset($wgExtraNamespaces)) {
 'qbfind' => "Агур",
 'qbspecialpages' => "Сæрмагонд фæрстæ",
 'randompage' => "Æнæбары æвзæрст фарс",
-'rclinks' => "Фæстаг $1 ивддзинæдтæ (афæстаг $2 боны дæргъы чи ’рцыдысты) равдис; 
+'rclinks' => "Фæстаг $1 ивддзинæдтæ (афæстаг $2 боны дæргъы чи ’рцыдысты) равдис;
 $3",
 'rcnote' => "Дæлдæр нымад сты афæстаг <strong>$2</strong> боны дæргъы конд <strong>$1</strong> ивддзинад(ы).",
 'recentchanges' => "Фæстаг ивддзинæдтæ",
@@ -232,68 +225,44 @@ $3",
 );
 
 class LanguageOs extends LanguageRu {
-        function LanguageOs() {
-                global $wgNamespaceNamesOs, $wgMetaNamespace;
-                LanguageUtf8::LanguageUtf8();
-        }
-
-        function getNamespaces() {
-                global $wgNamespaceNamesOs;
-                return $wgNamespaceNamesOs;
-        }
-
-        function getQuickbarSettings() {
-                global $wgQuickbarSettingsOs;
-                return $wgQuickbarSettingsOs;
-        }
-
-        function getSkinNames() {
-                global $wgSkinNamesOs;
-                return $wgSkinNamesOs;
-        }
+	function LanguageOs() {
+		global $wgNamespaceNamesOs, $wgMetaNamespace;
+		LanguageUtf8::LanguageUtf8();
+	}
 
-        function getDateFormats() {
-                global $wgDateFormatsRu;
-                return $wgDateFormatsRu;
-        }
+	function getNamespaces() {
+		global $wgNamespaceNamesOs;
+		return $wgNamespaceNamesOs;
+	}
 
-        function getValidSpecialPages()
-        {
-                global $wgValidSpecialPagesRu;
-                return $wgValidSpecialPagesRu;
-        }
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsOs;
+		return $wgQuickbarSettingsOs;
+	}
 
-        function getSysopSpecialPages()
-        {
-                global $wgSysopSpecialPagesRu;
-                return $wgSysopSpecialPagesRu;
-        }
+	function getSkinNames() {
+		global $wgSkinNamesOs;
+		return $wgSkinNamesOs;
+	}
 
-        function getDeveloperSpecialPages()
-        {
-                global $wgDeveloperSpecialPagesRu;
-                return $wgDeveloperSpecialPagesRu;
-        }
+	function getDateFormats() {
+		global $wgDateFormatsRu;
+		return $wgDateFormatsRu;
+	}
 
-        function getMessage( $key )
-        {
-                global $wgAllMessagesOs;
+	function getMessage( $key ) {
+		global $wgAllMessagesOs;
 		return isset($wgAllMessagesOs[$key]) ? $wgAllMessagesOs[$key] : parent::getMessage($key);
-        }
-
-        function fallback8bitEncoding() {
-                return "windows-1251";
-        }
+	}
 
-        function getMagicWords()  {
-                global $wgMagicWordsRu;
-                return $wgMagicWordsRu;
-        }
+	function fallback8bitEncoding() {
+		return "windows-1251";
+	}
 
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, '.,', ', ' ) : $number;
 	}
-	
+
 }
 ?>
diff --git a/languages/LanguagePa.php b/languages/LanguagePa.php
index c43bb0e7a7d4..3a55efecb20f 100644
--- a/languages/LanguagePa.php
+++ b/languages/LanguagePa.php
@@ -42,9 +42,6 @@ require_once('LanguageUtf8.php');
 #-------------------------------------------------------------------
 # Default messages
 #-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
 
 /* private */ $wgAllMessagesPa = array(
 # Bits of text used by many pages:
@@ -103,7 +100,6 @@ require_once('LanguageUtf8.php');
 'article'		=> 'ਵਿਸ਼ਾ-ਵਸਤੂ ਵਾਲਾ ਪੰਨਾ',
 'help'		=> 'ਮਦਦ',
 'helppage'		=> 'ਮਦਦ:ਵਿਸ਼ਾ-ਵਸਤੂ',
-'wikititlesuffix'	=> '{{SITENAME}}',
 'bugreports'		=> 'ਖਾਮੀ ਸੂਚਨਾ',
 'bugreportspage'	=> 'Project:ਖਾਮੀ_ਸੂਚਨਾ',
 'sitesupport'		=> 'ਦਾਨ',
@@ -127,10 +123,8 @@ require_once('LanguageUtf8.php');
 'anontalk'		=> 'ਇੱਸ ਆਈ-ਪੀ (IP) ਦੀ ਚਰਚਾ',
 'navigation'		=> 'ਨੈਵੀਗੇਸ਼ੱਨ',
 
-# NOTE: To turn off 'Current Events' in the sidebar,
-# set 'currentevents' => '-'
 'currentevents'	=> '-',
-/*'currentevents-url' => 'Current events',*/
+
 
 'disclaimers'		=> 'ਡਿਸਕਲੇਮਰ',
 'disclaimerpage'	=> 'Project:General_disclaimer',
@@ -181,8 +175,6 @@ require_once('LanguageUtf8.php');
 'sysoptext'		=> 'ਜੋ ਤੁਸੀਂ ਕਰਨਾ ਚਾਹ ਰਹੇ ਹੋ, ਓਹ ਸਿਰਫ਼ \'sysop\' ਦਰਜੇ ਵਾਲੇ ਮੈਂਬਰ ਹੀ ਕਰ ਸਕਦੇ ਹਨ. ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਵੇਖੋ: $1',
 'developertitle'	=> 'Developer ਦਰਜਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ',
 'developertext'	=> 'ਜੋ ਤੁਸੀਂ ਕਰਨਾ ਚਾਹ ਰਹੇ ਹੋ, ਓਹ ਸਿਰਫ਼ \'developer\' ਦਰਜੇ ਵਾਲੇ ਮੈਂਬਰ ਹੀ ਕਰ ਸਕਦੇ ਹਨ. ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਵੇਖੋ: $1',
-'bureaucrattitle'	=> 'Bureaucrat ਦਰਜਾ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ',
-'bureaucrattext'	=> 'ਜੋ ਤੁਸੀਂ ਕਰਨਾ ਚਾਹ ਰਹੇ ਹੋ, ਓਹ ਸਿਰਫ਼ \'bureaucrat\' ਦਰਜੇ ਵਾਲੇ sysop ਮੈਂਬਰ ਹੀ ਕਰ ਸਕਦੇ ਹਨ',
 'nbytes'		=> '$1 ਬਾਈਟ',
 'go'			=> 'ਜਾਓ',
 'ok'			=> 'ਠੀਕ ਹੈ',
@@ -254,15 +246,14 @@ a number of reasons why this may be so, please see
 [[{{ns:4}}:Protected page]].
 
 You can view and copy the source of this page:',
-'seriousxhtmlerrors'	=> 'Tidy ਦੁਆਰਾ ਕੁਝ ਬਹੁਤ ਹੀ ਅਹਿਮ XHTML markup ਦੀਆਂ ਗਲਤੀਆਂ ਲੱਭੀਆਂ ਗਈਆਂ ਹਨ',
 
 # Login and logout pages
 #
 'logouttitle'		=> 'ਮੈਂਬਰ ਲਾਗ ਆਊਟ',
-'logouttext'		=> 'ਹੁਣ ਤੁਸੀਂ ਲਾਗ ਆਊਟ ਹੋ ਚੁੱਕੇ ਹੋ। ਹੁਣ ਤੁਸੀਂ ਅਗਿਆਤ ਰੂਪ ਵਿੱਚ 
- {{SITENAME}} ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਓਹੀ ਮੈਂਬਰ 
-ਜਾਂ ਕਿਸੇ ਹੋਰ ਮੈਂਬਰ ਦੇ ਰੂਪ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰ ਸਕਦੇ ਹੋ।  
-Note that some pages may continue to be displayed as if you were 
+'logouttext'		=> 'ਹੁਣ ਤੁਸੀਂ ਲਾਗ ਆਊਟ ਹੋ ਚੁੱਕੇ ਹੋ। ਹੁਣ ਤੁਸੀਂ ਅਗਿਆਤ ਰੂਪ ਵਿੱਚ
+ {{SITENAME}} ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਓਹੀ ਮੈਂਬਰ
+ਜਾਂ ਕਿਸੇ ਹੋਰ ਮੈਂਬਰ ਦੇ ਰੂਪ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰ ਸਕਦੇ ਹੋ।
+Note that some pages may continue to be displayed as if you were
 still logged in, until you clear your browser cache\n',
 
 'welcomecreation'	=> '== ਜੀ ਆਇਆਂ ਨੂੰ, $1! ==
@@ -276,7 +267,7 @@ still logged in, until you clear your browser cache\n',
 'newusersonly'	=> '(ਸਿਰਫ਼ ਨਵੇਂ ਮੈਂਬਰਾਂ ਲਈ)',
 'remembermypassword'	=> 'ਅੱਗੋਂ ਲਈ ਮੇਰਾ ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ',
 'loginproblem'	=> '<b>ਤੁਹਾਡੇ ਲਾਗ ਇਨ ਵਿੱਚ ਕੁਝ ਸਮੱਸਿਆ ਹੈ,</b><br />ਦੌਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ!',
-'alreadyloggedin'	=> '<font color=red><b>$1, ਤੁਸੀਂ ਪਿਹਲਾਂ ਹੀ ਲਾਗ ਇਨ ਹੋ ਚੁੱਕੇ ਹੋ!</b></font><br />\n',
+'alreadyloggedin'	=> '<strong>$1, ਤੁਸੀਂ ਪਿਹਲਾਂ ਹੀ ਲਾਗ ਇਨ ਹੋ ਚੁੱਕੇ ਹੋ!</strong><br />\n',
 
 'login'		=> 'ਲਾਗ ਇਨ',
 'loginprompt'		=> '{{SITENAME}} ਵਿਚ ਲਾੱਗ-ਇਨ ਕਰਨ ਲਈ ਤੁਹਾਡੀਆਂ cookies enabled ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ।',
@@ -293,31 +284,31 @@ still logged in, until you clear your browser cache\n',
 'yourlanguage'	=> 'Interface language',
 'yourvariant'		=> 'Language variant',
 'yournick'		=> 'ਤੁਹਾਡਾ ਉਪਨਾਮ (ਦਸਤਖ਼ਤ ਲਈ)',
-'emailforlost'	=> 'Star (*) ਨਿਸ਼ਾਨ ਲੱਗੇ ਖਾਨਿਆਂ ਵਿੱਚ ਭਰਨਾ ਲਾਜ਼ਮੀ ਨਹੀਂ ਹੈ. 
-ਜੇ ਤੁਸੀਂ ਈ-ਮੇਲ ਦਿੰਦੇ ਹੋ ਤਾਂ ਬਿਨਾਂ ਤੁਹਾਡੇ ਅਸਲੀ ਈ-ਮੇਲ ਨੂੰ ਜਾਣੇ, ਇਸ website ਦੁਆਰਾ ਲੋਕ ਤੁਹਾਨੂੰ ਸੰਪੰਰਕ ਕਰ ਸਕਦੇ ਹਨ 
+'emailforlost'	=> 'Star (*) ਨਿਸ਼ਾਨ ਲੱਗੇ ਖਾਨਿਆਂ ਵਿੱਚ ਭਰਨਾ ਲਾਜ਼ਮੀ ਨਹੀਂ ਹੈ.
+ਜੇ ਤੁਸੀਂ ਈ-ਮੇਲ ਦਿੰਦੇ ਹੋ ਤਾਂ ਬਿਨਾਂ ਤੁਹਾਡੇ ਅਸਲੀ ਈ-ਮੇਲ ਨੂੰ ਜਾਣੇ, ਇਸ website ਦੁਆਰਾ ਲੋਕ ਤੁਹਾਨੂੰ ਸੰਪੰਰਕ ਕਰ ਸਕਦੇ ਹਨ
 ਅਤੇ ਜੇ ਕਦੀ ਤੁਸੀਂ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ, ਤਾਂ ਇਸ ਈ-ਮੇਲ ਤੇ ਤੁਹਾਨੂੰ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ. <br /><br />ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਮ, ਜੇ ਤੁਸੀਂ ਇੱਥੇ ਦਿੰਦੇ ਹੋ, ਤੁਹਾਡੇ ਕੰਮ ਨੂੰ attribution ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ',
-'prefs-help-realname'	=> '* <strong>ਅਸਲੀ ਨਾਮ</strong> (ਗੈਰ-ਜ਼ਰੂਰੀ): ਜੇ ਤੁਸੀਂ ਭਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੰਮ ਨੂੰ attribution ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ<br/>',
-'prefs-help-email'	=> '* <strong>ਈ-ਮੇਲ</strong> (ਗੈਰ-ਜ਼ਰੂਰੀ): ਜੇ ਭਰਦੇ ਹੋ ਤਾਂ ਬਿਨਾਂ ਤੁਹਾਡੇ ਅਸਲੀ ਈ-ਮੇਲ ਨੂੰ ਜਾਣੇ, ਇਸ website ਦੁਆਰਾ ਲੋਗ ਤੁਹਾਨੂੰ ਸੰਪੰਰਕ ਕਰ ਸਕਦੇ ਹਨ 
+'prefs-help-realname'	=> '* <strong>ਅਸਲੀ ਨਾਮ</strong> (ਗੈਰ-ਜ਼ਰੂਰੀ): ਜੇ ਤੁਸੀਂ ਭਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੰਮ ਨੂੰ attribution ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ<br />',
+'prefs-help-email'	=> '* <strong>ਈ-ਮੇਲ</strong> (ਗੈਰ-ਜ਼ਰੂਰੀ): ਜੇ ਭਰਦੇ ਹੋ ਤਾਂ ਬਿਨਾਂ ਤੁਹਾਡੇ ਅਸਲੀ ਈ-ਮੇਲ ਨੂੰ ਜਾਣੇ, ਇਸ website ਦੁਆਰਾ ਲੋਗ ਤੁਹਾਨੂੰ ਸੰਪੰਰਕ ਕਰ ਸਕਦੇ ਹਨ
 ਅਤੇ ਜੇ ਕਦੀ ਤੁਸੀਂ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਜਾਓ, ਤਾਂ ਇਸ ਈ-ਮੇਲ ਤੇ ਤੁਹਾਨੂੰ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ.',
 'loginerror'		=> 'ਲਾਗ ਇਨ ਵਿੱਚ ਗਲਤੀ',
 'noname'		=> 'ਤੁਸੀਂ ਮੈਂਬਰ ਦਾ ਨਾਮ ਸਹੀ ਨਹੀਂ ਦੱਸਿਆ.',
 'loginsuccesstitle'	=> 'ਲਾਗ ਇਨ ਕਾਮਯਾਬ ਰਿਹਾ',
 'loginsuccess'	=> 'ਹੁਣ ਤੁਸੀਂ {{SITENAME}} ਵਿੱਚ \'$1\' ਨਾਮ ਨਾਲ ਲਾਗ ਇਨ ਹੋ',
-'nosuchuser'		=> '\'$1\' ਨਾਮ ਦਾ ਕੋਈ ਮੈਂਬਰ ਨਹੀਂ ਹੈ. 
+'nosuchuser'		=> '\'$1\' ਨਾਮ ਦਾ ਕੋਈ ਮੈਂਬਰ ਨਹੀਂ ਹੈ.
 ਕਿਰਪਾ ਕਰਕੇ ਨਾਮ ਸਹੀ ਲਿੱਖੋ ਜਾਂ ਨੀਚੇ ਦਿੱਤੇ ਗਏ ਫ਼ਾਰਮ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੱਕ ਨਵਾਂ ਖਾਤਾ ਬਣਾ ਲਓ.',
 'wrongpassword'	=> 'ਦਿੱਤਾ ਗਿਆ ਪਾਸਵਰਡ ਗਲਤ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਦੋਬਾਰਾ ਯਤਨ ਕਰੋ',
 'mailmypassword'	=> 'ਮੈਨੂੰ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਈ-ਮੇਲ ਰਾਹੀਂ ਭੇਜ ਦਿਓ',
 'passwordremindertitle'	=> '{{SITENAME}} ਵਲੋਂ ਪਾਸਵਰਡ ਯਾਦਦਹਾਣੀ-ਪੱਤ੍ਰ (Password Reminder from {{SITENAME}})',
-'passwordremindertext'	=> 'ਕਿਸੇ ਨੇ (ਸ਼ਾਯਿਦ ਤੁਸੀਂ ਹੀ, $1 IP address ਤੋਂ) 
- {{SITENAME}} ਲਾਗ ਇਨ ਦਾ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜਣ ਦੀ ਮੰਗ ਕੀਤੀ ਸੀ. 
-ਮੈਂਬਰ \'$1\' ਦਾ ਹੁਣ ਨਵਾਂ ਪਾਸਵਰਡ \'$3\' ਹੈ. 
+'passwordremindertext'	=> 'ਕਿਸੇ ਨੇ (ਸ਼ਾਯਿਦ ਤੁਸੀਂ ਹੀ, $1 IP address ਤੋਂ)
+ {{SITENAME}} ਲਾਗ ਇਨ ਦਾ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜਣ ਦੀ ਮੰਗ ਕੀਤੀ ਸੀ.
+ਮੈਂਬਰ \'$1\' ਦਾ ਹੁਣ ਨਵਾਂ ਪਾਸਵਰਡ \'$3\' ਹੈ.
 ਕਿਰਪਾ ਕਰਕੇ {{SITENAME}} ਵਿੱਚ ਲਾਗ ਇਨ ਕਰਕੇ ਹੁਣੇ ਆਪਣਾ ਪਾਸਵਰਡ ਬਦਲ ਲਓ.\n<br /><br />
 Someone (probably you, from IP address $1)
 requested that we send you a new {{SITENAME}} login password.
 The password for user \'$2\' is now \'$3\'.
 You should log in and change your password now.',
 'noemail'		=> 'ਮੈਂਬਰ \'$1\' ਲਈ ਕੋਈ ਈ-ਮੇਲ ਅਡ੍ਰੈੱਸ ਨਹੀਂ ਹੈ',
-'passwordsent'	=> '\'$1\' ਮੈਂਬਰ ਦੇ ਈ-ਮੇਲ ਅਡ੍ਰੈੱਸ ਤੇ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜ ਦਿੱਤਾ ਗਿਆ ਹੈ. 
+'passwordsent'	=> '\'$1\' ਮੈਂਬਰ ਦੇ ਈ-ਮੇਲ ਅਡ੍ਰੈੱਸ ਤੇ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਭੇਜ ਦਿੱਤਾ ਗਿਆ ਹੈ.
 ਪਾਸਵਰਡ ਮਿਲੱਣ ਤੋਂ ਬਾਅਦ ਕਿਰਪਾ ਲਾਗ ਇਨ ਜ਼ਰੂਰ ਕਰੋ.',
 'loginend'		=> ' ',
 'mailerror'		=> 'ਮੇਲ (mail) $1 ਭੇਜਣ ਵਿੱਚ ਸਮੱਸਿਆ ਆ ਗਈ ਹੈ',
@@ -343,12 +334,12 @@ You should log in and change your password now.',
 'preview'		=> 'ਝਲਕ',
 'showpreview'		=> 'ਝਲਕ ਦਿਖਾਓ',
 'blockedtitle'	=> 'ਮੈਂਬਰ ਤੇ ਰੋਕ ਲਗਾ ਦਿੱਤੀ ਗਈ ਹੈ',
-'blockedtext'		=> 'ਤੁਹਾਡੇ ਮੈਂਬਰ ਨਾਮ ਜਾਂ IP address ਉੱਤੇ $1 ਦੁਆਰਾ ਰੋਕ ਲਗਾ ਦਿੱਤੀ ਗਈ ਹੈ. 
-ਕਾਰਣ ਹੈ:<br />\'\'$2\'\'<p>ਇਸ ਰੋਕ ਦੇ ਬਾਰੇ ਵਿੱਚ ਚਰਚਾ ਕਰਨ ਲਈ 
-$1 ਜਾਂ ਕਿਸੇ ਵੀ ਹੋਰ [[{{ns:4}}:ਪ੍ਰਸ਼ਾਸਕ]] 
-ਨੂੰ ਸੰਪੰਰਕ ਕਰੋ. ਧਿਆਨ ਦਿਓ ਕਿ ਤੁਸੀਂ ਓਹਨਾਂ ਚਿਰ \'ਇਸ ਮੈਂਬਰ ਨੂੰ ਈ-ਮੇਲ ਕਰੋ\' ਸੁਵੀਧਾ ਦੀ ਵਰਤੋਂ 
-ਨਹੀਂ ਕਰ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ [[Special:Preferences|preferences]] 
-ਵਿੱਚ ਆਪਣਾ ਈ-ਮੇਲ ਨਹੀਂ ਦਿੰਦੇ. ਤੁਹਾਡਾ IP address ਹੈ $3. 
+'blockedtext'		=> 'ਤੁਹਾਡੇ ਮੈਂਬਰ ਨਾਮ ਜਾਂ IP address ਉੱਤੇ $1 ਦੁਆਰਾ ਰੋਕ ਲਗਾ ਦਿੱਤੀ ਗਈ ਹੈ.
+ਕਾਰਣ ਹੈ:<br />\'\'$2\'\'<p>ਇਸ ਰੋਕ ਦੇ ਬਾਰੇ ਵਿੱਚ ਚਰਚਾ ਕਰਨ ਲਈ
+$1 ਜਾਂ ਕਿਸੇ ਵੀ ਹੋਰ [[{{ns:4}}:ਪ੍ਰਸ਼ਾਸਕ]]
+ਨੂੰ ਸੰਪੰਰਕ ਕਰੋ. ਧਿਆਨ ਦਿਓ ਕਿ ਤੁਸੀਂ ਓਹਨਾਂ ਚਿਰ \'ਇਸ ਮੈਂਬਰ ਨੂੰ ਈ-ਮੇਲ ਕਰੋ\' ਸੁਵੀਧਾ ਦੀ ਵਰਤੋਂ
+ਨਹੀਂ ਕਰ ਸਕਦੇ, ਜਦੋਂ ਤੱਕ ਕਿ ਤੁਸੀਂ [[Special:Preferences|preferences]]
+ਵਿੱਚ ਆਪਣਾ ਈ-ਮੇਲ ਨਹੀਂ ਦਿੰਦੇ. ਤੁਹਾਡਾ IP address ਹੈ $3.
 ਕਿਰਪਾ ਕਰਕੇ ਪੁਛ-ਗਿੱਛ ਕਰਦੇ ਵਕਤ ਇਸ IP address ਦੀ ਵਰਤੋਂ ਜ਼ਰੂਰ ਕਰੋ.',
 'whitelistedittitle'	=> 'ਬਦਲਾਵ ਕਰਨ ਲਈ ਲਾੱਗ-ਇਨ ਹੋਣਾ ਜ਼ਰੂਰੀ ਹੈ',
 'whitelistedittext'	=> 'ਤੁਹਾਨੂੰ ਲੇਖਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਲਈ [[Special:Userlogin|login]] ਕਰਨਾ ਜ਼ਰੂਰੀ ਹੈ',
@@ -362,9 +353,9 @@ $1 ਜਾਂ ਕਿਸੇ ਵੀ ਹੋਰ [[{{ns:4}}:ਪ੍ਰਸ਼ਾਸਕ]]
 'accmailtext'		=> '\'$1\' ਦਾ ਪਾਸਵਰਡ $2 ਨੂੰ ਭੇਜ ਦਿੱਤਾ ਗਿਆ ਹੈ',
 'newarticle'		=> '(ਨਵਾਂ ਲੇਖ)',
 'newarticletext'	=> '
-ਤੁਸੀਂ ਅਜੇਹੇ ਪੰਨੇ ਤੇ ਪੁੱਜ ਗਏ ਹੋ ਜੋ ਅਜੇ ਲਿੱਖਿਆ ਨਹੀਂ ਗਿਆ ਹੈ. 
-ਜੇ ਤੁਸੀਂ ਇਸ ਪੰਨੇ ਨੂੰ ਬਨਾਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਹੇਠਾਂ ਦਿੱਤੀ 
-ਥਾਂ ਵਿੱਚ ਲਿੱਖਣਾ ਸ਼ੁਰੂ ਕਰ ਦਿਓ(ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਵੇਖੋ [[Project:Help|help page]]). 
+ਤੁਸੀਂ ਅਜੇਹੇ ਪੰਨੇ ਤੇ ਪੁੱਜ ਗਏ ਹੋ ਜੋ ਅਜੇ ਲਿੱਖਿਆ ਨਹੀਂ ਗਿਆ ਹੈ.
+ਜੇ ਤੁਸੀਂ ਇਸ ਪੰਨੇ ਨੂੰ ਬਨਾਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਹੇਠਾਂ ਦਿੱਤੀ
+ਥਾਂ ਵਿੱਚ ਲਿੱਖਣਾ ਸ਼ੁਰੂ ਕਰ ਦਿਓ(ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ਵੇਖੋ [[Project:Help|help page]]).
 ਜੇ ਤੁਸੀਂ ਗਲਤੀ ਨਾਲ ਇੱਥੇ ਆ ਗਏ ਹੋ, ਤਾਂ ਆਪਣੇ browser ਦਾ \'\'\'back\'\'\' button ਦਬਾਓ',
 'noarticletext'	=> '(ਅਜੇ ਇਹ ਪੰਨਾ ਖਾਲੀ ਹੈ)',
 'usercssjsyoucanpreview'	=> '<strong>ਨਸੀਹਤ:</strong>CSS/JS ਵਿੱਚ ਕੀਤੇ ਗਏ ਬਦਲਾਵ  ਨੂੰ ਪੱਕਾ ਕਰਨ ਤੋਂ ਪਿਹਲਾਂ, \'ਝਲਕ ਦਿਖਾਓ\' button ਦਾ ਇਸਤੇਮਾਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ',
@@ -374,8 +365,6 @@ $1 ਜਾਂ ਕਿਸੇ ਵੀ ਹੋਰ [[{{ns:4}}:ਪ੍ਰਸ਼ਾਸਕ]]
 'note'		=> '<strong>ਧਿਆਨ ਦਿਓ:</strong> ',
 'previewnote'		=> 'ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਸਿਰਫ਼ ਇਕ ਝਲਕ ਹੈ, ਅਜੇ ਇਸਨੂੰ ਪੱਕਾ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ!',
 'editing'		=> 'ਬਦਲ ਰਹੇ ਹਾਂ: $1',
-'sectionedit'		=> ' (ਵਿਭਾਗ)',
-'commentedit'		=> ' (ਟਿੱਪਣੀ)',
 'editconflict'	=> 'ਬਦਲਾਵ ਮੱਤਭੇਦ: $1',
 'yourdiff'		=> 'ਅੰਤਰ (Differences)',
 
@@ -415,26 +404,7 @@ $1 ਜਾਂ ਕਿਸੇ ਵੀ ਹੋਰ [[{{ns:4}}:ਪ੍ਰਸ਼ਾਸਕ]]
 'nchanges'		=> '$1 ਬਦਲਾਵ',
 
 # tooltip help for some actions, most are in Monobook.js
-'tooltip-article'	=> 'ਲੇਖ ਦਿਖਾਓ [alt-a]',
-'tooltip-talk'	=> 'ਲੇਖ ਬਾਰੇ ਚਰਚਾ [alt-t]',
-'tooltip-edit'	=> 'ਤੁਸੀਂ ਇਸ ਪੰਨੇ ਵਿੱਚ ਬਦਲਾਵ ਕਰ ਸੱਕਦੇ ਹੋ. ਕਿਰਪਾ ਕਰਕੇ ਪੱਕਾ ਕਰਨ ਤੋਂ ਪਿਹਲਾਂ, \'ਝਲਕ ਦਿਖਾਓ\' button ਦਾ ਇੱਸਤੇਮਾਲ ਜ਼ਰੂਰ ਕਰੋ [alt-e]',
-'tooltip-viewsource'	=> 'ਇਹ ਪੰਨਾ ਸੁਰੱਖਿਅਤ ਹੈ। ਤੁਸੀਂ ਇਸਦਾ ਸ੍ਰੋਤ ਦੇਖ ਸਕਦੇ ਹੋ। [alt-e]',
-'tooltip-history'	=> 'ਇਸ ਪਣਨੇ ਦੇ ਪਹਿਲੇ ਰੁਪਾਂਤਰ, [alt-h]',
-'tooltip-protect'	=> 'ਇਸ ਪੰਨੇ ਦੀ ਰੱਖਿਆ ਕਰੋ [alt--]',
-'tooltip-delete'	=> 'ਇਹ ਪੰਨਾ ਹਟਾ ਦਿਓ [alt-d]',
-'tooltip-undelete'	=> 'Restore $1 deleted edits to this page [alt-d]',
-'tooltip-move'	=> 'ਇਸ ਪੰਨੇ ਨੂੰ ਕਿਤੇ ਹੋਰ ਲਿਜਾਓ [alt-m]',
 'tooltip-watch'	=> 'ਇਸ ਪੰਨੇ ਨੂੰ ਆਪਣੀ watchlist ਵਿੱਚ ਜਮਾਂ ਕਰੋ[alt-w]',
-'tooltip-unwatch'	=> 'ਇਸ ਪੰਨੇ ਨੂੰ ਆਪਣੀ watchlist ਤੋਂ ਹਟਾ ਦਿਓ[alt-w]',
-'tooltip-watchlist'	=> 'ਉਹਨਾਂ ਪੰਨਿਆਂ ਦੀ ਸੂਚੀ, ਜਿਹਨਾਂ ਤੇ ਤੁਸੀਂ ਬਦਲਾਵ ਲਈ ਨਿਗਰਾਨੀ ਰੱਖ ਰਹੇ ਹੋ। [alt-l]',
-'tooltip-preferences'	=> 'ਮੇਰੀ ਪਸੰਦ',
-'tooltip-mycontris'	=> 'ਮੇਰੇ ਯੋਗਦਾਨ ਦੀ ਸੂਚੀ [alt-y]',
-'tooltip-mainpage'	=> 'ਮੁੱਖ ਪੰਨੇ ਤੇ ਜਾਓ [alt-z]',
-'tooltip-portal'	=> 'ਪ੍ਰੋਜੈਕਟ ਦੇ ਬਾਰੇ, ਤੁਸੀਂ ਕੀ ਕਰ ਸਕਦੇ ਹੋ, ਚੀਜ਼ਾਂ ਕਿਥੋਂ ਮਿਲਣਗੀਆਂ',
-'tooltip-sitesupport'	=> '{{SITENAME}} ਦੀ ਸਹਾਇਤਾ ਕਰੋ',
-'tooltip-recentchanges'	=> 'ਵਿਕਿ ਵਿਚ ਹਾਲ ਹੀ ਵਿਚ ਹੋਈਆਂ ਤਬਦੀਲੀਆਂ ਦੀ ਸੂਚੀ। [alt-r]',
-'tooltip-specialpages'	=> 'ਸਾਰੇ ਖਾਸ ਪੰਨਿਆਂ ਦੀ ਸੂਚੀ [alt-q]',
-'tooltip-specialpage'	=> 'ਇਹ ਇਕ ਖਾਸ ਪੰਨਾ ਹੈ, ਤੁਸੀਂ ਇਸਦੇ ਵਿੱਚ ਕੋਈ ਬਦਲਾਵ ਨਹੀਂ ਕਰ ਸਕਦੇ',
 'tooltip-search'	=> 'ਇਸ ਵਿਕਿ ਵਿੱਚ ਲੱਭੋ [alt-f]',
 'tooltip-minoredit'	=> 'ਮਾਮੂਲੀ ਬਦਲਾਵ ਦੀ ਨਿਸ਼ਾਨੀ ਲਗਾਓ (Mark this as a minor edit) [alt-i]',
 'tooltip-save'	=> 'ਕੀਤੇ ਗਏ ਬਦਲਾਵ ਪੱਕੇ ਕਰੋ [alt-s]',
@@ -473,8 +443,7 @@ class LanguagePa extends LanguageUtf8 {
 		return $wgSkinNamesPa;
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesPa;
 		if( isset( $wgAllMessagesPa[$key] ) ) {
 			return $wgAllMessagesPa[$key];
@@ -482,7 +451,7 @@ class LanguagePa extends LanguageUtf8 {
 			return parent::getMessage( $key );
 		}
 	}
-	
+
 	var $digitTransTable = array(
 		'0' => '੦',
 		'1' => '੧',
@@ -495,7 +464,7 @@ class LanguagePa extends LanguageUtf8 {
 		'8' => '੮',
 		'9' => '੯'
 	);
-	
+
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		if( $wgTranslateNumerals ) {
diff --git a/languages/LanguagePl.php b/languages/LanguagePl.php
index d6ecb20138b0..0ba0d5e6a02f 100644
--- a/languages/LanguagePl.php
+++ b/languages/LanguagePl.php
@@ -7,11 +7,6 @@ require_once("LanguageUtf8.php");
 
 # FIXME: Lots of hardcoded Wikipedia-related text needs to be cleaned up.
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
 # Yucky hardcoding hack as polish grammar need tweaking :o)
 switch( $wgMetaNamespace ) {
 case 'Wikipedia':
@@ -25,80 +20,28 @@ default:
 }
 
 /* private */ $wgNamespaceNamesPl = array(
-    NS_MEDIA            => "Media",
-    NS_SPECIAL          => "Specjalna",
-    NS_MAIN             => "",
-    NS_TALK             => "Dyskusja",
-    NS_USER             => "Wikipedysta",
-    NS_USER_TALK        => "Dyskusja_Wikipedysty",
-    NS_PROJECT          => $wgMetaNamespace,
-    NS_PROJECT_TALK     => $wgMetaTalkNamespace,   // see above
-    NS_IMAGE            => "Grafika",
-    NS_IMAGE_TALK       => "Dyskusja_grafiki",
-    NS_MEDIAWIKI        => "MediaWiki",
-    NS_MEDIAWIKI_TALK   => "Dyskusja_MediaWiki",
-    NS_TEMPLATE         => "Szablon",
-    NS_TEMPLATE_TALK    => "Dyskusja_szablonu",
-    NS_HELP             => "Pomoc",
-    NS_HELP_TALK        => "Dyskusja_pomocy",
-    NS_CATEGORY         => "Kategoria",
-    NS_CATEGORY_TALK    => "Dyskusja_kategorii"
+	NS_MEDIA            => "Media",
+	NS_SPECIAL          => "Specjalna",
+	NS_MAIN             => "",
+	NS_TALK             => "Dyskusja",
+	NS_USER             => "Wikipedysta",
+	NS_USER_TALK        => "Dyskusja_Wikipedysty",
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaTalkNamespace,   // see above
+	NS_IMAGE            => "Grafika",
+	NS_IMAGE_TALK       => "Dyskusja_grafiki",
+	NS_MEDIAWIKI        => "MediaWiki",
+	NS_MEDIAWIKI_TALK   => "Dyskusja_MediaWiki",
+	NS_TEMPLATE         => "Szablon",
+	NS_TEMPLATE_TALK    => "Dyskusja_szablonu",
+	NS_HELP             => "Pomoc",
+	NS_HELP_TALK        => "Dyskusja_pomocy",
+	NS_CATEGORY         => "Kategoria",
+	NS_CATEGORY_TALK    => "Dyskusja_kategorii"
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsPl = array(
-        "Brak", "Stały, z lewej", "Stały, z prawej", "Unoszący się, z lewej"
-);
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesPl = array(
-        "Userlogin"     => "",
-        "Userlogout"    => "",
-        "Preferences"   => "Zmiana moich preferencji",
-        "Watchlist"     => "Obserwowane",
-        "Recentchanges" => "Ostatnio zmienione",
-        "Upload"        => "Przesyłanie plików",
-        "Imagelist"     => "Lista obrazków i multimediów",
-        "Listusers"     => "Zarejestrowani użytkownicy",
-        "Statistics"    => "Statystyka",
-        "Randompage"    => "Losowa strona",
-
-        "Lonelypages"   => "Porzucone artykuły",
-        "Unusedimages"  => "Porzucone pliki",
-        "Popularpages"  => "Najpopularniejsze",
-        "Wantedpages"   => "Najbardziej potrzebne",
-        "Shortpages"    => "Najkrótsze",
-        "Longpages"     => "Najdłuższe",
-        "Newpages"      => "Nowoutworzone",
-	"Ancientpages" => "Najstarsze",
-        "Allpages"      => "Wszystkie",
-
-        "Ipblocklist"   => "Zablokowane adresy IP",
-        "Maintenance"   => "Prosta administracja",
-        "Specialpages"  => "",
-        "Contributions" => "",
-        "Emailuser"     => "",
-        "Whatlinkshere" => "",
-        "Recentchangeslinked" => "",
-        "Movepage"      => "",
-        "Booksources"   => "Książki",
-//	"Categories"    => "Kategorie stron",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesPl = array(
-        "Blockip"       => "Zablokuj adres IP",
-        "Asksql"        => "Zapytanie SQL",
-        "Undelete"      => "Odtwarzanie skasowanych stron"
-
-);
-
-/* private */ $wgDeveloperSpecialPagesPl = array(
-        "Lockdb"        => "Zablokuj zapis do bazy danych",
-        "Unlockdb"      => "Odblokuj zapis do bazy danych",
+	"Brak", "Stały, z lewej", "Stały, z prawej", "Unoszący się, z lewej"
 );
 
 /* private */ $wgAllMessagesPl = array(
@@ -181,11 +124,9 @@ default:
 "aboutpage" => "{{ns:4}}:O_Wikipedii",
 "help" => "Pomoc",
 "helppage" => "{{ns:4}}:Pomoc",
-"wikititlesuffix" => "{{SITENAME}}",
 "bugreports" => "Raport o błędach",
 "bugreportspage" => "{{ns:4}}:Błędy",
 "sitesupport" => "Dary pieniężne",
-"sitesupportpage" => "http://wikimediafoundation.org/fundraising", # If not set, won't appear. Can be wiki page or URL
 "faq" => "FAQ",
 "faqpage" => "{{ns:4}}:FAQ",
 "edithelp" => "Pomoc w edycji",
@@ -216,17 +157,16 @@ default:
 "newpage" => "Nowa strona",
 "talkpage" => "Dyskusja",
 "postcomment" => "Skomentuj",
-"articlepage" => "Strona artykułu", 
+"articlepage" => "Strona artykułu",
 "subjectpage" => "Strona dyskutowana", # for compatibility
-"userpage" => "Strona wikipedysty", 
-"wikipediapage" => "Strona metaartykułu", 
-"imagepage" =>  "Strona grafiki", 
+"userpage" => "Strona wikipedysty",
+"wikipediapage" => "Strona metaartykułu",
+"imagepage" =>  "Strona grafiki",
 "viewtalkpage" => "Strona dyskusji",
 "otherlanguages" => "Wersja",
 "redirectedfrom" => "(Przekierowano z $1)",
 "lastmodified" => "Tę stronę ostatnio zmodyfikowano o $1;",
 "viewcount" => "Tę stronę obejrzano $1 razy;",
-"gnunote" => "udostępniana jest w oparciu o licencję <a class=internal href='/wiki/GNU_FDL'>GNU FDL</a>; możesz ją samodzielnie uzupełnić lub poprawić.",
 "printsubtitle" => "(z {{SERVER}})",
 "protectedpage" => "Strona zabezpieczona",
 "administrators" => "{{ns:4}}:Administratorzy",
@@ -310,7 +250,6 @@ znaki, których użycie jest zabronione lub jest pusty.",
 "perfdisabled" => "By odciążyć serwer w godzinach szczytu czasowo zablokowaliśmy
 wykonanie tej czynności. Wróć proszę i spróbuj jeszcze raz między 02.00 a 14.00
 czasu UTC. Przepraszamy!",
-"perfdisabledstub" => "Oto ostatnia zapisana wersja strony z $1",
 "viewsource" => "Tekst źródłowy",
 "protectedtext" => "Wyłączono możliwość edycji tej strony; istnieje kilka powodów
 dla których jest to robione - zobacz [[{{ns:4}}:Strona_zabezpieczona]]
@@ -334,7 +273,7 @@ Nie zapomnij dostosować <i>preferencji</i>.",
 "newusersonly" => " (tylko nowi użytkownicy)",
 "remembermypassword" => "Pamiętaj moje hasło między sesjami.",
 "loginproblem" => "<b>Są problemy z Twoim logowaniem.</b><br />Spróbuj ponownie!",
-"alreadyloggedin" => "<font color=red><b>$1, jesteś już zalogowany!</b></font><br />\n",
+"alreadyloggedin" => "<strong>$1, jesteś już zalogowany!</strong><br />\n",
 
 "login" => "Zaloguj mnie",
 "userlogin" => "Logowanie",
@@ -358,7 +297,7 @@ Sprawdź pisownię lub użyj poniższego formularza by utworzyć nowe konto.",
 "passwordremindertitle" => "{{SITENAME}} przypomina o haśle",
 "passwordremindertext" => "Ktoś (prawdopodobnie Ty, spod adresu $1)
 poprosił od nas o wysłanie nowego hasła dostępu do Wikipedii.
-Aktualne hasło dla użytkownika \"$2\" to \"$3\". 
+Aktualne hasło dla użytkownika \"$2\" to \"$3\".
 Najlepiej będzie jak zalogujesz się teraz i od razu zmienisz hasło.",
 "noemail" => "W bazie nie ma adresu e-mailowego dla użytkownika \"$1\".",
 "passwordsent" => "Nowe hasło zostało wysłane na adres e-mailowy użytkownika \"$1\"
@@ -404,8 +343,8 @@ By wprowadzić swoje zmiany musisz zmodyfikować tekst z górnego pola.
 \"Zapisz\".<br />",
 "yourtext" => "Twój tekst",
 "storedversion" => "Zapisana wersja",
-"editingold" => "<font color=\"red\"><strong>OSTRZEŻENIE: Edytujesz inną niż bieżąca wersję tej strony.
-Jeśli zapiszesz ją wszystkie późniejsze zmiany zostaną skasowane.</strong></font>",
+"editingold" => "<strong>OSTRZEŻENIE: Edytujesz inną niż bieżąca wersję tej strony.
+Jeśli zapiszesz ją wszystkie późniejsze zmiany zostaną skasowane.</strong>",
 "yourdiff" => "Różnice",
 "copyrightwarning" => "Proszę pamiętać o tym, że przyjmuje się, iż wszelki
 wkład do Wikipedii jest udostępniany na zasadach <i>GNU Free Documentation License</i>
@@ -477,13 +416,13 @@ spowodowany jest bardzo często szukaniem najpopularniejszych słów, takich jak
 \"jest\" czy \"nie\", które nie są indeksowane, albo z powodu podania w
 zapytaniu więcej niż jednego słowa (na liście odnalezionych stron znajdą się
 tylko te, które zawierają wszystkie podane słowa).",
-"powersearch" => "Szukaj", 
+"powersearch" => "Szukaj",
 "powersearchtext" => "
 Szukaj w przestrzeniach nazw :<br />
 $1<br />
 $2 Pokaż przekierowania   Szukany tekst $3 $9",
 "searchdisabled" => "<p>Ze względu na duże obciążenie serwera wyszukiwanie
-w treści artykułów zostało czasowo wyłączone; mamy nadzieję, że 
+w treści artykułów zostało czasowo wyłączone; mamy nadzieję, że
 po zbliżającej się modyfikacji sprzętu możliwość ta zostanie przywrócona.
 W międzyczasie polecamy wyszukiwanie za pomocą Google:</p>
 
@@ -501,15 +440,15 @@ przez zmianą swoich preferencji.",
 
 Zobacz [[{{ns:4}}:Preferencje]], aby poznać znaczenie poszczególnych opcji.",
 "prefsreset" => "Preferencje domyślne zostały odtworzone.",
-"qbsettings" => "Pasek szybkiego dostępu", 
+"qbsettings" => "Pasek szybkiego dostępu",
 "changepassword" => "Zmiana hasła",
 "skin" => "Skórka",
-"math" => "Prezentacja wzorów matematycznych", 
-"math_failure" => "Parser nie umiał rozpoznać", 
-"math_unknown_error" => "nieznany błąd", 
-"math_unknown_function" => "nieznana funkcja ", 
-"math_lexing_error" => "błąd leksera", 
-"math_syntax_error" => "błąd składni", 
+"math" => "Prezentacja wzorów matematycznych",
+"math_failure" => "Parser nie umiał rozpoznać",
+"math_unknown_error" => "nieznany błąd",
+"math_unknown_function" => "nieznana funkcja ",
+"math_lexing_error" => "błąd leksera",
+"math_syntax_error" => "błąd składni",
 "saveprefs" => "Zapisz preferencje",
 "resetprefs" => "Preferencje domyślne",
 "oldpassword" => "Stare hasło",
@@ -614,13 +553,9 @@ Wszystkie czasy odnoszą się do strefy czasu uniwersalnego (UTC).
 ",
 "filename" => "Plik",
 "filedesc" => "Opis",
-"affirmation" => "Potwierdzam, że właściciel praw autorskich do tego pliku
-zgadza się udzielić licencji zgodnie z $1.",
 "copyrightpage" => "{{ns:4}}:Prawa_autorskie",
 "copyrightpagename" => "prawami autorskimi Wikipedii",
 "uploadedfiles" => "Przesłane pliki",
-"noaffirmation" => "Musisz potwierdzić, że Twoja przesyłka nie narusza żadnych
-praw autorskich.",
 "ignorewarning" => "Zignoruj ostrzeżenie i prześlij plik.",
 "minlength" => "Nazwa obrazku musi mieć co najmniej trzy litery.",
 "badfilename" => "Nazwę obrazku zmieniona na \"$1\".",
@@ -707,7 +642,7 @@ przekierowywać.",
 "mispeelings" => "Strony z błędami pisowni",
 "mispeelingstext" => "Poniższe strony zawierają najczęstsze błędy
 pisowni (ich listę można znaleźć w $1). Poprawna pisownia może być podana obok w
-nawiasach.", 
+nawiasach.",
 "mispeelingspage" => "Lista najczęstszych błędów pisowni",
 "missinglanguagelinks" => "Brakujące odnośniki do innych wersji językowych",
 "missinglanguagelinksbutton" => "Znajdź brakujące odnośniki, wersja",
@@ -846,7 +781,7 @@ Podane czasy odnoszą się do strefy czasu uniwersalnego (UTC).
 "reverted" => "Przywrócono starszą wersję",
 "deletecomment" => "Powód usunięcia",
 "imagereverted" => "Przywrócenie wcześniejszej wersji powiodło się.",
-"rollback" => "Cofnij edycję", 
+"rollback" => "Cofnij edycję",
 "rollbacklink" => "cofnij",
 "rollbackfailed" => "Nie udało się cofnąć zmiany",
 "cantrollback" => "Nie można cofnąć edycji; jest tylko jedna wersja tej strony.",
@@ -856,7 +791,7 @@ Ktoś inny zdążył już to zrobić lub wprowadził własne poprawki do treści
 Autorem ostatniej zmiany jest teraz [[Wikipedysta:$3|$3]] ([[Dyskusja_wikipedysty:$3|Dyskusja]]).",
 # only shown if there is an edit comment
 "editcomment" => "Opisano ją następująco: \"<i>$1</i>\".",
-"revertpage" => "Przywrócono przedostatnią wersję, jej autor to $1", 
+"revertpage" => "Przywrócono przedostatnią wersję, jej autor to $1",
 
 # Undelete
 #
@@ -913,7 +848,6 @@ się wandalizmu).",
 "ipbreason" => "Powód",
 "ipbsubmit" => "Zablokuj ten adres",
 "badipaddress" => "Adres IP jest źle utworzony.",
-"noblockreason" => "Musisz podać powód blokady.",
 "blockipsuccesssub" => "Zablokowanie powiodło się",
 "blockipsuccesstext" => "Adres IP \"$1\" został zablokowany.
 <br />Przejdź do [[Specjalna:Ipblocklist|Listy zablokowanych adresów IP]] by przejrzeć blokady.",
@@ -952,21 +886,6 @@ Potwierdź, proszę, że to jest zgodne z Twoimi zamiarami.",
 <br />Pamiętaj usunąć blokadę po zakończeniu spraw administracyjnych.",
 "unlockdbsuccesstext" => "Baza danych Wikipedii została odblokowana.",
 
-# SQL query
-#
-"asksql" => "Zapytanie SQL",
-"asksqltext" => "Użyj poniższego formularza by wysłać bezpośrednie zapytanie
-do bazy danych Wikipedii.
-Do ograniczania literałów łańcuchowych używaj pojedynczych cudzysłowów ('tak jak tu').
-Twoje zapytanie może poważnie obciążyć serwer, więc używaj tej możliwości
-z rozwagą.",
-"sqlislogged" => "Przypominamy, że wszystkie zapytania są logowane!",
-"sqlquery" => "Podaj zapytanie",
-"querybtn" => "Wyślij zapytanie",
-"selectonly" => "Zapytania inne niż \"SELECT\" są zastrzeżone tylko dla
-użytkowników o statusie Programisty.",
-"querysuccessful" => "Zapytanie zakończone sukcesem",
-
 # Move page
 #
 "movepage" => "Przenieś stronę",
@@ -1009,17 +928,17 @@ Wybierz, proszę, nową nazwę.",
 "talkpagemoved" => "Odpowiednia strona z <i>Dyskusją</i> także została przeniesiona.",
 "talkpagenotmoved" => "Odpowiednia strona z <i>Dyskusją</i> <strong>nie</strong> została przeniesiona.",
 # Math
-    	'mw_math_png' => "Zawsze jako PNG",
-        'mw_math_simple' => "HTML dla prostych, dla reszty PNG",
-        'mw_math_html' => "Spróbuj HTML; jeśli zawiedzie, to PNG",
-        'mw_math_source' => "Pozostaw w TeXu (tekst)",
-        'mw_math_modern' => "HTML, dla nowszych przeglądarek",
-	'mw_math_mathml' => 'MathML'
+'mw_math_png' => "Zawsze jako PNG",
+'mw_math_simple' => "HTML dla prostych, dla reszty PNG",
+'mw_math_html' => "Spróbuj HTML; jeśli zawiedzie, to PNG",
+'mw_math_source' => "Pozostaw w TeXu (tekst)",
+'mw_math_modern' => "HTML, dla nowszych przeglądarek",
+'mw_math_mathml' => 'MathML'
 
 );
 
 class LanguagePl extends LanguageUtf8 {
-	
+
 	function getNamespaces() {
 		global $wgNamespaceNamesPl;
 		return $wgNamespaceNamesPl;
@@ -1038,27 +957,12 @@ class LanguagePl extends LanguageUtf8 {
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
-		$d = (0 + substr( $ts, 6, 2 )) . 
+		$d = (0 + substr( $ts, 6, 2 )) .
 		  " " . $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
 		  " " . substr( $ts, 0, 4 );
 		return $d;
 	}
 
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesPl;
-		return $wgValidSpecialPagesPl;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesPl;
-		return $wgSysopSpecialPagesPl;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesPl;
-		return $wgDeveloperSpecialPagesPl;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesPl;
 		if(array_key_exists($key, $wgAllMessagesPl))
diff --git a/languages/LanguagePt.php b/languages/LanguagePt.php
index 4fad2a1cafc6..00ad8278fe82 100644
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -11,102 +11,43 @@
 # are magical, so don't change or move them!  The Namespace class
 # encapsulates some of the magic-ness.
 #
-# This translation was made by Yves Marques Junqueira 
+# This translation was made by Yves Marques Junqueira
 # and Rodrigo Calanca Nishino from Portuguese Wikipedia
 #
 /* private */ $wgNamespaceNamesPt = array(
-    NS_MEDIA		=> "Media",
-    NS_SPECIAL		=> "Especial",
-    NS_MAIN 		=> "",
-    NS_TALK  		=> "Discussão",
-    NS_USER   		=> "Usuário",
-    NS_USER_TALK   	=> "Usuário_Discussão",
-    NS_PROJECT      => $wgMetaNamespace,
-    NS_PROJECT_TALK   => "{$wgMetaNamespace}_Discussão",
-    NS_IMAGE   		=> "Imagem",
-    NS_IMAGE_TALK   	=> "Imagem_Discussão",
-    NS_MEDIAWIKI   	=> "MediaWiki",
-    NS_MEDIAWIKI_TALK   => "MediaWiki_Discussão",
-    NS_TEMPLATE  	=> "Predefinição",
-    NS_TEMPLATE_TALK  	=> "Predefinição_Discussão",
-    NS_HELP		=> "Ajuda",
-    NS_HELP_TALK	=> "Ajuda_Discussão",
-    NS_CATEGORY		=> "Categoria",
-    NS_CATEGORY_TALK	=> "Categoria_Discussão"
+	NS_MEDIA		=> "Media",
+	NS_SPECIAL		=> "Especial",
+	NS_MAIN 		=> "",
+	NS_TALK  		=> "Discussão",
+	NS_USER   		=> "Usuário",
+	NS_USER_TALK   	=> "Usuário_Discussão",
+	NS_PROJECT      => $wgMetaNamespace,
+	NS_PROJECT_TALK   => "{$wgMetaNamespace}_Discussão",
+	NS_IMAGE   		=> "Imagem",
+	NS_IMAGE_TALK   	=> "Imagem_Discussão",
+	NS_MEDIAWIKI   	=> "MediaWiki",
+	NS_MEDIAWIKI_TALK   => "MediaWiki_Discussão",
+	NS_TEMPLATE  	=> "Predefinição",
+	NS_TEMPLATE_TALK  	=> "Predefinição_Discussão",
+	NS_HELP		=> "Ajuda",
+	NS_HELP_TALK	=> "Ajuda_Discussão",
+	NS_CATEGORY		=> "Categoria",
+	NS_CATEGORY_TALK	=> "Categoria_Discussão"
 
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsPt = array(
-    "Nada", "Fixado �  esquerda", "Fixado �  direita", "Flutuando �  Esquerda"
+	"Nada", "Fixado �  esquerda", "Fixado �  direita", "Flutuando �  Esquerda"
 );
 
 /* private */ $wgSkinNamesPt = array(
 	'standard' => "Padrão",
 	'nostalgia' => "Nostalgia",
-	'cologneblue' => "Azul Colonial",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+	'cologneblue' => "Azul Colonial"
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsPt = array(
-#    "Sem preferência",
-);
-
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesPt = array(
-    "Userlogin"     => "",
-    "Userlogout"    => "",
-    "Preferences"   => "Configura minhas pref. de usuário",
-    "Watchlist"     => "Minha lista de arigos observados",
-    "Recentchanges" => "Páginas modificadas recentemente",
-    "Upload"        => "Envia arquivo de imagens",
-    "Imagelist"     => "Lista de imagens",
-    "Listusers"     => "Usuários registrados",
-    "Statistics"    => "Estatísticas do site",
-    "Randompage"    => "Artigo aleatório",
-
-    "Lonelypages"   => "Artigos órfãos",
-    "Unusedimages"  => "Imagens órfãs",
-    "Popularpages"  => "Artigos populares",
-    "Wantedpages"   => "Artigos mais requisitados",
-    "Shortpages"    => "Artigos curtos",
-    "Longpages"     => "Artigos longos",
-    "Newpages"      => "Artigos criados recentemente",
-    "Ancientpages"  => "Artigos mais antigos",
-    "Intl"      => "Links de Interlinguagens",
-    "Allpages"      => "Todas as páginas, org. por títulos",
-
-    "Ipblocklist"   => "Endereços IP bloqueados",
-    "Maintenance" => "Página de manutenção",
-    "Specialpages"  => "Páginas Especiais",
-    "Contributions" => "Contribuições",
-    "Emailuser"     => "Enviar e-mail ao usuário",
-    "Whatlinkshere" => "Relacionados",
-    "Recentchangeslinked" => "Modificações recentes",
-    "Movepage"      => "Mover Página",
-    "Booksources"   => "Fontes bibliográficas externas",
-    #"Categories" => "Categorias de Páginas",
-    "Export"    => "XML export",
-);
-
-/* private */ $wgSysopSpecialPagesPt = array(
-    "Blockip"       => "Bloquear um endereço IP",
-    "Asksql"        => "Busca o banco-de-dados",
-    "Undelete"      => "Ver e restaura páginas apagadas"
-);
-
-/* private */ $wgDeveloperSpecialPagesPt = array(
-    "Lockdb"        => "Torna o banco de dados como apenas leitura",
-    "Unlockdb"      => "Restaura o acesso �  escrita no banco de dados",
-    "Debug"         => "\'Debugar\' informações"
+#	"Sem preferência",
 );
 
 /* private */ $wgAllMessagesPt = array(
@@ -178,7 +119,6 @@
 "aboutpage"     => "{{ns:4}}:Sobre",
 "help"          => "Ajuda",
 "helppage"      => "{{ns:4}}:Ajuda",
-"wikititlesuffix" => "{{SITENAME}}",
 "bugreports"    => "Reportagem de 'bugs'",
 "bugreportspage" => "{{ns:4}}:Reportag_Bug",
 "faq"           => "FAQ",
@@ -221,7 +161,6 @@
 "redirectedfrom" => "(Redirecionado de $1)",
 "lastmodified"  => "Está página foi modificada pela última vez em $1.",
 "viewcount"     => "Esta página foi acessada $1 vezes.",
-"gnunote" => "Todo o texto é disponível sob os termos da <a class=internal href='$wgScriptPath/GNU_FDL'>GNU Free Documentation License</a>.",
 "printsubtitle" => "(De {{SERVER}})",
 "protectedpage" => "Página protegida",
 "administrators" => "{{ns:4}}:Administradores",
@@ -230,7 +169,7 @@
 executada por usuários com status de \"opsys\".
 Veja $1.",
 "developertitle" => "Acesso de desenvolvedor necessário",
-"developertext" => "A ação que você requisitou só pode ser 
+"developertext" => "A ação que você requisitou só pode ser
 executada por usuários com status de \"desenvolvedor\".
 Veja $1.",
 "nbytes"        => "$1 bytes",
@@ -273,7 +212,7 @@ MySQL retornou o erro \"$3: $4\".\n",
 "noconnect"     => "Desculpe! O wiki está passando por algumas
 dificuldades técnicas, e não pode contatar o servidor de bando de dados.",
 "nodb"          => "Não foi possível selecionar o banco de dados $1",
-"cachederror"       => "O que segue é uma cópia em cache da página 
+"cachederror"       => "O que segue é uma cópia em cache da página
 solicitada, e pode não estar atualizada.",
 "readonly"      => "Banco de dados somente para leitura",
 "enterlockreason" => "Entre com um motivo para trancá-lo, incluindo uma estimativa de quando poderá novamente ser escrito",
@@ -283,7 +222,7 @@ mais tarde voltará ao normal.
 
 O administrador que fez o bloqueio oferece a seguinte explicação:
 <p>$1",
-"missingarticle" => "O Banco-de-Dados não encontrou o texto de uma página 
+"missingarticle" => "O Banco-de-Dados não encontrou o texto de uma página
 que deveria ser encontrado, chamado \"$1\".
 
 <p>Isto é geralmente causado pela procura de um diff antigo ou um histórico que leva a uma página que foi deletada.
@@ -296,7 +235,7 @@ Por favor, comunique isto ao administrador, tenha nota da URL.",
 "filedeleteerror" => "Não foi possível deletar o arquivo \"$1\".",
 "filenotfound"  => "Não foi possível encontrar o arquivo \"$1\".",
 "unexpected"    => "Valor não esperado: \"$1\"=\"$2\".",
-"formerror"     => "Erro: Não foi possível enviar o formulário", 
+"formerror"     => "Erro: Não foi possível enviar o formulário",
 "badarticleerror" => "Esta acção não pode ser performada nesta página.",
 "cannotdelete"  => "Não foi possível excluir página ou imagem especificada. (Ela já pode ter sido deletada por alguém.)",
 "badtitle"      => "Título ruim",
@@ -323,9 +262,7 @@ Não se esqueça de personalizar suas preferências na {{SITENAME}}.",
 "newusersonly"  => " (somente novos usuários)",
 "remembermypassword" => "Lembrar de minha senha em outras sessões.",
 "loginproblem"  => "<b>Houve um problema com a sua autenticação.</b><br />Tente novamente!",
-"alreadyloggedin" => "<font color=red><b>Utilizador $1, você já está autenticado!</b></font><br />\n",
-
-"areyounew"     => "Se você é novo(a) na {{SITENAME}} e quer fazer uma conta de utilizador, entre com um nome de utilizador e depois digite e re-digite uma senha. Seu e-mail é opcional - se você perder a sua senha, você pode requisitar para que ela seja enviada para o endereço que você informou.<br />\n",
+"alreadyloggedin" => "<strong>Utilizador $1, você já está autenticado!</strong><br />\n",
 
 "login"         => "Entrar",
 "userlogin"     => "Entrar",
@@ -353,7 +290,7 @@ solicitou que nós lhe enviássemos uma nova senha para login.
 A senha para o usuário \"$2\" é a partir de agora \"$3\".
 Você pode realizar um login e mudar sua senha agora.",
 "noemail"       => "Não há nenhum e-Mail associado ao usuário \"$1\".",
-"passwordsent"  => "Uma nova senha está sendo enviada para o endereço de e-Mail 
+"passwordsent"  => "Uma nova senha está sendo enviada para o endereço de e-Mail
 registrado para \"$1\".
 Por favor, reconecte-se ao recebê-lo.",
 
@@ -381,7 +318,7 @@ O motivo é:<br />''$2''<p>Você pode contactar $1 ou outro
 "newarticle"    => "(Novo)",
 "newarticletext" =>
 "Você seguiu um link para um artigo que não existe mais.
-Para criar a página, começe escrevendo na caixa a baixo 
+Para criar a página, começe escrevendo na caixa a baixo
 (veja [[{{ns:4}}:Ajuda| a página de ajuda]] para mais informações).
 Se você chegou aqui por engano, apenas clique no botão  '''volta''' do seu navegador.",
 
@@ -482,7 +419,7 @@ Seu número identificador interno é $2.
 
 veja [[{{ns:4}}:Ajuda_preferências_de_usuários]] para aprender a decifrar as opções.",
 "prefsreset"    => "Preferências foram reconfiguradas.",
-"qbsettings"    => "Configurações da Barra Rápida", 
+"qbsettings"    => "Configurações da Barra Rápida",
 "changepassword" => "Mudar senha",
 "skin"          => "Aparência(Skin)",
 "math"          => "Rendering math",
@@ -528,7 +465,7 @@ Por favor, dê uma olhada nestas páginas: [[{{ns:4}}:FAQ|FAQ da {{SITENAME}}]],
 e [[{{ns:4}}:Most common {{SITENAME}} faux pas|most common {{SITENAME}} faux pas]].
 
 Se você quer ver a {{SITENAME}} crescer, é muito importante que você não adicione material restrito por outras [[{{ns:4}}:Copyrights|copyrights]].
-Um problema legal poderia realmente prejudicar o projeto de maneira que pedimos, por avor, não faça isso. 
+Um problema legal poderia realmente prejudicar o projeto de maneira que pedimos, por avor, não faça isso.
 Veja também [http://meta.wikipedia.org/wiki/Special:Recentchanges recent meta discussion].",
 "rcloaderr"     => "Carregando alterações recentes",
 "rcnote"        => "Abaixo estão as últimas <strong>$1</strong> alterações nos últimos <strong>$2</strong> dias.",
@@ -593,12 +530,10 @@ Todas as datas mostradas são do servidor (UTC).
 ",
 "filename"      => "Nome do arquivo",
 "filedesc"      => "Sumário",
-"affirmation"   => "Eu afirmo que o proprietário deste arquivo concorda em licenciá-lo sob os termos da $1.",
 "copyrightpage" => "{{ns:4}}:Copyrights",
 "copyrightpagename" => "Direitos Autorais da {{SITENAME}}",
 
 "uploadedfiles" => "Arquivos carregados",
-"noaffirmation" => "Você tem que afirmar que o carregamento deste arquivo não fere nenhum direito autoral.",
 "ignorewarning" => "Ignorar aviso e salvar de qualquer forma.",
 "minlength"     => "Os nomes das imagens devem ter ao menos três letras.",
 "badfilename"   => "O nome da imagem mudou para \"$1\".",
@@ -756,7 +691,7 @@ $3...
 "couldntremove" => "Não consegui remover o item '$1'...",
 "iteminvalidname" => "Problema com item '$1', nome inválido...",
 "wlnote" => "Segue as últimas $1 mudanças nas últimas <b>$2</b> horas.",
-                                                                                                                                       
+
 
 # Delete/protect/revert
 #
@@ -789,11 +724,11 @@ Todos os horários mostrados estão no horário do servidor (UTC).
 "rollbackfailed" => "Rollback falhou",
 "cantrollback"  => "Não foi possível reverter a edição; o último contribuidor é o único autor deste artigo.",
 "alreadyrolled" => "Não foi possível reverter as edições de  [[$1]]
-por [[User:$2|$2]] ([[User talk:$2|Talk]]); alguém o editou ou já o reverteu. 
+por [[User:$2|$2]] ([[User talk:$2|Talk]]); alguém o editou ou já o reverteu.
 
 A última edição foi de  [[User:$3|$3]] ([[User talk:$3|Conversar com ele]]). ",
 #   only shown if there is an edit comment
-"editcomment" => "O comentário de edição era: \"<i>$1</i>\".", 
+"editcomment" => "O comentário de edição era: \"<i>$1</i>\".",
 "revertpage"    => "Revertido para a última edição por  $1",
 
 # Undelete
@@ -840,7 +775,6 @@ Preencha com um motivo específico (por exemplo, citando páginas que sofreram v
 "ipbreason"     => "Motivo",
 "ipbsubmit"     => "Bloquear este endereço",
 "badipaddress"  => "O endereço de IP está mal-formado.",
-"noblockreason" => "Você deve colocar um motivo.",
 "blockipsuccesssub" => "Bloqueio bem sucedido",
 "blockipsuccesstext" => "O endereço de IP \"$1\" Foi bloqueado.
 <br />Veja [[Special:Ipblocklist|Lista de IP's bloqueados]] para rever os bloqueios.",
@@ -872,18 +806,6 @@ Por favor confirme que você realmente pretende fazer isto, e que você vai desb
 <br />Lembre-se de remover a tranca após a manutenção.",
 "unlockdbsuccesstext" => "O bando de dados da {{SITENAME}} foi destrancado.",
 
-# SQL query
-#
-"asksql"        => "SQL query",
-"asksqltext"    => "Use o formulário a seguir para fazer uma pesquisa direta no banco de dados.
-Use aspas simples ('como isto') para delimitar strings literais.
-Isto pode frequentemente sobrecarregar o servidor , sendo assim, por favor use esta função moderadamente .",
-"sqlislogged"   => "Por favor, note de todas as pesquisas são registradas (log).",
-"sqlquery"      => "Entrar com pesquisa",
-"querybtn"      => "Enviar pesquisa",
-"selectonly"    => "Pesquisas diferentes de  \"SELECT\" são restritas a desenvolvedores da {{SITENAME}}.",
-"querysuccessful" => "Pesquisa bem sucedida",
-
 # Move page
 #
 "movepage"      => "Mover página",
@@ -919,12 +841,12 @@ Por favor, escolha outro nome.",
 "talkpagemoved" => "A página talk correspondente foi movida com sucesso.",
 "talkpagenotmoved" => "A página talk correspondente  <strong>não</strong> foi movida.",
 # Math
-    'mw_math_png' => "Sempre renderizar PNG",
-    'mw_math_simple' => "HTML se for bem simples e PNG",
-    'mw_math_html' => "HTML se possível ou então PNG",
-    'mw_math_source' => "Deixar como TeX (para navegadores em modo texto)",
-    'mw_math_modern' => "Recomendado para navegadores modernos",
-    'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Sempre renderizar PNG",
+'mw_math_simple' => "HTML se for bem simples e PNG",
+'mw_math_html' => "HTML se possível ou então PNG",
+'mw_math_source' => "Deixar como TeX (para navegadores em modo texto)",
+'mw_math_modern' => "Recomendado para navegadores modernos",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -932,60 +854,45 @@ require_once( "LanguageUtf8.php" );
 
 class LanguagePt extends LanguageUtf8 {
 
-    function getNamespaces() {
-        global $wgNamespaceNamesPt;
-        return $wgNamespaceNamesPt;
-    }
-
-    function getQuickbarSettings() {
-        global $wgQuickbarSettingsPt;
-        return $wgQuickbarSettingsPt;
-    }
-
-    function getSkinNames() {
-        global $wgSkinNamesPt;
-        return $wgSkinNamesPt;
-    }
-
-    function getDateFormats() {
-        global $wgDateFormatsPt;
-        return $wgDateFormatsPt;
-    }
-
-    function timeanddate( $ts, $adj = false ) {
-        return $this->time( $ts, $adj ) . ", " . $this->date( $ts, $adj );
-    }
-
-    function getValidSpecialPages() {
-        global $wgValidSpecialPagesPt;
-        return $wgValidSpecialPagesPt;
-    }
-
-    function getSysopSpecialPages() {
-        global $wgSysopSpecialPagesPt;
-        return $wgSysopSpecialPagesPt;
-    }
-
-    function getDeveloperSpecialPages() {
-        global $wgDeveloperSpecialPagesPt;
-        return $wgDeveloperSpecialPagesPt;
-    }
-
-    function getMessage( $key ) {
-         global $wgAllMessagesPt;
-         if( isset( $wgAllMessagesPt[$key] ) ) {
-             return $wgAllMessagesPt[$key];
-         } else {
-             return parent::getMessage( $key );
-        }
-    }
-
-    /**
-     * Portuguese numeric format is 123 456,78
-     */
-    function formatNum( $number, $year = false ) {
-        return $year ? $number : strtr($this->commafy($number), '.,', ', ' );
-    }
+	function getNamespaces() {
+		global $wgNamespaceNamesPt;
+		return $wgNamespaceNamesPt;
+	}
+
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsPt;
+		return $wgQuickbarSettingsPt;
+	}
+
+	function getSkinNames() {
+		global $wgSkinNamesPt;
+		return $wgSkinNamesPt;
+	}
+
+	function getDateFormats() {
+		global $wgDateFormatsPt;
+		return $wgDateFormatsPt;
+	}
+
+	function timeanddate( $ts, $adj = false ) {
+		return $this->time( $ts, $adj ) . ", " . $this->date( $ts, $adj );
+	}
+
+	function getMessage( $key ) {
+		 global $wgAllMessagesPt;
+		 if( isset( $wgAllMessagesPt[$key] ) ) {
+			 return $wgAllMessagesPt[$key];
+		 } else {
+			 return parent::getMessage( $key );
+		}
+	}
+
+	/**
+	 * Portuguese numeric format is 123 456,78
+	 */
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($this->commafy($number), '.,', ', ' );
+	}
 
 }
 
diff --git a/languages/LanguageRo.php b/languages/LanguageRo.php
index bfb7dc3b1731..d083b477f339 100644
--- a/languages/LanguageRo.php
+++ b/languages/LanguageRo.php
@@ -6,13 +6,6 @@
 
 require_once("LanguageUtf8.php");
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesRo = array(
 	NS_MEDIA			=> 'Media',
 	NS_SPECIAL			=> 'Special',
@@ -32,7 +25,7 @@ require_once("LanguageUtf8.php");
 	NS_HELP_TALK		=> 'Discuţie_Ajutor',
 	NS_CATEGORY			=> 'Categorie',
 	NS_CATEGORY_TALK	=> 'Discuţie_Categorie'
-				
+
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsRo = array(
@@ -41,15 +34,8 @@ require_once("LanguageUtf8.php");
 
 /* private */ $wgSkinNamesRo = array(
 	'standard' => "Normală",
-	'nostalgia' => "Nostalgie",
-	'cologneblue' => "Cologne Blue",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+	'nostalgia' => "Nostalgie"
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgDateFormatsRo = array(
@@ -58,221 +44,36 @@ require_once("LanguageUtf8.php");
 
 /* private */ $wgMagicWordsRo = array(
 #   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    "#redirect"                                       ),
-    MAG_NOTOC                => array( 0,    "__NOTOC__", "__FARACUPRINS__"                    ),
-    MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__", "__FARAEDITSECTIUNE__"       ),
-    MAG_START                => array( 0,    "__START__"                                       ),
-    MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH", "{{NUMARLUNACURENTA}}"            ),
-    MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "{{NUMELUNACURENTA}}"         ),
-    MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "{{NUMARZIUACURENTA}}"              ),   
-    MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "{{NUMEZIUACURENTA}}"           ),
-    MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "{{ANULCURENT}}"                   ),
-    MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "{{ORACURENTA}}"                   ),
-    MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES", "{{NUMARDEARTICOLE}}"         ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN", "{{NUMELUNACURENTAGEN}}"   ),
+	MAG_REDIRECT             => array( 0,    "#redirect"                                       ),
+	MAG_NOTOC                => array( 0,    "__NOTOC__", "__FARACUPRINS__"                    ),
+	MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__", "__FARAEDITSECTIUNE__"       ),
+	MAG_START                => array( 0,    "__START__"                                       ),
+	MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH", "{{NUMARLUNACURENTA}}"            ),
+	MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "{{NUMELUNACURENTA}}"         ),
+	MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "{{NUMARZIUACURENTA}}"              ),
+	MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "{{NUMEZIUACURENTA}}"           ),
+	MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "{{ANULCURENT}}"                   ),
+	MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "{{ORACURENTA}}"                   ),
+	MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES", "{{NUMARDEARTICOLE}}"         ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN", "{{NUMELUNACURENTAGEN}}"   ),
 	MAG_SUBST                => array( 0,    "SUBST:"                                          ),
-    MAG_MSGNW                => array( 0,    "MSGNW:", "MSJNOU:"                               ),
+	MAG_MSGNW                => array( 0,    "MSGNW:", "MSJNOU:"                               ),
 	MAG_END                  => array( 0,    "__END__", "__FINAL__"                            ),
-    MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb"                              ),
-    MAG_IMG_RIGHT            => array( 1,    "right"                                           ),
-    MAG_IMG_LEFT             => array( 1,    "left"                                            ),
-    MAG_IMG_NONE             => array( 1,    "none"                                            ),
-    MAG_IMG_WIDTH            => array( 1,    "$1px"                                            ),
-    MAG_IMG_CENTER           => array( 1,    "center", "centre"                                ),
-    MAG_INT                  => array( 0,    "INT:"                                            )
-
-
-);
+	MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb"                              ),
+	MAG_IMG_RIGHT            => array( 1,    "right"                                           ),
+	MAG_IMG_LEFT             => array( 1,    "left"                                            ),
+	MAG_IMG_NONE             => array( 1,    "none"                                            ),
+	MAG_IMG_WIDTH            => array( 1,    "$1px"                                            ),
+	MAG_IMG_CENTER           => array( 1,    "center", "centre"                                ),
+	MAG_INT                  => array( 0,    "INT:"                                            )
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesRo = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Preferinţele mele",
-	"Watchlist"		=> "Articole urmărite",
-	"Recentchanges" => "Pagini actualizate recent",
-	"Upload"		=> "Trimite imagini",
-	"Imagelist"		=> "Lista imaginilor",
-	"Listusers"		=> "Utilizatori înregistraţi",
-	"Statistics"	=> "Statistici pentru site",
-	"Randompage"	=> "Articol aleator",
-
-	"Lonelypages"	=> "Articole orfane",
-	"Unusedimages"	=> "Imagini orfane",
-	"Popularpages"	=> "Articole populare",
-	"Wantedpages"	=> "Cele mai dorite articole",
-	"Shortpages"	=> "Articole scurte",
-	"Longpages"		=> "Articole lungi",
-	"Newpages"		=> "Articole noi",
-	"Ancientpages"	=> "Cele mai vechi articole",
-        "Deadendpages"  => "Pagini fără legături",
-#	"Intl"	=> "Legături între limbi",
-	"Allpages"		=> "Toate paginile după titlu",
-
-	"Ipblocklist"	=> "Adrese IP blocate",
-	"Maintenance" => "Pagina de întreţinere",
-	"Specialpages"  => "Pagini speciale",
-	"Contributions" => "Contribuţii",
-	"Emailuser"		=> "Trimite e-mail utilizatorului",
-	"Whatlinkshere" => "Ce pagini se leagă aici",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "Mută pagina",
-	"Booksources"	=> "Surse externe de cărţi",
-	"Categories"	=> "Categorii de pagini",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesRo = array(
-	"Blockip"		=> "Blochează adresa IP",
-	"Asksql"		=> "Efectuează un query în baza de date",
-	"Undelete"		=> "Afişează şi restaurează pagini şterse"
-);
 
-/* private */ $wgDeveloperSpecialPagesRo = array(
-	"Lockdb"		=> "Blochează baza de date la scriere",
-	"Unlockdb"		=> "Deblochează baza de date",
 );
 
 /* private */ $wgAllMessagesRo = array(
 '1movedto2' => "$1 a fost mutată la $2",
 #'1movedto2_redir' => "$1 a fost mutată la $2 peste redirijare",
-'Monobook.css' => " /* 
- Pentru aparenţa monobook, {{SITENAME}} vine cu o inovaţie. 
- Utilizatorii individuali pot să  adpateze formatul {{SITENAME}} la cerinţele lor.
- */
-
- /* Colori di default */ 
- #content { color : black; } 
- #content { background : white; } 
- #p-cactions li { background : white; } 
- #p-cactions li a { background : white; } 
-
- /* Colore di fondo degli articoli */
- .ns-0 * #content { color : black; } 
- .ns-0 * #content { background : white; }
- .ns-0 * #p-cactions li { background : white; }
- .ns-0 * #p-cactions li a { background : white; }
-
- /* Colore di fondo delle pagine di discussione articoli */
- .ns-1 * #content { color : black; } 
- .ns-1 * #content { background : #FFEEFF; }
- .ns-1 * #p-cactions li { background : #FFEEFF; }
- .ns-1 * #p-cactions li a { background : #FFEEFF; }
-
- /* Colore di fondo delle pagine Utenti */
- .ns-2 * #content { color : black; } 
- .ns-2 * #content { background : white; }
- .ns-2 * #p-cactions li { background : white; }
- .ns-2 * #p-cactions li a { background : white; }
-
- /* Colore di fondo delle pagine di discussione Utenti */
- .ns-3 * #content { color : black; } 
- .ns-3 * #content { background : #FFEEFF; }
- .ns-3 * #p-cactions li { background : #FFEEFF; }
- .ns-3 * #p-cactions li a { background : #FFEEFF; }
-
- /* Colore di fondo delle pagine {{SITENAME}} */
- .ns-4 * #content { color : black; } 
- .ns-4 * #content { background : #EEEEFF; }
- .ns-4 * #p-cactions li { background : #EEEEFF; }
- .ns-4 * #p-cactions li a { background : #EEEEFF; }
-
- /* Colore di fondo delle pagine di discussione {{SITENAME}} */
- .ns-5 * #content { color : black; } 
- .ns-5 * #content { background : #FFEEFF; }
- .ns-5 * #p-cactions li { background : #FFEEFF; }
- .ns-5 * #p-cactions li a { background : #FFEEFF; }
-
- /* Colore di fondo delle pagine di discussione Immagine */
- .ns-7 * #content { background : #FFEEFF; }
- .ns-7 * #content { color : black; } 
- .ns-7 * #p-cactions li { background : #FFEEFF; }
- .ns-7 * #p-cactions li a { background : #FFEEFF; }
-
- /* Colore di fondo delle pagine MediaWiki */
- .ns-8 * #content { color : black; } 
- .ns-8 * #content { background : #EEFFEE; }
- .ns-8 * #p-cactions li { background : #EEFFEE; }
- .ns-8 * #p-cactions li a { background : #EEFFEE; }
-
- /* Colore di fondo delle pagine di discussione MediaWiki */
- .ns-9 * #content { color : black; } 
- .ns-9 * #content { background : #FFEEFF; }
- .ns-9 * #p-cactions li { background : #FFEEFF; }
- .ns-9 * #p-cactions li a { background : #FFEEFF; }
-
- /* Colore di fondo delle pagine di discussione Template */
- .ns-11 * #content { color : black; } 
- .ns-11 * #content { background : #FFEEFF; }
- .ns-11 * #p-cactions li { background : #FFEEFF; }
- .ns-11 * #p-cactions li a { background : #FFEEFF; }
-
- /* Colore di fondo delle pagine Aiuto */
- .ns-12 * #content { color : black; } 
- .ns-12 * #content { background : #FFEEEE; }
- .ns-12 * #p-cactions li { background : #FFEEEE; }
- .ns-12 * #p-cactions li a { background : #FFEEEE; }
-
- /* Colore di fondo delle pagine di discussione Aiuto */
- .ns-13 * #content { color : black; } 
- .ns-13 * #content { background : #FFEEEE; }
- .ns-13 * #p-cactions li { background : #FFEEEE; }
- .ns-13 * #p-cactions li a { background : #FFEEEE; }
-
- /* Colore di fondo delle pagine di discussione Categoria */
- .ns-15 * #content { color : black; } 
- .ns-15 * #content { background : #FFEEFF; }
- .ns-15 * #p-cactions li { background : #FFEEFF; }
- .ns-15 * #p-cactions li a { background : #FFEEFF; }
-
- /* numerele pare sunt pagini de discuţie
-xxx  '0': 'articol',  '2': 'utilizator',  '4': '{{SITENAME}}',  '6': 'imagine',  '8': 'mediawiki',  '10': 'format',  '12': 'ajutor',  '14': 'categorie' */
-
- /* underline links */
- a {
-   text-decoration: underline;
- }
-
- /* don't underline mouseover-links */
- a:hover {
-   text-decoration: none;
- }
-
- /* put scrollbar on pre sections instead of ugly cutoff/overlap in firefox */
- pre { overflow: auto; }
-
- /* link in selected tab */
- #p-cactions ul li.selected a {
-   /* font-weight: bold; */
- }
-
- /* Alinează textul din tabel vertical, până sus */
- table.nagore tbody {
-   vertical-align:top;
- }
-
- #siteNotice { padding: 0.3em; text-align: center; margin-bottom: 0.5em; }
- #siteNotice:after { 
- /* content: 'Pentru a sprijini creşterea proiectului {{SITENAME}}, vă rugăm vizitaţi [http://wikimediafoundation.org/fundraising pagina noastră pentru donaţii], sau citiţi despre [http://meta.wikimedia.org/wiki/What_we_use_the_money_for cum folosim noi banii].' Inactiv deocamdată */
- }
-
- /* stil pentru \"De la {{SITENAME}}, enciclopedia liberă */
- #siteSub {
-   display: inline;
-   font-weight: normal;
-   font-size: 0.95em; 
-   font-face: \"Trebuchet MS\", Verdana,sans-serif;
- }
-
- /* \"Editează pagina asta\" în aldine */
- #ca-edit a { 
-   font-weight: bold !important; 
- }",
-'Monobook.js' => 
+'Monobook.js' =>
 "/* tooltips and access keys */
 ta = new Object();
 ta['pt-userpage'] = new Array('.','Pagina mea de utilizator');
@@ -325,7 +126,6 @@ ta['ca-nstab-help'] = new Array('c','Vezi pagina de ajutor');
 ta['ca-nstab-category'] = new Array('c','Vezi categoria');",
 'about' => "Despre",
 'aboutpage' => "Project:Despre",
-'aboutwikipedia' => "Despre {{SITENAME}}",
 'accesskey-compareselectedversions' => "o",
 'accesskey-minoredit' => "m",
 #'accesskey-preview' => "p",
@@ -344,12 +144,11 @@ vor fi listate aici, şi în plus ele vor apărea cu <b>caractere îngroşate</b
 în viitor, apasă pe \"Nu mai urmări\" în bara de comenzi în timp ce această pagină este vizibilă.",
 #'addsection' => "+",
 'administrators' => "Project:Administratori",
-'affirmation' => "Afirm că persoana care deţine drepturile de autor asupra acestui fişier este de acord cu termenii licenţei $1.",
 'allmessages' => "Toate_mesajele",
 'allmessagestext' => "Aceasta este lista completă a mesajelor disponibile în domeniul \"MediaWiki:\"",
 'allpages' => "Toate paginile",
 'alphaindexline' => "$1 către $2",
-'alreadyloggedin' => "<font color=red><b>Eşti deja autentificat ca $1!</b></font><br>
+'alreadyloggedin' => "<strong>Eşti deja autentificat ca $1!</strong><br />
 ",
 'alreadyrolled' => "Nu se poate reveni peste ultima editare a [[$1]]
 făcută de către [[Utilizator:$2|$2]] ([[Discuţie utilizator:$2|Discuţie]]); altcineva a editat articolul sau a revenit deja.
@@ -364,11 +163,6 @@ Ultima editare a fost făcută de către [[Utilizator:$3|$3]] ([[Discuţie utili
 'articleexists' => "O pagină cu acelaşi nume există deja,
 sau numele pe care l-ai ales este invalid. Te rugăm să alegi un alt nume.",
 'articlepage' => "Vezi articolul",
-'asksql' => "Query SQL",
-'asksqltext' => "Foloseşte chestionarul de mai jos pentru a efectua un query direct către baza de date {{SITENAME}} (MySQL).
-Folosiţi apostrofuri ('în felul acesta') pentru a delimita şiruri de text.
-Această funcţionalitate poate solicita în mod deosebit server-ul,
-aşa că te rugăm să nu o foloseşti în exces.",
 'autoblocker' => "Autoblocat fiindcă foloseşti aceeaşi [[adresă IP]] ca şi \"$1\". Motivul este \"$2\".",
 'badarticleerror' => "Această acţiune nu poate fi efectuată pe această pagină.",
 'badfilename' => "Numele imaginii a fost schimbat; noul nume este \"$1\".",
@@ -384,13 +178,13 @@ Te rugăm să încerci încă o dată.",
 'badtitletext' => "Titlul căutat a fost invalid, gol sau o legătură invalidă inter-linguală sau inter-wiki.",
 'blanknamespace' => "(Principală)",
 'blockedtext' => "Utilizatorul sau parola ta au fost blocate de $1.
-Motivul oferit pentru blocare a fost:<br>''$2''<p>Îl poţi contacta pe $1 sau pe unul dintre ceilalţi
+Motivul oferit pentru blocare a fost:<br />''$2''<p>Îl poţi contacta pe $1 sau pe unul dintre ceilalţi
 [[Project:administratori|administratori]] pentru a discuta această blocare.",
 'blockedtitle' => "Utilizatorul este blocat",
 'blockip' => "Blocheză adresa IP",
 'blockipsuccesssub' => "Utilizatorul a fost blocat",
 'blockipsuccesstext' => "Adresa IP \"$1\" a fost blocată.
-<br>Vezi [[Special:Ipblocklist|lista de adrese IP blocate]] pentru a revizui adresele blocate.",
+<br />Vezi [[Special:Ipblocklist|lista de adrese IP blocate]] pentru a revizui adresele blocate.",
 'blockiptext' => "Foloseşte chestionarul de mai jos pentru a bloca
 la scriere o adresă IP. Această funcţie trebuie folosită numai pentru
 a preveni vandalismul conform [[Project:Politica|politicii {{SITENAME}}]].
@@ -415,9 +209,6 @@ iar lista de mai jos nu constituie nici un fel de garanţie sau validare a servi
 'bugreportspage' => "Project:Rapoarte_probleme",
 'bureaucratlog' => "Raport_birocrat",
 'bureaucratlogentry' => "Drepturile pentru utilizatorul \"$1\" setate \"$2\"",
-'bureaucrattext' => "Acţiunea pe care ai încercat-o poate fi realizată 
-doar de administratori cu statut de \"birocrat\".",
-'bureaucrattitle' => "Necesită acces de birocrat",
 'bydate' => "după dată",
 'byname' => "după nume",
 'bysize' => "după mărime",
@@ -431,7 +222,7 @@ doar de administratori cu statut de \"birocrat\".",
 #'categoryarticlecount' => "Sunt $1 articole în această categorie.",
 'changepassword' => "Schimbă parola",
 'changes' => "schimbări",
-#'clearyourcache' => "'''Notă:''' După salvare, poţi să-ţi goleşti fişierele din cache pentru a vedea schimbările: '''Mozilla:''' apasă ''reload''(sau ''ctrl-r''), '''IE / Opera:''' ''ctrl-f5'', '''Safari:''' ''cmd-r'', '''Konqueror''' ''ctrl-r''.",
+#'clearyourcache' => "'''Notă:''' După salvare, poţi să-ţi goleşti fişierele din cache pentru a vedea schimbările: '''Mozilla:''' apasă ''ctrl-shift-r'', '''IE:''' ''ctrl-f5'', '''Safari:''' ''cmd-shift-r'', '''Konqueror''' ''f5''.",
 'columns' => "Coloane",
 'commentedit' => " (comentariu)",
 'compareselectedversions' => "Compară versiunile selectate",
@@ -456,7 +247,7 @@ Te rugăm să îţi confirmi intenţia de a face asta, faptul că
 'copyrightpagename' => "Drepturi de autor în {{SITENAME}}",
 'copyrightwarning' => "Reţine că toate contribuţiile la {{SITENAME}} sunt considerate ca respectând licenţa GNU Free Documentation License
 (vezi $1 pentru detalii).
-Dacă nu doreşti ca ceea ce scrieţi să fie editat fără milă şi redistribuit în voie, atunci nu trimite materialele respective aici.<br>
+Dacă nu doreşti ca ceea ce scrieţi să fie editat fără milă şi redistribuit în voie, atunci nu trimite materialele respective aici.<br />
 De asemenea, trimiţând aceste materiale aici te angajezi că le-ai scris tu sau că sunt copiate dintr-o sursă care permite includerea materialelor sub această licenţă.
 <strong>NU TRIMITE MATERIALE PROTEJATE DE DREPTURI DE AUTOR FĂRĂ PERMISIUNE!</strong>",
 'couldntremove' => "Elementul '$1' nu a putut fi şters...",
@@ -508,11 +299,11 @@ Vezi $1.",
 'difference' => "(Diferenţa dintre versiuni)",
 'disambiguations' => "Pagini de dezambiguizare",
 'disambiguationspage' => "Project:Legături_către_paginile_de_dezambiguizare",
-'disambiguationstext' => "Următoarele articole conţin legături către cel puţin o <i>pagină de dezambiguizare</i>. Legăturile respective ar trebui făcute către paginile specifice.<br>O pagină este considerată ca fiind de dezambiguizare dacă există o legătură în ea dinspre $1.<br>Legăturile dinspre alte secţiuni {{SITENAME}} <i>nu sunt</i> luate în considerare aici.",
+'disambiguationstext' => "Următoarele articole conţin legături către cel puţin o <i>pagină de dezambiguizare</i>. Legăturile respective ar trebui făcute către paginile specifice.<br />O pagină este considerată ca fiind de dezambiguizare dacă există o legătură în ea dinspre $1.<br />Legăturile dinspre alte secţiuni {{SITENAME}} <i>nu sunt</i> luate în considerare aici.",
 'disclaimerpage' => "Project:General_disclaimer",
 'disclaimers' => "Disclaimer",
 'doubleredirects' => "Redirijări duble",
-'doubleredirectstext' => "<b>Atenţie:</b> Această listă poate conţine articole care nu sunt în fapt duble redirijări. Asta înseamnă de obicei că există text adiţional sub primul #REDIRECT.<br>
+'doubleredirectstext' => "<b>Atenţie:</b> Această listă poate conţine articole care nu sunt în fapt duble redirijări. Asta înseamnă de obicei că există text adiţional sub primul #REDIRECT.<br />
 Fiecare rând care conţine legături către prima sau a doua redirijare, ca şi prima linie din textul celei de-a doua redirijări, de obicei conţinând numele \"real\" al articolului ţintă, către care ar trebui să arate prima redirijare.",
 'edit' => "Editează pagina",
 'editcomment' => "Comentariul de editare a fost: \"<i>$1</i>\".",
@@ -572,7 +363,6 @@ pate fi transformat sau păstrat pur şi simplu fiindcă doreşti tu să-l păst
 'fileuploaded' => "Fişierul \"$1\" a fost trimis.
 Te rugăm să vizitezi această legătură: ($2) pentru a descrie fişierul şi pentru a completa informaţii despre acesta, ca de exemplu de unde provine, când a fost creat şi de către cine, cât şi orice alte informaţii doreşti să le adaugi.",
 'formerror' => "Eroare: datele nu au putut fi trimise",
-'fromwikipedia' => "De la {{SITENAME}}, enciclopedia liberă.",
 'getimagelist' => "încarc lista de imagini",
 'go' => "Du-te",
 'guesstimezone' => "Încearcă determinarea automată a diferenţei",
@@ -603,7 +393,7 @@ Te rugăm să vizitezi această legătură: ($2) pentru a descrie fişierul şi
 'imgdelete' => "şterge",
 #'imgdesc' => "desc",
 'imghistlegend' => "Legendă: (actuală) = versiunea curentă a imaginii, (şterg) = şterge această versiune veche, (rev) = revino la această versiune veche.
-<br><i>Apasă pe dată pentru a vedea versiunea trimisă la data respectivă</i>.",
+<br /><i>Apasă pe dată pentru a vedea versiunea trimisă la data respectivă</i>.",
 'imghistory' => "Istoria imaginii",
 'imglegend' => "Legendă: (desc) = arată/editează descrierea imaginii.",
 'import' => "Importă pagini",
@@ -653,7 +443,7 @@ Te rugăm să vizitezi această legătură: ($2) pentru a descrie fişierul şi
 'lockdb' => "Blochează baza de date",
 'lockdbsuccesssub' => "Baza de date a fost blocată",
 'lockdbsuccesstext' => "Baza de date {{SITENAME}} a fost blocată la scriere.
-<br>Nu uita să o deblochezi după ce termini operaţiunile administrative pentru care ai blocat-o.",
+<br />Nu uita să o deblochezi după ce termini operaţiunile administrative pentru care ai blocat-o.",
 'lockdbtext' => "Blocarea bazei de date va împiedica pe toţi utilizatorii
 să editeze pagini, să-şi schimbe preferinţele, să-şi editeze listele de
 pagini urmărite şi orice alte operaţiuni care ar necesita schimări
@@ -662,16 +452,16 @@ Te rugăm să confirmi că intenţionezi acest lucru şi faptul că vei debloca
 baza de date atunci când vei încheia operaţiunile de întreţinere.",
 'locknoconfirm' => "Nu ai confirmat căsuţa de confirmare.",
 'login' => "Autentificare",
-'loginend' => "Pentru a crea un cont de utilizator, introdu [[Project:Nume de utilizator|numele de utilizator]] şi parola, apoi fă clic pe \"Creează cont nou\". Evită folosirea numelui unei personalităţi politice, militare sau religioase, sau a unui eveniment. Evită numele de utilizator care sunt ofensive, dăunătoare sau confuze. Te rugăm să alegi un nume citeţ, nu doar un număr. 
+'loginend' => "Pentru a crea un cont de utilizator, introdu [[Project:Nume de utilizator|numele de utilizator]] şi parola, apoi fă clic pe \"Creează cont nou\". Evită folosirea numelui unei personalităţi politice, militare sau religioase, sau a unui eveniment. Evită numele de utilizator care sunt ofensive, dăunătoare sau confuze. Te rugăm să alegi un nume citeţ, nu doar un număr.
 
-Dacă ai nevoie de mai multe informaţii asupra modului de înregistrare, vezi articolul [[Project:Cum mă înregistrez|Cum mă înregistrez]].<br><br> 
+Dacă ai nevoie de mai multe informaţii asupra modului de înregistrare, vezi articolul [[Project:Cum mă înregistrez|Cum mă înregistrez]].<br /><br />
 
-După ce te înregistrezi, pentru a te autentifica dăţile viitoare când vizitezi {{SITENAME}}, va trebui să introduci doar numele de utilizator şi parola.<br><br>
+După ce te înregistrezi, pentru a te autentifica dăţile viitoare când vizitezi {{SITENAME}}, va trebui să introduci doar numele de utilizator şi parola.<br /><br />
 
 *Introducerea unei adrese de e-mail este opţională, nefiind necesară o confirmare pe e-mail în prealabil. Totuşi, aceasta permite oamenilor să te contacteze prin intermediul acestui sit web, fără să ţi-o afle şi te ajută şi în cazul în care ţi-ai uitat parola.",
 'loginerror' => "Eroare de autentificare",
 'loginpagetitle' => "Autentificare utilizator",
-'loginproblem' => "<b>A fost o problemă cu autentificarea ta</b><br>Încearcă din nou!",
+'loginproblem' => "<b>A fost o problemă cu autentificarea ta</b><br />Încearcă din nou!",
 'loginprompt' => "Trebuie să ai modulele cookie activate pentru a te autentifica la {{SITENAME}}.",
 'loginreqtext' => "Trebuie să te [[special:Userlogin|autentifici]] pentru a vizualiza alte pagini.",
 'loginreqtitle' => "Necesită Autentificare",
@@ -704,7 +494,7 @@ pentru a trimite e-mail altor utilizatori.",
 'makesysopname' => "Numele utilizatorului:",
 'makesysopok' => "<b>Utilizatorul \"$1\" este acum administrator</b>",
 'makesysopsubmit' => "Fă din acest utilizator un administrator",
-'makesysoptext' => "Acest formular este utilizat de birocraţi pentru a transforma utilizatori de rând în administratori. 
+'makesysoptext' => "Acest formular este utilizat de birocraţi pentru a transforma utilizatori de rând în administratori.
 Tastează numele utilizatorului în cutie şi apasă butonul pentru a face din utilizator un administrator",
 'makesysoptitle' => "Fă dintr-un utilizator un administrator",
 'matchtotals' => "Căutarea \"$1\" a produs $2 rezultate în titluri de articole şi $3 rezultate în texte de articole.",
@@ -794,12 +584,10 @@ Dacă ai ajuns aici din greşeală, întoarce-te folosind controalele browser-ul
 'nextn' => "următoarele $1",
 #'nextpage' => "Pagina următoare ($1)",
 'nlinks' => "$1 legături",
-'noaffirmation' => "Trebuie să afirmi că fişierul pe care îl trimiţi nu violează drepturi de autor (trebuie să bifezi căsuţa aferentă de pe pagina anterioară).",
 'noarticletext' => "<div style=\"border: 1px solid #ccc; padding: 7px;\">'''{{SITENAME}} nu are încă un articol cu acest nume'''
 * Pentru a începe articolul, fă clic pe '''[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} editează pagina]'''.
 * Poate există o intrare cu numele [[Wiktionary:ro:{{PAGENAME}}|{{PAGENAME}}]] în proiectul nostru frate, în [http://ro.wiktionary.org Wikţionar].
 </div>",
-'noblockreason' => "Trebuie să incluzi un motiv pentru blocare.",
 'noconnect' => "Nu s-a putut conecta baza de date pe $1",
 'nocontribs' => "Nu a fost găsită nici o modificare care să satisfacă acest criteriu.",
 'nocookieslogin' => "{{SITENAME}} foloseşte module cookie pentru a autentifica utilizatorii. Browser-ul tău are modulele cookie dezactivate. Te rugăm să le activezi şi să încerci din nou.",
@@ -879,11 +667,11 @@ Te rugăm să te autentifici în {{SITENAME}} după ce o primeşti.",
 'poweredby' => "{{SITENAME}} foloseşte [http://www.mediawiki.org/ MediaWiki], un motor wiki open source.",
 'powersearch' => "Caută",
 'powersearchtext' => "
-Caută în secţiunile:<br>
-$1<br>
+Caută în secţiunile:<br />
+$1<br />
 $2 Redirijări&nbsp; Căutări după $3 $9",
 'preferences' => "Preferinţe",
-'prefs-help-realname' => "* <strong>Numele tău real</strong> (opţional): Dacă decizi să  introduci numele real aici, acesta va fi folosit pentru a vă atribui munca.<br/>",
+'prefs-help-realname' => "* <strong>Numele tău real</strong> (opţional): Dacă decizi să  introduci numele real aici, acesta va fi folosit pentru a vă atribui munca.<br />",
 'prefs-help-email' => "* <strong>Adresa de e-mail</strong> (opţional): Permite altor utilizatori să te contacteze folosind {{SITENAME}}, fără a fi necesar să le pui la dispoziţie adresa reală de mail. În plus, aici ţi se poate trimite o nouă parolă în caz că o pierzi pe cea existentă.",
 'prefs-misc' => "Diverse reglări",
 'prefs-personal' => "Date de utilizator",
@@ -923,7 +711,7 @@ Vezi [[Project:Pagină protejată]] pentru mai multe informaţii.",
 'proxyblocksuccess' => "Realizat.",
 'qbbrowse' => "Răsfoieşte",
 'qbedit' => "Editează",
-'qbfind' => "Găseşte<br>
+'qbfind' => "Găseşte<br />
 <small>Diacritice: ă â î ş ţ</small>",
 'qbmyoptions' => "Opţiunile mele",
 'qbpageinfo' => "Informaţii ale paginii",
@@ -931,8 +719,6 @@ Vezi [[Project:Pagină protejată]] pentru mai multe informaţii.",
 'qbsettings' => "Setări pentru quickbar",
 #'qbsettingsnote' => "Această funcţie funcţionează doar în straturile 'Standard' şi 'CologneBlue'.",
 'qbspecialpages' => "Pagini speciale",
-'querybtn' => "Trimite query",
-'querysuccessful' => "Query efectuat",
 'randompage' => "Pagină aleatoare",
 'range_block_disabled' => "Abilitatea dezvoltatorilor de a bloca serii de adrese este dezactivată.",
 'rchide' => "în $4 form; $1 editări minore; $2 namespace-uri secundare; $3 editări multiple.",
@@ -993,19 +779,14 @@ Este foarte important să nu adaugi în {{SITENAME}} materiale protejate de [[dr
 'saveprefs' => "Salvează preferinţele",
 'search' => "Caută",
 'searchdisabled' => "<p>Ne pare rău! Căutarea după text a fost dezactivată temporar, din motive de performanţă. Între timp poţi folosi căutarea prin Google mai jos, însă aceasta poate să dea rezultate învechite.</p>",
-'searchhelppage' => "Project:Căutare",
-'searchingwikipedia' => "Căutare în {{SITENAME}}",
 'searchquery' => "Pentru căutarea \"$1\"",
 'searchresults' => "Rezultatele căutării",
 'searchresultshead' => "Setări de căutare",
 'searchresulttext' => "Pentru mai multe detalii despre căutarea în {{SITENAME}}, vezi $1.",
-'sectionedit' => " (secţiune)",
 'selectnewerversionfordiff' => "Selectează o versiunea mai nouă pentru comparare",
 'selectolderversionfordiff' => "Selectează o versiunea mai veche pentru comparaţie",
-'selectonly' => "Alte query-uri în afară de \"SELECT\" sunt accesibile numai pentru dezvoltatorii {{SITENAME}}.",
 'selflinks' => "Pagini cu legături ciclice",
 'selflinkstext' => "Următoarele pagini conţin legături către ele însele, ceea ce n-ar trebui să se întâmple.",
-'seriousxhtmlerrors' => "Tidy a detectat mai multe erori grave de marcaj xhtml.",
 'servertime' => "Ora serverului (UTC)",
 'set_rights_fail' => "<b>Nu au putut fi acordate drepturi de utilizator lui \"$1\". (Ai introdus numele corect?)</b>",
 'set_user_rights' => "Acordă drepturi de utilizator",
@@ -1038,8 +819,6 @@ de la ultima actualizare a programului (July 20, 2002).
 'specialpage' => "Pagină Specială",
 'specialpages' => "Pagini speciale",
 'spheading' => "Pagini speciale",
-'sqlislogged' => "Reţine că toate query-urile sunt reţinute în server (logged).",
-'sqlquery' => "Introdu query",
 'statistics' => "Statistici",
 'storedversion' => "Versiunea curentă",
 'stubthreshold' => "Limita de caractere pentru un ciot",
@@ -1237,12 +1016,11 @@ Nu uita să-ţi personalizezi preferinţele în {{SITENAME}}.",
 'whitelistreadtext' => "Trebuie să te [[Special:Userlogin|autentifici]] pentru a citi articole.",
 'whitelistreadtitle' => "Este necesară autentificarea pentru a citi",
 'wikipediapage' => "Vezi pagina meta",
-'wikititlesuffix' => "{{SITENAME}} în română",
 'wlnote' => "Dedesubt găseşti ultimele $1 schimbări din ultimele <b>$2</b> ore.",
 'wlsaved' => "Aceasta este o versiune salvată a listei tale de pagini urmărite.",
 'wlshowlast' => "Arată ultimele $1 ore $2 zile $3",
-'wrong_wfQuery_params' => "Număr incorect de parametri pentru wfQuery()<br>
-Funcţia: $1<br>
+'wrong_wfQuery_params' => "Număr incorect de parametri pentru wfQuery()<br />
+Funcţia: $1<br />
 Query: $2
 ",
 'wrongpassword' => "Parola pe care ai introdus-o este greşită. Te rugăm să încerci din nou.",
@@ -1265,7 +1043,6 @@ class LanguageRo extends LanguageUtf8 {
 
 	function getQuickbarSettings() {
 		global $wgQuickbarSettingsRo;
-
 		return $wgQuickbarSettingsRo;
 	}
 
@@ -1274,49 +1051,28 @@ class LanguageRo extends LanguageUtf8 {
 		return $wgSkinNamesRo;
 	}
 
-        function getDateFormats() {
-                global $wgDateFormatsRo;
-                return $wgDateFormatsRo;
-        }
-
-	function timeanddate( $ts, $adj = false )
-	{
-		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
-	}
-
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesRo;
-		return $wgValidSpecialPagesRo;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesRo;
-		return $wgSysopSpecialPagesRo;
+	function getDateFormats() {
+		global $wgDateFormatsRo;
+		return $wgDateFormatsRo;
 	}
 
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesRo;
-		return $wgDeveloperSpecialPagesRo;
+	function timeanddate( $ts, $adj = false ) {
+		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesRo;
 		if( isset( $wgAllMessagesRo[$key] ) )
 			return $wgAllMessagesRo[$key];
 		else
 			return parent::getMessage( $key );
 	}
-	
+
 	function fallback8bitEncoding() {
 		return "iso8859-2";
 	}
 
-	function getMagicWords() 
-	{
+	function getMagicWords() {
 		global $wgMagicWordsRo;
 		return $wgMagicWordsRo;
 	}
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index d948fe0f951a..90baced485f5 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -10,103 +10,54 @@
 require_once( 'LanguageUtf8.php' );
 
 if($wgMetaNamespace === FALSE)
-        $wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
+	$wgMetaNamespace = str_replace( ' ', '_', $wgSitename );
 
 
 /* private */ $wgNamespaceNamesRu = array(
-        NS_MEDIA            => 'Медиа',
-        NS_SPECIAL          => 'Служебная',
-        NS_MAIN             => '',
-        NS_TALK             => 'Обсуждение',
-        NS_USER             => 'Участник',
-        NS_USER_TALK        => 'Обсуждение_участника',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => FALSE,  #Set in constructor
-        NS_IMAGE            => 'Изображение',
-        NS_IMAGE_TALK       => 'Обсуждение_изображения',
-        NS_MEDIAWIKI        => 'MediaWiki',
-        NS_MEDIAWIKI_TALK   => 'Обсуждение_MediaWiki',
-        NS_TEMPLATE         => 'Шаблон',
-        NS_TEMPLATE_TALK    => 'Обсуждение_шаблона',
-        NS_HELP             => 'Справка',
-        NS_HELP_TALK        => 'Обсуждение_справки',
-        NS_CATEGORY         => 'Категория',
-        NS_CATEGORY_TALK    => 'Обсуждение_категории',
+	NS_MEDIA            => 'Медиа',
+	NS_SPECIAL          => 'Служебная',
+	NS_MAIN             => '',
+	NS_TALK             => 'Обсуждение',
+	NS_USER             => 'Участник',
+	NS_USER_TALK        => 'Обсуждение_участника',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => FALSE,  #Set in constructor
+	NS_IMAGE            => 'Изображение',
+	NS_IMAGE_TALK       => 'Обсуждение_изображения',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Обсуждение_MediaWiki',
+	NS_TEMPLATE         => 'Шаблон',
+	NS_TEMPLATE_TALK    => 'Обсуждение_шаблона',
+	NS_HELP             => 'Справка',
+	NS_HELP_TALK        => 'Обсуждение_справки',
+	NS_CATEGORY         => 'Категория',
+	NS_CATEGORY_TALK    => 'Обсуждение_категории',
 ) + $wgNamespaceNamesEn;
 
-if(isset($wgExtraNamespaces)) {
-        $wgNamespaceNamesRu=$wgNamespaceNamesRu+$wgExtraNamespaces;
-}
 
 /* private */ $wgQuickbarSettingsRu = array(
-        'Не показывать', 'Неподвижная слева', 'Неподвижная справа', 'Плавающая слева', 'Плавающая справа'
+	'Не показывать', 'Неподвижная слева', 'Неподвижная справа', 'Плавающая слева', 'Плавающая справа'
 );
 
 /* private */ $wgSkinNamesRu = array(
-        'standard' => 'Стандартный',
-        'nostalgia' => 'Ностальгия',
-        'cologneblue' => 'Кёльнская тоска',
-        'davinci' => 'Да Винчи',
-        'mono' => 'Моно',
-        'monobook' => 'Моно-книга',
-        'myskin' => 'Своё',
-        'chick' => 'Цыпа'
+	'standard' => 'Стандартный',
+	'nostalgia' => 'Ностальгия',
+	'cologneblue' => 'Кёльнская тоска',
+	'davinci' => 'Да Винчи',
+	'mono' => 'Моно',
+	'monobook' => 'Моно-книга',
+	'myskin' => 'Своё',
+	'chick' => 'Цыпа'
 );
 
 
 /* private */ $wgBookstoreListRu = array(
-        'ОЗОН' => 'http://www.ozon.ru/?context=advsearch_book&isbn=$1',
-        'Books.Ru' => 'http://www.books.ru/shop/search/advanced?as%5Btype%5D=books&as%5Bname%5D=&as%5Bisbn%5D=$1&as%5Bauthor%5D=&as%5Bmaker%5D=&as%5Bcontents%5D=&as%5Binfo%5D=&as%5Bdate_after%5D=&as%5Bdate_before%5D=&as%5Bprice_less%5D=&as%5Bprice_more%5D=&as%5Bstrict%5D=%E4%E0&as%5Bsub%5D=%E8%F1%EA%E0%F2%FC&x=22&y=8',
-        'Яндекс.Маркет' => 'http://market.yandex.ru/search.xml?text=$1',
-        'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
-);
-
-/* private */ $wgValidSpecialPagesRu = array(
-  'Userlogin'           => '',
-  'Userlogout'          => '',
-  'Preferences'         => 'Ваши настройки',
-  'Watchlist'           => 'Ваш список наблюдения',
-  'Recentchanges'       => 'Свежие правки',
-  'Upload'              => 'Загрузить файл',
-  'Imagelist'           => 'Список изображений',
-  'Listusers'           => 'Зарегистрированные  участники',
-  'Statistics'          => 'Статистика',
-  'Randompage'          => 'Случайная статья',
-
-  'Lonelypages'         => 'Статьи-сироты',
-  'Unusedimages'        => 'Изображения-сироты',
-  'Popularpages'        => 'Популярные статьи',
-  'Wantedpages'         => 'Требуемые статьи',
-  'Shortpages'          => 'Короткие статьи',
-  'Longpages'           => 'Длинные статьи',
-  'Newpages'            => 'Новые статьи',
-  'Ancientpages'        => 'Самые старые статьи',
-  'Allpages'            => 'Все страницы по алфавиту',
-
-  'Ipblocklist'         => 'Заблокированные IP-адреса',
-  'Maintenance'         => 'Подсобная страница',
-  'Specialpages'        => '',
-  'Contributions'       => '',
-  'Movepage'            => '',
-  'Emailuser'           => '',
-  'Whatlinkshere'       => '',
-  'Recentchangeslinked' => '',
-  'Booksources'         => 'Где искать книги',
-  'Categories'          => 'Категории',
-  'Export'              => 'Экспорт в XML',
-  'Version'                     => 'Версия',
+	'ОЗОН' => 'http://www.ozon.ru/?context=advsearch_book&isbn=$1',
+	'Books.Ru' => 'http://www.books.ru/shop/search/advanced?as%5Btype%5D=books&as%5Bname%5D=&as%5Bisbn%5D=$1&as%5Bauthor%5D=&as%5Bmaker%5D=&as%5Bcontents%5D=&as%5Binfo%5D=&as%5Bdate_after%5D=&as%5Bdate_before%5D=&as%5Bprice_less%5D=&as%5Bprice_more%5D=&as%5Bstrict%5D=%E4%E0&as%5Bsub%5D=%E8%F1%EA%E0%F2%FC&x=22&y=8',
+	'Яндекс.Маркет' => 'http://market.yandex.ru/search.xml?text=$1',
+	'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
 );
 
-/* private */ $wgSysopSpecialPagesRu = array(
-        'Blockip'               => 'Заблокировать IP-адрес',
-        'Asksql'                => 'Сделать запрос к базе данных',
-        'Undelete'              => 'Посмотреть и восстановить стёртые страницы'
-);
-
-/* private */ $wgDeveloperSpecialPagesRu = array(
-        'Lockdb'                => 'Сделать базу данных доступной только для чтения',
-        'Unlockdb'              => 'Восстановить возможность записи в базу данных',
-);
 
 # Note to translators:
 #   Please include the English words as synonyms.  This allows people
@@ -114,57 +65,57 @@ if(isset($wgExtraNamespaces)) {
 #
 /* private */ $wgMagicWordsRu = array(
 #   ID                                 CASE  SYNONYMS
-        MAG_REDIRECT             => array( 0,    '#redirect', '#перенаправление', '#перенапр'),
-        MAG_NOTOC                => array( 0,    '__NOTOC__', '__БЕЗСОДЕРЖАНИЯ__'),
-        MAG_FORCETOC             => array( 0,    '__FORCETOC__'),
-        MAG_TOC                  => array( 0,    '__TOC__', '__СОДЕРЖАНИЕ__'),
-        MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__БЕЗРЕДАКТИРОВАНИЯРАЗДЕЛА__'),
-        MAG_START                => array( 0,    '__START__', '__НАЧАЛО__'),
-        MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH', 'ТЕКУЩИЙМЕСЯЦ'),
-        MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME','НАЗВАНИЕТЕКУЩЕГОМЕСЯЦА'),
-        MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN','НАЗВАНИЕТЕКУЩЕГОМЕСЯЦАРОД'),
-        MAG_CURRENTMONTHABBREV   => array( 1,    'CURRENTMONTHABBREV', 'НАЗВАНИЕТЕКУЩЕГОМЕСЯЦААБР'),
-        MAG_CURRENTDAY           => array( 1,    'CURRENTDAY','ТЕКУЩИЙДЕНЬ'),
-        MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME','НАЗВАНИЕТЕКУЩЕГОДНЯ'),
-        MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR','ТЕКУЩИЙГОД'),
-        MAG_CURRENTTIME          => array( 1,    'CURRENTTIME','ТЕКУЩЕЕВРЕМЯ'),
-        MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES','КОЛИЧЕСТВОСТАТЕЙ'),
-        MAG_NUMBEROFFILES        => array( 1,    'NUMBEROFFILES', 'КОЛИЧЕСТВОФАЛОВ'),
-        MAG_PAGENAME             => array( 1,    'PAGENAME','НАЗВАНИЕСТРАНИЦЫ'),
-        MAG_PAGENAMEE            => array( 1,    'PAGENAMEE','НАЗВАНИЕСТРАНИЦЫ2'),
-        MAG_NAMESPACE            => array( 1,    'NAMESPACE','ПРОСТРАНСТВОИМЁН'),
-        MAG_MSG                  => array( 0,    'MSG:'),
-        MAG_SUBST                => array( 0,    'SUBST:','ПОДСТ:'),
-        MAG_MSGNW                => array( 0,    'MSGNW:'),
-        MAG_END                  => array( 0,    '__END__','__КОНЕЦ__'),
-        MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb', 'мини'),
-        MAG_IMG_RIGHT            => array( 1,    'right','справа'),
-        MAG_IMG_LEFT             => array( 1,    'left','слева'),
-        MAG_IMG_NONE             => array( 1,    'none'),
-        MAG_IMG_WIDTH            => array( 1,    '$1px','$1пкс'),
-        MAG_IMG_CENTER           => array( 1,    'center', 'centre','центр'),
-        MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame','обрамить'),
-        MAG_INT                  => array( 0,    'INT:'),
-        MAG_SITENAME             => array( 1,    'SITENAME','НАЗВАНИЕСАЙТА'),
-        MAG_NS                   => array( 0,    'NS:','ПИ:'),
-        MAG_LOCALURL             => array( 0,    'LOCALURL:'),
-        MAG_LOCALURLE            => array( 0,    'LOCALURLE:'),
-        MAG_SERVER               => array( 0,    'SERVER','СЕРВЕР'),
-        MAG_SERVERNAME           => array( 0,    'SERVERNAME', 'НАЗВАНИЕСЕРВЕРА'),
-        MAG_SCRIPTPATH           => array( 0,    'SCRIPTPATH', 'ПУТЬКСКРИПТУ'),
-        MAG_GRAMMAR              => array( 0,    'GRAMMAR:'),
-        MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__', '__БЕЗПРЕОБРАЗОВАНИЯЗАГОЛОВКА__'),
-        MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__', '__БЕЗПРЕОБРАЗОВАНИЯТЕКСТА__'),
-        MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK','ТЕКУЩАЯНЕДЕЛЯ'),
-        MAG_CURRENTDOW           => array( 1,    'CURRENTDOW','ТЕКУЩИЙДЕНЬНЕДЕЛИ'),
-        MAG_REVISIONID           => array( 1,    'REVISIONID', 'ИДВЕРСИИ'),
+	MAG_REDIRECT             => array( 0,    '#redirect', '#перенаправление', '#перенапр'),
+	MAG_NOTOC                => array( 0,    '__NOTOC__', '__БЕЗСОДЕРЖАНИЯ__'),
+	MAG_FORCETOC             => array( 0,    '__FORCETOC__'),
+	MAG_TOC                  => array( 0,    '__TOC__', '__СОДЕРЖАНИЕ__'),
+	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__БЕЗРЕДАКТИРОВАНИЯРАЗДЕЛА__'),
+	MAG_START                => array( 0,    '__START__', '__НАЧАЛО__'),
+	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH', 'ТЕКУЩИЙМЕСЯЦ'),
+	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME','НАЗВАНИЕТЕКУЩЕГОМЕСЯЦА'),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN','НАЗВАНИЕТЕКУЩЕГОМЕСЯЦАРОД'),
+	MAG_CURRENTMONTHABBREV   => array( 1,    'CURRENTMONTHABBREV', 'НАЗВАНИЕТЕКУЩЕГОМЕСЯЦААБР'),
+	MAG_CURRENTDAY           => array( 1,    'CURRENTDAY','ТЕКУЩИЙДЕНЬ'),
+	MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME','НАЗВАНИЕТЕКУЩЕГОДНЯ'),
+	MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR','ТЕКУЩИЙГОД'),
+	MAG_CURRENTTIME          => array( 1,    'CURRENTTIME','ТЕКУЩЕЕВРЕМЯ'),
+	MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES','КОЛИЧЕСТВОСТАТЕЙ'),
+	MAG_NUMBEROFFILES        => array( 1,    'NUMBEROFFILES', 'КОЛИЧЕСТВОФАЛОВ'),
+	MAG_PAGENAME             => array( 1,    'PAGENAME','НАЗВАНИЕСТРАНИЦЫ'),
+	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE','НАЗВАНИЕСТРАНИЦЫ2'),
+	MAG_NAMESPACE            => array( 1,    'NAMESPACE','ПРОСТРАНСТВОИМЁН'),
+	MAG_MSG                  => array( 0,    'MSG:'),
+	MAG_SUBST                => array( 0,    'SUBST:','ПОДСТ:'),
+	MAG_MSGNW                => array( 0,    'MSGNW:'),
+	MAG_END                  => array( 0,    '__END__','__КОНЕЦ__'),
+	MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb', 'мини'),
+	MAG_IMG_RIGHT            => array( 1,    'right','справа'),
+	MAG_IMG_LEFT             => array( 1,    'left','слева'),
+	MAG_IMG_NONE             => array( 1,    'none'),
+	MAG_IMG_WIDTH            => array( 1,    '$1px','$1пкс'),
+	MAG_IMG_CENTER           => array( 1,    'center', 'centre','центр'),
+	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame','обрамить'),
+	MAG_INT                  => array( 0,    'INT:'),
+	MAG_SITENAME             => array( 1,    'SITENAME','НАЗВАНИЕСАЙТА'),
+	MAG_NS                   => array( 0,    'NS:','ПИ:'),
+	MAG_LOCALURL             => array( 0,    'LOCALURL:'),
+	MAG_LOCALURLE            => array( 0,    'LOCALURLE:'),
+	MAG_SERVER               => array( 0,    'SERVER','СЕРВЕР'),
+	MAG_SERVERNAME           => array( 0,    'SERVERNAME', 'НАЗВАНИЕСЕРВЕРА'),
+	MAG_SCRIPTPATH           => array( 0,    'SCRIPTPATH', 'ПУТЬКСКРИПТУ'),
+	MAG_GRAMMAR              => array( 0,    'GRAMMAR:'),
+	MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__', '__БЕЗПРЕОБРАЗОВАНИЯЗАГОЛОВКА__'),
+	MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__', '__БЕЗПРЕОБРАЗОВАНИЯТЕКСТА__'),
+	MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK','ТЕКУЩАЯНЕДЕЛЯ'),
+	MAG_CURRENTDOW           => array( 1,    'CURRENTDOW','ТЕКУЩИЙДЕНЬНЕДЕЛИ'),
+	MAG_REVISIONID           => array( 1,    'REVISIONID', 'ИДВЕРСИИ'),
 );
 
 /* private */ $wgAllMessagesRu = array(
 
-# User preference toggles 
+# User preference toggles
 'tog-underline' => 'Подчёркивать ссылки',
-'tog-highlightbroken' => 'Показывать несуществующие ссылки <a href=\"\" class=\"new\">вот так</a> (иначе вот так<a href=\"\" class=\"internal\">?</a>).',
+'tog-highlightbroken' => 'Показывать несуществующие ссылки <a href="" class="new">вот так</a> (иначе вот так<a href="" class="internal">?</a>).',
 'tog-justify'   => 'Выравнивать текст по ширине страницы',
 'tog-hideminor' => 'Скрывать малозначимые правки в списке свежих изменений',
 'tog-usenewrc' => 'Улучшенный список свежих изменений (JavaScript)',
@@ -186,7 +137,6 @@ if(isset($wgExtraNamespaces)) {
 'tog-enotifminoredits'          => 'Уведомлять по эл. почте даже при малозначительных изменениях',
 'tog-enotifrevealaddr'          => 'Показывать мой почтовый адрес в сообщениях оповещения',
 'tog-shownumberswatching'       => 'Показывать число участников, включивших страницу в свой список наблюдения',
-'tog-showupdated'               => 'Показывать метку обновления',
 'tog-fancysig' => 'Простая подпись (без автоматической ссылки)',
 'tog-externaleditor' => 'Использовать по умолчанию внешний редактор',
 'tog-externaldiff' => 'Использовать по умолчанию внешную программу сравнения версий',
@@ -237,7 +187,7 @@ if(isset($wgExtraNamespaces)) {
 'subcategories' => 'Подкатегории',
 
 
-'linktrail'             => '/^((?:[a-z]|а|б|в|г|д|е|ё|ж|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ъ|ы|ь|э|ю|я)+)(.*)$/sD', 
+'linktrail'             => '/^((?:[a-z]|а|б|в|г|д|е|ё|ж|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ъ|ы|ь|э|ю|я)+)(.*)$/sD',
 'linkprefix'            => '/^(.*?)([a-zA-Z\x80-\xff\x4000-\x4f0f]+)$/sD',
 'mainpage'              => 'Заглавная страница',
 'mainpagetext'  => 'Програмное обеспечение вики-проекта успешно установлено.',
@@ -252,7 +202,6 @@ if(isset($wgExtraNamespaces)) {
 'article' => 'Статья',
 'help'                  => 'Справка',
 'helppage'            => '{{ns:project}}:Справка',
-'wikititlesuffix' => '{{SITENAME}}',
 'bugreports'  => 'Отчёт об ошибке',
 'bugreportspage' => '{{ns:project}}:Отчёт об ошибке',
 'sitesupport'   => 'Пожертвования', # To enable, something like 'Donations', '-' to disable
@@ -407,7 +356,7 @@ $1',
 'readonlytext'  => "Добавление новых статей и другие изменения базы данных сейчас заблокированы: вероятно, в связи с плановым обслуживанием.
 Заблокировавший оператор оставил следующее разъяснение:
 $1",
-'missingarticle' => "База данных не нашла текста статьи, 
+'missingarticle' => "База данных не нашла текста статьи,
 хотя должна была найти, по имени «$1».
 
 Обычно это вызвано использованием устаревшей ссылки на журнал изменений или различий для статьи, которая была удалена.
@@ -433,7 +382,7 @@ $1",
 Функция: $1<br />
 Запрос: $2",
 'viewsource' => 'Просмотр',
-'protectedtext' => "Эта страница заблокирована для предотвращения её изменений. 
+'protectedtext' => "Эта страница заблокирована для предотвращения её изменений.
 Существуют несколько причин по которым это могло быть сделано,
 смотрите [[{{ns:project}}:Журнал защиты]] для того чтобы узнать причину, связанную с этой страницей.
 
@@ -458,8 +407,8 @@ $1",
 'remembermypassword' => 'Запоминать пароль',
 'yourdomainname'       => 'Ваш домен',
 'externaldberror'      => 'Произошла ошибка при аутентификации с помощью внешней базы данных, или у вас недостаточно прав для внесения изменений в свою внешнюю учётную запись.',
-'loginproblem'  => '<span style=\"color:red\">Участник неопознан.</span>',
-'alreadyloggedin' => "<font color=red><strong>Участник $1, вы уже представились системе!</strong></font><br />",
+'loginproblem'  => '<span style="color:red">Участник неопознан.</span>',
+'alreadyloggedin' => "<strong>Участник $1, вы уже представились системе!</strong><br />",
 
 'login'                 => 'Представиться системе',
 'loginprompt'           => "Вы должны разрешить «cookies», чтобы представиться системе.",
@@ -494,7 +443,6 @@ $1",
 'nosuchusershort'       => "Не существует участника с именем $1. Проверьте написание имени.",
 'wrongpassword'         => 'Введённый вами пароль неверен. Попробуйте ещё раз.',
 'mailmypassword'        => 'Выслать новый пароль',
-'mailmypasswordauthent' => 'Выслать новый пароль',
 'passwordremindertitle' => "Напоминание пароля участника {{grammar:genitive|{{SITENAME}}}}",
 'passwordremindertext' => "Кто-то (возможно вы) с IP-адресом $1 запросил,
 чтобы мы выслали вам новый пароль участника {{grammar:genitive|{{SITENAME}}}}.
@@ -508,11 +456,11 @@ $1",
 'loginend'              => ' ',
 'mailerror' => "Ошибка при посылке почты: $1",
 'acct_creation_throttle_hit' => 'К сожалению, вы уже создали $1 учётных записей. Вы не можете создать больше ни одной.',
-'emailauthenticated'    => 'Ваш почтовый адрес был сопоставлен с $1.', 
+'emailauthenticated'    => 'Ваш почтовый адрес был сопоставлен с $1.',
 'emailnotauthenticated' => 'Ваш адрес электронной почты <strong>ещё не был подтверждён</strong>, функции вики-движка по работе с эл. почтой отключены.',
 'noemailprefs'          => '<strong>Адрес электронной почты не был указан</strong>, функции вики-движка по работе с эл. почтой отключены.',
 'emailconfirmlink' => 'Подтвердить ваш адрес электронной почты',
-'invalidemailaddress'   => 'Введённый адрес не может быть принят, т. к. он не соответствует формату адресов электронной почты. Пожалуйста введите корректный адрес или оставьте поле пустым.', 
+'invalidemailaddress'   => 'Введённый адрес не может быть принят, т. к. он не соответствует формату адресов электронной почты. Пожалуйста введите корректный адрес или оставьте поле пустым.',
 
 # Edit page toolbar
 'bold_sample'=>'Жирный шрифт',
@@ -551,7 +499,7 @@ $1",
 'showdiff'      => 'Внесённые изменения',
 'blockedtitle'  => 'Участник заблокирован',
 'blockedtext'   => "Ваше имя участника или IP-адрес был заблокирован $1.
-Утверждается, что причина такова:<br />''$2''<p>Вы можете связаться с $1 или одним из других 
+Утверждается, что причина такова:<br />''$2''<p>Вы можете связаться с $1 или одним из других
 [[{{ns:project}}:Администраторы|администраторов]] чтобы обсудить блокировку.",
 'whitelistedittitle' => 'Для изменения требуется авторизаци',
 'whitelistedittext' => 'Вы должны [[{{ns:special}}:Userlogin|зарегистрироваться]] для изменения этих страниц.',
@@ -566,13 +514,13 @@ $1",
 'newarticle'    => '(Новая)',
 'newarticletext' =>
 "Вы перешли по ссылке на статью, которая пока не существует.
-Чтобы создать новую страницу, наберите текст в окне, расположенном ниже 
+Чтобы создать новую страницу, наберите текст в окне, расположенном ниже
 (см. [[{{ns:project}}:Справка|справочную страницу]] чтобы получить больше информации).
 Если вы оказались здесь по ошибке, просто нажмите кнопку '''назад''' вашего браузера.",
 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
 'anontalkpagetext' => "---- ''Эта страница обсуждения принадлежит анонимному участнику, который ещё не зарегистрировался или который не представился регистрированным именем. Для его идентификации используется цифоровой [[IP-адрес]]. Если Вы — анонимный участник и полагаете, что получили сообщения, адресованные не Вам (один IP-адрес может использоваться несколькими участниками), [[Служебная:Userlogin|представьтесь системе]], чтобы впредь избежать возможной путаницы с другими анонимными участниками.''",
 'noarticletext' => '(Сейчас на этой странице нет текста)',
-'clearyourcache' => "'''Замечание:''' Чтобы после сохранения увидеть сделанные изменения, очистите кэш своего браузера: '''Mozilla:''' нажмите ''reload''(или ''Ctrl+R''), '''IE / Opera:''' ''Ctrl+F5'', '''Safari:''' ''Cmd+R'', '''Konqueror''' ''Ctrl+R''.",
+'clearyourcache' => "'''Замечание:''' Чтобы после сохранения увидеть сделанные изменения, очистите кэш своего браузера: '''Mozilla / Firefox:''' ''Ctrl+Shift+R'', '''IE:''' ''Ctrl+F5'', '''Safari:''' ''Cmd+Shift+R'', '''Konqueror''' ''F5''.",
 'usercssjsyoucanpreview' => "<strong>Подсказка:</strong> Используйте кнопку предварительного просмотра чтобы протестировать ваш новый css-файл или js-файл перед сохранением.",
 'usercsspreview' => "'''Помните что это только предварительный просмотр вашего css-файла, он ещё не сохранён!'''",
 'userjspreview' => "'''Помните что это только предварительный просмотр вашего javascrpt-файла, он ещё не сохранён!'''",
@@ -775,7 +723,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 # group editing
 'groups-editgroup' => 'Изменить группу',
 'groups-addgroup' => 'Добавить группу',
-'groups-editgroup-preamble' => 'Если название или описание начинаются с двоеточия, 
+'groups-editgroup-preamble' => 'Если название или описание начинаются с двоеточия,
 то их текст будет заменён на соответствующее сообщение из пространства имён MediaWiki',
 'groups-editgroup-name' => 'Название группы: ',
 'groups-editgroup-description' => 'Описание группы (максимум 255 символов):<br />',
@@ -852,7 +800,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'uploadtext'    => "Используя эту форму вы можете загрузить на сервер файлы.
 
 Чтобы просмотреть ранее загруженные файлы,
-перейдите сюда: [[Special:Imagelist|список загруженных изображений]].<br/>
+перейдите сюда: [[Special:Imagelist|список загруженных изображений]].<br />
 Загрузка и удаление файлов отражаются в [[Special:Log|журнале загрузки файлов]].
 
 Вы также должны поставить галочку, подтверждающую, что вы не нарушаете чьих-либо авторских прав загрузкой этого файла.
@@ -861,7 +809,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 
 Для включения изображения в статью вы можете использовать строки вида:
 *'''<nowiki>[[{{ns:6}}:file.jpg]]</nowiki>'''
-*'''<nowiki>[[{{ns:6}}:file.png|thumb|комментарий]]</nowiki>''' 
+*'''<nowiki>[[{{ns:6}}:file.png|thumb|комментарий]]</nowiki>'''
 
 Для ссылки на медиа-файл вы можете использовать строку вида:
 *'''<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>'''
@@ -883,7 +831,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'minlength'             => 'Название файла должно содержать хотя бы три символа.',
 'illegalfilename'       => 'Имя файла «$1» содержит символы, которые не разрешается использовать в заголовках. Пожалуйста, переименуйте файл и попытайтесь загрузить его снова.',
 'badfilename'   => "Название файла было изменено на $1.",
-'badfiletype'   => "«$1» не является рекомендованным форматом для файлов с изображениями.",
+'badfiletype'   => "«.$1» не является рекомендованным форматом для файлов с изображениями.",
 'largefile'             => 'Рекомедуется использовать изображения, размер которых не превышает $1 байт (размер загруженного файла составляет $2 байт).',
 'emptyfile'             => 'Загруженный вами файл вероятно пустой. Возможно, это произошло из-за ошибки при наборе имени файла. Пожалуйста, проверьте, действительно ли вы хотите загрузить этот файл.',
 'fileexists'            => 'Файл с этим именем уже существует, пожалуйста проверьте $1 если вы не уверены что вы хотите заменить его.',
@@ -949,7 +897,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'maintenancebacklink'   => 'Назад, на страницу обслуживания',
 'disambiguations'       => 'Многозначные страницы',
 'disambiguationspage'   => "{{ns:template}}:disambig",
-'disambiguationstext'   => "Следующие статьи ссылаются на <em>многозначные страницы</em>. Вместо этого они, вероятно, должны указывать на соответствующую конкретную статью.<br/>Страница считается многозначной, если на ней размещён $1.<br/>Ссылки из других пространств имён здесь <em>не</em> приведены.",
+'disambiguationstext'   => "Следующие статьи ссылаются на <em>многозначные страницы</em>. Вместо этого они, вероятно, должны указывать на соответствующую конкретную статью.<br />Страница считается многозначной, если на ней размещён $1.<br />Ссылки из других пространств имён здесь <em>не</em> приведены.",
 'doubleredirects'       => 'Двойные перенаправления',
 'doubleredirectstext'   => "Каждая строка содержит ссылки на первое и второе перенаправления, а также первую строчку страницы второго перенаправления, в которой обычно указывается название страницы куда должно осуществляться перенаправление. Нужно чтобы и первое перенаправление ссылалось на эту страницу.",
 'brokenredirects'       => 'Разорванные перенаправления',
@@ -1080,7 +1028,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'watchlistcontains' => "Ваш список наблюдения содержит $1 страниц.",
 'watcheditlist'         => 'Ниже представлен алфавитный список наблюдаемых
 вами страниц. Отметьте страниц, которые вы хотите удалить из вашего
-списка наблюдения и щёлкните на кнопку «удалить выбранные» 
+списка наблюдения и щёлкните на кнопку «удалить выбранные»
 внизу экрана.',
 'removingchecked'       => 'Удаление выбранных элементов из списка наблюдения…',
 'couldntremove'         => "Невозможно удалить элемент «$1»…",
@@ -1249,10 +1197,10 @@ IP-адреса.',
 'ipusuccess'    => "IP-адрес [[$1|«$1»]] разблокирован",
 'ipblocklist'   => 'Список заблокированных IP-адресов и пользователей',
 'blocklistline' => "$1, $2 заблокировал $3 ($4)",
-'infiniteblock' => 'бессрочная блокировка', 
+'infiniteblock' => 'бессрочная блокировка',
 'expiringblock' => 'блокировка завершится $1',
 'ipblocklistempty'      => 'Список блокировок пуст.',
-'blocklink'             => 'заблокировать',
+'blocklink'     => 'заблокировать',
 'unblocklink'   => 'разблокировать',
 'contribslink'  => 'вклад',
 'autoblocker'   => "Вы автоматически заблокированны, потому что у вас такой же IP-адрес, как у [[user:$1|«$1»]]. Причина блокировки участника «$1»: $2.",
@@ -1295,7 +1243,7 @@ IP-адреса.',
 
 # Make sysop
 'makesysoptitle'        => 'Сделать пользователя администратором',
-'makesysoptext'         => 'Этот формуляр используется бюрократами, чтобы делать обычных участников администраторами. 
+'makesysoptext'         => 'Этот формуляр используется бюрократами, чтобы делать обычных участников администраторами.
 Наберите имя участника и нажмите кнопку, чтобы сделать участника администратором',
 'makesysopname'         => 'Имя участника:',
 'makesysopsubmit'       => 'Сделать этого участника администратором',
@@ -1321,8 +1269,8 @@ IP-адреса.',
 'val_of' => '$1 из $2',
 'val_revision' => 'Версия',
 'val_time' => 'Время',
-'val_user_stats_title' => 'Краткий обзор оценок участника $1', 
-'val_my_stats_title' => 'Краткий обзор моих оценок', 
+'val_user_stats_title' => 'Краткий обзор оценок участника $1',
+'val_my_stats_title' => 'Краткий обзор моих оценок',
 'val_list_header' => '<th>#</th><th>Тема</th><th>Диапазон</th><th>Действие</th>',
 'val_add' => 'Добавить',
 'val_del' => 'Удалить',
@@ -1340,7 +1288,7 @@ IP-адреса.',
 'val_clear_old' => 'Очистить мои другие проверки данных',
 'val_details_th' => '<sub>Участник</sub> \\ <sup>Тема</sup>',
 'val_merge_old' => 'Использовать мою предыдущую оценку там где выбрано «Нет мнения»',
-'val_form_note' => "'''Посказка:''' Слияние ваших данных означает что для версии 
+'val_form_note' => "'''Посказка:''' Слияние ваших данных означает что для версии
 статьи, которую вы выбрали, все опции где вы выбрали пункт ''нет мнения''
 будут заполнены значениями и комментариями самой последней версии для которой вы
 выразили мнение. Например, если вы хотите изменить мнение по какой-то опции
@@ -1401,7 +1349,7 @@ IP-адреса.',
 'talkexists'    => "'''Страница была переименована, но страница обсуждения
 не может быть переименована, потому что страница с таким названием уже
 существует. Пожалуйста, объедините их вручную.'''",
-'movedto'               => 'переименована в', 
+'movedto'               => 'переименована в',
 'movetalk'              => 'Переименовать также и страницу «обсуждения», если это возможно.',
 'talkpagemoved' => 'Соответствующая страница обсуждения также переименована.',
 'talkpagenotmoved' => 'Соответствующая страница обсуждения <strong>не</strong> была переименована.',
@@ -1475,7 +1423,7 @@ IP-адреса.',
 'tooltip-watch' => 'Добавить текущую страницу в список наблюдения [alt-w]',
 
 # stylesheets
-'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
+#'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
 #'Monobook.js' => '/* edit this file to change js things in the monobook skin */',
 
 # Metadata
@@ -1753,9 +1701,6 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 'exif-planarconfiguration-1' => 'chunky format',
 'exif-planarconfiguration-2' => 'planar format',
 
-'exif-resolutionunit-2' => '$1 точек на дюйм',
-'exif-resolutionunit-3' => '$1 точек на см',
-
 'exif-colorspace-1' => 'sRGB',
 'exif-colorspace-ffff.h' => 'FFFF.H',
 
@@ -1898,7 +1843,7 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Страница категори
 
 # E-mail address confirmation
 'confirmemail' => 'Подтверждение адреса электронной почты',
-'confirmemail_text' => "Вики-движок требует подтверждения адреса электронной почты перед тем, как начать с ним работать. 
+'confirmemail_text' => "Вики-движок требует подтверждения адреса электронной почты перед тем, как начать с ним работать.
 Нажмите на кнопку, чтобы на указанный адрес было отправлено письмо, сореджащее ссылку на специальную страницу, после открытия которой в браузере адрес электронной почты будет считается подтверждённым.",
 
 'confirmemail_send' => 'Отправить письмо с запросом на подтверждение',
@@ -1931,7 +1876,7 @@ $3
 
 # Trackbacks
 'trackbackbox' => "<div id='mw_trackbacks'>
-Trackback для этой статьи:<br/>
+Trackback для этой статьи:<br />
 $1
 </div>
 ",
@@ -1946,112 +1891,92 @@ $1
 
 /* Please, see Language.php for general function comments */
 class LanguageRu extends LanguageUtf8 {
-        function LanguageRu() {
-                global $wgNamespaceNamesRu, $wgMetaNamespace;
-                LanguageUtf8::LanguageUtf8();
-                $wgNamespaceNamesRu[NS_PROJECT_TALK] = 'Обсуждение_' . $this->convertGrammar( $wgMetaNamespace, 'genitive' );
-        }
-
-        function getNamespaces() {
-                global $wgNamespaceNamesRu;
-                return $wgNamespaceNamesRu;
-        }
-
-        function getQuickbarSettings() {
-                global $wgQuickbarSettingsRu;
-                return $wgQuickbarSettingsRu;
-        }
-
-        function getSkinNames() {
-                global $wgSkinNamesRu;
-                return $wgSkinNamesRu;
-        }
-
-        function getDateFormats() {
-                global $wgDateFormatsRu;
-                return $wgDateFormatsRu;
-        }
-
-        function getValidSpecialPages()
-        {
-                global $wgValidSpecialPagesRu;
-                return $wgValidSpecialPagesRu;
-        }
-
-        function getSysopSpecialPages()
-        {
-                global $wgSysopSpecialPagesRu;
-                return $wgSysopSpecialPagesRu;
-        }
-
-        function getDeveloperSpecialPages()
-        {
-                global $wgDeveloperSpecialPagesRu;
-                return $wgDeveloperSpecialPagesRu;
-        }
-
-        function getMessage( $key )
-        {
-                global $wgAllMessagesRu;
+	function LanguageRu() {
+		global $wgNamespaceNamesRu, $wgMetaNamespace;
+		LanguageUtf8::LanguageUtf8();
+		$wgNamespaceNamesRu[NS_PROJECT_TALK] = 'Обсуждение_' . $this->convertGrammar( $wgMetaNamespace, 'genitive' );
+	}
+
+	function getNamespaces() {
+		global $wgNamespaceNamesRu;
+		return $wgNamespaceNamesRu;
+	}
+
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsRu;
+		return $wgQuickbarSettingsRu;
+	}
+
+	function getSkinNames() {
+		global $wgSkinNamesRu;
+		return $wgSkinNamesRu;
+	}
+
+	function getDateFormats() {
+		global $wgDateFormatsRu;
+		return $wgDateFormatsRu;
+	}
+
+	function getMessage( $key ) {
+		global $wgAllMessagesRu;
 		return isset($wgAllMessagesRu[$key]) ? $wgAllMessagesRu[$key] : parent::getMessage($key);
-        }
-
-        function fallback8bitEncoding() {
-                return "windows-1251";
-        }
-
-        function getMagicWords()  {
-                global $wgMagicWordsRu;
-                return $wgMagicWordsRu;
-        }
-
-        # Convert from the nominative form of a noun to some other case
-        # Invoked with {{grammar:case|word}}
-        function convertGrammar( $word, $case ) {
-                # These rules are not perfect, but they are currently only used for site names so it doesn't
-                # matter if they are wrong sometimes. Just add a special case for your site name if necessary. 
-
-                #join and array_slice instead mb_substr
-
-                preg_match_all( '/./us', $word, $ar );
-                if (!preg_match("/[a-zA-Z_]/us", $word))
-                        switch ( $case ) {
-                                case 'genitive': #родительный падеж  
-                                        if ((join('',array_slice($ar[0],-4))=='вики') || (join('',array_slice($ar[0],-4))=='Вики'))
-                                                {}
-                                        elseif (join('',array_slice($ar[0],-1))=='ь')
-                                                $word = join('',array_slice($ar[0],0,-1)).'я';
-                                        elseif (join('',array_slice($ar[0],-2))=='ия')
-                                                $word=join('',array_slice($ar[0],0,-2)).'ии';
-                                        elseif (join('',array_slice($ar[0],-2))=='ти')
-                                                $word=join('',array_slice($ar[0],0,-2)).'тей';
-                                        elseif (join('',array_slice($ar[0],-2))=='ды')
-                                                $word=join('',array_slice($ar[0],0,-2)).'дов';
-                                        elseif (join('',array_slice($ar[0],-3))=='ник')
-                                                $word=join('',array_slice($ar[0],0,-3)).'ника';
-                                        break;
-                                case 'dative':  #дательный падеж
-                                        #stub 
-                                        break;
-                                case 'accusative': #винительный падеж
-                                        #stub 
-                                        break;
-                                case 'instrumental':  #творительный падеж
-                                        #stub 
-                                        break;
-                                case 'prepositional': #предложный падеж
-                                        #stub 
-                                        break;
-                        }
-
-                return $word;
-        }
+	}
+
+	function fallback8bitEncoding() {
+		return "windows-1251";
+	}
+
+	function getMagicWords()  {
+		global $wgMagicWordsRu;
+		return $wgMagicWordsRu;
+	}
+
+	# Convert from the nominative form of a noun to some other case
+	# Invoked with {{grammar:case|word}}
+	function convertGrammar( $word, $case ) {
+		# These rules are not perfect, but they are currently only used for site names so it doesn't
+		# matter if they are wrong sometimes. Just add a special case for your site name if necessary.
+
+		#join and array_slice instead mb_substr
+
+		preg_match_all( '/./us', $word, $ar );
+		if (!preg_match("/[a-zA-Z_]/us", $word))
+			switch ( $case ) {
+				case 'genitive': #родительный падеж
+					if ((join('',array_slice($ar[0],-4))=='вики') || (join('',array_slice($ar[0],-4))=='Вики'))
+						{}
+					elseif (join('',array_slice($ar[0],-1))=='ь')
+						$word = join('',array_slice($ar[0],0,-1)).'я';
+					elseif (join('',array_slice($ar[0],-2))=='ия')
+						$word=join('',array_slice($ar[0],0,-2)).'ии';
+					elseif (join('',array_slice($ar[0],-2))=='ти')
+						$word=join('',array_slice($ar[0],0,-2)).'тей';
+					elseif (join('',array_slice($ar[0],-2))=='ды')
+						$word=join('',array_slice($ar[0],0,-2)).'дов';
+					elseif (join('',array_slice($ar[0],-3))=='ник')
+						$word=join('',array_slice($ar[0],0,-3)).'ника';
+					break;
+				case 'dative':  #дательный падеж
+					#stub
+					break;
+				case 'accusative': #винительный падеж
+					#stub
+					break;
+				case 'instrumental':  #творительный падеж
+					#stub
+					break;
+				case 'prepositional': #предложный падеж
+					#stub
+					break;
+			}
+		return $word;
+	}
 
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, '.,', ', ' ) : $number;
 	}
-	
+
 }
 
 ?>
diff --git a/languages/LanguageSc.php b/languages/LanguageSc.php
index 46812d97af5e..e4722f5c663d 100644
--- a/languages/LanguageSc.php
+++ b/languages/LanguageSc.php
@@ -6,80 +6,22 @@
 
 require_once( "LanguageUtf8.php" );
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesSc = array(
-	-1	=> "Speciale",
-	0	=> "",
-	1	=> "Contièndha",
-	2	=> "Utente",
-	3	=> "Utente_discussioni",
-	4	=> "Wikipedia",
-	5	=> "Wikipedia_discussioni",
-	6	=> "Immàgini",
-	7	=> "Immàgini_contièndha"
+	NS_SPECIAL         => "Speciale",
+	NS_MAIN            => "",
+	NS_TALK            => "Contièndha",
+	NS_USER            => "Utente",
+	NS_USER_TALK       => "Utente_discussioni",
+	NS_PROJECT         => "Wikipedia",
+	NS_PROJECT_TALK    => "Wikipedia_discussioni",
+	NS_IMAGE           => "Immàgini",
+	NS_IMAGE_TALK      => "Immàgini_contièndha"
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsSc = array(
 	"Nessuno", "Fisso a sinistra", "Fisso a destra", "Fluttuante a sinistra"
 );
 
-/* private */ $wgSkinNamesSc = array(
-	"Standard", "Nostalgia", "Cologne Blue"
-);
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesSc = array(
-	"Userlogin"		=> "", # These two intentionally left blank
-	"Userlogout"	=> "", #...
-	"Preferences"	=> "Preferenze Utente",
-	"Watchlist"		=> "Osservati Speciali",
-	"Recentchanges" => "Ultime pagine modificate",
-	"Upload"		=> "Salva immagini",
-	"Imagelist"		=> "Elenco Immagini",
-	"Listusers"		=> "Utenti registrati",
-	"Statistics"	=> "Statistiche del sito",
-	"Randompage"	=> "Un articolo a caso",
-
-	"Lonelypages"	=> "Articoli orfani",
-	"Unusedimages"	=> "Immagini orfane",
-	"Popularpages"	=> "Articoli più letti",
-	"Wantedpages"	=> "Articoli più richiesti",
-	"Shortpages"	=> "Articoli più corti",
-	"Longpages"		=> "Articoli più lunghi",
-	"Newpages"		=> "Articoli nuovi",
-	"Allpages"		=> "Tutti i titoli",
-
-	"Ipblocklist"	=> "Indirizzi IP bloccati",
-	"Maintenance" => "Pagina manutenzioni",
-	"Specialpages"  => "", # From here on intentionally left blank!
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> ""
-);
-
-/* private */ $wgSysopSpecialPagesSc = array(
-	"Blockip"		=> "Blocca un indirizzo IP",
-	"Asksql"		=> "Interroga il database",
-	"Undelete"		=> "Leggi e ripara pagine cancellate"
-);
-
-/* private */ $wgDeveloperSpecialPagesSc = array(
-	"Lockdb"		=> "Rendi il database read-only (di sola lettura, blocca le modifiche)",
-	"Unlockdb"		=> "Ripristina scrittura su database (lettura\/scrittura)",
-	"Debug"			=> "Informazioni per il Debugging"
-);
 
 /* private */ $wgAllMessagesSc = array(
 # User Toggles
@@ -139,7 +81,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "Wikipedia:About",
 "help"			=> "Aiuto",
 "helppage"		=> "Wikipedia:Aiuto",
-"wikititlesuffix" => "Wikipedia",
 "bugreports"	=> "Segnalazioni di malfunzionamento",
 "bugreportspage" => "Wikipedia:Malfunzionamenti",
 "faq"			=> "FAQ",
@@ -178,7 +119,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(Reindirizzamento da $1)",
 "lastmodified"	=> "Ultima modifica il $1.",
 "viewcount"		=> "Questo articolo è stato letto $1 volte.",
-"gnunote" => "Questa pagina è disponibile in licenza <a class=internal href='/wiki/GNU_FDL'>GNU FDL</a>.",
 "printsubtitle" => "(Articolo di {{SERVER}})",
 "protectedpage" => "Pagina protetta",
 "administrators" => "Wikipedia:Amministratori",
@@ -215,7 +155,7 @@ MySQL ha restituito un errore \"<tt>$3: $4</tt>\".",
 "nodb"			=> "Selezione del database $1 fallita",
 "readonly"		=> "Accesso al database temporaneamente disabilitato",
 "enterlockreason" => "Fornisci una spiegazione sui motivi del blocco, includendo le probabili data ed ora di riattivazione o di rimozione del blocco.",
-"readonlytext"	=> "Il database di Wikipedia è al momento bloccato, e non consente nuove immissioni né modifiche, molto probabilmente per manutenzione server, nel qual caso il database sarà presto di nuovo completamente accessibile. 
+"readonlytext"	=> "Il database di Wikipedia è al momento bloccato, e non consente nuove immissioni né modifiche, molto probabilmente per manutenzione server, nel qual caso il database sarà presto di nuovo completamente accessibile.
 L/'amministratore di sistema che ha imposto il blocco, ha lasciato questa nota:
 <p>$1",
 "missingarticle" => "Il database non ha trovato il testo di una pagina, che invece avrebbe dovuto trovare, intitolata \"$1\".
@@ -227,7 +167,7 @@ Per favore, segnalate l'accaduto ad un administrator, segnalando la URL e l'ora
 "filedeleteerror" => "Non è stato possibile cancellare il file \"$1\".",
 "filenotfound"	=> " Non è stato possibile trovare il file \"$1\".",
 "unexpected"	=> "Valore imprevisto: \"$1\"=\"$2\".",
-"formerror"		=> "Errore: il modulo non è stato inviato correttamente",	
+"formerror"		=> "Errore: il modulo non è stato inviato correttamente",
 "badarticleerror" => "Questa operazione non è consentita su questa pagina.",
 "cannotdelete"	=> "Impossibile cancellare la pagina o l'immagine richiesta.",
 "badtitle"		=> "Titolo non corretto",
@@ -249,10 +189,7 @@ Ora puoi continuare ad usare Wikipedia come utente anonimo (ma il tuo indirizzo
 "newusersonly"	=> " (solo per nuovi Utenti)",
 "remembermypassword" => "Ricorda la mia password per più sessioni (richiede uso dei cookies).",
 "loginproblem"	=> "<b>Si è verificato un errore durante il tuo tentativo di login.</b><br />Riprova, sarai più fortunato!",
-"alreadyloggedin" => "<font color=red><b>Ehi, Utente $1, hai già fatto il login, sei già connesso al nostro server!</b></font><br />\n",
-
-"areyounew"		=> "Se sei nuovo in Wikipedia e desideri creare un nuovo user account, immetti uno user name (che sarà il tuo nome per Wikipedia, poi digita una password e ripetila nella casella successiva.<br /> 
-Indicare un indirizzo e-mail non è obbligatorio, solo facoltativo (sebbene consigliato).<br />Se per caso perdessi la tua password, potrai richiedere che ti sia rispedita alla casella di posta elettronica che ci fornirai.<br />\n",
+"alreadyloggedin" => "<strong>Ehi, Utente $1, hai già fatto il login, sei già connesso al nostro server!</strong><br />\n",
 
 "login"			=> "Log in",
 "userlogin"		=> "Log in",
@@ -274,7 +211,7 @@ Controlla per favore il nome digitato, oppure usa il modulo qui sotto per creare
 "mailmypassword" => "Spediscimi una nuova password in posta elettronica",
 "passwordremindertitle" => "Servizio Password Reminder di Wikipedia",
 "passwordremindertext" => "Qualcuno (probabilmente tu, con indirizzo IP $1)
-ha richiesto l'invio di una nuova password per il login a Wikipedia. 
+ha richiesto l'invio di una nuova password per il login a Wikipedia.
 La password per l'Utente \"$2\" è ora \"$3\".
 Per evidenti ragioni di sicurezza, dovresti fare un log in il prima possibile, e cambiare la password immediatamente.",
 "noemail"		=> "Nessuna casella e-mail risulta registrata per l'Utente \"$1\".",
@@ -291,7 +228,7 @@ Per favore, fai subito un log in non appena la ricevi.",
 "showpreview"	=> "Visualizza Anteprima",
 "blockedtitle"	=> "Questo User name corrisponde purtroppo ad un Utente che è stato disabilitato alla modifica degli articoli.",
 "blockedtext"	=> "Il tuo User name o il tuo indirizzo IP sono stati bloccati da $1.<br />
-La motivazione del blocco è la seguente:<br />:''$2''<p>Se lo desideri, puoi contattare $1, o uno degli altri 
+La motivazione del blocco è la seguente:<br />:''$2''<p>Se lo desideri, puoi contattare $1, o uno degli altri
 [[Wikipedia:administrators|administrators]] per discutere del blocco.",
 "newarticle"	=> "(Nuovo)",
 "newarticletext" => "Scrivi qui il tuo testo.",
@@ -303,8 +240,8 @@ La motivazione del blocco è la seguente:<br />:''$2''<p>Se lo desideri, puoi co
 "editing"		=> "Modifica di $1",
 "editconflict"	=> "Conflitto di edizione: $1",
 "explainconflict" => "Qualcun altro ha salvato una sua versione dell'articolo nel tempo in cui tu stavi preparando la tua versione.<br />
-La casella di modifica di sopra contiene il testo dell'articolo nella sua forma attuale (cioè il testo attualmente online). Le tue modifiche sono invece contenute nella casella di modifica inferiore. 
-Dovrai inserire, se lo desideri, le tue modifiche nel testo esistente, e perciò scriverle nella casella di sopra. 
+La casella di modifica di sopra contiene il testo dell'articolo nella sua forma attuale (cioè il testo attualmente online). Le tue modifiche sono invece contenute nella casella di modifica inferiore.
+Dovrai inserire, se lo desideri, le tue modifiche nel testo esistente, e perciò scriverle nella casella di sopra.
 <b>Soltanto</b> il testo nella casella di sopra sarà sakvato se premerai il bottone \"Salva\".<br />",
 "yourtext"		=> "Il tuo testo",
 "storedversion" => "Versione in archivio",
@@ -378,7 +315,7 @@ per poter personalizzare le tue preferenze.",
 "prefslogintext" => "Sei connesso a Wikipedia come \"$1\".
 Il tuo numero identificativo (ID) interno è $2.",
 "prefsreset"	=> "Le tue Preferenze sono state ripescate dalla memoria di sistema del potente server di Wikipedia.",
-"qbsettings"	=> "Settaggio della barra menu", 
+"qbsettings"	=> "Settaggio della barra menu",
 "changepassword" => "Cambia password",
 "skin"			=> "Aspetto",
 "saveprefs"		=> "Salva preferenze",
@@ -458,7 +395,7 @@ Il caricamento può richiedere qualche minuto se hai una connessione ad Internet
 
 I formati immagine preferibili sono il JPEG per immagini fotografiche, il PNG
 per disegni ed altre immagini iconiche o simboliche, il OGG per i suoni.
-Per cortesia, rinomina i tuoi files, prima di caricarli, usando un nome il più possibile descrittivo del contenuto, così da evitare confusioni. 
+Per cortesia, rinomina i tuoi files, prima di caricarli, usando un nome il più possibile descrittivo del contenuto, così da evitare confusioni.
 Per inserire la nuova immagine in un articolo, usa semplicemente un link nella forma
 '''<nowiki>[[image:file.jpg]]</nowiki>''' o
 '''<nowiki>[[image:file.png|alt text, testo alternativo]]</nowiki>''' o
@@ -474,11 +411,9 @@ Tutti i tempi indicati sono calcolati sul fuso orario del server (UTC).
 ",
 "filename"		=> "Nome del file",
 "filedesc"		=> "Oggetto",
-"affirmation"	=> "Io dichiaro che il titolare dei diritti di autore (copyright, (c)) su questo file consente a cederlo in licenza di uso nei termini del $1.",
 "copyrightpage" => "Wikipedia:Copyrights",
 "copyrightpagename" => "Wikipedia copyright",
 "uploadedfiles"	=> "Files Caricati in Wikipedia",
-"noaffirmation" => "Devi dichiarare che il caricamento di questo file non viola, in alcun modo, alcun tipo di diritto altrui, e segnatamente non infrange nessun diritto di autore (copyright - (c)).",
 "ignorewarning"	=> "Ignora le avvertenze e salva comunque il file.",
 "minlength"		=> "I nomi dei file immagine debbono essere lunghi almeno tre caratteri, ma è preferibile usare nomi lumghi, purché descrittivi.",
 "badfilename"	=> "Il nome del file immagine è stato convertito in \"$1\".",
@@ -628,7 +563,7 @@ Le future modifiche a questa pagina ed alla relativa pagina di discussione saran
 "confirmdelete" => "Conferma cancellazione",
 "deletesub"		=> "(Cancellazione di \"$1\")",
 "confirmdeletetext" => "Stai per cancellare permanentemente dal database una pagina o una immagine, insieme a tutta la sua cronologia.
-Per cortesia, conferma che è tua intenzione procedere a tale cancellazione, conferma che hai piena consapevolezza delle conseguenze della tua azione, e conferma che la tua azione è pienamente ottemperante alle regole stabilite nella 
+Per cortesia, conferma che è tua intenzione procedere a tale cancellazione, conferma che hai piena consapevolezza delle conseguenze della tua azione, e conferma che la tua azione è pienamente ottemperante alle regole stabilite nella
 [[Wikipedia:Policy]].",
 "actioncomplete" => "Azione completata",
 "deletedtext"	=> "La pagina \"$1\" è stata cancellata.
@@ -685,13 +620,12 @@ Vedi [[Wikipedia:Deletion_log]] per un elenco delle pagine cancellate e recupera
 #
 "blockip"		=> "Blocca indirizzo IP",
 "blockiptext"	=> "Usa il modulo sottostante per bloccare l'accesso con diritto di scrittura da uno specifico indirizzo IP.
-Questo blocco deve essere operato SOLO per prevenire atti di vandalismo, ed in stretta osservanza dei principi tutti della [[Wikipedia:Policy|policy di Wikipedia]]. Il blocco non può in nessun caso essere applicato per motivi ideologici. 
+Questo blocco deve essere operato SOLO per prevenire atti di vandalismo, ed in stretta osservanza dei principi tutti della [[Wikipedia:Policy|policy di Wikipedia]]. Il blocco non può in nessun caso essere applicato per motivi ideologici.
 Scrivi un motivo specifico per il quale questo indirizzo IP dovrebbe a tuo avviso essere bloccato (per esempio, cita i titoli di pagine eventualmente già oggetto di vandalismo editoriale).",
 "ipaddress"		=> "Indirizzo IP (IP Address)",
 "ipbreason"		=> "Motivazione",
 "ipbsubmit"		=> "Blocca questo indirizzo IP",
 "badipaddress"	=> "L'indirizzo IP indicato non è corretto.",
-"noblockreason" => "Devi obbligatoriamente fornire una motivazione per il blocco.",
 "blockipsuccesssub" => "Blocco eseguito",
 "blockipsuccesstext" => " L'indirizzo IP \"$1\" è stato bloccato.
 <br />Vedi [[Special:Ipblocklist|lista IP bloccati]].",
@@ -724,22 +658,11 @@ Per cortesia, conferma che questo è effettivamente quanto tu intendi ora effett
 <br />Ricordati di rimuovere il blocco non appena avrai terminatoi le tue manutenzioni.",
 "unlockdbsuccesstext" => " Il database di Wikipedia è stato sbloccato.",
 
-# SQL query
-#
-"asksql"		=> "Interrogazione SQL",
-"asksqltext"	=> "Usa il modulo sottostante per effettuare una interrogazione diretta (query) al database di Wikipedia.
-Usa singole virgolette ('come queste') per delimitare una stringa letterale.
-Questo può considerevolmente sovraccaricare e di fatto rallentare il server, perciò per cortesia usa questa funzionalità solo quando necessario.",
-"sqlquery"		=> "Immetti stringa da ricercare",
-"querybtn"		=> "Invia interrogazione",
-"selectonly"	=> "Interrogazioni diverse da \"SELECT\" sono riservate agli sviluppatori di Wikipedia (developers).",
-"querysuccessful" => "Interrogazione riuscita",
-
 # Move page
 #
 "movepage"		=> "Spostamento di pagina",
 "movepagetext"	=> "Con il modulo sottostante puoi rinominare una pagina, spostando anche tutta la sua cronologia al nuovo nome.
-Il vecchior titolo diverrà automaticamente un redirect che punta al nuovo titolo. 
+Il vecchior titolo diverrà automaticamente un redirect che punta al nuovo titolo.
 I link alla vecchia pagina non saranno aggiornati (e punteranno quindi al redirect); accertati di [[Special:Manutenzioni|controllare con cura]] che non si creino doppi redirects o redirects interrotti.
 Resta nella tua responsabilità di accertarti che i link continuino a puntare verso dove devono dirigersi.
 
@@ -783,13 +706,7 @@ class LanguageSc extends LanguageUtf8 {
 		return $wgQuickbarSettingsSc;
 	}
 
-	function getSkinNames() {
-		global $wgSkinNamesSc;
-		return $wgSkinNamesSc;
-	}
-
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
@@ -798,26 +715,7 @@ class LanguageSc extends LanguageUtf8 {
 		return $d;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesSc;
-		return $wgValidSpecialPagesSc;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesSc;
-		return $wgSysopSpecialPagesSc;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesSc;
-		return $wgDeveloperSpecialPagesSc;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesSc;
 		if(array_key_exists($key, $wgAllMessagesSc))
 			return $wgAllMessagesSc[$key];
diff --git a/languages/LanguageSk.php b/languages/LanguageSk.php
index 649722e9b7eb..3a5a253b8343 100644
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -121,11 +121,6 @@ require_once( 'LanguageUtf8.php' );
 'tog-justify' => "Zarovnávaj odstavce",
 'tog-minordefault' => "Označ všetky zmeny ako drobné",
 'tog-nocache' => "Vypni ukladanie stránok do vyrovnávacej pamäte",
-#'tog-enotifwatchlistpages' => 'Send me an email on page changes',
-#'tog-enotifusertalkpages' => 'Send me an email when my user talk page is changed',
-#'tog-enotifminoredits' => 'Send me an email also for minor edits of pages',
-#'tog-enotifrevealaddr' => 'Reveal my email address in notification mails',
-#'tog-shownumberswatching' => 'Show the number of watching users',
 'tog-numberheadings' => "Automaticky čísluj odstavce",
 'tog-previewonfirst' => "Zobraz náhľad pri prvom upravovaní",
 'tog-previewontop' => "Zobrazuj ukážku pred oknom na úpravy, a nie až za ním",
@@ -194,10 +189,9 @@ a [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Používateľskú pr
 'article' => 'Stránka s obsahom',
 'help' => 'Pomoc',
 'helppage' => 'Pomoc:Obsah',
-'wikititlesuffix' => '{{SITENAME}}',
 'bugreports' => 'Oznámenia o chybách',
 'bugreportspage' => 'Project:Oznámenia_o_chybách',
-'sitesupport' => 'Dotácie', # To enable, something like 'Donations', 
+'sitesupport' => 'Dotácie', # To enable, something like 'Donations',
 'sitesupport-url' => 'Project:Dotácie',
 'faq' => 'FAQ',
 'faqpage' => 'Project:FAQ',
@@ -224,7 +218,7 @@ a [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Používateľskú pr
 
 # NOTE: To turn off "Current Events" in the sidebar,
 # set "currentevents" => "-"
- 
+
 'currentevents' => 'Aktuality',
 'currentevents-url' => 'Aktuality',
 
@@ -283,9 +277,6 @@ a [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Používateľskú pr
 'developertitle' => 'Je potrebné oprávnenie typu vývojár',
 'developertext' => "Požadovanú akciu môžu vykonať iba redaktori s oprávnením \"vývojár\".
 Pozri $1.",
-'bureaucrattitle' => 'Je potrebné oprávnenie typu byrokrat',
-"bureaucrattext" => "Akciu, ktorú ste vyvolali, môže použiť iba
-administrátor so statusom \"byrokrat\".",
 'nbytes' => '$1 bajtov',
 'ok' => 'OK',
 'sitetitle' => "{{SITENAME}}",
@@ -318,10 +309,10 @@ administrátor so statusom \"byrokrat\".",
 # Main script and global functions
 #
 'nosuchaction' => 'Takáto akcia neexistuje',
-'nosuchactiontext' => 'Softvér MediaWiki nepozná akciu, 
+'nosuchactiontext' => 'Softvér MediaWiki nepozná akciu,
 ktorú vyžadujete pomocou URL.',
 'nosuchspecialpage' => 'Takáto špeciálna stránka neexistuje',
-'nospecialpagetext' => 'Softvér MediaWiki nepozná takúto špeciálnu stránku, 
+'nospecialpagetext' => 'Softvér MediaWiki nepozná takúto špeciálnu stránku,
 zoznam špeciálnych stránok nájdete na [[{{ns:special}}:Specialpages]].',
 
 # General errors
@@ -344,18 +335,18 @@ $1',
 'cachederror' => 'Nasledujúca stránka je odložená kópia vyžiadanej stránky a nemusí byť aktuálna.',
 'laggedslavemode' => 'Varovanie: Je možné, že stránka neobsahuje posledné aktualizácie.',
 'readonly' => 'Databáza je zamknutá',
-'enterlockreason' => 'Zadajte dôvod požadovaného zamknutia vrátane odhadu, 
+'enterlockreason' => 'Zadajte dôvod požadovaného zamknutia vrátane odhadu,
 kedy očakávate odomknutie',
-'readonlytext' => "Databáza je momentálne zamknutá, 
-nové články a úpravy sú zablokované, pravdepodobne z dôvodu údržby databázy. 
+'readonlytext' => "Databáza je momentálne zamknutá,
+nové články a úpravy sú zablokované, pravdepodobne z dôvodu údržby databázy.
 Po skončení tejto údržby bude {{SITENAME}} opäť fungovať normálne.
 Administrátor, ktorý nariadil uzamknutie, uvádza tento dôvod: $1",
-'missingarticle' => "Databáza nenašla text článku, ktorý by mala nájsť, 
+'missingarticle' => "Databáza nenašla text článku, ktorý by mala nájsť,
 konkrétne \"$1\".
 
 Toto je obyčajne zapríčinené odkazovaním na staršie verzie alebo odkazom na článok, ktorý bol zmazaný.
 
-Ak toto neplatí, pravdepodobne ste našli chybu s softvéri. 
+Ak toto neplatí, pravdepodobne ste našli chybu s softvéri.
 Prosím ohláste túto chybu administrátorovi, uveďte aj meno článku - odkaz (URL).",
 #'readonly_lag' => "The database has been automatically locked while the slave database servers catch up to the master",
 'internalerror' => 'Vnútorná chyba',
@@ -374,9 +365,9 @@ alebo nesprávne odkazovaný z inej jazykovej verzie {{GRAMMAR:genitív|{{SITENA
 pretože tak spomaľuje databázu, že nikto nemôže používať
 wiki.',
 'perfdisabledsub' => "Tu je uložená kópia z $1:", # obsolete?
-'perfcached' => '<font color=red><strong>Nasledujúce dáta sú z dočasnej pamäte a nemusia byť úplne aktuálne:</strong></font>',
-'wrong_wfQuery_params' => "Nesprávny parameter v wfQuery()<br>
-Funkcia: $1<br>
+'perfcached' => '<strong>Nasledujúce dáta sú z dočasnej pamäte a nemusia byť úplne aktuálne:</strong>',
+'wrong_wfQuery_params' => "Nesprávny parameter v wfQuery()<br />
+Funkcia: $1<br />
 Dotaz: $2",
 'viewsource' => 'Zobraz zdroj',
 'protectedtext' => "Táto stránka bola zamknutá na zabránenie úprav; pravdepodobne existuje
@@ -384,7 +375,6 @@ veľa dôvodov prečo je to tak, prosíme pozrite
 [[Project:Zamknutá stránka]].
 
 Môžete si pozrieť a skopírovať zdroj tejto stránky:",
-'seriousxhtmlerrors' => 'Tidy našiel vážne značkovacie chyby xhtml.',
 'sqlhidden' => '(SQL príkaz na prehľadávanie je skrytý)',
 
 # Login and logout pages
@@ -396,7 +386,7 @@ opäť prihlásiť pod rovnakým alebo odlišným redaktorským menom. Uvedomte
 naďalej zobrazovať ako keby ste boli prihlásený, až kým nevymažete
 vyrovnávaciu pamäť vášho prehliadača.\n",
 
-'welcomecreation' => "== Vitajte, $1! == 
+'welcomecreation' => "== Vitajte, $1! ==
 Vaše konto je vytvorené. Nezabudnite si nastaviť vaše redaktorské nastavenia.",
 
 'loginpagetitle' => 'Prihlásenie redaktora',
@@ -405,8 +395,8 @@ Vaše konto je vytvorené. Nezabudnite si nastaviť vaše redaktorské nastaveni
 'yourpasswordagain' => 'Zopakujte heslo',
 'newusersonly' => ' (iba noví redaktori)',
 'remembermypassword' => 'Pamätať si heslo aj po vypnutí počítača.',
-'loginproblem' => "'''Nastal problém pri vašom prihlasovaní.'''<br>Skúste to znova!",
-'alreadyloggedin' => "<font color=red>'''Užívateľ $1, vy už ste prihlásený!'''</font><br />\n",
+'loginproblem' => "'''Nastal problém pri vašom prihlasovaní.'''<br />Skúste to znova!",
+'alreadyloggedin' => "'''Užívateľ $1, vy už ste prihlásený!'''<br />\n",
 
 'login' => 'Prihlásenie',
 'loginprompt' => "Na prihlásenie do {{GRAMMAR:genitív|{{SITENAME}}}} musíte mať zapnuté koláčiky (cookies).",
@@ -442,16 +432,13 @@ Vaše skutočné meno, ak sa rozhodnete ho uverejniť, bude priradené k vašej
 'nosuchusershort' => "V súčasnosti neexistuje redaktor s menom \"$1\". Skontrolujte preklepy.",
 'wrongpassword' => 'Zadané heslo je nesprávne. Skúste to znovu.',
 'mailmypassword' => 'Pošlite mi e-mailom dočasné heslo',
-'mailmypasswordauthent' => 'Pošlite mi e-mailom dočasné heslo',
 'noemail' => "Redaktor \"$1\" nezadal e-mailovú adresu.",
 'passwordsent' => "Nové heslo bolo zaslané na e-mailovú adresu
 redaktora \"$1\".
 Prihláste sa znovu po jeho obdržaní.",
-#'eauthentsent' => "A confirmation email has been sent to the nominated email address. 
-#Before any other mail is sent to the account, you will have to follow the instructions in the email, 
+#'eauthentsent' => "A confirmation email has been sent to the nominated email address.
+#Before any other mail is sent to the account, you will have to follow the instructions in the email,
 #to confirm that the account is actually yours.",
-'passwordsentforemailauthentication' => "Nové heslo bolo zaslané na e-mailovú adresu, ktorá bola novo zaregistrovaná pre \"$1\".
-Prihláste sa znovu s týmto heslom na účely overenia.",
 'loginend' => '&nbsp;',
 'mailerror' => "Chyba pri posielaní e-mailu: $1",
 'acct_creation_throttle_hit' => 'Prepáčte, už máte vytvorených $1 kont. Nemôžete ich vytvoriť viac.',
@@ -498,7 +485,7 @@ nástroje nebudú prístupné.',
 'showdiff' => 'Zobraz rozdiely',
 'blockedtitle' => 'Redaktor je zablokovaný',
 'blockedtext' => "Vaše redaktorské meno alebo IP adresu zablokoval $1.
-Udáva tento dôvod:<br>''$2''
+Udáva tento dôvod:<br />''$2''
 
 Môžete sa skontaktovať s $1 alebo s iným [[Project:Administrátori|administrátorom]] a prediskutovať blokovanie.\",
 
@@ -526,7 +513,7 @@ Vaša IP adresa je $3. Prosíme zahrňte túto adresu do každého vášho prík
 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
 'anontalkpagetext' => "---- ''Toto je diskusná stránka anonymného redaktora, ktorý nemá vytvorené svoje konto alebo ho nepoužíva. Preto musíme na jeho identifikáciu použiť numerickú [[IP adresa|IP adresu]]. Je možné, že takúto IP adresu používajú viacerí redaktori. Ak ste anonymný redaktor a máte pocit, že vám boli adresované irelevantné diskusné príspevky, zriaďte si vlastný účet alebo sa prihláste ([[Special:Userlogin|Zriadenie konta alebo prihlásenie]]), aby sa zamedzilo budúcim zámenám s inými anonymnými redaktormi''",
 'noarticletext' => '(Tento článok momentálne neobsahuje žiaden text)',
-'clearyourcache' => "'''Poznámka:''' Aby sa zmeny prejavili, po uložení musíte vymazať vyrovnávaciu pamäť vášho prehliadača: '''Mozilla:''' kliknite ''Reload'' (alebo ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'clearyourcache' => "'''Poznámka:''' Aby sa zmeny prejavili, po uložení musíte vymazať vyrovnávaciu pamäť vášho prehliadača: '''Mozilla:''' ''Ctrl-Shift-R'', '''IE:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
 'usercssjsyoucanpreview' => "<strong>Tip:</strong> Použite tlačidlo 'Zobraz náhľad', aby sa otestovalo Vaše nové CSS/JS pred uložením.",
 'usercsspreview' => "'''Nezabudnite, že toto je iba náhľad Vášho užívateľského CSS, ešte nebolo uložené!'''",
 'userjspreview' => "'''Nezabudnite, že iba testujete/náhľad vášho užívateľského JavaScriptu, ešte nebol uložený!'''",
@@ -552,14 +539,14 @@ verziu tejto stránky.
 Ak vašu úpravu uložíte, prepíšete tým všetky úpravy, ktoré nasledovali po tejto starej verzii.</strong>",
 'yourdiff' => 'Rozdiely',
 'copyrightwarning' => "<div id=\"specChar\" style=\"margin-top:5px;border-width:1px;border-style:solid;border-color:#aaaaaa;padding:3px;text-align:center;\">
-<small>[[metawikipedia:Help:Special_characters|Zvláštne znaky]] 
+<small>[[metawikipedia:Help:Special_characters|Zvláštne znaky]]
 </small></div>
 
 Nezabudnite, že všetky príspevky do {{GRAMMAR:genitív|{{SITENAME}}}}
 sa považujú za príspevky uskutočnené podľa GNU Free Documentation License
 (podrobnosti pozri pod $1).
 Ak nechcete, aby bolo to, čo ste napísali, neúprosne upravované a ďalej
-ľubovoľne rozširované, tak sem váš text neumiestňujte.<br>
+ľubovoľne rozširované, tak sem váš text neumiestňujte.<br />
 Týmto nám tiež sľubujete, že ste tento text buď napísali sám, alebo že je skopírovaný
 zo spoločného vlastníctva (public domain) alebo podobného voľne prístupného zdroja.
 <strong>NEUMIESTŇUJTE TU BEZ POVOLENIA DIELA CHRÁNENÉ AUTORSKÝM PRÁVOM!</strong>",
@@ -620,12 +607,11 @@ Prosím skontrolujte URL adresu, ktorú ste použili na prístup k tejto stránk
 'badquerytext' => 'Váš text na prehľadávanie sme nemohli spracovať.
 Dôvodom je pravdepodobne to, že ste hľadali slovo
 kratšie ako tri písmená, čo zatiaľ {{SITENAME}} neumožňuje.
-Alebo ste možno výraz zle napísali, napríklad \"dom a a záhrada\". Skúste iný text na prehľadávanie.',
-'matchtotals' => "Výsledkom textu na prehľadávanie \"$1\" je $2 nadpisov článkov
-a text $3 článkov.",
+Alebo ste možno výraz zle napísali, napríklad "dom a a záhrada". Skúste iný text na prehľadávanie.',
+'matchtotals' => 'Výsledkom textu na prehľadávanie "$1" je $2 nadpisov článkov a text $3 článkov.',
 'nogomatch' => "Neexistuje článok s presne takýmto nadpisom; skúšam nájsť podobné nadpisy.
 
-<br><br>Chcete '''<a href=\"$1\" class=\"new\">vytvoriť nový článok s týmto nadpisom</a>'''? Alebo [[Project:Žiadané články|dať žiadosť na jeho tvorbu]]?.",
+<br /><br />Chcete '''<a href=\"$1\" class=\"new\">vytvoriť nový článok s týmto nadpisom</a>'''? Alebo [[Project:Žiadané články|dať žiadosť na jeho tvorbu]]?.",
 'titlematches' => 'Vyhovujúce nadpisy článkov',
 'notitlematches' => 'Niet vyhovujúcich nadpisov článkov',
 'textmatches' => 'Vyhovujúce texty článkov',
@@ -640,8 +626,8 @@ a text $3 článkov.",
 pretože tieto sa neregistrujú, alebo uvedením viac ako jedného vyhľadávaného výrazu,
 pretože výsledky uvádzajú len stránky obsahujúce všetky vyhľadávané výrazy.",
 'powersearch' => 'Vyhľadávanie',
-'powersearchtext' => "Vyhľadávania v menných priestoroch :<br>
-$1<br>
+'powersearchtext' => "Vyhľadávania v menných priestoroch :<br />
+$1<br />
 $2 Zoznam presmerovaní &nbsp; Hľadanie pre $3 $9",
 'searchdisabled' => 'Prepáčte! Fulltextové vyhľadávanie bolo dočasne vypnuté z dôvodu preťaženia. Zatiaľ môžete použiť hľadanie pomocou Google, ktoré však nemusí byť aktuálne.',
 'blanknamespace' => '(Hlavný)',
@@ -716,7 +702,7 @@ od času na serveri (UTC).',
 # group editing
 'groups-editgroup' => 'Uprav skupinu',
 'groups-addgroup' => 'Pridaj skupinu',
-'groups-editgroup-preamble' => 'Ak opis začína čiarkou, zvyšok sa bude považovať za 
+'groups-editgroup-preamble' => 'Ak opis začína čiarkou, zvyšok sa bude považovať za
 názov systémovej správy a text bude lokalizovateľný pomocou menného priestoru MediaWiki',
 'groups-editgroup-name' => 'Meno skupiny: ',
 'groups-editgroup-description' => 'Opis skupiny (max. 255 znakov):<br />',
@@ -740,7 +726,7 @@ odobrať redaktora. Neoznačené skupiny nebudú zmenené. Odobrať skupinu mož
 'userrights-logcomment' => 'Zmenená príslušnosť zo skupiny $1 na skupinu $2',
 
 # Default group names and descriptions
-# 
+#
 'group-anon-name' => 'Anonym',
 'group-anon-desc' => 'Anonymný redaktor',
 'group-loggedin-name' => 'Redaktor',
@@ -842,16 +828,13 @@ Všetky uvedené časy sú časy na servri (UTC).
 'filedesc' => 'Opis súboru',
 'filestatus' => 'Stav autorských práv',
 'filesource' => 'Zdroj',
-'affirmation' => "Vyhlasujem, že držiteľ autorských práv k tomuto súboru
-súhlasí s tým, aby bol licencovaný podľa podmienok $1.",
 'copyrightpage' => "Project:Autorské práva",
 'copyrightpagename' => "{{SITENAME}} copyright",
 'uploadedfiles' => 'Nahrané súbory',
-'noaffirmation' => 'Musíte potvrdiť, že vaše nahranie neporušuje žiadne autorské práva.',
 'ignorewarning' => 'Ignorovať varovanie a súbor napriek tomu uložiť.',
 'minlength' => 'Názvy obrázkov musia obsahovať najmenej tri písmená.',
-'illegalfilename' => 'Názov súboru \"$1\" obsahuje znaky, ktoré nie sú povolené v názvoch článkov. Prosím premenujte súbor a skúste ho nahrať znovu.',
-'badfilename' => "Meno obrázka bolo zmenené na \"$1\".",
+'illegalfilename' => 'Názov súboru "$1" obsahuje znaky, ktoré nie sú povolené v názvoch článkov. Prosím premenujte súbor a skúste ho nahrať znovu.',
+'badfilename' => 'Meno obrázka bolo zmenené na "$1".',
 'badfiletype' => "\".$1\" nie je odporúčaný formát obrázkového súboru.",
 'largefile' => 'Odporúčame, aby obrázky neprekročili veľkosť $1 bajtov, veľkosť tohto súboru je $2 bajtov',
 'emptyfile' => 'Súbor, ktorý ste nahrali sa zdá byť prázdny. Toto mohlo vzniknúť preklepom v názve súboru. Skontrolujte, či skutočne chcete nahrať tento súbor.',
@@ -891,7 +874,7 @@ Ak je nahraný súbor obrázok, možno ho takto vložiť do článku: <tt><nowik
 'deleteimgcompletely' => 'Vymaž všetky verzie',
 'imghistlegend' => "Vysvetlivky: (aktuálna) = toto je aktuálny obrázok, (zmazať) = zmaž
 túto starú verziu, (pôvodná) = vráť sa k tejto starej verzii.
-<br>''Kliknite na dátum, aby sa zobrazil obrázok nahraný v ten deň''.",
+<br />''Kliknite na dátum, aby sa zobrazil obrázok nahraný v ten deň''.",
 'imagelinks' => 'Odkazy na obrázok',
 'linkstoimage' => 'Na tento obrázok odkazujú nasledujúce články:',
 'nolinkstoimage' => 'Žiadne články neobsahujú odkazy na tento obrázok.',
@@ -899,7 +882,7 @@ túto starú verziu, (pôvodná) = vráť sa k tejto starej verzii.
 
 <br clear=both>
 {| align=center border=0 cellpadding=3 cellspacing=3 style=\"border: solid #aaa 1px; background: #f9f9f9; font-size: 100%;\"
-|- 
+|-
 | [[Image:Commons without text.png|20px|Wikimedia Commons Logo]]
 |Toto je súbor z [[Commons:Main Page|Wikimedia Commons]]. Prosíme pozrite si jeho '''[[Commons:Image:{{PAGENAME}}|popisnú stránku ]]''' <!--on the Commons-->.
 |}",
@@ -930,7 +913,7 @@ z čoho '''$2''' (alebo '''$4%''') sú administrátormi (pozri $3).",
 'maintenancebacklink' => 'Späť na Stránku údržby',
 'disambiguations' => 'Stránky na rozlíšenie viacerých významov',
 'disambiguationspage' => "Project:Odkazy na stránky na rozlíšenie viacerých významov",
-'disambiguationstext' => "Tieto články obsahujú odkazy na ''rozlišovaciu stránku''. Namiesto toho by mali obsahovať odkazy na stránku s príslušnou témou. <br>Stránka sa považuje za rozlišovaciu stránku, ak $1 na ňu obsahuje odkaz.<br>Odkazy z iných menných priestorov tu ''nie'' sú uvedené.",
+'disambiguationstext' => "Tieto články obsahujú odkazy na ''rozlišovaciu stránku''. Namiesto toho by mali obsahovať odkazy na stránku s príslušnou témou. <br />Stránka sa považuje za rozlišovaciu stránku, ak $1 na ňu obsahuje odkaz.<br />Odkazy z iných menných priestorov tu ''nie'' sú uvedené.",
 'doubleredirects' => 'Dvojité presmerovanie',
 'doubleredirectstext' => "Každý riadok obsahuje odkaz na prvé a druhé presmerovanie, ako aj prvý riadok z textu, na ktorý odkazuje druhé presmerovanie, ktoré zvyčajne odkazuje na \"skutočný\" cieľ, na ktorý má odkazovať prvé presmerovanie.",
 'brokenredirects' => 'Pokazené presmerovania',
@@ -1278,25 +1261,12 @@ Potvrďte, že to naozaj chcete urobiť.',
 'lockdbsuccesssub' => 'Zamknutie databázy úspešné',
 'unlockdbsuccesssub' => 'Databáza bola úspešne odomknutá',
 'lockdbsuccesstext' => 'Databáza bola zamknutá.
-<br>Nezabudnite po dokončení údržby odstrániť zámok.',
+<br />Nezabudnite po dokončení údržby odstrániť zámok.',
 'unlockdbsuccesstext' => 'Databáza bola odomknutá.',
 
-# SQL query
-#
-'asksql' => 'SQL príkaz na prehľadávanie',
-'asksqltext' => "Použite dolu uvedený formulár na priamy príkaz na prehľadávanie databázy.
-Použite apostrofy ('ako tu') na ohraničenie textu.
-Často môžete značne zvýšiť záťaž servra,
-nepoužívajte preto túto funkciu často.",
-'sqlislogged' => 'Uvedomte si, že všetky príkazy na prehľadávanie sú zaznamenávané.',
-'sqlquery' => 'Zadajte príkaz na prehľadávanie',
-'querybtn' => 'Pošli príkaz na prehľadávanie',
-'selectonly' => 'Povolené sú iba príkazy na prehľadávanie \"SELECT\".',
-'querysuccessful' => 'Prehľadávanie nebolo úspešné',
-
 # Make sysop
 'makesysoptitle' => 'Urob z redaktora administrátora',
-'makesysoptext' => 'Tento formulár používajú byrokrati na zmenu redaktorov na administrátorov. 
+'makesysoptext' => 'Tento formulár používajú byrokrati na zmenu redaktorov na administrátorov.
 Do poľa napíšte meno redaktora a potvrďte zmenu redaktora na administrátora',
 'makesysopname' => 'Meno redaktora:',
 'makesysopsubmit' => 'Urob z tohto redaktora administrátora',
@@ -1336,17 +1306,16 @@ Do poľa napíšte meno redaktora a potvrďte zmenu redaktora na administrátora
 'val_validation_of' => 'Overenie "$1"',
 'val_revision_of' => 'Verzie $1',
 'val_revision_changes_ok' => 'Vaše hodnotenie bolo zaznamenané!',
-'val_rev_stats_link' => 'Pozri štatistiku overení pre "$1" <a href="$2">tu</a>',
 'val_revision_stats_link' => '(<a href="$1">detaily</a>)',
 'val_iamsure' => 'Zaškrtnite políčko, ak to myslíte vážne!',
 'val_clear_old' => 'Vymaž moje staršie záznamy overení',
 'val_merge_old' => 'Použi moje predchádzajúce hodnotenia tam, kde je zvolené \'Nemám názor\'',
 'val_form_note' => "'''Tip:''' Zlúčiť vaše údaje znamená, že pre verziu
-článku, ktorý zvolíte, všetky možnosti, kde ste označili ''nemám názor'', 
+článku, ktorý zvolíte, všetky možnosti, kde ste označili ''nemám názor'',
 budú nastavené na hodnotu a komentár najčerstvejšej verzie, pre ktorú
 ste vyjadrili názor. Napríklad, ak chcete zmeniť jedinú nezávislú možnosť
 pre novšiu verziu, ale tiež ponechať vaše ostatné nastavenia pre tento článok
-v tejto verzii, zvoľte iba, ktorú možnosť máte v úmysle ''zmeniť'', 
+v tejto verzii, zvoľte iba, ktorú možnosť máte v úmysle ''zmeniť'',
 a zlúčením sa doplnia ostatné možnosti z vašich predchádzajúcich nastavení",
 'val_noop' => 'Nemám názor',
 'val_percent' => "'''$1%'''<br />($2 z $3 bodov<br />od $4 redaktorov)",
@@ -1408,7 +1377,7 @@ Prosím vyberte si iný názov.',
 ale Diskusná stránka sa nedala premiestniť,
 pretože už jedna existuje pod zadaným novým názvom. Zlúčte ich manuálne.',
 'movedto' => 'presunutý na',
-'movetalk' => 'Premiestniť aj \"diskusnú\" stránku, ak je to možné.',
+'movetalk' => 'Premiestniť aj "diskusnú" stránku, ak je to možné.',
 'talkpagemoved' => 'Príslušná diskusná stránka bola tiež premiestnená.',
 'talkpagenotmoved' => 'Príslušná diskusná stránka <strong>nebola</strong> premiestnená.',
 '1movedto2' => "[[$1]] premiestnená na [[$2]]",
@@ -1418,7 +1387,7 @@ pretože už jedna existuje pod zadaným novým názvom. Zlúčte ich manuálne.
 'movereason' => 'Dôvod',
 'revertmove' => 'obnova',
 'delete_and_move' => 'Vymaž a presuň',
-'delete_and_move_text' => 
+'delete_and_move_text' =>
 '==Potreba zmazať článok==
 
 Cieľový článok "[[$1]]" už existuje. Chcete ho vymazať a vytvoriť tak priestor pre presun?',
@@ -1482,7 +1451,7 @@ Ak chcete iba posledné úpravy, ako napr. [[Special:Export/Tank]] pre článok
 'tooltip-watch' => 'Pridaj túto stránku k sledovaným. [alt-w]',
 
 # stylesheets
-'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
+#'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
 #'Monobook.js' => '/* edit this file to change js things in the monobook skin */',
 
 # Metadata
@@ -1543,52 +1512,52 @@ Ak chcete iba posledné úpravy, ako napr. [[Special:Export/Tank]] pre článok
 'Monobook.js' => '/* tooltips and access keys */
 ta = new Object();
 ta[\'pt-userpage\'] = new Array(\'.\',\'Moja redaktorská stránka\');
-ta[\'pt-anonuserpage\'] = new Array(\'.\',\'Stránka redaktora pre ip adresu, ktorú upravujete ako\'); 
-ta[\'pt-mytalk\'] = new Array(\'n\',\'Moja diskusná stránka\'); 
-ta[\'pt-anontalk\'] = new Array(\'n\',\'Diskusia o úpravách z tejto ip adresy\'); 
-ta[\'pt-preferences\'] = new Array(\'\',\'Moje nastavenia\'); 
-ta[\'pt-watchlist\'] = new Array(\'l\',\'Zoznam článkov, na ktorých sledujete zmeny.\'); 
-ta[\'pt-mycontris\'] = new Array(\'y\',\'Zoznam mojich príspevkov\'); 
-ta[\'pt-login\'] = new Array(\'o\',\'Odporúčame Vám prihlásiť sa, nie je to však povinné.\'); 
-ta[\'pt-anonlogin\'] = new Array(\'o\',\'Odporúčame Vám prihlásiť sa, nie je to však povinné.\'); 
-ta[\'pt-logout\'] = new Array(\'o\',\'Odhlásenie\'); 
-ta[\'ca-talk\'] = new Array(\'t\',\'Diskusia o obsahu článku\'); 
-ta[\'ca-edit\'] = new Array(\'e\',\'Môžete upravovať tento článok. Prosíme, použite tlačidlo náhľad pre uložením.\'); 
-ta[\'ca-addsection\'] = new Array(\'+\',\'Pridaj komentár k tejto diskusii.\'); 
-ta[\'ca-viewsource\'] = new Array(\'e\',\'Tento článok je zamknutý. Môžete však vidieť jeho zdrojový text.\'); 
-ta[\'ca-history\'] = new Array(\'h\',\'Minulé verzie tohto článku.\'); 
-ta[\'ca-protect\'] = new Array(\'=\',\'Zamkni tento článok\'); 
-ta[\'ca-delete\'] = new Array(\'d\',\'Vymaž tento článok\'); 
-ta[\'ca-undelete\'] = new Array(\'d\',\'Obnov úpravy tohto článku až po dobu jeho vymazania\'); 
-ta[\'ca-move\'] = new Array(\'m\',\'Presuň tento článok\'); 
-ta[\'ca-watch\'] = new Array(\'w\',\'Pridať tento článok do sledovaných článkov\'); 
-ta[\'ca-unwatch\'] = new Array(\'w\',\'Odstrániť tento článok zo sledovaných článkov\'); 
-ta[\'search\'] = new Array(\'f\',\'Prehľadávanie tejto wiki\'); 
-ta[\'p-logo\'] = new Array(\'\',\'Hlavná stránka\'); 
-ta[\'n-mainpage\'] = new Array(\'z\',\'Navštíviť Hlavnú stránku\'); 
-ta[\'n-portal\'] = new Array(\'\',\'O projekte, ako môžete prispieť, kde čo nájsť\'); 
-ta[\'n-currentevents\'] = new Array(\'\',\'Aktuálne udalosti a ich pozadie\'); 
-ta[\'n-recentchanges\'] = new Array(\'r\',\'Zoznam posledných úprav vo wiki.\'); 
-ta[\'n-randompage\'] = new Array(\'x\',\'Zobrazenie náhodného článku\'); 
-ta[\'n-help\'] = new Array(\'\',\'Pozrieť si pomoc.\'); 
-ta[\'n-sitesupport\'] = new Array(\'\',\'Podporte nás\'); 
-ta[\'t-whatlinkshere\'] = new Array(\'j\',\'Zoznam všetkých wiki článkov, ktoré sem odkazujú\'); 
-ta[\'t-recentchangeslinked\'] = new Array(\'k\',\'Posledné úpravy v článkoch, ktoré odkazujú na túto stránku\'); 
-ta[\'feed-rss\'] = new Array(\'\',\'RSS feed pre túto stránku\'); 
-ta[\'feed-atom\'] = new Array(\'\',\'Atom feed pre túto stránku\'); 
-ta[\'t-contributions\'] = new Array(\'\',\'Pozrieť si zoznam príspevkov od tohto redaktora\'); 
-ta[\'t-emailuser\'] = new Array(\'\',\'Poslať e-mail tomuto redaktorovi\'); 
-ta[\'t-upload\'] = new Array(\'u\',\'Nahranie obrázkových alebo mediálnych súborov\'); 
-ta[\'t-specialpages\'] = new Array(\'q\',\'Zoznam všetkých špeciálnych stránok\'); 
-ta[\'ca-nstab-main\'] = new Array(\'c\',\'Pozrieť si obsah článku\'); 
-ta[\'ca-nstab-user\'] = new Array(\'c\',\'Pozrieť si stránku redaktora\'); 
-ta[\'ca-nstab-media\'] = new Array(\'c\',\'Pozrieť si stránku médii\'); 
-ta[\'ca-nstab-special\'] = new Array(\'\',\'Toto je špeciálna stránka, nemôžete ju upravovať.\'); 
-ta[\'ca-nstab-wp\'] = new Array(\'c\',\'Pozrieť si stránku projektu\'); 
-ta[\'ca-nstab-image\'] = new Array(\'c\',\'Pozrieť si stránku obrázku\'); 
-ta[\'ca-nstab-mediawiki\'] = new Array(\'c\',\'Pozrieť si systémovú stránku\'); 
-ta[\'ca-nstab-template\'] = new Array(\'c\',\'Pozrieť si šablónu\'); 
-ta[\'ca-nstab-help\'] = new Array(\'c\',\'Pozrieť si stránku s Pomocou\'); 
+ta[\'pt-anonuserpage\'] = new Array(\'.\',\'Stránka redaktora pre ip adresu, ktorú upravujete ako\');
+ta[\'pt-mytalk\'] = new Array(\'n\',\'Moja diskusná stránka\');
+ta[\'pt-anontalk\'] = new Array(\'n\',\'Diskusia o úpravách z tejto ip adresy\');
+ta[\'pt-preferences\'] = new Array(\'\',\'Moje nastavenia\');
+ta[\'pt-watchlist\'] = new Array(\'l\',\'Zoznam článkov, na ktorých sledujete zmeny.\');
+ta[\'pt-mycontris\'] = new Array(\'y\',\'Zoznam mojich príspevkov\');
+ta[\'pt-login\'] = new Array(\'o\',\'Odporúčame Vám prihlásiť sa, nie je to však povinné.\');
+ta[\'pt-anonlogin\'] = new Array(\'o\',\'Odporúčame Vám prihlásiť sa, nie je to však povinné.\');
+ta[\'pt-logout\'] = new Array(\'o\',\'Odhlásenie\');
+ta[\'ca-talk\'] = new Array(\'t\',\'Diskusia o obsahu článku\');
+ta[\'ca-edit\'] = new Array(\'e\',\'Môžete upravovať tento článok. Prosíme, použite tlačidlo náhľad pre uložením.\');
+ta[\'ca-addsection\'] = new Array(\'+\',\'Pridaj komentár k tejto diskusii.\');
+ta[\'ca-viewsource\'] = new Array(\'e\',\'Tento článok je zamknutý. Môžete však vidieť jeho zdrojový text.\');
+ta[\'ca-history\'] = new Array(\'h\',\'Minulé verzie tohto článku.\');
+ta[\'ca-protect\'] = new Array(\'=\',\'Zamkni tento článok\');
+ta[\'ca-delete\'] = new Array(\'d\',\'Vymaž tento článok\');
+ta[\'ca-undelete\'] = new Array(\'d\',\'Obnov úpravy tohto článku až po dobu jeho vymazania\');
+ta[\'ca-move\'] = new Array(\'m\',\'Presuň tento článok\');
+ta[\'ca-watch\'] = new Array(\'w\',\'Pridať tento článok do sledovaných článkov\');
+ta[\'ca-unwatch\'] = new Array(\'w\',\'Odstrániť tento článok zo sledovaných článkov\');
+ta[\'search\'] = new Array(\'f\',\'Prehľadávanie tejto wiki\');
+ta[\'p-logo\'] = new Array(\'\',\'Hlavná stránka\');
+ta[\'n-mainpage\'] = new Array(\'z\',\'Navštíviť Hlavnú stránku\');
+ta[\'n-portal\'] = new Array(\'\',\'O projekte, ako môžete prispieť, kde čo nájsť\');
+ta[\'n-currentevents\'] = new Array(\'\',\'Aktuálne udalosti a ich pozadie\');
+ta[\'n-recentchanges\'] = new Array(\'r\',\'Zoznam posledných úprav vo wiki.\');
+ta[\'n-randompage\'] = new Array(\'x\',\'Zobrazenie náhodného článku\');
+ta[\'n-help\'] = new Array(\'\',\'Pozrieť si pomoc.\');
+ta[\'n-sitesupport\'] = new Array(\'\',\'Podporte nás\');
+ta[\'t-whatlinkshere\'] = new Array(\'j\',\'Zoznam všetkých wiki článkov, ktoré sem odkazujú\');
+ta[\'t-recentchangeslinked\'] = new Array(\'k\',\'Posledné úpravy v článkoch, ktoré odkazujú na túto stránku\');
+ta[\'feed-rss\'] = new Array(\'\',\'RSS feed pre túto stránku\');
+ta[\'feed-atom\'] = new Array(\'\',\'Atom feed pre túto stránku\');
+ta[\'t-contributions\'] = new Array(\'\',\'Pozrieť si zoznam príspevkov od tohto redaktora\');
+ta[\'t-emailuser\'] = new Array(\'\',\'Poslať e-mail tomuto redaktorovi\');
+ta[\'t-upload\'] = new Array(\'u\',\'Nahranie obrázkových alebo mediálnych súborov\');
+ta[\'t-specialpages\'] = new Array(\'q\',\'Zoznam všetkých špeciálnych stránok\');
+ta[\'ca-nstab-main\'] = new Array(\'c\',\'Pozrieť si obsah článku\');
+ta[\'ca-nstab-user\'] = new Array(\'c\',\'Pozrieť si stránku redaktora\');
+ta[\'ca-nstab-media\'] = new Array(\'c\',\'Pozrieť si stránku médii\');
+ta[\'ca-nstab-special\'] = new Array(\'\',\'Toto je špeciálna stránka, nemôžete ju upravovať.\');
+ta[\'ca-nstab-wp\'] = new Array(\'c\',\'Pozrieť si stránku projektu\');
+ta[\'ca-nstab-image\'] = new Array(\'c\',\'Pozrieť si stránku obrázku\');
+ta[\'ca-nstab-mediawiki\'] = new Array(\'c\',\'Pozrieť si systémovú stránku\');
+ta[\'ca-nstab-template\'] = new Array(\'c\',\'Pozrieť si šablónu\');
+ta[\'ca-nstab-help\'] = new Array(\'c\',\'Pozrieť si stránku s Pomocou\');
 ta[\'ca-nstab-category\'] = new Array(\'c\',\'Pozrieť si stránku s kategóriami\');
 ',
 
@@ -1606,8 +1575,6 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'Pozrieť si stránku s kategóriam
 'newimages' => 'Galéria nových obrázkov',
 'noimages' => 'Nič na zobrazenie.',
 
-'sitesettings' => 'Nastavenia webu',
-
 # labels for User: and Title: on Special:Log pages
 'specialloguserlabel' => 'Redaktor: ',
 'speciallogtitlelabel' => 'Názov: ',
@@ -1651,12 +1618,12 @@ do Vášho prehliadača pre potvrdenie, že Vaša e-mailová adresa je platná."
 'confirmemail_body' => "Niekto, pravdepodobne vy z IP adresy $1, zaregistroval účet
 \"$2\" s touto e-mailovou adresou na {{GRAMMAR:lokál|{{SITENAME}}}}.
 
-Pre potvrdenie, že tento účet skutočne patrí Vám a pre aktivovanie 
+Pre potvrdenie, že tento účet skutočne patrí Vám a pre aktivovanie
 e-mailových funkcií na {{GRAMMAR:lokál|{{SITENAME}}}}, otvorte tento odkaz vo vašom prehliadači:
 
 $3
 
-Ak ste to *neboli* Vy, neotvárajte odkaz. Tento potvrdzovací kód 
+Ak ste to *neboli* Vy, neotvárajte odkaz. Tento potvrdzovací kód
 vyprší o $4.
 ",
 
@@ -1671,9 +1638,6 @@ class LanguageSk extends LanguageUtf8 {
 		$wgNamespaceNamesSk[NS_PROJECT_TALK] = 'Diskusia_k_' . $this->convertGrammar( $wgMetaNamespace, 'datív' );
 	}
 
-	/**
-	 * @return array
-	 */
 	function getNamespaces() {
 		global $wgNamespaceNamesSk;
 		return $wgNamespaceNamesSk;
@@ -1730,7 +1694,7 @@ class LanguageSk extends LanguageUtf8 {
 		',' => "\xc2\xa0",
 		'.' => ','
 	);
- 
+
 	function formatNum( $number ) {
 		return strtr($number, $this->digitTransTable );
 	}
diff --git a/languages/LanguageSl.php b/languages/LanguageSl.php
index 1f43b99efc85..ea990a60934a 100644
--- a/languages/LanguageSl.php
+++ b/languages/LanguageSl.php
@@ -14,32 +14,28 @@
 #         1.00.31 romanm        2003-11-11 |    merged incorrectly broken lines
 #         1.00.32 romanm        2003-11-19 |    merged incorrectly broken lines
 #         1.00.40 romanm        2003-11-21 |    fixed Google search
-#
 
-require_once( "LanguageUtf8.php" );
+#         1.00.50 Nikerabbit    2005-08-15 |    removed old stuff, some cleanup, NOT COMPLETE!
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
 
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
+require_once( "LanguageUtf8.php" );
+
+/** TODO: fixme, remove wikipedia
 /* private */ $wgNamespaceNamesSl = array(
-	-2  => "Media",
-	-1	=> "Posebno",
-	0	=> "",
-	1	=> "Pogovor",
-	2	=> "Uporabnik",
-	3	=> "Uporabniški_pogovor",
-	4	=> "Wikipedija",
-	5	=> "Pogovor_k_Wikipediji",
-	6	=> "Slika",
-	7	=> "Pogovor_k_sliki",
-	8	=> "MediaWiki",
-	9	=> "MediaWiki_talk",
-	10  => "Template",
-	11  => "Template_talk"
+	NS_MEDIA          => "Media",
+	NS_SPECIAL        => "Posebno",
+	NS_MAIN           => "",
+	NS_TALK           => "Pogovor",
+	NS_USER           => "Uporabnik",
+	NS_USER_TALK      => "Uporabniški_pogovor",
+	NS_PROJECT        => "Wikipedija",
+	NS_PROJECT_TALK   => "Pogovor_k_Wikipediji",
+	NS_IMAGE          => "Slika",
+	NS_IMAGE_TALK     => "Pogovor_k_sliki",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "MediaWiki_talk",
+	NS_TEMPLATE       => "Template",
+	NS_TEMPLATE_TALK  => "Template_talk"
 
 ) + $wgNamespaceNamesEn;
 
@@ -47,54 +43,6 @@ require_once( "LanguageUtf8.php" );
 	"Brez", "Levo nepomično", "Desno nepomično", "Levo leteče"
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesSl = array(
-	"Userlogin"	=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Ponastavi moje uporabniške nastavitve",
-	"Watchlist"	=> "Moj opazovalni seznam",
-	"Recentchanges" => "Nedavno posodobljene strani",
-	"Upload"	=> "Naloži slikovne datoteke",
-	"Imagelist"	=> "Seznam slik",
-	"Listusers"	=> "Vpisani uporabniki",
-	"Statistics"	=> "Statistika strani",
-	"Randompage"	=> "Naključni članek",
-	"Lonelypages"	=> "Osamljeni članki",
-	"Unusedimages"	=> "Osamljene slike",
-	"Popularpages"	=> "Priljubljeni članki",
-	"Wantedpages"	=> "Najbolj iskani članki",
-	"Shortpages"	=> "Kratki članki",
-	"Longpages"	=> "Dolgi članki",
-	"Newpages"	=> "Nanovo ustvarjeni članki",
-	"Ancientpages"	=> "Oldest pages",
-	"Allpages"	=> "Vse strani po naslovu",
-	"Ipblocklist"	=> "Zaprti IP naslovi",
-	"Maintenance"   => "Vzdrževalna stran",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"	=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"	=> "",
-	"Booksources"	=> "Zunanji knjižni viri",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesSl = array(
-	"Blockip"		=> "Zapri IP naslov",
-	"Asksql"		=> "Preglej podatkovno bazo",
-	"Undelete"		=> "Poglej in obnovi zbrisane strani"
-);
-
-/* private */ $wgDeveloperSpecialPagesSl = array(
-	"Lockdb"		=> "Postavi podatkovno bazo samo za branje",
-	"Unlockdb"		=> "Obnovi zapisovalni dostop podatkovne baze",
-);
-
 /* private */ $wgDateFormatsSl = array(
 #        'No preference',
 );
@@ -159,7 +107,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "Wikipedija:O_Wikipediji",
 "help"			=> "Pomoč",
 "helppage"		=> "Wikipedija:Pomoč",
-"wikititlesuffix"       => "Wikipedija",
 "bugreports"	        => "Poročila o hroščih",
 "bugreportspage"        => "Wikipedija:Poročila_o_hroščih",
 "faq"			=> "Najpogostejša vprašanja",
@@ -201,7 +148,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom"        => "(Preusmerjeno iz $1)",
 "lastmodified"	        => "Zadnja sprememba $1.",
 "viewcount"		=> "To stran so pogledali $1 krat.",
-"gnunote" => "Vse besedilo je na razpolago pod pogoji <a class=internal href='/wiki/GNU_FDL'>GNU licence proste dokumentacije</a>.",
 "printsubtitle"         => "(Iz {{SERVER}})",
 "protectedpage"         => "Zaščitena stran",
 "administrators"        => "Wikipedija:Administratorji",
@@ -276,7 +222,7 @@ Lahko nadaljujete z uporabo Wikipedije nepodpisani, ali pa se lahko ponovno vpi
 "newusersonly"	        => " (Samo novi uporabniki)",
 "remembermypassword"    => "Zapomni si moje geslo vseskozi.",
 "loginproblem"	        => "<b>Nastala je tažava z vašim vpisom.</b><br />Poskusite znova!",
-"alreadyloggedin"       => "<font color=red><b>Uporabnik $1, ste že vpisani!</b></font><br />\n",
+"alreadyloggedin"       => "<strong>Uporabnik $1, ste že vpisani!</strong><br />\n",
 
 "login"			=> "Vpis",
 "userlogin"		=> "Vpis",
@@ -526,13 +472,10 @@ Vsi prikazani časi so strežnikov čas (UTC).
 ",
 "filename"		=> "Imedatoteke",
 "filedesc"		=> "Povzetek",
-"affirmation"	        => "Potrjujem da se nosilec avtorske pravice te datoteke
-strinja z licenco pod pogoji $1.",
+
 "copyrightpage"         => "Wikipedija:Avtorske pravice",
 "copyrightpagename"     => "Avtorske pravice Wikipedije",
 "uploadedfiles"	        => "Naložene datoteke",
-"noaffirmation"         => "Morate potrditi, da vaše nalaganje ne krši
-nobenih avtorskih pravic.",
 "ignorewarning"	        => "Zanemari opozorilo in vseeno shrani.",
 "minlength"		=> "Imena slik morajo vsebovati vsaj tri črke.",
 "badfilename"	        => "Slika se je spremenila v \"$1\".",
@@ -758,7 +701,6 @@ Vnesi razloge spodaj (na primer z navedbo določenih strani, ki so jih po nepotr
 "ipbreason"	=> "Razlog",
 "ipbsubmit"	=> "Prekini ta naslov",
 "badipaddress"	=> "IP naslov je slabo oblikovan.",
-"noblockreason" => "Morate navesti razlog prekinitve.",
 "blockipsuccesssub" => "Prekinitev je uspela",
 "blockipsuccesstext" => "IP naslov \"$1\" je prekinjen.
 <br />Glej [[Posebno:Ipseznamprekinitev|seznam prekinitev IP]] za pregled prekinitev.",
@@ -793,17 +735,6 @@ Prosimo potrdite vaš resnični namen.",
 <br />Ne pozabite odkleniti, ko boste končali z vzdrževanjem.",
 "unlockdbsuccesstext" => "Podatkovna baza Wikipedije je bila odklenjena.",
 
-# SQL query
-#
-"asksql"	=> "SQL vprašanje",
-"asksqltext"	=> "Uporabi spodnjo obliko za neposedno vprašanje podatkovni bazi Wikipedije.
-Uporabite enojne narekovaje ('tako') za razmejitev črkovnih nizov.
-To precej obremeni strežnik zato, prosimo, previdno uporabljajte to funkcijo.",
-"sqlquery"	=> "Vnesite vprašanje",
-"querybtn"	=> "Pošljite vprašanje",
-"selectonly"	=> "Vsa vprašanja razen \"SELECT\" so omejeni za razvijalce Wikipedije.",
-"querysuccessful" => "Vprašanje uspešno",
-
 # Move page
 #
 "movepage"	=> "Prestavi stran",
@@ -837,12 +768,12 @@ V teh primerih boste morali prestaviti ali povezati stran ročno, če to želite
 "talkpagemoved" => "Pripadajoča pogovorna stran je tudi prestavljena.",
 "talkpagenotmoved" => "Pripadajoča pogovorna stran <strong>ni</strong> prestavljena.",
 # Math
-	'mw_math_png' => "Vedno prikaži PNG",
-	'mw_math_simple' => "Če je dovolj preprosto, uporabi HTML, drugače pa PNG",
-	'mw_math_html' => "Uporabi HTML, če je možno, drugače pa PNG",
-	'mw_math_source' => "Pusti v TeX-ovi obliki (za tekstovne brskljalnike)",
-	'mw_math_modern' => "Priporočeno za sodobne brskljalnike",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Vedno prikaži PNG",
+'mw_math_simple' => "Če je dovolj preprosto, uporabi HTML, drugače pa PNG",
+'mw_math_html' => "Uporabi HTML, če je možno, drugače pa PNG",
+'mw_math_source' => "Pusti v TeX-ovi obliki (za tekstovne brskljalnike)",
+'mw_math_modern' => "Priporočeno za sodobne brskljalnike",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -851,16 +782,16 @@ V teh primerih boste morali prestaviti ali povezati stran ročno, če to želite
 #--------------------------------------------------------------------------
 
 class LanguageSl extends LanguageUtf8 {
-	
+
 	function getNamespaces() {
 		global $wgNamespaceNamesSl;
 		return $wgNamespaceNamesSl;
 	}
-	
-	
+
+
 	function getNsIndex( $text ) {
 		global $wgNamespaceNamesSl;
-		
+
 		foreach ( $wgNamespaceNamesSl as $i => $n ) {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
@@ -869,52 +800,32 @@ class LanguageSl extends LanguageUtf8 {
 		if( 0 == strcasecmp( "Wikipedia", $text ) ) { return 4; }
 		return false;
 	}
-	
+
 	function getQuickbarSettings() {
 		global $wgQuickbarSettingsSl;
 		return $wgQuickbarSettingsSl;
 	}
-	
+
 	function getDateFormats() {
 		global $wgDateFormatsSl;
 		return $wgDateFormatsSl;
 	}
-	
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesSl;
-		return $wgValidSpecialPagesSl;
-	}
-	
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesSl;
-		return $wgSysopSpecialPagesSl;
-	}
-	
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesSl;
-		return $wgDeveloperSpecialPagesSl;
-	}
-	
-	function getMessage( $key )
-	{
+
+	function getMessage( $key ) {
 		global $wgAllMessagesSl;
 		if(array_key_exists($key, $wgAllMessagesSl))
 			return $wgAllMessagesSl[$key];
 		else
 			return parent::getMessage($key);
 	}
-	
+
 	function fallback8bitEncoding() {
 		return "iso-8859-2";
 	}
 
-        function formatNum( $number, $year = false ) {
-                return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
-        }
-
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
+	}
 }
 
 ?>
diff --git a/languages/LanguageSq.php b/languages/LanguageSq.php
index f2250258524f..838b9a565a62 100644
--- a/languages/LanguageSq.php
+++ b/languages/LanguageSq.php
@@ -6,31 +6,23 @@
 
 require_once("LanguageUtf8.php");
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
 /* private */ $wgNamespaceNamesSq = array(
-	-2	=> "Media",
-	-1	=> "Speciale",
-	0	=> "",
-	1	=> "Diskutim",
-	2	=> "Përdoruesi",
-	3	=> "Përdoruesi_diskutim",
-	4	=> $wgMetaNamespace,
-	5	=> $wgMetaNamespace . "_diskutim",
-	6	=> "Figura",
-	7	=> "Figura_diskutim",
-	8	=> "MediaWiki",
-	9	=> "MediaWiki_diskutim",
-	10  => "Stampa",
-	11  => "Stampa_diskutim",
-        NS_HELP             => 'Ndihmë',
-        NS_HELP_TALK        => 'Ndihmë_diskutim'
+	NS_MEDIA          => "Media",
+	NS_SPECIAL        => "Speciale",
+	NS_MAIN           => "",
+	NS_TALK           => "Diskutim",
+	NS_USER           => "Përdoruesi",
+	NS_USER_TALK      => "Përdoruesi_diskutim",
+	NS_PROJECT        => $wgMetaNamespace,
+	NS_PROJECT_TALK   => $wgMetaNamespace . "_diskutim",
+	NS_IMAGE          => "Figura",
+	NS_IMAGE_TALK     => "Figura_diskutim",
+	NS_MEDIAWIKI      => "MediaWiki",
+	NS_MEDIAWIKI_TALK => "MediaWiki_diskutim",
+	NS_TEMPLATE       => "Stampa",
+	NS_TEMPLATE_TALK  => "Stampa_diskutim",
+	NS_HELP           => 'Ndihmë',
+	NS_HELP_TALK      => 'Ndihmë_diskutim'
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsSq = array(
@@ -40,71 +32,14 @@ require_once("LanguageUtf8.php");
 /* private */ $wgSkinNamesSq = array(
 	'standard' => "Standarte",
 	'nostalgia' => "Nostalgjike",
-	'cologneblue' => "Kolonjë Blu",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+	'cologneblue' => "Kolonjë Blu"
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgDateFormatsSq = array(
 #	"Pa preferencë",
 );
 
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesSq = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Vendos preferimet e mia",
-	"Watchlist"		=> "Lista mbikqyrëse",
-	"Recentchanges" => "Ndryshimet e fundit",
-	"Upload"		=> "Jep skedar",
-	"Imagelist"		=> "Lista e figurave",
-	"Listusers"		=> "Përdorues të rregjistruar",
-	"Statistics"	=> "Statistikat e faqeve",
-	"Randompage"	=> "Artikull kuturu",
-
-	"Lonelypages"	=> "Faqe të palidhura",
-	"Unusedimages"	=> "Figura të papërdorura",
-	"Popularpages"	=> "Artikuj të frekuentuar shpesh",
-	"Wantedpages"	=> "Artikuj më të dëshiruar",
-	"Shortpages"	=> "Artikuj të shkurtër",
-	"Longpages"		=> "Artikuj të gjatë",
-	"Newpages"		=> "Artikuj të rinj",
-	"Ancientpages"	=> "Artikuj më të vjetër",
-	"Allpages"		=> "Të gjitha faqet sipas emrave",
-
-	"Ipblocklist"	=> "Përdoruesit dhe IP-të e bllokuara",
-	"Maintenance" => "Faqe mirëmbajtëse",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "Burime të jashtme librash",
-	"Export"		=> "XML export",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesSq = array(
-	"Blockip"		=> "Blloko një përdorues/IP adresë",
-	"Asksql"		=> "Pyet rregjistrin",
-	"Undelete"		=> "Restauro faqet e grisura"
-);
-
-/* private */ $wgDeveloperSpecialPagesSq = array(
-	"Lockdb"		=> "Bëje rregjistrin vetëm për tu lexuar",
-	"Unlockdb"		=> "Lejo mundësinë e shrimit në rregjistër",
-);
-
 /* private */ $wgAllMessagesSq = array(
 
 # User Toggles
@@ -168,19 +103,17 @@ require_once("LanguageUtf8.php");
 "mainpage"		=> "Faqja Kryesore",
 "mainpagetext"	=> "Wiki software u instalua me sukses.",
 "about"			=> "Rreth",
-"aboutsite"      => "Rreth $wgSitename",
-"aboutpage"		=> "$wgMetaNamespace:Rreth",
+"aboutsite"      => "Rreth {{SITENAME}}",
+"aboutpage"		=> "{{ns:project}}:Rreth",
 "help"			=> "Ndihmë",
-"helppage"		=> "$wgMetaNamespace:Ndihmë",
-"wikititlesuffix" => "$wgSitename",
+"helppage"		=> "{{ns:project}}:Ndihmë",
 "bugreports"	=> "Raporto yçkla",
-"bugreportspage" => "$wgMetaNamespace:Raporto_yçkla",
+"bugreportspage" => "{{ns:project}}:Raporto_yçkla",
 "sitesupport"   => "Dhurime",
-"sitesupportpage" => "", # If not set, won't appear. Can be wiki page or URL
 "faq"			=> "Pyetje e Përgjigje",
-"faqpage"		=> "$wgMetaNamespace:Pyetje_e_Përgjigje",
+"faqpage"		=> "{{ns:project}}:Pyetje_e_Përgjigje",
 "edithelp"		=> "Ndihmë për redaktim",
-"edithelppage"	=> "$wgMetaNamespace:Si_redaktohet_një_faqe",
+"edithelppage"	=> "{{ns:project}}:Si_redaktohet_një_faqe",
 "cancel"		=> "Harroje",
 "qbfind"		=> "Kërko",
 "qbbrowse"		=> "Shfleto",
@@ -193,7 +126,7 @@ require_once("LanguageUtf8.php");
 "currentevents" => "Evenimente",
 "errorpagetitle" => "Gabim",
 "returnto"		=> "Kthehu tek $1.",
-"tagline"      	=> "Nga $wgSitename, Enciklopedia e Lirë.", # FIXME
+"tagline"      	=> "Nga {{SITENAME}}, Enciklopedia e Lirë.", # FIXME
 "whatlinkshere"	=> "Lidhjet këtu ",
 "help"			=> "Ndihmë",
 "search"		=> "Kërko",
@@ -217,10 +150,9 @@ require_once("LanguageUtf8.php");
 "redirectedfrom" => "(Ridrejtuar nga $1)",
 "lastmodified"	=> "Kjo faqe është ndryshuar për herë te fundit më $1.",
 "viewcount"		=> "Kjo faqe është parë $1 herë.",
-"gnunote" => "I gjithë teksti është publikuar sipas kushteve të <a class=internal href='$wgScriptPath/GNU_FDL'>GNU Free Documentation License</a>.",
 "printsubtitle" => "(Nga {{SERVER}})",
 "protectedpage" => "Faqe e mbrojtur",
-"administrators" => "$wgMetaNamespace:Administruesit",
+"administrators" => "{{ns:project}}:Administruesit",
 "sysoptitle"	=> "Nevojitet titulli sysop",
 "sysoptext"		=> "Veprimi që kerkove mund të bëhet vetëm nga një përdorues me titullin \"sysop\". Shiko $1.",
 "developertitle" => "Nevojitet titulli zhvillues",
@@ -228,7 +160,7 @@ require_once("LanguageUtf8.php");
 "nbytes"		=> "$1 bytes",
 "go"			=> "Shko",
 "ok"			=> "Shko",
-"sitetitle"		=> $wgSitename,
+"sitetitle"		=> '{{SITENAME}}',
 "sitesubtitle"	=> "Enciklopedia e Lirë",
 "retrievedfrom" => "Marrë nga \"$1\"",
 "newmessages" => "Ti ke $1.",
@@ -269,7 +201,7 @@ MySQL kthehu gabimin \"$3: $4\".\n",
 "readonly"		=> "Rregjistri i bllokuar",
 "enterlockreason" => "Fut një arsye për bllokimin, gjithashtu fut edhe kohën se kur
 pritet të ç'bllokohet",
-"readonlytext"	=> "Rregjistri $wgSitename është i bllokuar dhe nuk lejohen redaktime dhe
+"readonlytext"	=> "Rregjistri {{SITENAME}} është i bllokuar dhe nuk lejohen redaktime dhe
 artikuj të ri, ka mundësi të jetë bllokuar për mirëmbajtje,
 dhe do të kthehe në gjëndje normale mbas mirëmbajtjes.
 Administruesi i cili e bllokoi dha këtë arsye:
@@ -300,7 +232,7 @@ sepse e ngadalëson rregjistrin aq shumë sa nuk e përdor dot njeri tjetër.",
 "viewsource" => "Shiko tekstin",
 "protectedtext" => "Kjo faqe është e mbrojtur që të mos redaktohet; mund të ketë
 disa arsye përse kjo është bërë, të lutem shiko
-[[$wgMetaNamespace:Faqe e mbrojtur]].
+[[{{ns:project}}:Faqe e mbrojtur]].
 
 Mund të shikosh dhe kopjosh tekstin e kësaj faqeje:",
 
@@ -308,7 +240,7 @@ Mund të shikosh dhe kopjosh tekstin e kësaj faqeje:",
 #
 "logouttitle"	=> "Përdoruesi doli",
 "logouttext"	=> "Tani ti ke dalë jashtë.
-Mund të vazhdosh të përdorësh $wgSitename anonimisht, ose mund të hysh brënda
+Mund të vazhdosh të përdorësh {{SITENAME}} anonimisht, ose mund të hysh brënda
 përsëri me emrin që kishe ose me një emër tjetër.\n",
 
 "welcomecreation" => "<h2>Mirë se erdhe, $1!</h2><p>Llogaria jote ështe hapur.
@@ -321,12 +253,7 @@ Mos harro të vendosësh preferimet e tua të uikipedias.",
 "newusersonly"	=> " (përdoruesit e rinj vetëm)",
 "remembermypassword" => "Mbaj mënd fjalëkalimin tim për tërë vizitat e ardhshme.",
 "loginproblem"	=> "<b>Kishte një problem me hyrjen tënde.</b><br />Provoje përsëri!",
-"alreadyloggedin" => "<font color=red><b>Përdorues $1, ti ke hyrë brënda më parë!</b></font><br />\n",
-
-"areyounew"		=> "N.q.s. je një përdorues i ri i $wgSitename dhe do të hapësh një llogari,
-fut një emër, pastaj fut një fjalëkalim dy herë.
-Adresa jote e email-it nuk është e detyrueshme; n.q.s. ti harron fjalëkalimin mund të kërkosh që
-ta dergojme tek adresa që na dhe.<br />\n",
+"alreadyloggedin" => "<strong>Përdorues $1, ti ke hyrë brënda më parë!</strong><br />\n",
 
 "login"			=> "Hyrje",
 "userlogin"		=> "Hyrje",
@@ -344,14 +271,14 @@ të të kontaktojnë nëpërmjet faqes pa u treguar adresën, gjithashtu kjo adr
 "loginerror"	=> "Gabim hyrje",
 "noname"		=> "Nuk ke dhënë një emër të saktë.",
 "loginsuccesstitle" => "Hyrje me sukses",
-"loginsuccess"	=> "Tani ke hyrë brënda në $wgSitename si \"$1\".",
+"loginsuccess"	=> "Tani ke hyrë brënda në {{SITENAME}} si \"$1\".",
 "nosuchuser"	=> "Nuk ka ndonjë përdorues me emrin \"$1\".
 Kontrollo gërmat, ose përdor formularin e mëposhtëm për të hapur një llogari të re.",
 "wrongpassword"	=> "Fjalëkalimi që fute nuk është i saktë. Provoje përsëri!",
 "mailmypassword" => "Më dërgo një fjalëkalim të ri tek adresa ime",
-"passwordremindertitle" => "Kujtim për fjalëkalimin nga $wgSitename",
+"passwordremindertitle" => "Kujtim për fjalëkalimin nga {{SITENAME}}",
 "passwordremindertext" => "Dikush (ndoshta ti, nga IP adresa $1)
-kërkojë që të dërgojmë një fjalëkalim hyrje të ri për $wgSitename.
+kërkojë që të dërgojmë një fjalëkalim hyrje të ri për {{SITENAME}}.
 Fjalëkalimi për përdoruesin \"$2\" tani është \"$3\".
 Duhet të hysh përsëri dhe të ndërrosh fjalëkalimin tënd menjëherë.",
 "noemail"		=> "Rregjistri nuk ka adresë për përdoruesin \"$1\".",
@@ -370,7 +297,7 @@ Hyni përsëri mbasi ta kesh marrë.",
 "blockedtitle"	=> "Përdoruesi është bllokuar",
 "blockedtext"	=> "Emri yt ose adresa e IP-së është bllokuar nga $1.
 Arsyeja e dhënë është kjo:<br />''$2''<p>Mund të kontaktosh $1 ose një nga
-[[$wgMetaNamespace:Administruesit|administruesit]] e tjerë për të diskutuar bllokimin.
+[[{{ns:project}}:Administruesit|administruesit]] e tjerë për të diskutuar bllokimin.
 
 Vë re, nuk mund të përdorësh \"dërgoji email këtij përdoruesi\" n.q.s. nuk ke një adresë të saktë
 të rregjistruar në [[Speciale:Preferences|preferimet e përdoruesit]].
@@ -385,7 +312,7 @@ Në qoftë se kjo të ndodh ty, të lutem njoftoni një administrues duke përdo
 "newarticletext" =>
 "Ke ndjekur një lidhje tek një faqe që nuk ekziston akoma.
 Për ta krijuar këtë faqe, fillo të shtypësh në kutinë poshtë
-(shiko [[$wgMetaNamespace:Ndihmë|faqen ndihmuese]] për më shumë informacion).
+(shiko [[{{ns:project}}:Ndihmë|faqen ndihmuese]] për më shumë informacion).
 Në qoftë se je këtu gabimisht, thjesht shtyp butonin '''Back''' të shfletuesit tuaj.",
 "anontalkpagetext" => "---- ''Kjo është një faqe diskutimi për një përdorues anonim i cili nuk ka hapur akoma një llogari ose nuk e përdor atë. Prandaj, neve na duhet të përdorim numrin e adresës [[IP adresë|IP]] për ta identifikuar. Kjo adresë mund të përdoret nga disa njerëz. Në qoftë se ti je një përdorues anonim dhe mendon se komente kot janë drejtuar ndaj teje, të lutem [[Speciale:Userlogin|krijo një llogari ose hyni brënda]] për të mos
 u ngatarruar me përdorues të tjerë anonim.'' ",
@@ -412,7 +339,7 @@ të shtypësh \"Ruaje faqen\".\n<p>",
 Në qoftë se e ruan, çdo ndryshim i bërë deri tani do të humbet.</strong>",
 "yourdiff"		=> "Ndryshimet",
 # REPLACE THE COPYRIGHT WARNING IF YOUR SITE ISN'T GFDL!
-"copyrightwarning" => "Të lutem vë re që të gjitha kontributet tek $wgSitename janë
+"copyrightwarning" => "Të lutem vë re që të gjitha kontributet tek {{SITENAME}} janë
 të konsideruara të dhëna nën liçensën GNU Free Documentation License
 (shiko $1 për detaje).
 Në qoftë se nuk dëshiron që kontributet e tua të redaktohen pa mëshirë dhe të jepen
@@ -505,7 +432,7 @@ për të vedosur preferimet e përdoruesit.",
 "prefslogintext" => "Ke hyrë si \"$1\".
 Numri yt i brëndshëm i identifikimit është $2.
 
-Shiko [[$wgMetaNamespace:Ndihmë për preferimet e përdoruesit]] për ndihmë për të kuptuar opsionet.",
+Shiko [[{{ns:project}}:Ndihmë për preferimet e përdoruesit]] për ndihmë për të kuptuar opsionet.",
 "prefsreset"	=> "Preferimet janë rikthyer siç ishin.",
 "qbsettings"	=> "Vendimet e shpejta",
 "changepassword" => "Ndërro fjalëkalimin",
@@ -545,8 +472,8 @@ nga ajo e shërbyesit (UTC).",
 #
 "changes" => "ndryshime",
 "recentchanges" => "Ndryshimet e fundit",
-# This is the default text, and can be overriden by editing [[$wgMetaNamespace:Recentchanges]]
-"recentchangestext" => "Ndiq ndryshimet e fundit të $wgSitename në këtë faqe.",
+# This is the default text, and can be overriden by editing [[{{ns:project}}:Recentchanges]]
+"recentchangestext" => "Ndiq ndryshimet e fundit të {{SITENAME}} në këtë faqe.",
 "rcloaderr"		=> "Duke karikuar ndryshimet e fundit",
 "rcnote"		=> "Më poshtë janë <strong>$1</strong> ndryshimet e fundit gjatë <strong>$2</strong> ditëve.",
 "rcnotefrom"	=> "Më poshtë janë ndryshimet e fundit nga <b>$2</b> (treguar deri në <b>$1</b>).",
@@ -614,12 +541,9 @@ Të gjitha orët janë me orën e shërbyesit (UTC).
 ",
 "filename"		=> "Skedaremër",
 "filedesc"		=> "Përmbledhje",
-"affirmation"	=> "Unë konfirmoj që jam mbajtësi i të drejtave të kopimit të këtij skedarit
-dhe jap leje të liçensohet nën rregullat e $1.",
-"copyrightpage" => "$wgMetaNamespace:Të drejta kopimi",
-"copyrightpagename" => "$wgSitename Të drejta kopimi",
+"copyrightpage" => "{{ns:project}}:Të drejta kopimi",
+"copyrightpagename" => "{{SITENAME}} Të drejta kopimi",
 "uploadedfiles"	=> "Jep skedarë",
-"noaffirmation" => "Duhet të konfirmosh që dhënja e jote nuk thyen ndonjë të drejtë kopimi.",
 "ignorewarning"	=> "Injoroje shënimin e kujdesisë dhe ruaje skedarin.",
 "minlength"		=> "Emrat e skedarëve duhet të kenë të paktën tre gërma.",
 "badfilename"	=> "Emri i skedarit është ndërruar në \"$1\".",
@@ -665,7 +589,7 @@ këtë version të vjetër, (ktheje) = ktheje në këtë version të vjetër.
 "sitestats"		=> "Statistikat e faqeve",
 "userstats"		=> "Statistikat e përdoruesit",
 "sitestatstext" => "Gjënden <b>$1</b> faqe në totalin e rregjistrit.
-Këto përfshijnë faqet e  \"diskutimit\", faqe rreth $wgSitename, faqe \"cungje\" të vogla,
+Këto përfshijnë faqet e  \"diskutimit\", faqe rreth {{SITENAME}}, faqe \"cungje\" të vogla,
 ridrejtime, dhe të tjera që ndoshta nuk kualifikohen si artikuj.
 Duke mos i përfshirë këto, gjënden <b>$2</b> faqe që janë artikuj të ligjshëm.<p>
 Gjënden <b>$3</b> shikime faqesh, dhe <b>$4</b> redaktime faqesh që nga dita kur
@@ -682,7 +606,7 @@ Kjo do të thotë se janë bërë <b>$5</b> redaktime për faqe afërsisht, dhe
 rregjistrin, kështuqë mos e fresko faqen mbas çdo ndryshimi ;-)",
 "maintenancebacklink"	=> "Mbrapsh tek faqja mirëmbajtëse",
 "disambiguations"	=> "Faqe qartësuese",
-"disambiguationspage"	=> "$wgMetaNamespace:Lidhje_tek_faqe_qartësuese",
+"disambiguationspage"	=> "{{ns:project}}:Lidhje_tek_faqe_qartësuese",
 "disambiguationstext"	=> "Artikujt që vijojnë lidhen tek një <i>faqe qartësuese</i>. Ato duhet të lidhen tek tema e përshtatshme
 
 <br />Një faqe trajtohet si qartësuese lidhet nga $1.<br />Lidhje nga hapësira të tjera <i>nuk</i> jepen këtu.",
@@ -735,7 +659,7 @@ këtu edhe pse janë në përdorim.",
 "booksourcetext" => "Më poshtë është një listë me lidhje tek hapësira të tjera që shesin
 libra të rinj dhe të përdorur, dhe mund të kenë më shumë informacion
 për librat që po kerkon.
-$wgSitename nuk ka mardhënie me asnjë nga këto biznese, dhe
+{{SITENAME}} nuk ka mardhënie me asnjë nga këto biznese, dhe
 kjo listë nuk duhet të shikohet si një rreklamë.",
 "alphaindexline" => "$1 deri në $2",
 
@@ -816,7 +740,7 @@ dhe shtyp butonin 'Hiq të zgjedhurat' në fund të ekranit.",
 "confirmdeletetext" => "Je duke grisur '''përfundimisht''' një faqe
 ose një skedar me tërë historinë e tij nga rregjistri.
 Të lutem konfirmo që ke ndër mënd ta bësh këtë gjë, që e kupton se cilat janë
-pasojat, dhe që po vepron ne përputhje me [[$wgMetaNamespace:Rregullat]].",
+pasojat, dhe që po vepron ne përputhje me [[{{ns:project}}:Rregullat]].",
 "actioncomplete" => "Veprim i mbaruar",
 "deletedtext"	=> "\"$1\" është grisur nga rregjistri.
 Shiko $2 për një rekord të grisjeve të fundit.",
@@ -844,7 +768,7 @@ Redaktimi i fundit është bërë nga [[Përdoruesi:$3|$3]] ([[Përdoruesi disku
 "revertpage"	=> "Kthyer tek redaktimi i fundit nga $1",
 "protectlogpage" => "Mbroj_rregj",
 "protectlogtext" => "Më poshtë është një listë e \"mbrojtjeve/lirimeve\" të faqeve.
-Shiko [[$wgMetaNamespace:Faqe e mbrojtur]] për më shumë informacion.",
+Shiko [[{{ns:project}}:Faqe e mbrojtur]] për më shumë informacion.",
 "protectedarticle" => "mbrojti [[$1]]",
 "unprotectedarticle" => "liroji [[$1]]",
 
@@ -864,7 +788,7 @@ shkëmbehet automatikisht.",
 "undeletebtn" => "Restauro!",
 "undeletedarticle" => "u restaurua \"$1\"",
 "undeletedtext"   => "Faqja [[$1]] është restauruar me sukses.
-Shiko [[$wgMetaNamespace:Gris_rregj]] për një listë të grisjeve dhe restaurimeve të fundit.",
+Shiko [[{{ns:project}}:Gris_rregj]] për një listë të grisjeve dhe restaurimeve të fundit.",
 
 # Contributions
 #
@@ -892,14 +816,13 @@ të përdorim këtë funksion.",
 "blockip"		=> "Blloko përdoruesin",
 "blockiptext"	=> "Përdor formularin e mëposhtëm për të hequr lejen e shkrimit
 për një përdorues ose IP-ë specifike.
-Kjo duhet bërë vetëm në raste vandalizmi, dhe në përputhje me [[$wgMetaNamespace:Rregullat|$wgSitename regullat]].
+Kjo duhet bërë vetëm në raste vandalizmi, dhe në përputhje me [[{{ns:project}}:Rregullat|{{SITENAME}} regullat]].
 Plotëso arsyen specifike më poshtë (p.sh., trego faqet specifike që u
 vandalizuan).",
 "ipaddress"		=> "IP Adresë/përdorues",
 "ipbreason"		=> "Arsye",
 "ipbsubmit"		=> "Blloko këtë përdorues",
 "badipaddress"	=> "Nuk ka asnjë përdorues me atë emër",
-"noblockreason" => "Duhet të japësh një arsye për bllokimin.",
 "blockipsuccesssub" => "Bllokimi u bë me sukses",
 "blockipsuccesstext" => "\"$1\" është bllokuar.
 <br />Shiko [[Speciale:Ipblocklist|IP blloko listë]] për të parë bllokimet.",
@@ -935,22 +858,9 @@ Të lutem konfirmo që me vërte do të kryesh këtë veprim.",
 "locknoconfirm" => "Nuk vendose kryqin tek kutia konfirmuese.",
 "lockdbsuccesssub" => "Rregjistri u bllokua me sukses",
 "unlockdbsuccesssub" => "Rregjistri u ç'bllokua me sukses",
-"lockdbsuccesstext" => "Rregjistri i $wgSitename është bllokuar.
+"lockdbsuccesstext" => "Rregjistri i {{SITENAME}} është bllokuar.
 <br />Kujtohu ta ç'bllokosh mbasi të kesh mbaruar mirëmbajtjen.",
-"unlockdbsuccesstext" => "Rregjistri i $wgSitename është ç'bllokuar.",
-
-# SQL query
-#
-"asksql"		=> "SQL pyetje",
-"asksqltext"	=> "Përdor formularin e më poshtëm për të bërë një pyetje direkte tek rregjistri i $wgSitename .
-Përdor këto apostrofa ('kështu') për të ndarë vargjet e gërmave.
-Ky veprim mund ta ngarkojë shumë shërbyesin, prandaj mos e përdor shumë shpesh.",
-"sqlislogged"	=> "Vë re që të gjitha pyetjet janë të rregjistruara.",
-"sqlquery"		=> "Fut pyetjen",
-"querybtn"		=> "Bëj pyetjen",
-"selectonly"	=> "Pyetje përveç atyre \"SELECT\" janë të lejuara vetëm për
-$wgSitename zhvillues.",
-"querysuccessful" => "Pyetje me sukses",
+"unlockdbsuccesstext" => "Rregjistri i {{SITENAME}} është ç'bllokuar.",
 
 # Move page
 #
@@ -997,12 +907,12 @@ Të lutem, përpuqi vetë.",
 
 # Math
 
-	'mw_math_png' => "Gjithmonë PNG",
-	'mw_math_simple' => "HTML në qoftë se është e thjeshtë ose ndryshe PNG",
-	'mw_math_html' => "HTML në qoftë se është e mundur ose ndryshe PNG",
-	'mw_math_source' => "Lëre si TeX (për shfletuesit tekst)",
-	'mw_math_modern' => "E rekomanduar për shfletuesit modern",
-	'mw_math_mathml' => 'MathML',
+'mw_math_png' => "Gjithmonë PNG",
+'mw_math_simple' => "HTML në qoftë se është e thjeshtë ose ndryshe PNG",
+'mw_math_html' => "HTML në qoftë se është e mundur ose ndryshe PNG",
+'mw_math_source' => "Lëre si TeX (për shfletuesit tekst)",
+'mw_math_modern' => "E rekomanduar për shfletuesit modern",
+'mw_math_mathml' => 'MathML',
 
 );
 
@@ -1013,8 +923,6 @@ class LanguageSq extends LanguageUtf8 {
 		return $wgNamespaceNamesSq;
 	}
 
-
-
 	function getNsIndex( $text ) {
 		global $wgNamespaceNamesSq;
 		foreach ( $wgNamespaceNamesSq as $i => $n ) {
@@ -1043,8 +951,7 @@ class LanguageSq extends LanguageUtf8 {
 	}
 
 	# localised date and time
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = substr( $ts, 0, 4 ) . " " .
@@ -1053,46 +960,25 @@ class LanguageSq extends LanguageUtf8 {
 		return $d;
 	}
 
-	function time( $ts, $adj = false )
-	{
+	function time( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
 		return $t;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		return $this->date( $ts, $adj ) . " " . $this->time( $ts, $adj );
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesSq;
-		return $wgValidSpecialPagesSq;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesSq;
-		return $wgSysopSpecialPagesSq;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesSq;
-		return $wgDeveloperSpecialPagesSq;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesSq;
 		if(array_key_exists($key, $wgAllMessagesSq))
 			return $wgAllMessagesSq[$key];
 		else
 			return parent::getMessage($key);
 	}
-	
+
 	function formatNum( $number ) {
 		global $wgTranslateNumerals;
 		return $wgTranslateNumerals ? strtr($number, '.,', ',.' ) : $number;
diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 8ecd3f08b8cc..962090e5a3ca 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -40,7 +40,7 @@ require_once( "LanguageUtf8.php" );
 
 /* private */ $wgSkinNamesSr = array(
  "Обична", "Носталгија", "Келнско плаво", "Педингтон", "Монпарнас"
-);
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsSr = array(
 # "Без посебних жеља",
@@ -51,71 +51,19 @@ require_once( "LanguageUtf8.php" );
 /* NOT USED IN STABLE VERSION */
 /* private */ $wgMagicWordsSr = array(
 #   ID                                 CASE  SYNONYMS
-    MAG_REDIRECT             => array( 0,    "#преусмери"              ),
-    MAG_NOTOC                => array( 0,    "__БЕЗСАДРЖАЈА__"              ),
-    MAG_START                => array( 0,    "__ПОЧЕТАК__"              ),
-    MAG_CURRENTMONTH         => array( 1,    "{{ТРЕНУТНИМЕСЕЦ}}"       ),
-    MAG_CURRENTMONTHNAME     => array( 1,    "{{ИМЕТРЕНУТНОГМЕСЕЦА}}"   ),
-    MAG_CURRENTDAY           => array( 1,    "{{ТРЕНУТНИДАН}}"         ),
-    MAG_CURRENTDAYNAME       => array( 1,    "{{ИМЕТРЕНУТНОГДАНА}}"     ),
-    MAG_CURRENTYEAR          => array( 1,    "{{ТРЕНУТНАГОДИНА}}"        ),
-    MAG_CURRENTTIME          => array( 1,    "{{ТРЕНУТНОВРЕМЕ}}"        ),
-    MAG_NUMBEROFARTICLES     => array( 1,    "{{БРОЈЧЛАНАКА}}"   ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "{{ГЕНЕРИСАНОИМЕТРЕНУТНОГМЕСЕЦА}}"),
- MAG_SUBST                => array( 1,    "{{ПОДСТ:$1}}"           ),
-    MAG_MSGNW                => array( 1,    "{{НВПОР:$1}}"           )
-);
-
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesSr = array(
- "Userlogin"  => "",
- "Userlogout" => "",
- "Preferences" => "Моја корисничка подешавања",
- "Watchlist"  => "Мој списак надгледања",
- "Recentchanges" => "скорашње измене страница",
- "Upload"  => "Пошаљи слике",
- "Imagelist"  => "Листа слика",
- "Listusers"  => "Регистровани корисници",
- "Statistics" => "Статистике сајта",
- "Randompage" => "Случајни чланак",
-
- "Lonelypages" => "Чланци - сирочићи",
- "Unusedimages" => "Слике - Сирочићи",
- "Popularpages" => "Жељени чланци",
- "Wantedpages" => "Најтраженији чланци",
- "Shortpages" => "Кратки чланци",
- "Longpages"  => "Дугачки чланци",
- "Newpages"  => "Нови чланци",
- "Ancientpages" => "Најстарији чланци",
-# "Intl"  => "Међујезичке везе",
- "Allpages"  => "Све странице по наслову",
-
- "Ipblocklist" => "Блокирани корисници/ИП адресе",
- "Maintenance" => "Страница за одржавање",
- "Specialpages"  => "",
- "Contributions" => "",
- "Emailuser"  => "",
- "Whatlinkshere" => "",
- "Recentchangeslinked" => "",
- "Movepage"  => "",
- "Booksources" => "Спољњи извори литературе",
-#"Categories" => "Категорије странице",
- "Export" => "XML export",
- "Version" => "Version",
-);
-
-/* private */ $wgSysopSpecialPagesSr = array(
- "Blockip"  => "Блокирај корисника/ИП адресу",
- "Asksql"  => "Постави упит бази података",
- "Undelete"  => "Поврати обрисане странице"
-);
-
-/* private */ $wgDeveloperSpecialPagesSr = array(
- "Lockdb"  => "Омогући само право читања из базе",
- "Unlockdb"  => "Поврати право уписа у базу",
+	MAG_REDIRECT             => array( 0,    "#преусмери"              ),
+	MAG_NOTOC                => array( 0,    "__БЕЗСАДРЖАЈА__"              ),
+	MAG_START                => array( 0,    "__ПОЧЕТАК__"              ),
+	MAG_CURRENTMONTH         => array( 1,    "{{ТРЕНУТНИМЕСЕЦ}}"       ),
+	MAG_CURRENTMONTHNAME     => array( 1,    "{{ИМЕТРЕНУТНОГМЕСЕЦА}}"   ),
+	MAG_CURRENTDAY           => array( 1,    "{{ТРЕНУТНИДАН}}"         ),
+	MAG_CURRENTDAYNAME       => array( 1,    "{{ИМЕТРЕНУТНОГДАНА}}"     ),
+	MAG_CURRENTYEAR          => array( 1,    "{{ТРЕНУТНАГОДИНА}}"        ),
+	MAG_CURRENTTIME          => array( 1,    "{{ТРЕНУТНОВРЕМЕ}}"        ),
+	MAG_NUMBEROFARTICLES     => array( 1,    "{{БРОЈЧЛАНАКА}}"   ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    "{{ГЕНЕРИСАНОИМЕТРЕНУТНОГМЕСЕЦА}}"),
+	MAG_SUBST                => array( 1,    "{{ПОДСТ:$1}}"           ),
+	MAG_MSGNW                => array( 1,    "{{НВПОР:$1}}"           )
 );
 
 /* private */ $wgAllMessagesSr = array(
@@ -182,7 +130,7 @@ require_once( "LanguageUtf8.php" );
 "category_header" => "Чланака у категорији: \"$1\"",
 "subcategories" => "Подкатегорије",
 
-"linktrail"  => "/^([a-z\x80-\xff]+)(.*)\$/sD",
+"linktrail"  => "/^([а-ж�-�]+)(.*)$/sD",
 "mainpage"  => "Главна страна",
 "mainpagetext" => "Вики софтвер је успешно инсталиран.",
 "about"   => "О...",
@@ -190,7 +138,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"  => "{{ns:4}}:О",
 "help"   => "Помоћ",
 "helppage"  => "{{ns:4}}:Помоћ",
-"wikititlesuffix" => "{{SITENAME}}",
 "bugreports" => "Пријаве грешака",
 "bugreportspage" => "{{ns:4}}:Пријаве_грешака",
 "faq"   => "FAQ",
@@ -233,7 +180,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(Преусмерено са $1)",
 "lastmodified" => "Ова страница је последњи пут измењена $1.",
 "viewcount"  => "Овој страници је приступљено $1 пута.",
-"gnunote" => "Сав текст је доступан под условима <a class=internal href='/wiki/GNU_FDL'>ГНУ лиценце за слободну документацију</a>.",
 "printsubtitle" => "(Са {{SERVER}})",
 "protectedpage" => "Заштићена страница",
 "administrators" => "{{ns:4}}:Администратори",
@@ -339,7 +285,7 @@ MySQL је вратио грешку \"$3: $4\".\n",
 "newusersonly" => " (само за нове кориснике)",
 "remembermypassword" => "Запамти моју шифру током више сеанси.",
 "loginproblem" => "<b>Било је проблема са вашим пријављивањем.</b><br />Пробајте поново!",
-"alreadyloggedin" => "<font color=red><b>Корисниче $1, већ сте пријављени!</b></font><br />\n",
+"alreadyloggedin" => "<strong>Корисниче $1, већ сте пријављени!</strong><br />\n",
 
 "login"   => "Пријави се",
 "userlogin"  => "Пријави се",
@@ -641,13 +587,9 @@ or '''<nowiki>[[media:file.ogg]]</nowiki>''' за звукове.
 "filedesc"  => "Опис",
 "filestatus" => "Статус ауторских права",
 "filesource" => "Извор",
-"affirmation" => "Потврђујем да se носилац ауторских права на овај фајл
-слаже да их лиценцира под условима $1.",
 "copyrightpage" => "{{ns:4}}:Ауторска_права",
 "copyrightpagename" => "{{SITENAME}} ауторска права",
 "uploadedfiles" => "Послати фајлови",
-"noaffirmation" => "Порате потврдити да ваше слање не крши
-никаква ауторска права.",
 "ignorewarning" => "Игнориши упозорење и свеједно сними фајл.",
 "minlength"  => "Имена слика морају имате бар три слова.",
 "badfilename" => "Име слике је промељено у \"$1\".",
@@ -918,7 +860,6 @@ $3...
 "ipbreason"  => "Разлог",
 "ipbsubmit"  => "Обуздај овог корисника",
 "badipaddress" => "Не постоји ниједан корисник који се тако зове",
-"noblockreason" => "Морате дати разлог за обуздавање.",
 "blockipsuccesssub" => "Обуздавање је успело",
 "blockipsuccesstext" => "\"$1\" је обуздан.
 <br />Погледајте [[Посебно:ИПсписакаобузданих|ИП списак обузданих]] за преглед обуздавања.",
@@ -933,12 +874,6 @@ $3...
 "unblocklink" => "деблокирај",
 "contribslink" => "прилози",
 "autoblocker" => "Аутоматски сте обуздани јер делите ИП адресу са \"$1\". Разлог \"$2\".",
-/*
-</pre>
-
-==Део 4==
-<pre>
-*/
 # Developer tools
 #
 "lockdb"  => "Закључај базу",
@@ -963,21 +898,6 @@ $3...
 <br />Сетите се да је откључате када завршите са одржавањем.",
 "unlockdbsuccesstext" => "Википедијина база података је откључана.",
 
-# SQL query
-#
-"asksql"  => "SQL упит",
-"asksqltext" => "Употребите доњи упитник да направите директан упит
-Википедијиној бази.
-Употребите једноструке наводнике ('овако') за разграничење словних ниски.
-Ово често може да дода значајно оптерећење серверу, молимо
-користите ову могућност штедљиво.",
-"sqlislogged" => "Обратите пажњу да су сви упити логовани.",
-"sqlquery"  => "Унесите упит",
-"querybtn"  => "Пошаљи упит",
-"selectonly" => "Сви упити осим \"SELECT\" су ограничени на
-развојни тим Википедије.",
-"querysuccessful" => "Упит успешан",
-
 # Move page
 #
 "movepage"  => "Премештање странице",
@@ -1037,11 +957,11 @@ $3...
 
 # Math
 
- 'mw_math_png' => "Увек прикажи PNG",
- 'mw_math_simple' => "HTML ако је врло једноставно, иначе PNG",
- 'mw_math_html' => "HTML ако је могуће, иначе PNG",
- 'mw_math_source' => "Остави као ТеХ (за текстуалне бровсере)",
- 'mw_math_modern' => "Препоручено за савремене бровсере",
+'mw_math_png' => "Увек прикажи PNG",
+'mw_math_simple' => "HTML ако је врло једноставно, иначе PNG",
+'mw_math_html' => "HTML ако је могуће, иначе PNG",
+'mw_math_source' => "Остави као ТеХ (за текстуалне бровсере)",
+'mw_math_modern' => "Препоручено за савремене бровсере",
 
 );
 
@@ -1051,69 +971,50 @@ $3...
 
 class LanguageSr extends LanguageUtf8 {
 
- function getNamespaces() {
-  global $wgNamespaceNamesSr;
-  return $wgNamespaceNamesSr;
- }
-
- function getNsIndex( $text ) {
-  global $wgNamespaceNamesSr;
-
-  foreach ( $wgNamespaceNamesSr as $i => $n ) {
-   if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
-  }
-  if( 0 == strcasecmp( "Special", $text ) ) { return -1; }
-  if( 0 == strcasecmp( "User", $text ) ) { return 2; }
-  if( 0 == strcasecmp( "Wikipedia", $text ) ) { return 4; }
-  return false;
- }
-
- function getQuickbarSettings() {
-  global $wgQuickbarSettingsSr;
-  return $wgQuickbarSettingsSr;
- }
-
- function getSkinNames() {
-  global $wgSkinNamesSr;
-  return $wgSkinNamesSr;
- }
-
- function getDateFormats() {
-  global $wgDateFormatsSr;
-  return $wgDateFormatsSr;
- }
-
- function getValidSpecialPages()
- {
-  global $wgValidSpecialPagesSr;
-  return $wgValidSpecialPagesSr;
- }
-
- function getSysopSpecialPages()
- {
-  global $wgSysopSpecialPagesSr;
-  return $wgSysopSpecialPagesSr;
- }
-
- function getDeveloperSpecialPages()
- {
-  global $wgDeveloperSpecialPagesSr;
-  return $wgDeveloperSpecialPagesSr;
- }
-
- function getMessage( $key )
- {
+	function getNamespaces() {
+	global $wgNamespaceNamesSr;
+	return $wgNamespaceNamesSr;
+	}
+
+	function getNsIndex( $text ) {
+	global $wgNamespaceNamesSr;
+
+	foreach ( $wgNamespaceNamesSr as $i => $n ) {
+		if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
+	}
+	if( 0 == strcasecmp( "Special", $text ) ) { return -1; }
+	if( 0 == strcasecmp( "User", $text ) ) { return 2; }
+	if( 0 == strcasecmp( "Wikipedia", $text ) ) { return 4; }
+	return false;
+	}
+
+	function getQuickbarSettings() {
+	global $wgQuickbarSettingsSr;
+	return $wgQuickbarSettingsSr;
+	}
+
+	function getSkinNames() {
+	global $wgSkinNamesSr;
+	return $wgSkinNamesSr;
+	}
+
+	function getDateFormats() {
+	global $wgDateFormatsSr;
+	return $wgDateFormatsSr;
+	}
+
+	function getMessage( $key ) {
 		global $wgAllMessagesSr;
 		if(array_key_exists($key, $wgAllMessagesSr))
 			return $wgAllMessagesSr[$key];
 		else
 			return parent::getMessage($key);
- }
+	}
+
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
+	}
 
- function formatNum( $number, $year = false ) {
-        return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
- }
- 
 }
 
 ?>
diff --git a/languages/LanguageSv.php b/languages/LanguageSv.php
index 6f917a9de524..c789c13f123f 100644
--- a/languages/LanguageSv.php
+++ b/languages/LanguageSv.php
@@ -47,75 +47,8 @@ require_once( "LanguageUtf8.php" );
 	'standard' => "Standard",
 	'nostalgia' => "Nostalgi",
 	'cologneblue' => "Cologne Blå",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
-
-/* private */ $wgMathNamesSv = array(
-	MW_MATH_PNG    => "Rendera alltid PNG",
-	MW_MATH_SIMPLE => "HTML om den är väldigt enkel, annars PNG",
-	MW_MATH_HTML   => "HTML om det är möjligt, annars PNG",
-	MW_MATH_SOURCE => "Lämna det som TeX (för textbaserade webbläddrare)",
-	MW_MATH_MODERN => "Rekommenderas för moderna webbläsare",
-	MW_MATH_MATHML => "MathML om det är möjligt (experimentellt)",
-);
-
-// All special pages have to be listed here: a description of ""
-// will make them not show up on the "Special Pages" page, which
-// is the right thing for some of them (such as the "targeted" ones).
-//#
-
-// private
-$wgValidSpecialPagesSv = array(
-        "Userlogin"     => "",
-        "Userlogout"    => "",
-        "Preferences"   => "Mina användarinställningar",
-        "Watchlist"     => "Min övervakningslista",
-        "Recentchanges" => "Senaste ändringar",
-
-        "Upload"        => "Ladda upp filer",
-        "Imagelist"     => "Bildlista",
-        "Listusers"     => "Registrerade användare",
-        "Statistics"    => "Sidstatistik",
-
-        "Randompage"    => "Slumpmässig sida",
-        "Lonelypages"   => "Föräldralösa sidor",
-        "Unusedimages"  => "Föräldralösa filer",
-        "Popularpages"  => "Populära artiklar",
-        "Wantedpages"   => "Mest önskade artiklar",
-        "Shortpages"    => "Korta artiklar",
-        "Longpages"     => "Långa artiklar",
-        "Newpages"      => "De nyaste artiklarna",
-        "Ancientpages"  => "Oldest pages",
-        "Allpages"      => "Alla sidor efter titel",
-
-        "Ipblocklist"   => "Blockerade IP adresser",
-        "Maintenance"   => "Underhållssida",
-        "Specialpages"  => "Specialsidor",
-        "Contributions" => "",
-        "Emailuser"     => "E-postanvändare",
-        "Whatlinkshere" => "",
-        "Recentchangeslinked" => "",
-        "Movepage"      => "",
-        "Booksources"   => "Externa bokkällor",
-        "Export"        => "XML export",
-		"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesSv = array(
-        "Blockip"       => "Blockera en IP-adress",
-        "Asksql"        => "Gör en sökning i databasen",
-        "Undelete"      => "Se och återställ raderade sidor"
-);
+) + $wgSkinNamesEn;
 
-/* private */ $wgDeveloperSpecialPagesSv = array(
-        "Lockdb"        => "Skrivskydda databasen",
-        "Unlockdb"      => "Återställ skrivning till databasen",
-);
 
 /* private */ $wgAllMessagesSv = array(
 // User Toggles
@@ -174,7 +107,7 @@ $wgValidSpecialPagesSv = array(
 
 
 // Bits of text used by many pages:
-//	
+//
 "linktrail"             => "/^((?:[a-z]|ä|ö|å)+)(.*)\$/sD",
 "mainpage"              => "Huvudsida",
 'portal'		=> 'Kollektivportal',
@@ -185,11 +118,9 @@ $wgValidSpecialPagesSv = array(
 'article'               => 'Artikel',
 "help"                  => "Hjälp",
 "helppage"              => "Wikipedia:Hjälp",
-"wikititlesuffix"       => "Wikipedia",
 "bugreports"            => "Felrapporter",
 "bugreportspage"        => "Wikipedia:Felrapporter",
 "sitesupport"           => "Donationer",
-"sitesupportpage"       => "", # If not set, won't appear. Can be wiki page or URL
 "faq"                   => "FAQ",
 "faqpage"               => "Wikipedia:FAQ",
 "edithelp"              => "Redigeringshjälp",
@@ -249,8 +180,6 @@ Se $1.",
 "developertitle"        => "Utvecklarbehörighet krävs",
 "developertext"         => "Den här funktionen kan bara utföras av användare med \"developer\" status.
 Se $1.",
-"bureaucrattitle"	=> "Byråkrataccess krävs",
-"bureaucrattext"	=> "Funktionen du har eftersökt kan endast utföras av en sysop med byråkratstatus.",
 "nbytes"		=> "$1 bytes",
 "go"                    => "Utför",
 "ok"                    => "OK",
@@ -302,17 +231,17 @@ MySQL returnerade felen \"$3<tt>: $4</tt>\".",
 "noconnect"             => "Kunde inte ansluta till databasen på $1",
 "nodb"                  => "Kunde inte välja databasen $1",
 "readonly"              => "Databasen är skrivskyddad",
-"enterlockreason"       => "Skriv en grund för skrivskyddet, inklusive 
+"enterlockreason"       => "Skriv en grund för skrivskyddet, inklusive
 en uppskattning på när skrivskyddet skall upphävas",
-"readonlytext"          => "Wikipediadatabasen är för ögonblicket skrivskyddad för 
-nya sidor och andra modifikationer, beroende på rutinmässigt 
+"readonlytext"          => "Wikipediadatabasen är för ögonblicket skrivskyddad för
+nya sidor och andra modifikationer, beroende på rutinmässigt
 underhåll av databasen, varefter den återgår till normalstatus.
 Den administratör som skrivskyddade den har gett följande förklaring:
 <p>$1",
 "missingarticle"        => "Databasen fann inte texten på en sida
 som den skulle hitta, med namnet \"$1\".
 Dette är inte ett databas fel, utan beror på ett fel i mjukvaran.
-Skicka vänligen en rapport om detta till en administratör, där du också nämner 
+Skicka vänligen en rapport om detta till en administratör, där du också nämner
 URL:en.",
 "internalerror"         => "Internt fel",
 "filecopyerror"         => "Kunde inte kopiera filen \"$1\" til \"$2\".",
@@ -344,7 +273,7 @@ igen som samma eller annan användare.\n",
 "newusersonly"          => " (bara för nya användare)",
 "remembermypassword"    => "Kom ihåg mitt lösenord till nästa gång.",
 "loginproblem"          => "<b>Det var svårt att logga in dig .</b><br />Pröva igen!",
-"alreadyloggedin"       => "<font color=red><b>Användare $1, du är redan inloggad !</b></font><br />\n",
+"alreadyloggedin"       => "<strong>Användare $1, du är redan inloggad !</strong><br />\n",
 
 "login"                 => "Logga in",
 "userlogin"             => "Logga in",
@@ -394,7 +323,7 @@ Anledning är att:<br />''$2''<p>Ta kontakt med $1 eller en av de andra
 "updated"               => "(Uppdaterad)",
 "note"                  => "<strong>Notera:</strong> ",
 "previewnote"           => "Observera att detta är en förhandsvisning, och att sidan ännu inte sparats!",
-"previewconflict"       => "Den här förhandsvisningen är resultatet av den 
+"previewconflict"       => "Den här förhandsvisningen är resultatet av den
 redigerbara texten ovanför,
 så som det kommer att se ut om du väljer att spara.",
 "editing"               => "Redigerar $1",
@@ -419,10 +348,10 @@ Du lovar oss också att du skrev texten själv, eller kopierade från public dom
 "longpagewarning"       => "<strong>VARNING: Den här artikeln är $1 kilobytes lång; vissa äldre webbläsare
 kan ha problem med att redigera sidor som är omkring 32 kb eller större.
 Du kanske vill överväga att dela upp artikeln i mindre delar.</strong>",
-"readonlywarning"       => "<strong>VARNING: Databasen är tillfälligt låst för underhåll. Du kommer inte att kunna spara 
+"readonlywarning"       => "<strong>VARNING: Databasen är tillfälligt låst för underhåll. Du kommer inte att kunna spara
 dina ändringar just nu. För säkerhets skull kanske du vill överväga att kopiera över texten till din egen dator tills
 databasen är upplåst igen.</strong>",
-"protectedpagewarning"  => "<strong>VARNING:  Den här sidan har låsts så att bara administratörer kan redigera den. 
+"protectedpagewarning"  => "<strong>VARNING:  Den här sidan har låsts så att bara administratörer kan redigera den.
 Försäkra dig om att du följer rekommendationerna för [[Project:Skyddade sidor|skyddade sidor]]</strong>",
 
 // History pages
@@ -470,7 +399,7 @@ och texter i $3 artiklar.",
 "showingresults"        => "Nedan visas <b>$1</b> resultat som startar med nummer <b>$2</b>.",
 "nonefound"             => "<strong>Note</strong>: Misslyckade sökningar förorsakas ofta av
  att man söker efter vanliga ord som \"har\" och \"från\",
-vilka inte indexeras, eller att specificera flera sökord (bara 
+vilka inte indexeras, eller att specificera flera sökord (bara
 sidor som innehåller alla sökorden hittas).",
 "powersearch"           => "Sök",
 "powersearchtext"       => "
@@ -555,14 +484,14 @@ För att visa eller söka tidigare uppladdade bilder gå till
 Uppladdningar och borttagningar loggas i
 [[Project:Upload_log|uppladdnings logg]].
 
-Använd formuläret nedan för att ladda upp nya filer, som 
+Använd formuläret nedan för att ladda upp nya filer, som
 du kan illustrera dina artiklar med.
-På de flesta webbläsare kommer du att se en \"Browse...\" knapp eller en 
+På de flesta webbläsare kommer du att se en \"Browse...\" knapp eller en
 \"Öppna...\" knapp, som startar ditt operativsystems dialogruta för att öppna filer. När du valt en fil kommer namnet på den filen att visas i textfältet brevid knappen. Du måste även kryssa för rutan, för att du inte gör något som strider mot upphovsrätten av filen som laddas upp.
 Tryck på \"Upload\" knappen för att ladda upp filen.
 Detta kan dröja ett tag om du har en långsam internetförbindelse.
 
-Formaten på filerna ska helst vara JPEG för bilder, PNG för ritningar 
+Formaten på filerna ska helst vara JPEG för bilder, PNG för ritningar
 och andra ikonliknande bilder och OGG för ljud.
 Var vänlig namnge filen med ett så beskrivande namn som möjligt, för att undvika förvirring.
 För att använda en fil i en artikel, skriv följande om det är en bild: '''<nowiki>[[bild:filnamn.jpg]]</nowiki>''' eller '''<nowiki>[[bild:filnamn.png|alternativ text]]</nowiki>'''
@@ -578,11 +507,9 @@ Alla tider visas efter serverns tid (UTC).
 ",
 "filename"              => "Filnamn",
 "filedesc"              => "Beskrivning",
-"affirmation"           => "Jag bekräftar att ägaren till upphovsrätten accepterar att licensiera enligt följande avtal $1.",
 "copyrightpage"         => "Wikipedia:copyright",
 "copyrightpagename"     => "Wikipedia copyright",
 "uploadedfiles"         => "Uppladdade filer",
-"noaffirmation"         => "Du måste bekräfta att uppladdningen inte kränker någon copyright",
 "ignorewarning"         => "Ignorera varning och spara fil.",
 "minlength"             => "Namnet på bildfilen ska vara minst tre bokstäver",
 "badfilename"           => "Bildnamn har blivit ändrat till \"$1\".",
@@ -591,7 +518,7 @@ Alla tider visas efter serverns tid (UTC).
 "successfulupload"      => "Uppladdningen lyckades",
 "fileuploaded"          => "Filen \"$1\" laddades upp korrekt.
 Följ den här länken: ($2) till beskrivningssidan och fyll i
-information om filen, som till exempel var den kommer ifrån, 
+information om filen, som till exempel var den kommer ifrån,
 när den skapades och vem som gjort den och allt annat du vet om den.",
 "uploadwarning"         => "Uppladdnings varning",
 "savefile"              => "Spara fil",
@@ -614,7 +541,7 @@ när den skapades och vem som gjort den och allt annat du vet om den.",
 "revertimg"             => "återgå",
 "deleteimg"             => "radera",
 "deleteimgcompletely"             => "radera",
-"imghistlegend"         => "Legend: (nuvarande) = detta är den nuvarande bilden, 
+"imghistlegend"         => "Legend: (nuvarande) = detta är den nuvarande bilden,
 (ta bort) = ta bort den gamla version, (återgå) = återgå till en gammal version.
 <br /><i>Klicka på ett datum för att se bilden som laddades upp den dagen</i>.", //"
 "imagelinks"            => "Bildlänk",
@@ -632,7 +559,7 @@ sidor, omdirigeringssidor, och andra sidor som kvalificerar sig som artiklar.
 Om man tar bort ovanstående så är det <b>$2</b> sidor som anses som riktiga artiklar.<p>
 Det har varit totalt <b>$3</b> sidvisningar och det har varit <b>$4</b> sidor som har ändrats
 sedan uppdateringen av mjukvaran (1 december 2002).
-Det vill säga <b>$5</b> ändringar per sida genomsnittligt, 
+Det vill säga <b>$5</b> ändringar per sida genomsnittligt,
 och <b>$6</b> sidvisningar per ändring.",
 "userstatstext"         => "Det är <b>$1</b> registrerade användare.
 <b>$2</b> av dem är administratörer (se $3).",
@@ -656,7 +583,7 @@ och <b>$6</b> sidvisningar per ändring.",
 "mispeelingspage"       => "Lista med vanliga stavfel",
 "missinglanguagelinks"  => "Saknade språklänkar",
 "missinglanguagelinksbutton"    => "Sök efter saknade språklänkar för",
-"missinglanguagelinkstext"      => "De här artiklarna är <i>inte</i> länkade 
+"missinglanguagelinkstext"      => "De här artiklarna är <i>inte</i> länkade
 till deras i $1. Redirects och undersidor visas <i>inte</i>.",
 
 // Miscellaneous special pages
@@ -682,7 +609,7 @@ till deras i $1. Redirects och undersidor visas <i>inte</i>.",
 "newpages"              => "Nya sidor",
 "movethispage"          => "Flytta den här sidan",
 "unusedimagestext"      => "<p>Lägg märket till att andra hemsidor
-som till exempel de internationella wikipedias kan länka till bilder 
+som till exempel de internationella wikipedias kan länka till bilder
 med en direkt URL, och kan därför bli listade här trots att de används kontinuerligt.",
 "booksources"           => "Bokkällor",
 "booksourcetext"        => "Nedan följer en lista över länkar till hemsidor som säljer
@@ -723,13 +650,13 @@ för att kunna göra ändringar på din övervakningslista.",
 "addedwatch"            => "Tillagd på övervakningslistan",
 "addedwatchtext"        => "Sidan \"$1\" har satts upp på din <a href=\"" .
   "{{localurle:Special:Watchlist}}\">övervakningslista</a>.
-Framtida ändringar av den här sidan och dess diskussionssida vill listas där, 
+Framtida ändringar av den här sidan och dess diskussionssida vill listas där,
 
 och sidan kommer att markeras med <b>fet stil</b> i <a href=\"" .
   "{{localurle:Special:Recentchanges}}\">listan över de senaste ändringarna
 </a> för att lättare kunna hittas</p>
 
-<p>Om du vill ta bort den här sidan från din övervakningslista, så klicka 
+<p>Om du vill ta bort den här sidan från din övervakningslista, så klicka
 \"Ta bort övervakning\" ute i sidan.",
 "removedwatch"          => "Borttagen från övervakningslista",
 "removedwatchtext"      => "Sidan \"$1\" har blivit borttagen från din övervakningslista",
@@ -751,8 +678,8 @@ och sidan kommer att markeras med <b>fet stil</b> i <a href=\"" .
 "confirmdeletetext"     => "Du håller på och permanent ta bort en sida
 eller bild med all dess historia från databasen.
 Bekräfta att du förstår vad du håller på med och vilka konsekvenser
-detta leder till, och att det följer 
-[[Wikipedia:Policy]].", 
+detta leder till, och att det följer
+[[Wikipedia:Policy]].",
 "actioncomplete"        => "Genomfört",
 "deletedtext"           => "\"$1\" har blivit borttagen.
 Se $2 för lista över senaste borttagningar",
@@ -809,7 +736,7 @@ för att genomföra den här funktionen.",
 // Block/unblock IP
 //
 "blockip"               => "Blockera IP-adress",
-"blockiptext"           => "Använd formuläret nedan för att blockera skrivåtkomst 
+"blockiptext"           => "Använd formuläret nedan för att blockera skrivåtkomst
 från en viss IP-adress
 Detta ska bara genomföras för att stoppa klotter och
 överstämma med [[Wikipedia:Politik|Wikipedia politik]].
@@ -818,7 +745,6 @@ Fyll i anledningen till blockering nedan (till exempel vilka artiklar som klottr
 "ipbreason"             => "Anledning",
 "ipbsubmit"             => "Blockera den här IP-adressen",
 "badipaddress"          => "Du har inte skrivit IP-adressen korrekt.",
-"noblockreason"         => "Du måste ange en anledning till varför du blockerar.",
 "blockipsuccesssub"     => "Blockeringen lyckades",
 "blockipsuccesstext"    => "IP-adressen \"$1\" har blockerats.
 <br />Se [[Speciel:Ipblocklist|IP blockeringslistan]] för alla blockeringar.",
@@ -833,7 +759,7 @@ Fyll i anledningen till blockering nedan (till exempel vilka artiklar som klottr
 "unblocklink"           => "ta bort blockering",
 "contribslink"          => "bidrag",
 
-// Developer tools 
+// Developer tools
 //
 "lockdb"                => "Lås databas",
 "unlockdb"              => "Lås upp databas",
@@ -852,17 +778,6 @@ Bekräfta att du vill göra detta.",
 <br />Kom ihåg att ta bort låsningen när du är färdig med ditt underhåll.",
 "unlockdbsuccesstext"   => "Wikipediadatabasen är upplåst.",
 
-// SQL query
-//
-"asksql"                => "SQL-fråga",
-"asksqltext"            => "Använd nedanstående formulär för att ställa frågor direkt till Wikipedias databas.
-Använd enkla citationstecken ('så här') för att markera strängar.
-Detta belastar ofta servern hårt, så använd den här funktionen med omtanke.",
-"sqlquery"              => "Skriv fråga",
-"querybtn"              => "Skicka fråga",
-"selectonly"            => "Andra frågor än \"SELECT\" får endast utföras av Wikipedias utvecklare.",
-"querysuccessful"       => "Frågan genomfördes korrekt",
-
 // Move page
 //
 "movepage"              => "Flytta sida",
@@ -955,47 +870,11 @@ wiki som kör MediaWiki-programvara, konverterad, eller bara sparad som syns sku
 "missingimage"		=> "<b>Bild saknas</b><br /><i>$1</i>\n",
 
 # tooltip help for the main actions
-'tooltip-atom'	=> 'Atom feed for this page',
-'tooltip-article' => 'Visa artikel [alt-a]',
-'tooltip-talk' => 'Diskutera artikel [alt-t]',
-'tooltip-edit' => 'Du kan ändra den här sidan. Var god anvand förhandsgranskningsknappen innan du sparar. [alt-e]',
-'tooltip-addsection' => 'Lägg till en kommentar på den här sidan. [alt-+]',
-'tooltip-viewsource' => 'Den här sidan är skyddad. Du kan inte se dess källa. [alt-e]',
-'tooltip-history' => 'Tidigare versioner av den här sidan, [alt-h]',
-'tooltip-protect' => 'Skydda den här sidan [alt-=]',
-'tooltip-delete' => 'Ta bort den här sidan [alt-d]',
-'tooltip-undelete' => 'Återställ $1 borttagna ändringar till den här sidan [alt-d]',
-'tooltip-move' => 'Flytta den här sidan [alt-m]',
 'tooltip-watch' => 'Lägg till den här sidan till din bevakningslista [alt-w]',
-'tooltip-unwatch' => 'Ta bort den här sidan från din bevakningslista [alt-w]',
-'tooltip-watchlist' => 'Lista över sidor som du bevakar [alt-l]',
-'tooltip-userpage' => 'Min användarsida [alt-.]',
-'tooltip-anonuserpage' => 'Användarsidan för ip:et du ändrar [alt-.]',
-'tooltip-mytalk' => 'Min diskussionssida [alt-n]',
-'tooltip-anontalk' => 'Diskutera ändringar från den här ip-addressen [alt-n]',
-'tooltip-preferences' => 'Mina inställningar',
-'tooltip-mycontris' => 'Lista över mina bidrag [alt-y]',
-'tooltip-login' => 'Du är uppmuntrad att logga in, men det är inget krav. [alt-o]',
-'tooltip-logout' => 'Logga ut [alt-o]',
 'tooltip-search' => 'Sök den här wikin [alt-f]',
-'tooltip-mainpage' => 'Besöka Huvudsidan [alt-z]',
-'tooltip-portal' => 'Om projektet, vad du kan göra och vart du hittar saker och ting',
-'tooltip-randompage' => 'Ladda en slumpmässig sida [alt-x]',
-'tooltip-currentevents' => 'Hitta bakgrundsinformation till nuvarande händelser',
-'tooltip-sitesupport' => 'Stöd {{SITENAME}}',
-'tooltip-help' => 'The place to find out.',
-'tooltip-recentchanges' => 'Lista över senaste ändringar på wikin. [alt-r]',
-'tooltip-recentchangeslinked' => 'Senaste ändringar till sidor som länkar hit [alt-c]',
-'tooltip-whatlinkshere' => 'Lista alla wikisidor som länkar hit [alt-b]',
-'tooltip-specialpages' => 'Lista alla specialsidor [alt-q]',
-'tooltip-upload' => 'Ladda upp bilder och media filer [alt-u]',
-'tooltip-specialpage' => 'Detta är en specialsida, du kan inte ändra den.',
 'tooltip-minoredit' => 'Markera som en mindre ändring [alt-i]',
 'tooltip-save' => 'Spara dina ändringar changes [alt-s]',
 'tooltip-preview' => 'Förhandsgranska dina ändringar, gör detta innan du sparar! [alt-p]',
-'tooltip-contributions' => 'Visa lista över bidrag från den här änvändaren',
-'tooltip-emailuser' => 'Skicka ett mail till användaren',
-'tooltip-rss' => 'RSS-matning för den här sidan',
 'tooltip-compareselectedversions' => 'Visa skillnaden mellan de två markerade versionerna av den här sidan. [alt-v]',
 
 # Metadata
@@ -1005,70 +884,54 @@ wiki som kör MediaWiki-programvara, konverterad, eller bara sparad som syns sku
 
 # Attribution
 
-"anonymous" => "Anonym användare av $wgSitename",
-"siteuser" => "$wgSitename användare $1",
+"anonymous" => "Anonym användare av {{SITENAME}}",
+"siteuser" => "{{SITENAME}} användare $1",
 "lastmodifiedby" => "Den här sidan var senaste ändrad $1 av $2.",
 "and" => "och",
 "othercontribs" => "Baserad på arbete utfört av $1.",
-"siteusers" => "$wgSitename användare $1"
+"siteusers" => "{{SITENAME}} användare $1"
 
 );
 
 class LanguageSv extends LanguageUtf8 {
-	
+
 	function getNamespaces() {
 		global $wgNamespaceNamesSv;
 		return $wgNamespaceNamesSv;
 	}
-	
+
 	function getQuickbarSettings() {
 		global $wgQuickbarSettingsSv;
 		return $wgQuickbarSettingsSv;
 	}
-	
+
 	function getSkinNames() {
 		global $wgSkinNamesSv;
 		return $wgSkinNamesSv;
 	}
-	
-		
+
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		$d = (0 + substr( $ts, 6, 2 )) . " " .
 		$this->getMonthName( substr( $ts, 4, 2 ) ) . " " .
 		substr( $ts, 0, 4 );
 		return $d;
 	}
-	
+
 	// "." is used as the character to separate the
 	// hours from the minutes in the date output
 	function time( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		$t = substr( $ts, 8, 2 ) . "." . substr( $ts, 10, 2 );
 		return $t;
 	}
-	
+
 	function timeanddate( $ts, $adj = false ) {
 		return $this->date( $ts, $adj ) . " kl." . $this->time( $ts, $adj );
 	}
-	
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesSv;
-		return $wgValidSpecialPagesSv;
-	}
-	
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesSv;
-		return $wgSysopSpecialPagesSv;
-	}
-	
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesSv;
-		return $wgDeveloperSpecialPagesSv;
-	}
-	
+
 	function getMessage( $key ) {
 		global $wgAllMessagesSv;
 		if( isset( $wgAllMessagesSv[$key] ) ) {
@@ -1082,7 +945,7 @@ class LanguageSv extends LanguageUtf8 {
 		',' => "\xc2\xa0", // @bug 2749
 		'.' => ','
 	);
-	
+
 	function formatNum( $number, $year = false ) {
 		return $year ? $number : strtr($this->commafy($number), $this->digitTransTable);
 	}
diff --git a/languages/LanguageTa.php b/languages/LanguageTa.php
index 9b18b36a5055..8daf0a167a32 100644
--- a/languages/LanguageTa.php
+++ b/languages/LanguageTa.php
@@ -10,28 +10,21 @@ require_once( "LanguageUtf8.php" );
 # Language-specific text
 #--------------------------------------------------------------------------
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesTa = array(
-	-2	=> "ஊடகம்",
-	-1	=> "சிறப்பு",
-	0	=> "",
-	1	=> "பேச்சு",
-	2	=> "பயனர்",
-	3	=> "பயனர்_பேச்சு",
-	4	=> "விக்கிபீடியா",
-	5	=> "விக்கிபீடியா_பேச்சு",
-	6	=> "படிமம்",
-	7	=> "உருவப்_பேச்சு",
-	8	=> "மீடியாவிக்கி",
-	9	=> "மீடியாவிக்கி_பேச்சு",
-	10  => "Template",
-	11  => "Template_talk"
+	NS_MEDIA          => "ஊடகம்",
+	NS_SPECIAL        => "சிறப்பு",
+	NS_MAIN           => "",
+	NS_TALK           => "பேச்சு",
+	NS_USER           => "பயனர்",
+	NS_USER_TALK      => "பயனர்_பேச்சு",
+	NS_PROJECT        => "விக்கிபீடியா",
+	NS_PROJECT_TALK   => "விக்கிபீடியா_பேச்சு",
+	NS_IMAGE          => "படிமம்",
+	NS_IMAGE_TALK     => "உருவப்_பேச்சு",
+	NS_MEDIAWIKI      => "மீடியாவிக்கி",
+	NS_MEDIAWIKI_TALK => "மீடியாவிக்கி_பேச்சு",
+	NS_TEMPLATE       => "Template",
+	NS_TEMPLATE_TALK  => "Template_talk"
 
 ) + $wgNamespaceNamesEn;
 
@@ -45,82 +38,12 @@ require_once( "LanguageUtf8.php" );
 	'cologneblue' => "கொலோன் (Cologne) நீலம் Blue",
 	'smarty' => "பாடிங்டன் (Paddington)",
 	'montparnasse' => "மொண்ட்பார்னாசே (Montparnasse)",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
-
-/* private */ $wgMathNamesTa = array(
-	"எப்பொழுதும் PNG யிலாக்கு (render)",
-	"மிக எளிதாயின் HTML அல்லது PNG",
-	"முடியுமாயின் HTML அல்லது PNG",
-	" TeX ஆக விடு(உரை உலாவிகளுக்கு - text browsers)",
-	"நவீன உலாவிகளுக்கு சிபாரிசு செய்யப்பட்டது"
-);
+) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsTa = array(
 #	"முன்னுரிமை இல்லை",
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesTa = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "எனது பயனர் விருப்பத் தேர்வுகளை அமை",
-	"Watchlist"		=> "எனது கவனிப்புப் பட்டியல்",
-	"Recentchanges" => "அண்மையில் புதுப்பிக்கப்பட்ட பக்கங்கள்",
-	"Upload"		=> "படிமக் கோப்புகளைப் பதிவேற்று",
-	"Imagelist"		=> "படிமப் பட்டியல்",
-	"Listusers"		=> "பதியப்பட்ட பயனர்",
-	"Statistics"	=> "தளப் புள்ளிவிபரங்கள்",
-	"Randompage"	=> "குறியிலிக் கட்டுரை",
-
-	"Lonelypages"	=> "உறவிலிக் கட்டுரைகள்",
-	"Unusedimages"	=> "உறவிலிப் படிமங்கள்",
-	"Popularpages"	=> "பிரபல கட்டுரைகள்",
-	"Wantedpages"	=> "மிக வேண்டிய கட்டுரைகள்",
-	"Shortpages"	=> "குறுங் கட்டுரைகள்",
-	"Longpages"		=> "நீண்ட கட்டுரைகள்",
-	"Newpages"		=> "புதிதாக எழுதப்பட்ட கட்டுரைகள்",
-	"Ancientpages"	=> "மிகப் பழைய கட்டுரைகள்",
-	"Intl"		=> "மொழிகளுக்கிடையிலான இணைப்புகள்",
-	"Allpages"		=> "எல்லாப்பக்கங்களும் தலைப்புவழி",
-
-	"Ipblocklist"	=> "தடுக்கப்பட்ட பயனர் / ஐபி முகவரி",
-	"Maintenance" => "பராமரிப்புப் பக்கம்",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "புறநிலை நூல் மூலங்கள்",
-	"Categories" => "பக்க வகைகள்",
-	"Export"	=> "XML export",
-	"Version"	=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesTa = array(
-	"Blockip"		=> "பயனர் ஒருவரைத் தடு/ஐபி முகவரி",
-	"Asksql"		=> "தரவுத் தளத்தில் விபரமறி",
-	"Undelete"		=> "அழிக்கப்பட்ட பக்கங்களை மீள்வி"
-);
-
-/* private */ $wgDeveloperSpecialPagesTa = array(
-	"Lockdb"		=> "தரவுத் தளத்தைப் படிக்க மட்டும் (Read only) ஆக்கு",
-	"Unlockdb"		=> "தரவுத்தள எழுத்து அணுக்கத்தை மீட்டெடு (Restore)",
-);
-
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and 
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
 
 /* private */ $wgAllMessagesTa = array(
 
@@ -195,7 +118,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "விக்கிபீடியா:விபரம்",
 "help"			=> "உதவி",
 "helppage"		=> "விக்கிபீடியா:உதவி",
-"wikititlesuffix" => "விக்கிபீடியா",
 "bugreports"	=> "வழு அறிக்கை",
 "bugreportspage" => "விக்கிபீடியா:வழு அறிக்கைகள்",
 "faq"			=> "அடிக்கடி கேட்கப்படும் கேள்விகள்",
@@ -238,12 +160,11 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "($1 இலிருந்து மீள் வழிப்படுத்தப்பட்டது)",
 "lastmodified"	=> "இப்பக்கம் கடைசியாகத் திருத்த்ப்பட்டது $1.",
 "viewcount"		=> "இப்பக்கம் $1 முறை அணுகப்பட்டது .",
-"gnunote" => "<a class=internal href='/wiki/GNU_FDL'>GNU விடுதலை மனப்பாங்கொடு உருவானஆவணப்படுத்தல் அனுமதி வரைமுறையின் கீழ் எல்லா எழுத்தாக்கங்களும் கிடைக்கும்</a>.",
 "printsubtitle" => "({{SERVER}} இலிருந்து)",
 "protectedpage" => "பாதுகாக்கப்பட்ட பக்கம்",
 "administrators" => "விக்கிபீடியா:நிர்வாகிகள்",
 "sysoptitle"	=> "முறைமைச் செயற்படுத்துனர்(Sysop) அணுக்கம் வேண்டும்",
-"sysoptext"		=> "நீங்கள் கோரிய செயற்பாடுகள்  
+"sysoptext"		=> "நீங்கள் கோரிய செயற்பாடுகள்
  \"sysop\" நிலையிலுள்ள பயனர்களாலேயே செயற்படுத்த்ப்பட முடியும்.
  $1 பார்க்கவும்.",
 "developertitle" => "உருவாக்குனர் அணுக்கம் தேவை",
@@ -269,17 +190,17 @@ $1 பார்க்க.",
 "nosuchaction"	=> "அவ்வித செயற்பாடுகள் எதுவுமில்லை",
 "nosuchactiontext" => "யூஆர்எல்(URL) இனால் குறிப்பிடப்பட்ட செயற்பாடு விக்கிபீடியா மென்பொருளினால் அடையாளம் காணப்படவில்லை ",
 "nosuchspecialpage" => "அவ்வாறான சிறப்புப் பக்கங்கள் எதுவுமில்லை",
-"nospecialpagetext" => "நீங்கள் கோரிய விசேட பக்கம் விக்கிபீடியா மென்பொருளினால் அடையாளம் காணப்படவில்லை", 
+"nospecialpagetext" => "நீங்கள் கோரிய விசேட பக்கம் விக்கிபீடியா மென்பொருளினால் அடையாளம் காணப்படவில்லை",
 # General errors
 #
 "error"			=> "தவறு",
 "databaseerror" => "தரவுத்தள தவறு",
-"dberrortext"	=> "ஒரு தரவுத்தள வினவல் தொடரமைப்புத் தவறு ஏற்பட்டுள்ளது. 
+"dberrortext"	=> "ஒரு தரவுத்தள வினவல் தொடரமைப்புத் தவறு ஏற்பட்டுள்ளது.
 கடைசியாக முயற்சிக்கப்பட்ட தரவுத்தள வினவல்:
 <blockquote><tt>$1</tt></blockquote>
 செயலுக்குள்(function) இருந்து \"<tt>$2</tt>\".
 MySQL returned error \"<tt>$3: $4</tt>\".",
-"dberrortextcl" => "ஒரு தரவுத்தள வினவல் தொடரமைப்புத் தவறு ஏற்பட்டுள்ளது. 
+"dberrortextcl" => "ஒரு தரவுத்தள வினவல் தொடரமைப்புத் தவறு ஏற்பட்டுள்ளது.
 கடைசியாக முயற்சிக்கப்பட்ட தரவுத்தள வினவல்:
 \"$1\"
 செயலுக்குள்(function) இருந்து \"$2\".
@@ -302,7 +223,7 @@ MySQL returned error \"$3: $4\".\n",
 "filedeleteerror" => "கோப்பை நீக்க முடியவில்லை\"$1\".",
 "filenotfound"	=> "கோப்பைக் கண்டுபிடிக்க முடியவில்லை\"$1\".",
 "unexpected"	=> "எதிர்பாராத பெறுமானம்: \"$1\"=\"$2\".",
-"formerror"		=> "தவறு: படிவத்தை சமர்ப்பிக்க முடியவில்லை",	
+"formerror"		=> "தவறு: படிவத்தை சமர்ப்பிக்க முடியவில்லை",
 "badarticleerror" => "இச் செயற்பாட்டை இப்பக்கத்தில் செயற்படுத்த முடியாது.",
 "cannotdelete"	=> "குறிக்கப்பட்ட பக்கத்தையோ படிமத்தையோ நீக்க முடியாது. (வேறு யாராலோ ஏற்கெனவே நீக்கப்பட்டிருக்கலாம்.)",
 "badtitle"		=> "பழுதுள்ள தலைப்பு",
@@ -326,87 +247,85 @@ MySQL returned error \"$3: $4\".\n",
 நீங்கள் தொடர்ந்தும் விக்கிபீடியாவை அடையாளமின்றி உபயோகிக்கலாம், அல்லது அதே பயனராகவோ வேறு பயனராகவோ மீண்டும் புகுபதிகை செய்யலாம். உங்கள் உலவியின் இடைமாற்று (browser cache) அழிக்கப்படும்வரை சில பக்கங்கள் தொடர்ந்தும் புகுபதிகையில் உள்ளது போன்றே காட்சி தரும் என்பதைக் கவனிக்கவும்\n",
 
 "welcomecreation" => "<h2>வருக, $1!</h2><p>உங்கள் கணக்கு உருவாக்கப்பட்டுள்ளது.
-உங்கள் விக்கிபீடியா விருப்புகளை சொந்தமயப் (personalize) படுத்த மறவாதீர்கள்.", 
-"loginpagetitle" => "பயனர் புகுபதிகை", 
-"yourname" => "உங்கள் பயனர்பெயர்", 
-"yourpassword" => "உங்கள் கடவுச்சொல்", 
-"yourpasswordagain" => "கடவுச்சொல்லைத் திரும்ப எழுதவும்", 
-"newusersonly" => " (புதிய பயனர் மட்டும்)", 
-"remembermypassword" => "எனது கடவுச்சொல்லை அமர்வுகளிடையே (across sessions) ஞாபகத்தில் வைத்திருக்கவும்.", 
+உங்கள் விக்கிபீடியா விருப்புகளை சொந்தமயப் (personalize) படுத்த மறவாதீர்கள்.",
+"loginpagetitle" => "பயனர் புகுபதிகை",
+"yourname" => "உங்கள் பயனர்பெயர்",
+"yourpassword" => "உங்கள் கடவுச்சொல்",
+"yourpasswordagain" => "கடவுச்சொல்லைத் திரும்ப எழுதவும்",
+"newusersonly" => " (புதிய பயனர் மட்டும்)",
+"remembermypassword" => "எனது கடவுச்சொல்லை அமர்வுகளிடையே (across sessions) ஞாபகத்தில் வைத்திருக்கவும்.",
 "loginproblem" => "உங்கள் புகுபதிகை தொடர்பில் பிரச்சினை உண்டு.
-திரும்ப முயலவும்!", 
+திரும்ப முயலவும்!",
 "alreadyloggedin" => "பயனர் $1, நீங்கள் ஏற்கெனவே புகு பதிகையில் உள்ளீர்கள்!
-\n", 
-"areyounew" => "நீங்கள் விக்கிபீடியாவுக்குப் புதியவராயும், புதிய கணக்கொன்றைத் தொடங்க விரும்புபவராயுமிருந்தால், பயனர்பெயரைப் பதியுங்கள், பின்னர் கடவுச்சொல்லைப் பதிந்து அதை மீண்டும் பதியுங்கள். விரும்பினால் மின்னஞ்சல் முகவரியையும் கொடுங்கள்; கடவுச் சொல்லை மறந்துவிட்டால் அதை நீங்கள் கோரிப்பெறலாம். அப்பொழுது இப்பொழுது நீங்கள் தரும் முகவரிக்கே அது அனுப்பப்படும்.
-\n", 
-"login" => "புகுபதிகை", 
-"userlogin" => "புகுபதிகை", 
-"logout" => "விடுபதிகை", 
-"userlogout" => "விடுபதிகை", 
-"notloggedin" => "புகுபதிகையில் இல்லை", 
-"createaccount" => "புதிய கணக்கு உருவாக்கு", 
-"createaccountmail" => "மின்னஞ்சல் மூலம்", 
-"badretype" => "நீங்கள் பதிந்த கடவுச்சொல் பொருத்தமாக இல்லை.", 
-"userexists" => "நீங்கள் பதிந்த கடவுச் சொல் ஏற்கெனவே உபயோகத்தில் உள்ளது. தயவுசெய்து வேறு பெயர் தெரியவும்.", 
-"youremail" => "உங்கள் மின்னஞ்சல்*", 
-"yournick" => "உங்கள் அழைக்கும் பெயர் (கையொப்பத்துக்காக)", 
-"emailforlost" => "* விரும்பினால் மட்டும் மின்னஞ்சல் முகவரியைக் கொடுக்கவும். ஆனால் இது நீங்கள் உங்கள் மின்னஞ்சல் முகவரியை வெளிப்படுத்தாமலே மற்றவர்கள் இணையத்தளம் மூலம் உங்களைத் தொடர்புகொள்ள வழி வகுக்கும். அத்துடன் உங்கள் கடவுச்சொல்லை நீங்கள் மற்ந்துபோகும் சந்தர்ப்பங்களிலும் இது உதவும்.", 
-"loginerror" => "புகுபதிகைத் தவறு", "noname" => "நீங்கள் கொடுத்த பயனர் பெயர் செல்லுபடி இல்லை.", 
-"loginsuccesstitle" => "புகுபதிகை வெற்றி", 
-"loginsuccess" => "நீங்கள் இப்பொழுது \"$1\" ஆக விக்கிபீடியாவில் புகுபதிகை செய்துள்ளீர்கள்.", 
-"nosuchuser" => "\"$1\" பெயரில் பயனர் எவருமில்லை. எழுத்துப் பிழைகளைச் சரி பார்க்கவும், அல்லது பின்வரும் படிவத்தை உபயோகித்து புதிய பயனர் கணக்கொன்றை உருவாக்கவும்.", 
-"wrongpassword" => "நீங்கள் கொடுத்த கடவுச் சொல் சரியல்ல. மீண்டும் முயற்சிக்கவும்.", 
-"mailmypassword" => "புதிய கடவுச் சொல்லொன்றை அஞ்சல் செய்யவும்", 
-"passwordremindertitle" => "விக்கிபீடியாவிலிருந்து கடவுச் சொல் நினைவூட்டல்", 
-"passwordremindertext" => "யாரோ ஒருவர் (நீங்களாக இருக்கலாம், IP முகவரி $1 இலிருந்து) புதிய விக்கிபீடியா புகுபதிகை கடவுச்சொல் ஒன்று அனுப்பும்படி கோரியுள்ளார். பயனர் \"$2\" க்கான கடவுச்சொல் இப்பொழுது \"$3\". நீங்கள் புகுபதிகை செய்து கடவுச்சொல்லை மாற்றிக்கொள்ளவும்.", "noemail" => "பயனை \"$1\" க்கு மின்னஞ்சல் முகவரி எதுவும் பதியப்பட்டிருக்கவில்லை.", 
-"passwordsent" => "\"$1\" பெயரில் பதியப்பட்டுள்ள மின்னஞ்சல் முகவரிக்கு ஒரு புதிய கடவுச்சொல் அனுப்பப்பட்டுள்ளது. பெற்றுக்கொண்டதும் தயவுசெய்து மீண்டும் புகுபதிகை செய்யவும்.", 
-# Edit pages 
-"summary" => "சுருக்கம்", 
-"subject" => "உட்பொருள்/தலைப்புகள்", 
-"minoredit" => "இது ஒரு சிறு (minor) தொகுப்பு", 
-"watchthis" => "இக் கட்டுரையைக் கவனிக்கவும் (watch)", 
-"savearticle" => "பக்கத்தை சேமிக்கவும்", 
-"preview" => "முன்தோற்றம்", 
-"showpreview" => "முன்தோற்றம் காட்டு", 
-"blockedtitle" => "பயனர் தடுக்கப்பட்டுள்ளார்", 
-"blockedtext" => "உங்கள் பயனர் பெயர் அல்லது IP முகவரி $1 ஆல் தடுக்கப்பட்டுள்ளது. கொடுக்கப்பட்ட காரணம்: $2 
-இது பற்றிப் பேசுவதற்கு $1 ஐயோ அல்லது [[$wgMetaNamespace:Administrators|நிர்வாகிகளில்]] ஒருவரையோ நீங்கள் தொடர்புகொள்ளலாம். 
-பயனர் விருப்பத் தேர்வுகளில்</wiki/Special:Preferences> உங்களுடைய செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரி பதியப்பட்டிராவிட்டால் \"email this user\" வசதியை நீங்கள் உபயோகிக்க முடியாது என்பதைக் கவனிக்கவும். 
-உங்கள் IP முகவரி $3. தயவுசெய்து இந்த ஐபி முகவரியை விசாரிப்புகளைச் செய்யும்போது குறிப்பிடவும். 
+\n",
+"login" => "புகுபதிகை",
+"userlogin" => "புகுபதிகை",
+"logout" => "விடுபதிகை",
+"userlogout" => "விடுபதிகை",
+"notloggedin" => "புகுபதிகையில் இல்லை",
+"createaccount" => "புதிய கணக்கு உருவாக்கு",
+"createaccountmail" => "மின்னஞ்சல் மூலம்",
+"badretype" => "நீங்கள் பதிந்த கடவுச்சொல் பொருத்தமாக இல்லை.",
+"userexists" => "நீங்கள் பதிந்த கடவுச் சொல் ஏற்கெனவே உபயோகத்தில் உள்ளது. தயவுசெய்து வேறு பெயர் தெரியவும்.",
+"youremail" => "உங்கள் மின்னஞ்சல்*",
+"yournick" => "உங்கள் அழைக்கும் பெயர் (கையொப்பத்துக்காக)",
+"emailforlost" => "* விரும்பினால் மட்டும் மின்னஞ்சல் முகவரியைக் கொடுக்கவும். ஆனால் இது நீங்கள் உங்கள் மின்னஞ்சல் முகவரியை வெளிப்படுத்தாமலே மற்றவர்கள் இணையத்தளம் மூலம் உங்களைத் தொடர்புகொள்ள வழி வகுக்கும். அத்துடன் உங்கள் கடவுச்சொல்லை நீங்கள் மற்ந்துபோகும் சந்தர்ப்பங்களிலும் இது உதவும்.",
+"loginerror" => "புகுபதிகைத் தவறு", "noname" => "நீங்கள் கொடுத்த பயனர் பெயர் செல்லுபடி இல்லை.",
+"loginsuccesstitle" => "புகுபதிகை வெற்றி",
+"loginsuccess" => "நீங்கள் இப்பொழுது \"$1\" ஆக விக்கிபீடியாவில் புகுபதிகை செய்துள்ளீர்கள்.",
+"nosuchuser" => "\"$1\" பெயரில் பயனர் எவருமில்லை. எழுத்துப் பிழைகளைச் சரி பார்க்கவும், அல்லது பின்வரும் படிவத்தை உபயோகித்து புதிய பயனர் கணக்கொன்றை உருவாக்கவும்.",
+"wrongpassword" => "நீங்கள் கொடுத்த கடவுச் சொல் சரியல்ல. மீண்டும் முயற்சிக்கவும்.",
+"mailmypassword" => "புதிய கடவுச் சொல்லொன்றை அஞ்சல் செய்யவும்",
+"passwordremindertitle" => "விக்கிபீடியாவிலிருந்து கடவுச் சொல் நினைவூட்டல்",
+"passwordremindertext" => "யாரோ ஒருவர் (நீங்களாக இருக்கலாம், IP முகவரி $1 இலிருந்து) புதிய விக்கிபீடியா புகுபதிகை கடவுச்சொல் ஒன்று அனுப்பும்படி கோரியுள்ளார். பயனர் \"$2\" க்கான கடவுச்சொல் இப்பொழுது \"$3\". நீங்கள் புகுபதிகை செய்து கடவுச்சொல்லை மாற்றிக்கொள்ளவும்.", "noemail" => "பயனை \"$1\" க்கு மின்னஞ்சல் முகவரி எதுவும் பதியப்பட்டிருக்கவில்லை.",
+"passwordsent" => "\"$1\" பெயரில் பதியப்பட்டுள்ள மின்னஞ்சல் முகவரிக்கு ஒரு புதிய கடவுச்சொல் அனுப்பப்பட்டுள்ளது. பெற்றுக்கொண்டதும் தயவுசெய்து மீண்டும் புகுபதிகை செய்யவும்.",
+# Edit pages
+"summary" => "சுருக்கம்",
+"subject" => "உட்பொருள்/தலைப்புகள்",
+"minoredit" => "இது ஒரு சிறு (minor) தொகுப்பு",
+"watchthis" => "இக் கட்டுரையைக் கவனிக்கவும் (watch)",
+"savearticle" => "பக்கத்தை சேமிக்கவும்",
+"preview" => "முன்தோற்றம்",
+"showpreview" => "முன்தோற்றம் காட்டு",
+"blockedtitle" => "பயனர் தடுக்கப்பட்டுள்ளார்",
+"blockedtext" => "உங்கள் பயனர் பெயர் அல்லது IP முகவரி $1 ஆல் தடுக்கப்பட்டுள்ளது. கொடுக்கப்பட்ட காரணம்: $2
+இது பற்றிப் பேசுவதற்கு $1 ஐயோ அல்லது [[$wgMetaNamespace:Administrators|நிர்வாகிகளில்]] ஒருவரையோ நீங்கள் தொடர்புகொள்ளலாம்.
+பயனர் விருப்பத் தேர்வுகளில்</wiki/Special:Preferences> உங்களுடைய செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரி பதியப்பட்டிராவிட்டால் \"email this user\" வசதியை நீங்கள் உபயோகிக்க முடியாது என்பதைக் கவனிக்கவும்.
+உங்கள் IP முகவரி $3. தயவுசெய்து இந்த ஐபி முகவரியை விசாரிப்புகளைச் செய்யும்போது குறிப்பிடவும்.
 
 Note to AOL users
 
-குறிப்பிட்ட ஏஓஎல் (AOL) பயனர் ஒருவருடைய தொடர்ந்த விஷமச் செயல்கள் காரணமாக விக்கிபீடியா அடிக்கடி ஏஓஎல் (AOL) proxy யை தடுக்கிறது. துரதிர்ஷ்டவசமாக ஒரு proxy வழங்கனை பெருமளவு ஏஓஎல் (AOL) பயனர்கள் பயன்படுத்தக் கூடும், அதனால் அப்பாவி AOL பயனர்களும் அடிக்கடி தடுக்கப்படுகிறார்கள். இதனாலேற்படும் வசதியீனங்களுக்கு மன்னிப்புக் கோருகிறோம். இது உங்களுக்கு நிகழ்ந்திருந்தால், தயவுசெய்து ஒரு ஏஓஎல் (AOL) மின்னஞ்சல் முகவரியை உபயோகித்து, நிர்வாகியொருவருக்கு அஞ்சல் செயுங்கள். மேலே கொடுக்கப்பட்டுள்ள ஐபி முகவரியைக் குறிப்பிட மறவாதீர்கள்.", 
-"whitelistedittitle" => "தொகுப்பதற்கு புகுபதிகை (login) செய்யப்படவேண்டும்.", 
-"whitelistedittext" => " கட்டுரைகளைத் தொகுப்பதற்கு (edit) நீங்கள் புகுபதிகை (login) </wiki/Special:Userlogin>வேண்டும்.", 
-"whitelistreadtitle" => "வாசிப்பதற்கு புகுபதிகை (login) செய்ய வேண்டும்", 
-"whitelistreadtext" => " கட்டுரைகளை வாசிப்பதற்கு நீங்கள் புகுபதிகை (login) </wiki/Special:Userlogin> செய்யவேண்டும்.", 
-"whitelistacctitle" => "கணக்கொன்று உருவாக்குவதற்கு நீங்கள் அனுமதிக்கப்படவில்லை.", 
-"whitelistacctext" => "இந்த விக்கியில் கணக்கு ஏற்படுத்துவதற்கு, நீங்கள் log </wiki/Special:Userlogin> செய்வதுடன் உரிய அனுமதியும் பெற்றிருக்க வேண்டும்.", 
-"accmailtitle" => "கடவுச்சொல் அனுப்பப்பட்டுள்ளது.", 
-"accmailtext" => "'$1' உடைய கடவுச்சொல் $2 க்கு அனுப்பப்பட்டுள்ளது.", 
-"newarticle" => "(புதிது)", 
-"newarticletext" => "ஒரு இணைப்பினூடாக நீங்கள் வந்துள்ள இப் பக்கம் இன்னும் உருவாக்கப்படவில்லை. பக்கத்தை உருவாக்குவதற்குக் கீழேயுள்ள கட்டத்துள் தட்டச்சிடத் தொடங்குங்கள். (மேலதிக விபரங்களுக்கு உதவிப் பக்கங்களைப்</wiki/Wikipedia:Help> பார்க்கவும்). நீங்கள் தவறுதலாக இங்கே வந்திருந்தால், உங்கள் உலாவி (browser) யின் பின்னே (back) பொத்தானைச் சொடுக்கவும்.", 
-"anontalkpagetext" => "---- இது இன்னும் கணக்கொன்று ஏற்படுத்தாத அல்லது இதனை வழமையாகப் பயன்படுத்தாத பயனர்களுக்குரிய கலந்துரையாடல் பக்கமாகும். அதனால் நாங்கள் இவரை அடையாளம் காண்பதற்கு எண்சார்ந்த ஐபி (IP) முகவரி</wiki/IP_address>யை உபயோகிக்கிறோம். இவ்வாறான ஐபி (IP) முகவரிகள் பல பயனர்(user) களினால் பகிர்ந்துகொள்ளப்படலாம். நீங்கள் ஒரு முகவரியற்ற பயனராயிருந்து, தொடர்பற்ற கருத்துக்கள் உங்களைக் குறித்துச் சொல்லப்பட்டிருப்பதாக நீங்கள் உணர்ந்தால், முகவரியற்ற ஏனைய பயனர்களுடனான குழப்பங்களை எதிர்காலத்தில் தவிர்ப்பதற்கு, தயவுசெய்து கணக்கொன்றை ஏற்படுத்துங்கள் அல்லது புகுபதிகை (login) செய்யுங்கள் </wiki/Special:Userlogin>. ", 
-"noarticletext" => "(இப் பக்கத்தில் தற்பொழுது எழுத்துக்கள் எதுவுமில்லை)", 
-"updated" => "(இற்றைப்படுத்தப்பட்டது Updated)", 
-"note" => "Note: ", "previewnote" => "இது ஒரு முன்தோற்றம் (preview) மட்டுமே என்பதையும், இன்னும் சேமிக்கப்படவில்லை என்பதையும் ஞாபகத்தில் வைத்திருக்கவும்!", 
-"previewconflict" => "இந்த முன்தோற்றம் உரை தொகுப்புப் பகுதியின் மேற்பகுதியிலுள்ள உரையைப் பிரதிபலிக்கின்றது. நீங்கள் இப்பொழுது சேமித்தால் மேற்படி தோற்றமே கிடைக்கும்.", 
-"editing" => "தொகுத்தல் (Editting) $1", 
-"editingsection" => "தொகுத்தல் (Editting) $1 (பிரிவு)", 
-"editingcomment" => "தொகுத்தல் (Editting) $1 (கருத்து)", 
-"editconflict" => "முரண்பாடுகளைத் தொகுக்கவும் (edit): $1", 
-"explainconflict" => "நீங்கள் தொகுக்கத் தொடங்கியதின் பின்னர் யாரோஒருவர் இப் பக்கங்களில் மாற்றங்கள் செய்துள்ளார். உரைப் பகுதியின் (text area ) மேற்பக்கம் தற்போதுள்ள உரைகளைக் கொண்டிருக்கும், நீங்கள் செய்த மாற்றங்கள் உரையின் கீழ்ப்பக்கம் காணப்படும். நீங்கள் உங்களுடைய மாற்றங்களை ஏற்கெனவேயிருக்கும் உரையுடன் ஒருங்கிணைக்க வேண்டியிருக்கும். 
+குறிப்பிட்ட ஏஓஎல் (AOL) பயனர் ஒருவருடைய தொடர்ந்த விஷமச் செயல்கள் காரணமாக விக்கிபீடியா அடிக்கடி ஏஓஎல் (AOL) proxy யை தடுக்கிறது. துரதிர்ஷ்டவசமாக ஒரு proxy வழங்கனை பெருமளவு ஏஓஎல் (AOL) பயனர்கள் பயன்படுத்தக் கூடும், அதனால் அப்பாவி AOL பயனர்களும் அடிக்கடி தடுக்கப்படுகிறார்கள். இதனாலேற்படும் வசதியீனங்களுக்கு மன்னிப்புக் கோருகிறோம். இது உங்களுக்கு நிகழ்ந்திருந்தால், தயவுசெய்து ஒரு ஏஓஎல் (AOL) மின்னஞ்சல் முகவரியை உபயோகித்து, நிர்வாகியொருவருக்கு அஞ்சல் செயுங்கள். மேலே கொடுக்கப்பட்டுள்ள ஐபி முகவரியைக் குறிப்பிட மறவாதீர்கள்.",
+"whitelistedittitle" => "தொகுப்பதற்கு புகுபதிகை (login) செய்யப்படவேண்டும்.",
+"whitelistedittext" => " கட்டுரைகளைத் தொகுப்பதற்கு (edit) நீங்கள் புகுபதிகை (login) </wiki/Special:Userlogin>வேண்டும்.",
+"whitelistreadtitle" => "வாசிப்பதற்கு புகுபதிகை (login) செய்ய வேண்டும்",
+"whitelistreadtext" => " கட்டுரைகளை வாசிப்பதற்கு நீங்கள் புகுபதிகை (login) </wiki/Special:Userlogin> செய்யவேண்டும்.",
+"whitelistacctitle" => "கணக்கொன்று உருவாக்குவதற்கு நீங்கள் அனுமதிக்கப்படவில்லை.",
+"whitelistacctext" => "இந்த விக்கியில் கணக்கு ஏற்படுத்துவதற்கு, நீங்கள் log </wiki/Special:Userlogin> செய்வதுடன் உரிய அனுமதியும் பெற்றிருக்க வேண்டும்.",
+"accmailtitle" => "கடவுச்சொல் அனுப்பப்பட்டுள்ளது.",
+"accmailtext" => "'$1' உடைய கடவுச்சொல் $2 க்கு அனுப்பப்பட்டுள்ளது.",
+"newarticle" => "(புதிது)",
+"newarticletext" => "ஒரு இணைப்பினூடாக நீங்கள் வந்துள்ள இப் பக்கம் இன்னும் உருவாக்கப்படவில்லை. பக்கத்தை உருவாக்குவதற்குக் கீழேயுள்ள கட்டத்துள் தட்டச்சிடத் தொடங்குங்கள். (மேலதிக விபரங்களுக்கு உதவிப் பக்கங்களைப்</wiki/Wikipedia:Help> பார்க்கவும்). நீங்கள் தவறுதலாக இங்கே வந்திருந்தால், உங்கள் உலாவி (browser) யின் பின்னே (back) பொத்தானைச் சொடுக்கவும்.",
+"anontalkpagetext" => "---- இது இன்னும் கணக்கொன்று ஏற்படுத்தாத அல்லது இதனை வழமையாகப் பயன்படுத்தாத பயனர்களுக்குரிய கலந்துரையாடல் பக்கமாகும். அதனால் நாங்கள் இவரை அடையாளம் காண்பதற்கு எண்சார்ந்த ஐபி (IP) முகவரி</wiki/IP_address>யை உபயோகிக்கிறோம். இவ்வாறான ஐபி (IP) முகவரிகள் பல பயனர்(user) களினால் பகிர்ந்துகொள்ளப்படலாம். நீங்கள் ஒரு முகவரியற்ற பயனராயிருந்து, தொடர்பற்ற கருத்துக்கள் உங்களைக் குறித்துச் சொல்லப்பட்டிருப்பதாக நீங்கள் உணர்ந்தால், முகவரியற்ற ஏனைய பயனர்களுடனான குழப்பங்களை எதிர்காலத்தில் தவிர்ப்பதற்கு, தயவுசெய்து கணக்கொன்றை ஏற்படுத்துங்கள் அல்லது புகுபதிகை (login) செய்யுங்கள் </wiki/Special:Userlogin>. ",
+"noarticletext" => "(இப் பக்கத்தில் தற்பொழுது எழுத்துக்கள் எதுவுமில்லை)",
+"updated" => "(இற்றைப்படுத்தப்பட்டது Updated)",
+"note" => "Note: ", "previewnote" => "இது ஒரு முன்தோற்றம் (preview) மட்டுமே என்பதையும், இன்னும் சேமிக்கப்படவில்லை என்பதையும் ஞாபகத்தில் வைத்திருக்கவும்!",
+"previewconflict" => "இந்த முன்தோற்றம் உரை தொகுப்புப் பகுதியின் மேற்பகுதியிலுள்ள உரையைப் பிரதிபலிக்கின்றது. நீங்கள் இப்பொழுது சேமித்தால் மேற்படி தோற்றமே கிடைக்கும்.",
+"editing" => "தொகுத்தல் (Editting) $1",
+"editingsection" => "தொகுத்தல் (Editting) $1 (பிரிவு)",
+"editingcomment" => "தொகுத்தல் (Editting) $1 (கருத்து)",
+"editconflict" => "முரண்பாடுகளைத் தொகுக்கவும் (edit): $1",
+"explainconflict" => "நீங்கள் தொகுக்கத் தொடங்கியதின் பின்னர் யாரோஒருவர் இப் பக்கங்களில் மாற்றங்கள் செய்துள்ளார். உரைப் பகுதியின் (text area ) மேற்பக்கம் தற்போதுள்ள உரைகளைக் கொண்டிருக்கும், நீங்கள் செய்த மாற்றங்கள் உரையின் கீழ்ப்பக்கம் காணப்படும். நீங்கள் உங்களுடைய மாற்றங்களை ஏற்கெனவேயிருக்கும் உரையுடன் ஒருங்கிணைக்க வேண்டியிருக்கும்.
  \"Save page\" ஐ அழுத்தும்போது உரைப்பகுதியின் மேற்பக்கத்திலுள்ள உரை மட்டுமே சேமிக்கப்படும்.<br />",
 
-"yourtext" => "உங்கள் உரை", 
-"storedversion" => "சேமிக்கப்பட்ட பதிப்பு", 
-"editingold" => "எச்சரிக்கை: நீங்கள் தொகுத்துக்கொண்டிருப்பது இப் பக்கத்தின் பழைய திருத்தமொன்றை(revision)யாகும். இதை நீங்கள் சேமித்தால், மேற்படி திருத்தத்தின் பின்பு நீங்கள் செய்த மாற்றங்கள் அனைத்தும் இழக்கப்படும்.", 
-"yourdiff" => "வித்தியாசங்கள்", 
-"copyrightwarning" => "விக்கிபீடியாவுக்கான ஆக்கங்கள் அனைத்தும் ஜிஎன்யூ விடுதலை மனப்பாங்கொடு உருவான ஆவண அனுமதி (GNU Free Documentation License) முறையின் கீழ் வழங்கப்பட்டதாகவே கருதப்படும் என்பதைத் தயவு செய்து கவனிக்கவும். (விபரங்களுக்கு $1 ஐப் பார்க்க). 
+"yourtext" => "உங்கள் உரை",
+"storedversion" => "சேமிக்கப்பட்ட பதிப்பு",
+"editingold" => "எச்சரிக்கை: நீங்கள் தொகுத்துக்கொண்டிருப்பது இப் பக்கத்தின் பழைய திருத்தமொன்றை(revision)யாகும். இதை நீங்கள் சேமித்தால், மேற்படி திருத்தத்தின் பின்பு நீங்கள் செய்த மாற்றங்கள் அனைத்தும் இழக்கப்படும்.",
+"yourdiff" => "வித்தியாசங்கள்",
+"copyrightwarning" => "விக்கிபீடியாவுக்கான ஆக்கங்கள் அனைத்தும் ஜிஎன்யூ விடுதலை மனப்பாங்கொடு உருவான ஆவண அனுமதி (GNU Free Documentation License) முறையின் கீழ் வழங்கப்பட்டதாகவே கருதப்படும் என்பதைத் தயவு செய்து கவனிக்கவும். (விபரங்களுக்கு $1 ஐப் பார்க்க).
 
 உங்களுடைய எழுத்துக்கள் கடுமையாகத் தொகுக்கப்படுவதையோ, விரும்பியபடி விநியோகிக்கப்படுவதையோ நீங்கள் விரும்பாவிடில் இங்கே சமர்ப்பிக்காதீர்.<br />
-அத்துடன் நீங்களே இதை எழுதியதாகவோ, அல்லது வேறு பொதுக் களம் (domain) அல்லது அது போன்ற விடுதலையளிக்கும் மூலங்களிலிருந்து பிரதி பண்ணியிருப்பதாகவோ உறுதி கூறுகிறீர்கள். 
+அத்துடன் நீங்களே இதை எழுதியதாகவோ, அல்லது வேறு பொதுக் களம் (domain) அல்லது அது போன்ற விடுதலையளிக்கும் மூலங்களிலிருந்து பிரதி பண்ணியிருப்பதாகவோ உறுதி கூறுகிறீர்கள்.
 <strong>பதிப்புரிமையுள்ள ஆக்கங்களை அனுமதியின்றி சமர்ப்பிக்க வேண்டாம்!</strong>",
 "longpagewarning" => "<strong>எச்சரிக்கை: இந்தப் பக்கம் $1 கிலோபைட்ஸ் நீளமானது; 32kb யை அண்மிக்கும் அல்லது அதிலும் கூடிய அளவுள்ள பக்கங்களைத் தொகுப்பதில் சில உலாவிகளுக்கு (browsers) பிரச்சினை உண்டு.
 தயவுசெய்து பக்கங்களைச் சிறிய பகுதிகளாகப் பிரிப்பது பற்றிக் கவனத்தில் எடுக்கவும்.</strong>",
@@ -480,7 +399,7 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 
 உங்கள் விருப்பத் தேர்வுகளை விளங்கிக் கொள்ள [[Wikipedia:User preferences help]] ஐப் பார்க்க.",
 "prefsreset"	=> "உங்கள் விருப்புகள் சேமிப்பிலிருந்து மீட்டமைக்கப்பட்டுள்ளன (reset).",
-"qbsettings"	=> "விரைவுச் சட்ட அமைவுகள்", 
+"qbsettings"	=> "விரைவுச் சட்ட அமைவுகள்",
 "changepassword" => "கடவுச்சொல்லை மாற்று",
 "skin"			=> "தோல் (Skin)",
 "math"			=> "பதிப்புவரை கணிதம் (Rendering math)",
@@ -517,50 +436,50 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 #
 "changes" => "மாற்றங்கள்",
 "recentchanges" => "அண்மைய மாற்றங்கள்",
-"recentchangestext" => 
+"recentchangestext" =>
 "விக்கிபீடியாவுக்கு, மிக அண்மையில் செய்யப்பட்ட மாற்றங்களை, இந்தப் பக்கத்தில் கண்டுபிடிக்கவும்.<br />[[Wikipedia:Welcome,_newcomers|வருக, புது வருனர்களே]]!
 தயவுசெய்து பின்வரும் பக்கங்களை ஒருமுறை பாருங்கள்: [[wikipedia:FAQ|விக்கிபீடியா அடிக்கடி கேட்கப்படும் கேள்விகள்( FAQ)]],
 [[Wikipedia:Policies and guidelines|விக்கிபீடியா கொள்கை]]
 (விசேடமாக [[wikipedia:Naming conventions|பெயரிடல் மரபு]],
 [[wikipedia:Neutral point of view|நடுநிலை நோக்கு]]),
 அத்துடன் [[wikipedia:Most common Wikipedia faux pas|மிகப் பொதுவான விக்கிபீடியா ஒழுங்குமுறைப் பிறழ்வுகள்]].
- 
-விக்கிபீடியா வெற்றிபெறுவதை நீங்கள் பார்க்க வேண்டுமானால், மற்றவர்களுடைய பதிப்புரிமையினால் </wiki/Wikipedia:Copyrights> கட்டுப்படுத்தப்பட்டுள்ள ஆக்கங்களை இதிலே சேர்க்காதிருப்பது முக்கியமாகும். 
-சட்டம் சார்ந்த பொறுப்பு (liability) இத் திட்டத்தைப் பெரிதும் பாதிக்கும், எனவே தயவுசெய்து இவ்வாறு செய்யாதீர். அண்மைய மீ (meta) கலந்துரையாடலைப் <http://meta.wikipedia.org/wiki/Special:Recentchanges> பார்க்கவும்.", 
-"rcloaderr" => "அண்மைய மாற்றங்களை ஏற்றுதல்(Loading).", 
-"rcnote" => "கீழே காணப்படுவது கடைசி $2 நாட்களில் செய்யப்பட்ட $1 மாற்றங்களாகும்.", 
-"rcnotefrom" => "கீழே காணப்படுவது $2 இலிருந்து செய்யப்பட்ட மாற்றங்கள் ($1வரை காட்டப்பட்டுள்ளது).", 
-"rclistfrom" => "$1 தொடக்கம் செய்யப்பட்ட புதிய மாற்றங்களைக் காட்டவும்", 
-"rclinks" => "கடைசி $2 மணித்தியாலங்கள் / கடைசி $3 நாட்களில் செய்யப்பட்ட கடைசி $1 மாற்றங்களைக் காட்டு", 
-"rclinks" => "கடைசி $2 நாட்களில் கடைசி $1 மாற்றங்களைக் காட்டு .", 
-"rclinks" => "கடைசி $2 நாட்களில் செய்யப்பட்ட கடைசி $1 மற்றங்களைக் காட்டு; $3 சிறிய தொகுப்புகள்", "rchide" => "$4 படிவங்களில்; $1 சிறிய தொகுப்புக்கள்; $2 இரண்டாம்தர பெயர்வெளிகள்(namespaces); $3 பல்லினத் தொகுப்புகள்.", 
-"rcliu" => "; $1 புகுபதிகை செய்த பயனர்களிடமிருந்தான தொகுப்புகள்", 
-"diff" => "வேறுபாடு", 
-"hist" => "வரலாறு", 
-"hide" => "மறை", 
-"show" => "காட்டு", 
-"tableform" => "அட்டவணை", 
-"listform" => "பட்டியல்", 
-"nchanges" => "$1 மாற்றங்கள்", 
-"minoreditletter" => "M", 
-"newpageletter" => "N", 
-# Upload 
-"upload" => "கோப்பைப் பதிவேற்று (Upload file)", 
-"uploadbtn" => "கோப்பைப் பதிவேற்று (Upload file)", 
-"uploadlink" => "படிமங்களைப் பதிவேற்று (Upload images)", 
-"reupload" => "மீளப் பதிவேற்று (Re-upload)", 
-"reuploaddesc" => "பதிவேற்றும் படிவத்துக்கு மீளச் செல்.", 
-"uploadnologin" => "புகுபதிகை (login) செய்யப்படவில்லை ", 
+
+விக்கிபீடியா வெற்றிபெறுவதை நீங்கள் பார்க்க வேண்டுமானால், மற்றவர்களுடைய பதிப்புரிமையினால் </wiki/Wikipedia:Copyrights> கட்டுப்படுத்தப்பட்டுள்ள ஆக்கங்களை இதிலே சேர்க்காதிருப்பது முக்கியமாகும்.
+சட்டம் சார்ந்த பொறுப்பு (liability) இத் திட்டத்தைப் பெரிதும் பாதிக்கும், எனவே தயவுசெய்து இவ்வாறு செய்யாதீர். அண்மைய மீ (meta) கலந்துரையாடலைப் <http://meta.wikipedia.org/wiki/Special:Recentchanges> பார்க்கவும்.",
+"rcloaderr" => "அண்மைய மாற்றங்களை ஏற்றுதல்(Loading).",
+"rcnote" => "கீழே காணப்படுவது கடைசி $2 நாட்களில் செய்யப்பட்ட $1 மாற்றங்களாகும்.",
+"rcnotefrom" => "கீழே காணப்படுவது $2 இலிருந்து செய்யப்பட்ட மாற்றங்கள் ($1வரை காட்டப்பட்டுள்ளது).",
+"rclistfrom" => "$1 தொடக்கம் செய்யப்பட்ட புதிய மாற்றங்களைக் காட்டவும்",
+"rclinks" => "கடைசி $2 மணித்தியாலங்கள் / கடைசி $3 நாட்களில் செய்யப்பட்ட கடைசி $1 மாற்றங்களைக் காட்டு",
+"rclinks" => "கடைசி $2 நாட்களில் கடைசி $1 மாற்றங்களைக் காட்டு .",
+"rclinks" => "கடைசி $2 நாட்களில் செய்யப்பட்ட கடைசி $1 மற்றங்களைக் காட்டு; $3 சிறிய தொகுப்புகள்", "rchide" => "$4 படிவங்களில்; $1 சிறிய தொகுப்புக்கள்; $2 இரண்டாம்தர பெயர்வெளிகள்(namespaces); $3 பல்லினத் தொகுப்புகள்.",
+"rcliu" => "; $1 புகுபதிகை செய்த பயனர்களிடமிருந்தான தொகுப்புகள்",
+"diff" => "வேறுபாடு",
+"hist" => "வரலாறு",
+"hide" => "மறை",
+"show" => "காட்டு",
+"tableform" => "அட்டவணை",
+"listform" => "பட்டியல்",
+"nchanges" => "$1 மாற்றங்கள்",
+"minoreditletter" => "M",
+"newpageletter" => "N",
+# Upload
+"upload" => "கோப்பைப் பதிவேற்று (Upload file)",
+"uploadbtn" => "கோப்பைப் பதிவேற்று (Upload file)",
+"uploadlink" => "படிமங்களைப் பதிவேற்று (Upload images)",
+"reupload" => "மீளப் பதிவேற்று (Re-upload)",
+"reuploaddesc" => "பதிவேற்றும் படிவத்துக்கு மீளச் செல்.",
+"uploadnologin" => "புகுபதிகை (login) செய்யப்படவில்லை ",
 "uploadnologintext" => "கோப்புகளைப் பதிவேற்றம் செய்வதற்கு நீங்கள்[[Special:Userlogin|புகுபதிகை செய்திருக்க வேண்டும்]].",
-"uploaderror" => "ஏற்றுத் தவறு", 
-"uploadtext" => "நிறுத்தவும்! இங்கே பதிவேற்றம் செய்யுமுன், விக்கிபீடியாவின் [[Project:Image_use_policy|படிமம் பயன்படுத்தற் கொள்கை]] யை வாசித்துப் பின்பற்றுவதை உறுதிப்படுத்திக் கொள்ளவும். 
-நீங்கள் குறித்த பெயருடைய கோப்பு எற்கெனவே விக்கிபீடியாவில் இருக்குமாயின், அது எச்சரிக்கை கொடாமல் பிரதியீடு செய்யப்படும். எனவே கோப்பொன்றை இற்றைப்படுத்துவது (update) உங்கள் நோக்கமாக இல்லாவிடில், அதே பெயரில் வேறு கோப்பு உள்ளதா என முதலில் அறிந்து கொள்ளவும். 
-முன்னர் பதிவேற்றம் செய்யப்பட்ட படிமங்களைப் பார்ப்பதற்கு அல்லது தேடுவதற்கு, [[Special:Imagelist|பதிவேற்றம் செய்யப்பட்ட படிமங்களின் பட்டிய]] லுக்குச் செல்லவும். பதிவேற்றங்களும் நீக்கல்களும் [[Project:Upload_log|பதிவேற்றப் பதிகையில் (upload log)]] பதியப்பட்டுள்ளன. 
-உங்கள் கட்டுரைகளில் பயன்படவுள்ள புதிய படிமங்களைப் பதிவேற்றுவதற்கு கீழேயுள்ள படிவத்தைப் பயன்படுத்தவும். பெரும்பாலான உலவிகளில், கோப்புத் திறக்கும் உரையாடல் பெட்டியைக் காட்டும் உங்கள் இயக்க முறைமையின் (operating system) இயல்பான ஒரு \"Browse...\" பொத்தானைக் காணலாம்.ஒரு கோப்பைத் தெரிவுசெய்யும்பொது, அதன் பெயர், பொத்தானுக்கு அருகிலுள்ள உரைப்புலத்தில் (text field) நிரப்பப்படும். கோப்பைப் பதிவேற்றம் செய்வதன் மூலம்எந்தப் பதிப்புரிமையையும் மீற்வில்லை என்பதை உறுதிப்படுத்த அதற்குரிய கட்டத்திலும் நீங்கள் குறியிடவேண்டும். பதிவேற்றத்தை நிறைவுசெய்வதற்கு \"Upload\" பொத்தானை அழுத்தவும். உங்கள் வலையக இணைப்பு வேகம் குறைந்ததாக இருப்பின், இதற்குச் சிறிது நேரன் எடுக்கக்கூடும். 
+"uploaderror" => "ஏற்றுத் தவறு",
+"uploadtext" => "நிறுத்தவும்! இங்கே பதிவேற்றம் செய்யுமுன், விக்கிபீடியாவின் [[Project:Image_use_policy|படிமம் பயன்படுத்தற் கொள்கை]] யை வாசித்துப் பின்பற்றுவதை உறுதிப்படுத்திக் கொள்ளவும்.
+நீங்கள் குறித்த பெயருடைய கோப்பு எற்கெனவே விக்கிபீடியாவில் இருக்குமாயின், அது எச்சரிக்கை கொடாமல் பிரதியீடு செய்யப்படும். எனவே கோப்பொன்றை இற்றைப்படுத்துவது (update) உங்கள் நோக்கமாக இல்லாவிடில், அதே பெயரில் வேறு கோப்பு உள்ளதா என முதலில் அறிந்து கொள்ளவும்.
+முன்னர் பதிவேற்றம் செய்யப்பட்ட படிமங்களைப் பார்ப்பதற்கு அல்லது தேடுவதற்கு, [[Special:Imagelist|பதிவேற்றம் செய்யப்பட்ட படிமங்களின் பட்டிய]] லுக்குச் செல்லவும். பதிவேற்றங்களும் நீக்கல்களும் [[Project:Upload_log|பதிவேற்றப் பதிகையில் (upload log)]] பதியப்பட்டுள்ளன.
+உங்கள் கட்டுரைகளில் பயன்படவுள்ள புதிய படிமங்களைப் பதிவேற்றுவதற்கு கீழேயுள்ள படிவத்தைப் பயன்படுத்தவும். பெரும்பாலான உலவிகளில், கோப்புத் திறக்கும் உரையாடல் பெட்டியைக் காட்டும் உங்கள் இயக்க முறைமையின் (operating system) இயல்பான ஒரு \"Browse...\" பொத்தானைக் காணலாம்.ஒரு கோப்பைத் தெரிவுசெய்யும்பொது, அதன் பெயர், பொத்தானுக்கு அருகிலுள்ள உரைப்புலத்தில் (text field) நிரப்பப்படும். கோப்பைப் பதிவேற்றம் செய்வதன் மூலம்எந்தப் பதிப்புரிமையையும் மீற்வில்லை என்பதை உறுதிப்படுத்த அதற்குரிய கட்டத்திலும் நீங்கள் குறியிடவேண்டும். பதிவேற்றத்தை நிறைவுசெய்வதற்கு \"Upload\" பொத்தானை அழுத்தவும். உங்கள் வலையக இணைப்பு வேகம் குறைந்ததாக இருப்பின், இதற்குச் சிறிது நேரன் எடுக்கக்கூடும்.
 புகைப்படப் படிமங்களுக்கு JPEG யும், வரைபடங்களுக்கும் ஏனைய குறியீட்டுப் (iconic) படிமங்களுக்கும் PNG யும், ஒலிக் கோப்புகளுக்கு OGG யும் விரும்பத்தக்க வடிவங்களாகும்.
 
 
-குழ்ப்பத்தைத் தவிர்ப்பதற்குத் தயவுசெய்து உங்கள் கோப்புகளுக்கு விபரமாகப் பெயரிடவும்.உங்கள் கட்டுரைகளில் படிமங்களைச் சேர்ப்பதற்கு, 
+குழ்ப்பத்தைத் தவிர்ப்பதற்குத் தயவுசெய்து உங்கள் கோப்புகளுக்கு விபரமாகப் பெயரிடவும்.உங்கள் கட்டுரைகளில் படிமங்களைச் சேர்ப்பதற்கு,
 '''<nowiki>[[image:file.jpg]]</nowiki>''' அல்லது '''<nowiki>[[image:file.png|alt text]]</nowiki>''' இணைப்பு வடிவத்தையும், ஒலிகளுக்கு '''<nowiki>[[media:file.ogg]]</nowiki>''' இணைப்புவடிவத்தையும் பயன்படுத்தவும்.
 
 விக்கிபீடியா பக்கங்களைப் பொறுத்தவரை, கலைக் கழஞ்சியத்துக்கு உதவும் என்று மற்றவர்கள் கருதினால், உங்கள் பதிவேற்றத்தைத் தொகுக்கவோ அல்லது நீக்கவோ முடியும். அத்துடன் நீங்கள் இந்த முறைமையைத் துஷ்பிரயோகம் செய்தால், பதிவேற்றம் செய்வதிலிருந்து தடுக்கப்படவும் கூடும் என்பதையும் கவனிக்கவும்.",
@@ -576,11 +495,9 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 "filedesc"		=> "சுருக்கம்",
 "filestatus" => "பதிப்புரிமை நிலை",
 "filesource" => "மூலம்",
-"affirmation"	=> "இக் கோப்பிற்கான பதிப்புரிமை பெற்றவர் $1 இன் நிபந்தனைகளுக்கு (terms) அமைய அனுமதிப் பத்திரம் தரச் சம்மதித்திருக்கிறார் என்பதை நான் உறுதிப்படுத்துகின்றேன்.",
 "copyrightpage" => "விக்கிபீடியா:பதிப்புரிமை",
 "copyrightpagename" => "விக்கிபீடியா பதிப்புரிமை",
 "uploadedfiles"	=> "ஏற்றப்பட்ட (Uploaded) கோப்புகள்",
-"noaffirmation" => "உங்கள் பதிவேற்றம் (uploading) பதிப்புரிமை எதனையும் மீறவில்லையென உறுதி கூற வேண்டும்.",
 "ignorewarning"	=> "எப்படியானாலும் எச்சரிக்கையைக் கவனியாது கோப்பைச் சேமி.",
 "minlength"		=> "படிமத்தின் (Image) பெயர் குறைந்தது மூன்று எழுத்துக்களாவது இருக்க வேண்டும்.",
 "badfilename"	=> "படிமப் (Image) பெயர் \"$1\" ஆக மாற்றப்பட்டுள்ளது.",
@@ -687,84 +604,82 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 ஏனைய பயனர்களுக்கு மின்னஞ்சல் அனுப்பக்கூடியத்தாக செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரியொன்றும் உங்களுடைய  [[Special:Preferences|விருப்பத் தெரிவுகளில்]] கொடுபட்டிருக்கவேண்டும்.",
 "emailuser"		=> "இப் பயனருக்கு மின்னஞ்சல் செய்",
 "emailpage"		=> "மின்னஞ்சல் பயனர்",
-"emailpagetext"	=> "இப் பயனர் ஒரு செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரியை அவரது பயனர் விருப்பத்தேர்வுகளில் கொடுத்திருந்தால், கீழ் வரும் படிவம் ஒரு தனித்த செய்தியை அனுப்பும். 
+"emailpagetext"	=> "இப் பயனர் ஒரு செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரியை அவரது பயனர் விருப்பத்தேர்வுகளில் கொடுத்திருந்தால், கீழ் வரும் படிவம் ஒரு தனித்த செய்தியை அனுப்பும்.
 பயனர் விருப்பத்தேர்வுகளில் நீங்கள் கொடுத்துள்ள மின்னஞ்சல் முகவரி, பெறுனர் பதில் எழுத முடியும் வகையில், அஞ்சலின் \"From\" முகவரியாகக் காட்சி தரும்.",
 "noemailtitle"	=> "மின்னஞ்சல் முகவரி இல்லை",
-"noemailtext" => "இப் பயனர் ஒரு செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரியைக் குறிப்பிடவில்லை அல்லது பிற பயனர்களிடமிருந்து மின்னஞ்சல் பெறும் விருப்பத் தேர்வைத் தெரிவு செய்யவில்லை.", 
-"emailfrom" => "அனுப்புனர்", 
-"emailto" => "பெறுனர்", 
-"emailsubject" => "உட்பொருள்", 
-"emailmessage" => "செய்தி", 
-"emailsend" => "அனுப்பு", 
-"emailsent" => "மின்னஞ்சல் அனுப்பப்பட்டது", 
-"emailsenttext" => "உங்கள் மின்னஞ்சல் செய்தி அனுப்பப்பட்டது.", 
-# Watchlist 
-"watchlist" => "என்னுடைய கவனிப்புப் பட்டியல்(watchlist)", 
-"watchlistsub" => "(பயனர்\"$1\"க்காக)", 
-"nowatchlist" => "உங்களுடைய கவனிப்புப் பட்டியலில் ஒரு விடயமும் இல்லை.", 
-"watchnologin" => "புகுபதிகை செயப்படவில்லை", 
+"noemailtext" => "இப் பயனர் ஒரு செல்லுபடியாகக்கூடிய மின்னஞ்சல் முகவரியைக் குறிப்பிடவில்லை அல்லது பிற பயனர்களிடமிருந்து மின்னஞ்சல் பெறும் விருப்பத் தேர்வைத் தெரிவு செய்யவில்லை.",
+"emailfrom" => "அனுப்புனர்",
+"emailto" => "பெறுனர்",
+"emailsubject" => "உட்பொருள்",
+"emailmessage" => "செய்தி",
+"emailsend" => "அனுப்பு",
+"emailsent" => "மின்னஞ்சல் அனுப்பப்பட்டது",
+"emailsenttext" => "உங்கள் மின்னஞ்சல் செய்தி அனுப்பப்பட்டது.",
+# Watchlist
+"watchlist" => "என்னுடைய கவனிப்புப் பட்டியல்(watchlist)",
+"watchlistsub" => "(பயனர்\"$1\"க்காக)",
+"nowatchlist" => "உங்களுடைய கவனிப்புப் பட்டியலில் ஒரு விடயமும் இல்லை.",
+"watchnologin" => "புகுபதிகை செயப்படவில்லை",
 "watchnologintext" => "உங்கள் கவனிப்புப் பட்டியலில் திருத்தம் செய்வதற்கு, நீங்கள்[[Special:Userlogin|புகுபதிகை செய்திருக்கவேண்டும்]].",
-"addedwatch" => "கவனிப்புப் பட்டியலில் சேர்க்கப்பட்டது", 
-"addedwatchtext" => "பக்கம்\"$1\" உங்கள்<a href=\"" . 
+"addedwatch" => "கவனிப்புப் பட்டியலில் சேர்க்கப்பட்டது",
+"addedwatchtext" => "பக்கம்\"$1\" உங்கள்<a href=\"" .
   "{{localurle:Special:Watchlist}}\">கவனிப்புப் பக்கத்தில்</a> சேர்க்கப்பட்டுள்ளது.
-இந்தப் பக்கத்துக்கு எதிகாலத்தில் செய்யப்படவுள்ள மாற்றங்களும், அதனோடிணைந்த பேச்சுப் பக்கமும், அங்கே பட்டியலிடப்படும். அத்துடன் தெரிந்தெடுக்க வசதியாக <a href=\"" . 
-  "{{localurle:Special:Recentchanges}}\">அண்மைய மாற்றங்களின் பட்டியலில்</a> இது தடித்த எழுத்துக்களில் காட்டப்படும். 
-பின்னர், இப் பக்கத்தை உங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்க விரும்பினால், பக்கச் சட்டத் (sidebar) திலுள்ள \"Stop watching\" ஐச் சொடுக்கவும்.", 
-"removedwatch" => "கவனிப்புப் பட்டியலிலிருந்து நீக்கப்பட்டது", 
-"removedwatchtext" => "இந்தப் பக்கம் \"$1\" உங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்கப்பட்டது.", 
-"watchthispage" => "இந்தப் பக்கத்தைக் கவனிக்கவும்", 
-"unwatchthispage" => "கவனிப்பதை நிறுத்தவும்", 
-"notanarticle" => "ஒரு கட்டுரை அல்ல", 
-"watchnochange" => "காட்சிப்படுத்தப்பட்ட கால இடைவெளியில், கவனிப்பிலுள்ள, உங்கள் விடயமெதுவும் தொகுக்கப்பட்டிருக்கவில்லை.", 
-"watchdetails" => "(பேச்சுப் பக்கங்களைக் கணக்கிடாமல், $1 பக்கங்கள் கவனிக்கப்பட்டன; வெட்டுநிலை (cutoff) யிலிருந்து, மொத்தம் $2 பக்கங்கள் தொகுக்கப்பட்டன; $3... [$4 முழுப் பட்டியலையும் காண்பித்துத் தொகுக்கவும்].)", 
-"watchmethod-recent" => "கவனிக்கப்படுகின்ற பக்கங்களுக்காக, அண்மைய தொகுப்புகள் தேடிப் பார்க்கப்படுகிறன", 
-"watchmethod-list" => "அண்மைய தொகுப்புகளுக்காக, கவனிக்கப்படுகின்ற பக்கங்கள் தேடிப் பார்க்கப்படுகிறன", 
-"removechecked" => "குறியிடப்பட்ட விடயங்களைக் கவனிப்புப் பட்டியலிலிருந்து நீக்குக.", 
-"watchlistcontains" => "உங்கள் கவனிப்புப் பட்டியல் $1 பக்கங்களைக் கொண்டுள்ளது.", 
-"watcheditlist" => "இதோ உங்கள் கவனிப்புப் பக்கங்களுக்கான ஒரு அகரவரிசைப் பட்டியல். உங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்க விரும்பும் பக்கங்களுக்கான கட்டங்களில் குறியிட்டு, திரையின் கீழ்ப் பாகத்திலுள்ள 'குறியிடப்பட்டதை நீக்குக' பொத்தானைச் சொடுக்கவும்.", 
-"removingchecked" => "கோரப்பட்ட விடயங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்கப்படுகின்றன ...", 
-"couldntremove" => "விடயம்'$1' ஐ நீக்க முடியவில்லை...", 
-"iteminvalidname" => "விடயம் '$1' தொடர்பில் பிரச்சினை உள்ளது, செல்லுபடியாகாத பெயர்...", 
-"wlnote" => "பின்வருவன, கடைசி $2 மணிகளில் செய்யப்பட்ட, கடைசி $1 மாற்றங்களாகும்.", 
-"wlshowlast" => "கடைசியைக் காட்டு", 
-"wlhours" => " மணித்தியாலங்கள்", 
-"wldays" => " நாட்கள்", 
-                                                                                                                                       
-# Delete/protect/revert 
-"deletepage" => "பக்கத்தை நீக்கு", 
-"confirm" => "உறுதிசெய்", 
-"excontent" => "இருந்த உள்ளடக்கம்: '$1'", 
-"exbeforeblank" => "வெறுமைப்படுத்த (blanking) முன்னிருந்த உள்ளடக்கம்: '$1'", 
-"exblank" => "பக்கம் வெறுமையாய் இருந்தது", 
-"confirmdelete" => "நீக்குதலை உறுதிப்படுத்து", 
-"deletesub" => "(\"$1\" நீக்கப்படுகிறது)", 
-"historywarning" => "எச்சரிக்கை: நீங்கள் நீக்கவுள்ள பக்கத்துக்கு ஒரு வரலாறு உண்டு: ", 
-"confirmdeletetext" => "தரவுத் தளத்திலுள்ள பக்கமொன்றை அல்லது படிமமொன்றை, அதன் வரலாற்றுடன் சேர்த்து, நிரந்தரமாக நீக்கும் தறுவாயிலுள்ளீர்கள். இதையே நீங்கள் விரும்புகிறீர்கள் என்பதையும், இதன் விளைவுகளை நீங்கள் விளங்கிக்கொண்டிருக்கிறீர்கள் என்பதையும், இதை நீங்கள் விக்கிபீடியா:கொள்கைகளுக்கு </w/wiki.phtml?title=Wikipedia:Policy&action=edit> உட்பட்டே செய்கிறீர்கள் என்பதையும், தயவுசெய்து உறுதிப்படுத்தவும்.", 
-"actioncomplete" => "செயற்பாடு நிறைவுற்றது", 
-"deletedtext" => "\"$1\" நீக்கப்பட்டு விட்டது. அண்மைய நீக்குதல்களின் பதிவுக்கு $2 ஐப் பார்க்க.", 
-"deletedarticle" => "\"$1\" நீக்கப்பட்டது", 
-"dellogpage" => "நீக்கல்_பதிவு", 
-"dellogpagetext" => "கீழே காணப்படுவது மிக அண்மைய நீக்கல்களின் அட்டவணையாகும். எல்லா நேரங்களும் வழங்கன்(server) நேரங்களாகும்(UTC).", 
-"deletionlog" => "நீக்கல்_பதிவு", 
-"reverted" => "முன் திருத்தத்துக்கு மீள்விக்கப்பட்டுள்ளது", 
-"deletecomment" => "நீக்கலுக்கான காரணம்", 
-"imagereverted" => "வெற்றிகரமாக முன்னைய திருத்தத்துக்கு மீழ்விக்கப்பட்டது.", 
-"rollback" => "முன்நிலையாக்கத் (Roll back ) தொகுப்புகள்", 
-"rollbacklink" => "முன்நிலையாக்கு", 
-"rollbackfailed" => "முன்நிலையாக்கம் (Rollback) தோல்வி", 
-"cantrollback" => "தொகுப்பை மீழ்விக்க முடியாது; கடைசிப் பங்களிப்பாளரே (contributor) இக் கட்டுரையின் ஆசிரியராகும்.", 
-"alreadyrolled" => " ( [[User:$3|$3]] ([[User talk:$3|Talk]]) ஆல் செய்யப்பட்ட [[$1]] திகதிய கடைசித் தொகுப்பை முன்நிலையாக்க முடியாது; வேறு யாரோ இக் கட்டுரையை ஏற்கெனவே தொகுத்தோ அல்லது முன்நிலையாக்கியோ உள்ளார். 
-கடைசியாகத் தொகுத்தவர்[[User:$3|$3]] ([[User talk:$3|Talk]]). ", 
-# only shown if there is an edit comment 
-"editcomment" => "தொகுப்புக்குரிய கருத்துரை (comment): \"$1\".", 
-"revertpage" => "$1 ஆல் கடைசித் தொகுப்புக்கு முன்நிலையாக்கப்பட்டது", 
-# Undelete 
-"undelete" => "நீக்கப்பட்ட பக்கங்களை மீட்டெடு", 
-"undeletepage" => "பார்ப்பதுடன், நீக்கப்பட்ட பக்கங்களை மீட்டெடு", 
-"undeletepagetext" => "பின்வரும் பக்கங்கள் நீக்கப்பட்டுவிட்டன எனினும் காப்பகத்திலுள்ளதுடன் அவற்றை மீட்டெடுக்கவும் முடியும்.  காப்பகம் காலத்துக்குக் காலம் சுத்தப்படுத்தப்படலாம்.", 
-"undeletearticle" => "நீக்கப்பட்ட கட்டுரையை மீட்டெடு", 
-"undeleterevisions" => "$1 திருத்தங்கள் காப்பகப்படுத்த்ப்பட்டன", 
-"undeletehistory" => "இந்தப் பக்கத்தை நீங்கள் மீள்வித்தால், எல்லாத் திருத்தங்களும் வரலாற்றுக்கு மீள்விக்கப்படும். நீக்குதலின் பின்னர், அதே பெயருடைய வேறொரு புதிய பக்கம் உருவாக்கப்பட்டிருந்தால், மீள்விக்கப்பட்ட திருத்தங்கள் முன்னைய வரலாற்றிலேயே காணப்படும், அத்துடன் உயிர்ப்பு நிலையிலுள்ள () நடப்புத் திருத்தம் தன்னியக்கமாகப் பிரதியீடு செய்யப்பட மாட்டாது.", 
+இந்தப் பக்கத்துக்கு எதிகாலத்தில் செய்யப்படவுள்ள மாற்றங்களும், அதனோடிணைந்த பேச்சுப் பக்கமும், அங்கே பட்டியலிடப்படும். அத்துடன் தெரிந்தெடுக்க வசதியாக <a href=\"" .
+  "{{localurle:Special:Recentchanges}}\">அண்மைய மாற்றங்களின் பட்டியலில்</a> இது தடித்த எழுத்துக்களில் காட்டப்படும்.
+பின்னர், இப் பக்கத்தை உங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்க விரும்பினால், பக்கச் சட்டத் (sidebar) திலுள்ள \"Stop watching\" ஐச் சொடுக்கவும்.",
+"removedwatch" => "கவனிப்புப் பட்டியலிலிருந்து நீக்கப்பட்டது",
+"removedwatchtext" => "இந்தப் பக்கம் \"$1\" உங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்கப்பட்டது.",
+"watchthispage" => "இந்தப் பக்கத்தைக் கவனிக்கவும்",
+"unwatchthispage" => "கவனிப்பதை நிறுத்தவும்",
+"notanarticle" => "ஒரு கட்டுரை அல்ல",
+"watchnochange" => "காட்சிப்படுத்தப்பட்ட கால இடைவெளியில், கவனிப்பிலுள்ள, உங்கள் விடயமெதுவும் தொகுக்கப்பட்டிருக்கவில்லை.",
+"watchdetails" => "(பேச்சுப் பக்கங்களைக் கணக்கிடாமல், $1 பக்கங்கள் கவனிக்கப்பட்டன; வெட்டுநிலை (cutoff) யிலிருந்து, மொத்தம் $2 பக்கங்கள் தொகுக்கப்பட்டன; $3... [$4 முழுப் பட்டியலையும் காண்பித்துத் தொகுக்கவும்].)",
+"watchmethod-recent" => "கவனிக்கப்படுகின்ற பக்கங்களுக்காக, அண்மைய தொகுப்புகள் தேடிப் பார்க்கப்படுகிறன",
+"watchmethod-list" => "அண்மைய தொகுப்புகளுக்காக, கவனிக்கப்படுகின்ற பக்கங்கள் தேடிப் பார்க்கப்படுகிறன",
+"removechecked" => "குறியிடப்பட்ட விடயங்களைக் கவனிப்புப் பட்டியலிலிருந்து நீக்குக.",
+"watchlistcontains" => "உங்கள் கவனிப்புப் பட்டியல் $1 பக்கங்களைக் கொண்டுள்ளது.",
+"watcheditlist" => "இதோ உங்கள் கவனிப்புப் பக்கங்களுக்கான ஒரு அகரவரிசைப் பட்டியல். உங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்க விரும்பும் பக்கங்களுக்கான கட்டங்களில் குறியிட்டு, திரையின் கீழ்ப் பாகத்திலுள்ள 'குறியிடப்பட்டதை நீக்குக' பொத்தானைச் சொடுக்கவும்.",
+"removingchecked" => "கோரப்பட்ட விடயங்கள் கவனிப்புப் பட்டியலிலிருந்து நீக்கப்படுகின்றன ...",
+"couldntremove" => "விடயம்'$1' ஐ நீக்க முடியவில்லை...",
+"iteminvalidname" => "விடயம் '$1' தொடர்பில் பிரச்சினை உள்ளது, செல்லுபடியாகாத பெயர்...",
+"wlnote" => "பின்வருவன, கடைசி $2 மணிகளில் செய்யப்பட்ட, கடைசி $1 மாற்றங்களாகும்.",
+"wlshowlast" => "கடைசியைக் காட்டு",
+
+# Delete/protect/revert
+"deletepage" => "பக்கத்தை நீக்கு",
+"confirm" => "உறுதிசெய்",
+"excontent" => "இருந்த உள்ளடக்கம்: '$1'",
+"exbeforeblank" => "வெறுமைப்படுத்த (blanking) முன்னிருந்த உள்ளடக்கம்: '$1'",
+"exblank" => "பக்கம் வெறுமையாய் இருந்தது",
+"confirmdelete" => "நீக்குதலை உறுதிப்படுத்து",
+"deletesub" => "(\"$1\" நீக்கப்படுகிறது)",
+"historywarning" => "எச்சரிக்கை: நீங்கள் நீக்கவுள்ள பக்கத்துக்கு ஒரு வரலாறு உண்டு: ",
+"confirmdeletetext" => "தரவுத் தளத்திலுள்ள பக்கமொன்றை அல்லது படிமமொன்றை, அதன் வரலாற்றுடன் சேர்த்து, நிரந்தரமாக நீக்கும் தறுவாயிலுள்ளீர்கள். இதையே நீங்கள் விரும்புகிறீர்கள் என்பதையும், இதன் விளைவுகளை நீங்கள் விளங்கிக்கொண்டிருக்கிறீர்கள் என்பதையும், இதை நீங்கள் விக்கிபீடியா:கொள்கைகளுக்கு </w/wiki.phtml?title=Wikipedia:Policy&action=edit> உட்பட்டே செய்கிறீர்கள் என்பதையும், தயவுசெய்து உறுதிப்படுத்தவும்.",
+"actioncomplete" => "செயற்பாடு நிறைவுற்றது",
+"deletedtext" => "\"$1\" நீக்கப்பட்டு விட்டது. அண்மைய நீக்குதல்களின் பதிவுக்கு $2 ஐப் பார்க்க.",
+"deletedarticle" => "\"$1\" நீக்கப்பட்டது",
+"dellogpage" => "நீக்கல்_பதிவு",
+"dellogpagetext" => "கீழே காணப்படுவது மிக அண்மைய நீக்கல்களின் அட்டவணையாகும். எல்லா நேரங்களும் வழங்கன்(server) நேரங்களாகும்(UTC).",
+"deletionlog" => "நீக்கல்_பதிவு",
+"reverted" => "முன் திருத்தத்துக்கு மீள்விக்கப்பட்டுள்ளது",
+"deletecomment" => "நீக்கலுக்கான காரணம்",
+"imagereverted" => "வெற்றிகரமாக முன்னைய திருத்தத்துக்கு மீழ்விக்கப்பட்டது.",
+"rollback" => "முன்நிலையாக்கத் (Roll back ) தொகுப்புகள்",
+"rollbacklink" => "முன்நிலையாக்கு",
+"rollbackfailed" => "முன்நிலையாக்கம் (Rollback) தோல்வி",
+"cantrollback" => "தொகுப்பை மீழ்விக்க முடியாது; கடைசிப் பங்களிப்பாளரே (contributor) இக் கட்டுரையின் ஆசிரியராகும்.",
+"alreadyrolled" => " ( [[User:$3|$3]] ([[User talk:$3|Talk]]) ஆல் செய்யப்பட்ட [[$1]] திகதிய கடைசித் தொகுப்பை முன்நிலையாக்க முடியாது; வேறு யாரோ இக் கட்டுரையை ஏற்கெனவே தொகுத்தோ அல்லது முன்நிலையாக்கியோ உள்ளார்.
+கடைசியாகத் தொகுத்தவர்[[User:$3|$3]] ([[User talk:$3|Talk]]). ",
+# only shown if there is an edit comment
+"editcomment" => "தொகுப்புக்குரிய கருத்துரை (comment): \"$1\".",
+"revertpage" => "$1 ஆல் கடைசித் தொகுப்புக்கு முன்நிலையாக்கப்பட்டது",
+# Undelete
+"undelete" => "நீக்கப்பட்ட பக்கங்களை மீட்டெடு",
+"undeletepage" => "பார்ப்பதுடன், நீக்கப்பட்ட பக்கங்களை மீட்டெடு",
+"undeletepagetext" => "பின்வரும் பக்கங்கள் நீக்கப்பட்டுவிட்டன எனினும் காப்பகத்திலுள்ளதுடன் அவற்றை மீட்டெடுக்கவும் முடியும்.  காப்பகம் காலத்துக்குக் காலம் சுத்தப்படுத்தப்படலாம்.",
+"undeletearticle" => "நீக்கப்பட்ட கட்டுரையை மீட்டெடு",
+"undeleterevisions" => "$1 திருத்தங்கள் காப்பகப்படுத்த்ப்பட்டன",
+"undeletehistory" => "இந்தப் பக்கத்தை நீங்கள் மீள்வித்தால், எல்லாத் திருத்தங்களும் வரலாற்றுக்கு மீள்விக்கப்படும். நீக்குதலின் பின்னர், அதே பெயருடைய வேறொரு புதிய பக்கம் உருவாக்கப்பட்டிருந்தால், மீள்விக்கப்பட்ட திருத்தங்கள் முன்னைய வரலாற்றிலேயே காணப்படும், அத்துடன் உயிர்ப்பு நிலையிலுள்ள () நடப்புத் திருத்தம் தன்னியக்கமாகப் பிரதியீடு செய்யப்பட மாட்டாது.",
 "undeleterevision" => "$1 திருத்தத்தை நீக்கு",
 "undeletebtn" => "மீட்டெடு!",
 "undeletedarticle" => "\"$1\" மீட்டெடுக்கப்பட்டது",
@@ -794,13 +709,12 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 # Block/unblock IP
 #
 "blockip"		=> "பயனரைத் தடு",
-"blockiptext"	=> "ஒரு குறிப்பிட்ட ஐபி முகவரி அல்லது பயனரிடமிருந்து எழுத்து அணுக்கத்தைத் தடுப்பதற்குக் கீழேயுள்ள படிவத்தை உபயோகிக்கவும். இது விஷமத்தனத்தைத் தடுப்பதற்கும் [[Wikipedia:Policy|விக்கிபீடியா கொள்கை]]க்கு எற்புடைய வகையிலும் மட்டுமே பயன்படுத்தப்பட வேண்டும். 
+"blockiptext"	=> "ஒரு குறிப்பிட்ட ஐபி முகவரி அல்லது பயனரிடமிருந்து எழுத்து அணுக்கத்தைத் தடுப்பதற்குக் கீழேயுள்ள படிவத்தை உபயோகிக்கவும். இது விஷமத்தனத்தைத் தடுப்பதற்கும் [[Wikipedia:Policy|விக்கிபீடியா கொள்கை]]க்கு எற்புடைய வகையிலும் மட்டுமே பயன்படுத்தப்பட வேண்டும்.
 குறிப்பிட்ட காரணமொன்றைக் கீழே நிரப்புக (உதாரணமாக், விஷமத்தனம் செய்யப்பட்ட (vandalized) பக்கங்களை எடுத்துக் காட்டவும்).",
 "ipaddress"		=> "ஐபி (IP) முகவரி/பயனர்பெயர்",
 "ipbreason"		=> "காரணம்",
 "ipbsubmit"		=> "இப் பயனரைத் தடு",
 "badipaddress"	=> "அந்தப் பெயரில் பயனர் எவரும் இல்லை",
-"noblockreason" => "தடுப்புக்கான காரணங்களை நீங்கள் கொடுக்க வேண்டும்.",
 "blockipsuccesssub" => "தடுப்பு வெற்றி",
 "blockipsuccesstext" => "\"$1\" தடுக்கப்பட்டுள்ளார்.
 <br />தடுப்பை மீளாய்வு செய்ய [[Special:Ipblocklist|IP block list]] ஐப் பார்க்கவும்.",
@@ -836,26 +750,15 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 <br />பராமரிப்பு முடிவடைந்ததும் பூட்டை நீக்க மறவாதீர்.",
 "unlockdbsuccesstext" => "விக்கிபீடியா தரவுத்தளம் திறக்கப்பட்டது.",
 
-# SQL query
-#
-"asksql"		=> "SQL வினவல்(query)",
-"asksqltext"	=> "விக்கிபீடியா தரவுத்தளம் பற்றிய நேரடி வினவல்களுக்குக் கீழேயுள்ள படிவத்தைப் பயன்படுத்தவும். 
-சர மதிப்புருக்களை (string literals) எல்லைப்படுத்துவதற்குத் ஒற்றை எடுத்துக்காட்டுக்குறிகளைப் (quotes) பயன்படுத்தவும் ('இப்படி').
-இது பெரும்பாலும் வழங்கனுக்குக் குறிப்பிடத்தக்க அளவு சுமையைக் கூட்டும் . எனவே இச் செயற்பாட்டைத் தயவுசெய்து மிதமாகப் பயன்படுத்தவும்.",
-"sqlislogged"	=> "எல்லா வினவல்களும் பதிவுசெய்யப்படுகின்றன என்பதைத் தயவுசெய்து கவனிக்கவும்.",
-"sqlquery"		=> "வினவலைப் பதிவுசெய்",
-"querybtn"		=> "வினவலைச் சமர்ப்பி",
-"selectonly"	=> "\"SELECT\" தவிர்ந்த எனைய வினவல்கள் விக்கிபீடியா உருவாக்குபவர்களுக்கு மட்டும் மட்டுப்படுத்தப்பட்டுள்ளது.",
-"querysuccessful" => "வினவல் வெற்றி",
 # Move page
 #
 "movepage"		=> "பக்கத்தை நகர்த்து",
-"movepagetext"	=> "பின்வரும் படிவத்தைப் பயன்படுத்துவது, பக்கமொன்றின் பெயரை மாற்றி, இதனுடைய முழு வரலாற்றையும் புதிய பெயருக்கு நகர்த்தும். பழைய தலைப்பு, புதிய பக்கத்துக்கான ஒர் வழிகாட்டும் பக்கமாக ஆகும். பழைய பக்கத் தலைப்புக்கு உள்ள இணைப்புக்கள் மாறமாட்டா; இரட்டை அல்லது முறிந்த வழிமாற்றுகள் உள்ளனவா என்பதைச் சரி பார்த்து உறுதிசெய்யவும். இணைப்புகள் எவ்விடத்துக்குச் சென்றடைய வேண்டுமோ அவ்விடத்தைத் தொடர்ந்தும் குறிப்பதை உறுதி செய்து கொள்வது உங்கள் பொறுப்பாகும்.<br /> 
-ஏற்கெனவே புதிய தலைப்பில் ஒரு பக்கம் இருந்தால், இந்தப் பக்கம் வெறுமையாகவோ அல்லது ஒரு வழிமாற்றுப் பக்கமாகவோ இருப்பதுடன் பழைய தொகுப்பு வரலாறும் இல்லாதிருந்தால்தான்,  இப் பக்கம் நகர்த்தப்படும் என்பதைக் கவனிக்கவும். தற்செயலாக, நீங்கள் தவறு செய்துவிட்டால், எந்தப் பெயரிலிருந்து பெயர் மாற்றம் செய்தீர்களோ அதே பெயருக்கு மீண்டும் மாற்றமுடியும் என்பதுடன் ஏற்கெனவே இருக்கும் பக்கமொன்றை மேலெழுத (overwrite) முடியாது என்பதையும் இது குறிக்கின்றது. 
+"movepagetext"	=> "பின்வரும் படிவத்தைப் பயன்படுத்துவது, பக்கமொன்றின் பெயரை மாற்றி, இதனுடைய முழு வரலாற்றையும் புதிய பெயருக்கு நகர்த்தும். பழைய தலைப்பு, புதிய பக்கத்துக்கான ஒர் வழிகாட்டும் பக்கமாக ஆகும். பழைய பக்கத் தலைப்புக்கு உள்ள இணைப்புக்கள் மாறமாட்டா; இரட்டை அல்லது முறிந்த வழிமாற்றுகள் உள்ளனவா என்பதைச் சரி பார்த்து உறுதிசெய்யவும். இணைப்புகள் எவ்விடத்துக்குச் சென்றடைய வேண்டுமோ அவ்விடத்தைத் தொடர்ந்தும் குறிப்பதை உறுதி செய்து கொள்வது உங்கள் பொறுப்பாகும்.<br />
+ஏற்கெனவே புதிய தலைப்பில் ஒரு பக்கம் இருந்தால், இந்தப் பக்கம் வெறுமையாகவோ அல்லது ஒரு வழிமாற்றுப் பக்கமாகவோ இருப்பதுடன் பழைய தொகுப்பு வரலாறும் இல்லாதிருந்தால்தான்,  இப் பக்கம் நகர்த்தப்படும் என்பதைக் கவனிக்கவும். தற்செயலாக, நீங்கள் தவறு செய்துவிட்டால், எந்தப் பெயரிலிருந்து பெயர் மாற்றம் செய்தீர்களோ அதே பெயருக்கு மீண்டும் மாற்றமுடியும் என்பதுடன் ஏற்கெனவே இருக்கும் பக்கமொன்றை மேலெழுத (overwrite) முடியாது என்பதையும் இது குறிக்கின்றது.
 <b>எச்சரிக்கை!</b>
 இது பிரபலமான ஒரு பக்கத்துக்குச் செய்யும் கடுமையானதும், எதிர்பாராததுமான மாற்றமாக இருக்கக்கூடும்; தொடர்வதற்கு முன் இதன் விளைவுகளை விளங்கிக்கொண்டிருக்கிறீர்கள் என்பதை உறுதிப்படுத்திக் கொள்ளவும்.",
 "movepagetalktext" => "*நீங்கள் பக்கத்தைப் பெயர்வெளிகள் (namespaces) இடையே நகர்த்துகிறீர்கள் என்றோ,
-*ஒரு வெறுமையில்லாத பேச்சுப் பக்கம் புதிய பெயரில் ஏற்கெனவேயிருந்தோ, அல்லது 
+*ஒரு வெறுமையில்லாத பேச்சுப் பக்கம் புதிய பெயரில் ஏற்கெனவேயிருந்தோ, அல்லது
 *நீங்கள் கீழேயுள்ள கட்டத்தில் குறியிடாமல் விடுகிறீர்கள் என்றோ.
  '''இல்லாவிடில்''' சேர்ந்திருக்கும் பேச்சுப் பக்கம், ஏதாவது இருந்தால், தன்னியக்கமாக அதனுடன் நகர்த்தப்படும்.
 இப்படியான சந்தர்ப்பங்களில், விரும்பினால், நகர்த்தலையோ அல்லது ஒன்றிணைத்தலையோ நீங்கள் கைவினையாகச் செய்யவேண்டியிருக்கும்.",
@@ -881,47 +784,28 @@ $2 பட்டியல் &nbsp; $3 $9 க்கான தேடலை மீ
 );
 
 class LanguageTa extends LanguageUtf8 {
-        function getNamespaces() {
-                global $wgNamespaceNamesTa;
-                return $wgNamespaceNamesTa;
-        }
-
-        function getQuickbarSettings() {
-                global $wgQuickbarSettingsTa;
-                return $wgQuickbarSettingsTa;
-        }
-
-        function getSkinNames() {
-                global $wgSkinNamesTa;
-                return $wgSkinNamesTa;
-        }
-
-        function getValidSpecialPages()
-        {
-                global $wgValidSpecialPagesTa;
-                return $wgValidSpecialPagesTa;
-        }
-
-        function getSysopSpecialPages()
-        {
-                global $wgSysopSpecialPagesTa;
-                return $wgSysopSpecialPagesTa;
-        }
-
-        function getDeveloperSpecialPages()
-        {
-                global $wgDeveloperSpecialPagesTa;
-                return $wgDeveloperSpecialPagesTa;
-        }
-
-	function getMessage( $key )
-        {
-                global $wgAllMessagesTa;
-                if( array_key_exists( $key, $wgAllMessagesTa ) )
-                        return $wgAllMessagesTa[$key];
-                else
-                        return parent::getMessage($key);
-        }
+	function getNamespaces() {
+		global $wgNamespaceNamesTa;
+		return $wgNamespaceNamesTa;
+	}
+
+	function getQuickbarSettings() {
+		global $wgQuickbarSettingsTa;
+		return $wgQuickbarSettingsTa;
+	}
+
+	function getSkinNames() {
+		global $wgSkinNamesTa;
+		return $wgSkinNamesTa;
+	}
+
+	function getMessage( $key ) {
+		global $wgAllMessagesTa;
+		if( array_key_exists( $key, $wgAllMessagesTa ) )
+			return $wgAllMessagesTa[$key];
+		else
+			return parent::getMessage($key);
+	}
 }
 
 ?>
diff --git a/languages/LanguageTh.php b/languages/LanguageTh.php
index dcb067188bae..92fe23e18fc3 100644
--- a/languages/LanguageTh.php
+++ b/languages/LanguageTh.php
@@ -28,66 +28,6 @@
 	"ไม่มี", "อยู่ทางซ้าย", "อยู่ทางขวา", "ลอยทางซ้าย"
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesTh = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "ตั้งค่าสำหรับผู้ใช้",
-	"Watchlist"		=> "Watchlist",
-	"Recentchanges" => "หน้าที่ได้รับการแก้ไขเมื่อเร็ว ๆ นี้",
-	"Upload"		=> "Upload ภาพ",
-	"Imagelist"		=> "รายชื่อภาพ",
-	"Listusers"		=> "ผูใช้ที่ลงทะเบียนแล้ว",
-	"Statistics"	=> "สถิติของเว็บไซต์",
-	"Randompage"	=> "สุ่มบทความ",
-
-	"Lonelypages"	=> "บทความที่ไม่ได้ลิงก์ไว้",
-	"Unusedimages"	=> "ภาพที่ไม่ได้ใช้",
-	"Popularpages"	=> "บทความที่ได้รับความนิยม",
-	"Wantedpages"	=> "บทความที่เป็นที่ต้องการมากที่สุด",
-	"Shortpages"	=> "บทความสั้น",
-	"Longpages"		=> "บทความยาว",
-	"Newpages"		=> "บทความที่สร้างมาใหม่",
-	"Ancientpages"	=> "บทความที่เก่าที่สุด",
-        "Deadendpages"  => "หน้าทางตัน",
-#	"Intl"                => "ลิงก์ระหว่างภาษา",
-	"Allpages"		=> "ทุกหน้าตามชื่อ",
-
-	"Ipblocklist"	=> "ผู้ใช้และ IP address ที่ถูกกั้นไว้",
-	"Maintenance"	=> "หน้าสำหรับการรักษาบำรุง",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "แหล่งหนังสือภายนอก",
-#	"Categories"	=> "ประเภทของหน้า",
-	"Export"		=> "การ export หน้าเป็น XML",
-	"Version"		=> "Version",
-);
-
-/* private */ $wgSysopSpecialPagesTh = array(
-	"Blockip"		=> "กั้นผู้ใช้ หรือ IP address",
-	"Asksql"		=> "ค้นหาในฐานข้อมูล",
-	"Undelete"		=> "คืนหน้าที่ถูกลบไป"
-);
-
-/* private */ $wgDeveloperSpecialPagesTh = array(
-	"Lockdb"		=> "ทำให้ฐานข้อมูลอ่านได้อย่างเดียว",
-	"Unlockdb"		=> "ทำให้ฐานข้อมูลสามารถเขียนได้",
-);
-
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
-
 /* private */ $wgAllMessagesTh = array(
 
 # User Toggles
@@ -158,19 +98,17 @@
 "mainpage"		=> "หน้าหลัก",
 "mainpagetext"	=> "Wiki software  ถูกติดตั้งเรียบร้อยแล้ว",
 "about"			=> "เกี่ยวกับ",
-"aboutsite"      => "เกี่ยวกับ $wgSitename",
-"aboutpage"		=> "$wgMetaNamespace:เกี่ยวกับ",
+"aboutsite"      => "เกี่ยวกับ {{SITENAME}}",
+"aboutpage"		=> "{{ns:project}}:เกี่ยวกับ",
 "help"			=> "ความช่วยเหลือ",
-"helppage"		=> "$wgMetaNamespace:ความช่วยเหลือ",
-"wikititlesuffix" => "$wgSitename",
+"helppage"		=> "{{ns:project}}:ความช่วยเหลือ",
 "bugreports"	=> "รายงาน bug",
-"bugreportspage" => "$wgMetaNamespace:รายงาน bug",
+"bugreportspage" => "{{ns:project}}:รายงาน bug",
 "sitesupport"   => "การบริจาค",
-"sitesupportpage" => "", # If not set, won't appear. Can be wiki page or URL
 "faq"			=> "FAQ",
-"faqpage"		=> "$wgMetaNamespace:FAQ",
+"faqpage"		=> "{{ns:project}}:FAQ",
 "edithelp"		=> "ความช่วยเหลือในการแก้ไขหน้า",
-"edithelppage"	=> "$wgMetaNamespace:การแก้ไขหน้า",
+"edithelppage"	=> "{{ns:project}}:การแก้ไขหน้า",
 "cancel"		=> "ยกเลิก",
 "qbfind"		=> "ค้นหา",
 "qbbrowse"		=> "ค้น",
@@ -185,7 +123,7 @@
 "currentevents" => "เหตุการณ์ปัจจุบัน",
 "errorpagetitle" => "ความผิดพลาด",
 "returnto"		=> "กลับไปยัง $1.",
-"tagline"      	=> "จาก $wgSitename, สารานุกรมฟรี",
+"tagline"      	=> "จาก {{SITENAME}}, สารานุกรมฟรี",
 "whatlinkshere"	=> "หน้าที่ลิงก์มายังที่นี่",
 "help"			=> "ความช่วยเหลือ",
 "search"		=> "ค้นหา",
@@ -209,10 +147,9 @@
 "redirectedfrom" => "(Redirected from $1)",
 "lastmodified"	=> "This page was last modified $1.",
 "viewcount"		=> "This page has been accessed $1 times.",
-"gnunote" => "All text is available under the terms of the <a class=internal href='/wiki/GNU_FDL'>GNU Free Documentation License</a>.",
 "printsubtitle" => "(From {{SERVER}})",
 "protectedpage" => "Protected page",
-"administrators" => "$wgMetaNamespace:Administrators",
+"administrators" => "{{ns:project}}:Administrators",
 "sysoptitle"	=> "Sysop access required",
 "sysoptext"		=> "The action you have requested can only be
 performed by users with \"sysop\" status.
@@ -225,7 +162,7 @@ See $1.",
 "nbytes"		=> "$1 ไบต์",
 "go"			=> "ไป",
 "ok"			=> "OK",
-"sitetitle"		=> "$wgSitename",
+"sitetitle"		=> "{{SITENAME}}",
 "sitesubtitle"	=> "สารานุกรมฟรี",
 "retrievedfrom" => "Retrieved from \"$1\"",
 "newmessages" => "คุณมีข้อความใหม่ $1.",
@@ -255,7 +192,7 @@ See $1.",
 "newusersonly"	=> " (เฉพาะผู้ใช้ใหม่)",
 
 "login"			=> "ล็อกอิน",
-"loginprompt"           => "ต้อง enable cookie เพื่อล็อกอินสู่ $wgSitename ได้",
+"loginprompt"           => "ต้อง enable cookie เพื่อล็อกอินสู่ {{SITENAME}} ได้",
 "userlogin"		=> "ล็อกอิน",
 "logout"		=> "ล็อกเอาท์",
 "userlogout"	=> "ล็อกเอาท์",
@@ -271,7 +208,7 @@ See $1.",
 "newarticletext" =>
 "คุณได้ตามลิงก์ที่นำไปยังหน้าที่ยังไม่ปรากฏอยู่
 เพื่อเริ่มสร้างหน้าใหม่ พิมพ์ลงในกล่องข้างล่างนี้
-(ดู[[$wgMetaNamespace:ความช่วยเหลือ|หน้าความช่วยเหลือ]]สำหรับข้อมูลเพิ่มเติม)
+(ดู[[{{ns:project}}:ความช่วยเหลือ|หน้าความช่วยเหลือ]]สำหรับข้อมูลเพิ่มเติม)
 If you are here by mistake, just click your browser's '''back''' button.",
 "noarticletext" => "(ไม่มีข้อความในหน้านี้)",
 "updated"		=> "(ได้รับการแก้ไขแล้ว)",
@@ -296,26 +233,7 @@ class LanguageTh extends LanguageUtf8 {
 		return $wgQuickbarSettingsTh;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesTh;
-		return $wgValidSpecialPagesTh;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesTh;
-		return $wgSysopSpecialPagesTh;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesTh;
-		return $wgDeveloperSpecialPagesTh;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesTh;
 		if( isset( $wgAllMessagesTh[$key] ) ) {
 			return $wgAllMessagesTh[$key];
@@ -324,8 +242,7 @@ class LanguageTh extends LanguageUtf8 {
 		}
 	}
 
-	function getAllMessages()
-	{
+	function getAllMessages() {
 		global $wgAllMessagesTh;
 		return $wgAllMessagesTh;
 	}
diff --git a/languages/LanguageTlh.php b/languages/LanguageTlh.php
index c1a18c829440..a338dc9a0d1c 100644
--- a/languages/LanguageTlh.php
+++ b/languages/LanguageTlh.php
@@ -1,6 +1,6 @@
 <?php
 /** Klingon (tlhIngan-Hol)
-  * 
+  *
   * @package MediaWiki
   * @subpackage Language
   */
@@ -8,36 +8,35 @@
 require_once( "LanguageUtf8.php" );
 
 if ( $wgMetaNamespace == "Wikipedia" ) {
-        $wgMetaNamespace = "wIqIpe'DIya";
+	$wgMetaNamespace = "wIqIpe'DIya";
 }
 
 /* private */ $wgNamespaceNamesTlh = array(
-        NS_MEDIA            => "Doch",
-        NS_SPECIAL          => "le'",
-        NS_MAIN             => "",
-        NS_TALK             => "ja'chuq",
-        NS_USER             => "lo'wI'",
-        NS_USER_TALK        => "lo'wI'_ja'chuq",
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => $wgMetaNamespace . "_ja'chuq",
-        NS_IMAGE            => "nagh_beQ",
-        NS_IMAGE_TALK       => "nagh_beQ_ja'chuq",
-        NS_MEDIAWIKI        => "MediaWiki",
-        NS_MEDIAWIKI_TALK   => "MediaWiki_ja'chuq",
-        NS_TEMPLATE         => "chen'ay'",
-        NS_TEMPLATE_TALK    => "chen'ay'_ja'chuq",
-        NS_HELP             => "QaH",
-        NS_HELP_TALK        => "QaH_ja'chuq",
-        NS_CATEGORY         => "Segh",
-        NS_CATEGORY_TALK    => "Segh_ja'chuq"
+	NS_MEDIA            => "Doch",
+	NS_SPECIAL          => "le'",
+	NS_MAIN             => "",
+	NS_TALK             => "ja'chuq",
+	NS_USER             => "lo'wI'",
+	NS_USER_TALK        => "lo'wI'_ja'chuq",
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaNamespace . "_ja'chuq",
+	NS_IMAGE            => "nagh_beQ",
+	NS_IMAGE_TALK       => "nagh_beQ_ja'chuq",
+	NS_MEDIAWIKI        => "MediaWiki",
+	NS_MEDIAWIKI_TALK   => "MediaWiki_ja'chuq",
+	NS_TEMPLATE         => "chen'ay'",
+	NS_TEMPLATE_TALK    => "chen'ay'_ja'chuq",
+	NS_HELP             => "QaH",
+	NS_HELP_TALK        => "QaH_ja'chuq",
+	NS_CATEGORY         => "Segh",
+	NS_CATEGORY_TALK    => "Segh_ja'chuq"
 ) + $wgNamespaceNamesEn;
 
-class LanguageTlh extends LanguageUtf8
-{
-        function getNamespaces() {
-                global $wgNamespaceNamesTlh;
-                return $wgNamespaceNamesTlh;
-        }
+class LanguageTlh extends LanguageUtf8 {
+	function getNamespaces() {
+		global $wgNamespaceNamesTlh;
+		return $wgNamespaceNamesTlh;
+	}
 }
 
 ?>
diff --git a/languages/LanguageTr.php b/languages/LanguageTr.php
index ba41822fcb63..a68debab1a94 100644
--- a/languages/LanguageTr.php
+++ b/languages/LanguageTr.php
@@ -2,42 +2,42 @@
 require_once( "LanguageUtf8.php" );
 
 /* private */ $wgNamespaceNamesTr = array(
-        NS_MEDIA            => 'Media',
-        NS_SPECIAL          => 'Özel',
-        NS_MAIN             => '',
-        NS_TALK             => 'Tartışma',
-        NS_USER             => 'Kullanıcı',
-        NS_USER_TALK        => 'Kullanıcı_mesaj',
-        NS_PROJECT          => $wgMetaNamespace,
-        NS_PROJECT_TALK     => $wgMetaNamespace . '_tartışma',
-        NS_IMAGE            => 'Resim',
-        NS_IMAGE_TALK       => 'Resim_tartışma',
-        NS_MEDIAWIKI        => 'MedyaViki',
-        NS_MEDIAWIKI_TALK   => 'MedyaViki_tartışma',
-        NS_TEMPLATE         => 'Şablon',
-        NS_TEMPLATE_TALK    => 'Şablon_tartışma',
-        NS_HELP             => 'Yardım',
-        NS_HELP_TALK        => 'Yardım_tartışma',
-        NS_CATEGORY         => 'Kategori',
-        NS_CATEGORY_TALK    => 'Kategori_tartışma',
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Özel',
+	NS_MAIN             => '',
+	NS_TALK             => 'Tartışma',
+	NS_USER             => 'Kullanıcı',
+	NS_USER_TALK        => 'Kullanıcı_mesaj',
+	NS_PROJECT          => $wgMetaNamespace,
+	NS_PROJECT_TALK     => $wgMetaNamespace . '_tartışma',
+	NS_IMAGE            => 'Resim',
+	NS_IMAGE_TALK       => 'Resim_tartışma',
+	NS_MEDIAWIKI        => 'MedyaViki',
+	NS_MEDIAWIKI_TALK   => 'MedyaViki_tartışma',
+	NS_TEMPLATE         => 'Şablon',
+	NS_TEMPLATE_TALK    => 'Şablon_tartışma',
+	NS_HELP             => 'Yardım',
+	NS_HELP_TALK        => 'Yardım_tartışma',
+	NS_CATEGORY         => 'Kategori',
+	NS_CATEGORY_TALK    => 'Kategori_tartışma',
 ) + $wgNamespaceNamesEn;
 
 class LanguageTr extends LanguageUtf8 {
-        function getNamespaces() {
-                global $wgNamespaceNamesTr;
-                return $wgNamespaceNamesTr;
-        }
+	function getNamespaces() {
+		global $wgNamespaceNamesTr;
+		return $wgNamespaceNamesTr;
+	}
 
-        function formatNum( $number, $year = false ) {
-                return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
-        }
-        
-        function ucfirst ( $string ) {
-        	if ( $string[0] == 'i' ) {
-        		return 'İ' . substr( $string, 1 );
-        	} else {
-        		return parent::ucfirst( $string );
-        	}
-        }
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
+	}
+
+	function ucfirst ( $string ) {
+		if ( $string[0] == 'i' ) {
+			return 'İ' . substr( $string, 1 );
+		} else {
+			return parent::ucfirst( $string );
+		}
+	}
 }
 ?>
diff --git a/languages/LanguageTt.php b/languages/LanguageTt.php
index 57b4515ddf55..55bd392dc1fd 100644
--- a/languages/LanguageTt.php
+++ b/languages/LanguageTt.php
@@ -13,116 +13,71 @@
 
 require_once( "LanguageUtf8.php" );
 
-#--------------------------------------------------------------------------
-# Language-specific text
-#--------------------------------------------------------------------------
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
 /* private */ $wgNamespaceNamesTt = array(
-        NS_MEDIA            => 'Media',
-        NS_SPECIAL          => 'Maxsus',
-        NS_MAIN             => '',
-        NS_TALK             => 'Bäxäs',
-        NS_USER             => 'Äğzä',
-        NS_USER_TALK        => "Äğzä_bäxäse",
-        NS_PROJECT          => "Wikipedia",
-        NS_PROJECT_TALK     => "Wikipedia_bäxäse",
-        NS_IMAGE            => "Räsem",
-        NS_IMAGE_TALK       => "Räsem_bäxäse",
-        NS_MEDIAWIKI        => "MediaWiki",
-        NS_MEDIAWIKI_TALK   => "MediaWiki_bäxäse",
-        NS_TEMPLATE         => "Ürnäk",
-        NS_TEMPLATE_TALK    => "Ürnäk_bäxäse",
-        NS_HELP             => "Yärdäm",
-        NS_HELP_TALK        => "Yärdäm_bäxäse",
-        NS_CATEGORY         => "Törkem",
-        NS_CATEGORY_TALK    => "Törkem_bäxäse"
+	NS_MEDIA            => 'Media',
+	NS_SPECIAL          => 'Maxsus',
+	NS_MAIN             => '',
+	NS_TALK             => 'Bäxäs',
+	NS_USER             => 'Äğzä',
+	NS_USER_TALK        => "Äğzä_bäxäse",
+	NS_PROJECT          => "Wikipedia",
+	NS_PROJECT_TALK     => "Wikipedia_bäxäse",
+	NS_IMAGE            => "Räsem",
+	NS_IMAGE_TALK       => "Räsem_bäxäse",
+	NS_MEDIAWIKI        => "MediaWiki",
+	NS_MEDIAWIKI_TALK   => "MediaWiki_bäxäse",
+	NS_TEMPLATE         => "Ürnäk",
+	NS_TEMPLATE_TALK    => "Ürnäk_bäxäse",
+	NS_HELP             => "Yärdäm",
+	NS_HELP_TALK        => "Yärdäm_bäxäse",
+	NS_CATEGORY         => "Törkem",
+	NS_CATEGORY_TALK    => "Törkem_bäxäse"
 ) + $wgNamespaceNamesEn;
 
-/* private */ $wgQuickbarSettingsTt = array(
-        "None", "Fixed left", "Fixed right", "Floating left"
-);
-
-/* private */ $wgSkinNamesTt = array(
-        'standard' => 'Classic',
-        'nostalgia' => 'Nostalgia',
-        'cologneblue' => 'Cologne Blue',
-        'davinci' => 'DaVinci',
-        'mono' => 'Mono',
-        'monobook' => 'MonoBook',
-        'myskin' => 'MySkin'
-);
-
 /* private */ $wgDateFormatsTt = array(
 #        "köyläwsez",
 );
 
-# Read language names
-global $wgLanguageNames;
-require_once( "Names.php" );
-
-$wgLanguageNamesTt =& $wgLanguageNames;
-
 # Note to translators:
 #   Please include the English words as synonyms.  This allows people
 #   from other wikis to contribute more easily.
 #
 /* private */ $wgMagicWordsTt = array(
 #       ID                                 CASE  SYNONYMS
-        MAG_REDIRECT             => array( 0,    '#yünältü'               ),
-        MAG_NOTOC                => array( 0,    '__ETYUQ__'              ),
-        MAG_FORCETOC             => array( 0,    '__ETTIQ__'              ),
-        MAG_TOC                  => array( 0,    '__ET__'                 ),
-        MAG_NOEDITSECTION        => array( 0,    '__BÜLEMTÖZÄTÜYUQ__'     ),
-        MAG_START                => array( 0,    '__BAŞLAW__'             ),
-        MAG_CURRENTMONTH         => array( 1,    'AĞIMDAĞI_AY'            ),
-        MAG_CURRENTMONTHNAME     => array( 1,    'AĞIMDAĞI_AY_İSEME'      ),
-        MAG_CURRENTDAY           => array( 1,    'AĞIMDAĞI_KÖN'           ),
-        MAG_CURRENTDAYNAME       => array( 1,    'AĞIMDAĞI_KÖN_İSEME'     ),
-        MAG_CURRENTYEAR          => array( 1,    'AĞIMDAĞI_YIL'           ),
-        MAG_CURRENTTIME          => array( 1,    'AĞIMDAĞI_WAQIT'         ),
-        MAG_NUMBEROFARTICLES     => array( 1,    'MÄQÄLÄ_SANI'            ),
-        MAG_CURRENTMONTHNAMEGEN  => array( 1,    'AĞIMDAĞI_AY_İSEME_GEN'  ),
-        MAG_PAGENAME             => array( 1,    'BİTİSEME'               ),
-        MAG_NAMESPACE            => array( 1,    'İSEMARA'                ),
-        MAG_SUBST                => array( 0,    'TÖPÇEK:'                ),
-        MAG_MSGNW                => array( 0,    'MSGNW:'                 ),
-        MAG_END                  => array( 0,    '__AZAQ__'               ),
-        MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb'     ),
-        MAG_IMG_RIGHT            => array( 1,    'uñda'                   ),
-        MAG_IMG_LEFT             => array( 1,    'sulda'                  ),
-        MAG_IMG_NONE             => array( 1,    'yuq'                    ),
-        MAG_IMG_WIDTH            => array( 1,    '$1px'                   ),
-        MAG_IMG_CENTER           => array( 1,    'center', 'centre'       ),
-        MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame' ),
-        MAG_INT                  => array( 0,    'EÇKE:'                   ),
-        MAG_SITENAME             => array( 1,    'SÄXİFÄİSEME'            ),
-        MAG_NS                   => array( 0,    'İA:'                    ),
-        MAG_LOCALURL             => array( 0,    'URINLIURL:'              ),
-        MAG_LOCALURLE            => array( 0,    'URINLIURLE:'             ),
-        MAG_SERVER               => array( 0,    'SERVER'                 )
+	MAG_REDIRECT             => array( 0,    '#yünältü'               ),
+	MAG_NOTOC                => array( 0,    '__ETYUQ__'              ),
+	MAG_FORCETOC             => array( 0,    '__ETTIQ__'              ),
+	MAG_TOC                  => array( 0,    '__ET__'                 ),
+	MAG_NOEDITSECTION        => array( 0,    '__BÜLEMTÖZÄTÜYUQ__'     ),
+	MAG_START                => array( 0,    '__BAŞLAW__'             ),
+	MAG_CURRENTMONTH         => array( 1,    'AĞIMDAĞI_AY'            ),
+	MAG_CURRENTMONTHNAME     => array( 1,    'AĞIMDAĞI_AY_İSEME'      ),
+	MAG_CURRENTDAY           => array( 1,    'AĞIMDAĞI_KÖN'           ),
+	MAG_CURRENTDAYNAME       => array( 1,    'AĞIMDAĞI_KÖN_İSEME'     ),
+	MAG_CURRENTYEAR          => array( 1,    'AĞIMDAĞI_YIL'           ),
+	MAG_CURRENTTIME          => array( 1,    'AĞIMDAĞI_WAQIT'         ),
+	MAG_NUMBEROFARTICLES     => array( 1,    'MÄQÄLÄ_SANI'            ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    'AĞIMDAĞI_AY_İSEME_GEN'  ),
+	MAG_PAGENAME             => array( 1,    'BİTİSEME'               ),
+	MAG_NAMESPACE            => array( 1,    'İSEMARA'                ),
+	MAG_SUBST                => array( 0,    'TÖPÇEK:'                ),
+	MAG_MSGNW                => array( 0,    'MSGNW:'                 ),
+	MAG_END                  => array( 0,    '__AZAQ__'               ),
+	MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb'     ),
+	MAG_IMG_RIGHT            => array( 1,    'uñda'                   ),
+	MAG_IMG_LEFT             => array( 1,    'sulda'                  ),
+	MAG_IMG_NONE             => array( 1,    'yuq'                    ),
+	MAG_IMG_WIDTH            => array( 1,    '$1px'                   ),
+	MAG_IMG_CENTER           => array( 1,    'center', 'centre'       ),
+	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame' ),
+	MAG_INT                  => array( 0,    'EÇKE:'                   ),
+	MAG_SITENAME             => array( 1,    'SÄXİFÄİSEME'            ),
+	MAG_NS                   => array( 0,    'İA:'                    ),
+	MAG_LOCALURL             => array( 0,    'URINLIURL:'              ),
+	MAG_LOCALURLE            => array( 0,    'URINLIURLE:'             ),
+	MAG_SERVER               => array( 0,    'SERVER'                 )
 ) + $wgMagicWordsEn;
 
-#-------------------------------------------------------------------
-# Default messages
-#-------------------------------------------------------------------
-# Allowed characters in keys are: A-Z, a-z, 0-9, underscore (_) and
-# hyphen (-). If you need more characters, you may be able to change
-# the regex in MagicWord::initRegex
-
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => ""
-
-# NOTE: To turn off "Disclaimers" in the title links,
-# set "disclaimers" => ""
-
-# NOTE: To turn off "Community portal" in the title links,
-# set "portal" => ""
-
 /* private */ $wgAllMessagesTt = array(
 
 # week days, months
@@ -158,25 +113,6 @@ $wgLanguageNamesTt =& $wgLanguageNames;
 'nov' => "Nöy",
 'dec' => "Dek",
 
-# User Toggles
-"tog-underline"           => "Underline links",
-"tog-highlightbroken"     => "Format broken links <a href=\"\" class=\"new\">like this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
-"tog-justify"             => "Justify paragraphs",
-"tog-hideminor"           => "Hide minor edits in recent changes",
-"tog-usenewrc"            => "Enhanced recent changes (not for all browsers)",
-"tog-numberheadings"      => "Auto-number headings",
-"tog-showtoolbar"         =>"Show edit toolbar",
-"tog-editondblclick"      => "Edit pages on double click (JavaScript)",
-"tog-editsection"         =>"Enable section editing via [edit] links",
-"tog-editsectiononrightclick"=>"Enable section editing by right clicking<br /> on section titles (JavaScript)",
-"tog-showtoc"             =>"Show table of contents<br />(for articles with more than 3 headings)",
-"tog-rememberpassword"    => "Remember password across sessions",
-"tog-editwidth"           => "Edit box has full width",
-"tog-watchdefault"                => "Add pages you edit to your watchlist",
-"tog-minordefault"                => "Mark all edits minor by default",
-"tog-previewontop"                => "Show preview before edit box and not after it",
-"tog-nocache"             => "Disable page caching",
-
 );
 
 class LanguageTt extends LanguageUtf8 {
@@ -186,22 +122,12 @@ class LanguageTt extends LanguageUtf8 {
 		return $wgNamespaceNamesTt;
 	}
 
-	function getQuickbarSettings() {
-		global $wgQuickbarSettingsTt;
-		return $wgQuickbarSettingsTt;
-	}
-
-	function getSkinNames() {
-		global $wgSkinNamesTt;
-		return $wgSkinNamesTt;
-	}
-
 	function getDateFormats() {
 		global $wgDateFormatsTt;
 		return $wgDateFormatsTt;
 	}
 
-	
+
 	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
@@ -222,23 +148,6 @@ class LanguageTt extends LanguageUtf8 {
 		return $this->date( $ts, $adj ) . ", " . $this->time( $ts, $adj );
 	}
 
-		
-
-	function getValidSpecialPages() {
-		global $wgValidSpecialPagesTt;
-		return $wgValidSpecialPagesTt;
-	}
-
-	function getSysopSpecialPages() {
-		global $wgSysopSpecialPagesTt;
-		return $wgSysopSpecialPagesTt;
-	}
-
-	function getDeveloperSpecialPages() {
-		global $wgDeveloperSpecialPagesTt;
-		return $wgDeveloperSpecialPagesTt;
-	}
-
 	function getMessage( $key ) {
 		global $wgAllMessagesTt;
 		if( isset( $wgAllMessagesTt[$key] ) ) {
diff --git a/languages/LanguageUk.php b/languages/LanguageUk.php
index 24d490424ffe..563e4e5dd41a 100755
--- a/languages/LanguageUk.php
+++ b/languages/LanguageUk.php
@@ -6,14 +6,6 @@
 
 require_once( 'LanguageUtf8.php' );
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
-
 /* private */ $wgNamespaceNamesUk = array(
 	NS_MEDIA            => 'Медіа',
 	NS_SPECIAL          => 'Спеціальні',
@@ -42,14 +34,8 @@ require_once( 'LanguageUtf8.php' );
 /* private */ $wgSkinNamesUk = array(
 	'standard' => "Стандартне",
 	'nostalgia' => "Ностальгія",
-	'cologneblue' => "Кельнське Синє",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
- "myskin" => "MySkin" 
-);
+	'cologneblue' => "Кельнське Синє"
+) + $wgSkinNamesEn;
 
 
 /* private */ $wgDateFormatsUk = array(
@@ -128,18 +114,16 @@ require_once( 'LanguageUtf8.php' );
 "mainpagetext"	=> "Програмне забезпечення вікі встановлено.",
 "about"			=> "Про",
 "aboutsite"      => "Про Вікіпедію",
-"aboutpage"		=> "$wgMetaNamespace:Про",
+"aboutpage"		=> "{{ns:project}}:Про",
 "help"			=> "Довідка",
-"helppage"		=> "$wgMetaNamespace:Довідка",
-"wikititlesuffix" => "$wgSitename",
+"helppage"		=> "{{ns:project}}:Довідка",
 "bugreports"	=> "Звіт про помилку",
-"bugreportspage" => "$wgMetaNamespace:Звіт_про_помилку",
+"bugreportspage" => "{{ns:project}}:Звіт_про_помилку",
 "sitesupport"   => "Sitesupport",
-"sitesupportpage" => "", # Не з'явиться, якщо не встановлено. Може бути вікі-сторінкою або URL
 "faq"			=> "Часті питання",
-"faqpage"		=> "$wgMetaNamespace:Часті питання",
+"faqpage"		=> "{{ns:project}}:Часті питання",
 "edithelp"		=> "Довідка про редагування",
-"edithelppage"	=> "$wgMetaNamespace:Як_редагувати_статті",
+"edithelppage"	=> "{{ns:project}}:Як_редагувати_статті",
 "cancel"		=> "Відмінити",
 "qbfind"		=> "Знайти",
 "qbbrowse"		=> "Переглянути",
@@ -176,10 +160,9 @@ require_once( 'LanguageUtf8.php' );
 "redirectedfrom" => "(Перенаправлено з $1)",
 "lastmodified"	=> "Остання зміна $1.",
 "viewcount"		=> "Цю статтю переглядали $1 разів.",
-"gnunote" => "Всі тексти доступні на умовах ліцензії <a class=internal href='/wiki/GNU_FDL'>GNU Free Documentation License</a> версії 1.2 або пізнішої версії, опублікованої Free Software Foundation; без Незмінюваних розділів, без Текстів, розміщуваних на обкладинці; неприпустимо добавляти подібні секції. All text is available under the terms of the <a class=internal href='/wiki/GNU_FDL'>GNU Free Documentation License</a>, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts; no such sections allowed to be added.",
 "printsubtitle" => "(Матеріал з {{SERVER}})",
 "protectedpage" => "Захищена стаття",
-"administrators" => "$wgMetaNamespace:Адміністратори",
+"administrators" => "{{ns:project}}:Адміністратори",
 "sysoptitle"	=> "Необхідний рівень доступу Оператор",
 "sysoptext"		=> "Дана дія може бути виконана тільки користувачами з правами \"Оператор\". Див. $1.",
 "developertitle" => "Необхіден рівень доступу Розробник",
@@ -187,7 +170,7 @@ require_once( 'LanguageUtf8.php' );
 "nbytes"		=> "$1 байт(ів)",
 "go"			=> "Перейти",
 "ok"			=> "OK",
-"sitetitle"		=> $wgSitename,
+"sitetitle"		=> '{{SITENAME}}',
 "sitesubtitle"	=> "Вільна енциклопедія",
 "retrievedfrom" => "Отримано від \"$1\"",
 "newmessages" => "Ви отримали $1.",
@@ -250,7 +233,7 @@ MySQL повернув помилку \"$3: $4\".\n",
 "viewsource" => "Переглянути початковий текст",
 "protectedtext" => "Ця сторінка була заблокована, щоб не допустити
 зміни; для цього можуть бути різні причини, подивіться будь-ласка
-[[$wgMetaNamespace:Захищена стаття]].
+[[{{ns:project}}:Захищена стаття]].
 
 You can view and copy the source of this page:",
 
@@ -270,12 +253,7 @@ You can view and copy the source of this page:",
 "newusersonly"	=> " (тільки для нових користувачів)",
 "remembermypassword" => "Запам'ятовувати ваш пароль між сеансами.",
 "loginproblem"	=> "<b>Проблема при вході в систему.</b><br />попробуйте ще раз!",
-"alreadyloggedin" => "<font color=red><b>Користувач $1, ви вже ввійшли в систему!</b></font><br />\n",
-
-"areyounew"		=> "Якщо ви новачок в технології Вікіпедії й хочете стати користувачем,
-введіть ім'я користувача, а потім введіть і повторіть пароль.
-Заповніть поле с адресою вашої електронної пошти; якщо ви забудете ваш пароль, ви зможете зробити запит, щоб новий пароль був відправлений вам на вказану вами адресу.<br />\n",
-
+"alreadyloggedin" => "<strong>Користувач $1, ви вже ввійшли в систему!</strong><br />\n",
 "login"			=> "Вхід в систему",
 "userlogin"		=> "Вхід в систему",
 "logout"		=> "Вийти з системи",
@@ -318,7 +296,7 @@ You can view and copy the source of this page:",
 "blockedtitle"	=> "Користувача заблоковано",
 "blockedtext"	=> "Ваш користувач чи IP-адреса заблоковані $1.
 Причина блокування:<br />''$2''<p>Ви можете зв'язатися з $1 чи іншим
-[[$wgMetaNamespace:Администратори|администратором]] що обговорити блокування.
+[[{{ns:project}}:Администратори|администратором]] що обговорити блокування.
 Зверніть увагу, що ви не можете використовувати функцію \"Надіслати електронного листа користувачу\", якщо ви не вказали адресу вашої електронної пошти в Ваших [[Спеціальні:Настройки|настройках]]
 Ваша IP-адреса - $3. Будь-ласка, вказуйте, якщо будете запитувати про блокування.
 ==Зауваження для користувачів America On-Line==
@@ -327,7 +305,7 @@ You can view and copy the source of this page:",
 "newarticle"	=> "(Нова)",
 "newarticletext" => "Ви перейшли на статтю, яка поки що не існує.
 Щоб створити нову статтю, наберіть текст в вікні нижче
-(див. [[$wgMetaNamespace:Довідка|довідкову статтю]] щоб отримати більше інформації).
+(див. [[{{ns:project}}:Довідка|довідкову статтю]] щоб отримати більше інформації).
 Якщо ви опинились тут помилково, просто натисніть кнопку браузера '''назад'''.",
 "anontalkpagetext" => "---- ''Це сторінка обговорення, що належить анонімному користувачу, який ще не зареєструвався або не скористався зареєстрованим ім'ям. Тому ми вимушені використовувати [[IP-адресу]] для його ідентифікації. Одна IP-адреса може використовуватися декількома користувачами. Якщо ви - анонімний користувач і вважаєте, що отримали коментарі, адресовані не вам, будь ласка [[Спеціальні:Вхід_в_систему|зареєструйтесь або ввійдіть в систему як зареєстрований користувач]], щоб в майбутньому уникнути можливої плутанини з іншими анонімними користувачами.'' ",
 "noarticletext" => "(На даний момент текст в цієї статті відсутній)",
@@ -419,29 +397,7 @@ GNU Free Documentation License без незмінюваних секцій
 Пошук в просторі імен :<br />
 $1<br />
 $2 Показувати перенаправлення   Пошук на $3 $9",
-"searchdisabled" => "<p>Повнотекстовий пошук тимчасово недоступний через перевантаження сервера; передбачається, що ця функція буде знову включена після установки нового обладнання. Поки що ми пропонуємо вам скористатися пошуковою машиною google:</p>
-
-<!-- SiteSearch Google -->
-<FORM method=GET action=\"http://www.google.com.ua/search\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td>
-<A HREF=\"http://www.google.com.ua/\">
-<IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
-border=\"0\" ALT=\"Google\"></A>
-</td>
-<td>
-<INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
-<INPUT type=submit name=btnG VALUE=\"Google Search\">
-<font size=-1>
-<input type=hidden name=domains value=\"{$wgServer}\"><br /><input type=radio
-name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch
-value=\"{$wgServer}\" checked> {$wgServer} <br />
-<input type='hidden' name='ie' value='$2'>
-<input type='hidden' name='oe' value='$2'>
-</font>
-</td></tr></TABLE>
-</FORM>
-<!-- SiteSearch Google -->
-",
+"searchdisabled" => "<p>Повнотекстовий пошук тимчасово недоступний через перевантаження сервера; передбачається, що ця функція буде знову включена після установки нового обладнання. Поки що ми пропонуємо вам скористатися пошуковою машиною google:</p>",
 "blanknamespace" => "(Основне)",
 
 # Preferences page
@@ -453,7 +409,7 @@ value=\"{$wgServer}\" checked> {$wgServer} <br />
 "prefslogintext" => "Ви ввійшли в систему як \"$1\".
 Ваш внутрішній ідентифікаційний номер - $2.
 
-Див. [[$wgMetaNamespace:Допомога по настройкам]] що розібратися з настройками.",
+Див. [[{{ns:project}}:Допомога по настройкам]] що розібратися з настройками.",
 "prefsreset"	=> "Настройки були повернуті в стандартний стан.",
 "qbsettings"	=> "Настройки панелі навігації",
 "changepassword" => "Змінити пароль",
@@ -493,7 +449,7 @@ value=\"{$wgServer}\" checked> {$wgServer} <br />
 #
 "changes" => "редагування",
 "recentchanges" => "Нові редагування",
-# This is the default text, and can be overriden by editing [[$wgMetaNamespace::Recentchanges]]
+# This is the default text, and can be overriden by editing [[{{ns:project}}::Recentchanges]]
 "recentchangestext" => "На цій сторінці представлені останні редагування в Вікіпедії.",
 "rcloaderr"		=> "Завантаження нових редагувань",
 "rcnote"		=> "Нижче відображені останні <strong>$1</strong> редагувань за останні(й) <strong>$2</strong> день(і,ів).",
@@ -564,11 +520,9 @@ value=\"{$wgServer}\" checked> {$wgServer} <br />
 ",
 "filename"		=> "Назва файлу",
 "filedesc"		=> "Опис файлу",
-"affirmation"	=> "Я підтверджую, що власник авторських прав на це файл згоден розповсюджувати його на наступних умовах  $1.",
-"copyrightpage" => "$wgMetaNamespace:Авторське право",
+"copyrightpage" => "{{ns:project}}:Авторське право",
 "copyrightpagename" => "Авторські права в Вікіпедії",
 "uploadedfiles"	=> "Завантажені файли",
-"noaffirmation" => "Ви повинні підтвердити, що дане завантаження не порушує будь-чиїх авторських прав.",
 "ignorewarning"	=> "Ігнорувати попередження й все одно записати файл.",
 "minlength"		=> "Назва зображення повинна містити хоча б три символи.",
 "badfilename"	=> "Назва зображення було змінено на \"$1\".",
@@ -667,7 +621,7 @@ value=\"{$wgServer}\" checked> {$wgServer} <br />
 "unusedimagestext" => "<p>Будь-ласка, врахуйте, що інші веб-сайти (подібно інших мовних розділів Вікіпедії) можуть використовувати пряме посилання (URL) на це зображення, і тому зображення може активно використовуватися не дивлячись на його присутність в цьому списку.",
 "booksources"	=> "Джерела книг",
 "booksourcetext" => "Нижче наведено список посилань на інші веб-сайти, де продаються нові та такі, що були в користуванні книги, а також там  може бути інформація про книги, які ви шукаєте.
-$wgSitename ніяк не зв’язані з будь-якими з них, і цей список не може розглядатися як їх підтримка.",
+{{SITENAME}} ніяк не зв’язані з будь-якими з них, і цей список не може розглядатися як їх підтримка.",
 "alphaindexline" => "від $1 до $2",
 
 # Email this user
@@ -744,7 +698,7 @@ $3...
 "historywarning" => "Попередження: Стаття, яку ви збираєтеся вилучити, має журнал редагувань: ",
 "confirmdeletetext" => "Ви ось-ось назавжди вилучите статтю чи файл і всі її журнали редагувань з бази даних.
 Будь-ласка, підтвердіть, що ви бажаєте зробити це, що ви повністю розумієте наслідки й що ви робите це в відповідності з
-[[$wgMetaNamespace:Правила|правилами Вікіпедії]].",
+[[{{ns:project}}:Правила|правилами Вікіпедії]].",
 "actioncomplete" => "Дію виконано",
 "deletedtext"	=> "\"$1\" було вилучено.
 Див. $2 для перегляду списку останніх вилучень.",
@@ -771,7 +725,7 @@ $3...
 "revertpage"	=> "Відкинуть всі редагування до зробленого $1",
 "protectlogpage" => "Журнал_захисту",
 "protectlogtext" => "Нижче наведено список установок й зняття захисту з сторінки.
-Додаткова інформація: [[$wgMetaNamespace:Захищена стаття]].",
+Додаткова інформація: [[{{ns:project}}:Захищена стаття]].",
 "protectedarticle" => "захист на [[$1]] встановлено",
 "unprotectedarticle" => "захист з [[$1]] знято",
 
@@ -787,7 +741,7 @@ $3...
 "undeletebtn" => "Відновити!",
 "undeletedarticle" => "\"$1\" відновлена",
 "undeletedtext"   => "Статтю [[$1]] було відновлено.
-Див. [[$wgMetaNamespace:Список_вилучень]] щоб переглянути список останніх вилучень та відновлень.",
+Див. [[{{ns:project}}:Список_вилучень]] щоб переглянути список останніх вилучень та відновлень.",
 
 # Contributions
 #
@@ -814,13 +768,12 @@ $3...
 "blockip"		=> "Заблокувати IP-адресу",
 "blockiptext"	=> "Використовуйте форму що нижче, щоб заблокувати можливість збереження з вказаної IP-адреси.
 Це може бути зроблене виключно для попередження вандалізму і тільки в відповідності до
-[[$wgMetaNamespace:Правила|правил Вікіпедії]].
+[[{{ns:project}}:Правила|правил Вікіпедії]].
 Нище вкажіть конкретную причину (наприклад, процитуйте деякі статті з ознаками вандалізму).",
 "ipaddress"		=> "IP-адреса/Імя користувача",
 "ipbreason"		=> "Причина",
 "ipbsubmit"		=> "Заблокувати доступ цьому користувачу ",
 "badipaddress"	=> "Користувача з таким іменем не існує.",
-"noblockreason" => "Ви повинні описати причину блокування.",
 "blockipsuccesssub" => "Блокування проведено",
 "blockipsuccesstext" => "\"$1\" заблоковано.
 <br />См. [[Спеціальні:Список_заблокованих_IP|список заблокованих IP]] щоб взнати, які IP-адреси заблоковані.",
@@ -857,18 +810,6 @@ IP-адреси.",
 <br />Не забудьте її розблокувати після завершення обслуговування.",
 "unlockdbsuccesstext" => "Базу даних Вікіпедії розблоковано.",
 
-# SQL query
-#
-"asksql"		=> "SQL-запит",
-"asksqltext"	=> "Використовуйте форму що нижче, щоб виконати прямий запит до бази даних Вікіпедії.
-Використовуйте одинарні кавички ('як ось тут') для обмеження рядків (string).
-Дана функція часто призводить до перевантаження сервера, тому використовуйте її обережно (не дуже часто).",
-"sqlislogged"	=> "Будь-ласка, зверніть увагу, що всі запити протоколюються.",
-"sqlquery"		=> "Введіть запит",
-"querybtn"		=> "Підтвердіть запит",
-"selectonly"	=> "Запити, інакші чим \"SELECT\", доступні тільки розробникам Вікіпедії.",
-"querysuccessful" => "Запит виконано",
-
 # Move page
 #
 "movepage"		=> "Перемістити статтю",
@@ -953,8 +894,7 @@ class LanguageUk extends LanguageUtf8 {
 		return wfMsg( $wgMonthNamesGenEn[$key-1] );
 	}
 
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesUk;
 		if( isset( $wgAllMessagesUk[$key] ) ) {
 			return $wgAllMessagesUk[$key];
diff --git a/languages/LanguageUtf8.php b/languages/LanguageUtf8.php
index 05e79867e888..67433b86a5a6 100644
--- a/languages/LanguageUtf8.php
+++ b/languages/LanguageUtf8.php
@@ -19,11 +19,11 @@ if( function_exists( 'mb_strtoupper' ) ) {
 	mb_internal_encoding('UTF-8');
 } else {
 	# Hack our own case conversion routines
-	
+
 	# Loading serialized arrays is faster than parsing code :P
 	$wikiUpperChars = $wgMemc->get( $key1 = "$wgDBname:utf8:upper" );
 	$wikiLowerChars = $wgMemc->get( $key2 = "$wgDBname:utf8:lower" );
-	
+
 	if(empty( $wikiUpperChars) || empty($wikiLowerChars )) {
 		require_once( "includes/Utf8Case.php" );
 		$wgMemc->set( $key1, $wikiUpperChars );
@@ -38,7 +38,7 @@ if( function_exists( 'mb_strtoupper' ) ) {
 class LanguageUtf8 extends Language {
 
 	# These two functions use mbstring library, if it is loaded
-	# or compiled and character mapping arrays otherwise. 
+	# or compiled and character mapping arrays otherwise.
 	# In case of language-specific character mismatch
 	# it should be dealt with in Language classes.
 
@@ -62,7 +62,7 @@ class LanguageUtf8 extends Language {
 		}
 		return ucfirst( $string );
 	}
-	
+
 	function lcfirst( $string ) {
 		if (function_exists('mb_strtolower')) {
 			return mb_strtolower(mb_substr($string,0,1)).mb_substr($string,1);
@@ -83,7 +83,7 @@ class LanguageUtf8 extends Language {
 		# all strtolower on stripped output or argument
 		# should be removed and all stripForSearch
 		# methods adjusted to that.
-		
+
 		wfProfileIn( "LanguageUtf8::stripForSearch" );
 		if( function_exists( 'mb_strtolower' ) ) {
 			$out = preg_replace(
@@ -117,7 +117,7 @@ class LanguageUtf8 extends Language {
 		# Check for non-UTF-8 URLs
 		$ishigh = preg_match( '/[\x80-\xff]/', $s);
 		if(!$ishigh) return $s;
-		
+
 		$isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
                 '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
 		if( $isutf8 ) return $s;
@@ -128,7 +128,7 @@ class LanguageUtf8 extends Language {
 	function firstChar( $s ) {
 		preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
 		'[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})/', $s, $matches);
-		
+
 		return isset( $matches[1] ) ? $matches[1] : "";
 	}
 
diff --git a/languages/LanguageWa.php b/languages/LanguageWa.php
index 6049cda03990..fe96a5757f20 100644
--- a/languages/LanguageWa.php
+++ b/languages/LanguageWa.php
@@ -9,13 +9,6 @@ require_once( "LanguageUtf8.php" );
 # NOTE: cweri après "NOTE:" po des racsegnes so des ratournaedjes
 # k' i gn a.
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesWa = array(
 	NS_MEDIA          => "Media", /* Media */
 	NS_SPECIAL        => "Sipeciås", /* Special */
@@ -23,7 +16,7 @@ require_once( "LanguageUtf8.php" );
 	NS_TALK           => "Copene", /* Talk */
 	NS_USER	          => "Uzeu", /* User */
 	NS_USER_TALK      => "Uzeu_copene", /* User_talk */
-	NS_PROJECT        => "Wikipedia", /* Wikipedia */ 
+	NS_PROJECT        => "Wikipedia", /* Wikipedia */
 	NS_PROJECT_TALK => "Wikipedia_copene", /* Wikipedia_talk */
 	NS_IMAGE          => "Imådje", /* Image */
 	NS_IMAGE_TALK     => "Imådje_copene", /* Image_talk */
@@ -41,81 +34,18 @@ require_once( "LanguageUtf8.php" );
 	"Nole bår", "Aclawêye a hintche", "Aclawêye a droete", "Flotante a hintche"
 );
 
-/* private */ $wgSkinNamesWa = array(
-	"Sitandård", "Nostaldjike", "Bleu Cologne", "Paddington", "Montparnasse"
-);
-
-
 /* private */ $wgDateFormatsWa = array( /* cwè fé chal ??? */
 #	"Nole preferince",
 );
 
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-####
-#### Li no des pådjes ni s' pout nén (co?) ratourner
-#### Name of the pages is not (yet?) translatable
-####
-/* private */ $wgValidSpecialPagesWa = array(
-	"Userlogin"	=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "Candjî mes preferinces",
-	"Watchlist"	=> "Mes pådjes shuvowes",
-	"Recentchanges" => "Dierins candjmints",
-	"Upload"	=> "Eberweter des imådjes",
-	"Imagelist"	=> "Djivêye des imådjes",
-	"Listusers"	=> "Uzeus eredjîstrés",
-	"Statistics"	=> "Sitatistikes del waibe",
-	"Randompage"	=> "Årtike a l'&nbsp;astcheyance",
-
-	"Lonelypages"	=> "Årtikes ôrfulins",
-	"Unusedimages"	=> "Imådjes ôrfulinnes",
-	"Popularpages"	=> "Årtikes les pus léjhous",
-	"Wantedpages"	=> "Årtikes les pus rcwerous",
-	"Shortpages"	=> "Årtikes les pus courts",
-	"Longpages"	=> "Årtikes les pus longous",
-	"Newpages"	=> "Årtikes novelmint askepyîs",
-	"Ancientpages"	=> "Årtikes les pus vîs",
-	"Intl"		=> "Loyéns eterlingaedjes",
-	"Allpages"	=> "Totes les påjdes reléjhowes sol tite",
-
-	"Ipblocklist"	=> "Uzeus/adresses IP di blokés",
-	"Maintenance"	=> "Pådje di manaedjmint",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"	=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"	=> "",
-	"Booksources"	=> "External book sources", # co a fé
-	"Categories"	=> "Categoreyes des pådjes",
-	"Export"	=> "XML page export", # co a fé
-	
-);
-
-/* private */ $wgSysopSpecialPagesWa = array(
-	"Makesysop"		=> "Diner a èn uzeu on livea di manaedjeu",
-	"Blockip"		=> "Bloker èn uzeu/ene adresse IP",
-	"Asksql"		=> "Query the database", # co a fé
-	"Undelete"		=> "Rapexhî des disfacêyès pådjes"
-);
-
-/* private */ $wgDeveloperSpecialPagesWa = array(
-	"Lockdb"		=> "Mete li båze di dnêyes e môde seulmint-lére",
-	"Unlockdb"		=> "Rimete l'&nbsp;accès po scrire al båze di dnêyes",
-	"Debug"			=> "Informåcion di disbugaedje"
-);
-
 /* private */ $wgAllMessagesWa = array(
 # User Toggles
 
 "tog-underline" => "Sorlignî les loyéns",
 "tog-highlightbroken" => "Håyner les vudes loyéns <a href=\"\" class=\"new\">come çouchal</a><br /> &nbsp;&nbsp;&nbsp; (oudonbén: come çouchal<a href=\"\" class=\"internal\">?</a>).",
 "tog-justify"	=> "Djustifyî les hagnons",
-"tog-hideminor" => "Èn nén moster les <i>dierins candjmints</i> mineurs", 
+"tog-hideminor" => "Èn nén moster les <i>dierins candjmints</i> mineurs",
 "tog-usenewrc" => "Ramidrés <i>dierins candjmints</i> (nén tos les betchteus)",
 "tog-numberheadings" => "Limerotaedje otomatike des tites",
 "tog-editondblclick" => "Candjî les pådjes avou on dobe-clitch (JavaScript)",
@@ -178,11 +108,9 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "Wikipedia:Å dfait",
 "help"			=> "Aidance",
 "helppage"		=> "Wikipedia:Aidance",
-"wikititlesuffix" => "Wikipedia",
 "bugreports"	=> "Rapoirts di bugs",
 "bugreportspage" => "Wikipedia:Rapoirts di bugs",
 "sitesupport"	=> "Ecwårlaedje",
-"sitesupportpage" => "", # If not set, won't appear. Can be wiki page or URL
 "faq"			=> "FAQ", # co a fé
 "faqpage"		=> "Wikipedia:FAQ", # co a fé
 "edithelp"		=> "Aidance",
@@ -310,7 +238,7 @@ Cweraedje: $2
 ",
 "viewsource" => "Vey côde sourdant",
 "protectedtext" => "Cisse pådje chal a stî protedjeye siconte des candjmints;
-i gn a sacwantès råjhons po çoula, loukîz 
+i gn a sacwantès råjhons po çoula, loukîz
 [[{{ns:4}}:Pådje protedjeye]] s'&nbsp;i vs plait.
 
 Mins nerén vos ploz vey eyet copyî li côde sourdant del pådje:",
@@ -335,15 +263,7 @@ Vosse conte a stî ahivé.
 "newusersonly"	=> " (seulmint po les noveas uzeus)",
 "remembermypassword" => "Rimimbrer m'&nbsp;sicret inte les sessions.",
 "loginproblem"	=> "<b>Åk n'&nbsp;a nén stî tot vs elodjant.</b><br />Rissayîz!",
-"alreadyloggedin" => "<font color=red><b>Uzeu $1, vos estoz ddja elodjî!</b></font><br />",
-
-"areyounew"		=> "Si vos estoz novea so {{SITENAME}} et ki vos vloz
-on conte d'&nbsp;uzeu, tapez on no no d'&nbsp;uzeu ki vos vloz eployî,
-et poy deus côps on on scret (li minme, on côp dins tchake boesse).
-Come rawete vos ploz (mins c'&nbsp;est nén oblidjî) dner voste adresse
-emile; ça vént a pont si vos rovyîz vosse sicret, po dmander k'&nbsp;on
-vs evoye èn ôte pa emile.<br />\n",
-
+"alreadyloggedin" => "<strong>Uzeu $1, vos estoz ddja elodjî!</strong><br />",
 "login"			=> "S'&nbsp;elodjî",
 "loginprompt"		=> "Vos dvoz permete les coûkes po vs elodjî so Wikipedia.",
 "userlogin"		=> "S' elodjî", # pont d' "nbsp" chal
@@ -356,11 +276,11 @@ vs evoye èn ôte pa emile.<br />\n",
 "userexists"	=> "Li no d'&nbsp;uzeu ki vs avoz tchoezi est ddja eployî. Tchoezixhoz è èn ôte s'&nbsp;i vs plait.",
 "youremail"		=> "Vost emile*",
 "yournick"		=> "Vosse no metou (po les sinateures)",
-"emailforlost"	=> "Les tchamps avou ene sitoele (*) 
+"emailforlost"	=> "Les tchamps avou ene sitoele (*)
 èn sont nén obligatweres.<br />
-L'&nbsp;adresse emile, si vos ndè dnez ene, vos permetrè di rçure et 
-d'&nbsp;evoyî des emiles å dtruviè di cisse waibe chal, sins vos dveur 
-diner voste adresse emile, çoula vos srè eto foirt ahessåve si vos rovyîz 
+L'&nbsp;adresse emile, si vos ndè dnez ene, vos permetrè di rçure et
+d'&nbsp;evoyî des emiles å dtruviè di cisse waibe chal, sins vos dveur
+diner voste adresse emile, çoula vos srè eto foirt ahessåve si vos rovyîz
 måy vosse sicret (on novea scret vos pôrè-st esse evoyî pa emile).<br />
 Vosse vraiy no, si vos l'&nbsp;dinez, pôrè esse eployî po mete a costé
 di vos ovraedjes.",
@@ -421,7 +341,7 @@ If this happens to you, please email an administrator, using an AOL email addres
 "Vos avoz clitchî so on loyén viè ene pådje ki n'&nbsp;egzistêye nén co.
 Mins '''vos''' l'&nbsp;poloz askepyî! Po çoula, vos n'&nbsp;avoz k'&nbsp;a
 cmincî a taper vosse tecse dins l'&nbsp;boesse di tecse chal pa dzo
-(alez vey li [[Wikipedia:Aidance|pådje d'&nbsp;aidance]] po pus 
+(alez vey li [[Wikipedia:Aidance|pådje d'&nbsp;aidance]] po pus
 d'&nbsp;informåcion).
 Si vos n'&nbsp;voloz nén scrire cisse pådje chal, clitchîz simplumint
 sol boton '''En erî''' di vosse betchteu waibe po rivni al pådje di dvant.",
@@ -479,7 +399,7 @@ Vos dvrîz tuzer a pårti l'&nbsp;pådje e pus ptits bokets.</strong>",
 Do côp, vos n'&nbsp;såroz schaper vos candjmints asteure; motoit vos dvrîz copyî et aclaper l'&nbsp;tecse dins on fitchî da vosse pol poleur rimete sol {{SITENAME}} pus tård.</strong>",
 "protectedpagewarning" => "<strong>ASTEME: Cisse pådje chal a stî protedjeye siconte
 des candjmints, seulmint les uzeus avou èn accès di manaedjeu el polèt candjî.
-Acertinez vs ki vos shuvoz les 
+Acertinez vs ki vos shuvoz les
 [[Project:Rîles_po_les_pådjes_protedjeyes|rîles po les pådjes
 protedjeyes]].</strong>",
 
@@ -540,29 +460,7 @@ $2 Håyner les redjiblaedjes &nbsp; Cweri après $3 $9",
 "searchdisabled" => "<p>Mande escuzes! Li cweraedje å dvins des årtikes a stî dismetou
 pol moumint, cåze ki l'&nbsp;sierveu est fortcherdjî.
 Tot ratindant, vos ploz eployî Google po fé les rcweraedjes,
-mins çoula pout esse ene miete vî.</p>
-  
-<!-- SiteSearch Google -->
-<FORM method=GET action=\"http://www.google.com/search\">
-<TABLE bgcolor=\"#FFFFFF\"><tr><td>
-<A HREF=\"http://www.google.com/\">
-<IMG SRC=\"http://www.google.com/logos/Logo_40wht.gif\"
-border=\"0\" ALT=\"Google\"></A>
-</td>
-<td>
-<INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
-<INPUT type=submit name=btnG VALUE=\"Cweri avou Google\">
-<font size=-1>
-<input type=hidden name=domains value=\"{$wgServer}\"><br />
-<input type=radio name=sitesearch value=\"\"> sol waibe 
-<input type=radio name=sitesearch value=\"{$wgServer}\" checked> so {$wgServer} <br />
-<input type='hidden' name='hl' value='wa'>
-<input type='hidden' name='ie' value='$2'>
-<input type='hidden' name='oe' value='$2'>
-</font>
-</td></tr></TABLE>
-</FORM>
-<!-- SiteSearch Google -->",
+mins çoula pout esse ene miete vî.</p>",
 "blanknamespace" => "(Mwaisse)",
 
 # Preferences page
@@ -577,7 +475,7 @@ Vosse divintrin idintifiant est l'&nbsp;limero $2.
 Loukîz a [[Wikipedia:Aidance so les preferinces]] po saveur çou k'&nbsp;c'&nbsp;est tchaeke des tchuzes des preferinces des uzeus.",
 "prefsreset"	=> "Les preferinces ont stî rmetowes come d'&nbsp;avance a
 pårti des wårdêyès valixhances.",
-"qbsettings"	=> "Apontiaedjes pol bår di menu", 
+"qbsettings"	=> "Apontiaedjes pol bår di menu",
 "changepassword" => "Candjî l'&nbsp;sicret",
 "skin"			=> "Pea",
 "math"			=> "Håynaedje des formules matematikes",
@@ -648,7 +546,7 @@ dzo Wikipedia.",
 vos pleur eberweter des fitchîs.",
 "uploaderror"	=> "Aroke d'&nbsp;eberwetaedje",
 "uploadtext"	=> "'''ASTEME!''' Divant d'&nbsp;eberweter on
-fitchî chal, léjhoz et s'&nbsp;vos asseurer di bén shure 
+fitchî chal, léjhoz et s'&nbsp;vos asseurer di bén shure
 les [[Project:Rîles_po_l'_eployaedje_des_imådjes|rîles po l'&nbsp;eployaedje des imådjes]]
 di Wikipedia.
 
@@ -658,7 +556,7 @@ Dj'&nbsp;ô bén ki, a moens ki vos vôrîz mete a djoû on fitchî tot
 l'&nbsp;replaeçant pa on pus noû, vos dvrîz tofer vos acertiner
 k'&nbsp;i n'&nbsp;a nén ddja on fitchî do minme no.
 
-Po håyner ou cweri des imådjes k'&nbsp;ont ddja stî rçuvowes, 
+Po håyner ou cweri des imådjes k'&nbsp;ont ddja stî rçuvowes,
 alez sol [[Sipeciås:Imagelist|djivêye des imådjes dedja eberwetêyes]].
 Les eberwetaedjes et disfaçaedjes sont metous èn on
 [[Project:Djournå_des_eberwetaedjes|djournå des eberwetaedjes]].
@@ -679,7 +577,7 @@ londjin.
 Les cognes di fitchîs k'&nbsp;on-z a ptchî c'&nbsp;est li JPEG po
 les imådjes foto, eyet li PNG po les dessins, mapes, drapeas, imådjetes...
 et li OGG po les sons.
-S'&nbsp;i vs plait, dinez a vosse fitchî on no ki dit bén çou 
+S'&nbsp;i vs plait, dinez a vosse fitchî on no ki dit bén çou
 k'&nbsp;c'&nbsp;est, c'&nbsp;est pus åjhey insi.
 Po håyner l'&nbsp;imådje dins èn årtike, eployîz on loyén del
 foûme '''<nowiki>[[imådje:fitchî.jpg]]</nowiki>''' ou
@@ -701,14 +599,9 @@ Totes les eures sont metowes e tins univiersel (UTC).
 "filedesc"		=> "Discrijhaedje",
 "filestatus"		=> "Abondroets ey eployaedje",
 "filesource"		=> "Sourdant",
-"affirmation"	=> "Dj'&nbsp;acertinêye ki l'&nbsp;djin k'&nbsp;a les
-abondroets po ci fitchî chal est d'&nbsp;acoird di l'&nbsp;eplaidî dizo
-les condicions del $1.",
 "copyrightpage" => "Wikipedia:Abondroets",
 "copyrightpagename" => "Abondroets Wikipedia",
 "uploadedfiles"	=> "Fitchîs eberwetés",
-"noaffirmation" => "Vos dvoz acertiner ki l'&nbsp;fitchî ki vos eberwetez
-pout bén esse eployî sins aler siconte des abondroets do fitchî.",
 "ignorewarning"	=> "Passer houte des adviertixhmints eyet schaper tot l'&nbsp;minme li fitchî.",
 "minlength"		=> "Les imådjes divèt aveur des nos di pol moens troes letes.",
 "badfilename"	=> "Li no d'&nbsp;l'&nbsp;imådje a stî candjî a «$1».",
@@ -765,7 +658,7 @@ Dj'&nbsp;ô bén k'&nbsp;i gn a ene moyene di <b>$5</b> candjmints par pådje,
 eyet <b>$6</b> riwaitaedjes po on candjmint.",
 "userstatstext" => "I gn a <b>$1</b> uzeus d'&nbsp;eredjîstrés.
 <b>$2</b> di zels sont eto des manaedjeus (riloukîz a $3).
-                                                                                
+
 <p><h2>Des ôtes pus spepieusès statistikes</h2><p>
 Des pus spepieusès statistikes åd dilong des moes sont
 <a href='/stats/WA/Sitemap.htm' class='internal'>chal</a>.
@@ -795,7 +688,7 @@ Tchaeke roye a-st on loyén viè l'&nbsp;prumî eyet l'&nbsp;deujhinme redjiblae
 "mispeelings"           => "Pådjes avou des flotches",
 "mispeelingstext"               => "Les pådjes shuvantes ont ene ou sacwante
 flotche, di cenes metowes so $1. Li scrijhaedje corek pout esse mostré inte
-åtchetes a costé do mot må scrît.", 
+åtchetes a costé do mot må scrît.",
 "mispeelingspage"       => "Djivêye des flotches les pus corantes",
 "missinglanguagelinks"  => "Loyéns di lingaedjes ki mankèt",
 "missinglanguagelinksbutton"    => "Trover les loyéns di lingaedjes ki mankèt po",
@@ -842,12 +735,12 @@ chal èn doet nén esse veyowe come èn aspoya ou nerén ene reclame.",
 #
 "mailnologin"	=> "Nole adresse d'&nbsp;evoyeu",
 "mailnologintext" => "Po-z evoyî èn emile a èn ôte uzeu i vs fåt esse [[Sipeciås:Userlogin|elodjî]]
-eyet aveur ene adresse emile d'&nbsp;evoyeu ki soeye valide 
+eyet aveur ene adresse emile d'&nbsp;evoyeu ki soeye valide
 dins vos [[Sipeciås:Preferences|preferinces]].",
 "emailuser"		=> "Emiler a l'&nbsp;uzeu",
 "emailpage"		=> "Emilaedje a èn uzeu",
 "emailpagetext"	=> "Si cist uzeu chal a dné ene adresse emile valide dins
-ses preferins, vos lyi ploz evoyî èn emile a pårti di cisse pådje chal. 
+ses preferins, vos lyi ploz evoyî èn emile a pårti di cisse pådje chal.
 L'&nbsp;adresse emile k'&nbsp;i gn a dins vos preferinces serè-st eployeye
 come adresse di l'&nbsp;evoyeu (adresse «From:» di l'&nbsp;emile),
 po ki l'&nbsp;riçuveu poye risponde.",
@@ -939,7 +832,7 @@ disfaçaedjes. Totes les dates et eures sont-st e tins univiersel (UTC).
 "rollbackfailed" => "Rollback failed", # co a fé
 "cantrollback"	=> "Cannot revert edit; last contributor is only author of this article.", # co a fé
 "alreadyrolled"	=> "Cannot rollback last edit of [[$1]]
-by [[Uzeu:$2|$2]] ([[Uzeu copene:$2|Copene]]); someone else has edited or rolled back the article already. 
+by [[Uzeu:$2|$2]] ([[Uzeu copene:$2|Copene]]); someone else has edited or rolled back the article already.
 
 Li dierin candjmint a stî fwait pa [[Uzeu:$3|$3]] ([[Uzeu copene:$3|Copene]]). ",
 #   only shown if there is an edit comment
@@ -1007,7 +900,6 @@ pages that were vandalized).", # co a fé
 "ipbreason"		=> "Råjhon",
 "ipbsubmit"		=> "Bloker cist uzeu",
 "badipaddress"	=> "Nol uzeu avou ç'&nbsp;no la.",
-"noblockreason" => "Vos dvoz dner ene råjhon pol blocaedje.",
 "blockipsuccesssub" => "Li blocaedje a stî comifåt",
 "blockipsuccesstext" => "«$1» a stî bloké.
 <br />Loukîz li [[Sipeciås:Ipblocklist|Djivêye des blocaedjes]] po candjî on blocaedje.",
@@ -1024,7 +916,7 @@ to a previously blocked IP address.", # co a fé
 "autoblocker"	=> "Bloké otomaticmint paski vos eployîz li minme adresse IP ki «%s». Råjhon do blocaedje «%s».",
 "blocklogpage"	=> "Block_log", # co a fé
 "blocklogentry"	=> '«$1» a stî bloké',
-"blocklogtext"	=> "This is a log of user blocking and unblocking actions. Automatically 
+"blocklogtext"	=> "This is a log of user blocking and unblocking actions. Automatically
 blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
 the list of currently operational bans and blocks.", # co a fé
 "unblocklogentry"	=> '«$1» a stî disbloké',
@@ -1053,20 +945,6 @@ Please confirm that this is what you intend to do.", # co a fé
 <br />Remember to remove the lock after your maintenance is complete.", # co a fé
 "unlockdbsuccesstext" => "The database has been unlocked.", # co a fé
 
-# SQL query
-#
-"asksql"		=> "SQL query", # co a fé
-"asksqltext"	=> "Use the form below to make a direct query of the
-database.
-Use single quotes ('like this') to delimit string literals.
-This can often add considerable load to the server, so please use
-this function sparingly.", # co a fé
-"sqlislogged"	=> "Please note that all queries are logged.", # co a fé
-"sqlquery"		=> "Enter query", # co a fé
-"querybtn"		=> "Submit query", # co a fé
-"selectonly"	=> "Only read-only queries are allowed.", # co a fé
-"querysuccessful" => "Query successful", # co a fé
-
 # Move page
 #
 "movepage"		=> "Displaecî l'&nbsp;pådje",
@@ -1156,98 +1034,68 @@ class LanguageWa extends LanguageUtf8 {
 		return $wgQuickbarSettingsWa;
 	}
 
-	function getSkinNames() {
-		global $wgSkinNamesWa;
-		return $wgSkinNamesWa;
-	}
-
 	function getDateFormats() {
 		global $wgDateFormatsWa;
 		return $wgDateFormatsWa;
 	}
-	
-	
+
+
 	###
 	### Dates in Walloon are "1î d' <monthname>" for 1st of the month,
 	### "<day> di <monthname>" for months starting by a consoun, and
 	### "<day> d' <monthname>" for months starting with a vowel
 	###
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		global $wgAmericanDates, $wgUser, $wgUseDynamicDates;
 
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-		
+
 		$m = substr( $ts, 4, 2 );
 		$n = substr( $ts, 6, 2 );
 
 		if ($n == 1) {
-		    $d = "1î d'&nbsp;" . $this->getMonthName( $m ) . 
+		    $d = "1î d'&nbsp;" . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
 		} else if ($n == 2 || $n == 3 || $n == 20 || $n == 22 || $n == 23) {
-		    $d = (0 + $n) . " d'&nbsp;" . $this->getMonthName( $m ) . 
+		    $d = (0 + $n) . " d'&nbsp;" . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
 		} else if ($m == 4 || $m == 8 || $m == 10) {
-		    $d = (0 + $n) . " d'&nbsp;" . $this->getMonthName( $m ) . 
+		    $d = (0 + $n) . " d'&nbsp;" . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
 		} else {
 		    $d = (0 + $n) . " di " . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
 		}
-		  
+
 		return $d;
 	}
 
-	function time( $ts, $adj = false )
-	{
+	function time( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
 		return $t;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		#return $this->time( $ts, $adj ) . " " . $this->date( $ts, $adj );
 		return $this->date( $ts, $adj ) . " a " . $this->time( $ts, $adj );
 	}
 
-		
-
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesWa;
-		return $wgValidSpecialPagesWa;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesWa;
-		return $wgSysopSpecialPagesWa;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesWa;
-		return $wgDeveloperSpecialPagesWa;
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesWa;
-		
+
 		if(array_key_exists($key, $wgAllMessagesWa))
 			return $wgAllMessagesWa[$key];
 		else
 			return parent::getMessage($key);
 	}
 
-	function getAllMessages()
-	{
+	function getAllMessages() {
 		global $wgAllMessagesWa;
 		return $wgAllMessagesWa;
 	}
-	
+
 }
 
 ?>
diff --git a/languages/LanguageZh.php b/languages/LanguageZh.php
index f7f3255fdd19..f2052eef6c18 100644
--- a/languages/LanguageZh.php
+++ b/languages/LanguageZh.php
@@ -25,7 +25,7 @@ class ZhConverter extends LanguageConverter {
 		$this->mTables['zh-hk'] = array_merge($this->mTables['zh-tw'], $this->mTables['zh-hk']);
     }
 
-	/* there shouldn't be any latin text in Chinese conversion, so no need 
+	/* there shouldn't be any latin text in Chinese conversion, so no need
 	   to mark anything
     */
 	function markNoConversion($text) {
@@ -33,7 +33,7 @@ class ZhConverter extends LanguageConverter {
 	}
 
 	function convertCategoryKey( $key ) {
-		return $this->autoConvert( $key, 'zh-cn' ); 
+		return $this->autoConvert( $key, 'zh-cn' );
 	}
 }
 
@@ -42,20 +42,20 @@ class ZhConverter extends LanguageConverter {
    right now it only distinguish zh_cn, zh_tw, zh_sg and zh_hk.
 */
 class LanguageZh extends LanguageZh_cn {
-	
+
 	function LanguageZh() {
 		global $wgHooks;
-		$this->mConverter = new ZhConverter($this, 'zh', 
+		$this->mConverter = new ZhConverter($this, 'zh',
                                             array('zh', 'zh-cn', 'zh-tw', 'zh-sg', 'zh-hk'),
 											array('zh'=>'zh-cn',
 												  'zh-cn'=>'zh-sg',
 												  'zh-sg'=>'zh-cn',
 												  'zh-tw'=>'zh-hk',
-												  'zh-hk'=>'zh-tw'));	   
+												  'zh-hk'=>'zh-tw'));
 		$wgHooks['ArticleSaveComplete'][] = $this->mConverter;
 	}
 
-	
+
 	# this should give much better diff info
 	function segmentForDiff( $text ) {
 		return preg_replace(
@@ -81,7 +81,7 @@ class LanguageZh extends LanguageZh_cn {
 				"' ' .\"$1\"", $string);
 
         //always convert to zh-cn before indexing. it should be
-		//better to use zh-cn for search, since conversion from 
+		//better to use zh-cn for search, since conversion from
 		//Traditional to Simplified is less ambiguous than the
 		//other way around
 
diff --git a/languages/LanguageZh_cn.php b/languages/LanguageZh_cn.php
index eedeef1a8fc4..4892c5aa1060 100644
--- a/languages/LanguageZh_cn.php
+++ b/languages/LanguageZh_cn.php
@@ -5,13 +5,6 @@
   */
 require_once( "LanguageUtf8.php" );
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesZh_cn = array(
 	NS_MEDIA            => "Media",
 	NS_SPECIAL          => "Special",
@@ -35,93 +28,23 @@ require_once( "LanguageUtf8.php" );
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsZh_cn = array(
-	"无", /* "None" */ 
-	"左侧固定", /* "Fixed left" */ 
-	"右侧固定", /* "Fixed right" */ 
-	"左侧漂移" /* "Floating left" */ 	
+	"无", /* "None" */
+	"左侧固定", /* "Fixed left" */
+	"右侧固定", /* "Fixed right" */
+	"左侧漂移" /* "Floating left" */
 );
 
 /* private */ $wgSkinNamesZh_cn = array(
 	'standard' => "标准",
 	'nostalgia' => "怀旧",
-	'cologneblue' => "科隆香水蓝",
-	'smarty' => "Paddington",
-	'montparnasse' => "Montparnasse",
-	'davinci' => "DaVinci",
-	'mono' => "Mono",
-	'monobook' => "MonoBook",
-	'myskin' => "MySkin"
-);
+	'cologneblue' => "科隆香水蓝"
+) + $wgSkinNamesEn;
 
 /* private */ $wgUserTogglesZh_cn = array(
 	'nolangconversion',
 ) + $wgUserTogglesEn;
 
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesZh_cn = array(
-	"Userlogin"		=> "",
-	"Userlogout"	=> "",
-	"Preferences"	=> "参数设置", 
-/*"Set my user preferences", */
-	"Watchlist"		=> "监视列表",
-/* "My watchlist", */
-	"Recentchanges" => "最近更新",
-/* "Recently updated pages", */
-	"Upload"		=> "上载",
-/* "Upload image files", */
-	"Imagelist"		=> "图像列表",
-/* "Image list", */
-	"Listusers"		=> "注册用户",
-/* "Registered users", */
-	"Statistics"	=> "站点统计",
-/* "Site statistics", */
-	"Randompage"	=> "随机页面",
-/* "Random article", */
-
-	"Lonelypages"	=> "孤立页面",
-/* "Orphaned articles",*/
-	"Unusedimages"	=> "孤立图像",
-/* "Orphaned images", */
-	"Popularpages"	=> "热点条目",
-/* "Popular articles", */
-	"Wantedpages"	=> "待撰页面",
-/* "Most wanted articles", */
-	"Shortpages"	=> "短条目",
-	"Longpages"		=> "长条目",
-	"Newpages"		=> "新建条目",
-#	"Intl"		=> "跨语言链接", # this page not done yet!
-	"Ancientpages"		=> "Oldest pages",
-	"Allpages"		=> "所有条目",
-
-	"Ipblocklist"	=> "被封IP地址",
-	"Maintenance" => "维护页",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "",
-	"Recentchangeslinked" => "",
-	"Movepage"		=> "",
-	"Booksources"	=> "站外书源",
-#           "Categories" => "页面分类"
-	"Export" => "XML export",
-	"Version" => "Version",
-);
-
-/* private */ $wgSysopSpecialPagesZh_cn = array(
-	"Blockip"		=> "查封一个IP地址",
-	"Asksql"		=> "查询数据库",
-	"Undelete"		=> "恢复被删页面"
-);
-
-/* private */ $wgDeveloperSpecialPagesZh_cn = array(
-	"Lockdb"		=> "设置数据库只读",
-	"Unlockdb"		=> "恢复数据库修改权限",
-);
-
 /* private */ $wgAllMessagesZh_cn = array(
 # User Toggles
 
@@ -190,7 +113,6 @@ require_once( "LanguageUtf8.php" );
 "aboutpage"		=> "Wikipedia:关于",
 "help"			=> "帮助",
 "helppage"		=> "Wikipedia:帮助",
-"wikititlesuffix" => "Wikipedia",
 "bugreports"	=> "错误报告",
 "bugreportspage" => "Wikipedia:错误报告",
 "faq"			=> "常见问题解答",
@@ -233,7 +155,6 @@ require_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(重定向自$1)",
 "lastmodified"	=> "最后更改$1.",
 "viewcount"		=> "本页面已经被浏览$1次。",
-"gnunote" => "所有文本在<a class=internal href='/wiki/GNU_FDL'>GNU自由文档协议证书 </a>下发布",
 "printsubtitle" => "(来自 {{SERVER}})",
 "protectedpage" => "被保护页",
 "administrators" => "Wikipedia:管理员",
@@ -251,7 +172,7 @@ require_once( "LanguageUtf8.php" );
 "retrievedfrom" => "取自\"$1\"",
 "newmessages" => "您有$1。",
 "newmessageslink" => "新信息",
- "editsection"=>"编辑",	 
+ "editsection"=>"编辑",
  "toc" => "目录",
 "showtoc" => "显示",
  	 "hidetoc" => "隐藏",
@@ -295,7 +216,7 @@ MySQL返回错误 \"<tt>$3: $4</tt>\"。",
 "filedeleteerror" => "无法删除文件 \"$1\"。",
 "filenotfound"	=> "找不到文件 \"$1\"。",
 "unexpected"	=> "不正常值: \"$1\"=\"$2\"。",
-"formerror"		=> "错误：无法提交表单",	
+"formerror"		=> "错误：无法提交表单",
 "badarticleerror" => "无法在本页上进行此项操作。",
 "cannotdelete"	=> "无法删除选定的页面或图像（它可能已经被其他人删除了）。",
 "badtitle"		=> "错误的标题",
@@ -318,7 +239,7 @@ MySQL返回错误 \"<tt>$3: $4</tt>\"。",
 "newusersonly"	=> "（仅限新用户）",
 "remembermypassword" => "下次登录记住密码。",
 "loginproblem"	=> "<b>登录有问题。</b><br />再试一次！",
-"alreadyloggedin" => "<font color=red><b>用户$1，您已经登录了!</b></font><br />\n",
+"alreadyloggedin" => "<strong>用户$1，您已经登录了!</strong><br />\n",
 
 "login"			=> "登录",
 "userlogin"		=> "用户登录",
@@ -458,24 +379,7 @@ MySQL返回错误 \"<tt>$3: $4</tt>\"。",
 "searchdisabled" => "<p>Wikipedia内部搜索功能由于高峰时段服务器超载而停止使用。
 您可以暂时通过
 <a href=\"http://google.com/\">google</a>搜索Wikipedia。
-谢谢您的耐心。
-<!-- Search Google -->
-<form id=\"google\" method=\"get\" action=\"http://www.google.com/custom\">
-<table bgcolor=\"#FFFFFF\" cellspacing=0 border=0>
-<tr valign=top><td>
-<a href=\"http://www.google.com/search\">
-<img src=\"http://www.google.com/logos/Logo_40wht.gif\" border=0
-alt=\"Google\" align=\"middle\"></a>
-</td>
-<td>
-<input type=text name=\"q\" size=31 maxlength=255 value=\"$1\">
-<input type=submit name=\"sa\" value=\"Google搜索\">
-<input type=hidden name=\"cof\" value=\"LW:135;L:http://zh.wikipedia.org/upload/wiki.png;LH:133;AH:left;S:http://www.wikiped<font face=arial,sans-serif size=-1>
-<input type=hidden name=\"domains\" value=\"zh.wikipedia.org\"><br />
-<input type=radio name=\"sitesearch\" value=\"\"> 搜索WWW
-<input type=radio name=\"sitesearch\" value=\"zh.wikipedia.org\" checked> 搜索zh.wikipedia.org </font><br />
-</td></tr></table></form>
-<!-- Search Google -->\n",
+谢谢您的耐心。",
 
 # Preferences page
 #
@@ -485,7 +389,7 @@ alt=\"Google\" align=\"middle\"></a>
 "prefslogintext" => "你已经以\"$1\"的身份登录。
 你的内部ID是$2。",
 "prefsreset"	=> "参数重新设置。",
-"qbsettings"	=> "快速导航条设置", 
+"qbsettings"	=> "快速导航条设置",
 "changepassword" => "更改密码",
 "skin"			=> "Skin",
 "math"			=> "数学显示",
@@ -591,11 +495,9 @@ alt=\"Google\" align=\"middle\"></a>
 ",
 "filename"		=> "文件名",
 "filedesc"		=> "简述",
-"affirmation"	=> "我保证本文件的版权持有人同意将其在$1条款下发布。",
 "copyrightpage" => "Wikipedia:版权信息",
 "copyrightpagename" => "Wikipedia版权",
 "uploadedfiles"	=> "已上载文件",
-"noaffirmation" => "您必须保证您上载的文件并没有侵犯版权。",
 "ignorewarning"	=> "忽略警告并保存文件。",
 "minlength"		=> "图像名字必须至少有三个字母。",
 "badfilename"	=> "图像名已被改为\"$1\"。",
@@ -839,7 +741,6 @@ Wikipedia与这些公司并没有任何商业关系，因此本表不应该
 "ipbreason"		=> "原因",
 "ipbsubmit"		=> "查封该地址",
 "badipaddress"	=> "IP地址不正确。",
-"noblockreason" => "您必须说明查封的具体理由。",
 "blockipsuccesssub" => "查封成功",
 "blockipsuccesstext" => "IP地址“$1”已经被查封。
 <br />参看[[Special:被封IP地址列表|被封IP地址列表]]以复审查封。",
@@ -873,17 +774,6 @@ Wikipedia与这些公司并没有任何商业关系，因此本表不应该
 <br />请记住在维护完成后重新开放数据库。",
 "unlockdbsuccesstext" => "Wikipedia数据库重新开放。",
 
-# SQL query
-#
-"asksql"		=> "SQL查询",
-"asksqltext"	=> "用下面的表单对Wikipedia数据库进行直接查询。
-使用单引号（'像这样'） 来分割字串符。
-这样做有可能增加服务器的负担，所以请慎用本功能。",
-"sqlquery"		=> "输入查询",
-"querybtn"		=> "提交查询",
-"selectonly"	=> "除了“SELECT”以外的所有查询都只限Wikipedia发展者使用。",
-"querysuccessful" => "查询成功",
-
 # Move page
 #
 "movepage"		=> "移动页面",
@@ -954,7 +844,7 @@ Wikipedia与这些公司并没有任何商业关系，因此本表不应该
 'blocklogpage' => "封锁记录", //"Block_log",
 'categoriespagetext' => "以下列出所有的页面分类。", //"The following categories exists in the wiki.",
 'categoryarticlecount' => "该类页面共有 $1 条目", //There are $1 articles in this category.",
-'clearyourcache' => "'''注意：''' 保存设置后，要清掉浏览器的缓存才能生效：'''Mozilla:''' 点''刷新'' （或用快键''Ctrl-R''），'''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''。",//"'''Note:''' After saving, you have to clear your browser cache to see the changes: '''Mozilla:''' click ''Reload'' (or ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'clearyourcache' => "'''注意：''' 保存设置后，要清掉浏览器的缓存才能生效：'''Mozilla:''' ''Ctrl-Shift-R'', '''Internet Explorer:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''。",
 'edit' => "编辑", //"Edit",
 'navigation' => "导航", //"Navigation",
 'nstab-category' => "分类", //"Category",
@@ -984,7 +874,7 @@ email address to them, and it can be used to send you a new password if you forg
 'yourrealname' => "真实姓名*", //"Your real name"
 'yourvariant' => "中文字体", //"language variant"
 
-# short names for language variants used for language conversion links. 
+# short names for language variants used for language conversion links.
 # to disable showing a particular link, set it to 'disable', e.g.
 # 'variantname-zh-sg' => 'disable',
 'variantname-zh-cn' => '大陆简体',
@@ -1015,14 +905,14 @@ class LanguageZh_cn extends LanguageUtf8 {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
 		# Aliases
-        if ( 0 == strcasecmp( "特殊", $text ) ) { return -1; }
-        if ( 0 == strcasecmp( "", $text ) ) { return ; }
-        if ( 0 == strcasecmp( "对话", $text ) ) { return 1; }
-        if ( 0 == strcasecmp( "用户", $text ) ) { return 2; }
-        if ( 0 == strcasecmp( "用户对话", $text ) ) { return 3; }
-        if ( 0 == strcasecmp( "Wikipedia_对话", $text ) ) { return 5; }
-        if ( 0 == strcasecmp( "图像", $text ) ) { return 6; }
-        if ( 0 == strcasecmp( "图像对话", $text ) ) { return 7; }
+		if ( 0 == strcasecmp( "特殊", $text ) ) { return -1; }
+		if ( 0 == strcasecmp( "", $text ) ) { return ; }
+		if ( 0 == strcasecmp( "对话", $text ) ) { return 1; }
+		if ( 0 == strcasecmp( "用户", $text ) ) { return 2; }
+		if ( 0 == strcasecmp( "用户对话", $text ) ) { return 3; }
+		if ( 0 == strcasecmp( "Wikipedia_对话", $text ) ) { return 5; }
+		if ( 0 == strcasecmp( "图像", $text ) ) { return 6; }
+		if ( 0 == strcasecmp( "图像对话", $text ) ) { return 7; }
 		return false;
 	}
 
@@ -1036,12 +926,7 @@ class LanguageZh_cn extends LanguageUtf8 {
 		return $wgSkinNamesZh_cn;
 	}
 
-# The date and time functions can be tweaked if need be
-
-	# inherit userAdjust()
- 
-	function date( $ts, $adj = false )
-	{
+	function date( $ts, $adj = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
 		$d = substr( $ts, 0, 4 ) . "年" .
@@ -1050,32 +935,11 @@ class LanguageZh_cn extends LanguageUtf8 {
 		return $d;
 	}
 
-	function timeanddate( $ts, $adj = false )
-	{
+	function timeanddate( $ts, $adj = false ) {
 		return $this->time( $ts, $adj ) . " " . $this->date( $ts, $adj );
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesZh_cn;
-		return $wgValidSpecialPagesZh_cn;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesZh_cn;
-		return $wgSysopSpecialPagesZh_cn;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesZh_cn;
-		return $wgDeveloperSpecialPagesZh_cn;
-
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesZh_cn;
 		if( isset( $wgAllMessagesZh_cn[$key] ) )
 			return $wgAllMessagesZh_cn[$key];
diff --git a/languages/LanguageZh_hk.php b/languages/LanguageZh_hk.php
index 1b0ecdcbbe08..7e55a77b2f33 100644
--- a/languages/LanguageZh_hk.php
+++ b/languages/LanguageZh_hk.php
@@ -5,7 +5,7 @@
   */
 require_once( "LanguageZh_tw.php");
 
-class LanguageZh_hk extends LanguageZh_tw { 
+class LanguageZh_hk extends LanguageZh_tw {
 # Inherit everything for now
 }
 ?>
diff --git a/languages/LanguageZh_sg.php b/languages/LanguageZh_sg.php
index 7543a82e7bed..6e43c3c5410b 100644
--- a/languages/LanguageZh_sg.php
+++ b/languages/LanguageZh_sg.php
@@ -5,7 +5,7 @@
   */
 require_once( "LanguageZh_cn.php");
 
-class LanguageZh_sg extends LanguageZh_cn { 
+class LanguageZh_sg extends LanguageZh_cn {
 # Inherit everything for now
 }
 ?>
diff --git a/languages/LanguageZh_tw.php b/languages/LanguageZh_tw.php
index 805c22e833cf..3770b2377d7c 100644
--- a/languages/LanguageZh_tw.php
+++ b/languages/LanguageZh_tw.php
@@ -6,13 +6,6 @@
 require_once( "LanguageUtf8.php" );
 require_once( "LanguageZh_cn.php" );
 
-# NOTE: To turn off "Current Events" in the sidebar,
-# set "currentevents" => "-"
-
-# The names of the namespaces can be set here, but the numbers
-# are magical, so don't change or move them!  The Namespace class
-# encapsulates some of the magic-ness.
-#
 /* private */ $wgNamespaceNamesZh_tw = array(
 	NS_MEDIA            => "媒體",
 	NS_SPECIAL          => "特殊",
@@ -45,16 +38,7 @@ require_once( "LanguageZh_cn.php" );
         "標準",/* "Standard" */
 	"懷舊",/* "Nostalgia" */
 	"科隆香水藍" /* "Cologne Blue" */
-);
-
-/* private */ $wgMathNamesZh_tw = array(
-	"永遠使用PNG圖像",    /* "Always render PNG" */
-	"如果是簡單的公式使用HTML，否則使用PNG圖像",   /* "HTML if very simple or else PNG" */
-	"如果可以用HTML，否則用PNG圖像",   /* "HTML if possible or else PNG" */
-	"顯示為TeX代碼(使用文字流覽器時)",  /* "Leave it as TeX (for text browsers)" */
-	"推薦為新版流覽器使用"  /* "Recommended for modern browsers" */
-);
-
+) + $wgSkinNamesEn;
 
 /* private */ $wgBookstoreListZh_tw = array(
 	"博客來書店" => "http://www.books.com.tw/exep/openfind_book_keyword.php?cat1=4&key1=$1",
@@ -63,70 +47,6 @@ require_once( "LanguageZh_cn.php" );
 	"新絲書店" => "http://www.silkbook.com/function/Search_List_Book.asp?item=5&text=$1"
 );
 
-# All special pages have to be listed here: a description of ""
-# will make them not show up on the "Special Pages" page, which
-# is the right thing for some of them (such as the "targeted" ones).
-#
-/* private */ $wgValidSpecialPagesZh_tw = array(
-	"Userlogin"		=> "註冊",
-	"Userlogout"	=> "註銷",
-	"Preferences"	=> "參數設置",
-/*"Set my user preferences", */
-	"Watchlist"		=> "監視列表",
-/* "My watchlist", */
-	"Recentchanges" => "最近更新",
-/* "Recently updated pages", */
-	"Upload"		=> "上載文件",
-/* "Upload image files", */
-	"Imagelist"		=> "圖像列表",
-/* "Image list", */
-	"Listusers"		=> "註冊用戶",
-/* "Registered users", */
-	"Statistics"	=> "站點統計",
-/* "Site statistics", */
-	"Randompage"	=> "隨機條目",
-/* "Random article", */
-
-	"Lonelypages"	=> "孤立條目",
-/* "Orphaned articles",*/
-	"Unusedimages"	=> "孤立圖像",
-/* "Orphaned images", */
-	"Popularpages"	=> "熱點條目",
-/* "Popular articles", */
-	"Wantedpages"	=> "待撰條目",
-/* "Most wanted articles", */
-	"Shortpages"	=> "短條目",
-	"Longpages"		=> "長條目",
-	"Newpages"		=> "新建條目",
-#	"Intl"		=> "跨語言鏈接", # this page not done yet!
-	"Ancientpages"		=> "舊條目",
-	"Allpages"		=> "所有條目",
-
-	"Ipblocklist"	=> "被封網址列表",
-	"Maintenance" => "維護頁",
-	"Specialpages"  => "",
-	"Contributions" => "",
-	"Emailuser"		=> "",
-	"Whatlinkshere" => "鏈入頁面",
-	"Recentchangeslinked" => "链出更改",
-	"Movepage"		=> "鏈出更改",
-	"Booksources"	=> "站外書源",
-#           "Categories" => "頁面分類"
-	"Export" => "導出為XML",
-	"Version" => "媒體維基版本",
-);
-
-/* private */ $wgSysopSpecialPagesZh_tw = array(
-	"Blockip"		=> "查封一個網址",
-	"Asksql"		=> "查詢數據庫",
-	"Undelete"		=> "恢復被刪頁面"
-);
-
-/* private */ $wgDeveloperSpecialPagesZh_tw = array(
-	"Lockdb"		=> "設置數據庫只讀",
-	"Unlockdb"		=> "恢復數據庫修改權限",
-);
-
 /* private */ $wgAllMessagesZh_tw = array(
 
 /* User toggles */
@@ -159,11 +79,9 @@ require_once( "LanguageZh_cn.php" );
 "linktrail"		=> "/^([a-z]+)(.*)\$/sD",
 "mainpage"		=> "首頁",
 "about"			=> "關於",
-"aboutwikipedia" => "關於維基百科",
 "aboutpage"		=> "維基百科:關於",
 "help"			=> "幫助",
 "helppage"		=> "維基百科:幫助",
-"wikititlesuffix" => "維基百科",
 "bugreports"	=> "錯誤報告",
 "bugreportspage" => "維基百科:錯誤報告",
 "faq"			=> "常見問題解答",
@@ -182,7 +100,6 @@ require_once( "LanguageZh_cn.php" );
 "currentevents" => "新聞動態",
 "errorpagetitle" => "錯誤",
 "returnto"		=> "返回到$1.",
-"fromwikipedia"	=> "維基百科，自由的百科全書",
 "whatlinkshere"	=> "鏈入頁面",
 "help"			=> "幫助",
 "search"		=> "搜索",
@@ -206,7 +123,6 @@ require_once( "LanguageZh_cn.php" );
 "redirectedfrom" => "(重定向自$1)",
 "lastmodified"	=> "最後更改$1.",
 "viewcount"		=> "本頁面已經被瀏覽$1次。",
-"gnunote" => "所有文本在<a class=internal href='/wiki/GNU_FDL'>GNU自由文檔協議證書 </a>下發佈",
 "printsubtitle" => "(來自 {{SERVER}})",
 "protectedpage" => "被保護頁",
 "administrators" => "維基百科:管理員",
@@ -326,7 +242,7 @@ MySQL返回錯誤 \"<tt>$3: $4</tt>\"。",
 "newusersonly"	=> "（僅限新用戶）",
 "remembermypassword" => "下次登錄記住密碼。",
 "loginproblem"	=> "<b>登錄有問題。</b><br />再試一次！",
-"alreadyloggedin" => "<font color=red><b>用戶$1，您已經登錄了!</b></font><br />\n",
+"alreadyloggedin" => "<strong>用戶$1，您已經登錄了!</strong><br />\n",
 
 "login"			=> "登錄",
 "userlogin"		=> "用戶登錄",
@@ -439,8 +355,6 @@ MySQL返回錯誤 \"<tt>$3: $4</tt>\"。",
 # Search results
 #
 "searchresults" => "搜索結果",
-"searchhelppage" => "維基百科:搜索",
-"searchingwikipedia" => "搜索維基百科",
 "searchresulttext" => "有關搜索維基百科的更多詳情,參見$1。",
 "searchquery"	=> "查詢\"$1\"",
 "badquery"		=> "搜索查詢不正確",
@@ -468,24 +382,7 @@ MySQL返回錯誤 \"<tt>$3: $4</tt>\"。",
 "searchdisabled" => "<p>維基百科內部搜索功能由於高峰時段服務器超載而停止使用。
 您可以暫時通過
 <a href=\"http://google.com.tw/\">google</a>搜索維基百科。
-謝謝您的耐心。
-<!-- Search Google -->
-<form id=\"google\" method=\"get\" action=\"http://www.google.com.tw/custom\">
-<table bgcolor=\"#FFFFFF\" cellspacing=0 border=0>
-<tr valign=top><td>
-<a href=\"http://www.google.com.tw/search\">
-<img src=\"http://www.google.com.tw/logos/Logo_40wht.gif\" border=0
-alt=\"Google\" align=\"middle\"></a>
-</td>
-<td>
-<input type=text name=\"q\" size=31 maxlength=255 value=\"$1\">
-<input type=submit name=\"sa\" value=\"Google搜索\">
-<input type=hidden name=\"cof\" value=\"LW:135;L:http://zh-tw.wikipedia.org/upload/wiki.png;LH:133;AH:left;S:http://www.wikiped<font face=arial,sans-serif size=-1>
-<input type=hidden name=\"domains\" value=\"zh-tw.wikipedia.org\"><br />
-<input type=radio name=\"sitesearch\" value=\"\"> 搜索WWW
-<input type=radio name=\"sitesearch\" value=\"zh-tw.wikipedia.org\" checked> 搜索zh-tw.wikipedia.org </font><br />
-</td></tr></table></form>
-<!-- Search Google -->\n",
+謝謝您的耐心。",
 
 # Preferences page
 #
@@ -597,11 +494,9 @@ alt=\"Google\" align=\"middle\"></a>
 ",
 "filename"		=> "文件名",
 "filedesc"		=> "簡述",
-"affirmation"	=> "我保證本文件的版權持有人同意將其在$1條款下發佈。",
 "copyrightpage" => "維基百科:版權信息",
 "copyrightpagename" => "維基百科版權",
 "uploadedfiles"	=> "已上載文件",
-"noaffirmation" => "您必須保證您上載的文件並沒有侵犯版權。",
 "ignorewarning"	=> "忽略警告並保存文件。",
 "minlength"		=> "圖像名字必須至少有三個字母。",
 "badfilename"	=> "圖像名已被改為\"$1\"。",
@@ -843,7 +738,6 @@ alt=\"Google\" align=\"middle\"></a>
 "ipbreason"		=> "原因",
 "ipbsubmit"		=> "查封該地址",
 "badipaddress"	=> "網址不正確。",
-"noblockreason" => "您必須說明查封的具體理由。",
 "blockipsuccesssub" => "查封成功",
 "blockipsuccesstext" => "網址“$1”已經被查封。
 <br />參看[[特殊:被封網址列表|被封網址列表]]以復審查封。",
@@ -877,17 +771,6 @@ alt=\"Google\" align=\"middle\"></a>
 <br />請記住在維護完成後重新開放數據庫。",
 "unlockdbsuccesstext" => "維基百科數據庫重新開放。",
 
-# SQL query
-#
-"asksql"		=> "SQL查詢",
-"asksqltext"	=> "用下麵的表單對維基百科數據庫進行直接查詢。
-使用單引號（'像這樣'）來分割字串符。
-這樣做有可能增加服務器的負擔，所以請慎用本功能。",
-"sqlquery"		=> "輸入查詢",
-"querybtn"		=> "提交查詢",
-"selectonly"	=> "除了“SELECT”以外的所有查詢都只限維基百科發展者使用。",
-"querysuccessful" => "查詢成功",
-
 # Move page
 #
 "movepage"		=> "移動頁面",
@@ -951,7 +834,7 @@ alt=\"Google\" align=\"middle\"></a>
 'blocklogpage' => "封鎖記錄", //"Block_log",
 'categoriespagetext' => "以下列出所有的頁面分類。", //"The following categories exists in the wiki.",
 'categoryarticlecount' => "該類頁面共有 $1 條目", //There are $1 articles in this category.",
-'clearyourcache' => "'''注意：''' 保存設置後，要清掉瀏覽器的緩存才能生效：'''Mozilla:''' 點''刷新'' （或用快鍵''Ctrl-R''），'''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''。",//"'''Note:''' After saving, you have to clear your browser cache to see the changes: '''Mozilla:''' click ''Reload'' (or ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'clearyourcache' => "'''注意：''' 保存設置後，要清掉瀏覽器的緩存才能生效：'''Mozilla / Firefox:''' ''Ctrl-Shift-R'', '''Internet Explorer:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''。",
 'edit' => "編輯", //"Edit",
 'navigation' => "導航", //"Navigation",
 'nstab-category' => "分類", //"Category",
@@ -993,7 +876,6 @@ email address to them, and it can be used to send you a new password if you forg
 "aboutsite" => "關於 {{SITENAME}}",
 "disclaimers" => "免責聲明",
 "tog-fancysig" => "使用原始簽名 (不產生自動連結)",
-"qbsettingsnote" => '這些設定只會在 \'Standard\' 和 \'CologneBlue\' 面板生效',
 "tog-previewonfirst" => "第一次編輯時顯示原文內容的預覽",
 "copyright" => "本站所有內容允許以下方式利用: $1",
 "loginprompt" => "您必須允許瀏覽器紀錄Cookie才能成功登入 Wikipedia 並順利進行操作",
@@ -1018,14 +900,14 @@ class LanguageZh_tw extends LanguageZh_cn {
 			if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
 		}
 		# Aliases
-        if ( 0 == strcasecmp( "特殊", $text ) ) { return -1; }
-        if ( 0 == strcasecmp( "", $text ) ) { return ; }
-        if ( 0 == strcasecmp( "對話", $text ) ) { return 1; }
-        if ( 0 == strcasecmp( "用戶", $text ) ) { return 2; }
-        if ( 0 == strcasecmp( "用戶對話", $text ) ) { return 3; }
-        if ( 0 == strcasecmp( "維基百科對話", $text ) ) { return 5; }
-        if ( 0 == strcasecmp( "圖像", $text ) ) { return 6; }
-        if ( 0 == strcasecmp( "圖像對話", $text ) ) { return 7; }
+		if ( 0 == strcasecmp( "特殊", $text ) ) { return -1; }
+		if ( 0 == strcasecmp( "", $text ) ) { return ; }
+		if ( 0 == strcasecmp( "對話", $text ) ) { return 1; }
+		if ( 0 == strcasecmp( "用戶", $text ) ) { return 2; }
+		if ( 0 == strcasecmp( "用戶對話", $text ) ) { return 3; }
+		if ( 0 == strcasecmp( "維基百科對話", $text ) ) { return 5; }
+		if ( 0 == strcasecmp( "圖像", $text ) ) { return 6; }
+		if ( 0 == strcasecmp( "圖像對話", $text ) ) { return 7; }
 		return false;
 	}
 
@@ -1044,27 +926,7 @@ class LanguageZh_tw extends LanguageZh_cn {
 		return $wgMathNamesZh_tw;
 	}
 
-	function getValidSpecialPages()
-	{
-		global $wgValidSpecialPagesZh_tw;
-		return $wgValidSpecialPagesZh_tw;
-	}
-
-	function getSysopSpecialPages()
-	{
-		global $wgSysopSpecialPagesZh_tw;
-		return $wgSysopSpecialPagesZh_tw;
-	}
-
-	function getDeveloperSpecialPages()
-	{
-		global $wgDeveloperSpecialPagesZh_tw;
-		return $wgDeveloperSpecialPagesZh_tw;
-
-	}
-
-	function getMessage( $key )
-	{
+	function getMessage( $key ) {
 		global $wgAllMessagesZh_tw;
 		if(array_key_exists($key, $wgAllMessagesZh_tw))
 			return $wgAllMessagesZh_tw[$key];
-- 
cgit v1.2.3


From 037b351c7eefac5b732724094c50cd71e19249d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Thu, 18 Aug 2005 16:06:20 +0000
Subject: wikititlesuffix obsoleted by pagetitle

---
 RELEASE-NOTES           | 2 ++
 includes/OutputPage.php | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dd362fedccba..401790683e70 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -658,6 +658,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   as a proxy debugging aid
 * (bug 3162) Fix 'undefined property page_is_new' error on watchlist
 * (bug 1734) granting db permissions failed with db usernames containg '-'
+* (bug 3170) wikititlesuffix was removed, use pagetitle instead
+
 
 === Caveats ===
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6f4e04666f94..e2e63fc4e826 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -174,7 +174,8 @@ class OutputPage {
 				$name .= ' - '.$taction;
 			}
 		}
-		$this->setHTMLTitle( $name . ' - ' . wfMsg( 'wikititlesuffix' ) );
+		
+		$this->setHTMLTitle( wfMsg( 'pagetitle', $name ) );
 	}
 	function getHTMLTitle() { return $this->mHTMLtitle; }
 	function getPageTitle() { return $this->mPagetitle; }
@@ -809,13 +810,13 @@ class OutputPage {
 
 		$ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
 
-		if ( "" == $this->mHTMLtitle ) {
-			$this->mHTMLtitle = wfMsg( "pagetitle", $this->mPagetitle );
+		if ( '' == $this->getHTMLTitle() ) {
+			$this->setHTMLTitle(  wfMsg( 'pagetitle', $this->getPageTitle() ));
 		}
 
 		$rtl = $wgContLang->isRTL() ? " dir='RTL'" : '';
 		$ret .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n";
-		$ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
+		$ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n";
 		array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
 
 		$ret .= $this->getHeadLinks();
-- 
cgit v1.2.3


From 9fac0680e1fcff884fd884c24311b6b3f23a591d Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 18 Aug 2005 16:06:57 +0000
Subject: Backport from HEAD: typo

---
 docs/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README b/docs/README
index afaef42567a6..2c34d7b77635 100644
--- a/docs/README
+++ b/docs/README
@@ -6,7 +6,7 @@ understand the most importants classes in MediaWiki.
 API documentation is sometime generated and uploaded at:
   http://wikipedia.sourceforge.net/doc/
 
-You can get a fresh version using 'make doc' or mwgendoc.php
+You can get a fresh version using 'make doc' or mwdocgen.php
 in the ../maintenance/ directory.
 
 
-- 
cgit v1.2.3


From 0a099e49ec70fa9e518ef141344f2b8e45ea5cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Thu, 18 Aug 2005 16:27:06 +0000
Subject: Removing some {}

---
 languages/LanguageHu.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/languages/LanguageHu.php b/languages/LanguageHu.php
index 67ac7bb0de89..226a7cce26c2 100644
--- a/languages/LanguageHu.php
+++ b/languages/LanguageHu.php
@@ -146,15 +146,15 @@ if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 "mainpagetext"	=> "Wiki szoftver sikeresen telepítve.",
 "about"			=> "Névjegy",
 "aboutsite"      => "A {{SITENAME}}ROL",
-"aboutpage"		=> "{{{ns:project}}}:Névjegy",
+"aboutpage"		=> "{{ns:project}}:Névjegy",
 "help"			=> "Segítség",
-"helppage"		=> "{{{ns:project}}}:Segítség",
+"helppage"		=> "{{ns:project}}:Segítség",
 "bugreports"	=> "Hibajelentés",
-"bugreportspage" => "{{{ns:project}}}:Hibajelentések",
+"bugreportspage" => "{{ns:project}}:Hibajelentések",
 "faq"			=> "GyIK",
-"faqpage"		=> "{{{ns:project}}}:GyIK",
+"faqpage"		=> "{{ns:project}}:GyIK",
 "edithelp"		=> "Segítség a szerkesztéshez",
-"edithelppage"	=> "{{{ns:project}}}:Hogyan_szerkessz_egy_lapot",
+"edithelppage"	=> "{{ns:project}}:Hogyan_szerkessz_egy_lapot",
 "cancel"		=> "Vissza",
 "qbfind"		=> "Keresés",
 "qbbrowse"		=> "Böngészés",
@@ -193,7 +193,7 @@ if( 0 == strcasecmp( "Wikipédia", $wgSitename ) ) {
 "viewcount"		=> "Ezt a lapot eddig $1 alkalommal látogatták.",
 "printsubtitle" => "(From {{SERVER}})",
 "protectedpage" => "Védett lap",
-"administrators" => "{{{ns:project}}}:Adminisztrátorok",
+"administrators" => "{{ns:project}}:Adminisztrátorok",
 "sysoptitle"	=> "Sysop hozzáférés szükséges",
 "sysoptext"		=> "Az általad kért tevékenységet csak \"sysopok\" végezhetik el.
 Lásd $1.",
@@ -341,7 +341,7 @@ Lépj be a levélben található adatokkal.",
 "blockedtext"	=> "A felhasználói neved vagy IP számod $1 letiltotta.
 Az indoklás:<br />''$2''
 <p>Felveheted a kapcsolatot $1 adminnal vagy bármely más
-[[{{{ns:project}}}:adminisztrátorok|adminisztrátorral]] hogy megvitasd a letiltást.",
+[[{{ns:project}}:adminisztrátorok|adminisztrátorral]] hogy megvitasd a letiltást.",
 "whitelistedittitle" => "A szerkesztéshez be kell lépned",
 "whitelistedittext" => "A szócikkek szerkesztéséhez [[Special:Userlogin|be kell lépned]].",
 "whitelistreadtitle" => "Az olvasáshoz be kell lépned",
@@ -354,7 +354,7 @@ Az indoklás:<br />''$2''
 "newarticletext" =>
 "Egy olyan lapra jutottál ami még nem létezik.
 A lap létrehozásához kezdd el írni a szövegét lenti keretbe
-(a [[{{{ns:project}}}:Segítség|segítség]] lapon lelsz további
+(a [[{{ns:project}}:Segítség|segítség]] lapon lelsz további
 információkat).
 Ha tévedésből jöttél ide, csak nyomd meg a böngésző '''Vissza/Back'''
 gombját.",
@@ -518,13 +518,13 @@ idő a GMT-től eltér (Magyarországon nyáron 2, télen 1).",
 "changes" 		=> "változtatás",
 "recentchanges" => "Friss változtatások",
 "recentchangestext" => "Ezen a lapon követheted a {{SITENAME}} történt legutóbbi
-változtatásokat. [[{{{ns:project}}}:Üdvözlünk_látogató|Üdvözlünk, látogató]]!
-Légy szíves ismerkedj meg az alábbi lapokkal: [[{{{ns:project}}}:GyIK|{{SITENAME}} GyIK]],
-[[{{{ns:project}}}:Irányelvek]] (különösen az [[{{{ns:project}}}:Elnevezési szokások|elnevezési szokásokat]],
-a [[{{{ns:project}}}:Semleges nézőpont|semleges nézőpontot]]), és a
-[[{{{ns:project}}}:Legelterjedtebb baklövések|legelterjedtebb baklövéseket]].
+változtatásokat. [[{{ns:project}}:Üdvözlünk_látogató|Üdvözlünk, látogató]]!
+Légy szíves ismerkedj meg az alábbi lapokkal: [[{{ns:project}}:GyIK|{{SITENAME}} GyIK]],
+[[{{ns:project}}:Irányelvek]] (különösen az [[{{ns:project}}:Elnevezési szokások|elnevezési szokásokat]],
+a [[{{ns:project}}:Semleges nézőpont|semleges nézőpontot]]), és a
+[[{{ns:project}}:Legelterjedtebb baklövések|legelterjedtebb baklövéseket]].
 Ha azt szeretnéd hogy a Wikipedia sikeres legyen akkor nagyon fontos, hogy
-soha ne add hozzá mások [[{{{ns:project}}}:Copyright|jogvédett és nem felhasználható]]
+soha ne add hozzá mások [[{{ns:project}}:Copyright|jogvédett és nem felhasználható]]
 anyagait.
 A jogi problémák komolyan árthatnak a projektnek ezért kérünk arra, hogy ne tegyél
 ilyet.",
@@ -603,7 +603,7 @@ Minden időpont a server idejében (UTC) van megadva.
 "filedesc"		=> "Összefoglaló",
 "filestatus" 	=> "Szerzői jogi állapot",
 "filesource" 	=> "Forrás",
-"copyrightpage" => "{{{ns:project}}}:Copyright",
+"copyrightpage" => "{{ns:project}}:Copyright",
 "copyrightpagename" => "{{SITENAME}} copyright",
 "uploadedfiles"	=> "Felküldött file-ok",
 "ignorewarning"	=> "Mentés a figyelmeztetés figyelmen kívül hagyásával.",
-- 
cgit v1.2.3


From 5d55772111778e077d9ffc07fab243206cb96002 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 18 Aug 2005 17:17:49 +0000
Subject: Fix #3187: watchlist text refer to unexistent "Stop watching" action

---
 RELEASE-NOTES          | 2 +-
 languages/Language.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 401790683e70..23f00e4d7d09 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -659,7 +659,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3162) Fix 'undefined property page_is_new' error on watchlist
 * (bug 1734) granting db permissions failed with db usernames containg '-'
 * (bug 3170) wikititlesuffix was removed, use pagetitle instead
-
+* (bug 3187) watchlist text refer to unexistent "Stop watching" action
 
 === Caveats ===
 
diff --git a/languages/Language.php b/languages/Language.php
index fa15263a42e6..ac312ed5c176 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1211,7 +1211,7 @@ Future changes to this page and its associated Talk page will be listed there,
 and the page will appear '''bolded''' in the [[Special:Recentchanges|list of recent changes]] to
 make it easier to pick out.
 
-<p>If you want to remove the page from your watchlist later, click \"Stop watching\" in the sidebar.",
+<p>If you want to remove the page from your watchlist later, click \"Unwatch\" in the sidebar.",
 'removedwatch'		=> 'Removed from watchlist',
 'removedwatchtext' 	=> "The page \"$1\" has been removed from your watchlist.",
 'watch' => 'Watch',
-- 
cgit v1.2.3


From 0b566fd77415cd589ab45c201545633aae218a10 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 18 Aug 2005 20:01:43 +0000
Subject: quotes errors

---
 languages/LanguageFur.php | 2 +-
 languages/LanguageNds.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages/LanguageFur.php b/languages/LanguageFur.php
index 4553d15255f8..3351a8590a77 100644
--- a/languages/LanguageFur.php
+++ b/languages/LanguageFur.php
@@ -267,7 +267,7 @@ cheste vecje version, (rip) = torne a ripristinâ cheste vecje version.
 'loginerror' => "Erôr te jentrade",
 'loginpagetitle' => "Jentrade dal utent",
 'loginreqtitle'	=> 'Si scugne jentrâ',
-'loginreqpagetext'	=> 'Tu scugnis [[{{ns:special}}:Userlogin|jentrâ']] par viodi lis altris pagjinis.',
+'loginreqpagetext'	=> 'Tu scugnis [[{{ns:special}}:Userlogin|jentrâ\']] par viodi lis altris pagjinis.',
 'loginsuccess' => "Cumò tu sês jentrât te {{SITENAME}} sicu \"$1\".",
 'loginsuccesstitle' => "Jentrât cun sucès",
 'logout' => "Jes",
diff --git a/languages/LanguageNds.php b/languages/LanguageNds.php
index e7a4b07e651d..f7d8f18392fc 100644
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -449,7 +449,7 @@ Dat Textfeld baven wiest de aktuelle Siet.
 Dat Textfeld nerrn wiest diene Ännern.
 Föög diene Ännern in dat Textfeld baven in.
 
-<b>Blots</b> de Text in dat Textfeld baven warrt spiekert, wenn du op Spiekern klickst!<br />",
+<b>Blots</b> de Text in dat Textfeld baven warrt spiekert, wenn du op Spiekern klickst!<br />',
 'yourtext'                      => 'Dien Text',
 'storedversion'          => 'Spiekerte Version',
 'nonunicodebrowser'      => '<strong>Wohrscho: Dien Browser ünnerstütt keen Unicode, wähl en annern Browser, wenn du en Siet ännern wullst.</strong>',
-- 
cgit v1.2.3


From f3a75165f428936b41ed40bcc1f359195a655bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 19 Aug 2005 00:20:55 +0000
Subject: Bug 3190

---
 RELEASE-NOTES                   |   1 +
 includes/SpecialPreferences.php |   7 +-
 languages/LanguageSr.php        | 161 +++++++++++++++++++++++++++++++++-------
 3 files changed, 141 insertions(+), 28 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 23f00e4d7d09..4b42bdf55231 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -660,6 +660,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 1734) granting db permissions failed with db usernames containg '-'
 * (bug 3170) wikititlesuffix was removed, use pagetitle instead
 * (bug 3187) watchlist text refer to unexistent "Stop watching" action
+* (bug 3190) Added some date format choices for language sr
 
 === Caveats ===
 
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index f96efe3399ef..822adcab22c0 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -226,7 +226,7 @@ class PreferencesForm {
 		if( $wgUseTeX ) {
 			$wgUser->setOption( 'math', $this->mMath );
 		}
-		$wgUser->setOption( 'date', $this->validateDate( $this->mDate, 0, 10 ) );
+		$wgUser->setOption( 'date', $this->validateDate( $this->mDate, 0, 20 ) );
 		$wgUser->setOption( 'searchlimit', $this->validateIntOrNull( $this->mSearch ) );
 		$wgUser->setOption( 'contextlines', $this->validateIntOrNull( $this->mSearchLines ) );
 		$wgUser->setOption( 'contextchars', $this->validateIntOrNull( $this->mSearchChars ) );
@@ -378,7 +378,7 @@ class PreferencesForm {
 		$checked = $wgUser->getOption( $tname ) == 1 ? ' checked="checked"' : '';
 		$trailer = $trailer ? $trailer : '';
 		return "<div class='toggle'><input type='checkbox' value='1' id=\"$tname\" name=\"wpOp$tname\"$checked />" .
-			" <span class='toggletext'><label for=\"$tname\">$ttext</label>$trailer</span></div>";
+			" <span class='toggletext'><label for=\"$tname\">$ttext</label>$trailer</span></div>\n";
 	}
 
 	function getToggles( $items ) {
@@ -769,7 +769,8 @@ class PreferencesForm {
 <option value=\"1\"$s1>$msgUnderlinealways</option>
 <option value=\"2\"$s2>$msgUnderlinedefault</option>
 </select>
-</label></div>
+</label>
+</div>
 ");
 		foreach ( $togs as $tname ) {
 			if( !array_key_exists( $tname, $this->mUsedToggles ) ) {
diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 962090e5a3ca..df25b02fa306 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -43,7 +43,19 @@ require_once( "LanguageUtf8.php" );
 ) + $wgSkinNamesEn;
 
 /* private */ $wgDateFormatsSr = array(
-# "Без посебних жеља",
+	'Није битно',
+	'06:12, 5. јануар 2001.',
+	'06:12, 5 јануар 2001',
+	'06:12, 05.01.2001.',
+	'06:12, 5.1.2001.',
+	'06:12, 5. јан 2001.',
+	'06:12, 5 јан 2001',
+	'6:12, 5. јануар 2001.',
+	'6:12, 5 јануар 2001',
+	'6:12, 05.01.2001.',
+	'6:12, 5.1.2001.',
+	'6:12, 5. јан 2001.',
+	'6:12, 5 јан 2001',
 );
 
 
@@ -98,30 +110,30 @@ require_once( "LanguageUtf8.php" );
 'thursday' => "Четвртак",
 'friday' => "Петак",
 'saturday' => "Субота",
-'january' => "Јануар",
-'february' => "Фебруар",
-'march' => "Март",
-'april' => "Април",
-'may_long' => "Мај",
-'june' => "Јуни",
-'july' => "Јули",
-'august' => "Август",
-'september' => "Септембар",
-'october' => "Октобар",
-'november' => "Новембар",
-'december' => "Децембар",
-'jan' => "Јан",
-'feb' => "Феб",
-'mar' => "Мар",
-'apr' => "Апр",
-'may' => "Мај",
-'jun' => "Јун",
-'jul' => "Јул",
-'aug' => "Авг",
-'sep' => "Сеп",
-'oct' => "Окт",
-'nov' => "Нов",
-'dec' => "Дец",
+'january' => "јануар",
+'february' => "фебруар",
+'march' => "март",
+'april' => "април",
+'may_long' => "мај",
+'june' => "јун",
+'july' => "јул",
+'august' => "август",
+'september' => "септембар",
+'october' => "октобар",
+'november' => "новембар",
+'december' => "децембар",
+'jan' => "јан",
+'feb' => "феб",
+'mar' => "мар",
+'apr' => "апр",
+'may' => "мај",
+'jun' => "јун",
+'jul' => "јул",
+'aug' => "авг",
+'sep' => "сеп",
+'oct' => "окт",
+'nov' => "нов",
+'dec' => "дец",
 
 # Bits of text used by many pages:
 #
@@ -1015,6 +1027,105 @@ class LanguageSr extends LanguageUtf8 {
 		return $year ? $number : strtr($this->commafy($number), '.,', ',.' );
 	}
 
+	/**
+	 * @access public
+	 * @param mixed  $ts the time format which needs to be turned into a
+	 *               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	 * @param bool   $adj whether to adjust the time output according to the
+	 *               user configured offset ($timecorrection)
+	 * @param mixed  $format what format to return, if it's false output the
+	 *               default one.
+	 * @param string $timecorrection the time offset as returned by
+	 *               validateTimeZone() in Special:Preferences
+	 * @return string
+	 */
+	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
+
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+
+		$mm = substr( $ts, 4, 2 );
+		$m = 0 + $mm;
+		$mmmm = $this->getMonthName( $mm );
+		$mmm = $this->getMonthAbbreviation( $mm );
+		$dd = substr( $ts, 6, 2 );
+		$d = 0 + $dd;
+		$yyyy =  substr( $ts, 0, 4 );
+		$yy =  substr( $ts, 2, 2 );
+
+		switch( $format ) {
+			case '2':
+			case '8':
+				return "$d $mmmm $yyyy";
+			case '3':
+			case '9':
+				return "$dd.$mm.$yyyy.";
+			case '4':
+			case '10':
+				return "$d.$m.$yyyy.";
+			case '5':
+			case '11':
+				return "$d. $mmm $yyyy.";
+			case '6':
+			case '12':
+				return "$d $mmm $yyyy";
+			default:
+				return "$d. $mmmm $yyyy.";
+		}
+
+	}
+
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*               user configured offset ($timecorrection)
+	* @param mixed  $format what format to return, if it's false output the
+	*               default one (default true)
+	* @param string $timecorrection the time offset as returned by
+	*               validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
+
+		global $wgOut;
+		if ($wgOut) $wgOut->addHTML($format);
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+		$hh = substr( $ts, 8, 2 );
+		$h = 0 + $hh;
+		$mm = substr( $ts, 10, 2 );
+		switch( $format ) {
+			case '7':
+			case '8':
+			case '9':
+			case '10':
+			case '11':
+			case '12':
+				return "$h:$mm";
+			default:
+				return "$hh:$mm";
+		}
+	}
+
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*               user configured offset ($timecorrection)
+	* @param mixed  $format what format to return, if it's false output the
+	*               default one (default true)
+	* @param string $timecorrection the time offset as returned by
+	*               validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
+		$datePreference = $this->dateFormat($format);
+		return $this->time( $ts, $adj, $datePreference, $timecorrection ) . ', ' . $this->date( $ts, $adj, $datePreference, $timecorrection );
+
+	}
+
+
 }
 
 ?>
-- 
cgit v1.2.3


From d7a0dee953d6ff664113b297b2648dfab8c4f62b Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 19 Aug 2005 00:39:38 +0000
Subject: headscripts variable

---
 includes/SkinTemplate.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 496ceeadc0a3..d3f8ee544c66 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -225,6 +225,7 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'jsmimetype', $wgJsMimeType );
 		$tpl->setRef( 'charset', $wgOutputEncoding );
 		$tpl->set( 'headlinks', $out->getHeadLinks() );
+		$tpl->setRef('headscripts', $out->getScript() );
 		$tpl->setRef( 'wgScript', $wgScript );
 		$tpl->setRef( 'skinname', $this->skinname );
 		$tpl->setRef( 'stylename', $this->stylename );
-- 
cgit v1.2.3


From 077edcaaeae96ef51bcfc4b4766f0642a6d30fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 19 Aug 2005 01:21:26 +0000
Subject: * (bug 1334) LanguageGa.php update

---
 RELEASE-NOTES            |    2 +
 languages/LanguageGa.php | 2332 ++++++++++++++++++++++++++++++----------------
 2 files changed, 1550 insertions(+), 784 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4b42bdf55231..3b1c9325dbe3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -661,6 +661,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3170) wikititlesuffix was removed, use pagetitle instead
 * (bug 3187) watchlist text refer to unexistent "Stop watching" action
 * (bug 3190) Added some date format choices for language sr
+* (bug 1334) LanguageGa.php update
+
 
 === Caveats ===
 
diff --git a/languages/LanguageGa.php b/languages/LanguageGa.php
index fd452fa2118b..cac3ca2b1b31 100755
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -1,15 +1,13 @@
 <?php
-/**
-  * @package MediaWiki
-  * @subpackage Language
-  */
 
 /* Gaeilge - Irish */
 
 /*
 Seo é an dara leagan den comhad LanguageGa.php. Úsáidtear an iomaí foclóirí agus
 achmhainní idirlín - má tá aon contrárthacht, pléigh é ar an leathanch phlé ach
-NA HATHRAIGH É GO DÍREACH, MÁS É DO THOIL É!
+NA HATHRAIGH É GO DÍREACH É, MÁS É DO THOIL É!
+
+
 
 This is the second version of the LanguageGa.php file. Multiple dictionaries and
 internet resources have been utilised - if there is any inconsistency or other
@@ -26,117 +24,155 @@ DISCUSSION!
 # How can this be incorporated?
 
 /* private */ $wgNamespaceNamesGa = array(
-	NS_MEDIA            => 'Meán',
+	NS_MEDIA	    => 'Meán',
 	NS_SPECIAL          => 'Speisialta',
-	NS_MAIN	            => '',
-	NS_TALK	            => 'Plé',
+	NS_MAIN             => '',
+	NS_TALK             => 'Plé',
 	NS_USER             => 'Úsáideoir',
 	NS_USER_TALK        => 'Plé_úsáideora',
 	NS_PROJECT          => 'Vicipéid',
-	NS_PROJECT_TALK     => 'Plé_Vicipéide', # NOTE TO DEVELOPERS: A different genitive spelling is needed for
-	                                        # each Wiki name, as can be seen. So the $wgMetaNamespace tag has not been used
-	                                        # here for the moment in some cases, and in other places with a FIXME flag.
+	NS_PROJECT_TALK     => 'Plé_Vicipéide',
+
+ # NOTE TO DEVELOPERS: A different genitive spelling is needed for
+ # each Wiki name, as can be seen. So the $wgMetaNamespace tag has not been used
+ # here for the moment in some cases, and in other places with a FIXME flag.
+ # Perhaps we'll just have to customise each project file.
+
 	NS_IMAGE            => 'Íomhá',
-	NS_IMAGE_TALK       => 'Plé_í­omhá',
+	NS_IMAGE_TALK       => 'Plé_íomhá',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Plé_MediaWiki',
-	NS_TEMPLATE         => 'Múnla',
-	NS_TEMPLATE_TALK    => 'Plé_múnla',
+	NS_TEMPLATE         => 'Teimpléad',
+	NS_TEMPLATE_TALK    => 'Plé_teimpléid',
 	NS_HELP             => 'Cabhair',
 	NS_HELP_TALK        => 'Plé_cabhrach',
-	NS_CATEGORY         => 'Rang',
-	NS_CATEGORY_TALK    => 'Plé_ranga'
+	NS_CATEGORY         => 'Catagóir',
+	NS_CATEGORY_TALK    => 'Plé_catagóire'
 ) + $wgNamespaceNamesEn;
 
+
 /* private */ $wgQuickbarSettingsGa = array(
-	"Faic", "Greamaithe ar chlé", "Greamaithe ar an taobh deas", "Ag faoileáil ar chlé"
+	"Faic", "Greamaithe ar chlé", "Greamaithe ar dheis", "Ag faoileáil ar chlé", "Ag faoileáil ar dheis"
 );
 
 /* private */ $wgSkinNamesGa = array(
 	'standard' => "Gnáth",
 	'nostalgia' => "Sean-nós",
-	'cologneblue' => "Gorm na Colóin",
+	'cologneblue' => "Gorm na Colóna",
 	'smarty' => "Paddington",
 	'montparnasse' => "Montparnasse",
 	'davinci' => "DaVinci",
-	'mono' => "Aondath",
-	'monobook' => "ÚrLeabhar",
-	'myskin' => "Sean-nós Nua"
+	'mono' => "Mono",
+	'monobook' => "MonoBook",
+	"myskin" => "MySkin",
+	'chick' => 'Chick'
 ) + $wgSkinNamesEn;
 
-
 /* private */ $wgDateFormatsGa = array(
-#    "Is cuma liom",
+	'Is cuma liom',
+	'16:12, Eanáir 15, 2001',
+	'16:12, 15 Eanáir 2001',
+	'16:12, 2001 Eanáir 15',
+	'ISO 8601' => '2001-01-15 16:12:34'
 );
 
-# The following exist for the purpose of being translated:
-
 /* private */ $wgMagicWordsGa = array(
-#   ID                                 CASE  SYNONYMS
-	MAG_REDIRECT             => array( 0,    "#redirect", "#athsheoladh"              ),
-	MAG_NOTOC                => array( 0,    "__NOTOC__"              ),
-	MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__"      ),
-	MAG_START                => array( 0,    "__START__"              ),
-	MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH", "MÍREATHA"           ),
-	MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME", "AINMMHÍREATHA"       ),
-	MAG_CURRENTDAY           => array( 1,    "CURRENTDAY", "LÁREATHA"             ),
-	MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME", "AINMLAEREATHA"         ),
-	MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR", "BLIAINREATHA"            ),
-	MAG_CURRENTTIME          => array( 1,    "CURRENTTIME", "AMREATHA"            ),
-	MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES", "MÉIDAILT"       ),
-	MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN"    ), #FIXME - what is this?
-	MAG_SUBST                => array( 1,    "SUBST:"                 ),
-	MAG_MSGNW                => array( 1,    "MSGNW:"                 ),
-	MAG_END                  => array( 0,    "__END__", "__DEIREADH__"             ),
-	MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb", "reamhspléach", "beag"     ),
-	MAG_IMG_RIGHT            => array( 1,    "right", "taobhdeas"                  ),
-	MAG_IMG_LEFT             => array( 1,    "left", "clé"                   ),
-	MAG_IMG_NONE             => array( 1,    "none", "faic"                   ),
-	MAG_IMG_WIDTH            => array( 1,    "$1px"                   ),
-	MAG_IMG_CENTER           => array( 1,    "center", "centre", "lár"       ),
-	MAG_INT                  => array( 0,    "INT:"                   ) #FIXME - what is this?
-
+#   ID	                         CASE  SYNONYMS
+	MAG_REDIRECT             => array( 0,    '#redirect', '#athsheoladh' ),
+	MAG_NOTOC                => array( 0,    '__NOTOC__', '__GANCÁ__'              ),
+	MAG_FORCETOC             => array( 0,    '__FORCETOC__',         '__CÁGACHUAIR__'  ),
+	MAG_TOC                  => array( 0,    '__TOC__', '__CÁ__'                ),
+	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__',    '__GANMHÍRATHRÚ__'  ),
+	MAG_START                => array( 0,    '__START__', '__TÚS__'              ),
+	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH',  'MÍLÁITHREACH'  ),
+	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME',     'AINMNAMÍOSALÁITHREAÍ'  ),
+	MAG_CURRENTMONTHNAMEGEN  => array( 1,    'CURRENTMONTHNAMEGEN',  'GINAINMNAMÍOSALÁITHREAÍ'  ),
+	MAG_CURRENTMONTHABBREV   => array( 1,    'CURRENTMONTHABBREV',   'GIORRÚNAMÍOSALÁITHREAÍ'  ),
+	MAG_CURRENTDAY           => array( 1,    'CURRENTDAY',           'LÁLÁITHREACH'  ),
+	MAG_CURRENTDAYNAME       => array( 1,    'CURRENTDAYNAME',       'AINMANLAELÁITHRIGH'  ),
+	MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR',          'BLIAINLÁITHREACH'  ),
+	MAG_CURRENTTIME          => array( 1,    'CURRENTTIME',          'AMLÁITHREACH'  ),
+	MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES',     'LÍONNANALT'  ),
+	MAG_NUMBEROFFILES        => array( 1,    'NUMBEROFFILES',        'LÍONNAGCOMHAD'  ),
+	MAG_PAGENAME             => array( 1,    'PAGENAME',             'AINMANLGH'  ),
+	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE',            'AINMANLGHB'  ),
+	MAG_NAMESPACE            => array( 1,    'NAMESPACE',            'AINMSPÁS'  ),
+	MAG_MSG                  => array( 0,    'MSG:',                 'TCHT:'  ),
+	MAG_SUBST                => array( 0,    'SUBST:',               'IONAD:'  ),
+	MAG_MSGNW                => array( 0,    'MSGNW:',               'TCHTFS:'  ),
+	MAG_END                  => array( 0,    '__END__',              '__DEIREADH__'  ),
+	MAG_IMG_THUMBNAIL        => array( 1,    'thumbnail', 'thumb',   'mionsamhail', 'mion'  ),
+	MAG_IMG_RIGHT            => array( 1,    'right',                'deas'  ),
+	MAG_IMG_LEFT             => array( 1,    'left',                 'clé'  ),
+	MAG_IMG_NONE             => array( 1,    'none',                 'faic'  ),
+	MAG_IMG_WIDTH            => array( 1,    '$1px'                   ),
+	MAG_IMG_CENTER           => array( 1,    'center', 'centre',     'lár'  ),
+	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame', 'fráma', 'frámaithe' ),
+	MAG_INT                  => array( 0,    'INT:', 'INMH:'                   ),
+	MAG_SITENAME             => array( 1,    'SITENAME',             'AINMANTSUÍMH'  ),
+	MAG_NS                   => array( 0,    'NS:', 'AS:'                    ),
+	MAG_LOCALURL             => array( 0,    'LOCALURL:',            'URLÁITIÚIL'  ),
+	MAG_LOCALURLE            => array( 0,    'LOCALURLE:',           'URLÁITIÚILB'  ),
+	MAG_SERVER               => array( 0,    'SERVER',               'FREASTALAÍ'  ),
+	MAG_SERVERNAME           => array( 0,    'SERVERNAME',            'AINMANFHREASTALAÍ' ),
+	MAG_SCRIPTPATH           => array( 0,    'SCRIPTPATH',           'SCRIPTCHOSÁN'  ),
+	MAG_GRAMMAR              => array( 0,    'GRAMMAR:',             'GRAMADACH:'  ),
+	MAG_NOTITLECONVERT       => array( 0,    '__NOTITLECONVERT__', '__NOTC__', '__GANTIONTÚNADTEIDEAL__', '__GANTT__'),
+	MAG_NOCONTENTCONVERT     => array( 0,    '__NOCONTENTCONVERT__', '__NOCC__', '__GANTIONTÚNANÁBHAIR__', '__GANTA__' ),
+	MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK',          'SEACHTAINLÁITHREACH'  ),
+	MAG_CURRENTDOW           => array( 1,    'CURRENTDOW',           'LÁLÁITHREACHNAS'  ),
+	MAG_REVISIONID           => array( 1,    'REVISIONID',           'IDANLEASAITHE'  ),
 );
 
 #-------------------------------------------------------------------
 # Default messages
 #-------------------------------------------------------------------
 
+# required for copyrightwarning
+global $wgRightsText;
+
 /* private */ $wgAllMessagesGa = array(
-# User Toggles
-#
 
-"tog-underline" => "Cuir lí­nte faoi na lúibí­ní­",
-"tog-highlightbroken" => "Cuir dath dearg ar lúibí­ní­ briste, <a href=\"\" class=\"new\">mar sin</a> (rogha eile: mar sin<a href=\"\" class=\"internal\">?</a>).",
-"tog-justify"   => "Comhfhadaigh na paragraif",
-"tog-hideminor" => "Ná taispeáin fo-eagair sna hathruithe is déanaí",
-"tog-usenewrc" => "Stí­l nua do na hathruithe le déanaí (le JavaScript)",
-"tog-numberheadings" => "Uimhrigh ceannteidil go huathoibrí­och",
-"tog-editondblclick" => "Cuir leathanaigh in eagar le roghna dúbailte (JavaScript)",
-"tog-editsection"=>"Cumasaigh eagarthóireacht mí­r le lúibí­ní­ [athraithe]",
-"tog-editsectiononrightclick"=>"Cumasaigh eagarthóireacht mí­r le deas-roghna<br /> ar ceannteidil (JavaScript)",
-"tog-showtoc"=>"Déan liosta na ceannteideal<br />(do ailt le ní­os mó ná 3 ceannteidil)",
-"tog-rememberpassword" => "Cuimhnigh mo focal faire",
-"tog-editwidth" => "Cuir uasméid ar an mbosca eagair",
-"tog-watchdefault" => "Breathnaigh ar leathanaigh a d'athraigh tú",
-"tog-minordefault" => "Cuir marc mionathraithe ar gach athrú, mar réamhshocrú",
-"tog-previewontop" => "Cuir an réamhthaispeántas os cionn an bhosca eagair, agus ná taobh thí­os de",
-"tog-nocache" => "Ciorraigh an taisce leathanaigh",
-
-# Dates
-#
-# NOTE TO DEVELOPERS: please note that different spellings of days are necessary
-# when talking about a particular day or the day in general. Here they have been
-# rendered in the "particular day" version as that seems more useful; the others,
-# more useful as titles, have been moved outside, as follows:
-#
-'sunday' => 'Dé Domhnaigh', # Domhnach
-'monday' => 'Dé Luain', # Luan
-'tuesday' => 'Dé Mháirt', # Máirt
-'wednesday' => 'Dé Chéadaoin', # Céadaoin
-'thursday' => 'Déardaoin', # same spelling
-'friday' => 'Dé hAoine', # Aoine
-'saturday' => 'Dé Sathairn', # Satharn
+# User Toggles'tog-underline'	         => "Cuir línte faoi na naisc",
+'tog-highlightbroken'	   => "Cuir dath dearg ar naisc briste, <a href=\"\" class=\"new\">mar sin</a>
+(rogha eile: mar sin<a href=\"\" class=\"internal\">?</a>).",
+'tog-justify'	           => "Comhfhadaigh na paragraif",
+'tog-hideminor'	         => "Ná taispeáin fo-athruithe i measc na n-athruithe is déanaí",
+'tog-usenewrc'	          => "Stíl nua do na hathruithe is déanaí (le JavaScript)",
+'tog-numberheadings'	    => "Uimhrigh ceannteidil go huathoibríoch",
+'tog-showtoolbar'		=> 'Taispeáin an barra uirlisí eagair (JavaScript)',
+"tog-editondblclick"	    => "Cuir leathanaigh in eagar le déchliceáil (JavaScript)",
+"tog-editsection"	       =>"Cumasaigh mír-eagarthóireacht le naisc mar seo: [athrú]",
+"tog-editsectiononrightclick"   =>"Cumasaigh mír-eagarthóireacht le deaschliceáil<br> ar ceannteidil (JavaScript)",
+"tog-showtoc"	           =>"Taispeáin an clár ábhair (d'ailt le níos mó ná 3 ceannteidil)",
+"tog-rememberpassword"	  => "Cuimhnigh m'fhocal faire",
+"tog-editwidth"	         => "Cuir uasmhéid ar an mbosca eagair",
+"tog-watchdefault"	      => "Déan faire ar leathanaigh a athraíonn tú",
+"tog-minordefault"	      => "Déan mionathrú de gach aon athrú, mar réamhshocrú",
+"tog-previewontop"	      => "Cuir an réamhamharc os cionn an bhosca eagair, <br>agus ná cuir é taobh thíos de",
+'tog-previewonfirst'	    => 'Taispeáin réamhamharc don chéad athrú',
+"tog-nocache"	           => "Ciorraigh taisce na leathanach",
+
+'tog-enotifwatchlistpages'      => 'Cuir ríomhphost chugam nuair a athraítear leathanaigh',
+'tog-enotifusertalkpages'       => 'Cuir ríomhphost chugam nuair a athraítear mo leathanach phlé úsáideora',
+'tog-enotifminoredits'	  => 'Cuir ríomhphost chugam nuair a dhéantar mionathruithe chomh maith',
+'tog-enotifrevealaddr'	  => 'Taispeáin mo sheoladh ríomhphoist i dteachtaireachtaí fógra',
+'tog-shownumberswatching'       => 'Taispeán an méid úsáideoirí atá ag faire',
+'tog-fancysig'	          => 'Síniuithe bunúsacha (gan nasc uathoibríoch)',
+'tog-externaleditor'	    => 'Bain úsáid as eagarthóir seachtrach, mar réamhshocrú',
+'tog-externaldiff'	      => 'Bain úsáid as difríocht sheachtrach, mar réamhshocrú',
+
+'underline-always' => 'Déan é gach uair é',
+'underline-never' => 'Ná déan é riamh',
+'underline-default' => 'Reamhshocrú ón brabhsálaí',
+
+'sunday' => 'an Domhnach',
+'monday' => 'an Luan',
+'tuesday' => 'an Mháirt',
+'wednesday' => 'an Chéadaoin',
+'thursday' => 'an Déardaoin',
+'friday' => 'an Aoine',
+'saturday' => 'an Satharn',
 'january' => 'Eanáir',
 'february' => 'Feabhra',
 'march' => 'Márta',
@@ -147,277 +183,341 @@ DISCUSSION!
 'august' => 'Lúnasa',
 'september' => 'Meán Fómhair',
 'october' => 'Deireadh Fómhair',
-'november' => 'Mí­ na Samhna',
-'december' => 'Mí­ na Nollag',
+'november' => 'Mí na Samhna',
+'december' => 'Mí na Nollag',
 'jan' => 'Ean',
-'feb' => 'Fea',
-'mar' => 'Már',
+'feb' => 'Feabh',
+'mar' => 'Márta',
 'apr' => 'Aib',
-'may' => 'Bea',
-'jun' => 'Mei',
-'jul' => 'Iúi',
+'may' => 'Beal',
+'jun' => 'Meith',
+'jul' => 'Iúil',
 'aug' => 'Lún',
-'sep' => 'Mea',
-'oct' => 'Dei',
+'sep' => 'MFómh',
+'oct' => 'DFómh',
 'nov' => 'Samh',
-'dec' => 'Nol',
+'dec' => 'Noll',
 
 
 # Bits of text used by many pages:
 #
 # FIXME
 #
-"categories" => "Ranganna leathanaigh",
-"category" => "rang",
-"category_header" => "Ailt sa rang \"$1\"",
-"subcategories" => "Fo-ranganna",
-
-"linktrail"     => "/^([a-z]+)(.*)\$/sD",
-"mainpage"      => "Príomh­leathanach",
-"mainpagetext"  => "D'insealbhaí­odh an oideas mearshuímh go rathúil.",
+'categories' => 'Catagóirí',
+'category' => 'catagóir',
+'category_header' => 'Ailt sa chatagóir "$1"',
+"subcategories" => "Fo-chatagóirí",
+
+"linktrail"     => '/^([a-z]+)(.*)\$/sD',
+"mainpage"      => "Príomhleathanach",
+"mainpagetext"  => "Suiteáladh an ríomhchlár vicí go rathúil.",
 "mainpagedocfooter" => "Féach ar [http://meta.wikimedia.org/wiki/MediaWiki_i18n doiciméid um conas an chomhéadán a athrú]
 agus an [http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide Lámhleabhar úsáideora] chun cabhair úsáide agus fíoraíochta a fháil.",
-'portal'		=> 'Lárionad chomhphobail',
-'portal-url'		=> '{{ns:4}}:Lárionad chomhphobail',
-"about"     => "Faoi",
-"aboutsite"         => "Faoin Vicipéid",
-'article'       => "Clár ábhair",
-"aboutpage"     => "Vicipéid:Faoi",
+
+# NOTE: To turn off "Community portal" in the title links,
+# set "portal" => "-"
+
+'portal'	        => 'Ionad pobail',
+'portal-url'	    => '{{ns:4}}:Ionad pobail',
+"about"     => "Maidir leis",
+"aboutsite"	 => "Maidir le {{SITENAME}}",
+'article'       => "Leathanach ábhair",
+"aboutpage"     => "{{ns:4}}:Maidir leis",
 "help"      => "Cabhair",
-"helppage"      => "Vicipéid:Cabhair",
-"bugreports"    => "Fabht-thuairiscí­",
-"bugreportspage"    => "Vicipéid:Fabht-thuairiscí­",
-"faq"           => "Ceisteanna Coiteanta",
-"faqpage"       => "Vicipéid:Ceisteanna_Coiteanta",
+"helppage"      => "Cabhair:Clár_ábhair",
+"bugreports"    => "Fabht-thuairiscí",
+"bugreportspage"    => "{{ns:4}}:Fabht-thuairiscí",
+'sitesupport'   => 'Síntiúis',
+'sitesupport-url' => '{{ns:4}}:Tacaíocht an tsuímh',
+"faq"	   => "Ceisteanna Coiteanta",
+"faqpage"       => "{{ns:4}}:Ceisteanna_Coiteanta",
 "edithelp"      => "Cabhair eagarthóireachta",
-"newwindow"     => "(osclaítear i fuinneog eile é)",
-"edithelppage"  => "Vicipéid:Conas_a_cuirtear_alt_in_eagar",
-"cancel"        => "Ná déan",
-"qbfind"        => "Faigh",
-"qbbrowse"      => "Siortaigh",
-"qbedit"        => "Athraigh",
-"qbpageoptions" => "An lch seo",
+"newwindow"     => "(osclaítear i bhfuinneog eile é)",
+"edithelppage"  => "Cabhair:Eagarthóireacht",
+"cancel"	=> "Cealaigh",
+"qbfind"	=> "Aimsigh",
+"qbbrowse"      => "Brabhsáil",
+"qbedit"	=> "Cuir in eagar",
+"qbpageoptions" => "An leathanach seo",
 "qbpageinfo"    => "Comhthéacs",
-"qbmyoptions"   => "Mo chuid lgh",
-"qbspecialpages" => "Lgh speisialta",
+"qbmyoptions"   => "Mo chuid leathanaigh",
+"qbspecialpages" => "Leathanaigh speisialta",
 "moredotdotdot" => "Tuilleadh...",
-"mypage"        => "Mo leathanach",
-"mytalk"        => "Mo chuid phlé",
-"anontalk"      => "Plé den IP seo",
-"navigation"    => "Taiscéalaíocht",
-"currentevents" => "Cursaí­ reatha",
+"mypage"	=> "Mo leathanach",
+"mytalk"	=> "Mo chuid phlé",
+"anontalk"      => "Plé don IP seo",
+"navigation"    => "Nascleanúint",
+
+# Metadata in edit box
+'metadata' => '<b>Meiteashonraí</b> (féach ar <a href="$1">here</a> le haghaidh a thuilleadh eolais)',
+'metadata_page' => '{{ns:4}}:Meiteashonraí',
+
+# NOTE: To turn off "Current Events" in the sidebar,
+# set "currentevents" => "-"
+
+"currentevents" => "Cursaí reatha",
+'currentevents-url' => 'Cursaí reatha',
+
+# NOTE: To turn off "Disclaimers" in the title links,
+# set "disclaimers" => "-"
+
 'disclaimers' => 'Séanadh',
-"disclaimerpage" => "{{ns:4}}:Séanadh_ginearálta",-
+"disclaimerpage" => "{{ns:4}}:Séanadh_ginearálta",
 "errorpagetitle" => "Earráid",
 "returnto"      => "Dul ar ais go $1.",
-"tagline"       => "Ón Vicipéid, an chiclipéid shaor.",
-"whatlinkshere" => "Leathanaigh a nascaí­onn chuig an leathanach seo",
+"tagline"       => "Ó {{SITENAME}}.",
+"whatlinkshere" => "Leathanaigh a nascaíonn chuig an leathanach seo",
 "help"      => "Cabhair",
-"search"        => "Cuardaigh",
-"go"            => "Dul",
+"search"	=> "Cuardaigh",
+"go"	    => "Téir",
 "history"       => "Stair an lgh seo",
 'history_short' => 'Stair',
-'info_short'	=> 'Eolas',
+'info_short'    => 'Eolas',
 "printableversion" => "Eagrán inphriontáilte",
-"edit"          => "Athraigh",
+"print"	 => "Priontáil",
+"edit"	  => "Athraigh an lch seo",
 "editthispage"  => "Athraigh an lch seo",
-"delete"        => "Scrios",
+"delete"	=> "Scrios",
 "deletethispage"    => "Scrios an lch seo",
-"undelete_short" => "Cuir ar ais $1 athruithe",
-"undelete_short1" => "Cuir ar ais 1 athruithe",
-"protect"        => "Cuir faoi ghlas",
-"protectthispage" => "Cuir glas ar an lch seo",
-"unprotect"     =>  "Bain an glas",
-"unprotectthispage" => "Bain an glas den lch seo",
+'undelete_short1' => 'Díscrios athrú amháin',
+"undelete_short" => "Díscrios $1 athruithe",
+"protect"	=> "Glasáil",
+"protectthispage" => "Glasáil an lch seo",
+"unprotect"     =>  "Díghlasáil",
+"unprotectthispage" => "Díghlasáil an lch seo",
 "newpage"       => "Leathanach nua",
 "talkpage"      => "Pléigh an lch seo",
 'specialpage' => 'Leathanach Speisialta',
-'personaltools' => 'Uirlisí pearsánta',
-"postcomment"   => "Trácht ar an lch",
+'personaltools' => 'Uirlisí phearsánta',
+"postcomment"   => "Caint ar an lch",
 'addsection'   => '+',
 "articlepage"   => "Féach ar an alt",
 "subjectpage"   => "Féach ar an t-ábhar", # For compatibility
 'talk' => 'Plé',
+'views' => 'Tuairimí',
 'toolbox' => 'Bosca uirlisí',
 "userpage"      => "Féach ar lch úsáideora",
-"wikipediapage" => "Féach ar meitea-lch",
-"imagepage"     => "Féach ar lch í­omhá",
+"wikipediapage" => "Féach ar lch thionscadail",
+"imagepage"     => "Féach ar lch íomhá",
 "viewtalkpage"  => "Féach ar phlé",
-"otherlanguages"    => "Teangacha eile",
+"otherlanguages"    => "I dteangacha eile",
 "redirectedfrom"    => "(Athsheolta ó $1)",
-"lastmodified"  => "Athraí­odh an leathanach seo ag $1.",
-"viewcount"     => "Rochtainí­odh an leathanach seo $1 uair.",
-'copyright'	=> "Tá an t-ábhar le fáil faoin $1.",
-'poweredby'	=> "Cumhachtaítear an Vicipéid le [http://www.mediawiki.org/ MediaWiki], inneall mearshuímh shaor-fhoinse.",
+"lastmodified"  => "Athraíodh an leathanach seo ag $1.",
+"viewcount"     => "Rochtainíodh an leathanach seo $1 uair.",
+'copyright'     => "Tá an t-ábhar le fáil faoin $1.",
+'poweredby'     => "Cumhachtaítear {{SITENAME}} ag [http://www.mediawiki.org/ MediaWiki], vicí-inneall le foinse oscailte.",
 "printsubtitle" => "(Ó {{SERVER}})",
-"protectedpage" => "Lch faoi ghlas",
-"administrators"    => "Vicipéid:Riarthóirí­",
-"sysoptitle"    => "Tá cuntas ceannasaí­ riachtanach",
-"sysoptext"     => "Ní mór duit bheith i do \"ceannasaí­\"
-chun an gní­omh seo a dhéanamh.
+"protectedpage" => "Leathanach glasáilte",
+"administrators"    => "{{ns:4}}:Riarthóirí",
+"sysoptitle"    => "Tá cuntas oibreora córais de dhíth",
+"sysoptext"     => "Ní mór duit bheith i do \"oibreoir córais\"
+chun an gníomh seo a dhéanamh.
 Féach ar $1.",
-"developertitle"    => "Tá cuntas chumadóra riachtanach",
-"developertext" => "Ní mór duit bheith i do \"cumadóir\"
-chun an gní­omh seo a dhéanamh.
+"developertitle"    => "Tá cuntas ríomhchláraitheora de dhíth",
+"developertext" => "Ní mór duit bheith i do \"ríomhchláraitheoir\"
+chun an gníomh seo a dhéanamh.
 Féach ar $1.",
-"nbytes"        => "$1 ochtáin",
-"go"            => "Dul",
-"ok"            => "Déan",
-"sitetitle"     => "Vicipéid",
-'pagetitle'		=> "$1 - Vicipéid",
+
+'badaccess'     => 'Earráid ceada',
+'badaccesstext' => 'Ní féidir an gníomh seo a dhéanamh muna bhfuil
+an cead "$2" agat.
+See $1.',
+
+'versionrequired' => 'Tá leagan $1 de MediaWiki de dhíth',
+'versionrequiredtext' => 'Tá an leagan $1 de MediaWiki riachtanach chun an leathanach seo a úsáid. Féach ar [[Speisialta:Version]]',
+
+
+"nbytes"	=> "$1 beart",
+"go"	    => "Téir",
+"ok"	    => "Déan",
+"sitetitle"     => "{{SITENAME}}",
+'pagetitle'	     => "$1 - {{SITENAME}}",
 "sitesubtitle"  => "An Chiclipéid Shaor",
 "retrievedfrom" => "Fuarthas ar ais ó \"$1\"",
 "newmessages"   => "Tá $1 agat.",
-"newmessageslink" => "teachtaireachtaí­ nua",
+"newmessageslink" => "teachtaireachtaí nua",
 "editsection"   => "athraigh",
-"toc"           => "Clár ábhair",
+"toc"	   => "Clár ábhair",
 "showtoc"       => "taispeáin",
 "hidetoc"       => "folaigh",
 "thisisdeleted" => "Breathnaigh nó cuir ar ais $1?",
 "restorelink"   => "$1 athruithe scriosaithe",
-'feedlinks' => 'Sní eolais:',
-'sitenotice'	=> '-', # the equivalent to wgSiteNotice
+'feedlinks' => 'Fotha:',
+'sitenotice'    => '-', # the equivalent to wgSiteNotice
 
 # Short words for each namespace, by default used in the 'article' tab in monobook
 'nstab-main' => 'Alt',
 'nstab-user' => 'Lch úsáideora',
-'nstab-media' => 'Meán',
+'nstab-media' => 'Lch meáin',
 'nstab-special' => 'Speisialta',
-'nstab-wp' => 'Faoi',
-'nstab-image' => 'Íomhá',
+'nstab-wp' => 'Lch thionscadail',
+'nstab-image' => 'Comhad',
 'nstab-mediawiki' => 'Teachtaireacht',
-'nstab-template' => 'Múnla',
+'nstab-template' => 'Teimpléad',
 'nstab-help' => 'Cabhair',
-'nstab-category' => 'Rang',
+'nstab-category' => 'Catagóir',
 
 # Main script and global functions
 #
-"nosuchaction"  => "Ní­l a leithéid de ghní­omh ann",
-"nosuchactiontext" => "Ní­l aithní­onn an oideas Vicipéide
-an gní­omh ('action') atá ann san lí­onsheoladh.",
-"nosuchspecialpage" => "Ní­l a leithéid de leathanach speisialta ann",
-"nospecialpagetext" => "Ní­l aithní­onn an oideas Vicipéide
-an leathanach speisialta a d'iarr tú ar.",
+"nosuchaction"  => "Níl a leithéid de ghníomh ann",
+"nosuchactiontext" => "Níl aithníonn an vicí an gníomh atá ann sa líonsheoladh.",
+"nosuchspecialpage" => "Níl a leithéid de leathanach speisialta ann",
+"nospecialpagetext" => "Níl aithníonn an vicí an leathanach speisialta a d'iarr tú ar.",
 
 # General errors
 #
-"error"         => "Earráid",
-"databaseerror"     => "Earráid sa bunachar sonraí­",
-"dberrortext"   => "Tharlaigh earráid chomhréir in órdú chuig an bhunachar sonraí­.
+"error"	 => "Earráid",
+"databaseerror"     => "Earráid sa bunachar sonraí",
+"dberrortext"   => "Tharlaigh earráid chomhréire in iarratas chuig an bhunachar sonraí.
 <blockquote><tt>$1</tt></blockquote>, ón suim \"<tt>$2</tt>\",
-an órdú deireanach chuig an bhunachar sonrai.
+an iarratas deireanach chuig an bhunachar sonrai.
 Chuir MySQL an earráid seo ar ais: \"<tt>$3: $4</tt>\".",
-"dberrortextcl"     => "Tharlaigh earráid chomhréir in órdú chuig an bhunachar sonraí­.
+"dberrortextcl"     => "Tharlaigh earráid chomhréire in iarratas chuig an bhunachar
+
+sonraí.
 \"$1\", ón suim \"$2\",
-ab ea an órdú fiosraithe deireanach chuig an bhunachar sonrai,
+ab ea an iarratas fiosraithe deireanach chuig an bhunachar sonrai,
 Chuir MySQL an earráid seo ar ais: \"$3: $4\".\n",
-"noconnect"     => "Tá brón orainn! Chuaigh an oideas Wiki in abar teicniúil, agus theipeadh an nasc leis an mbunachar sonraí­ .",
-"nodb"      => "Theipeadh an rogha den bhunachar sonraí­ $1",
-"cachederror"   => "Seo í­ cóip athscrí­obhtha den leathanach a raibh tú ag lorg (is dócha go nach bhfuil sí­ bord ar bhord leis an eagrán reatha).",
-"readonly"      => "Bunachar sonraí­ faoi ghlas",
-"enterlockreason" => "Iontráil cúis don ghlas, agus meastachán
-den cathain a mbainfear an ghlas de.",
-"readonlytext"  => "Tá an bunachar sonraí­ Vicipéide faoi ghlas anois do iontráilí­ agus athruithe nua
+"noconnect"     => "Tá brón orainn! Tá roinnt deacrachtaí teicniúla ag an vicí faoi
+
+láthair,
+agus ní féidir leis teagmháil a dhéanamh leis an mbunachar sonraí.",
+"nodb"      => "Theip rogha an bhunachair sonraí $1",
+"cachederror"   => "Seo í cóip taisce den leathanach atá á lorg agat (is dócha nach bhfuil sí bord ar bhord leis an leagan
+
+láithreach).",
+'laggedslavemode'   => 'Fógra: B\'fhéidir nach bhfuil an leathanach suas chun dáta.',
+"readonly"      => "Bunachar sonraí glasáilte",
+"enterlockreason" => "Iontráil cúis don glasáil, agus meastachán
+den uair a díghlasálfar an bunachar sonraí.",
+"readonlytext"  => "Tá an bunachar sonraí Vicipéide glasáilte anois do iontráilí agus athruithe nua
 (is dócha go bhfuil sé do gnáthchothabháil).
-Tar éis seo, beidh an bunachar sonraí­ tofa ar ais.
-Thug an riarthóir a ghlasaigh an mí­niú seo:
-<p>$1",
-"missingarticle" => "Chuardaigh an bunachar sonraí­ ar leathanach go mba chóir a bheith faighte, darbh ainm \"$1\". Ní­or bhfuarthas an leathanach.
-
-<p>Ní­ earráid san bunachar sonraí­ é seo, ach b'fhéidir go bhfuair tú amach fabht
-san oideasra MediaWiki. De ghnáth, tarlaí­onn sé sin nuair a leantar nasc staire nó difrí­ochta go leathanach a raibh scriosaithe cheana féin.
-
-<p>Déan nóta den URL le do thoil, agus cuir an ábhar in iúl do riarthóir.",
+Tar éis seo, díghlasálfar an bunachar sonraí arís.
+Tugadh an míniú seo ag an riarthóir a ghlasáil é:
+$1",
+"missingarticle" => "Chuardaigh an bunachar sonraí ar leathanach a mba chóir bheith
+faighte darb teideal \"$1\" ach níor bhfuarthas an leathanach.
+
+Is dócha gur lean tu nasc chuig sean-dhifríocht nó nasc staire a bhaineann le
+leathanach atá scriosta cheana féin.
+
+Muna bhfuil seo an scéal, b'fhéidir go bhfuair tú amach fabht sna bogearraí MediaWiki.
+Déan nóta den URL le do thoil, agus cuir an ábhar in iúl do riarthóir.",
+'readonly_lag' => "Glasáladh an bunachar sonraí go huathoibríoch, mar tá freastalaithe
+sclábhánta an bhunachair sonraí ag teacht suas chun dáta leis an máistirfhreastalaí
+fós.",
 "internalerror" => "Earráid inmhéanach",
-"filecopyerror" => "Ní­ féidir an comhad \"$1\" a chóipeáil go \"$2\".",
-"filerenameerror" => "Ní­ féidir an comhad \"$1\" a athainmnigh bheith \"$2\".",
-"filedeleteerror" => "Ní­ féidir an comhad \"$1\" a scriosaigh amach.",
-"filenotfound"  => "Ní­ bhfuarthas an comhad \"$1\".",
+"filecopyerror" => "Ní féidir an comhad \"$1\" a chóipeáil go \"$2\".",
+"filerenameerror" => "Ní féidir an comhad \"$1\" a athainmnigh mar \"$2\".",
+"filedeleteerror" => "Ní féidir an comhad \"$1\" a scriosaigh amach.",
+"filenotfound"  => "Ní bhfuarthas an comhad \"$1\".",
 "unexpected"    => "Luach gan súil leis: \"$1\"=\"$2\".",
-"formerror"     => "Earráid: ní­ féidir an foirm a tabhair isteach",
-"badarticleerror" => "Ní­ féidir an gní­omh seo a dhéanamh ar an leathanach seo.",
-"cannotdelete"  => "Ní­ féidir an leathanach nó í­omhá sonraithe a scriosaigh. (B'fhéidir go shcriosaigh duine eile é cheana féin.)",
-"badtitle"      => "Teideal neamhbhailí­",
-"badtitletext"  => "Bhí­ teideal an leanthanaigh a d'iarr tú ar neamhbhailí­, folamh, nó
-teideal idirtheangach no idir-Wiki nasctha go mí­cheart.",
-"perfdisabled" => "Tá brón orainnn! Mhí­chumasaí­odh an gné seo go sealadach chun luas an bunachair sonraí­ a chosaint.",
-"perfdisabledsub" => "Seo cóip i dtaisce ó $1:",
-"wrong_wfQuery_params" => "Paraiméadair mí­chearta don wfQuery()<br />
-Feidhm: $1<br />
-Órdú: $2
+"formerror"     => "Earráid: ní féidir an foirm a tabhair isteach",
+"badarticleerror" => "Ní féidir an gníomh seo a dhéanamh ar an leathanach seo.",
+"cannotdelete"  => "Ní féidir an leathanach nó íomhá sonraithe a scriosaigh. (B'fhéidir gur scrios duine eile é cheana féin.)",
+"badtitle"      => "Teideal neamhbhailí",
+"badtitletext"  => "Bhí teideal an leathanaigh a d'iarr tú ar neamhbhailí, folamh, nó
+teideal idirtheangach nó idirvicí nasctha go mícheart.",
+"perfdisabled" => "Tá brón orainn! Díchumasaíodh an gné seo ar feadh tamaill chun luas an bhunachair sonraí a chosaint.",
+"perfdisabledsub" => "Is cóip i dtaisce é seo, ó $1:",
+"wrong_wfQuery_params" => "Paraiméadair míchearta don wfQuery()<br>
+Feidhm: $1<br>
+Iarratas: $2
 ",
-'perfcached' => 'Fuarthas na sonraí seo as dtaisce, agus is dócha nach bhfuil siad reatha:',
+'perfcached' => 'Fuarthas na sonraí seo as dtaisce, agus is dócha nach bhfuil siad suas chun dáta:',
 "viewsource" => "Féach ar fhoinse",
-"protectedtext" => "Chuirtear ghlas ar an leathanach seo chun é a chosaint in aghaidh athruithe. Tá go leor
+"protectedtext" => "Glasáladh an leathanach seo chun é a chosaint i gcoinne athruithe. Tá go leor
 cúiseanna féideartha don scéal seo. Féach ar
-[[{{ns:project}}:Leathanach faoi ghlas]] más é do thoil é.
+[[{{ns:project}}:Leathanach glasáilte]] más é do thoil é.
 
 Is féidir leat foinse an leathanaigh seo a féachaint agus a chóipeáil:",
-
+'sqlhidden' => '(Iarratas SQL folaithe)',
 
 # Login and logout pages
 #
 "logouttitle"   => "Logáil amach",
 "logouttext" => "Tá tú logáilte amach anois.
-Is féidir leat an Vicipéid a úsáid fós gan ainm, nó is féidir leat logáil isteach
-arí­s mar an úsáideoir céanna, nó mar úsáideoir eile. Tabhair faoi deara go taispeáinfear roinnt
- leathanaigh mar atá tú logtha ann fós, go dtí­ go ghlanfá amach do taisce lí­onleitheora\n",
+Is féidir leat an {{SITENAME}} a úsáid fós gan ainm, nó is féidir leat logáil isteach
+arís mar an úsáideoir céanna, nó mar úsáideoir eile. Tabhair faoi deara go taispeáinfear roinnt
+leathanaigh mar atá tú logtha ann fós, go dtí go ghlanfá amach do thaisce brabhsálaí\n",
+
+"welcomecreation" => "== Tá fáilte romhat, $1! ==
 
-"welcomecreation" => "<h2>Tá fáilte romhat, a $1!</h2><p>Chruthaí­odh do chuntas.
-Ná déan dearmad do sainroghanna phearsanta a athrú.",
+Cruthaíodh do chuntas. Ná déan dearmad ar do sainroghanna phearsanta Vicipéide a hathrú.",
 
 "loginpagetitle" => "Logáil isteach",
 "yourname"      => "D'ainm úsáideora",
 "yourpassword"  => "D'fhocal faire",
 "yourpasswordagain" => "Athiontráil d'fhocal faire",
-"newusersonly"  => " (D'úsáideoirí­ úrnua amháin)",
-"remembermypassword" => "Cuimhnigh m'fhocal faire.",
-"loginproblem"  => "<b>Bhí­ fadhb leis an logáil isteach.</b><br />Déan iarracht eile!",
-"alreadyloggedin" => "<strong>A húsáideoir $1, tá tú logáilte isteach cheana féin!</strong><br />\n",
-
-"login"     => "Log ann",
-'loginprompt'   => "Tá chomhaid aithintáin (<i>cookies</i>) riachtanach chun logáil isteach san {{SITENAME}} a dhéanamh.",
+"newusersonly"  => " (D'úsáideoirí úrnua amháin)",
+"remembermypassword" => "Cuimhnigh orm",
+"yourdomainname"       => "D'fhearann",
+'externaldberror'      => 'Bhí earráid bhunachair sonraí ann maidir le fíordheimhniú seachtrach, nóThere was either an external authentication database error or you are not allowed to update your external account.',
+"loginproblem"  => "<b>Bhí fadhb ann maidir leis an logáil isteach.</b><br>Déan iarracht eile!",
+"alreadyloggedin" => "<font color=red><b>A húsáideoir $1, tá tú logáilte isteach cheana féin!</b></font><br>\n",
+
+"login"     => "Logáil isteach",
+'loginprompt'   => "Tá fianáin de dhíth chun logáil isteach a dhéanamh ag {{SITENAME}}.",
 "userlogin"     => "Logáil isteach",
-"logout"        => "Log as",
+"logout"	=> "Logáil amach",
 "userlogout"    => "Logáil amach",
-"notloggedin"   => "Ní­l tú logáilte isteach",
+"notloggedin"   => "Níl tú logáilte isteach",
 "createaccount" => "Cruthaigh cuntas nua",
-"createaccountmail" => "le rí­omhphost",
+"createaccountmail" => "le ríomhphost",
 "badretype"     => "D'iontráil tú dhá fhocal faire difriúla.",
-"userexists"    => "Tá an ainm úsáideora a d'iontráil tú in úsáid cheana féin. Déan rogha d'ainm eile, más é do thoil é.",
-"youremail"     => "Do rí­omhphost*",
-'yourrealname'  => "D'ainm ceart*",
-"yournick"      => "Do leasainm (do sí­niúithe)",
-"emailforlost"  => "* Níl na boscaí le réalt (*) ach roghnach.  Le seoladh ríomhphoist i dtaisce, ba féidir le daoine teagmhail a dhéanamh leat
-trí­d an suí­omh gan do sheoladh rí­omhphoist a nochtaigh dóibh. Ina theannta sin,
-is cabhair é má dheanfá dearmad ar d'fhocal faire.<br /><br />Má toghaíonn tú d'ainm ceart a chur isteach, úsáidfear é chun do chuid dreachtaí a chur i leith tusa",
-'prefs-help-realname' => '* <strong>Ainm ceart</strong> (roghnach): má toghaíonn tú é sin a chur ar fáil, úsáidfear é chun do chuid dreachtaí a chur i leith tusa.<br />',
-'prefs-help-email' => '* <strong>Ríomhphost</strong> (roghnach): Ba féidir le daoine teagmháil a dhéanamh leat gan do sheoladh ríomhphoist a thaispeáint dóibh, agus ba féidir focal faire nua a sheol chugat má dhéanfá dearmad air.',
+"userexists"    => "Tá an ainm úsáideora a d'iontráil tú á úsáid cheana féin. Déan rogha d'ainm eile, más é do thoil é.",
+"youremail"     => "Do ríomhphost *",
+'yourrealname'  => "D'fhíorainm **",
+'yourlanguage'  => 'Teanga',
+'yourvariant'  => 'Malairt',
+"yournick"      => "Do leasainm (i síniuithe)",
+"emailforlost"  => "* Níl na boscaí le réalt (*, **) ach roghnach.  Le seoladh ríomhphoist i dtaisce, ba féidir le
+daoine teagmhail a dhéanamh leat tríd an suíomh gan do sheoladh ríomhphoist a nochtaigh dóibh. Ina theannta sin,
+is cabhair é má dheanfá dearmad ar d'fhocal faire.<br /><br />Má toghaíonn tú d'ainm ceart a chur isteach,
+úsáidfear é chun do chuid dreachtaí a chur i leith tusa.",
+'prefs-help-email'      => '** <strong>Ríomhphost</strong> (roghnach): Leis an tréith seo is féidir teagmháil a dhéanamh leat tríd do leathanach úsáideora nó phlé_úsáideora gan do sheoladh ríomhphost a thaispeáint.',
+'prefs-help-email-enotif' => 'Úsáidtear an seoladh seo chun fógraíocht ríomhphoist a sheoladh dhuit, má chumasaigh tú an rogha sin.',
+'prefs-help-realname'   => '* <strong>Fíorainm</strong> (roghnach): má toghaíonn tú é sin a chur ar fáil, úsáidfear é chun
+do chuid dreachtaí a chur i leith tusa.',
 "loginerror"    => "Earráid leis an logáil isteach",
-'nocookiesnew'	=> "Chruthaíodh an cuntas úsáideora, ach níl tú logáilte isteach. Úsáideann an {{SITENAME}} comhaid aithintáin (<i>cookies</i>) chun úsáideoirí a logáil isteach. Tá comhaid aithintáin míchumasaithe agat. Cumasaigh iad le do thoil, agus ansin logáil isteach le d'ainm úsáideora agus d'fhocal faire úrnua.",
-"nocookieslogin"	=> "Úsáideann an {{SITENAME}} comhaid aithintáin (<i>cookies</i>) chun úsáideoirí a logáil isteach. Tá comhaid aithintáin míchumasaithe agat. Cumasaigh iad agus déan athiarracht, le do thoil.",
-"noname"        => "Ní­ shonraigh tú ainm úsáideora bailí­.",
+'nocookiesnew'  => "Chruthaíodh an cuntas úsáideora, ach níl tú logáilte isteach.
+
+Úsáideann {{SITENAME}} fianáin chun úsáideoirí a logáil isteach. Tá fianáin díchumasaithe agat. Cumasaigh iad le do thoil, agus ansin logáil isteach le d'ainm úsáideora agus d'fhocal faire úrnua.",
+"nocookieslogin"      => "Úsáideann {{SITENAME}} fianáin chun úsáideoirí a logáil
+isteach. Tá fianáin díchumasaithe agat. Cumasaigh iad agus déan athiarracht, le do thoil.",
+"noname"	=> "Níor shonraigh tú ainm úsáideora bailí.",
 "loginsuccesstitle" => "Logáil isteach rathúil",
 "loginsuccess"  => "Tá tú logáilte isteach anois sa Vicipéid mar \"$1\".",
-"nosuchuser"    => "Ní­l aon úsáideoir ann leis an ainm \"$1\".
-Cinntigh do litriú, nó bain úsáid as an foirm thí­os chun cuntas úsáideora nua a chruthú.",
-"wrongpassword" => "Focal faire mí­cheart ab ea é a d'iontráil tú. Déan iarracht eile le do thoil.",
-"mailmypassword" => "Seol focal faire nua chugam",
-"passwordremindertitle" => "Cuimhneachán focail faire ón Vicipéid",
-"passwordremindertext" => "D'iarr duine éigin (tusa de réir cosúlachta, ón seoladh IP $1)
-go sheolfaimis focal faire Vicipéide nua logála isteach chugat.
-Is é an focal faire don úsáideoir \"$2\" ná \"$3\" anois.
-Ba chóir duit logáil isteach anois agus d'focal faire a athrú.",
-"noemail"       => "Ní­l aon seoladh rí­omhphoist i gcuntas don úsáideoir \"$1\".",
-"passwordsent"  => "Cuireadh focal faire nua chuig an seoladh rí­omhphoist cláraithe do \"$1\".
-Agus atá sé agat, logáil isteach arí­s leis le do thoil.",
-'loginend'		=> '&nbsp;',
+"nosuchuser"    => "Níl aon úsáideoir ann leis an ainm \"$1\".
+Cinntigh do litriú, nó bain úsáid as an foirm thíos chun cuntas úsáideora nua a chruthú.",
+'nosuchusershort'       => "Níl aon úsáideoir ann leis an ainm \"$1\". Cinntigh do litriú.",
+"wrongpassword" => "D'iontráil tú focal faire mícheart (nó ar iarraidh). Déan iarracht eile le do thoil.",
+"mailmypassword" => "Seol m'fhocal faire chugam.",
+'passwordremindertitle' => "Cuimneachán an fhocail faire ó {{SITENAME}}",
+'passwordremindertext' => "D'iarr duine éigin (tusa de réir cosúlachta, ón seoladh IP $1)
+go sheolfaimis focal faire Vicipéide nua.
+\"$3\" an focal faire don úsáideoir \"$2\" anois.
+Ba chóir duit lógail isteach anois agus d'fhocal faire a athrú.",
+
+"noemail"       => "Níl aon seoladh ríomhphoist i gcuntas don úsáideoir \"$1\".",
+"passwordsent"  => "Cuireadh focal faire nua chuig an seoladh ríomhphoist atá cláraithe do \"$1\".
+Nuair atá sé agat, logáil isteach arís le do thoil chun fíordheimhniu a dhéanamh.",
+'eauthentsent'	     =>  "Cuireadh teachtaireacht ríomhphoist chuig an seoladh
+chun fíordheimhniú a dhéanamh. Chun fíordheimhniú a dhéanamh gur leatsa an cuntas, caithfidh tú glac leis an teachtaireacht sin nó ní sheolfar aon rud eile chuig do chuntas.",
+'loginend'	      => ' ',
 'mailerror' => "Tharlaigh earráid leis an seoladh: $1",
-'acct_creation_throttle_hit' => 'Tá brón orainn, ach tá tú tar éis ag chruthú $1 cuntas. Ní féidir lead níos mó a dhéanamh.',
+'acct_creation_throttle_hit' => 'Tá brón orainn, ach tá tú i ndiadh $1 cuntas á chruthú. Ní féidir leat níos mó a dhéanamh.',
+
+'emailauthenticated'    => 'D\'fhíordheimhníodh do sheoladh ríomhphoist ar $1.',
+'emailnotauthenticated' => '<strong>Ní dhearna fíordheimhniú</strong> ar do sheoladh ríomhphoist fós, agu díchumasaítear na hardtréithe ríomhphoist go dtí go fíordheimhneofaí é <strong>(d.c.f.)</strong>.<br>
+Chun fíordheimhniú a dhéanamh, logáil isteach leis an focal faire neamhbhuan atá seolta chugat, nó iarr ar ceann nua ar an leathanach logála istigh.',
+'invalidemailaddress'   => 'Ní féidir an seoladh ríomhphoist a ghlacadh leis mar is dócha go bhfuil formáid neamhbhailí aige.
+
+Iontráil seoladh dea-fhormáidte le do thoil, nó glan an réimse sin.',
 
 # Edit page toolbar
-'bold_sample'=>'Cló dubh',
-'bold_tip'=>'Cló dubh',
+'bold_sample'=>'Cló trom',
+'bold_tip'=>'Cló trom',
 'italic_sample'=>'Cló Iodáileach',
 'italic_tip'=>'Cló Iodáileach',
 'link_sample'=>'Ainm naisc',
@@ -438,180 +538,198 @@ Agus atá sé agat, logáil isteach arí­s leis le do thoil.",
 'hr_tip'=>'Líne cothrománach (inúsáidte go coigilteach)',
 'infobox'=>'Roghnaigh cnaipe chun téacs sámpla a fháil',
 # alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror
-'infobox_alert'=>"Cuir isteach an téacs ba mhaith leat a fhormáidigh.\\n Taispeánfar é san bosca eolais chun gearr agus greamaigh a dhéanamh.\\nSámpla:\\nTaispeánfar\\n$1\\nmar sin:\\n$2",
+'infobox_alert'=>"Más mhaith leat téacs a fhormáidigh, cuir isteach anseo é.\\n
+
+Taispeánfar an
+téacs sa bhosca eolais le haghaidh gearr agus greamaithe.\\nSámpla:\\nTaispeánfar\\n$1
+
+\\nmar sin:\\n$2",
 
 # Edit pages
 #
 "summary"       => "Achoimriú",
-"subject"       => "Ábhar/ceannlí­ne",
+"subject"       => "Ábhar/ceannlíne",
 "minoredit"     => "Is mionathrú é seo",
 "watchthis"     => "Déan faire ar an lch seo",
-"savearticle"   => "Cuir an lch i dtaisce",
-"preview"       => "Reamhspéachadh",
-"showpreview"   => "Reamhspléach",
+"savearticle"   => "Sábháil an lch",
+"preview"       => "Réamhamharc",
+"showpreview"   => "Taispeáin réamhamharc",
 "blockedtitle"  => "Tá an úsáideoir seo faoi chosc",
-"blockedtext"   => "Chuir $1 cosc ar d'ainm úsáideora nó do seoladh IP.
-Seo é an cúis a thugadh:<br />''$2''<p>Is féidir leat teagmháil a dhéanamh le $1 nó le ceann eile de na
-[[{{ns:project}}:Riarthóirí­|riarthóirí­]] chun an cosc a phléigh.
+"blockedtext"   => "Chuir $1 cosc ar d'ainm úsáideora nó ar do sheoladh IP.
+Seo é an cúis a thugadh:<br>''$2''<p>Is féidir leat teagmháil a dhéanamh le $1 nó le ceann eile de na
+[[{{ns:4}}:Riarthóirí|riarthóirí]] chun an cosc a phléigh.
 
-Tabhair faoi deara nach bhfuil cead agat an gné \"cuir rí­omhphost chuig an úsáideoir seo\" a úsáid
-mura bhfuil seoladh rí­omhphoist bailí­ cláraithe i do [[Speisialta:Preferences|shainroghanna úsáideora]].
+Tabhair faoi deara nach bhfuil cead agat an gné \"cuir ríomhphost chuig an úsáideoir seo\" a úsáid
+mura bhfuil seoladh ríomhphoist bailí cláraithe i do [[Speisialta:Preferences|shainroghanna úsáideora]].
 
 Is é $3 do sheoladh IP. Más é do thoil é, déan tagairt den seoladh seo le gach ceist a chuirfeá.
 ",
 "whitelistedittitle" => "Logáil isteach chun athrú a dhéanamh",
 "whitelistedittext" => "Ní mór duit [[Speisialta:Userlogin|logáil isteach]] chun ailt a athrú.",
 "whitelistreadtitle" => "Logáil isteach chun ailt a léamh",
-"whitelistreadtext" => "Ní mór duit [[Speisialta:Userlogin|logáil isteach]] chun ailt a léigh.",
-"whitelistacctitle" => "Ní­l cead agat cuntas a chruthaigh",
-"whitelistacctext" => "Chun cuntais nua a chruthaigh san Wiki seo caithfidh tú [[Speisialta:Userlogin|logáil isteach]] agus caithfidh bheith an cead riachtanach agat.",
-'loginreqtitle'	=> 'Tá logáil isteach riachtanach',
-'loginreqtext'	=> 'Ní mór duit logáil isteach chun leathanaigh eila a fhéiceáil.',
+"whitelistreadtext" => "Ní mór duit [[Speisialta:Userlogin|logáil isteach]] chun ailt a léamh.",
+"whitelistacctitle" => "Níl cead agat cuntas a chruthú",
+"whitelistacctext" => "Chun cuntais nua a chruthú sa vicí seo, caithfidh tú [[Speisialta:Userlogin|logáil
+isteach]] agus caithfidh go bhfuil an cead riachtanach agat.",
+'loginreqtitle' => 'Tá logáil isteach de dhíth ort',
 "accmailtitle" => "Seoladh an focal faire.",
-"accmailtext" => "Seoladh an focal faire don úsáideoir '$1' chuig $2.",
+"accmailtext" => "Seoladh chuig $2 focal faire an úsáideora '$1'.",
 "newarticle"    => "(Nua)",
 "newarticletext" =>
 "Lean tú nasc chuig leathanach a nach bhfuil ann fós.
-Chun an leathanach a chruthú, tosaigh ag clóscrí­obh san bosca anseo thí­os
-(féach ar an [[Vicipéid:Cabhair|leathanach cabhrach]] chun a thuilleadh eolas a fháil).
-Má tháinig tú anseo as dearmad, brúigh an cnaipe '''ar ais''' ar do lí­onléitheoir.",
-'talkpagetext' => '<!-- MediaWiki:teacsphle -->',
-"anontalkpagetext" => "---- ''Seo é an leathanach plé do úsáideoir gan ainm a nach chruthaigh
-cuntas fós nó a nach úsáideann a chuntas. Dá bhrí­ sin caithfimid an [[seoladh IP]] uimhriúil
-chun é/í­ a ionannaigh. Is féidir cuid mhaith úsáideoirí­ an seoladh IP céanna a úsáid. Má tá tú
+Chun an leathanach a chruthú, tosaigh ag clóscríobh san bosca anseo thíos
+(féach ar an [[Vicipéid:Cabhair|leathanach cabhrach]] chun a thuilleadh eolais a fháil).
+Má tháinig tú anseo as dearmad, brúigh an cnaipe '''ar ais''' ar do líonléitheoir.",
+'talkpagetext' => '<!-- MediaWiki:teacsphlé -->',
+"anontalkpagetext" => "---- ''Is é seo an leathanach plé do úsáideoir gan ainm nach chruthaigh
+cuntas fós nó nach úsáideann a chuntas phéarsanta. Dá bhrí sin, caithfimid an [[seoladh IP]] uimhriúil a úsáid
+chun é/í a ionannaigh. Is féidir cuid mhaith úsáideoirí an seoladh IP céanna a úsáid. Má tá tú
 i do úsáideoir gan ainm agus má tá sé do thuairim go rinneadh léiriuithe neamhfheidhmeacha fút,
-[[Special:Userlogin|cruthaigh cuntas nó logáil isteach]] le do thoil chun mearbhall le húsáideoirí­ eile
-gan ainmneacha a héalaigh amach anseo.'' ",
-"noarticletext" => "(Ní­l aon téacs ar an leathanach seo faoi láthair)",
-'clearyourcache' => "'''Tabhair faoi deara:''' Tar éis duit ábhar a shábháil, ní mór duit taisce do líonléitheora chun na hathruithe a fheiceáil: '''Mozilla / Firefox / Netscape:''' ''Ctrl-Shift-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-Shift-R'', '''Konqueror:''' ''F5''.",
-'usercssjsyoucanpreview' => "<strong>Leid:</strong> Sula sábhálaím tú, úsáid an cnaipe 'Reamhspléach' chun do CSS/JS nua a tástáil.",
-'usercsspreview' => "'''Cuimhnigh nach bhfuil seo ach reamhspléachadh do CSS úsáideora - níor sábháladh é go fóill!'''",
-'userjspreview' => "'''Cuimhnigh nach bhfuil seo ach reamhspléachadh do JavaScript úsáideora - níor sábháladh é go fóill!'''",
-
+[[Special:Userlogin|cruthaigh cuntas nó logáil isteach]] le do thoil chun mearbhall a héalú
+le húsáideoirí eile gan ainmneacha amach anseo.'' ",
+"noarticletext" => "(Níl aon téacs ar an leathanach seo faoi láthair)",
+'clearyourcache' => "'''Tabhair faoi deara:''' Tar éis duit ábhar a shábháil, ní mór duit
+taisce do líonléitheora chun na hathruithe a fheiceáil After saving, you have to clear your
+browser cache to see the changes: '''Mozilla / Netscape:''' roghnaigh ''Athlódáil''
+(nó ''Ctrl-R''), '''IE / Opera:''' ''Ctrl-F5'', '''Safari:''' ''Cmd-R'', '''Konqueror''' ''Ctrl-R''.",
+'usercssjsyoucanpreview' => "<strong>Leid:</strong> Sula sábhálaím tú, úsáid an cnaipe
+'Réamhamharc' chun do CSS/JS nua a tástáil.",
+'usercsspreview' => "'''Cuimhnigh nach bhfuil seo ach réamhamharc do CSS úsáideora -
+níor sábháladh é go fóill!'''",
+'userjspreview' => "'''Cuimhnigh nach bhfuil seo ach réamhamharc do JavaScript úsáideora
+- níor sábháladh é go fóill!'''",
 "updated"       => "(Leasaithe)",
-"note"          => "<strong>Tabhair faoi deara:</strong> ",
-"previewnote"   => "Tabhair faoi deara go nach bhfuil seo ach reamhspléachadh, agus go nach sábháladh é fós!",
-"previewconflict" => "San reamhspléachadh seo, feachann tú an téacs dé réir an eagarbhosca
+"note"	  => "<strong>Tabhair faoi deara:</strong> ",
+"previewnote"   => "Cuimhnigh nach bhfuil seo ach réamhamharc, agus nach sábháladh é fós!",
+"previewconflict" => "San réamhamharc seo, feachann tú an téacs dé réir an eagarbhosca
 thuas mar a taispeáinfear é má sábháilfear é.",
 "editing"       => "Ag athrú $1",
-"editingsection"       => "Ag athrú $1 (roinnt)",
-"editingcomment"       => "Ag athrú $1 (trácht)",
 "editconflict"  => "Coimhlint athraithe: $1",
-"explainconflict" => "D'athraigh duine eile an leathanach seo ó shin a thosaigh tú ag cur é in eagar.
-San bhosca seo thuas feiceann tú téacs an leathanaigh mar a bhfuil sé faoi láthair.
-Tá do chuid athruithe san bhosca thí­os.
-Caithfidh tú do chuid athruithe a chumasadh leis an eagrán reatha.
-Nuair a brúann tú ar an cnaipe \"Sábháil an leathanach\", ní­ sábhálfar <b>ach amháin</b> an téacs san bhosca thuas.<br />",
+"explainconflict" => "D'athraigh duine eile an leathanach seo ó shin a thosaigh tú ag athrú é.
+Sa bhosca seo thuas feiceann tú téacs an leathanaigh mar atá sé faoi láthair.
+Tá do chuid athruithe sa bhosca thíos.
+Caithfidh tú do chuid athruithe a chumasadh leis an leagan láithreach.
+Nuair a brúann tú ar an cnaipe \"Sábháil an leathanach\", ní shábhálfar aon rud <b>ach
+amháin</b> an téacs sa bhosca thuas.\n<p>",
 "yourtext"      => "Do chuid téacs",
 "storedversion" => "Eagrán sábháilte",
 "editingold"    => "<strong>AIRE: Tá tú ag athrú eagrán an leathanaigh atá as dáta.
-Dá shábhálfá é, caillfear aon athrú a rinneadh ó shin an eagrán seo.</strong>",
-"yourdiff"      => "Difrí­ochtaí­",
-"copyrightwarning" => "Tabhair faoi deara go scaoilí­tear gach dréacht chuig an Vicipéid maidir lena tearmaí­ an <i>GNU Free Documentation License</i>
-(tuilleadh eolais ag $1).
-Muna aontaíonn tú go cuirfear do chuid scrí­bhinn in eagar go héadrócaireach agus go athdálfar é gan teorainn,
-ná tabhair isteach é anseo.<br />
-Ina theannta sin, geallann tú duinn go scrí­obh tusa féin an rud seo, nó go chóipeáil tú é as
-fhoinse atá gan chóipcheart.
-<strong>NÁ TABHAIR ISTEACH OBAIR ATÁ FAOI CHÓIPCHEART GAN CEAD!</strong>",
-"longpagewarning" => "<strong>AIRE: Tá an leathanach seo $1 cilibhearta i bhfad; ní­ féidir le roinnt lí­onléitheoirí­
-leathanaigh atá breis agus nó ní­os fada ná 32kb a athrú.
-Más féidir, giotaigh an leathanach i gcodanna níos bige.</strong>",
-"readonlywarning" => "<strong>AIRE: Cuireadh glas ar an mbunachar sonraí­, agus mar sin
-ní­ féidir leat do chuid athruithe a shábháil dí­reach anois. B'fhéidir gur mhaith leat an téacs a ghearr is greamaigh i gcomhad téacs agus é a úsáid níos déanaí.</strong>",
-"protectedpagewarning" => "<strong>AIRE:  Cuireadh glas ar an leathanach seo, agus ní féidir le duine ar bith é a athrú
-ach amhaín na húsáideoirí le pribhléidí­ ceannasaí­. Bí­ cinnte go leanann tú na
-[[Project:Treoirlí­nte_do_leathanaigh_glasáilte|treoirlí­nte do leathanaigh glasáilte]]</strong>.",
+Dá shábhálfá é, caillfear aon athrú a rinneadh ó shin an eagrán seo.</strong>\n",
+"yourdiff"      => "Difríochtaí",
+"copyrightwarning" => "Tabhair faoi dearadh go scaoiltear gach ceart le Vicipéid de réir tearmaí an <i>GNU Free Documentation License</i> (féach ar $1 le haghaidh tuilleadh eolais).
+Munar mian leat go gcuirfí do chuid scríbhinn in eagar go héadrócaireach agus go n-athdálfaí gan teorainn iad, ná
+tabhair isteach anseo iad.<br>
+Ina theannta sin, geallann tú gur scríobh tú féin an dréacht seo, nó gur chóipeáil tú é ó fhoinse gan chóipcheart
+é. <strong>NÁ TABHAIR ISTEACH OBAIR LE CÓIPCHEART GAN CHEAD!</strong>",
+"copyrightwarning2" => "Tabhair faoi dearadh gur féidir le cuiditheoirí eile gach dréacht do {{SITENAME}} a chur in eagar, a athrú agus a scriosadh. Munar mian leat go gcuirfí do chuid scríbhinn in eagar go héadrócaireach agus go n-athdálfaí gan teorainn iad, ná tabhair isteach anseo iad.<br> Ina theannta sin, geallann tú gur scríobh tú féin an dréacht seo, nó gur chóipeáil tú é ó fhoinse gan chóipcheart é (féach ar $1 le haghaidh tuilleadh eolais). <strong>NÁ TABHAIR ISTEACH OBAIR LE CÓIPCHEART GAN CHEAD!</strong>",
+"longpagewarning" => "AIRE: Tá an leathanach seo $1 cilibheart i bhfad; ní féidir le roinnt brabhsálaithe
+leathanaigh a athrú má tá siad breis agus 32kb, nó níos fada ná sin.
+Más féidir, giotaigh an leathanach i gcodanna níos bige.",
+"readonlywarning" => "AIRE: Glasáladh an bunachar sonraí, agus mar sin
+ní féidir leat do chuid athruithe a shábháil díreach anois. B'fhéidir gur mhaith leat an téacs a ghearr is
+ghreamú i gcomhad téacs agus é a úsáid níos déanaí.",
+"protectedpagewarning" => "AIRE:  Glasáladh an leathanach seo, agus ní féidir le duine ar bith é a athrú
+ach amhaín na húsáideoirí le pribhléidí oibreora córais. Bí cinnte go leanann tú na
+<a href='$wgScriptPath/$wgMetaNamespace:Treoirlínte_do_leathanaigh_glasáilte'>treoirlínte do leathanaigh
+glasáilte</a>.",
 
 # History pages
 #
 "revhistory"    => "Stáir athraithe",
-"nohistory"     => "Ní­l aon stáir athraithe ag an leathanach seo.",
-"revnotfound"   => "Ní­ bhfuarthas an athrú",
-"revnotfoundtext" => "Ní­ bhfuarthas seaneagrán an leathanaigh a d'iarr tú ar.
+"nohistory"     => "Níl aon stáir athraithe ag an leathanach seo.",
+"revnotfound"   => "Ní bhfuarthas an athrú",
+"revnotfoundtext" => "Ní bhfuarthas seaneagrán an leathanaigh a d'iarr tú ar.
 Cinntigh an URL a d'úsáid tú chun an leathanach seo a rochtain.\n",
 "loadhist"      => "Ag lódáil stáir an leathanaigh",
-"currentrev"    => "Eagrán reatha",
-"revisionasof"  => "Eagrán ó $1",
-"cur"           => "rth",
-"next"          => "lns",
-"last"          => "rmh",
-"orig"          => "bun",
-'histlegend'	=> "Difríochtaí a roghnú: marcáil na boscaí de na eagráin atá ag teastail uait á cuir i gcomparáid, agus brúigh Iontráil nó an cnaipe ag bun an leathanaigh.<br />
-Eochair: (rth) = difrí­ocht leis an eagrán reatha,
-(rmh) = difrí­ocht leis an eagrán roimhe, M = mionathrú",
+"currentrev"    => "Leagan láithreach",
+"revisionasof"  => "Leagan ó $1",
+'revisionasofwithlink'  => 'Leagan ó $1; $2<br />$3 | $4',
+'previousrevision'      => '?Leagan níos sine',
+'nextrevision'	  => 'Leagan níos nuaí?',
+'currentrevisionlink'   => 'féach ar an leagan laithreach',
+"cur"	   => "rth",
+"next"	  => "lns",
+"last"	  => "rmh",
+"orig"	  => "bun",
+'histlegend'    => "Difríochtaí a roghnú: marcáil na boscaí de na eagráin atá ag teastail uait á cuir i gcomparáid, agus brúigh Iontráil nó an cnaipe ag bun an leathanaigh.<br/>
+Eochair: (rth) = difríocht leis an leagan láithreach,
+(rmh) = difríocht leis an eagrán roimhe, M = mionathrú",
+'history_copyright'    => '-',
+'deletedrev' => '[scriosta]',
+'histfirst' => 'An ceann is luaithe',
+'histlast' => 'An ceann is déanaí',
 
 # Diffs
 #
-"difference"    => "(Difrí­ochtaí­ idir eagráin)",
-"loadingrev"    => "ag lódáil eagrán don difrí­ocht",
-"lineno"        => "Lí­ne $1:",
-"editcurrent"   => "Athraigh eagrán reatha an leathanaigh seo",
-'selectnewerversionfordiff' => 'Roghnaigh eagrán níos nuaí do comparáid',
-'selectolderversionfordiff' => 'Roghnaigh eagrán níos sine do comparáid',
-'compareselectedversions' => 'Cuir i gcomparáid na heagráin atá roghnaithe',
-
+"difference"    => "(Difríochtaí idir leaganacha)",
+"loadingrev"    => "ag lódáil leagan don difríocht",
+"lineno"	=> "Líne $1:",
+"editcurrent"   => "Athraigh leagan láithreach an leathanaigh seo",
+'selectnewerversionfordiff' => 'Roghnaigh leagan níos nuaí mar chomparáid',
+'selectolderversionfordiff' => 'Roghnaigh leagan níos sine mar chomparáid',
+'compareselectedversions' => 'Cuir na leagain roghnaithe i gcomparáid',
 
 # Search results
 #
-"searchresults" => "Toraidh an cuardaigh",
-"searchresulttext" => "Féach ar [[Vicipéid:Cuardach|Ag cuardach sa Vicipéid]] chun a thuilleadh eolais a fháil faoi chuardach Vicipéide.",
-"searchquery"   => "Don órdú \"$1\"",
-"badquery"      => "Órdú fiosraithe neamhbhailí­",
-"badquerytext"  => "Nior éirigh linn d'órdú a phróiseáil.
-Is dócha go rinne tú cuardach ar focal le ní­os lú ná trí­ litir,
-gné a nach bhfuil le tacaí­ocht aige fós.
-B'fhéidir freisin go mhí­chlóshcrí­obh tú an leagan, mar shampla
+"searchresults" => "Torthaí an chuardaigh",
+"searchresulttext" => "Féach ar [[Vicipéid:Cuardach|Cuardach sa Vicipéid]] chun a thuilleadh eolais a fháil maidir le cuardaigh Vicipéide.",
+"searchquery"   => "Don iarratas \"$1\"",
+"badquery"      => "Iarratas fiosraithe neamhbhailí",
+"badquerytext"  => "Nior éirigh linn d'iarratas a phróiseáil.
+Is dócha go rinne tú cuardach ar focal le níos lú ná trí litir,
+gné a nach bhfuil le tacaíocht aige fós.
+B'fhéidir freisin go mhíchlóshcríobh tú an leagan, mar shampla
 \"éisc agus agus lanna\". Déan athiarracht.",
-"matchtotals"   => "Bhí­ an cheist \"$1\" ina mhacasamhail le $2 ainmneacha alt
+"matchtotals"   => "Bhí an cheist \"$1\" ina mhacasamhail le $2 teidil alt
 agus leis an téacs i $3 ailt.",
-"nogomatch" => "Ní­l aon leathanach leis an ainm áirithe seo. Déantar cuardach an téacs ar fad...",
-"titlematches"  => "Tá macasamhla ainm alt ann",
-"notitlematches" => "Ní­l macasamhla ainm alt ann",
+"nogomatch" => "Níl aon leathanach ann leis an teideal áirithe seo air. Tá cuardach á dhéanamh sa téacs iomlán...",
+"titlematches"  => "Tá macasamhla teidil alt ann",
+"notitlematches" => "Níl macasamhla teidil alt ann",
 "textmatches"   => "Tá macasamhla téacs alt ann",
-"notextmatches" => "Ní­l macasamhla téacs alt ann",
-"prevn"         => "na $1 roimhe",
-"nextn"         => "an chéad $1 eile",
+"notextmatches" => "Níl macasamhla téacs alt ann",
+"prevn"	 => "na $1 roimhe",
+"nextn"	 => "an chéad $1 eile",
 "viewprevnext"  => "Taispeáin ($1) ($2) ($3).",
-"showingresults" => "Ag taispeáint thí­os <b>$1</b> toraidh, ag tosachh le #<b>$2</b>.",
-"showingresultsnum" => "Ag taispeáint thí­os <b>$3</b> toraidh, ag tosach le #<b>$2</b>.",
-"nonefound"     => "<strong>Tabhair faoi deara</strong>: go minic, ní éiríonn cuardaigh nuair a cuardaí­tear focail an-coiteanta, m.sh., \"ag\" is \"an\",
-a nach bhfuil innéacsaí­tear, nó nuair a ceisteann tú ní­os mó ná téarma amháin (ní­
-taispeáintear sna toraidh ach na leathanaigh ina bhfuil go leoir na téarmaí­ cuardaigh).",
+"showingresults" => "Ag taispeáint thíos <b>$1</b> toraidh, ag tosachh le #<b>$2</b>.",
+"showingresultsnum" => "Ag taispeáint thíos <b>$3</b> toraidh, ag tosach le #<b>$2</b>.",
+"nonefound"     => "<strong>Tabhair faoi deara</strong>: go minic, ní éiríonn cuardaigh nuair a cuardaítear focail an-coiteanta, m.sh., \"ag\" is \"an\",
+a nach bhfuil innéacsaítear, nó nuair a ceisteann tú níos mó ná téarma amháin (ní
+taispeáintear sna toraidh ach na leathanaigh ina bhfuil go leoir na téarmaí cuardaigh).",
 "powersearch" => "Cuardaigh",
 "powersearchtext" => "
-Cuardaigh sna hainmranna :<br />
-$1<br />
-$2 Cuir athsheolaidh in áireamh &nbsp; Cuardaigh ar $3 $9",
-"searchdisabled" => "<p>Tá brón orainn! Mhí­chumasaí­odh an cuardach téacs iomlán go sealadach chun luas an suí­mh
-a chosaint. Idir an dá linn, is féidir leat an cuardach Google anseo thí­os a úsáid - b'fhéidir go bhfuil sé as dáta.</p>",
+Cuardaigh sna hainmspásanna :<br>
+$1<br>
+$2 Cuir athsheolaidh in áireamh   Cuardaigh ar $3 $9",
+"searchdisabled" => "<p>Tá brón orainn! Mhíchumasaíodh an cuardach téacs iomlán go sealadach chun luas an tsuímh
+a chosaint. Idir an dá linn, is féidir leat an cuardach Google anseo thíos a úsáid - b'fhéidir go bhfuil sé as dáta.</p>",
+
 "blanknamespace" => "(Gnáth)",
 
 # Preferences page
 #
 "preferences"   => "Sainroghanna",
-"prefsnologin" => "Ní­l tú logáilte isteach",
-"prefsnologintext"  => "Ní mór duit bheith [[Speisialta:Userlogin|logáilte isteach]]
-chun do chuid sainroghanna phearsanta a athrú.",
+"prefsnologin" => "Níl tú logáilte isteach",
+"prefsnologintext"  => "Ní mór duit [[Speisialta:Userlogin|logáil isteach]] chun do chuid sainroghanna phearsanta a shocrú.",
 "prefslogintext" => "Tá tú logáilte isteach mar \"$1\".
 Is é $2 d'uimhir aitheantais inmhéanach.
 
 Féach ar [[{{ns:4}}:Cabhair do sainroghanna úsáideora]] chun cabhair a fháil mar gheall ar na roghanna.",
- "prefsreset"    => "D'athraí­odh do chuid sainroghanna ar ais chuig an leagan bunúsach ón stóras.",
-"qbsettings"    => "Sainroghanna an bosca uirlisí­",
+ "prefsreset"    => "D'athraíodh do chuid sainroghanna ar ais chuig an leagan bunúsach ón stóras.",
+"qbsettings"    => "Sainroghanna an bosca uirlisí",
 "changepassword" => "Athraigh d'fhocal faire",
-"skin"          => "Cuma",
-"math"          => "Ag aistriú an matamaitic",
+"skin"	  => "Craiceann",
+"math"	  => "Ag aistriú na matamaitice",
 "dateformat"    => "Formáid dáta",
-"math_failure"      => "Theipeadh anailí­s an foirmle",
+"math_failure"      => "Theip anailís an fhoirmle",
 "math_unknown_error"    => "earráid anaithnid",
 "math_unknown_function" => "foirmle anaithnid ",
-"math_lexing_error" => "Theipeadh anailí­s an foclóra",
+"math_lexing_error" => "Theipeadh anailís an fhoclóra",
 "math_syntax_error" => "earráid comhréire",
-'math_image_error'	=> 'Theipeadh aistriú an PNG; tástáil má tá na ríomh-oidis latex, dvips, gs, agus convert i suite go maith.',
-'math_bad_tmpdir'	=> 'Ní féidir scríobh chuig an fillteán mata sealadach, nó é a chruthú',
-'math_bad_output'	=> 'Ní féidir scríobh chuig an fillteán mata aschomhaid, nó é a chruthú',
-'math_notexvc'	=> 'Níl an oideas texvc ann; féach ar mata/EOLAIS chun é a sainathrú.',
+'math_image_error'      => 'Theipeadh aistriú an PNG; tástáil má tá na ríomhchláir latex, dvips, gs, agus convert
+i suite go maith.',
+'math_bad_tmpdir'       => 'Ní féidir scríobh chuig an fillteán mata sealadach, nó é a chruthú',
+'math_bad_output'       => 'Ní féidir scríobh chuig an fillteán mata aschomhaid, nó é a chruthú',
+'math_notexvc'  => 'Níl an ríomhchlár texvc ann; féach ar mata/EOLAIS chun é a sainathrú.',
 'prefs-personal' => 'Sonraí úsáideora',
 'prefs-rc' => 'Athruithe le déanaí agus taispeántas stumpaí',
 'prefs-misc' => 'Sainroghanna éagsúla',
@@ -619,487 +737,663 @@ Féach ar [[{{ns:4}}:Cabhair do sainroghanna úsáideora]] chun cabhair a fháil
 "resetprefs"    => "Athshuigh sainroghanna",
 "oldpassword"   => "Seanfhocal faire",
 "newpassword"   => "Nuafhocal faire",
-"retypenew"     => "Athchlóshcrí­obh an nuafhocal faire",
+"retypenew"     => "Athiontráil an nuafhocal faire",
 "textboxsize"   => "Eagarthóireacht",
-"rows"          => "Sraitheanna",
+"rows"	  => "Sraitheanna",
 "columns"       => "Colúin",
 "searchresultshead" => "Sainroghanna do toraidh cuardaigh",
 "resultsperpage" => "Cuairt le taispeáint ar gach leathanach",
-"contextlines"  => "Lí­nte le taispeáint do gach cuairt",
+"contextlines"  => "Línte le taispeáint do gach cuairt",
 "contextchars"  => "Litreacha chomhthéacs ar gach líne",
 "stubthreshold" => "Tairseach do taispeántas stumpaí",
-"recentchangescount" => "Méid ainmneacha sna hathruithe le déanaí",
-"savedprefs"    => "Sábháladh do chuid socruithe.",
+"recentchangescount" => "Méid teideal sna hathruithe le déanaí",
+"savedprefs"    => "Sábháladh do chuid sainroghanna.",
 'timezonelegend' => 'Crios ama',
-"timezonetext"  => "Iontráil an méid uaireanta a difrí­onn do am áitiúil
-den am an innill friothála­ (UTC).",
+"timezonetext"  => "Iontráil an méid uaireanta a difríonn do am áitiúil
+den am an freastalaí (UTC).",
 "localtime" => "An t-am áitiúil",
 "timezoneoffset" => "Difear",
-"servertime"    => "Am an innill friothála anois",
-"guesstimezone" => "Líon ón lí­onléitheoir",
-"emailflag"     => "Coisc rí­omhphost a sheolann úsáideoirí­ eile",
+"servertime"    => "Am an freastalaí anois",
+"guesstimezone" => "Líon ón líonléitheoir",
+"emailflag"     => "Coisc ríomhphost a sheolann úsáideoirí eile",
 "defaultns"     => "Cuardaigh sna ranna seo a los éagmaise:",
+'default'	       => 'réamhshocrú',
+'files'			=> 'Comhaid',
+
+# User levels special page
+#
+
+# switching pan
+'editgroup' => 'Cuir Grúpa In Eagar',
+'addgroup' => 'Cuir Grúpa Leis',
+'editusergroup' => 'Cuir Grúpái Úsáideoirí In Eagar',
+
+# group editing
+'savegroup' => 'Sábháil an Ghrúpa',
+
+# user groups editing
+'saveusergroups' => 'Sábháil Grúpaí Úsáideoirí',
+
+# group editing
+'groups-editgroup'	  => 'Cuir grúpa in eagar',
+'groups-addgroup'	   => 'Cuir grúpa leis',
+'groups-editgroup-preamble' => 'Má thosaíonn an ainm nó an cur síos le hidirstad,
+measfar go bhfuil ainm teachtaireacha ann sa chuid eile, agus mar sin
+beidh an téacs san ainmspás MediaWiki.',
+'groups-editgroup-name'     => 'Ainm an ghrúpa: ',
+'groups-editgroup-description' => 'Cur síos ar an ngrúpa (255 carachtar an uasmhéid):<br/>',
+'savegroup'	         => 'Sábháil an Ghrúpa',
+'groups-tableheader'	=> 'ID || Ainm || Cur Síos || Cearta',
+'groups-existing'	   => 'Grúpaí atá ann cheana féin',
+'groups-noname'	     => 'Cuir ainm bailí i leith don ghrúpa',
+'groups-already-exists'     => 'Tá grúpa ann leis an ainm sin cheana féin',
+'addgrouplogentry'	  => 'Cuireadh an ghrúpa $2 leis',
+'changegrouplogentry'       => 'Athraíodh an ghrúpa $2',
+'renamegrouplogentry'       => 'Athainmníodh an ghrúpa $2 mar $3',
+
+# user groups editing
+#
+'userrights-editusergroup' => 'Cuir grúpaí na n-úsáideoirí in eagar',
+'saveusergroups' => 'Sábháil Grúpaí na n-Úsáideoirí',
+'userrights-groupsmember' => 'Ball de:',
+'userrights-groupsavailable' => 'Grúpaí atá le fáil:',
+'userrights-groupshelp' => 'Roghnaigh na grúpaí a bhfuil tú ag cur an úsáideoir leis nó ag baint an úsáideoir de.
+Ní bheidh aon athrú le grúpaí neamhroghnaithe. Is féidir leat grúpa a díroghnú le húsáid CTRL + cléchliceáil',
+'userrights-logcomment' => 'Athraíodh an ballraíocht grúpa ó $1 go $2',
+
+# Default group names and descriptions
+#
+'group-anon-name'       => 'Gan ainm',
+'group-anon-desc'       => 'úsáideoirí gan ainmneacha',
+'group-loggedin-name'   => 'Úsáideoir',
+'group-loggedin-desc'   => 'Gnáth-úsáideoirí atá logáilte isteach',
+'group-admin-name'      => 'Riarthóir',
+'group-admin-desc'      => 'Úsáideoirí iontaofa, atá ar a gcumas úsáideoirí a chosc agus ailt a scriosadh',
+'group-bureaucrat-name' => 'Maorlathach',
+'group-bureaucrat-desc' => 'Is féidir le grúpa na maorlathach oibreoirí córais a dhéanamh',
+'group-steward-name'    => 'Maor',
+'group-steward-desc'    => 'Rochtain iomlán',
 
 # Recent changes
 #
 "changes" => "athruithe",
 "recentchanges" => "Athruithe is déanaí",
-"recentchangestext" => "Ar an leathanach seo, déan fáire ar na hathruithe is déanaí sa vicí.",
+'recentchanges-url' => 'Speisialta:Recentchanges',
+"recentchangestext" => "Déan faire ar na hathruithe is déanaí sa vicí ar an leathanach seo.",
 "rcloaderr"     => "Ag lódáil na athruithe is déanaí",
-"rcnote"        => "Is iad seo a leanas na <strong>$1</strong> athruithe deireanacha sna <strong>$2</strong> lae seo caite.",
-"rcnotefrom"    => "Is iad seo a leanas na athruithe ó <b>$2</b> (go dti <b>$1</b> taispeánaithe).",
-"rclistfrom"    => "Taispeáin nua-athruithe ó $1 anuas",
+"rcnote"	=> "Is iad seo a leanas na <strong>$1</strong> athruithe is déanaí sna <strong>$2</strong> lae seo caite.",
+"rcnotefrom"    => "Is iad seo a leanas na hathruithe ó <b>$2</b> (go dti <b>$1</b> taispeánaithe).",
+"rclistfrom"    => "Taispeáin nua-athruithe dom ó <b>$1</b> anuas)",
+'showhideminor' => "$1 mionathruithe | $2 robait | $3 úsáideoirí atá logáilte isteach | $4 athruithe faoi phatról",
 # "rclinks"     => "Taispeáin na $1 athruithe is déanaí sna $2 uaire seo caite / $3 laethanta seo caite.",
 # "rclinks"     => "Taispeáin na $1 athruithe is déanaí sna $2 laethanta seo caite.",
 "rclinks"       => "Taispeáin na $1 athruithe is déanaí sna $2 laethanta seo caite; $3 mionathruithe",
-"rchide"        => "sa cuma $4; $1 mionathruithe; $2 fo-ainmranna; $3 athruithe ilchodacha.",
-"rcliu"         => "; $1 athruithe de úsáideoirí­ atá logáilte isteach",
-"diff"          => "difrí­ochtaí­",
-"hist"          => "stáir",
-"hide"          => "folaigh",
-"show"          => "taispeán",
+"rchide"	=> "san fhoirm $4; $1 mionathruithe; $2 fo-ainmspásanna; $3 athruithe ilchodacha.",
+"rcliu"	 => "; $1 athruithe de úsáideoirí atá logáilte isteach",
+"diff"	  => "difr",
+"hist"	  => "stáir",
+"hide"	  => "Folaigh",
+"show"	  => "taispeán",
 "tableform"     => "tábla",
 "listform"      => "liosta",
 "nchanges"      => "$1 athruithe",
-"minoreditletter" => "M",
+"minoreditletter" => "m",
 "newpageletter" => "N",
+'sectionlink' => '?',
+'number_of_watching_users_RCview'       => '[$1]',
+'number_of_watching_users_pageview'     => '[$1 úsáideoirí ag breathnú]',
 
 # Upload
 #
-"upload"        => "Uaslódáil comhad",
+"upload"	=> "Uaslódáil comhad",
 "uploadbtn"     => "Uaslódáil comhad",
-"uploadlink"    => "Uaslódáil í­omhánna",
+"uploadlink"    => "Uaslódáil íomhánna",
 "reupload"      => "Athuaslódáil",
 "reuploaddesc"  => "Dul ar ais chuig an fhoirm uaslódála.",
 "uploadnologin" => "Nil tú logáilte isteach",
-"uploadnologintext" => "Caithfifh tú bheith [[Speisialta:Userlogin|logáilte isteach]]
-chun comhaid a uaslódáil.",
+"uploadnologintext" => "Ní mór duit <a href=\"" .
+  "{{localurle:Speisialta:Userlogin}}\">logáil isteach</a>
+chun comhaid a huaslódáil.",
 "uploaderror"   => "Earráid uaslódála",
-"uploadtext"    => "'''STOP!''' Roimh a uaslódálaíonn tú rud ar bith anseo,
-bí­ cinnte leigh agus géill don
-[[Project:Polasaí­_úsáide_í­omhá|polasaí­ úsáide í­omhá]] atá ag an Vicipéid.
-
-Má bhfuil aon comhad i dtaisce fós leis an ainm céanna a bhfuil tú ag
-tabhairt don comhad nua, cuirfear an nuachomhad in ionad an seanchomhad gan fógra.
-Mar sin, mura nuashonraí­onn tú comhad éigin, is scéal maith é cinntigh má bhfuil comhad
-leis an ainm seo ann fós.
-
-Dul go dti an[[Speisialta:Imagelist|liosta í­omhánna]]chun féach ar nó chuardaigh idir í­omhánna atá uaslódáilte roimhe seo.
-Déantar liosta de uaslódála agus scriosaidh ar an
-[[Project:Liosta_uaslódála|liosta uaslódála]].
-
-Bain úsáid as an fhoirm anseo thí­os chun í­omháchomhaid nua a chaith in airde.
-Ba féidir leat na í­omhánna a úsáid i do chuid ailt.
-Ar an chuid is mó de lí­onléitheoirí­, feicfidh tú cnaipe \"siortaigh...\" no mar sin. Lé brú ar an cnaipe seo,
-gheobhaigh tú an gháthbhosca agallaimh comhadtheachta do [[córas dubhshraithe|chórais dubhshraithe]].
-Nuair a luí­onn tú comhad, lí­onfar ainm an comhaid san téacsbhosca in aice leis an cnaipe.
-Ní mór duit a admháil le brú san bosca beag nach
-bhfuil tú ag sáraigh aon chóipcheart leis an caitheamh in airde seo.
-Brúigh an cnaipe \"Uaslódáil\" chun an caitheamh in airde a chrí­ochnaigh.
-Mura bhfuil nasc idirlí­n tapaidh agat, beidh roinnt ama uait chun an rud sin a dhéanamh.
-
-Is iad na formáide inmholta ná JPEG do í­omhánna grianghrafacha, PNG
-do pictiúir tarraingthe agus léaráide, agus [[OGG]] do fuaimeanna.
-Ainmnigh do comhaid go tuairisciúil chun mearbhall a héalú.
-Chun an í­omhá a úsáid san alt, úsáid nasc mar sin:
-'''<nowiki>[[í­omhá:comhad.jpg]]</nowiki>''' nó '''<nowiki>[[image:í­omhá.png|téacs eile]]</nowiki>'''
-nó '''<nowiki>[[meán:comhad.ogg]]</nowiki>''' do fuaimeanna.
-
-Tabhair faoi deara go, cosúil le leathanaigh Vicipéide, is féidir le daoine eile do suaslódálacha a
-athraigh nó a scriosadh amach, má sí­ltear go bhfuil sé i gcabhair
-don ciclipéid, agus má bhainfeá mí­-úsáid as an córas tá seans go coiscfí­ tú ón gcóras.",
-
-"uploadlog"     => "liosta suaslódála",
-"uploadlogpage" => "Liosta_suaslódála",
-"uploadlogpagetext" => "Is liosta é seo a leanas de na suaslódálacha comhad is deireanacha.
-Is am an friothálaí­ (UTC) iad na hamanna atá anseo thí­os.
+"uploadtext"    => "'''STOP!''' Sul má dhéanann tú uaslódáil anseo,
+bí cinnte an [[Vicipéid:Polasaí_úsáide_íomhá|polasaí úsáide íomhá]] atá ag Vicipéid a léamh agus géilleadh dó.
+
+Má tá comhad ann cheana leis an ainm céanna atá tú ag tabhairt don chomhad nua, cuirfear an comhad nua
+in áit an sean-chomhaid gan fógra.
+Mar sin, muna roghnaíonn tú comhad, is fearr féachaint an bhfuil comhad leis an ainm chéanna ann cheana féin.
+
+Le breathnú nó cuardach a dhéanamh ar íomhánna a uaslódáladh cheana féin, téigh go dtí an
+[[Speisialta:Imagelist|liosta íomhánna]] uaslódáilte. Déantar liosta de uaslódála agus scriosaidh ar an [[Vicipéid:Liosta_uaslódála|liosta uaslódála]].
+
+Bain úsáid as an bhfoirm thíos chun íomhá-chomhaid nua a uaslódáil. Is féidir leat na h-íomhánna a úsáid i do chuid alt.
+Ar an gcuid is mó de na líonléitheoirí, feicfidh tú cnaipe \"Brabhsáil...\" nó rud éigin mar sin.
+Lé brú ar an gcnaipe seo, gheobhaigh tú an ghnáthbhosca dialóige comhad-oscailte dod'chóras oibriúcháin.
+Nuair a roghnaíonn tú comhad, líonfar ainm an chomhaid sa téacsbhosca in aice leis an gcnaipe.
+Caithfidh tú dearfú le brú sa bhosca beag nach bhfuil tú ag sárú aon chóipcheart leis an suaslódáil seo.
+Brúigh an cnaipe \"Uaslódáil\" chun an uaslódáil a chríochnú. Mura bhfuil nasc Idirlín tapaidh agat,
+beidh roinnt ama uait leis seo.
+
+Is iad na formáidí inmholta ná [[JPEG]] do íomhánna grianghrafa, [[PNG]] do pictiúir tarraingte agus léaráidí,
+agus [[OGG]] d'huaimeanna. Ainmnigh do chuid comhad i mbealach a mbeidh sé éasca ciall a bhaint astu, chun dul
+amú a sheachaint. Chun an íomhá a úsáid san alt, úsáid nasc mar seo:
+
+'''[[{{ns:6}}:comhad.jpg]]'''
+nó '''[[{{ns:6}}:íomhá.png|téacs eile]]''',
+nó '''[[{{ns:-2}}:comhad.ogg]]''' d'fhuaimeanna.
+
+Mar is fíor maidir le leathanaigh Vicipéide, is féidir le daoine eile do chuid comhad
+
+uaslódáilte a athrú nó a
+scriosadh, má shíltear go bhfuil sé i gcabhair don ciclipéid. Má bhaineann tú mí-úsáid as an gcóras tá seans
+go gcoscfar ón gcóras tú.",
+
+"uploadlog"     => "Stair uaslódála",
+"uploadlogpage" => "Stair_uaslódála",
+"uploadlogpagetext" => "Is liosta é seo a leanas de na uaslódáil comhad is deanaí.
+Is am an freastalaí (UTC) iad na hamanna atá anseo thíos.
 <ul>
 </ul>
 ",
-"filename"      => "Ainm comhaid",
+"filename"      => "Comhadainm",
 "filedesc"      => "Achoimriú",
 "filestatus" => "Stádas cóipchirt",
 "filesource" => "Foinse",
-"copyrightpage" => "Vicipéid:Cóipchearta",
+"copyrightpage" => "{{ns:4}}:Cóipchearta",
 "copyrightpagename" => "Cóipcheart Vicipéide",
-"uploadedfiles" => "Comhaid suaslódálaithe",
+"uploadedfiles" => "Comhaid uaslódáilte",
 "ignorewarning" => "Scaoil tharat an rabhadh agus sábháil an comhad ar aon chaoi.",
-"minlength"     => "Caithfidh trí­ litreacha ar a laghad bheith ann sa ainm í­omhá.",
-'illegalfilename'	=> 'Tá litreacha san comhadainm  "$1" a nach ceadaítear in ainm leathanaigh. Athainmnigh an comhad agus déan athiarracht, más é do thoil é.',
-"badfilename"   => "D'athraí­odh an ainm í­omhá go \"$1\".",
-"badfiletype"   => "Ní­l \".$1\" ina formáid comhaid í­omhá inmholta.",
-"largefile"     => "Moltar nach uaslódálaítear comhaid í­omhá thar 100kb i méid.",
-'emptyfile'		=> "De réir cuma, ní aon rud san chomhad a d'uaslódáil tú ach comhad folamh. Is dócha gur míchruinneas é seo san ainm chomhaid. Seiceáil más é an comhad seo atá le huaslódáil agat.",
+"minlength"     => "Caithfidh trí litreacha ar a laghad bheith ann sa comhadainm.",
+'illegalfilename'       => 'Tá litreacha san comhadainm  "$1" nach ceadaítear in ainm leathanaigh. Athainmnigh
+an comhad agus déan athiarracht, más é do thoil é.',
+"badfilename"   => "D'athraíodh an comhadainm bheith \"$1\".",
+"badfiletype"   => "Níl \".$1\" ina formáid comhaid íomhá inmholta.",
+"largefile"     => "Moltar nach uaslódálaítear comhaid íomhá thar 100kb i méid.",
+'emptyfile'	     => "De réir a chuma, ní aon rud san chomhad a d'uaslódáil tú ach comhad folamh. Is dócha gur
+míchruinneas é seo san ainm chomhaid. Seiceáil más é an comhad seo atá le huaslódáil agat.",
 "successfulupload" => "Uaslódáil rathúil",
 "fileuploaded"  => "Uaslódáladh an comhad \"$1\" go rathúil.
-Lean an nasc seo: ($2) chuig an leathanach cuir sios agus lí­on isteach
+Lean an nasc seo: ($2) chuig an leathanach cuir sios agus líon isteach
 eolas faoin comhad, mar shampla cá bhfuarthas é, cathain a
-chruthaí­odh é agus rud eile ar bith tá 'fhios agat faoi.",
+chruthaíodh é agus rud eile ar bith tá 'fhios agat faoi. Más íomhá an comhad seo,
+is féidir leat é a hionsú mar sin: <tt>[[Íomhá:$1|mion|Cur síos]]</tt>",
 "uploadwarning" => "Rabhadh suaslódála",
 "savefile"      => "Sábháil comhad",
-"uploadedimage" => "D'uaslódáladh \"[[$1]]\"",
+"uploadedimage" => "D'uaslódáladh \"$1\"",
+'uploaddisabled' => 'Tá brón orainn, díchumasaítear an córas uaslódála faoi láthair.',
+'uploadcorrupt' => 'Tá an comhad truaillithe nó tá iarmhír comhadainm neamhbhailí aige. Scrúdaigh an comhad agus
+uaslódáil é arís, le do thoil.',
+'uploadvirus' => 'Tá víreas ann sa comhad seo! Eolas: $1',
+'sourcefilename' => 'Comhadainm foinse',
+'destfilename' => 'Comhadainm sprice',
 
 # Image list
 #
-"imagelist"     => "Liosta í­omhánna",
-"imagelisttext" => "Is liosta é seo a leanas de $1 í­omhánna, curtha in eagar le $2.",
-"getimagelist"  => "ag fáil an liosta í­omhánna",
+"imagelist"     => "Liosta íomhánna",
+"imagelisttext" => "Is liosta é seo a leanas de $1 íomhánna, curtha in eagar le $2.",
+"getimagelist"  => "ag fáil an liosta íomhánna",
 "ilsubmit"      => "Cuardaigh",
-"showlast"      => "Taispeáin na $1 í­omhánna seo caite, curtha in eagar le $2.",
-"byname"        => "de réir hainm",
-"bydate"        => "de réir dáta",
-"bysize"        => "de réir méid",
+"showlast"      => "Taispeáin na $1 íomhánna seo caite, curtha in eagar le $2.",
+"byname"	=> "de réir hainm",
+"bydate"	=> "de réir dáta",
+"bysize"	=> "de réir méid",
 "imgdelete"     => "scrios",
-"imgdesc"       => "cur",
-"imglegend"     => "Eochair: (cur) = taispeáin/athraigh cur sí­os an í­omhá.",
-"imghistory"    => "Stair an í­omhá",
+"imgdesc"       => "curs",
+"imglegend"     => "Eochair: (curs) = taispeáin/athraigh an cur síos comhaid.",
+"imghistory"    => "Stair an chomhaid",
 "revertimg"     => "ath",
 "deleteimg"     => "scr",
-"deleteimgcompletely"     => "scr",
-"imghistlegend" => "Eochair: (rth) = seo é an eagrán reatha, (scr) = scrios an
-sean-eagrán seo, (ath) = athúsáid an sean-eagrán seo.
-<br /><i>Bruigh an dáta chun feach ar an í­omhá mar a suaslódálaí­odh é ar an dáta sin</i>.",
-"imagelinks"    => "Naisc í­omhá",
-"linkstoimage"  => "Is iad na leathanaigh seo a leanas a nascaí­onn chuig an í­omhá seo:",
-"nolinkstoimage" => "Ní­l aon leathanach ann a nascaí­onn chuig an í­omhá seo.",
+"deleteimgcompletely"     => "Scrios gach leasú don comhad seo",
+"imghistlegend" => "Eochair: (rth) = an leagan láithreach is ea seo, (scr) = scrios an
+seanleagan seo, (ath) = athúsáid an seanleagan seo.
+<br><i>Bruigh an dáta chun feach ar an íomhá mar a suaslódálaíodh é ar an dáta sin</i>.",
+"imagelinks"    => "Naisc íomhá",
+"linkstoimage"  => "Is iad na leathanaigh seo a leanas a nascaíonn chuig an íomhá seo:",
+"nolinkstoimage" => "Níl aon leathanach ann a nascaíonn chuig an íomhá seo.",
+'sharedupload' => 'Is uaslodáil roinnte atá ann sa comhad seo, agus is féidir le tionscadail eile é a úsáid.',
+'shareduploadwiki' => 'Féach ar an [leathanach cur síos don comhad $1] le tuilleadh eolais.',
+'shareddescriptionfollows' => '-',
+'noimage'       => 'Níl aon chomhad ann leis an ainm seo, ba féidir leat [$1 é a uaslódáil]',
+'uploadnewversion' => '[$1 Uaslódáil leagan nua den comhad seo]',
 
 # Statistics
 #
-"statistics"    => "Staitistic",
-"sitestats"     => "Staitistic suí­mh",
-"userstats"     => "Staitistic úsáideora",
-"sitestatstext" => "Is é '''$1''' an méid leathanach in iomlán sa bhunachar sonraí­.
-Cuirtear san áireamh \"plé\"-leathanaigh, leathanaigh faoin Vicipéid, ailt \"stumpaí­\"
-í­osmhéadacha, athsheolaidh, agus leathanaigh eile a nach cáileann mar ailt.
-Ag fágáil na leathanaigh seo as, tá '''$2''' leathanaigh ann atá ailt dlisteanacha, is dócha.
-
-In iomlán bhí­ '''$3''' radhairc leathanaigh, agus ''''$4''' athruithe leathanaigh
+"statistics"    => "Staidreamh",
+"sitestats"     => "Staidreamh do {{SITENAME}}",
+"userstats"     => "Staidreamh úsáideora",
+"sitestatstext" => "Is é '''$1''' líon na leathanach sa bunachar sonraí.
+Cuirtear leathanaigh \"phlé\", leathanaigh a bhaineann le Vicipéid í fhéin, ailt \"stumpaí\"
+íosmhéadacha, athsheolaidh, agus leathanaigh eile nach cáileann mar ailt i ndáiríre, san áireamh.
+Ag fágáil na leathanaigh seo as, tá '''$2''' leathanaigh ann atá ina nailt dlisteanacha, is dócha.
+
+In iomlán tá '''$3''' radhairc leathanaigh, agus ''''$4''' athruithe leathanaigh sa Vicipéid
 ó thus athchóiriú an vicí (25 Eanáir, 2004).
-Sin '''$5''' athruithe ar meán do gach leathanach, agus '''$6''' radhairc do gach athrú.",
-"userstatstext" => "Tá '''$1''' úsáideoirí­ cláraithe ann.
-Is iad '''$2''' de na úsáideoirí­ seo ina riarthóirí­ (féach ar $3).",
+Is é sin '''$5''' athruithe ar meán do gach leathanach, agus '''$6''' radhairc do gach athrú.",
+"userstatstext" => "Tá '''$1''' úsáideoirí cláraithe anseo.
+Tá '''$2''' de na úsáideoirí seo ina riarthóirí (féach ar $3).",
 
 # Maintenance Page
 #
-"maintenance"       => "Leathanach coinneála",
-"maintnancepagetext"    => "Sa leathanach seo faightear uirlisí­ éagsúla don gnáthchoinneáil. Is féidir le roinnt
-de na feidhmeanna seo an bunachar sonraí­ a cuir strus ar, mar sin ná athbhruigh athlódáil tar éis gach mí­r a
-chrí­ochnaí­onn tú ;-)",
-"maintenancebacklink"   => "Ar ais go Leathanach Coinneála",
-"disambiguations"   => "Leathanaigh easathbhrí­ochais",
-"disambiguationspage"   => "Vicipéid:Naisc_go_leathanaigh_easathbhrí­ochais",
-"disambiguationstext"   => "Nascaí­onn na ailt seo a leanas go <i>leathanach easathbhrí­ochais</i>. Ba chóir dóibh nasc a
-dhéanamh leis an ábhar oiriúnach ina áit.<br />Tugtar an teideal easathbhrí­ochais ar leathanach má bhfuil násc aige
-ó $1.<br /><i>Ní­</i> cuirtear naisc ó ranna eile ar an liosta seo.",
-"doubleredirects"   => "Athsheolaidh Dúbailte",
+"maintenance"       => "Leathanach cothabhála",
+"maintnancepagetext"    => "Sa leathanach seo faightear uirlisí éagsúla don gnáthcothabháil. Is féidir le roinnt
+de na feidhmeanna seo an bunachar sonraí a cuir strus ar, mar sin ná athbhruigh athlódáil tar éis gach mír a
+chríochnaíonn tú ;-)",
+"maintenancebacklink"   => "Ar ais go dtí an Leathanach Cothabhála",
+"disambiguations"   => "Leathanaigh idirdhealaithe",
+"disambiguationspage"   => "Vicipéid:Naisc_go_leathanaigh_idirdhealaithe",
+"disambiguationstext"   => "Nascaíonn na ailt seo a leanas go <i>leathanach
+idirdhealaithe</i>. Ba chóir dóibh nasc a dhéanamh dón ábhar áirithe atá i gceist.<br>Tugtar
+an teideal \"idirdhealán\" ar leathanach má tá nasc ar $1 dó.<br><i>Ní</i> cuirtear ar
+an liosta seo naisc as na hainmspásanna eile.",
+"doubleredirects"   => "Athsheolaidh dúbailte",
 "doubleredirectstext"   => "<b>Tabhair faoi deara:</b> B'fheidir go bhfuil toraidh bréagacha ar an liosta seo.
-De ghnáth cí­allaí­onn sé sin go bhfuil téacs breise le naisc thí­os sa chéad #REDIRECT no #ATHSHEOLADH.<br />\n Sa gach
-sraith tá náisc chuig an chéad is an dara athsheoladh, chomh maith le chéad lí­ne an dara téacs athsheolaidh. De ghnáth
-tugann sé sin an sprioc-alt \"fí­or\".",
+De ghnáth cíallaíonn sé sin go bhfuil téacs breise le naisc thíos sa chéad #REDIRECT no #ATHSHEOLADH.<br>\n Sa
+gach sraith tá náisc chuig an chéad is an dara athsheoladh, chomh maith le chéad líne an dara téacs athsheolaidh. De
+ghnáth tugann sé sin an sprioc-alt \"fíor\".",
 "brokenredirects"   => "Athsheolaidh Briste",
-"brokenredirectstext"   => "Is iad na athsheolaidh seo a leanas a nascaí­onn go ailt a nach bhfuil ann.",
+"brokenredirectstext"   => "Is iad na athsheolaidh seo a leanas a nascaíonn go ailt nach bhfuil ann fós.",
 "selflinks"     => "Leathanaigh le féin-naisc",
-"selflinkstext"     => "Sna leathanaigh seo a leanas tá naisc a nascaí­onn chuig an leathanach céanna é fhéin. Seo é flúirseach.",
-"mispeelings"           => "Leathanaigh mí­litrithe",
-"mispeelingstext"               => "Sna leathanaigh seo a leanas tá mí­litriú coiteanta, atá san liosta ar $1. Is dócha go taispeántar an litriú ceart (mar sin).",
-"mispeelingspage"       => "List of common misspellings",
+"selflinkstext"     => "Sna leathanaigh seo a leanas tá naisc a nascaíonn chuig an leathanach céanna é fhéin. Tá an méid seo flúirseach.",
+"mispeelings"	   => "Leathanaigh mílitrithe",
+"mispeelingstext"	       => "Sna leathanaigh seo a leanas tá mílitriú coiteanta, atá san liosta ar $1. Is
+dócha go taispeántar an litriú ceart (mar sin).",
+"mispeelingspage"       => "Liosta mhílitriuithe coitianta",
 "missinglanguagelinks"  => "Naisc Teangacha Ar Iarraidh",
 "missinglanguagelinksbutton"    => "Cuardaigh ar naisc teangacha ar iarraidh do",
-"missinglanguagelinkstext"      => "<i>Ní­</i> nascaí­onn na ailt seo chuig a macasamhail sa $1. <i>Ní­</i> taispeántar athsheolaidh nó fo-leathanaigh.",
+"missinglanguagelinkstext"      => "<i>Ní</i> nascaíonn na hailt seo chuig a macasamhail sa $1. <i>Ní</i>
+taispeántar athsheolaidh nó fo-leathanaigh.",
 
 
 # Miscellaneous special pages
 #
-"orphans"       => "Leathanaigh dí­lleachtacha",
-'geo'		=> 'Comhardanáidí GEO',
-'validate'		=> 'Cuir an leathanach i bhailí',
-"lonelypages"   => "Leathanaigh dí­lleachtacha",
-'uncategorizedpages'	=> 'Leathanaigh gan rang',
-"unusedimages"  => "Íomhánna tréigthe",
+"orphans"       => "Leathanaigh dhílleachtacha",
+'geo'	   => 'Comhardanáidí GEO',
+'validate'      => 'Cuir an leathanach i bhailí',
+"lonelypages"   => "Leathanaigh dhílleachtacha",
+'uncategorizedpages'    => 'Leathanaigh gan catagóir',
+'unusedcategories' => 'Catagóirí nach úsáidtear',
+"unusedimages"  => "Íomhánna nach úsáidtear",
 "popularpages"  => "Leathanaigh coitianta",
-"nviews"        => "$1 radhairc",
-"wantedpages"   => "Leathanaigh de dhí­th",
-"nlinks"        => "$1 naisc",
+"nviews"	=> "$1 radhairc",
+"wantedpages"   => "Leathanaigh de dhíth",
+"nlinks"	=> "$1 naisc",
 "allpages"      => "Na leathanaigh go léir",
-'nextpage'		=> 'An lch a leanas ($1)',
+'nextpage'	      => 'An lch a leanas ($1)',
 "randompage"    => "Leathanach fánach",
+'randompage-url'=> 'Speisialta:Random',
 "shortpages"    => "Leathanaigh gearra",
 "longpages"     => "Leathanaigh fada",
-'deadendpages'  => 'Dead-end pages',
-"listusers"     => "Liosta úsáideoirí­",
-"specialpages"  => "Lgh speisialta",
-"spheading"     => "Lgh speisialta do gach úsáideoir",
-"protectpage"   => "Cuir glas ar leathanach",
+'deadendpages'  => 'Leathanaigh caocha',
+"listusers"     => "Liosta úsáideoirí",
+"specialpages"  => "Leathanaigh speisialta",
+"spheading"     => "Leathanaigh speisialta do gach úsáideoir",
+
+"protectpage"   => "Glasáil leathanach",
 "recentchangeslinked" => "Athruithe gaolmhara",
-"rclsub"        => "(go leathanaigh nasctha ó \"$1\")",
-"debug"         => "Bain fabhtanna",
+"rclsub"	=> "(go leathanaigh nasctha ó \"$1\")",
+"debug"	 => "Bain fabhtanna",
 "newpages"      => "Leathanaigh nua",
 "ancientpages"      => "Na leathanaigh is sine",
 "intl"      => "Naisc idirtheangacha",
 'move' => 'Athainmnigh',
 "movethispage"  => "Athainmnigh an leathanach seo",
-"unusedimagestext" => "<p>Tabhair faoi deara go féidir le lí­onshuí­mh
-eile, m.sh. na Vicipéidí­ eile, naisc a dhéanamh le í­omha le URL dí­reach,
-agus mar sin beidh siad ar an liosta seo fós cé go bhfuil an í­omhá
-in úsáid anois.",
-"booksources"   => "Díoltóirí­ leabhar",
-"booksourcetext" => "Seo é liosta anseo thí­os chuig suí­mh eile a
-dí­olann leabhair nua agus athdhí­olta, agus tá seans go bhfuil eolas
-breise acu faoina leabhair a bhfuil tú ag tnuth leis.
-Ní­l aon baint ag Vicipéid le gnó ar bith anseo, agus ní­
+"unusedimagestext" => "<p>Tabhair faoi deara gur féidir le shuímh
+eile naisc a dhéanamh leis an íomha le URL díreach,
+agus mar sin bheadh siad ar an liosta seo fós cé go bhfuil siad
+in úsáid faoi láthair.",
+'unusedcategoriestext' => 'Tá na leathanaigh catagóire seo a leanas ann, cé nach úsáidtear
+iad in aon alt eile nó in aon chatagóir eile.',
+"booksources"   => "Leabharfhoinsí",
+'categoriespagetext' => 'Tá na catagóir seo a leanas ann sa vicí.',
+'data'  => 'Sonraí',
+"booksourcetext" => "Liosta is ea seo thíos de suímh eile a
+dhíolann leabhair nua agus athdhíolta, agus tá seans ann go bhfuil eolas
+breise acu maidir leis na leabhair a bhfuil tú ag iarradh ar.
+Níl aon baint ag {{SITENAME}} le gnó ar bith anseo, agus ní
 aontú leo é an liosta seo.",
-'isbn'	=> 'ISBN',
-'rfcurl' =>  "http://www.faqs.org/rfcs/rfc$1.html",
+'isbn'  => 'ISBN',
+'rfcurl' =>  "http://www.ietf.org/rfc/rfc$1.txt",
 "alphaindexline" => "$1 go $2",
-'version'		=> 'Leagan',
+'version'	       => 'Leagan',
+'log'	   => 'Logaí',
+'alllogstext'   => 'Taispeántas comhcheangaltha de logaí a bhaineann le huaslódáil, scriosadh, glasáil, coisc,
+agus oibreoirí córais. Is féidir leat an taispeántas a ghéarú - roghnaigh an saghas loga, an ainm úsáideora, nó an
+leathanach atá i gceist agat.',
+
+# Special:Allpages
+'nextpage'	  => 'An leathanach a leanas ($1)',
+'allarticles'       => 'Gach alt',
+'allpagesprev'      => 'Roimhe',
+'allpagesnext'      => 'Ar aghaidh',
+'allpagessubmit'    => 'Dul',
 
 # Email this user
 #
-"mailnologin"   => "Ní­l aon seoladh maith ann",
-"mailnologintext" => "Ní mór duit bheith  [[Special:Userlogin|logáilte isteach]]
-agus bheith le seoladh rí­omhphoist bhailí­ i do chuid [[Special:Preferences|sainroghanna]]
-más mian leat rí­omhphost a sheoladh chuig úsáideoirí­ eile.",
-"emailuser"     => "Cuir rí­omhphost chuig an úsáideoir seo",
-"emailpage"     => "Seol rí­omhphost",
-"emailpagetext" => "Ma d'iontráil an úsáideoir seo seoladh rí­omhphoist bhailí­
-ina chuid sainroghanna úsáideora, cuirfidh an foirm anseo thí­os teachtaireacht amháin do.
-Beidh do seoladh rí­omhphoist, a d'iontráil tú i do chuid sainroghanna úsáideora, ann
-san bhosca \"Seoltóir\" an riomhphoist, agus mar sin ba féidir léis an faighteoir rí­omhphost a chur leatsa.",
+"mailnologin"   => "Níl aon seoladh maith ann",
+"mailnologintext" => "Ní mór duit bheith  <a href=\"{{localurl:Special:Userlogin\">logáilte isteach</a>
+agus bheith le seoladh ríomhphoist bhailí i do chuid <a href=\"{{localurl:Special:Preferences}}\">sainroghanna</a>
+más mian leat ríomhphost a sheoladh chuig úsáideoirí eile.",
+"emailuser"     => "Cuir ríomhphost chuig an úsáideoir seo",
+"emailpage"     => "Seol ríomhphost",
+"emailpagetext" => "Má d'iontráil an úsáideoir seo seoladh ríomhphoist bhailí
+ina chuid sainroghanna úsáideora, cuirfidh an foirm anseo thíos teachtaireacht amháin do.
+Beidh do seoladh ríomhphoist a d'iontráil tú i do chuid sainroghanna úsáideora
+sa bhosca \"Seoltóir\" an riomhphoist, agus mar sin ba féidir léis an faighteoir ríomhphost eile a chur leatsa.",
 'usermailererror' => 'Earráid leis an píosa ríomhphoist: ',
 'defemailsubject'  => "Ríomhphost Vicipéide",
-"noemailtitle"  => "Ní­l aon seoladh rí­omhphoist ann",
-"noemailtext"   => "Ní­or thug an úsáideoir seo seoladh rí­omhphoist bhailí­, nó shocraigh sé nach
-mian leis rí­omhphost a fháil ón úsáideoirí­ eile.",
+"noemailtitle"  => "Níl aon seoladh ríomhphoist ann",
+"noemailtext"   => "Níor thug an úsáideoir seo seoladh ríomhphoist bhailí, nó shocraigh sé nach
+mian leis ríomhphost a fháil ón úsáideoirí eile.",
 "emailfrom"     => "Seoltóir",
 "emailto"       => "Chuig",
 "emailsubject"  => "Ábhar",
 "emailmessage"  => "Teachtaireacht",
 "emailsend"     => "Seol",
-"emailsent"     => "Rí­omhphost seolta",
-"emailsenttext" => "Seoladh do theachtaireacht rí­omhphoist go ráthúil.",
+"emailsent"     => "Ríomhphost seolta",
+"emailsenttext" => "Seoladh do theachtaireacht ríomhphoist go ráthúil.",
 
 # Watchlist
 #
 "watchlist"     => "Mo liosta faire",
 "watchlistsub"  => "(don úsáideoir \"$1\")",
-"nowatchlist"   => "Ní­l aon rud i do liosta faire.",
-"watchnologin"  => "Ní­l tú logáilte isteach",
-"watchnologintext"  => "Ní mór duit bheith [[Speisialta:Userlogin|logáilte isteach]]
+"nowatchlist"   => "Níl aon rud i do liosta faire.",
+"watchnologin"  => "Níl tú logáilte isteach",
+"watchnologintext"  => "Ní mór duit <a href=\"" .
+  "{{localurle:Speisialta:Userlogin}}\">logáil isteach</a>
 chun do liosta faire a athrú.",
 "addedwatch"    => "Curtha san liosta faire",
 "addedwatchtext" => "Cuireadh an leathanach \"$1\" le do <a href=\"" .
   "{{localurle:Speisialta:Watchlist}}\">liosta faire</a>.
-Cuirfear athruithe amach anseo don leathanach sin agus a leathanach phlé leis an liosta ann,
-agus beidh <b>cló dubh</b> ar a teideal san <a href=\"" .
-  "{{localurle:Speisialta:Recentchanges}}\">liosta de na hathruithe is déanaí</a> sa chaoi go
-bhfeicfeá iad go héasca.</p>
-
-<p>Más mian leat an leathanach a bain amach do liosta faire ní­os déanaí­, brúigh ar \"Stop ag faire\" ar an taobhbharra.",
+Cuirfear athruithe amach anseo, don leathanach sin agus don leathanach phlé, ar an liosta ann,
+agus beidh <b>cló trom</b> ar a theideal san <a href=\"" .
+  "{{localurle:Speisialta:Recentchanges}}\">liosta de na hathruithe is déanaí</a> sa chaoi go bhfeicfeá iad go héasca.</p>
+<p>Más mian leat an leathanach a bain amach do liosta faire níos déanaí, brúigh ar \"Stop ag faire\" ar an taobhbharra.",
 "removedwatch"  => "Bainthe amach ón liosta faire",
 "removedwatchtext" => "Baineadh an leathanach \"$1\" amach ó do liosta faire.",
-'watch' => 'Faire',
-"watchthispage" => "Faire ar an leathanach seo",
+'watch' => 'Fair',
+"watchthispage" => "Fair ar an leathanach seo",
 'unwatch' => 'Stop ag faire',
 "unwatchthispage" => "Stop ag faire",
-"notanarticle"  => "Ní­l alt ann",
-"watchnochange" => "Ní­or athraí­odh aon de na leathanaigh i do liosta faire taobh istigh den am socraithe.",
-"watchdetails" => "(Tá tú ag faire ar $1 leathanaigh chomh maith leis na leathanaigh phlé;
-le déanach athraí­odh $2 leathanaigh in iomlán;
-$3...
-[$4 athraigh do liosta].)",
-"watchmethod-recent" => "ag seiceáil na athruithe deireanacha do leathanaigh faire",
-"watchmethod-list" => "ag seiceáil na leathanaigh faire do athruithe deireanacha",
-"removechecked" => "Bain mí­reanna marcálaithe amach as do liosta faire",
+"notanarticle"  => "Níl alt ann",
+"watchnochange" => "Níor athraíodh ceann ar bith de na leathanaigh atá ar do liosta faire,
+taobh istigh den tréimhse atá roghnaithe agat.",
+"watchdetails" => "Tá tú ag faire ar $1 leathanaigh, gan leathanaigh phlé a chur san áireamh.",
+"watchmethod-recent" => "ag seiceáil na athruithe deireanacha ar do chuid leathanaigh faire",
+"watchmethod-list" => "ag seiceáil na leathanaigh faire ar do chuid athruithe deireanacha",
+"removechecked" => "Bain míreanna marcálaithe as do liosta faire",
 "watchlistcontains" => "Tá $1 leathanaigh i do liosta faire.",
-"watcheditlist" => "Seo liosta na leathanaigh i do liosta faire, in ord aibitre.
-Marcáil boscaí­ de na leathanaigh atá le baint amach an liosta faire, agus bruigh
+"watcheditlist" => "Is é seo liosta de na leathanaigh i do liosta faire, in ord aibitre.
+Marcáil boscaí de na leathanaigh atá le baint amach an liosta faire, agus bruigh
 an cnaipe 'bain amach le marcanna' ag bun an leathanaigh.",
-"removingchecked" => "Ag baint amach na mí­reanna ón liosta faire mar a iarraidh...",
-"couldntremove" => "Ní­or baineadh amach an mí­r '$1'...",
-"iteminvalidname" => "Fadhb leis an mí­r '$1', ainm neamhbhailí­...",
-"wlnote" => "Seo iad na $1 athruithe seo caite sna <b>$2</b> uaire seo caite.",
-"wlshowlast" => "Taispeáin na mí­reanna deireanacha $1 uaire $2 laethanta $3", #FIXME
-'wlsaved'			=> 'Seo leagan sábháilte do liosta faire.',
+"removingchecked" => "Ag baint amach na míreanna ón liosta faire, mar a iarraidh...",
+"couldntremove" => "Níor baineadh amach an mír '$1'...",
+"iteminvalidname" => "Fadhb leis an mír '$1', ainm neamhbhailí...",
+"wlnote" => "Is iad seo na $1 athruithe deireanacha sna <b>$2</b> uaire deireanacha.",
+"wlshowlast" => "Taispeáin an $1 uair $2 lá seo caite$3", #FIXME
+'wlsaved'	 => 'Leagan sábháilte is ea seo de do liosta faire.',
+'wlhideshowown'   => '$1 mo chuid athruithe.',
+'wlshow'		=> 'Taispeáin',
+'wlhide'		=> 'Folaigh',
+
+'updatedmarker'	 => '<span class=\'updatedmarker\'> leasaithe (ó shin mo chuairt dheireanach) </span>',
+
+'enotif_mailer' 		=> 'Fógrasheoltóir as {{SITENAME}}',
+'enotif_reset'			=> 'Marcáil gach leathanach bheith tadhlaithe',
+'enotif_newpagetext'=> 'Is leathanach nua é seo.',
+'changed'			=> 'D\'athraigh',
+'created'			=> 'Cruthaigh',
+'enotif_subject' 	=> '  $CHANGEDORCREATED $PAGEEDITOR an leathanach $PAGETITLE ag {{SITENAME}}.',
+'enotif_lastvisited' => 'Féach ar $1 le haghaidh gach athrú a rinneadh ó thús na cuairte seo caite a rinne tú.',
+'enotif_body' => 'A $WATCHINGUSERNAME, a chara,
+
+$CHANGEDORCREATED $PAGEEDITOR an leathanach $PAGETITLE  ag {{SITENAME}} ar $PAGEEDITDATE, féach ar $PAGETITLE_URL chun an leagan reatha a fháil.
+
+$NEWPAGE
+
+Athchoimriú an úsáideora a rinne é: $PAGESUMMARY $PAGEMINOREDIT
+
+Déan teagmháil leis an úsáideoir:
+r-phost: $PAGEEDITOR_EMAIL
+vicí: $PAGEEDITOR_WIKI
+
+I gcás athruithe eile, ní bheidh aon fhógra eile muna dtéann tú go dtí an leathanach seo. Ba féidir leat na bratacha fógraithe a athrú do gach leathanach ar do liosta faire.
+
+	     Is mise le meas,
+	     An fógrachóras uathoibríoch ag {{SITENAME}}
+
+--
+Chun do chuid socruithe a athrú maidir leis an liosta faire, teir go dtí
+{{SERVER}}{{localurl:Speisialta:Watchlist/edit}}
+
+Aiseolas agus a thuilleadh cabhrach:
+{{SERVER}}{{localurl:Help:Contents}}',
 
 # Delete/protect/revert
 #
 "deletepage"    => "Scrios an leathanach",
 "confirm"       => "Cinntigh",
-"excontent" => "sin a raibh an ábhar: '$1'",
-"exbeforeblank" => "sin a raibh an ábhar roimh an folmhadh: '$1'",
-"exblank" => "bhí­ an leathanach folamh",
+"excontent" => "is é seo a raibh an ábhar:",
+"exbeforeblank" => "is é seo a raibh an ábhar roimh an folmhadh:",
+"exblank" => "bhí an leathanach folamh",
 "confirmdelete" => "Cinntigh an scriosadh",
 "deletesub"     => "(Ag scriosadh \"$1\")",
-"historywarning" => "Aire: Ta stair ag an leathanach a bhfuil tú ar tí­ é a scrios: ",
-"confirmdeletetext" => "Tá tú ar tí­ leathanach nó í­omhá a scrios,
-chomh maith leis a chuid stair, ón bunachar sonraí­.
+"historywarning" => "Aire: Ta stair ag an leathanach a bhfuil tú ar tí é a scriosadh: ",
+"confirmdeletetext" => "Tá tú ar tí leathanach nó íomhá a scrios,
+chomh maith leis a chuid stair, ón bunachar sonraí.
 Cinntigh go mian leis an méid seo a dhéanamh, go dtuigeann tú na
-iarmhairtaí­, agus go ndéanann tú é dar leis [[Vicipéid:Polasaí­]].",
-"actioncomplete" => "Gní­omh déanta",
-"deletedtext"   => "\"$1\" atá scriosaithe.
-Féach ar $2 chun cuntas den scriosadh deireanacha a fháil.",
+iarmhairtaí, agus go ndéanann tú é dar le [[Vicipéid:Polasaí]].",
+"actioncomplete" => "Gníomh críochnaithe",
+"deletedtext"   => "scriosadh \"$1\".
+Féach ar $2 chun cuntas na scriosiadh deireanacha a fháil.",
 "deletedarticle" => "scriosadh \"$1\"",
 "dellogpage"    => "Cuntas_scriosaidh",
 "dellogpagetext" => "Seo é liosta de na scriosaidh is deireanacha.
-Is in am an innill friothála­ (UTC) iad na hamanna anseo thí­os.
+Is in am an freastalaí (UTC) iad na hamanna anseo thíos.
 <ul>
 </ul>
 ",
 "deletionlog"   => "cuntas scriosaidh",
-"reverted"      => "Tá eagrán ní­os luaithe in úsáid anois",
+"reverted"      => "Tá eagrán níos luaithe in úsáid anois",
 "deletecomment" => "Cúis don scriosadh",
-"imagereverted" => "D'éirigh le athúsáid eagráin ní­os luaithe.",
-"rollback"      => "Athúsáid athruithe",
+"imagereverted" => "D'éirigh le athúsáid eagráin níos luaithe.",
+"rollback"      => "Athúsáid seanathruithe",
 "rollbacklink"  => "athúsáid",
-"rollbackfailed" => "Theipeadh an athúsáid",
-"cantrollback"  => "Ní­ féidir an athrú a áthúsáid; ba é údar an ailt an aon scrí­bhneoir atá ann.",
-"alreadyrolled" => "Ní­ féidir eagrán ní­os luath an leathanach [[$1]]
-le [[Úsáideoir:$2|$2]] ([[Plé úsáideora:$2|Plé]]) a athúsáid; d'athraigh duine eile é fós nó
-d'athúsáid duine eile eagrán ní­os luaithe fós.
+"rollbackfailed" => "Theip an athúsáid",
+"cantrollback"  => "Ní féidir an athrú a athúsáid; ba é údar an ailt an t-aon duine a rinne athrú dó.",
+"alreadyrolled" => "Ní féidir eagrán níos luaí an leathanaigh [[$1]]
+le [[Úsáideoir:$2|$2]] ([[Plé úsáideora:$2|Plé]]) a athúsáid; d'athraigh duine eile é cheana fein, nó
+d'athúsáid duine eile eagrán níos luaí cheana féin.
 
-Ba é [[Úsáideoir:$3|$3]] ([[Plé úsáideora:$3|Plé]]) an té a rinne an athrú seo caite. ",
+[[Úsáideoir:$3|$3]] ([[Plé úsáideora:$3|Plé]]) an té a rinne an athrú is déanaí. ",
 #   only shown if there is an edit comment
-"editcomment" => "Seo a raibh an mí­nithe athraithe: \"<i>$1</i>\".",
+"editcomment" => "Seo a raibh an mínithe athraithe: \"<i>$1</i>\".",
 "revertpage"    => "D'athúsáideadh an athrú seo caite le $1",
 "protectlogpage" => "Cuntas_cosanta",
 "protectlogtext" => "Seo é liosta de glais a cuireadh ar / baineadh de leathanaigh.
-Féach ar [[{{ns:project}}:Leathanach faoi ghlas]] chun a thuilleadh eolais a fháil.",
-"protectedarticle" => "faoi ghlas [[$1]]",
-"unprotectedarticle" => "gan ghlas [[$1]]",
-'protectsub' =>"(Ag curadh \"$1\" faoi ghlas)",
-'confirmprotecttext' => 'Ar mhaith leat go fírinneach glas a chur ar an leathanach seo?',
-'confirmprotect' => 'Cinntigh an glas',
-'protectcomment' => 'Cúis don glas',
-'unprotectsub' =>"(Ag baint an glas de \"$1\")",
-'confirmunprotecttext' => 'Ar mhaith leat go fírinneach an glas a bhaint den leathanach seo?',
+Féach ar [[{{ns:4}}:Leathanach glasáilte]] chun a thuilleadh eolais a fháil.",
+'protectedarticle' => 'glasáladh "[[$1]]"',
+'unprotectedarticle' => 'díghlasáladh "[[$1]]"',
+'protectsub' =>'(Ag glasáil "$1")',
+'confirmprotecttext' => 'Ar mhaith leat go fírinneach an leathanach seo a ghlasáil?',
+'confirmprotect' => 'Cinntigh an glasáil',
+'protectcomment' => 'Cúis don glasáil',
+'unprotectsub' =>"(Ag díghlasáil \"$1\")",
+'confirmunprotecttext' => 'Ar mhaith leat go fírinneach an leathanach seo a díghlasáil?',
 'confirmunprotect' => 'Cinntigh baint an glais',
 'unprotectcomment' => 'Cúis do baint an glais',
 
-
 # Undelete
-"undelete" => "Cuir leathanach scriosaithe ar ais",
-"undeletepage" => "Féach ar agus cuir ar ais leathanaigh scriosaithe",
-"undeletepagetext" => "Scriosaí­odh na leathanaigh seo a leanas cheana, ach
-tá sí­ad ann fós san cartlann agus is féidir iad a cuir ar ais.
-Ó am go ham, is féidir leis an cartlann bheith folmhaithe.",
-"undeletearticle" => "Cuir alt scriosaithe ar ais",
+"undelete" => "Díscrios leathanach scriosta",
+"undeletepage" => "Féach ar leathanaigh scriosta agus díscrios iad",
+"undeletepagetext" => "Scriosaíodh na leathanaigh seo a leanas cheana féin, ach
+tá síad sa cartlann fós agus is féidir iad a dhíscrios.
+Ó am go ham, is féidir an cartlann a fholmhú.",
+"undeletearticle" => "Díscrios alt scriosta",
 "undeleterevisions" => "Cuireadh $1 leagain sa chartlann",
-"undeletehistory" => "Má chuirfeá ab leathanach ar ais, cuirfear ar ais gach athbhreithniú chuig an stair.
-Má chruthaí­odh leathanach nua leis an ainm céanna ó shin an scriosadh, taispeáinfear
-na sean-athruithe san stair roimhe seo, agus ní­ athshuighfear an eagrán reatha an leathanaigh go huathoibrí­och.",
-"undeleterevision" => "Leagan scriosaithe den dáta $1",
-"undeletebtn" => "Cuir ar ais!",
-"undeletedarticle" => "cuireadh \"$1\" ar ais",
-"undeletedtext"   => "Cuireadh an alt [[$1]] ar ais go rathúil.
-Féach ar [[Vicipéid:Cuntas_scriosaidh]] chun cuntas de scriosaidh agus athchóirithe deireanacha a fháil.",
+"undeletehistory" => "Dá díscriosfá an leathanach, díscriosfar gach leasú i stair an leathanaigh.
+Dá gcruthaíodh leathanach nua leis an teideal céanna ó shin an scriosadh, taispeáinfear
+na sean-athruithe san stair roimhe seo, agus ní athshuífear leagan láithreach an
+
+leathanaigh go huathoibríoch.",
+"undeleterevision" => "Leagan scriosta den dáta $1",
+"undeletebtn" => "Díscrios!",
+"undeletedarticle" => "Díscriosadh \"$1\" ar ais",
+"undeletedtext"   => "Díscriosadh an alt [[$1]] go rathúil.
+Féach ar [[{{ns:4}}:Cuntas_scriosaidh]] chun cuntas de scriosaidh agus athchóirithe deireanacha a fháil.",
+
+
+# Namespace form on various pages
+'namespace' => 'Ainmspás:',
+'invert' => 'Cuir an roghnú bun os cionn',
 
 # Contributions
 #
-"contributions" => "Dréachtaí­ úsáideora",
-"mycontris" => "Mo chuid dréachtaí­",
+"contributions" => "Dréachtaí úsáideora",
+"mycontris" => "Mo chuid dréachtaí",
 "contribsub"    => "Do $1",
-"nocontribs"    => "Ní­or bhfuarthas aon athrú a raibh cosúil le na crí­téir seo.",
-"ucnote"        => "Is iad seo thí­os na <b>$1</b> athruithe is deireanaí­ an úsáideora sna <b>$2</b> lae seo caite.",
-"uclinks"       => "Féach ar na $1 athruithe is déanaí­; féach ar na $2 lae seo caite.",
+"nocontribs"    => "Níor bhfuarthas aon athrú a raibh cosúil le na crítéir seo.",
+"ucnote"	=> "Is iad seo thíos na <b>$1</b> athruithe is déanaí a rinne an
+
+úsáideoir sna <b>$2</b> lae
+
+seo caite.",
+"uclinks"       => "Féach ar na $1 athruithe is déanaí; féach ar na $2 lae seo caite.",
 "uctop"     => " (barr)" ,
+'newbies'       => 'núíosaigh',
+'contribs-showhideminor' => '$1 mionathruithe',
 
 # What links here
 #
-"whatlinkshere" => "Naisc don lch seo",
-"notargettitle" => "Ní­l aon cuspóir ann",
-"notargettext"  => "Ní­or thug tú leathanach nó úsáideoir sprice
-chun an gní­omh seo a dhéanamh ar.",
+"whatlinkshere" => "Naisc don leathanch seo",
+"notargettitle" => "Níl aon cuspóir ann",
+"notargettext"  => "Níor thug tú leathanach nó úsáideoir sprice
+chun an gníomh seo a dhéanamh ar.",
 "linklistsub"   => "(Liosta nasc)",
-"linkshere"     => "Nascaí­onn na leathanaigh seo a leanas chuig an leathanach seo:",
-"nolinkshere"   => "Ní­ nascaí­onn aon leathanach chuig an leathanach seo.",
+"linkshere"     => "Nascaíonn na leathanaigh seo a leanas chuig an leathanach seo:",
+"nolinkshere"   => "Ní nascaíonn aon leathanach chuig an leathanach seo.",
 "isredirect"    => "Leathanach athsheolaidh",
 
 # Block/unblock IP
 #
 "blockip"       => "Coisc úsáideoir",
-"blockiptext"   => "Úsáid an foirm anseo thí­os chun bealach scrí­ofa a chosc ó
+"blockiptext"   => "Úsáid an foirm anseo thíos chun bealach scríofa a chosc ó
 seoladh IP nó ainm úsáideora áirithe.
 Is féidir leat an rud seo a dhéanamh amháin chun an chreachadóireacht a chosc, de réir
-mar a deirtear san [[Vicipéid:Polasaí­|polasaí­ Vicipéide]].
-Lí­onaigh cúis áirithe anseo thí­os (mar shampla, is féidir leat a luaigh
+mar a deirtear sa [[Vicipéid:Polasaí|polasaí Vicipéide]].
+Líonaigh cúis áirithe anseo thíos (mar shampla, is féidir leat a luaigh
 leathanaigh áirithe a rinne an duine damáiste ar).",
 "ipaddress"     => "Seoladh IP / ainm úsáideora",
-'ipbexpiry'		=> 'Am éaga',
+'ipbexpiry'	     => 'Am éaga',
 "ipbreason"     => "Cúis",
 "ipbsubmit"     => "Coisc an úsáideoir seo",
-"badipaddress"  => "Ní­l aon úsáideoir ann leis an ainm seo.",
+'ipbother'	      => 'Méid eile ama',
+#'ipboptions'	    => '2 uair:2 uair,1 lá amháin:1 lá amháin,3 lá:3 lá,1 sheachtain amháin:1 sheachtain amháin,2 sheachtain:2 sheachtain,1 mhí amháin:1 mhí amháin,3 mhí:3 mhí,6 mhí:6 mhí,1 bhliain amháin:1 bhliain amháin,gan teorainn:gan teorainn',
+'ipbotheroption'	=> 'eile',
+"badipaddress"  => "Níl aon úsáideoir ann leis an ainm seo.",
 "blockipsuccesssub" => "D'éirigh leis an cosc",
-"blockipsuccesstext" => "Choisceadh \"$1\".
-<br />Féach ar [[Speisialta:Ipblocklist|Liosta coisc IP]] chun coisc a athbhreithnigh.",
-"unblockip"     => "Bain an cosc den úsáideoir",
-"unblockiptext" => "Úsáid an foirm anseo thí­os chun bealach scrí­ofa a thabhairt ar ais go seoladh
-IP nó ainm úsáideora a raibh coiscthe roimhe seo.",
-"ipusubmit"     => "Bain an cosc den seoladh seo",
-"ipusuccess"    => "\"$1\" gan cosc",
-"ipblocklist"   => "Liosta seoltaí­ IP agus ainmneacha úsáideoirí­ coiscthe",
+"blockipsuccesstext" => "Choisceadh [[{{ns:Special}}:Contributions/$1|$1]].
+<br/>Féach ar an g[[{{ns:Special}}:Ipblocklist|liosta coisc IP]] chun coisc a athbhreithniú.",
+"unblockip"     => "Díchoisc úsáideoir",
+"unblockiptext" => "Úsáid an foirm anseo thíos chun bealach scríofa a thabhairt ar ais do seoladh
+IP nó ainm úsáideora a raibh faoi chosc roimhe seo.",
+"ipusubmit"     => "Díchoisc an seoladh seo",
+"ipusuccess"    => "Díchoisceadh \"$1\"",
+"ipblocklist"   => "Liosta seoltaí IP agus ainmneacha úsáideoirí coiscthe",
 "blocklistline" => "$1, $2 a choisc $3 ($4)",
 'infiniteblock' => 'am éaga infinite', //fixme
 'expiringblock' => 'am éaga  $1',
-"blocklink"     => "Coisceadh",
-"unblocklink"   => "bain an cosc den",
-"contribslink"  => "dréachtaí­",
-"autoblocker"   => "Coiscthe go huathoibrí­och de bhrí­ go roinneann tú an seoladh IP céanna le \"$1\". Cúis \"$2\".",
+"blocklink"     => "Cosc",
+"unblocklink"   => "bain an cosc",
+"contribslink"  => "dréachtaí",
+"autoblocker"   => "Coisceadh go huathoibríoch thú dá bharr gur úsáideadh do sheoladh IP ag an úsáideoir \"[[Úsáideoir:$1|$1]]\". Is é seo an cúis don cosc ar $1: \"$2\".",
 "blocklogpage"  => "Cuntas_coisc",
 "blocklogentry" => 'coisceadh "$1"; is é $2 an am éaga',
-"blocklogtext"  => "Seo é cuntas de gní­omhartha coisc úsáideoirí­ agus mí­choisc úsáideoirí­. Ní­ cuirtear
-seoltaí­ IP a raibh coiscthe go huathoibrí­och ar an liosta seo. Féach ar an [[Speisialta:Ipblocklist|Liosta coisc IP]] chun
+"blocklogtext"  => "Seo é cuntas de gníomhartha coisc úsáideoirí agus míchoisc úsáideoirí. Ní cuirtear
+seoltaí IP a raibh coiscthe go huathoibríoch ar an liosta seo. Féach ar an
+[[Speisialta:Ipblocklist|Liosta coisc IP]] chun
 liosta a fháil de coisc atá i bhfeidhm faoi láthair.",
-"unblocklogentry"   => 'baineadh an cosc den "$1"',
-'range_block_disabled'	=> 'Faoi láthair, míchumasaítear an cumas riarthóra chun coisc réimse a dhéanamh.',
-'ipb_expiry_invalid'	=> 'Am éaga neamhbhailí.',
-'ip_range_invalid'	=> "Réimse IP neamhbhailí.\n",
-'proxyblocker'	=> 'Cosc do inneall fo-friothála', #FIXME
-'proxyblockreason'	=> "Cuireadh cosc ar do sheoladh IP de bharr gur bealach fo-friothála neamhshlándála é. Déan teagmháil le do chomhlacht idirlín nó do lucht cabhrach teicneolaíochta go mbeidh 'fhios acu faoin fadhb slándála tábhachtach seo.",
-'proxyblocksuccess'	=> "Críochnaithe.\n",
+"unblocklogentry"   => 'díchoisceadh $1',
+'range_block_disabled'  => 'Faoi láthair, míchumasaítear an cumas riarthóra chun réimsechoisc a dhéanamh.',
+'ipb_expiry_invalid'    => 'Am éaga neamhbhailí.',
+'ip_range_invalid'      => "Réimse IP neamhbhailí.\n",
+'proxyblocker'  => 'Cosc ar seachfhreastalaithe',
+'proxyblockreason'      => "Coisceadh do sheoladh IP dá bharr gur seachfhreastalaí
+neamhshlándála is ea é. Déan teagmháil le do chomhlacht idirlín nó le do lucht cabhrach teicneolaíochta
+go mbeidh 'fhios acu faoin fadhb slándála tábhachtach seo.",
+'proxyblocksuccess'     => "Rinneadh.\n",
+'sorbs'	 => 'DNSBL SORBS',
+'sorbsreason'   => 'Liostalaítear do sheoladh IP mar sheachfhreastalaí oscailte sa DNSBL [http://www.sorbs.net SORBS].',
 
 # Developer tools
 #
-"lockdb"        => "Cuir glas ar an bunachar sonraí­",
-"unlockdb"      => "Bain an glas den bunachar sonraí­",
-"lockdbtext"    => "Má chuirfeá glas ar an bunachar sonraí­, ní­ beidh cead ar aon úsáideoir
-leathanaigh a chur in eagar, a socruithe a athrú, a liostaí­ faire a athrú, nó rudaí­ eile a thrachtann le
-athruithe san bunachar sonraí­.
-Cinntigh go bhfuil an scéal seo d'intinn agat, is go bainfidh tú an glas den bunachar sonraí­ nuair a bhfuil
-do chuid coinneáil críochnaithe.",
-"unlockdbtext"  => "Má bhainfeá an glas den bunachar sonraí­, beidh ceat ag gach úsáideoirí­ aris
-na leathanaigh a chur in eagar, a sainroghanna a athrú, a liostaí­ faire a athrú, agus rudaí­ eile
-a dhéanamh a thrachtann le athruithe san bunachar sonraí­.
+"lockdb"	=> "Glasáil an bunachar sonraí",
+"unlockdb"      => "Díghlasáil bunachar sonraí",
+"lockdbtext"    => "Dá nglasálfá an bunachar sonraí, ní beidh cead ar aon úsáideoir
+leathanaigh a chur in eagar, a socruithe a athrú, a liostaí faire a athrú, nó rudaí eile a thrachtann le
+athruithe san bunachar sonraí.
+Cinntigh go bhfuil an scéal seo d'intinn agat, is go díghlasálfaidh tú an bunachar sonraí nuair a bhfuil
+do chuid cothabháile críochnaithe.",
+"unlockdbtext"  => "Dá díghlasálfá an bunachar sonraí, beidh ceat ag gach úsáideoirí aris
+na leathanaigh a chur in eagar, a sainroghanna a athrú, a liostaí faire a athrú, agus rudaí eile
+a dhéanamh a thrachtann le athruithe san bunachar sonraí.
 Cinntigh go bhfuil an scéal seo d'intinn agat.",
-"lockconfirm"   => "Sea, is mian liom glas a chur ar an bunachar sonraí­.",
-"unlockconfirm" => "Sea, is mian liom glas a bhain den bunachar sonraí­.",
-"lockbtn"       => "Cuir glas ar an mbunachar sonraí­",
-"unlockbtn"     => "Bain an glas den bunachar sonraí­",
-"locknoconfirm" => "Ní­or mharcáil tú an bosca daingnithe.",
-"lockdbsuccesssub" => "D'éirigh le glas an bunachair sonraí­",
-"unlockdbsuccesssub" => "Baineadh an glas den bunachar sonraí­",
-"lockdbsuccesstext" => "Cuireadh glas ar an mbunachar sonraí­ Vicipéide.
-<br />Cuimhnigh nach mór duit an glas a bhaint tar éis do chuid coinneála.",
-"unlockdbsuccesstext" => "Baineadh an glas den bunachar sonraí­ Vicipéide.",
+"lockconfirm"   => "Sea, is mian liom an bunachar sonraí a ghlasáil.",
+"unlockconfirm" => "Sea, is mian liom an bunachar sonraí a dhíghlasáil.",
+"lockbtn"       => "Glasáil an bunachar sonraí",
+"unlockbtn"     => "Díghlasáil an bunachar sonraí",
+"locknoconfirm" => "Níor mharcáil tú an bosca daingnithe.",
+"lockdbsuccesssub" => "D'éirigh le glasáil an bhunachair sonraí",
+"unlockdbsuccesssub" => "D'éirigh le díghlasáil an bhunachair sonraí",
+"lockdbsuccesstext" => "Glasáladh an bunachar sonraí Vicipéide.
+<br />Cuimhnigh nach mór duit é a dhíghlasáil tar éis do chuid cothabháil.",
+"unlockdbsuccesstext" => "Díghlasáladh an bunachar sonraí Vicipéide.",
 
 # Make sysop
-'makesysoptitle'	=> 'Déan ceannasaí de úsáideoir',
-'makesysoptext'		=> 'Úsáideann maorlathaigh an fhoirm seo chun riarthóirí a dhéanamh de ghnáthúsáideoirí.
+'makesysoptitle'	=> 'Déan oibreoir córais de húsáideoir',
+'makesysoptext'	 => 'Úsáideann maorlathaigh an fhoirm seo chun riarthóirí a dhéanamh de ghnáthúsáideoirí.
 Iontráil ainm an úsáideora sa bosca seo agus brúigh an cnaipe chun riarthóir a dhéanamh den úsáideoir',
-'makesysopname'		=> 'Ainm an úsáideora:',
-'makesysopsubmit'	=> 'Déan ceannasaí den úsáideoir seo',
-'makesysopok'		=> "Is ceannasaí atá san <b>Úsáideoir \"$1\" anois.</b>",
-'makesysopfail'		=> "<b>Níor rinneadh ceannasaí den Úsáideoir \"$1\". (Ar iontráil tú an ainm go ceart?)</b>",
+'makesysopname'	 => 'Ainm an úsáideora:',
+'makesysopsubmit'       => 'Déan oibreoir córais den úsáideoir seo',
+'makesysopok'	   => "Is oibreoir córais atá in <b>Úsáideoir \"$1\" anois.</b>",
+'makesysopfail'	 => "<b>Níor rinneadh oibreoir córais den Úsáideoir \"$1\". (Ar iontráil tú an ainm go ceart?)</b>",
 'setbureaucratflag' => 'Athraigh an brat maotharlach',
-'bureaucratlog'		=> 'Liosta_maotharlach',
-'bureaucratlogentry'	=> "Tá na cearta don úsáideoir \"$1\" athraithe bheith \"$2\"",
-'rights'			=> 'Cearta:',
-'set_user_rights'	=> 'Athraigh cearta úsáideora',
-'user_rights_set'	=> "<b>Leasaíodh na cearta úsáideora do \"$1\"</b>",
-'set_rights_fail'	=> "<b>Níorbh fhéidir na cearta úsáideora do \"$1\" a athrú. (Ar iontráil tú an ainm go ceart?)</b>",
-'makesysop'         => 'Déan ceannasaí de úsáideoir',
+'bureaucratlog'	 => 'Liosta_maotharlach',
+'bureaucratlogentry'    => "Tá na cearta don úsáideoir \"$1\" athraithe bheith \"$2\"",
+'rights'	                => 'Cearta:',
+'set_user_rights'       => 'Athraigh na cearta úsáideora',
+'user_rights_set'       => "<b>Leasaíodh na cearta úsáideora do \"$1\"</b>",
+'set_rights_fail'       => "<b>Níorbh fhéidir na cearta úsáideora do \"$1\" a athrú. (Ar iontráil tú an ainm go ceart?)</b>",
+'makesysop'	 => 'Déan oibreoir córais de húsáideoir',
+'already_sysop'     => 'Is oibreoir córais é an usáideoir seo cheana féin',
+'already_bureaucrat' => 'Is maorlathach é an úsáideoir seo cheana féin',
+'already_steward'   => 'Is maor é an úsáideoir seo cheana féin',
 
 # Validation
-'val_clear_old' => 'Glan mo chuid sonraí bailíochta do $1',
+'val_yes' => 'Is ea',
+'val_no' => 'Ní hea',
+'val_of' => '$1 as $2',
+'val_revision' => 'Leasú',
+'val_time' => 'Am',
+'val_user_stats_title' => 'Forbhreathnú bailíochtaithe an úsáideora $1',
+'val_my_stats_title' => 'M\'fhorbhreathnú bailíochtaithe',
+'val_list_header' => '<th>#</th><th>Ábhar</th><th>Réimse</th><th>Gníomh</th>',
+'val_add' => 'Cuir leis',
+'val_del' => 'Scrios',
+'val_show_my_ratings' => 'Taispeáin mo chuid bailíochtuithe',
+'val_revision_number' => 'Leasú #$1',
+'val_warning' => '<b>Ná hathraigh rud ar bith anseo <i>go deo</i> muna bhfuil comhaontú
+
+<i>dearfa</i> ann cheana féin ón comhphobal!</b>',
+'val_rev_for' => 'Leasuithe do $1',
+'val_details_th_user' => 'Úsáideoir $1',
+'val_validation_of' => 'Bailíochtú do "$1"',
+'val_revision_of' => 'Leasú ar $1',
+'val_revision_changes_ok' => 'Stóráladh do chuid meastachán!',
+'val_rev_stats' => 'Féach ar an staidreamh bailíochtaithe do "$1" <a href="$2">anseoe</a>',
+'val_revision_stats_link' => 'sonraí',
+'val_iamsure' => 'Gliogáil an ticbhosca seo más mian leat é a dhéanamh go fírinneach!',
+'val_details_th' => '<sub>Úsáideoir</sub> \\ <sup>Ábhar</sup>',
+
+'val_clear_old' => 'Glan mo chuid sonraí bailíochtaithe níos sine do $1',
 'val_merge_old' => 'Úsáid mo measúnacht roimhe seo nuair atá roghnaithe \'Gan tuairim\'',
 'val_form_note' => '<b>Leid:</b> Má chumaiscítear do chuid sonraí, athreofar
 gach sainrogha ina chuir tú <i>gan tuairim</i> don leagan ailt a roghnaíonn
@@ -1109,140 +1403,176 @@ hathrú, ach ba mhaith leat do roghanna eile don alt a chosaint, ná roghnaigh
 rud ar bith ach amháin an rogha ba mhaith leat a <i>athrú</i>, agus le
 cumaisc líonfar na roghanna eile de réir na roghanna a raibh agat roimhe ré.',
 'val_noop' => 'Gan tuairim',
-'val_percent' => '<b>$1%</b><br />($2 de $3 pointí<br />a rinne $4 úsáideoirí)',
-'val_percent_single' => '<b>$1%</b><br />($2 de $3 pointí<br />a rinne aon úsáideoir)',
+'val_topic_desc_page' => 'Tionscadal:Téamaí bailíochtaithe',
+'val_votepage_intro' => 'Athraigh an téacs seo <a href="{{SERVER}}{{localurl:MediaWiki:Val_votepage_intro}}">anseo</a>!',
+'val_percent' => '<b>$1%</b><br>($2 de $3 pointí<br>a rinne $4 úsáideoirí)',
+'val_percent_single' => '<b>$1%</b><br>($2 de $3 pointí<br>a rinne aon úsáideoir)',
 'val_total' => 'Iomlán',
 'val_version' => 'Leagan',
-'val_tab' => 'Seiceáil an bhailíocht',
-'val_this_is_current_version' => 'is é seo an t-eagrán is deireanach',
+'val_tab' => 'Bailíochtaigh',
+'val_this_is_current_version' => 'is é seo an t-eagrán is déanaí',
 'val_version_of' => "Leagan ó $1" ,
-'val_table_header' => "<tr><th>Rang</th>$1<th colspan=4>Tuairim</th>$1<th>Trácht</th></tr>\n",
+'val_table_header' => "<tr><th>Rang</th>$1<th
+
+colspan=4>Tuairim</th>$1<th>Trácht</th></tr>\n",
 'val_stat_link_text' => 'Staitistic bhailíochta don alt seo',
 'val_view_version' => 'Féach ar an leagan seo',
-'val_validate_version' => 'Déan bhailíocht den leagan seo',
-'val_user_validations' => 'Rinne an t-úsáideoir seo bhailíocht ar $1 leathanaigh.',
-'val_no_anon_validation' => 'Caithfidh tú bheith logáilte isteach chun bailíocht a dhéanamh ar alt.',
-'val_validate_article_namespace_only' => 'Ní féidir ach amháin ailt a chur i bhailíocht. <i>Níl</i> an leathanach seo san ainmroinn do ailt.',
+'val_validate_version' => 'Bailíochtaigh an leagan seo',
+'val_user_validations' => 'Bhailíochtaigh an úsáideoir seo $1 leathanaigh.',
+'val_no_anon_validation' => 'Caithfidh tú bheith logáilte isteach chun alt a bhailíochtú.',
+'val_validate_article_namespace_only' => 'Ní féidir leathanaigh a bhailíochtú ach amháin ailt. <i>Níl</i> an leathanach seo in ainmspás na n-alt.',
 'val_validated' => 'Tá an bhailíocht críochnaithe.',
-'val_article_lists' => 'Líosta ailt le bailíocht',
-'val_page_validation_statistics' => 'Staitistic bhailíochta ailt do $1',
+'val_article_lists' => 'Líosta ailt atá déanta bailí',
+'val_page_validation_statistics' => 'Staitisticí bhailíochta ailt do $1',
 
 # Move page
 #
 "movepage"      => "Athainmnigh an leathanach",
-"movepagetext"  => "Úsáid an foirm anseo thí­os chun leathanach a hathainmniú. Aistreofar a chuid
-stair go léir chuig an ainm nua.
-Déanfar leathanach athsheolaidh den sean-ainm chuig an ainm nua.
-Ní­ athreofar naisc chuig sean-ainmneacha an leathanaigh. Bí cinnte go ndéanfá
-cuardach ar athsheolaidh dubáilte nó briste.
+"movepagetext"  => "Úsáid an foirm seo thíos chun leathanach a hathainmniú. Aistreofar a chuid
+stair go léir chuig an teideal nua.
+Déanfar leathanach athsheolaidh den sean-theideal chuig an teideal nua.
+Ní athreofar naisc chuig sean-teidil an leathanaigh. Bí cinnte go ndéanfá
+[[Speisialta:Maintenance|cuardach]] ar athsheolaidh dubáilte nó briste.
 Tá tú freagrach i cinnteach go leanann naisc chuig an pointe a bhfuil siad ag aimsiú ar.
 
-Tabhair faoi deara '''nach''' athainmneofar an leathanach má bhfuil leathanach
-ann cheana féin leis an ainm nua, mura bhfuil sé folamh nó athsheoladh nó mura bhfuil aon
-stair athraithe aige cheana. Ciallaí­onn sé sin go féidir leat leathanach a athainmniú ar ais
-chuig an áit ina raibh sé roimhe má dhéanfá botún, agus ní­ féidir leat leathanach atá ann a forshcriobh ar.
+Tabhair faoi deara '''nach''' n-athainmneofar an leathanach má tá leathanach
+ann cheana féin faoin teideal nua, mura bhfuil sé folamh nó athsheoladh nó mura bhfuil aon
+stair athraithe aige cheana. Ciallaíonn sé sin go féidir leat leathanach a athainmniú ar ais
+chuig an áit ina raibh sé roimhe má dhéanfá botún, agus ní féidir leat leathanach atá ann a fhorscriobh ar.
 
 <b>AIRE!</b>
 Is athrú tábhachtach é athainmniú má tá leathanach coitianta i gceist;
-cinntigh go dtuigeann tú na iarmhairtí­ go léir roimh a leanfá.",
+cinntigh go dtuigeann tú na iarmhairtí go léir roimh a leanfá.",
 "movepagetalktext" => "Aistreofar an leathanach phlé leis, má tá sin ann:
-*'''mura''' bhfuil tú ag aistriú an leathanach trasna ainmranna,
-*'''mura''' bhfuil leathanach phlé neamhfholamh ann leis an ainm nua, nó
-*'''mura''' baineann tú an marc den bosca anseo thí­os.
+*'''muna''' bhfuil tú ag aistriú an leathanach trasna ainmspásanna,
+*'''muna''' bhfuil leathanach phlé neamhfholamh ann leis an teideal nua, nó
+*'''muna''' bhaineann tú an marc den bosca anseo thíos.
 
 Sna scéil sin, caithfidh tú an leathanach a aistrigh nó a báigh leis na lámha má tá sin an rud atá uait.",
-"movearticle"   => "Aistrigh an leathanach",
-"movenologin"   => "Ní­l tú logtha ann",
-"movenologintext" => "Ní mór duit bheith úsáideoir cláraithe agus [[Speisialta:Userlogin|logtha ann]]
-chun leathanach a aistrigh.",
+"movearticle"   => "Athainmnigh an leathanach",
+"movenologin"   => "Níl tú logáilte isteach",
+"movenologintext" => "Ní mór duit bheith i d'úsáideoir cláraithe agus <a href=\"" .
+  "{{localurle:Speisialta:Userlogin}}\">logáilte isteach</a>
+chun leathanach a hathainmniú.",
 "newtitle"      => "Go teideal nua",
-"movepagebtn"   => "Aistrigh an leathanach",
+"movepagebtn"   => "Athainmnigh an leathanach",
 "pagemovedsub"  => "D'éirigh leis an athainmniú",
-"pagemovedtext" => "D'aistraí­odh an leathanach \"[[$1]]\" chuig \"[[$2]]\".",
-"articleexists" => "Tá leathanach leis an ainm seo ann fós, nó ní­l an
-ainm a rinne tú rogha air ina ainm bailí­.
-Toghaigh ainm eile le do thoil.",
-"talkexists"    => "D'aistraí­odh an leathanach é féin go rathúil, ach ní­ raibh sé ar a chumas an
-leathanach phlé a aistriú de bhrí­ go bhfuil ceann ann fós ag an
-ainm nua. Báigh iad tusa féin, le do thoil.",
-"movedto"       => "aistraithe go",
-"movetalk"      => "Aistrigh an leathanach \"phlé\" freisin, má bhfuil an leathanach sin ann.",
-"talkpagemoved" => "D'aistraí­odh an leathanach phlé frithiontráil.",
-"talkpagenotmoved" => "<strong>Ní­or</strong> aistraí­odh an leathanach phlé frithiontráil.",
-'1movedto2'		=> "D'aistríodh $1 chuig $2",
-'1movedto2_redir' => "D'aistríodh $1 chuig $2 thar athsheoladh",
+"pagemovedtext" => "D'athainmníodh an leathanach \"[[$1]]\" chuig \"[[$2]]\".",
+"articleexists" => "Tá leathanach leis an teideal seo ann fós, nó níl an
+teideal a rinne tú rogha air ina theideal bailí.
+Toghaigh teideal eile le do thoil.",
+"talkexists"    => "D'athainmníodh an leathanach é féin go rathúil, ach ní raibh sé ar a chumas an
+leathanach phlé a hathainmniú dá bharr go bhfuil ceann ann cheana féin ag an teideal nua.
+Báigh tusa féin iad, le do thoil.",
+"movedto"       => "athainmnithe go",
+"movetalk"      => "Athainmnigh an leathanach \"phlé\" freisin, má bhfuil an leathanach sin ann.",
+"talkpagemoved" => "D'athainmníodh an leathanach phlé frithiontráil.",
+"talkpagenotmoved" => "<strong>Níor</strong> athainmníodh an leathanach phlé frithiontráil.",
+'1movedto2'	     => "D'athainmníodh $1 bheith $2",
+'1movedto2_redir' => "D'athainmníodh $1 bheith $2 thar athsheoladh",
+'movelogpage' => 'Athainmnigh loga',
+'movelogpagetext' => 'Liosta is ea seo thíos de leathanaigh athainmnithe.',
+'movereason'	=> 'Cúis',
+'revertmove'	=> 'athúsáid',
+'delete_and_move' => 'Scrios agus athainmnigh',
+'delete_and_move_text'	=>
+'==Tá scrios riachtanach==
+
+Tá an t-alt "[[$1]]" ann cheana féin, a bhíodh ceaptha mar ainm nua don athainmniú. Ar
+mhaith leat é a scrios chun áit a dhéanamh don athainmniú?',
+'delete_and_move_reason' => 'Scriosta chun áit a dhéanamh d\'athainmniú',
+'selfmove' => "Tá an ainm céanna ag an bhfoinse mar atá ar an ainm sprice; ní féidir leathanach a athainmniú bheith é féin.",
+'immobile_namespace' => "Saghas speisialta leathanach atá ann san ainm sprice; ní féidir leathanaigh a athainmniú san ainmspás sin.",
 
 #Export
 
-"export"        => "Onnmhairigh leathanaigh",
-"exporttext"    => "Is féidir leat an téacs agus stair athraithe de leathanach áirithe a onnmhairiú,
-fillte i bpí­osa XML; is féidir leat ansin é a iompórtáil isteach vicí eile atá leis an oideasra MediaWiki
+"export"	=> "Easportáil leathanaigh",
+"exporttext"    => "Is féidir leat an téacs agus stair athraithe de leathanach áirithe a heasportáil,
+fillte i bpíosa XML; is féidir leat ansin é a iompórtáil isteach vicí eile atá le na bogearraí MediaWiki
 air, nó is féidir leat é a coinniú do do chuid shiamsa féin.",
-"exportcuronly" => "Ná cuir san áireamh ach an eagrán reatha, ná cuir ann an stair in iomlán",
+"exportcuronly" => "Ná cuir san áireamh ach an leagan láithreach; ná cuir an stair iomlán ann",
 
 # Namespace 8 related
 
-"allmessages"   => "Gach teachtaireacht córais",
-"allmessagestext"   => "Seo é liosta de na teachtaireachtaí­ go léir atá le fáil san ainmroinn MediaWiki: .",
+"allmessages"   => "Teachtaireachtaí córais",
+"allmessagestext"   => "Liosta is ea seo de theachtaireachtaí córais atá le fáil san ainmspás MediaWiki: .",
+'allmessagesnotsupportedUI' => 'Níl tacaíocht ag Speisialta:AllMessages maidir le do theanga
+comhéadáin phearsanta don suíomh seo.',
+'allmessagesnotsupportedDB' => 'Níl aon tacaíocht anseo do Speisialta:AllMessages dá bharr
+go bhfuil wgUseDatabaseMessages druidte.',
 
 # Thumbnails
 
 'thumbnail-more'	=> 'Méadaigh',
-'missingimage'		=> "<b>Íomhá ar iarraidh</b><br /><i>$1</i>\n",
+'missingimage'	  => "<b>Íomhá ar iarraidh</b><br /><i>$1</i>\n",
+'filemissing'		=> 'Comhad ar iarraidh',
 
 # Special:Import
 'import'	=> 'Iompórtáil leathanaigh',
-'importtext'	=> 'Onnmhairigh an comhad ón fhoinse-vicí le do thoil (le húsáid an tréith Speisialta:Export), sábháil é ar do dhíosca agus uaslódáil é anseo.',
-'importfailed'	=> "Theip ar an iompórtáil: $1",
-'importnotext'	=> 'Folamh nó gan téacs',
-'importsuccess'	=> "D'eirigh leis an iompórtáil!",
-'importhistoryconflict' => 'Tá stair athraithe contrártha ann cheana féin (is dócha go uaslódáladh an leathanach seo roimh ré)',
+'importinterwiki' => 'Iompórtáil trasna vicíonna',
+'importtext'    => 'Easportáil an comhad ón bhfoinse-vicí le do thoil (le húsáid na tréithe
+Speisialta:Export), sábháil ar do dhíosca é agus uaslódáil anseo é.',
+'importfailed'  => "Theip ar an iompórtáil: $1",
+'importnotext'  => 'Folamh nó gan téacs',
+'importsuccess' => "D'eirigh leis an iompórtáil!",
+'importhistoryconflict' => 'Tá stair athraithe contrártha ann cheana féin (is dócha go
+uaslódáladh an leathanach seo roimh ré)',
+'importnosources' => 'Níl aon fhoinse curtha i leith d\'iompórtáil trasna vicíonna, agus
+ní féidir uaslódála staire díreacha a dhéanamh faoi láthair.',
 
 # Keyboard access keys for power users
 'accesskey-search' => 'c', # Cuardaigh
 'accesskey-minoredit' => 'm', # Mionathrú
 'accesskey-save' => 's', # Sábháil
-'accesskey-preview' => 'r', # Reamhspléachas
+'accesskey-preview' => 'r', # Reamhamharc
+'accesskey-diff' => 'd', # Difríocht
 'accesskey-compareselectedversions' => 'l', # Leagain
 
 # tooltip help for some actions, most are in Monobook.js
-'tooltip-search' => 'Cuardaigh an vicí seo [alt-c]',
+'tooltip-search' => 'Cuardaigh ar {{SITENAME}} [alt-c]',
 'tooltip-minoredit' => 'Déan mionathrú den athrú seo [alt-m]',
 'tooltip-save' => 'Sábháil do chuid athruithe [alt-s]',
-'tooltip-preview' => 'Reamhspléach do chuid athruithe; úsáid an gné seo roimh a shábhálaíonn tú! [alt-r]',
-'tooltip-compareselectedversions' => 'Feic na difríochtaí idir na dhá leagain roghnaithe den leathanach seo. [alt-l]',
+'tooltip-preview' => 'Réamhamharc ar do chuid athruithe; úsáid an gné seo roimh a shábhálaíonn tú! [alt-r]',
+'tooltip-compareselectedversions' => 'Féach na difríochtaí idir an dhá leagain roghnaithe den leathanach seo. [alt-l]',
+'tooltip-watch' => 'Cuir an leathanach seo ar do liosta faire [alt-f]',
+'tooltip-diff' => 'Taispeáin na difríochtaí áirithe a rinne tú don téacs [alt-d]',
+
 
 # stylesheets
 
-'Monobook.css' => '/* athraigh an comhad seo chun an cuma monobook a athrú don suíomh ar fad */',
-#'Monobook.js' => '/* edit this file to change js things in the monobook skin */',
+'Monobook.css' => '/* athraigh an comhad seo chun an craiceann MonoBook a athrú don suíomh ar fad */',
+#'Monobook.js' => '/* athraigh an comhad seo chun rudaí js sa craiceann MonoBook a hathrú */',
 
 # Metadata
-'nodublincore' => 'Míchumasaítear meitea-shonraí Dublin Core RDF ar an inneall friothála seo.',
-'nocreativecommons' => 'Míchumasaítear meitea-shonraí Creative Commons RDF ar an inneall friothála seo.',
-'notacceptable' => 'Ní féidir leis an inneall friothála vicí na sonraí a chur ar fáil i formáid a féidir le do chliant a léamh.',
+'nodublincore' => 'Míchumasaítear meitea-shonraí Dublin Core RDF ar an freastalaí seo.',
+'nocreativecommons' => 'Míchumasaítear meitea-shonraí Creative Commons RDF ar an freastalaí seo.',
+'notacceptable' => 'Ní féidir leis an freastalaí vicí na sonraí a chur ar fáil i bhformáid atá inléite ag do chliant.',
 
 # Attribution
 
 'anonymous' => "Úsáideoir(í) gan ainm ar {{SITENAME}}",
-'siteuser' => "Úsáideoir Vicipéide $1", #FIXME - genitive needed here
-'lastmodifiedby' => "Athraíodh an leathanach seo go deireanach ag $1 le $2.",
+'siteuser' => "Úsáideoir $1 ag {{SITENAME}}", #FIXME - genitive needed here
+'lastmodifiedby' => "Leasaigh $2 an leathanach seo go déanaí ag $1.",
 'and' => 'agus',
-'othercontribs' => "Bunaithe ar oibre a rinne $1.",
+'othercontribs' => "Bunaithe ar saothair le $1.",
 'others' => 'daoine eile',
-'siteusers' => "Úsáideoir(í) Vicipéide $1", #FIXME - genitive needed here
+'siteusers' => "Úsáideoir(í) ag {{SITENAME}}", #FIXME - genitive needed here
 'creditspage' => 'Creidiúintí leathanaigh',
 'nocredits' => 'Níl aon eolas creidiúna le fáil don leathanach seo.',
 
 # Spam protection
 
 'spamprotectiontitle' => 'Scagaire in aghaidh ríomhphost dramhála',
-'spamprotectiontext' => 'Chuir an scagaire dramhála bac ar an leathanach a raibh tú ar iarradh sábháil. Is dócha gur nasc chuig suíomh seachtrach ba chúis leis.
+'spamprotectiontext' => 'Chuir an scagaire dramhála bac ar an leathanach a raibh tú ar
+iarradh sábháil. Is dócha gur nasc chuig suíomh seachtrach ba chúis leis.',
+'spamprotectionmatch' => 'Truicear ár scagaire dramhála ag an téacs seo a leanas: $1',
+'subcategorycount' => "Tá $1 fo-chatagóirí sa chatagóir seo.",
+'subcategorycount1' => "Tá fó-chatagóir amháin sa chatagóir seo.",
+'categoryarticlecount' => "Tá $1 ailt sa chatagóir seo.",
+'categoryarticlecount1' => "Tá alt amháin sa chatagóir seo.",
+'usenewcategorypage' => "1\n\nScríobh \"0\" mar an chéad litir chun an leagan amach nua
 
-Is dócha gur mhaith leat an gnáth-leagan seo a seiceáil chun patrúin a fheiceáil atá faoi bhac i láthair na huaire:',
-'subcategorycount' => "Tá $1 fo-ranganna sa rang seo.",
-'categoryarticlecount' => "Tá $1 ailt sa rang seo.",
-'usenewcategorypage' => "1\n\nScríobh \"0\" mar an chéad litir chun an leagan amach nua ranga a mhíchumasaigh.",
+chatagóire a mhíchumasú.",
 
 # Info page
 "infosubtitle" => "Eolas don leathanach",
@@ -1254,50 +1584,60 @@ Is dócha gur mhaith leat an gnáth-leagan seo a seiceáil chun patrúin a fheic
 
 # Math options
 
-'mw_math_png' => "Déan PNG-í­omhá gach uair",
+'mw_math_png' => "Déan PNG-íomhá gach uair",
 'mw_math_simple' => "Déan HTML má tá sin an-easca, nó PNG ar mhodh eile",
 'mw_math_html' => "Déan HTML más féidir, nó PNG ar mhodh eile",
-'mw_math_source' => "Fág mar cló TeX (do teacsleitheoirí­)",
-'mw_math_modern' => "Inmholta do lí­onleitheoirí­ nua",
+'mw_math_source' => "Fág mar cló TeX (do teacsleitheoirí)",
+'mw_math_modern' => "Inmholta do líonleitheoirí nua",
 'mw_math_mathml' => 'MathML más féidir (turgnamhach)',
 
+# Patrolling
+'markaspatrolleddiff'   => "Marcáil bheith patrólaithe",
+'markaspatrolledlink'   => "<div class='patrollink'>[$1]</div>",
+'markaspatrolledtext'   => "Marcáil go bhfuil an alt seo patrólaithe",
+'markedaspatrolled'     => "Marcáil bheith patrólaithe",
+'markedaspatrolledtext' => "Marcáladh an athrú áirithe seo bheith patrólaithe.",
+'rcpatroldisabled'      => "Mhíchumasaíodh Patról na n-Athruithe is Déanaí",
+'rcpatroldisabledtext'  => "Tá an tréith Patról na n-Athruithe is Déanaí míchumasaithe faoi láthair.",
+
 # Monobook.js: tooltips and access keys for monobook
 'Monobook.js' => '/* leideanna uirlisí agus cnaipí rochtana */
 ta = new Object();
 ta[\'pt-userpage\'] = new Array(\'.\',\'Mo leathanach úsáideora\');
-ta[\'pt-anonuserpage\'] = new Array(\'.\',\'An leathanach úsáideora don IP ina dhéanann tú do chuid athruithe\');
-ta[\'pt-mytalk\'] = new Array(\'n\',\'Mo leathanach phlé
-ta[\'pt-anontalk\'] = new Array(\'n\',\'Plé faoina athruithe a dhéantar ón seoladh IP seo\');
+ta[\'pt-anonuserpage\'] = new Array(\'.\',\'Leathanach úsáideora don IP ina dhéanann tú do chuid athruithe\');
+ta[\'pt-mytalk\'] = new Array(\'n\',\'Mo leathanach phlé\');
+ta[\'pt-anontalk\'] = new Array(\'n\',\'Plé maidir le na hathruithe a dhéantar ón seoladh IP seo\');
 ta[\'pt-preferences\'] = new Array(\'\',\'Mo chuid sainroghanna\');
-ta[\'pt-watchlist\'] = new Array(\'l\',\'Liosta de na leathanaigh a dhéanann tú faire ar do athruithe.\');
+ta[\'pt-watchlist\'] = new Array(\'l\',\'Liosta de na leathanaigh a dhéanann tú faire ar maidir  le athruithe\');
 ta[\'pt-mycontris\'] = new Array(\'y\',\'Liosta de mo chuid dréachtaí\');
 ta[\'pt-login\'] = new Array(\'o\',\'Moltar duit logáil isteach, ach níl sé riachtanach.\');
 ta[\'pt-anonlogin\'] = new Array(\'o\',\'Moltar duit logáil isteach, ach níl sé riachtanach.\');
 ta[\'pt-logout\'] = new Array(\'o\',\'Logáil amach\');
-ta[\'ca-talk\'] = new Array(\'t\',\'Plé faoin leathanach ábhair\');
-ta[\'ca-edit\'] = new Array(\'e\',\'Is féidir leat an leathanach seo a athrú. Más é do thoil é, bain úsáid as an cnaipe reamhspléachais roimh a shabhálaíonn tú.\');
-ta[\'ca-addsection\'] = new Array(\'+\',\'Scríobh trácht don plé seo.\');
-ta[\'ca-viewsource\'] = new Array(\'e\',\'Tá an leathanach seo faoi ghlas. Is féidir leat a fhoinse a fheiceáil.\');
+ta[\'ca-talk\'] = new Array(\'t\',\'Plé maidir leis an leathanach ábhair\');
+ta[\'ca-edit\'] = new Array(\'e\',\'Is féidir leat an leathanach seo a athrú. Más é do thoil é, bain úsáid as an cnaipe réamhamhairc roimh sábháil a dhéanamh.\');
+ta[\'ca-addsection\'] = new Array(\'+\',\'Cuir trácht leis an plé seo..\');
+ta[\'ca-viewsource\'] = new Array(\'e\',\'Tá an leathanach seo glasáilte. Is féidir leat a fhoinse a fheiceáil.\');
 ta[\'ca-history\'] = new Array(\'h\',\'Leagain stairiúla den leathanach seo.\');
-ta[\'ca-protect\'] = new Array(\'=\',\'Cuir glas ar an leathanach seo\');
+ta[\'ca-protect\'] = new Array(\'=\',\'Glasáil an leathanach seo\');
 ta[\'ca-delete\'] = new Array(\'d\',\'Scrios an leathanach seo\');
-ta[\'ca-undelete\'] = new Array(\'d\',\'Cuir ar ais na hathruithe a raibh déanta don leathanach seo roimh a scriosadh é\');
+ta[\'ca-undelete\'] = new Array(\'d\',\'Díscrios na hathruithe a rinneadh don leathanach seo roimh a scriosadh é\');
 ta[\'ca-move\'] = new Array(\'m\',\'Athainmnigh an leathanach\');
+ta[\'ca-nomove\'] = new Array(\'\',\'Níl an cead riachtanach agat chun an leathanach a athainmniú\');
 ta[\'ca-watch\'] = new Array(\'w\',\'Cuir an leathanach seo ar do liosta faire\');
 ta[\'ca-unwatch\'] = new Array(\'w\',\'Bain an leathanach seo as do liosta faire\');
-ta[\'search\'] = new Array(\'f\',\'Cuardaigh san vicí seo\');
+ta[\'search\'] = new Array(\'f\',\'Cuardaigh sa vicí seo\');
 ta[\'p-logo\'] = new Array(\'\',\'Príomhleathanach\');
 ta[\'n-mainpage\'] = new Array(\'z\',\'Tabhair cuairt ar an bPríomhleathanach\');
-ta[\'n-portal\'] = new Array(\'\',\'Faoin tionscadal, cad is féidir leat a dhéanamh, cás féidir leat achmhainní a fháil\');
-ta[\'n-currentevents\'] = new Array(\'\',\'Faigh eolas cúlrach faoi chursaí reatha\');
+ta[\'n-portal\'] = new Array(\'\',\'Maidir leis an tionscadal, cad is féidir leat a dhéanamh, conas achmhainní a fháil\');
+ta[\'n-currentevents\'] = new Array(\'\',\'Faigh eolas cúlrach maidir le chursaí reatha\');
 ta[\'n-recentchanges\'] = new Array(\'r\',\'Liosta de na hathruithe is déanaí sa vicí.\');
 ta[\'n-randompage\'] = new Array(\'x\',\'Lódáil leathanach fánach\');
 ta[\'n-help\'] = new Array(\'\',\'An áit chun cabhair a fháil.\');
 ta[\'n-sitesupport\'] = new Array(\'\',\'Tabhair tacaíocht duinn\');
-ta[\'t-whatlinkshere\'] = new Array(\'j\',\'Liosta de gach leathanach sa vicí a nascaíonn don leathanach seo\');
-ta[\'t-recentchangeslinked\'] = new Array(\'k\',\'Na hathruithe is déanaí do leathanaigh a nascaíonn don an leathanach seo\');
-ta[\'feed-rss\'] = new Array(\'\',\'Sní eolais RSS don leathanach seo\');
-ta[\'feed-atom\'] = new Array(\'\',\'Sní eolais Atom don leathanach seo\');
+ta[\'t-whatlinkshere\'] = new Array(\'j\',\'Liosta de gach leathanach sa vicí a nascaíonn chuig an leathanach seo\');
+ta[\'t-recentchangeslinked\'] = new Array(\'k\',\'Na hathruithe is déanaí ar leathanaigh a nascaíonn chuig an leathanach seo\');
+ta[\'feed-rss\'] = new Array(\'\',\'Fotha RSS don leathanach seo\');
+ta[\'feed-atom\'] = new Array(\'\',\'Fotha Atom don leathanach seo\');
 ta[\'t-contributions\'] = new Array(\'\',\'Féach ar an liosta dréachtaí a rinne an t-úsáideoir seo\');
 ta[\'t-emailuser\'] = new Array(\'\',\'Cuir teachtaireacht chuig an úsáideoir seo\');
 ta[\'t-upload\'] = new Array(\'u\',\'Comhaid íomhá nó meáin a uaslódáil\');
@@ -1305,13 +1645,387 @@ ta[\'t-specialpages\'] = new Array(\'q\',\'Liosta de gach leathanach speisialta\
 ta[\'ca-nstab-main\'] = new Array(\'c\',\'Féach ar an leathanach ábhair\');
 ta[\'ca-nstab-user\'] = new Array(\'c\',\'Féach ar an leathanach úsáideora\');
 ta[\'ca-nstab-media\'] = new Array(\'c\',\'Féach ar an leathanach meáin\');
-ta[\'ca-nstab-special\'] = new Array(\'\',\'Is leathanach speisialta é seo, ní féidir leat é fhéin a athrú.\');
+ta[\'ca-nstab-special\'] = new Array(\'\',\'Is leathanach speisialta é seo, ní féidir leat an leathanach é fhéin a athrú.\');
 ta[\'ca-nstab-wp\'] = new Array(\'a\',\'Féach ar an leathanach thionscadail\');
 ta[\'ca-nstab-image\'] = new Array(\'c\',\'Féach ar an leathanach íomhá\');
 ta[\'ca-nstab-mediawiki\'] = new Array(\'c\',\'Féach ar an teachtaireacht córais\');
-ta[\'ca-nstab-template\'] = new Array(\'c\',\'Féach ar an múnla\');
+ta[\'ca-nstab-template\'] = new Array(\'c\',\'Féach ar an teimpléad\');
 ta[\'ca-nstab-help\'] = new Array(\'c\',\'Féach ar an leathanach cabhrach\');
-ta[\'ca-nstab-category\'] = new Array(\'c\',\'Féach ar an leathanach ranga\');'
+ta[\'ca-nstab-category\'] = new Array(\'c\',\'Féach ar an leathanach catagóire\');',
+
+# image deletion
+'deletedrevision' => 'Scriosadh an sean-leagan $1.',
+
+# browsing diffs
+'previousdiff' => '← An difríocht roimhe seo',
+'nextdiff' => 'An difríocht i ndiadh seo →',
+
+'imagemaxsize' => 'Cuir an teorann seo ar na íomhánna atá le fáil ar leathanaigh cuir síos íomhánna: ',
+'thumbsize'	=> 'Méid mionshamhla : ',
+'showbigimage' => 'Íoslódáil leagan ardtaifigh ($1x$2, $3 kb)',
+
+'newimages' => 'Gailearaí na n-íomhánna nua',
+'noimages'  => 'Níl aon rud le feiscint.',
+
+# short names for language variants used for language conversion links.
+# to disable showing a particular link, set it to 'disable', e.g.
+# 'variantname-zh-sg' => 'disable',
+'variantname-zh-cn' => 'cn',
+'variantname-zh-tw' => 'tw',
+'variantname-zh-hk' => 'hk',
+'variantname-zh-sg' => 'sg',
+'variantname-zh' => 'zh',
+
+'variantname-is' => 'is',
+'variantname-iz' => 'iz',
+
+# labels for User: and Title: on Special:Log pages
+'specialloguserlabel' => 'Úsáideoir: ',
+'speciallogtitlelabel' => 'Teideal: ',
+
+'passwordtooshort' => 'Tá d\'fhocal faire ró-ghearr. Caithfidh go bhfuil $1 carachtar ann ar a laghad.',
+
+# Media Warning
+'mediawarning' => '\'\'\'Aire\'\'\': Tá seans ann go bhfuil cód mailíseach sa comhad seo - b\'fheidir go gcuirfear do chóras i gcontúirt dá rithfeá é.
+<hr>',
+
+'fileinfo' => '$1KB, saghas MIME: <code>$2</code>',
+
+# Metadata
+'metadata' => 'Meiteasonraí',
+
+# Exif tags
+'exif-imagewidth' =>'Leithead',
+'exif-imagelength' =>'Airde',
+'exif-bitspersample' =>'Gíotáin sa chomhpháirt',
+'exif-compression' =>'Scéim comhbhrúite',
+'exif-photometricinterpretation' =>'Comhbhrú picteilíní',
+'exif-orientation' =>'Treoshuíomh',
+'exif-samplesperpixel' =>'Líon na gcomhpháirt',
+'exif-planarconfiguration' =>'Eagar na sonraí',
+'exif-ycbcrsubsampling' =>'Cóimheas foshamplála de Y i gcoinne C',
+'exif-ycbcrpositioning' =>'Suí Y agus C',
+'exif-xresolution' =>'Taifeach íomhá i dtreo an leithid',
+'exif-yresolution' =>'Taifeach íomhá i dtreo an airde',
+'exif-resolutionunit' =>'Aonad an taifigh X agus Y',
+'exif-stripoffsets' =>'Suíomh na sonraí íomhá',
+'exif-rowsperstrip' =>'Líon na rónna sa stráice',
+'exif-stripbytecounts' =>'Bearta sa stráice comhbhrúite',
+'exif-jpeginterchangeformat' =>'Aischló don SOI JPEG',
+'exif-jpeginterchangeformatlength' =>'Bearta sonraí JPEG',
+'exif-transferfunction' =>'Feidhm aistrithe',
+'exif-whitepoint' =>'Crómatacht na bpointí bán',
+'exif-primarychromaticities' =>'Crómatachta na bpríomhacht',
+'exif-ycbcrcoefficients' =>'Comhéifeachtaí mhaitrís trasfhoirmithe an dathspáis',
+'exif-referenceblackwhite' =>'Péire luachanna tagartha don dubh is don bán',
+'exif-datetime' =>'Dáta agus am athrú an chomhaid ',
+'exif-imagedescription' =>'Íomhátheideal',
+'exif-make' =>'Déantóir an ceamara',
+'exif-model' =>'Déanamh an ceamara',
+'exif-software' =>'Na bogearraí a úsáideadh',
+'exif-artist' =>'Údar',
+'exif-copyright' =>'Úinéir an chóipchirt',
+'exif-exifversion' =>'Leagan EXIF',
+'exif-flashpixversion' =>'Leagan Flashpix atá á thacú',
+'exif-colorspace' =>'Dathspás',
+'exif-componentsconfiguration' =>'Ciall le gach giota',
+'exif-compressedbitsperpixel' =>'Modh chomhbhrú na n-íomhánna',
+'exif-pixelydimension' =>'Leithead bailí don íomhá',
+'exif-pixelxdimension' =>'Airde bailí don íomhá',
+'exif-makernote' =>'Nótaí an déantóra',
+'exif-usercomment' =>'Nótaí an úsáideora',
+'exif-relatedsoundfile' =>'comhad gaolmhara fuaime',
+'exif-datetimeoriginal' =>'Dáta agus am ghiniúint na sonraí',
+'exif-datetimedigitized' =>'Dáta agus am digitithe',
+'exif-subsectime' =>'Foshoicindí DateTime',
+'exif-subsectimeoriginal' =>'Foshoicindí DateTimeOriginal',
+'exif-subsectimedigitized' =>'Foshoicindí DateTimeDigitized',
+'exif-exposuretime' =>'Am nochta',
+'exif-fnumber' =>'Uimhir F',
+'exif-exposureprogram' =>'Clár nochta',
+'exif-spectralsensitivity' =>'Íogaireacht an speictrim',
+'exif-isospeedratings' =>'Grádú ISO luais',
+'exif-oecf' =>'Fachtóir optaileictreonach tiontaithe',
+'exif-shutterspeedvalue' =>'Luas nochta',
+'exif-aperturevalue' =>'Cró',
+'exif-brightnessvalue' =>'Gile',
+'exif-exposurebiasvalue' =>'Laobh nochta',
+'exif-maxaperturevalue' =>'Cró tíre uasmhéideach',
+'exif-subjectdistance' =>'Fad ón ábhar',
+'exif-meteringmode' =>'Modh meadarachta',
+'exif-lightsource' =>'Foinse solais',
+'exif-flash' =>'Splanc',
+'exif-focallength' =>'Fad fócasach an lionsa',
+'exif-subjectarea' =>'Achar an ábhair',
+'exif-flashenergy' =>'Splanfhuinneamh',
+'exif-spatialfrequencyresponse' =>'Freagairt minicíochta spáis',
+'exif-focalplanexresolution' =>'Taifeach an plána fócasaigh X',
+'exif-focalplaneyresolution' =>'Taifeach an plána fócasaigh Y',
+'exif-focalplaneresolutionunit' =>'Aonad taifigh an plána fócasaigh',
+'exif-subjectlocation' =>'Suíomh an ábhair',
+'exif-exposureindex' =>'Innéacs nochta',
+'exif-sensingmethod' =>'Modh braite',
+'exif-filesource' =>'Foinse comhaid',
+'exif-scenetype' =>'Cineál radhairc',
+'exif-cfapattern' =>'Patrún CFA',
+'exif-customrendered' =>'Íomháphróiseáil saincheaptha',
+'exif-exposuremode' =>'Modh nochta',
+'exif-whitebalance' =>'Bánchothromaíocht',
+'exif-digitalzoomratio' =>'Cóimheas zúmála digiteaí',
+'exif-focallengthin35mmfilm' =>'Fad fócasach i scannán 35 mm',
+'exif-scenecapturetype' =>'Cineál gabhála radhairc',
+'exif-gaincontrol' =>'Rialú radhairc',
+'exif-contrast' =>'Codarsnacht',
+'exif-saturation' =>'Sáithiú',
+'exif-sharpness' =>'Géire',
+'exif-devicesettingdescription' =>'Cur síos ar socruithe gléis',
+'exif-subjectdistancerange' =>'Raon fada ón ábhar',
+'exif-imageuniqueid' =>'Aitheantas uathúil an íomhá',
+'exif-gpsversionid' =>'Leagan clibe GPS',
+'exif-gpslatituderef' =>'Domhan-leithead Thuaidh no Theas',
+'exif-gpslatitude' =>'Domhan-leithead',
+'exif-gpslongituderef' =>'Domhanfhad Thoir nó Thiar',
+'exif-gpslongitude' =>'Domhanfhad',
+'exif-gpsaltituderef' =>'Tagairt airde',
+'exif-gpsaltitude' =>'Airde',
+'exif-gpstimestamp' =>'Am GPS (clog adamhach)',
+'exif-gpssatellites' =>'Satailítí úsáidte don tomhas',
+'exif-gpsstatus' =>'Stádas an ghlacadóra',
+'exif-gpsmeasuremode' =>'Modh tomhais',
+'exif-gpsdop' =>'Beachtas tomhais',
+'exif-gpsspeedref' =>'Aonad luais',
+'exif-gpsspeed' =>'Luas an ghlacadóra GPS',
+'exif-gpstrackref' =>'Tagairt don treo gluaiseachta',
+'exif-gpstrack' =>'Treo gluaiseachta',
+'exif-gpsimgdirectionref' =>'Tagairt do treo an íomhá',
+'exif-gpsimgdirection' =>'Treo an íomhá',
+'exif-gpsmapdatum' =>'Sonraí suirbhéireachta geodasaí a úsáideadh',
+'exif-gpsdestlatituderef' =>'Tagairt don domhan-leithead sprice',
+'exif-gpsdestlatitude' =>'Domhan-leithead sprice',
+'exif-gpsdestlongituderef' =>'Tagairt don domhanfhad sprice',
+'exif-gpsdestlongitude' =>'Domhanfhad sprice',
+'exif-gpsdestbearingref' =>'Tagairt don treo-uillinn sprice',
+'exif-gpsdestbearing' =>'Treo-uillinn sprice',
+'exif-gpsdestdistanceref' =>'Tagairt don fad ón áit sprice',
+'exif-gpsdestdistance' =>'Fad ón áit sprice',
+'exif-gpsprocessingmethod' =>'Ainm an modha próiseála GPS',
+'exif-gpsareainformation' =>'Ainm an cheantair GPS',
+'exif-gpsdatestamp' =>'Dáta GPS',
+'exif-gpsdifferential' =>'Ceartú difreálach GPS',
+
+# Make & model, can be wikified in order to link to the camera and model name
+
+'exif-make-value' => '$1',
+'exif-model-value' =>'$1',
+'exif-software-value' => '$1',
+
+# Exif attributes
+
+'exif-compression-1' => 'Neamh-chomhbhrúite',
+'exif-compression-6' => 'JPEG',
+
+'exif-photometricinterpretation-1' => 'RGB',
+'exif-photometricinterpretation-6' => 'YCbCr',
+
+'exif-orientation-1' => 'Gnáth', // 0th row: top; 0th column: left
+'exif-orientation-2' => 'Iompaithe go cothrománach', // 0th row: top; 0th column: right
+'exif-orientation-3' => 'Rothlaithe trí 180°', // 0th row: bottom; 0th column: right
+'exif-orientation-4' => 'Iompaithe go hingearach', // 0th row: bottom; 0th olumn: left
+'exif-orientation-5' => 'Rothlaithe trí 90° CCW agus iompaithe go hingearach', // 0th row: left; 0th column: top
+'exif-orientation-6' => 'Rothlaithe trí 90° CW', // 0th row: right; 0th column: top
+'exif-orientation-7' => 'Rothlaithe trí 90° CW agus iompaithe go hingearach', // 0th row: right; 0th column: bottom
+'exif-orientation-8' => 'Rothlaithe trí 90° CCW', // 0th row: left; 0th column: bottom
+
+'exif-planarconfiguration-1' => 'Formáid shmutánach',
+'exif-planarconfiguration-2' => 'Formáid phlánach',
+
+'exif-colorspace-1' => 'sRGB',
+'exif-colorspace-ffff.h' => 'FFFF.H',
+
+'exif-componentsconfiguration-0' => 'níl a leithéid ann',
+'exif-componentsconfiguration-1' => 'Y',
+'exif-componentsconfiguration-2' => 'Cb',
+'exif-componentsconfiguration-3' => 'Cr',
+'exif-componentsconfiguration-4' => 'R',
+'exif-componentsconfiguration-5' => 'G',
+'exif-componentsconfiguration-6' => 'B',
+
+'exif-exposureprogram-0' => 'Gan sainiú',
+'exif-exposureprogram-1' => 'Leis na lámha',
+'exif-exposureprogram-2' => 'Gnáthchlár',
+'exif-exposureprogram-3' => 'Tosaíocht nochta',
+'exif-exposureprogram-4' => 'Tosaíocht cró',
+'exif-exposureprogram-5' => 'Clár cúise (laofa do doimhneacht réimse)',
+'exif-exposureprogram-6' => 'Clár gnímh (laofa do cróluas tapaidh)',
+'exif-exposureprogram-7' => 'Modh portráide (do grianghraif i ngar don ábhar,
+le cúlra as fócas)',
+'exif-exposureprogram-8' => 'Modh tírdhreacha (do grianghraif tírdhreacha le
+cúlra i bhfócas)',
+
+'exif-meteringmode-0' => 'Anaithnid',
+'exif-meteringmode-1' => 'Meán',
+'exif-meteringmode-2' => 'MeánUalaitheDonLár',
+'exif-meteringmode-3' => 'Spota',
+'exif-meteringmode-4' => 'Ilspotach',
+'exif-meteringmode-5' => 'Patrún',
+'exif-meteringmode-6' => 'Páirteach',
+'exif-meteringmode-255' => 'Eile',
+
+'exif-lightsource-0' => 'Anaithnid',
+'exif-lightsource-1' => 'Solas lae',
+'exif-lightsource-2' => 'Fluaraiseach',
+'exif-lightsource-3' => 'Tungstan (solas gealbhruthach)',
+'exif-lightsource-4' => 'Splanc',
+'exif-lightsource-9' => 'Aimsir breá',
+'exif-lightsource-10' => 'Aimsir scamallach',
+'exif-lightsource-11' => 'Scáth',
+'exif-lightsource-12' => 'Solas lae fluaraiseach (D 5700 – 7100K)',
+'exif-lightsource-13' => 'Solas bán lae fluaraiseach (N 4600 – 5400K)',
+'exif-lightsource-14' => 'Solas fuar bán fluaraiseach (W 3900 – 4500K)',
+'exif-lightsource-15' => 'Solas bán fluaraiseach (WW 3200 – 3700K)',
+'exif-lightsource-17' => 'Gnáthsholas A',
+'exif-lightsource-18' => 'Gnáthsholas B',
+'exif-lightsource-19' => 'Gnáthsholas C',
+'exif-lightsource-20' => 'D55',
+'exif-lightsource-21' => 'D65',
+'exif-lightsource-22' => 'D75',
+'exif-lightsource-23' => 'D50',
+'exif-lightsource-24' => 'Tungstan stiúideó ISO',
+'exif-lightsource-255' => 'Foinse eile solais',
+
+'exif-sensingmethod-1' => 'Gan sainiú',
+'exif-sensingmethod-2' => 'Braiteoir aonshliseach ceantair datha',
+'exif-sensingmethod-3' => 'Braiteoir dháshliseach ceantair datha',
+'exif-sensingmethod-4' => 'Braiteoir tríshliseach ceantair datha',
+'exif-sensingmethod-5' => 'Braiteoir dathsheicheamhach ceantair',
+'exif-sensingmethod-7' => 'Braiteoir trílíneach',
+'exif-sensingmethod-8' => 'Braiteoir dathsheicheamhach línte',
+
+'exif-filesource-3' => 'DSC',
+
+'exif-scenetype-1' => 'Grianghraf a rinneadh go díreach',
+
+'exif-customrendered-0' => 'Gnáthphróiseas',
+'exif-customrendered-1' => 'Próiseas saincheaptha',
+
+'exif-exposuremode-0' => 'Nochtadh uathoibríoch',
+'exif-exposuremode-1' => 'Nochtadh láimhe',
+'exif-exposuremode-2' => 'Brac uathoibríoch',
+
+'exif-whitebalance-0' => 'Bánchothromaíocht uathoibríoch',
+'exif-whitebalance-1' => 'Bánchothromaíocht láimhe',
+
+'exif-scenecapturetype-0' => 'Gnáth',
+'exif-scenecapturetype-1' => 'Tírdhreach',
+'exif-scenecapturetype-2' => 'Portráid',
+'exif-scenecapturetype-3' => 'Radharc oíche',
+
+'exif-gaincontrol-0' => 'Dada',
+'exif-gaincontrol-1' => 'Íosneartúchán suas',
+'exif-gaincontrol-2' => 'Uasneartúchán suas',
+'exif-gaincontrol-3' => 'Íosneartúchán síos',
+'exif-gaincontrol-4' => 'Uasneartúchán síos',
+
+'exif-contrast-0' => 'Gnáth',
+'exif-contrast-1' => 'Bog',
+'exif-contrast-2' => 'Crua',
+
+'exif-saturation-0' => 'Gnáth',
+'exif-saturation-1' => 'Sáithiúchán íseal',
+'exif-saturation-2' => 'Ard-sáithiúchán',
+
+'exif-sharpness-0' => 'Gnáth',
+'exif-sharpness-1' => 'Bog',
+'exif-sharpness-2' => 'Crua',
+
+'exif-subjectdistancerange-0' => 'Anaithnid',
+'exif-subjectdistancerange-1' => 'Macra',
+'exif-subjectdistancerange-2' => 'Radharc teann',
+'exif-subjectdistancerange-3' => 'Cianradharc',
+
+// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => 'Domhan-leithead thuaidh',
+'exif-gpslatitude-s' => 'Domhan-leithead theas',
+
+// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => 'Domhanfhad Thoir',
+'exif-gpslongitude-w' => 'Domhanfhad Thiar',
+
+'exif-gpsstatus-a' => 'Tomhas ar siúl',
+'exif-gpsstatus-v' => 'Tomhas dodhéanta',
+
+'exif-gpsmeasuremode-2' => 'Tomhas déthoiseach',
+'exif-gpsmeasuremode-3' => 'Tomhas tríthoiseach',
+
+// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-k' => 'Ciliméadair san uair',
+'exif-gpsspeed-m' => 'Mílte san uair',
+'exif-gpsspeed-n' => 'Muirmhílte',
+
+// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => 'Fíorthreo',
+'exif-gpsdirection-m' => 'Treo maighnéadach',
+
+# external editor support
+'edit-externally' => 'Athraigh an comhad seo le feidhmchlár seachtrach',
+'edit-externally-help' => 'Féach ar na
+
+[http://meta.wikimedia.org/wiki/Help:External_editors treoracha cumraíochta] (as Béarla)
+
+le tuilleadh eolais.',
+
+# 'all' in various places, this might be different for inflicted languages
+'recentchangesall' => 'gach',
+'imagelistall' => 'gach',
+'watchlistall1' => 'gach',
+'watchlistall2' => 'gach',
+
+# E-mail address confirmation
+'confirmemail' => 'Deimhnigh do sheoladh ríomhphoist',
+'confirmemail_text' => "Tá sé de dhíth an an vicí seo do sheoladh ríomhphoist a
+
+bhailíochtú sula úsáideann tú na gnéithe ríomhphoist. Gníomhachtaigh an cnaipe seo thíos
+
+chun teachtaireacht deimhnithe a sheoladh chuig do chuntas ríomhphoist. Beidh nasc ann sa
+
+comhad ina mbeidh cód áirithe; lódáil an nasc i do bhrabhsálaí chun deimhniú go bhfuil do
+
+sheoladh ríomhphoist bailí.",
+'confirmemail_send' => 'Seol cód deimhnithe',
+'confirmemail_sent' => 'Seoladh teachtaireacht deimhnithe.',
+'confirmemail_sendfailed' => 'Níorbh fhéidir an teachtaireacht deimhnithe a sheoladh. Seiceáil nach bhfuil caractair neamh-bhailí ann sa seoladh.',
+'confirmemail_invalid' => 'Cód deimhnithe neamh-bhailí. B\'fhéidir gur chuaidh an cód as feidhm.',
+'confirmemail_success' => 'Deimhníodh do sheoladh ríomhphoist. Is féidir leat logáil
+
+isteach anois agus sult a bhaint as an vicí.',
+'confirmemail_loggedin' => 'Deimhníodh do sheoladh ríomhphoist.',
+'confirmemail_error' => 'Tharlaigh botún éigin le sabháil do dheimhniú.',
+
+'confirmemail_subject' => 'Deimhniú seolaidh ríomhphoist as {{SITENAME}}',
+'confirmemail_body' => "Chláraigh duine éigin an cuntas \"$2\" le húsáid an seolaidh
+
+ríomhphoist seo ar {{SITENAME}} - is dócha gur rinne tú féin é seo, ón seoladh IP $1.
+
+Chun deimhniú a dhéanamh gur leatsa é an cuntas seo, agus chun gnéithe ríomhphoist a chur
+
+i ngníomh ag {{SITENAME}}, oscail an nasc seo i do bhrabhsalaí:
+
+$3
+
+*Muna* bhfuil tú an duine atá i gceist, ná roghnaigh an nasc. Rachfaidh an cód deimhnithe
+
+seo as feidhm ag $4.
+",
+
+# Inputbox extension, may be useful in other contexts as well
+'tryexact' => 'Déan iarracht ar meaitseáil cruinn',
+'searchfulltext' => 'Cuardaigh sa téacs iomlán',
+'createarticle' => 'Cruthaigh alt',
+
+# Scary transclusion
+'scarytranscludedisabled' => '[Díchumasaíodh trasáireamh idir vicíonna]',
+'scarytranscludefailed' => '[Theip leis an iarradh teimpléid do $1; tá brón orainn]',
+'scarytranscludetoolong' => '[Tá an URL ró-fhada; tá brón orainn]',
 
 );
 
@@ -1339,8 +2053,33 @@ class LanguageGa extends LanguageUtf8 {
 		return $wgDateFormatsGa;
 	}
 
+	/**
+	 * Get a namespace key by value, case insensetive.
+	 *
+	 * @param string $text
+	 * @return mixed An integer if $text is a valid value otherwise false
+	 */
+	function getNsIndex( $text ) {
+		$ns = $this->getNamespaces();
+
+		foreach ( $ns as $i => $n ) {
+			if ( strcasecmp( $n, $text ) == 0)
+				return $i;
+		}
+
+		if ( strcasecmp( 'Plé_í­omhá', $text) == 0) return NS_IMAGE_TALK;
+		if ( strcasecmp( 'Múnla', $text) == 0) return NS_TEMPLATE;
+		if ( strcasecmp( 'Múnla', $text) == 0) return NS_TEMPLATE;
+		if ( strcasecmp( 'Plé_múnla', $text) == 0) return NS_TEMPLATE_TALK;
+		if ( strcasecmp( 'Rang', $text) == 0) return NS_CATEGORY;
+		if ( strcasecmp( 'Catagóir', $text) == 0) return NS_CATEGORY_TALK;
+
+		return false;
+	}
+
+
 	function getMessage( $key ) {
-		global $wgAllMessagesGa;
+	global $wgAllMessagesGa;
 		if( isset( $wgAllMessagesGa[$key] ) ) {
 			return $wgAllMessagesGa[$key];
 		} else {
@@ -1358,6 +2097,31 @@ class LanguageGa extends LanguageUtf8 {
 		return $wgMagicWordsGa;
 	}
 
+	# Convert day names
+	# Invoked with {{GRAMMAR:transformation|word}}
+	function convertGrammar( $word, $what ) {
+		switch ( $case ) {
+		case 'ainmlae':
+			switch ($word) {
+			case 'an Domhnach':
+				$word = 'Dé Domhnaigh'; break;
+			case 'an Luan':
+				$word = 'Dé Luain'; break;
+			case 'an Mháirt':
+				$word = 'Dé Mháirt'; break;
+			case 'an Chéadaoin':
+				$word = 'Dé Chéadaoin'; break;
+			case 'an Déardaoin':
+				$word = 'Déardaoin'; break;
+			case 'an Aoine':
+				$word = 'Dé hAoine'; break;
+			case 'an Satharn':
+				$word = 'Dé Sathairn'; break;
+			}
+		}
+		return $word;
+	}
+
 }
 
 ?>
-- 
cgit v1.2.3


From 7c92aa19942f6827a556403fd4ff4953dded1e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 19 Aug 2005 12:31:48 +0000
Subject: Removing debugging code

---
 languages/LanguageSr.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index df25b02fa306..73476a9437e9 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -1088,8 +1088,6 @@ class LanguageSr extends LanguageUtf8 {
 	*/
 	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
 
-		global $wgOut;
-		if ($wgOut) $wgOut->addHTML($format);
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
 		$hh = substr( $ts, 8, 2 );
 		$h = 0 + $hh;
-- 
cgit v1.2.3


From 83bc3a710a545435e44ec6db01c7b8aa3fdf54e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 19 Aug 2005 15:29:10 +0000
Subject: Bug 1020: Changing user interface language does not work immediately
 Includes html->wikitext fixes, unlikely to break any messages

---
 RELEASE-NOTES                   |  1 +
 includes/SpecialPreferences.php | 40 +++++++++++++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3b1c9325dbe3..ee5717823c35 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -662,6 +662,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3187) watchlist text refer to unexistent "Stop watching" action
 * (bug 3190) Added some date format choices for language sr
 * (bug 1334) LanguageGa.php update
+* (bug 1020) Changing user interface language does not work immediately
 
 
 === Caveats ===
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 822adcab22c0..bd462909c3b8 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -66,6 +66,7 @@ class PreferencesForm {
 		$this->mAction = $request->getVal( 'action' );
 		$this->mReset = $request->getCheck( 'wpReset' );
 		$this->mPosted = $request->wasPosted();
+		$this->mSuccess = $request->getCheck( 'success' );
 
 		$this->mSaveprefs = $request->getCheck( 'wpSaveprefs' ) &&
 			$this->mPosted &&
@@ -113,7 +114,7 @@ class PreferencesForm {
 		}
 		if ( $this->mReset ) {
 			$this->resetPrefs();
-			$this->mainPrefsForm( wfMsg( 'prefsreset' ) );
+			$this->mainPrefsForm( 'reset', wfMsg( 'prefsreset' ) );
 		} else if ( $this->mSaveprefs ) {
 			$this->savePreferences();
 		} else {
@@ -197,26 +198,33 @@ class PreferencesForm {
 
 		if ( '' != $this->mNewpass ) {
 			if ( $this->mNewpass != $this->mRetypePass ) {
-				$this->mainPrefsForm( wfMsg( 'badretype' ) );
+				$this->mainPrefsForm( 'error', wfMsg( 'badretype' ) );
 				return;
 			}
 
 			if ( strlen( $this->mNewpass ) < $wgMinimalPasswordLength ) {
-				$this->mainPrefsForm( wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
+				$this->mainPrefsForm( 'error', wfMsg( 'passwordtooshort', $wgMinimalPasswordLength ) );
 				return;
 			}
 
 			if (!$wgUser->checkPassword( $this->mOldpass )) {
-				$this->mainPrefsForm( wfMsg( 'wrongpassword' ) );
+				$this->mainPrefsForm( 'error', wfMsg( 'wrongpassword' ) );
 				return;
 			}
 			if (!$wgAuth->setPassword( $wgUser, $this->mNewpass )) {
-				$this->mainPrefsForm( wfMsg( 'externaldberror' ) );
+				$this->mainPrefsForm( 'error', wfMsg( 'externaldberror' ) );
 				return;
 			}
 			$wgUser->setPassword( $this->mNewpass );
 		}
 		$wgUser->setRealName( $this->mRealName );
+
+		if( $wgUser->getOption( 'language' ) !== $this->mUserLanguage ) {
+			$needRedirect = true;
+		} else {
+			$needRedirect = false;
+		}
+
 		$wgUser->setOption( 'language', $this->mUserLanguage );
 		$wgUser->setOption( 'variant', $this->mUserVariant );
 		$wgUser->setOption( 'nickname', $this->mNick );
@@ -259,7 +267,7 @@ class PreferencesForm {
 		$wgUser->setCookies();
 		$wgUser->saveSettings();
 
-		$error = wfMsg( 'savedprefs' );
+		$error = false;
 		if( $wgEnableEmail ) {
 			$newadr = $this->mUserEmail;
 			$oldadr = $wgUser->getEmail();
@@ -274,7 +282,7 @@ class PreferencesForm {
 						# User can come back through the confirmation URL to re-enable email.
 						$result = $wgUser->sendConfirmationMail();
 						if( WikiError::isError( $result ) ) {
-							$error = wfMsg( 'mailerror', $result->getMessage() );
+							$error = wfMsg( 'mailerror', htmlspecialchars( $result->getMessage() ) );
 						} else {
 							$error = wfMsg( 'eauthentsent', $wgUser->getName() );
 						}
@@ -289,9 +297,15 @@ class PreferencesForm {
 			}
 		}
 
+		if( $needRedirect && $error === false ) {
+			$title =& Title::makeTitle( NS_SPECIAL, "Preferences" );
+			$wgOut->redirect($title->getFullURL('success'));
+			return;
+		}
+
 		$wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
 		$po = ParserOptions::newFromUser( $wgUser );
-		$this->mainPrefsForm( $error );
+		$this->mainPrefsForm( $error === false ? 'success' : 'error', $error);
 	}
 
 	/**
@@ -404,7 +418,7 @@ class PreferencesForm {
 	/**
 	 * @access private
 	 */
-	function mainPrefsForm( $err ) {
+	function mainPrefsForm( $status , $message = '' ) {
 		global $wgUser, $wgOut, $wgLang, $wgContLang, $wgValidSkinNames;
 		global $wgAllowRealName, $wgImageLimits, $wgThumbLimits;
 		global $wgDisableLangConversion;
@@ -417,8 +431,12 @@ class PreferencesForm {
 		$wgOut->setArticleRelated( false );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-		if ( '' != $err ) {
-			$wgOut->addHTML( "<p class='error'>" . htmlspecialchars( $err ) . "</p>\n" );
+		if ( $this->mSuccess || 'success' == $status ) {
+			$wgOut->addWikitext( '<span class="preferences-save-success">'. wfMsg( 'savedprefs' ) . "</span>\n----" );
+		} else	if ( 'error' == $status ) {
+			$wgOut->addWikitext( "<span class='error'>" . $message  . "</span>\n----" );
+		} else if ( '' != $status ) {
+			$wgOut->addWikitext( $message . "\n----" );
 		}
 		$uname = $wgUser->getName();
 		$uid = $wgUser->getID();
-- 
cgit v1.2.3


From 442c93f93b58f47db29af658f732741ce38d4070 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 19 Aug 2005 18:54:41 +0000
Subject: Fix Serbian linktrail

---
 languages/LanguageSr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 73476a9437e9..20a11dedf813 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -142,7 +142,7 @@ require_once( "LanguageUtf8.php" );
 "category_header" => "Чланака у категорији: \"$1\"",
 "subcategories" => "Подкатегорије",
 
-"linktrail"  => "/^([а-ж�-�]+)(.*)$/sD",
+"linktrail" => "/^([абвгдђежзијклљмнњопрстћуфхцчџш]+)(.*)$/usD",
 "mainpage"  => "Главна страна",
 "mainpagetext" => "Вики софтвер је успешно инсталиран.",
 "about"   => "О...",
-- 
cgit v1.2.3


From 23a38dada373bce700e0d25896c46fee273a356f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 19 Aug 2005 22:16:30 +0000
Subject: Bug 2753 Some namespaces are not translated in LanguageTa.php (Tamil)
 Changed PROJECT & _TALK, translated template, help and category

---
 RELEASE-NOTES            |  1 +
 languages/LanguageTa.php | 33 ++++++++++++++++++---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ee5717823c35..06b15b8041af 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -663,6 +663,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3190) Added some date format choices for language sr
 * (bug 1334) LanguageGa.php update
 * (bug 1020) Changing user interface language does not work immediately
+* (bug 2753) Some namespaces were not translated in LanguageTa.php (Tamil)
 
 
 === Caveats ===
diff --git a/languages/LanguageTa.php b/languages/LanguageTa.php
index 8daf0a167a32..5a0b56046d18 100644
--- a/languages/LanguageTa.php
+++ b/languages/LanguageTa.php
@@ -11,21 +11,24 @@ require_once( "LanguageUtf8.php" );
 #--------------------------------------------------------------------------
 
 /* private */ $wgNamespaceNamesTa = array(
-	NS_MEDIA          => "ஊடகம்",
-	NS_SPECIAL        => "சிறப்பு",
-	NS_MAIN           => "",
-	NS_TALK           => "பேச்சு",
-	NS_USER           => "பயனர்",
-	NS_USER_TALK      => "பயனர்_பேச்சு",
-	NS_PROJECT        => "விக்கிபீடியா",
-	NS_PROJECT_TALK   => "விக்கிபீடியா_பேச்சு",
-	NS_IMAGE          => "படிமம்",
-	NS_IMAGE_TALK     => "உருவப்_பேச்சு",
-	NS_MEDIAWIKI      => "மீடியாவிக்கி",
-	NS_MEDIAWIKI_TALK => "மீடியாவிக்கி_பேச்சு",
-	NS_TEMPLATE       => "Template",
-	NS_TEMPLATE_TALK  => "Template_talk"
-
+	NS_MEDIA          => 'ஊடகம்',
+	NS_SPECIAL        => 'சிறப்பு',
+	NS_MAIN           => '',
+	NS_TALK           => 'பேச்சு',
+	NS_USER           => 'பயனர்',
+	NS_USER_TALK      => 'பயனர்_பேச்சு',
+	NS_PROJECT        => $wgMetaNamespace,
+	NS_PROJECT_TALK   => $wgMetaNamespace . '_பேச்சு',
+	NS_IMAGE          => 'படிமம்',
+	NS_IMAGE_TALK     => 'உருவப்_பேச்சு',
+	NS_MEDIAWIKI      => 'மீடியாவிக்கி',
+	NS_MEDIAWIKI_TALK => 'மீடியாவிக்கி_பேச்சு',
+	NS_TEMPLATE       => 'வார்ப்புரு',
+	NS_TEMPLATE_TALK  => 'வார்ப்புரு_பேச்சு',
+	NS_HELP           => 'உதவி',
+	NS_HELP_TALK      => 'உதவி_பேச்சு',
+	NS_CATEGORY       => 'பகுப்பு',
+	NS_CATEGORY_TALK  => 'பகுப்பு_பேச்சு',
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsTa = array(
-- 
cgit v1.2.3


From 1898acf241e39ef7b78112a6f8baa38d35bd4e12 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 20 Aug 2005 01:49:34 +0000
Subject: better current directory handling

---
 maintenance/dumpBackup.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintenance/dumpBackup.php b/maintenance/dumpBackup.php
index b934120b57fd..51d9ee0b11f5 100644
--- a/maintenance/dumpBackup.php
+++ b/maintenance/dumpBackup.php
@@ -22,6 +22,8 @@
  * @subpackage SpecialPage
  */
 
+$originalDir = getcwd();
+
 $optionsWithArgs = array( 'server', 'pagelist' );
 
 require_once( 'commandLine.inc' );
@@ -141,7 +143,7 @@ if( isset( $options['server'] ) ) {
 
 if ( isset( $options['pagelist'] ) ) {
 	$olddir = getcwd();
-	chdir( 'maintenance' );
+	chdir( $originalDir );
 	$pages = file( $options['pagelist'] );
 	chdir( $olddir );
 	if ( $pages === false ) {
-- 
cgit v1.2.3


From 81c52e24b7ecd0e2b1f8c92f3d5d676869459bea Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 20 Aug 2005 01:51:13 +0000
Subject: use master

---
 maintenance/update.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintenance/update.php b/maintenance/update.php
index 41d9e9ca1aa3..87dd4b159f40 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -8,6 +8,7 @@
  */ 
 
 /** */
+$wgUseMasterForMaintenance = true;
 $options = array( 'quick' );
 require_once( "commandLine.inc" );
 require_once( "updaters.inc" );
-- 
cgit v1.2.3


From b9ea4a8ab1fe24a1e46b1294b29968331acc0b7c Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 20 Aug 2005 01:53:39 +0000
Subject: live improvements by brion

---
 maintenance/rebuildInterwiki.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/maintenance/rebuildInterwiki.inc b/maintenance/rebuildInterwiki.inc
index 76ef6ffd62eb..34046274c296 100644
--- a/maintenance/rebuildInterwiki.inc
+++ b/maintenance/rebuildInterwiki.inc
@@ -49,6 +49,7 @@ function getRebuildInterwikiSQL() {
 		'textbookwiki' => 'wikibooks.org',
 		'sep11wiki' => 'sep11.wikipedia.org',
 		'metawiki' => 'meta.wikimedia.org',
+		'commonswiki' => 'commons.wikimedia.org',
 	);
 
 	$extraLinks = array(
@@ -77,7 +78,8 @@ function getRebuildInterwikiSQL() {
 	}
 
 	# Extract the intermap from meta
-	$lines = file( 'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw' );
+	$intermap = wfGetHTTP( 'http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw' );
+	$lines = array_map( 'trim', explode( "\n", trim( $intermap ) ) );
 
 	if ( !$lines ) {
 		die( "m:Interwiki_map not found" );
-- 
cgit v1.2.3


From dca3329c8cfbfff406e6e4e6db2000573f087f51 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 20 Aug 2005 02:06:26 +0000
Subject: * (bug 3204) Fix typo breaking special pages in fy localization

---
 RELEASE-NOTES            | 1 +
 languages/LanguageFy.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 06b15b8041af..f8a65d6b1fa0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -664,6 +664,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 1334) LanguageGa.php update
 * (bug 1020) Changing user interface language does not work immediately
 * (bug 2753) Some namespaces were not translated in LanguageTa.php (Tamil)
+* (bug 3204) Fix typo breaking special pages in fy localization
 
 
 === Caveats ===
diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php
index 8bbd02d3daf4..ba85faacd61a 100644
--- a/languages/LanguageFy.php
+++ b/languages/LanguageFy.php
@@ -11,7 +11,7 @@ if($wgMetaNamespace === FALSE)
 
 /* private */ $wgNamespaceNamesFy = array(
 	NS_MEDIA          => "Media",
-	MS_SPECIAL        => "Wiki",
+	NS_SPECIAL        => "Wiki",
 	NS_MAIN           => "",
 	NS_TALK           => "Oerlis",
 	NS_USER           => "Meidogger",
-- 
cgit v1.2.3


From 1527a8e13cad7a8436a76bbc57a0db4c245c1db6 Mon Sep 17 00:00:00 2001
From: Rowan Collins <imsop@users.mediawiki.org>
Date: Sat, 20 Aug 2005 12:51:08 +0000
Subject: (Bug 3090) mask all external links in image captions against
 double-parsing, rather than just http:// ones

---
 includes/Parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/Parser.php b/includes/Parser.php
index fa6c1ce06c9c..80224f73cff0 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -773,7 +773,7 @@ class Parser
 
 		# replaceInternalLinks may sometimes leave behind
 		# absolute URLs, which have to be masked to hide them from replaceExternalLinks
-		$text = str_replace("http-noparse://","http://",$text);
+		$text = str_replace(UNIQ_PREFIX."NOPARSE", "", $text);
 
 		$text = $this->doMagicLinks( $text );
 		$text = $this->doTableStuff( $text );
@@ -1388,7 +1388,7 @@ class Parser
 						$text = $this->replaceInternalLinks($text);
 
 						# cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them
-						$s .= $prefix . str_replace('http://', 'http-noparse://', $this->makeImage( $nt, $text ) ) . $trail;
+						$s .= $prefix . preg_replace("/\b($wgUrlProtocols)/", UNIQ_PREFIX."NOPARSE$1", $this->makeImage( $nt, $text) ) . $trail;
 						$wgLinkCache->addImageLinkObj( $nt );
 
 						wfProfileOut( "$fname-image" );
-- 
cgit v1.2.3


From d3adb498c6b5bed4ede1be67a6c4cc892615108d Mon Sep 17 00:00:00 2001
From: Rowan Collins <imsop@users.mediawiki.org>
Date: Sat, 20 Aug 2005 15:47:23 +0000
Subject: (bug 676) Avoid creating invalid title objects when there's a leading
 colon and a real namespace (as in {{:Project:Foo}}); should mean things like
 [[{{NAMESPACE}}:Foo]] should work too.

---
 includes/Title.php | 89 +++++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 44 deletions(-)

diff --git a/includes/Title.php b/includes/Title.php
index 1ad1b30f906d..31d21d87513e 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1280,57 +1280,58 @@ class Title {
 
 		$this->mDbkeyform = $t;
 
-		# Initial colon indicating main namespace
+		# Initial colon indicates main namespace rather than specified default
+		# but should not create invalid {ns,title} pairs such as {0,Project:Foo}
 		if ( ':' == $t{0} ) {
-			$r = substr( $t, 1 );
 			$this->mNamespace = NS_MAIN;
-		} else {
-			# Namespace or interwiki prefix
-			$firstPass = true;
-			do {
-				if ( preg_match( "/^(.+?)_*:_*(.*)$/S", $t, $m ) ) {
-					$p = $m[1];
-					$lowerNs = strtolower( $p );
-					if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) {
-						# Canonical namespace
-						$t = $m[2];
-						$this->mNamespace = $ns;
-					} elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) {
-						# Ordinary namespace
-						$t = $m[2];
-						$this->mNamespace = $ns;
-					} elseif( $this->getInterwikiLink( $p ) ) {
-						if( !$firstPass ) {
-							# Can't make a local interwiki link to an interwiki link.
-							# That's just crazy!
+			$t = substr( $t, 1 ); # remove the colon but continue processing
+		}
+
+		# Namespace or interwiki prefix
+		$firstPass = true;
+		do {
+			if ( preg_match( "/^(.+?)_*:_*(.*)$/S", $t, $m ) ) {
+				$p = $m[1];
+				$lowerNs = strtolower( $p );
+				if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) {
+					# Canonical namespace
+					$t = $m[2];
+					$this->mNamespace = $ns;
+				} elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) {
+					# Ordinary namespace
+					$t = $m[2];
+					$this->mNamespace = $ns;
+				} elseif( $this->getInterwikiLink( $p ) ) {
+					if( !$firstPass ) {
+						# Can't make a local interwiki link to an interwiki link.
+						# That's just crazy!
+						wfProfileOut( $fname );
+						return false;
+					}
+
+					# Interwiki link
+					$t = $m[2];
+					$this->mInterwiki = $p;
+
+					# Redundant interwiki prefix to the local wiki
+					if ( 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
+						if( $t == '' ) {
+							# Can't have an empty self-link
 							wfProfileOut( $fname );
 							return false;
 						}
-
-						# Interwiki link
-						$t = $m[2];
-						$this->mInterwiki = $p;
-
-						# Redundant interwiki prefix to the local wiki
-						if ( 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
-							if( $t == '' ) {
-								# Can't have an empty self-link
-								wfProfileOut( $fname );
-								return false;
-							}
-							$this->mInterwiki = '';
-							$firstPass = false;
-							# Do another namespace split...
-							continue;
-						}
+						$this->mInterwiki = '';
+						$firstPass = false;
+						# Do another namespace split...
+						continue;
 					}
-					# If there's no recognized interwiki or namespace,
-					# then let the colon expression be part of the title.
 				}
-				break;
-			} while( true );
-			$r = $t;
-		}
+				# If there's no recognized interwiki or namespace,
+				# then let the colon expression be part of the title.
+			}
+			break;
+		} while( true );
+		$r = $t;
 
 		# We already know that some pages won't be in the database!
 		#
-- 
cgit v1.2.3


From f3a024c6e0c40de97e6585338ca7a0714b35cfb7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 21 Aug 2005 00:40:52 +0000
Subject: * (bug 3210) Fix Media: links with remote image URL path Someone
 changed how the noparse links handling worked without updating all uses. Copy
 fix from HEAD.

---
 RELEASE-NOTES       | 1 +
 includes/Linker.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f8a65d6b1fa0..085a82d2ab4b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -665,6 +665,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 1020) Changing user interface language does not work immediately
 * (bug 2753) Some namespaces were not translated in LanguageTa.php (Tamil)
 * (bug 3204) Fix typo breaking special pages in fy localization
+* (bug 3210) Fix Media: links with remote image URL path
 
 
 === Caveats ===
diff --git a/includes/Linker.php b/includes/Linker.php
index 81e31e56ce0c..bf25abd7fbbf 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -601,7 +601,7 @@ class Linker {
 			if( $img->exists() ) {
 				$url  = $img->getURL();
 				if( $nourl ) {
-					$url = str_replace( "http://", "http-noparse://", $url );
+					$url = str_replace( "http://", UNIQ_PREFIX . "NOPARSEhttp://", $url );
 				}
 				$class = 'internal';
 			} else {
-- 
cgit v1.2.3


From 1490e1b7a980ba1f7a9512ded6ac26ade3e7bd65 Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Sun, 21 Aug 2005 13:27:06 +0000
Subject: add referrer into stub

---
 includes/HistoryBlob.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index f7fa77afd304..3eb2b6f5335e 100644
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -182,7 +182,7 @@ $wgBlobCache = array();
  * @package MediaWiki
  */
 class HistoryBlobStub {
-	var $mOldId, $mHash;
+	var $mOldId, $mHash,$mRef;
 
 	/** @todo document */
 	function HistoryBlobStub( $hash = '', $oldid = 0 ) {
@@ -197,6 +197,20 @@ class HistoryBlobStub {
 		$this->mOldId = $id;
 	}
 
+	/**
+	 * Sets the location (old_id) of the referring object
+	 */
+	function setReferrer( $id ) {
+		$this->mRef = $id;
+	}
+
+	/**
+	 * Gets the location of the referring object
+	 */
+	function getReferrer() {
+		return $this->mRef;
+	}
+
 	/** @todo document */
 	function getText() {
 		global $wgBlobCache;
-- 
cgit v1.2.3


From f020922d93f6c55d7a8933ad38b2507a3dc0e649 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 22 Aug 2005 06:36:26 +0000
Subject: * (bug 3220) Fix escaping of block URLs in Recentchanges Username
 with & would be cut off in the resulting form. Also did some corrective
 escaping on username links for XML validation Copied fix from HEAD

---
 RELEASE-NOTES            | 1 +
 includes/ChangesList.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 085a82d2ab4b..7a7d107ede24 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -666,6 +666,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2753) Some namespaces were not translated in LanguageTa.php (Tamil)
 * (bug 3204) Fix typo breaking special pages in fy localization
 * (bug 3210) Fix Media: links with remote image URL path
+* (bug 3220) Fix escaping of block URLs in Recentchanges
 
 
 === Caveats ===
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index b224c0a68105..bc1fcb78a66c 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -365,7 +365,7 @@ class ChangesList {
 				$rc_user_text, 'target=' . $rc_user_text );
 		} else {
 			$userPage =& Title::makeTitle( NS_USER, $rc_user_text );
-			$userLink = $this->skin->makeLinkObj( $userPage, $rc_user_text );
+			$userLink = $this->skin->makeLinkObj( $userPage, htmlspecialchars( $rc_user_text ) );
 		}
 		$s .= $userLink;
 
@@ -376,14 +376,14 @@ class ChangesList {
 			$userTalkLink = '';
 		} else {
 			$userTalkPage =& Title::makeTitle( NS_USER_TALK, $rc_user_text );
-			$userTalkLink= $this->skin->makeLinkObj( $userTalkPage, $talkname );
+			$userTalkLink= $this->skin->makeLinkObj( $userTalkPage, htmlspecialchars( $talkname ) );
 		}
 		# Block link
 		$blockLink='';
 		if ( ( $wgSysopUserBans || 0 == $rc_user ) && $wgUser->isAllowed('block') ) {
 			$blockLinkPage = Title::makeTitle( NS_SPECIAL, 'Blockip' );
 			$blockLink = $this->skin->makeKnownLinkObj( $blockLinkPage,
-				$message['blocklink'], 'ip='.$rc_user_text );
+				htmlspecialchars( $message['blocklink'] ), 'ip=' . urlencode( $rc_user_text ) );
 
 		}
 		if($blockLink) {
-- 
cgit v1.2.3


From 226445ea1c606aff66d99cbc1e52b3e4187cbc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 23 Aug 2005 17:31:29 +0000
Subject: * (bug 3238): Updated LanguageNn.php for 1_5 branch

---
 RELEASE-NOTES            |   2 +-
 languages/LanguageNn.php | 169 +++++++++++++++++++++++++++++++----------------
 2 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7a7d107ede24..71b74d974d4c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -667,7 +667,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3204) Fix typo breaking special pages in fy localization
 * (bug 3210) Fix Media: links with remote image URL path
 * (bug 3220) Fix escaping of block URLs in Recentchanges
-
+* (bug 3238): Updated LanguageNn.php for 1_5 branch
 
 === Caveats ===
 
diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index a08de382de5e..27f33414b127 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -40,7 +40,7 @@ if($wgMetaNamespace === FALSE)
 ) + $wgNamespaceNamesEn;
 
 /* private */ $wgQuickbarSettingsNn = array(
-	'Ingen', 'Venstre', 'Høgre', 'Fast venstre'
+	'Ingen', 'Venstre', 'Høgre', 'Flytande venstre', 'Flytande høgre'
 );
 
 /* private */ $wgSkinNamesNn = array(
@@ -63,7 +63,7 @@ if($wgMetaNamespace === FALSE)
 	'Bibsys'       => 'http://ask.bibsys.no/ask/action/result?kilde=biblio&fid=isbn&lang=nn&term=$1',
 	'BokBerit'     => 'http://www.bokberit.no/annet_sted/bocker/$1.html',
 	'Bokkilden'    => 'http://www.bokkilden.no/ProductDetails.aspx?ProductId=$1',
-	'Haugenbok'    => 'http://www.haugenbok.no/searchresults.cfm?searchtype=simple&isbn=$1',
+	'Haugenbok'    => 'http://www.haugenbok.no/resultat.cfm?st=hurtig&isbn=$1',
 	'Akademika'    => 'http://www.akademika.no/sok.php?isbn=$1',
 	'Gnist'        => 'http://www.gnist.no/sok.php?isbn=$1',
 	'Amazon.co.uk' => 'http://www.amazon.co.uk/exec/obidos/ISBN=$1',
@@ -81,7 +81,7 @@ if($wgMetaNamespace === FALSE)
 	MAG_NOTOC                => array( 0,    '__NOTOC__', '__INGAINNHALDSLISTE__', '__INGENINNHOLDSLISTE__'         ),
 	MAG_FORCETOC             => array( 0,    '__FORCETOC__', '__ALLTIDINNHALDSLISTE__', '__ALLTIDINNHOLDSLISTE__'   ),
 	MAG_TOC                  => array( 0,    '__TOC__', '__INNHALDSLISTE__', '__INNHOLDSLISTE__'                    ),
-	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__INGABOLKREDIGERING__', '__INGENDELREDIGERING__'),
+	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__INGABOLKENDRING__', '__INGABOLKREDIGERING__', '__INGENDELENDRING__'),
 	MAG_START                => array( 0,    '__START__'                                                            ),
 	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH', 'MÅNADNO', 'MÅNEDNÅ'                                   ),
 	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME', 'MÅNADNONAMN', 'MÅNEDNÅNAVN'                       ),
@@ -91,9 +91,11 @@ if($wgMetaNamespace === FALSE)
 	MAG_CURRENTYEAR          => array( 1,    'CURRENTYEAR', 'ÅRNO', 'ÅRNÅ'                                          ),
 	MAG_CURRENTTIME          => array( 1,    'CURRENTTIME', 'TIDNO', 'TIDNÅ'                                        ),
 	MAG_NUMBEROFARTICLES     => array( 1,    'NUMBEROFARTICLES', 'INNHALDSSIDETAL', 'INNHOLDSSIDETALL'              ),
+	MAG_NUMBEROFFILES        => array( 1,    'NUMBEROFFILES', 'FILTAL'                                              ),
 	MAG_PAGENAME             => array( 1,    'PAGENAME', 'SIDENAMN', 'SIDENAVN'                                     ),
 	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE', 'SIDENAMNE', 'SIDENAVNE'                                  ),
 	MAG_NAMESPACE            => array( 1,    'NAMESPACE', 'NAMNEROM', 'NAVNEROM'                                    ),
+	MAG_MSG                  => array( 0,    'MSG:'                                                                 ),
 	MAG_SUBST                => array( 0,    'SUBST:', 'LIMINN:'                                                    ),
 	MAG_MSGNW                => array( 0,    'MSGNW:', 'IKWIKMELD:'                                                 ),
 	MAG_END                  => array( 0,    '__END__', '__SLUTT__'                                                 ),
@@ -126,13 +128,13 @@ if($wgMetaNamespace === FALSE)
 
 /* private */ $wgAllMessagesNn = array(
 # User preference toggles
-'tog-underline'           => 'Strek under lenkjer',
+'tog-underline'           => 'Strek under lenkjer:',
 'tog-highlightbroken'     => 'Vis lenkjer til tomme sider <a href="" class="new">slik</a> (alternativt slik<a href="" class="internal">?</a>)',
 'tog-justify'	          => 'Blokkjusterte avsnitt',
 'tog-hideminor'           => 'Skjul uviktige endringar på «siste endringar»',
 'tog-usenewrc'            => 'Utvida funksjonalitet på «siste endringar» (JavaScript)',
 'tog-numberheadings'      => 'Vis nummererte overskrifter',
-'tog-showtoolbar'         => 'Vis redigeringsknappar (JavaScript)',
+'tog-showtoolbar'         => 'Vis endringsknappar (JavaScript)',
 'tog-editondblclick'      => 'Endre sider med dobbelklikk (JavaScript)',
 'tog-editsection'         => 'Endre avsnitt med hjelp av [endre]-lenkje',
 'tog-editsectiononrightclick' => 'Endre avsnitt med å høgreklikke på avsnittsoverskrift (JavaScript)',
@@ -153,6 +155,12 @@ if($wgMetaNamespace === FALSE)
 'tog-externaleditor'      => 'Eksternt handsamingsprogram som standard',
 'tog-externaldiff'        => 'Eksternt skilnadprogram som standard',
 
+'underline-always'        => 'Alltid',
+'underline-never'         => 'Aldri',
+'underline-default'       => 'Nettlesarstandard',
+
+'skinpreview'             => '(førehandsvis)',
+
 # Dates
 'sunday'                  => 'søndag',
 'monday'                  => 'måndag',
@@ -212,7 +220,7 @@ if($wgMetaNamespace === FALSE)
 'faq'			  => 'OSS',
 'faqpage'		  => 'Project:OSS',
 'edithelp'		  => 'Hjelp til endring',
-'newwindow'		  => '(vert opna i eit nytt vindauge)',
+'newwindow'		  => '(blir opna i eit nytt vindauge)',
 'edithelppage'	          => 'Help:Endring',
 'cancel'		  => 'Avbryt',
 'qbfind'		  => 'Finn',
@@ -248,15 +256,16 @@ if($wgMetaNamespace === FALSE)
 'history_short'           => 'Historikk',
 'info_short'	          => 'Informasjon',
 'printableversion'        => 'Utskriftsversjon',
+'print'                   => 'Skriv ut',
 'edit'                    => 'Endre',
-'editthispage'	          => 'Endre side',
+'editthispage'	          => 'Endre sida',
 'delete'                  => 'Slett',
 'deletethispage'          => 'Slett side',
 'undelete_short1'         => 'Attopprett 1 endring',
 'undelete_short'          => 'Attopprett $1 endringar',
 'protect'                 => 'Vern',
 'protectthispage'         => 'Vern denne sida',
-'unprotect'               => 'Fjern vern',
+'unprotect'               => 'fjern vern',
 'unprotectthispage'       => 'Fjern vern av denne sida',
 'newpage'                 => 'Ny side',
 'talkpage'		  => 'Drøft sida',
@@ -273,7 +282,7 @@ if($wgMetaNamespace === FALSE)
 'wikipediapage'           => 'Vis prosjektside',
 'imagepage'               => 'Vis filside',
 'viewtalkpage'            => 'Vis diskusjon',
-'otherlanguages'          => 'Andre språk',
+'otherlanguages'          => 'På andre språk',
 'redirectedfrom'          => '(Omdirigert frå $1)',
 'lastmodified'	          => 'Sist endra $1.',
 'viewcount'		  => 'Vist $1 gonger.',
@@ -288,6 +297,8 @@ if($wgMetaNamespace === FALSE)
 'developertext'	          => 'Funksjonen kan berre utførast av administratorar med utviklartilgang. Sjå $1.',
 'badaccess'               => 'Tilgangsfeil',
 'badaccesstext'           => 'Handlinga du har prøvd å få utført kan berre utførast av brukarar med «$2»-tilgang. Sjå $1.',
+'versionrequired'         => 'MediaWiki versjon $1 trengst',
+'versionrequiredtext'     => 'For å bruke denne sida trengst MediaWiki versjon $1. Sjå [[{{ns:special}}:Version]]',
 'nbytes'		  => '$1 byte',
 'ok'			  => 'OK',
 'sitetitle'		  => '{{SITENAME}}',
@@ -301,14 +312,15 @@ if($wgMetaNamespace === FALSE)
 'showtoc'                 => 'vis',
 'hidetoc'                 => 'gøym',
 'thisisdeleted'           => 'Sjå eller attopprett $1?',
-'restorelink'             => '$1 sletta endringar',
+'restorelink1'            => 'ein sletta versjon',
+'restorelink'             => '$1 sletta versjonar',
 'feedlinks'               => 'Mating:',
 'sitenotice'	          => '-', # the equivalent to wgSiteNotice
 
 # Short words for each namespace, by default used in the 'article' tab in monobook
 'nstab-main'              => 'Innhaldsside',
 'nstab-user'              => 'Brukarside',
-'nstab-media'             => 'Filpeikar',
+'nstab-media'             => 'Filside',
 'nstab-special'           => 'Spesial',
 'nstab-wp'                => 'Prosjektside',
 'nstab-image'             => 'Fil',
@@ -340,10 +352,10 @@ MySQL returnerte feilen «$3: $4».',
 'readonlytext'	          => 'Databasen er akkurat no skriveverna, truleg for rutinemessig vedlikehald. Administratoren som verna han har gjeve denne forklaringa:<p>$1',
 'missingarticle'          => 'Databasen fann ikkje teksten til ei side med namnet «$1» som han skulle ha funne.
 
-<p>Dette skjer oftast fordi du følgde ei lenkje til ei oppføring som har vorte sletta.
+Dette skjer oftast fordi du følgde ei lenkje til ei oppføring som har vorte sletta.
 Sletta oppføringar kan vanlegvis attopprettast.
 
-<p>Dersom dette ikkje er tilfellet kan du ha funne ein feil i programvaren. Gje melding om dette til ein administrator, med adressa åt sida.',
+Dersom dette ikkje er tilfellet kan du ha funne ein feil i programvaren. Gje melding om dette til ein administrator, med adressa åt sida.',
 'readonly_lag'            => 'Databasen er mellombels skriveverna for at databasetenarane skal kunna synkronisere seg mot kvarandre',
 'internalerror'           => 'Intern feil',
 'filecopyerror'           => 'Kunne ikkje kopiere fila frå «$1» til «$2».',
@@ -371,9 +383,9 @@ Du kan sjå og kopiere kjeldeteksten til denne sida:',
 'logouttitle'	          => 'Logg ut',
 'logouttext'	          => 'Du er no utlogga. Avhengig av innstillingane på tenaren kan nettlesaren no brukast anonymt på {{SITENAME}};
 du kan logge inn att med same kontoen eller ein annan brukar kan logge inn. Ver merksam på at nokre sider kan fortsetje å bli viste som om du er innlogga inntil du tømmer mellomlageret til nettlesaren din.',
-'welcomecreation'         => '== Hjarteleg velkommen til {{SITENAME}}, $1! ==
+'welcomecreation'         => '== Hjarteleg velkommen til {{SITENAME}}, [[user:$1|$1]]! ==
 
-Brukarkontoen din har vorte oppretta. Det er tilrådd at du ser gjennom brukarinnstillingane dine.',
+Brukarkontoen din har vorte oppretta. Det er tilrådd at du skriv litt om deg sjølv på [[user:$1|brukarsida di]] og ser gjennom [[special:preferences|brukarinnstillingane dine]].',
 'loginpagetitle'          => 'Logg inn',
 'yourname'		          => 'Brukarnamn',
 'yourpassword'	          => 'Passord',
@@ -381,7 +393,7 @@ Brukarkontoen din har vorte oppretta. Det er tilrådd at du ser gjennom brukarin
 'newusersonly'	          => ' (berre nye brukarar)',
 'remembermypassword'      => 'Hugs passordet.',
 'yourdomainname'          => 'Domenet ditt',
-'externaldberror'         => 'Det var anten ein ekstern databasefeil i tilgjengekontrollen, eller du har ikkje løyve til å oppdatera den eksterne kontoen din.',
+'externaldberror'         => 'Det var anten ein ekstern databasefeil i tilgjengekontrollen, eller du har ikkje løyve til å oppdatere den eksterne kontoen din.',
 'loginproblem'	          => '<b>Du vart ikkje innlogga.</b><br />Prøv om att!',
 'alreadyloggedin'         => '<strong>Brukar $1, du er allereie innlogga!</strong><br />',
 'login'			  => 'Logg inn',
@@ -408,7 +420,7 @@ Brukarkontoen din har vorte oppretta. Det er tilrådd at du ser gjennom brukarin
 'nocookiesnew'	          => 'Brukarkontoen vart oppretta, men du er ikkje innlogga. {{SITENAME}} bruker informasjonskapslar for å logge inn brukarar,
 nettlesaren din er innstilt for ikkje å godta desse. Etter at du har endra innstillingane slik at nettlesaren godtek informasjonskapslar, kan du logge inn med det nye brukarnamnet og passordet ditt.',
 'nocookieslogin'	  => '{{SITENAME}} bruker informasjonskapslar for å logge inn brukarar, nettlesaren din er innstilt for ikkje å godta desse.
-Etter at du har endra innstillingane slik at nettlesaren godtek informasjonskapslar kan du prøva å logge inn på nytt.',
+Etter at du har endra innstillingane slik at nettlesaren godtek informasjonskapslar kan du prøve å logge inn på nytt.',
 'noname'		  => 'Du har ikkje oppgjeve gyldig brukarnamn.',
 'loginsuccesstitle'       => 'Du er no innlogga',
 'loginsuccess'	          => 'Du er no innlogga som «$1».',
@@ -453,7 +465,7 @@ Etter at du har endra innstillingane slik at nettlesaren godtek informasjonskaps
 'hr_tip'                  => 'Vassrett line',
 'infobox'                 => 'Klikk på ein knapp for å få eksempeltekst',
 # alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror
-'infobox_alert'           => 'Skriv inn teksten du vil ha formatert.\n Han vil bli vist i boksen slik at han kan kopierast og limast inn.\nEksempel:\n$1\nvert til:\n$2',
+'infobox_alert'           => 'Skriv inn teksten du vil ha formatert.\n Han vil bli vist i boksen slik at han kan kopierast og limast inn.\nEksempel:\n$1\nblir til:\n$2',
 
 # Edit pages
 #
@@ -466,9 +478,9 @@ Etter at du har endra innstillingane slik at nettlesaren godtek informasjonskaps
 'showpreview'	          => 'Førehandsvis',
 'showdiff'                => 'Vis skilnad',
 'blockedtitle'	          => 'Brukaren er blokkert',
-'blockedtext'	          => 'Brukarnamnet ditt eller IP-adressa di er blokkert frå redigering, av $1. Denne grunnen vart gjeven:<br />\'\'$2\'\'<p>Du kan kontakte $1 eller ein annan [[Project:Administratorar|administrator]] for å diskutere blokkeringa.
+'blockedtext'	          => 'Brukarnamnet ditt eller IP-adressa di er blokkert frå endring, av $1. Denne grunnen vart gjeven:<br />\'\'$2\'\'<p>Du kan kontakte $1 eller ein annan [[Project:Administratorar|administrator]] for å diskutere blokkeringa.
 
-Ver merksam på at du ikkje kan bruke «send e-post åt brukar»-funksjonen så lenge du ikkje har ei gyldig e-postadresse registrert i [[Spesial:Innstillingar|innstillingane dine]].
+Ver merksam på at du ikkje kan bruke «send e-post åt brukar»-funksjonen så lenge du ikkje har ei gyldig e-postadresse registrert i [[Special:Preferences|innstillingane dine]].
 
 IP-adressa di er $3. Legg henne ved eventuelle førespurnader.',
 'whitelistedittitle'      => 'Du lyt logge inn for å gjera endringar',
@@ -491,22 +503,22 @@ IP-adressa di er $3. Legg henne ved eventuelle førespurnader.',
 'anontalkpagetext'        => '---- \'\'Dette er ei diskusjonsside for ein anonym brukar som ikkje har logga inn på eigen brukarkonto. Vi er difor nøydde til å bruke den numeriske IP-adressa knytt til internettoppkoplinga åt brukaren. Same IP-adressa kan vera knytt til fleire brukarar. Om du er ein anonym brukar og meiner at du har fått irrelevante kommentarar på ei slik side, [[{{ns:-1}}:Userlogin|logg inn]] slik at vi unngår framtidige forvekslingar med andre anonyme brukarar.\'\'',
 'noarticletext'           => '\'\'\'Sida «{{PAGENAME}}» finst ikkje på {{SITENAME}} enno.\'\'\'
 * Klikk på \'\'\'[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} endre]\'\'\' for å opprette sida.',
-'clearyourcache'          => '\'\'\'Merk:\'\'\' Etter lagring bør du tømme mellomlageret åt nettlesaren for å sjå endringane. \'\'\'Mozilla og Firefox:\'\'\' trykk \'\'Ctrl-Shift-R\'\', \'\'\'Internet Explorer:\'\'\' \'\'Ctrl-F5\'\', \'\'\'Safari:\'\'\' \'\'Cmd-Shift-R\'\', \'\'\'Konqueror:\'\'\' \'\'F5\'\'.',
+'clearyourcache'          => '\'\'\'Merk:\'\'\' Etter lagring vil det kanskje vera naudsynt at nettlesaren omgår mellomlageret sitt for at endringane skal tre i kraft. \'\'\'Mozilla og Firefox:\'\'\' trykk \'\'Ctrl-Shift-R\'\', \'\'\'Internet Explorer:\'\'\' \'\'Ctrl-F5\'\', \'\'\'Safari:\'\'\' \'\'Cmd-Shift-R\'\', \'\'\'Konqueror:\'\'\' \'\'F5\'\'.',
 'usercssjsyoucanpreview'  => '<strong>Tip:</strong> Bruk «Førehandsvis»-knappen for å teste den nye CSS- eller JS-koden din føre du lagrar.',
 'usercsspreview'          => '\'\'\'Hugs at du berre testar ditt eige CSS, det har ikkje vorte lagra enno!\'\'\'',
 'userjspreview'           => '\'\'\'Hugs at du berre testar ditt eige JavaScript, det har ikkje vorte lagra enno!!\'\'\'',
 'updated'		  => '(Oppdatert)',
 'note'			  => '<strong>Merk:</strong> ',
 'previewnote'	          => 'Hugs at dette berre er ei førehandsvising og at teksten ikkje er lagra!',
-'previewconflict'         => 'Dette er ei førehandsvising av teksten i redigeringsboksen over, slik han vil sjå ut om du lagrar han',
+'previewconflict'         => 'Dette er ei førehandsvising av teksten i endringsboksen over, slik han vil sjå ut om du lagrar han',
 'editing'		  => 'Endrar $1',
 'editingsection'          => 'Endrar $1 (bolk)',
 'editingcomment'          => 'Endrar $1 (kommentar)',
 'editconflict'	          => 'Endringskonflikt: $1',
-'explainconflict'         => 'Nokon annan har endra teksten sidan du byrja å skrive. Den øvste boksen inneheld den noverande teksten. Endringane dine er viste i den nedste boksen. Du lyt flette endringane dine saman med den noverande teksten. <strong>Berre</strong> teksten i den øvste tekstboksen vil bli lagra når du trykkjer «Lagre».<br />',
+'explainconflict'         => 'Nokon annan har endra teksten sidan du byrja å skrive. Den øvste boksen inneheld den noverande teksten. Skilnaden mellom den lagra versjonen og din endra versjon er viste under. Versjonen som du har endra er i den nedste boksen. Du lyt flette endringane dine saman med den noverande teksten. <strong>Berre</strong> teksten i den øvste tekstboksen vil bli lagra når du klikkar på «Lagre».<br />',
 'yourtext'		  => 'Teksten din',
 'storedversion'           => 'Den lagra versjonen',
-'nonunicodebrowser'       => '<strong>ÅTVARING: Nettlesaren din støttar ikkje «Unicode». Dette kan føra til feil i teksten. Ver venleg å byte nettlesar før du endrar. Sjå [[hjelp:unicode]] for meir informasjon.</strong><br />',
+'nonunicodebrowser'       => '<strong>ÅTVARING: Nettlesaren din støttar ikkje «Unicode». For å omgå problemet blir teikn utanfor ASCII-standarden viste som heksadesimale kodar. Det vil vera ein fordel om du byter nettlesar. Sjå [[hjelp:unicode]] for meir informasjon.</strong><br />',
 'editingold'	          => '<strong>ÅTVARING: Du endrar ein gammal versjon av denne sida. Om du lagrar ho, vil alle endringar gjorde etter denne versjonen bli overskrivne.</strong> (Men dei kan hentast fram att frå historikken.)<br />',
 'yourdiff'		  => 'Skilnad',
 'copyrightwarning'        => 'Merk deg at alle bidrag til {{SITENAME}} er å rekne som utgjevne under $2 (sjå $1 for detaljar). Om du ikkje vil ha teksten endra og kopiert under desse vilkåra, kan du ikkje leggje han her.<br />
@@ -517,8 +529,7 @@ Teksten må du ha skrive sjølv, eller kopiert frå ein ressurs som er kompatibe
 Teksten må du ha skrive sjølv eller ha kopiert frå ein ressurs som er kompatibel med vilkåra eller ikkje verna av opphavsrett (sjå $1 for detaljar).
 
 <strong>LEGG ALDRI INN MATERIALE SOM ANDRE HAR OPPHAVSRETT TIL UTAN LØYVE FRÅ DEI!</strong>',
-'longpagewarning'         => '<strong>ÅTVARING: Denne sida er $1 KB lang; nokre nettlesarar kan ha problem med å handsame endringar av sider som nærmar seg eller
-er lengre enn 32KB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><br />',
+'longpagewarning'         => '<strong>ÅTVARING: Denne sida er $1 KB lang; nokre nettlesarar kan ha problem med å handsama endringar av sider som nærmar seg eller er lengre enn 32 KB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><br />',
 'readonlywarning'         => '<strong>ÅTVARING: Databasen er skriveverna på grunn av vedlikehald, difor kan du ikkje lagre endringane dine akkurat no. Det kan vera lurt å  kopiere teksten din åt ei tekstfil, så du kan lagre han her seinare.</strong><br />',
 'protectedpagewarning'    => '<strong>ÅTVARING: Denne sida er verna, slik at berre administratorar kan endre ho.</strong><br />',
 'templatesused'	          => 'Malar brukte på denne sida:',
@@ -543,6 +554,8 @@ er lengre enn 32KB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><b
 'histlegend'	          => 'Merk av for dei versjonane du vil samanlikne og trykk [Enter] eller klikk på knappen nedst på sida.<br />Forklaring: (no) = skilnad frå den noverande versjonen, (førre) = skilnad frå den førre versjonen, <b>u</b> = uviktig endring',
 'history_copyright'       => '-',
 'deletedrev'              => '[sletta]',
+'histfirst'               => 'Første',
+'histlast'                => 'Siste',
 
 # Diffs
 #
@@ -558,7 +571,7 @@ er lengre enn 32KB. Du bør vurdere å dele opp sida i mindre bolkar.</strong><b
 #
 'searchresults'           => 'Søkjeresultat',
 'searchresulttext'        => 'For meir info om søkjefunksjonen i {{SITENAME}}, sjå [[Help:Søk|Hjelp]].',
-'searchquery'	          => 'Du søkte etter «$1»',
+'searchquery'	          => 'Du søkte etter «$1» <a href="/wiki/Spesial:Allpages/$1">[Indeks]</a>',
 'badquery'		  => 'Feil utforma førespurnad',
 'badquerytext'	          => 'Vi kunne ikkje svara på denne førespurnaden &mdash; Truleg fordi du prøvde å søkje etter eit ord med færre enn tre bokstavar, noko som ikkje er mogleg enno. Det kan òg vera du skreiv feil... Prøv om att.',
 'matchtotals'	          => 'Førespurnaden «$1» gav treff på $2 sidetitlar og på teksten på $3 sider.',
@@ -611,7 +624,7 @@ Sjå [[Help:Brukarinnstillingar|Hjelp]] for ei forklaring på dei ulike innstill
 'oldpassword'	        => 'Gammalt passord',
 'newpassword'	        => 'Nytt passord',
 'retypenew'		        => 'Nytt passord om att',
-'textboxsize'	        => 'Redigering',
+'textboxsize'	        => 'Endring',
 'rows'			        => 'Rekkjer',
 'columns'		        => 'Kolonnar',
 'searchresultshead'     => 'Søk',
@@ -692,7 +705,7 @@ Sjå [[Help:Brukarinnstillingar|Hjelp]] for ei forklaring på dei ulike innstill
 'rcnote'		=> 'Nedanfor er dei siste <strong>$1</strong> endringane gjort dei siste <strong>$2</strong> dagane.',
 'rcnotefrom'	        => 'Nedanfor er endringane frå <b>$2</b> inntil <b>$1</b> viste.',
 'rclistfrom'	        => 'Vis nye endringar frå $1',
-'showhideminor'         => '$1 uviktige endringar | $2 bottar | $3 innlogga brukarar | $4 patruljerte redigeringar',
+'showhideminor'         => '$1 uviktige endringar | $2 bottar | $3 innlogga brukarar | $4 patruljerte endringar',
 'rclinks'		=> 'Vis siste $1 endringar dei siste $2 dagane<br />$3',
 'rchide'		=> 'i $4 form; $1 uviktige endringar; $2 andre namnerom; $3 meir enn éi endring.',
 'rcliu'			=> '; $1 endringar av innlogga brukarar',
@@ -801,7 +814,7 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'maintnancepagetext'	=> 'På denne sida er det ulike verktøy for å halde {{SITENAME}} ved like. Nokre av desse funksjonane er harde for databasen (dei tar lang tid), så lat vera å oppdatere sida kvar gong du har retta ein enkelt ting',
 'maintenancebacklink'	=> 'Attende til vedlikehaldssida',
 'disambiguations'	=> 'Fleirtydingssider',
-'disambiguationspage'	=> 'Project:Lenkjer_til_artiklar_med fleirtydige titlar',
+'disambiguationspage'	=> 'Template:Fleirtyding',
 'disambiguationstext'	=> 'Dei følgjande artiklane har lenkjer til <i>artiklar med fleirtydige titlar</i>. Dei burde heller lenkje til ein ikkje-fleirtydig  tittel i staden.<br />Ein artikkeltittel blir handsama som fleirtydig om han har lenkjer frå $1.<br />Lenkjer frå andre namnerom er <i>ikkje</i> opprekna her.',
 'doubleredirects'	=> 'Doble omdirigeringar',
 'doubleredirectstext'	=> 'Kvar line inneheld lenkjer til den første og den andre omdirigeringa, og den første lina frå den andre omdirigeringsteksten. Det gjev som regel den «rette» målartikkelen, som den første omdirigeringa skulle ha peikt på.',
@@ -824,10 +837,12 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'lonelypages'	        => 'Foreldrelause sider',
 'uncategorizedpages'	=> 'Ikkje kategoriserte sider',
 'uncategorizedcategories' => 'Ikkje kategoriserte kategoriar',
+'unusedcategories'      => 'Ubrukte kategoriar',
 'unusedimages'	        => 'Ubrukte filer',
 'popularpages'	        => 'Populære sider',
 'nviews'		=> '$1 visingar',
 'wantedpages'	        => 'Etterspurde sider',
+'mostlinked'            => 'Sider mest lenkja til',
 'nlinks'		=> '$1 lenkjer',
 'allpages'		=> 'Alle sider',
 'randompage'	        => 'Tilfeldig side',
@@ -839,6 +854,7 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'specialpages'	        => 'Spesialsider',
 'spheading'		=> 'Spesialsider for alle brukarar',
 'restrictedpheading'    => 'Spesialsider med avgrensa tilgang',
+
 'protectpage'	        => 'Vern side',
 'recentchangeslinked'   => 'Relaterte endringar',
 'rclsub'		=> '(til sider med lenkje frå «$1»)',
@@ -849,6 +865,8 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'move'                  => 'Flytt',
 'movethispage'	        => 'Flytt side',
 'unusedimagestext'      => '<p>Merk deg at andre internettsider kan ha lenkjer til filer som er lista her. Dei kan difor vera i aktiv bruk.</p>',
+'unusedcategoriestext'  => 'Dei følgjande kategorisidene er oppretta, sjølv om ingen artikkel eller kategori brukar dei.',
+
 'booksources'	        => 'Bokkjelder',
 'categoriespagetext'    => 'Wikien har følgjande kategoriar.',
 'data'                  => 'Data',
@@ -891,7 +909,7 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'emailmessage'	        => 'Melding',
 'emailsend'		=> 'Send',
 'emailsent'		=> 'E-posten er sendt',
-'emailsenttext'         => 'E-postmeldinga er sendt.',
+'emailsenttext'         => 'E-posten er sendt.',
 
 # Watchlist
 #
@@ -901,9 +919,9 @@ Alle sidene er vortne viste \'\'\'$3\'\'\' gonger og endra \'\'\'$4\'\'\' gonger
 'watchnologin'	        => 'Ikkje innlogga',
 'watchnologintext'	    => 'Du lyt vera [[Special:Userlogin|innlogga]] for å kunna endre overvakingslista.',
 'addedwatch'	        => 'Lagt til overvakingslista',
-'addedwatchtext'        => 'Sida «$1» er lagt til [[Special:Watchlist|overvakingslista]] di. Framtidige endringar av denne sida og den tilhøyrande diskusjonssida vil bli oppførde her, og sida vil vera \'\'\'utheva\'\'\' i [[Special:Recentchanges|siste endringar]] lista for å gjera deg merksam på henne.
+'addedwatchtext'        => 'Sida «$1» er lagt til [[Special:Watchlist|overvakingslista]] di. Framtidige endringar av denne sida og den tilhøyrande diskusjonssida vil bli oppførde her, og sida vil vera \'\'\'utheva\'\'\' på «[[Special:Recentchanges|siste endringar]]» for å gjera deg merksam på henne.
 
-Om du seinere vil fjerne sida frå overvakingslista, klikk «Fjern overvaking» på den aktuelle sida.',
+Om du seinere vil fjerne sida frå overvakingslista, klikk på «Fjern overvaking» på den aktuelle sida.',
 'removedwatch'	        => 'Fjerna frå overvakingslista',
 'removedwatchtext'      => 'Sida «$1» er fjerna frå overvakingslista.',
 'watch'                 => 'Overvak',
@@ -963,9 +981,9 @@ For hjelp og meir informasjon:
 # Delete/protect/revert
 #
 'deletepage'	        => 'Slett side',
-'confirm'		=> 'Bekreft',
+'confirm'		=> 'Stadfest',
 'excontent'             => 'innhaldet var: «$1»',
-'excontentauthor'       => 'innhaldet var: «$1» (og den einaste bidragsytaren var «$2»)',
+'excontentauthor'       => 'innhaldet var: «$1» (og den einaste bidragsytaren var «[[{{ns:2}}:$2|$2]]»)',
 'exbeforeblank'         => 'innhaldet før sida vart tømd var: «$1»',
 'exblank'               => 'sida var tom',
 'confirmdelete'         => 'Stadfest sletting',
@@ -991,7 +1009,7 @@ For hjelp og meir informasjon:
 Den siste endringa vart gjort av [[{{ns:2}}:$3|$3]] ([[{{ns:3}}:$3|brukardiskusjon]]).',
 # only shown if there is an edit comment
 'editcomment'           => 'Samandraget for endringa var: "<i>$1</i>".',
-'revertpage'	        => 'Attenderulla endring gjort av $2 til tidlegare versjon endra av $1',
+'revertpage'	        => 'Attenderulla endring gjort av [[{{ns:2}}:$2|$2]] til tidlegare versjon endra av [[{{ns:2}}:$1|$1]]',
 'sessionfailure'        => 'Det ser ut til å vera eit problem med innloggingsøkta di. Handlinga er vorten avbroten for å vera føre var mot kidnapping av økta. Bruk attendeknappen i nettlesaren din og prøv om att.',
 'protectlogpage'        => 'Vernelogg',
 'protectlogtext'        => 'Dette er ei liste over sider som er vortne verna eller har fått fjerna vern. Sjå [[{{ns:4}}:Verna side]] for meir info.',
@@ -1013,8 +1031,7 @@ Den siste endringa vart gjort av [[{{ns:2}}:$3|$3]] ([[{{ns:3}}:$3|brukardiskusj
 'undeletepagetext'      => 'Dei følgjande sidene er sletta, men dei finst enno i arkivet og kan attopprettast. Arkivet blir periodevis sletta.',
 'undeletearticle'       => 'Attopprett sletta side',
 'undeleterevisions'     => '$1 versjonar arkiverte',
-'undeletehistory'       => 'Om du attopprettar sida, vil alle versjonane i historikken også bli attoppretta. Dersom ei ny side med same namnet
-er oppretta sidan den gamle sida vart sletta, vil dei attoppretta versjonane dukke opp i historikken, og den nyaste versjonen vil bli verande som han er.',
+'undeletehistory'       => 'Om du attopprettar sida, vil alle versjonane i historikken også bli attoppretta. Dersom ei ny side med same namnet er oppretta sidan den gamle sida vart sletta, vil dei attoppretta versjonane dukke opp i historikken, og den nyaste versjonen vil bli verande som han er.',
 'undeleterevision'      => 'Sletta versjon frå $1',
 'undeletebtn'           => 'Attopprett!',
 'undeletedarticle'      => 'attoppretta «[[$1]]»',
@@ -1030,11 +1047,12 @@ er oppretta sidan den gamle sida vart sletta, vil dei attoppretta versjonane duk
 'contributions'	        => 'Brukarbidrag',
 'mycontris'             => 'Eigne bidrag',
 'contribsub'	        => 'For $1',
-'nocontribs'	        => 'Det vart ikkje funne nokon endringar som passa desse vilkåra.',
+'nocontribs'	        => 'Det vart ikkje funne nokon endringar gjorde av denne brukaren.',
 'ucnote'	        => 'Her er dei siste <b>$1</b> endringane frå denne brukaren dei siste <b>$2</b> dagane.',
 'uclinks'	        => 'Vis dei siste $1 endringane; vis dei siste $2 dagane.',
 'uctop'		        => ' (øvst)' ,
 'newbies'               => 'ferskingar',
+'contribs-showhideminor' => '$1 uviktige endringar',
 
 # What links here
 #
@@ -1051,26 +1069,30 @@ er oppretta sidan den gamle sida vart sletta, vil dei attoppretta versjonane duk
 'blockip'		=> 'Blokker brukar',
 'blockiptext'	        => 'Bruk skjemaet nedanfor for å blokkere skrivetilgangen frå ei spesifikk IP-adresse eller brukarnamn. Dette bør berre gjerast for å hindre hærverk, og i samsvar med [[Project:Retningsliner|retningslinene]]. Skriv grunngjeving nedanfor (t.d. med sitat frå sider som er vortne utsette for hærverk). Opphørstid for blokkeringa skriv ein med GNU standardformat, som er skildra i [http://www.gnu.org/software/tar/manual/html_chapter/tar_7.html tar manualen] (engelsk), t.d. «1 hour», «2 days», «next Wednesday», «1 January 2017». Alternativt kan ei blokkering vera «indefinite» (ikkje fastsett) eller «infinite» (uendeleg).
 
-For informasjon om korleis ein kan blokkere seriar av IP-adresser, sjå [[Help:Blokkere IP-adresse serie|hjelp]]. For å oppheve blokkering, sjå  [[Special:Ipblocklist|blokkeringslista]].',
+For informasjon om korleis ein kan blokkere seriar av IP-adresser, sjå [http://meta.wikimedia.org/wiki/Range_blocks] (engelsk). For å oppheve blokkering, sjå  [[Special:Ipblocklist|blokkeringslista]].',
 'ipaddress'		        => 'IP-adresse',
 'ipadressorusername'    => 'IP-adresse eller brukarnamn',
 'ipbreason'		=> 'Grunngjeving',
 'ipbsubmit'		=> 'Blokker denne brukaren',
+'ipbother'              => 'Anna tid',
+'ipboptions'            => '2 timar:2 hours,1 dag:1 day,3 dagar:3 days,1 veke:1 week,2 veker:2 weeks,1 månad:1 month,3 månader:3 months,6 månader:6 months,1 år:1 year,endelaus:infinite',
+'ipbotheroption'        => 'anna tid',
 'badipaddress'	        => 'IP-adressa var ugyldig eller brukarblokkering er deaktivert på tenaren.',
 'blockipsuccesssub'     => 'Blokkering utført',
-'blockipsuccesstext'    => '«$1» er blokkert.<br />Sjå [[Special:Ipblocklist|blokkeringslista]] for alle blokkeringar.',
+'blockipsuccesstext'    => '«[[User:$1|$1]]» er blokkert.<br />Sjå [[Special:Ipblocklist|blokkeringslista]] for alle blokkeringar.',
 'unblockip'		=> 'Opphev blokkering',
 'unblockiptext'	        => 'Bruk skjemaet nedanfor for å oppheve blokkeringa av ein tidlegare blokkert brukar.',
 'ipusubmit'		=> 'Opphev blokkering',
 'ipusuccess'	        => '«[[$1]]» har fått oppheva blokkeringa',
 'ipblocklist'	        => 'Blokkerte IP-adresser og brukarnamn',
 'blocklistline'	        => '$1, $2 blokkerte $3 ($4)',
-'infiniteblock' => 'opphørstid infinite', //fixme
-'expiringblock' => 'opphørstid $1',
+'infiniteblock'         => 'uendeleg opphørstid',
+'expiringblock'         => '$1 opphørstid',
+'ipblocklistempty'      => 'Blokkeringslista er tom.',
 'blocklink'		=> 'blokker',
 'unblocklink'	        => 'opphev blokkering',
 'contribslink'	        => 'bidrag',
-'autoblocker'	        => 'Automatisk blokkert fordi du deler IP-adresse med [[{{ns:2}}:$1|$1]]. Grunngjeving gjeve for blokkeringa av $2 var: "$2".',
+'autoblocker'	        => 'Automatisk blokkert fordi du deler IP-adresse med [[{{ns:2}}:$1|$1]]. Grunngjeving gjeve for blokkeringa av $1 var: «$2».',
 'blocklogpage'	        => 'Blokkeringslogg',
 'blocklogentry'	        => 'Blokkerte «[[$1]]» med opphørstid $2',
 'blocklogtext'	        => 'Dette er ein logg over blokkeringar og oppheving av blokkeringar gjorde av [[{{ns:4}}:Administratorar|administratorar]].
@@ -1083,7 +1105,10 @@ IP-adresser som blir automatisk blokkerte er ikkje lista her. Sjå [[{{ns:-1}}:I
 'proxyblockreason'	=> 'Du er blokkert frå å endre fordi IP-adressa di tilhøyrer ein open mellomtenar (proxy). Du bør kontakte internettleverandøren din eller kundesørvis og gje dei beskjed, ettersom dette er eit alvorleg sikkerheitsproblem.',
 'proxyblocksuccess'	=> 'Utført.',
 'sorbs'         => 'SORBS DNSBL',
-'sorbsreason'   => '[[IP]]-adressa di er lista som ein open [[mellomtenar]] i [[SORBS DNSBL]] [http://www.sorbs.net].',
+'sorbsreason'   => 'IP-adressa di er lista som ein open mellomtenar i [http://www.sorbs.net SORBS DNSBL].
+
+Dersom du er feilaktig blokkert kan http://www.sorbs.net/faq/retest.shtml vera til hjelp for å få IP-adressa di fjerna frå svartelista.',
+'sorbs_create_account_reason' => 'IP-adressa di er lista som ein open mellomtenar i [http://www.sorbs.net SORBS] DNSBL, og difor får du ikkje registrert deg.',
 
 # Developer tools
 #
@@ -1190,7 +1215,7 @@ I desse falla lyt du flytte eller flette saman sida manuelt. Om det ikkje er mog
 'pagemovedsub'	        => 'Flyttinga er gjennomført',
 'pagemovedtext'         => 'Sida «[[$1]]» er flytt til «[[$2]]».',
 'articleexists'         => 'Ei side med det namnet finst allereie, eller det namnet du har valt er ikkje gyldig. Vel eit anna namn.',
-'talkexists'	        => 'Innhaldssida vart flytt, men diskusjonssida som høyrer til kunne ikkje flyttast fordi det allereie finst ei side med den nye tittelen. Du lyt flette dei saman manuelt. Dersom det ikkje er mogleg for deg å gjera dette kan du kontakte ein <a href="{{localurl:Project:Administratorar}}">administrator</a> &#8212; men <b>ikkje</b> bruk klipp-og-lim metoden sidan dette ikkje tek vare på endringshistorikken.',
+'talkexists'	        => '\'\'\'Innhaldssida vart flytt, men diskusjonssida som høyrer til kunne ikkje flyttast fordi det allereie finst ei side med den nye tittelen. Du lyt flette dei saman manuelt. Dersom det ikkje er mogleg for deg å gjera dette kan du kontakte ein <a href="{{localurl:Project:Administratorar}}">administrator</a> &#8212; men <b>ikkje</b> bruk klipp-og-lim metoden sidan dette ikkje tek vare på endringshistorikken.\'\'\'',
 'movedto'		=> 'er flytt til',
 'movetalk'		=> 'Flytt diskusjonssida òg om ho finst.',
 'talkpagemoved'         => 'Diskusjonssida som høyrer til vart òg flytt.',
@@ -1211,7 +1236,7 @@ Målsida «[[$1]]» finst allereie. Vil du slette ho for å gje rom for flytting
 
 # Export
 'export'		=> 'Eksporter sider',
-'exporttext'	        => 'Du kan eksportere teksten og redigeringshistorikken til ei side eller ein serie sider, pakka inn i litt XML. I framtida kan det hende at dette att kan bli importert til ei anna wiki som brukar MediaWiki-programvaren, men det er det ikkje støtte for dette i denne versjonen av MediaWiki.
+'exporttext'	        => 'Du kan eksportere teksten og endringshistorikken til ei side eller ein serie sider, pakka inn i litt XML. I framtida kan det hende at dette att kan bli importert til ei anna wiki som brukar MediaWiki-programvaren, men det er det ikkje støtte for dette i denne versjonen av MediaWiki.
 
 For å eksportere sider, skriv tittelen i tekstboksen nedanfor, ein tittel per line, og vel om du vil ha med alle versjonane eller berre siste versjon.
 
@@ -1219,11 +1244,11 @@ Dersom du berre vil ha den siste versjonen kan du òg bruke ei lenkje, t.d. [[{{
 'exportcuronly'	        => 'Berre eksporter siste versjonen, ikkje med heile historikken.',
 
 # Namespace 8 related
-'allmessages'	        => 'Alle systemmeldingar',
+'allmessages'	        => 'Systemmeldingar',
 'allmessagesname' => 'Namn',
 'allmessagesdefault' => 'Standardtekst',
 'allmessagescurrent' => 'Noverande tekst',
-'allmessagestext'	=> 'Dette er ei liste over alle systemmeldingar som er tilgjengelege i MediaWiki-namnerommet.',
+'allmessagestext'	=> 'Dette er ei liste over systemmeldingar i MediaWiki-namnerommet.',
 'allmessagesnotsupportedUI' => 'Det gjeldande språket for grensesnittet <b>$1</b>, støttar ikkje {{ns:-1}}:Allmessages.',
 'allmessagesnotsupportedDB' => '{{ns:-1}}:Allmessages er ikkje støtta fordi "wgUseDatabaseMessages" ikkje er aktivert på tenaren.',
 
@@ -1252,7 +1277,7 @@ For å eksportere bruker du [[{{ns:-1}}:Export|eksportsida]] på kjeldewikien; h
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for some actions, most are in Monobook.js
-'tooltip-search'        => 'Søk i denne wikien [alt-f]',
+'tooltip-search'        => 'Søk i {{SITENAME}} [alt-f]',
 'tooltip-minoredit'     => 'Merk dette som ei uviktig endring [alt-i]',
 'tooltip-save'          => 'Lagre endringane dine [alt-s]',
 'tooltip-preview'       => 'Førehandsvis endringane dine, bruk denne funksjonen før du lagrar! [alt-p]',
@@ -1268,7 +1293,7 @@ For å eksportere bruker du [[{{ns:-1}}:Export|eksportsida]] på kjeldewikien; h
 # Attribution
 'anonymous'             => 'Anonym(e) brukar(ar) av {{SITENAME}}',
 'siteuser'              => '{{SITENAME}} brukar $1',
-'lastmodifiedby'        => 'Denne sida vart sist redigert $1 av $2.',
+'lastmodifiedby'        => 'Denne sida vart sist endra $1 av $2.',
 'and'                   => 'og',
 'othercontribs'         => 'Basert på arbeid av $1.',
 'others'                => 'andre',
@@ -1321,7 +1346,7 @@ Skriv "0" som første bokstav for å slå av den nye kategoriutsjånaden.',
 /* verktøytips og snøggtastar */
 ta = new Object();
 ta[\'pt-userpage\']             = new Array(\'.\',\'Brukarsida mi\');
-ta[\'pt-anonuserpage\']         = new Array(\'.\',\'Brukarsida for ip-adressa du redigerer under\');
+ta[\'pt-anonuserpage\']         = new Array(\'.\',\'Brukarsida for ip-adressa du endrar under\');
 ta[\'pt-mytalk\']               = new Array(\'n\',\'Diskusjonssida mi\');
 ta[\'pt-anontalk\']             = new Array(\'n\',\'Diskusjon om endringar gjorde av denne ip-adressa\');
 ta[\'pt-preferences\']          = new Array(\'\',\'Innstillingane mine\');
@@ -1402,7 +1427,7 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 # Exif tags
 'exif-imagewidth'      => 'Breidd',
 'exif-imagelength'     => 'Høgd',
-'exif-bitspersample'   => 'Bit per komponent',
+'exif-bitspersample'   => 'Bitar per komponent',
 'exif-compression'     => 'Komprimeringsteknikk',
 'exif-photometricinterpretation' => 'Pikselsamansetjing',
 'exif-orientation'     => 'Retning',
@@ -1423,6 +1448,7 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 'exif-copyright'       => 'Opphavsrettsleg eigar',
 'exif-exifversion'     => 'Exif-versjon',
 'exif-flashpixversion' => 'Støtta Flashpix versjon',
+'exif-colorspace'      => 'Fargerom',
 'exif-pixelydimension'  => 'Gyldig biletbreidd',
 'exif-pixelxdimension'  => 'Gyldig bilethøgd',
 'exif-makernote'        => 'Produsentnotat',
@@ -1438,16 +1464,17 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 'exif-exposureprogram'  => 'Eksponeringsprogram',
 'exif-isospeedratings'  => 'Lysfølsemd (ISO)',
 'exif-shutterspeedvalue' => 'Lukkarfart',
-'exif-aperturevalue'    => 'Blendaropning',
+'exif-aperturevalue'    => 'Blendartal',
 'exif-brightnessvalue'  => 'Lysstyrke',
 'exif-exposurebiasvalue' => 'Exposure bias',
 'exif-subjectdistance'  => 'Motivavstand',
-'exif-meteringmode'     => 'Målemodus',
+'exif-meteringmode'     => 'Lysmålarmodus',
 'exif-lightsource'      => 'Lyskjelde',
 'exif-flash'            => 'Blits',
 'exif-focallength'      => 'Linsefokallengd',
 'exif-subjectarea'      => 'Motivområde',
-'exif-flashenergy'      => 'Blitsenergi',
+'exif-flashenergy'      => 'Blitsstyrke',
+'exif-focalplaneresolutionunit' => 'Oppløysingseining for fokalplanet',
 'exif-subjectlocation'  => 'Motivplassering',
 'exif-exposureindex'    => 'Eksponeringsindeks',
 'exif-sensingmethod'    => 'Sensor',
@@ -1519,6 +1546,8 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 'exif-exposureprogram-7' => 'Portrettmodus (for nærbilete med uskarp bakgrunn)',
 'exif-exposureprogram-8' => 'Landskapsmodus (for landskapsbilete med skarp bakgrunn)',
 
+'exif-subjectdistance-value' => '$1 meter',
+
 'exif-meteringmode-0' => 'Ukjent',
 'exif-meteringmode-1' => 'Snittmåling',
 'exif-meteringmode-2' => 'Snittmåling med vekt på midten',
@@ -1544,6 +1573,8 @@ ta[\'ca-nstab-category\']       = new Array(\'c\',\'Vis kategoriside\');
 'exif-lightsource-19' => 'Standardlys C',
 'exif-lightsource-255' => 'Anna lyskjelde',
 
+'exif-focalplaneresolutionunit-2' => 'tommar',
+
 'exif-sensingmethod-1' => 'Ikkje bestemt',
 'exif-sensingmethod-2' => 'Einbrikka fargeområdesensor',
 'exif-sensingmethod-3' => 'Tobrikka fargeområdesensor',
@@ -1641,7 +1672,31 @@ funksjonar tilknytt e-post på {{SITENAME}} må du opne denne lenkja i nettlesar
 $3
 
 Dersom dette *ikkje* er deg, må du ikkje opne lenkja. Denne stadfestingskoden
-blir forelda $4.'
+blir forelda $4.',
+
+# Inputbox extension, may be useful in other contexts as well
+'tryexact'               => 'Prøv nøyaktig treff',
+'searchfulltext'         => 'Søk i all tekst',
+'createarticle'          => 'Lag side',
+
+# Scary transclusion
+'scarytranscludedisabled' => '[Interwiki transcluding is disabled]',
+'scarytranscludefailed'   => '[Henting av mal for $1 gjekk ikkje, beklagar]',
+'scarytranscludetoolong'  => '[Nettadressa er for lang, beklagar]',
+
+# Trackbacks
+'trackbackbox'           => "<div id='mw_trackbacks'>
+Attendelenkjer for denne sida:<br />
+$1
+</div>
+",
+'trackback' => "; $4$5 : [$2 $1]\n",
+'trackbackexcerpt' => "; $4$5 : [$2 $1]: <nowiki>$3</nowiki>\n",
+'trackbackremove' => ' ([$1 Slett])',
+'trackbacklink' => 'Attendelenkje',
+'trackbackdeleteok' => 'Attendelenkja vart sletta.',
+
+'unit-pixel' => 'px',
 
 );
 
-- 
cgit v1.2.3


From d3ea344d87fc7bee6047c85d97aa57630808dcc7 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 23 Aug 2005 21:48:07 +0000
Subject: fix 3175

---
 docs/design.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/design.txt b/docs/design.txt
index 2b0bf4cb32fb..5fff9fd0ff6a 100644
--- a/docs/design.txt
+++ b/docs/design.txt
@@ -22,7 +22,7 @@ Primary source files/objects:
     Can be queried for things like the user's settings, name, etc.
     Handles the details of getting and saving to the "user" table
     of the database, and dealing with sessions and cookies.
-    More details in USER.DOC.
+    More details in USER.TXT.
 
   OutputPage
     Encapsulates the entire HTML page that will be sent in
@@ -64,7 +64,7 @@ Primary source files/objects:
     A global one is allocated in $wgLang.
 
   LinkCache
-    Keeps information on existence of articles. See LINKCACHE.DOC.
+    Keeps information on existence of articles. See LINKCACHE.TXT.
 
 Naming/coding conventions:
 
-- 
cgit v1.2.3


From 0c3bbb9120d99e3c697ceba815b5ae6b27befb19 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 23 Aug 2005 22:07:16 +0000
Subject: Fix #3192: properly check 'limit' parameter on Special:Contributions

---
 RELEASE-NOTES                     | 1 +
 includes/SpecialContributions.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 71b74d974d4c..0e9b11fde0be 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -668,6 +668,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3210) Fix Media: links with remote image URL path
 * (bug 3220) Fix escaping of block URLs in Recentchanges
 * (bug 3238): Updated LanguageNn.php for 1_5 branch
+* (bug 3192): properly check 'limit' parameter on Special:Contributions
 
 === Caveats ===
 
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 0e552850480e..c15a8f1a8958 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -169,7 +169,7 @@ function wfSpecialContributions( $par = null ) {
 	}
 	$nt =& Title::makeTitle(NS_USER, $nt->getDBkey());
 
-	$limit = min($wgRequest->getInt('limit', 50), 500);
+	list( $limit, $offset) = wfCheckLimits();
 	$offset = $wgRequest->getVal('offset');
 	/* Offset must be an integral. */
 	if (!strlen($offset) || !preg_match("/^[0-9]+$/", $offset))
-- 
cgit v1.2.3


From c25cb59e30a70b72e2f2423d5379f34252595e40 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 23 Aug 2005 22:17:02 +0000
Subject: Bump to 1.5rc1 * (bug 3244) Fix remote image loading hack, JavaScript
 injection on MSIE * Fix URL sanitization in HTML attributes, which broke in
 this branch

---
 RELEASE-NOTES                | 20 ++++++++++++++++++++
 includes/DefaultSettings.php |  2 +-
 includes/Parser.php          | 17 ++++++++++++++++-
 includes/Sanitizer.php       | 19 ++++++++++++++++---
 maintenance/parserTests.txt  | 18 ++++++++++++++++++
 5 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0e9b11fde0be..0dbb7834a030 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,23 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5 release candidate 1 ==
+
+August 23, 2005
+
+MediaWiki 1.5rc1 is a preview release of the new 1.5 release series.
+Numerous bug fixes since last beta, plus a security fix; see change
+log below for full details.
+
+A flaw in the interaction between extensions and HTML attribute
+sanitization was discovered which could allow unauthorized use
+of offsite resources in style sheets, and possible exploitation
+of a JavaScript injection feature on Microsoft Internet Explorer.
+
+This version expands the returned text and properly checks it
+before output.
+
+
 == MediaWiki 1.5 beta 4 ==
 
 July 30, 2005
@@ -669,6 +686,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3220) Fix escaping of block URLs in Recentchanges
 * (bug 3238): Updated LanguageNn.php for 1_5 branch
 * (bug 3192): properly check 'limit' parameter on Special:Contributions
+* (bug 3244) Fix remote image loading hack, JavaScript injection on MSIE
+* Fix URL sanitization in HTML attributes, which broke in this branch
+
 
 === Caveats ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 1b95381bd4f7..f6f263911bbb 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5beta4';
+$wgVersion			= '1.5rc1';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
diff --git a/includes/Parser.php b/includes/Parser.php
index 80224f73cff0..8b5c8697f1f6 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -757,7 +757,7 @@ class Parser
 		$text = strtr( $text, array( '<noinclude>' => '', '</noinclude>' => '') );
 		$text = preg_replace( '/<includeonly>.*?<\/includeonly>/s', '', $text );
 
-		$text = Sanitizer::removeHTMLtags( $text, array( &$this, 'replaceVariables' ) );
+		$text = Sanitizer::removeHTMLtags( $text, array( &$this, 'attributeStripCallback' ) );
 		$text = $this->replaceVariables( $text, $args );
 
 		$text = preg_replace( '/(^|\n)-----*/', '\\1<hr />', $text );
@@ -3304,6 +3304,21 @@ class Parser
 	function disableCache() {
 		$this->mOutput->mCacheTime = -1;
 	}
+	
+	/**
+	 * Callback from the Sanitizer for expanding items found in HTML attribute
+	 * values, so they can be safely tested and escaped.
+	 * @param string $text
+	 * @param array $args
+	 * @return string
+	 * @access private
+	 */
+	function attributeStripCallback( &$text, $args ) {
+		$text = $this->replaceVariables( $text, $args );
+		$text = $this->unstrip( $text, $this->mStripState );
+		$text = $this->unstripNoWiki( $text, $this->mStripState );
+		return $text;
+	}
 }
 
 /**
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index b9b3b50212ac..04ca272e546f 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -571,9 +571,12 @@ class Sanitizer {
 				'RFC'  => '&#82;FC',
 				'PMID' => '&#80;MID',
 			) );
-			$value = preg_replace(
-				'/(' . $wgUrlProtocols . '):/',
-				'\\1&#58;', $value );
+			
+			# Stupid hack
+			$value = preg_replace_callback(
+				'/(' . $wgUrlProtocols . ')/',
+				array( 'Sanitizer', 'armorLinksCallback' ),
+				$value );
 			
 			// If this attribute was previously set, override it.
 			// Output should only have one attribute of each name.
@@ -586,6 +589,16 @@ class Sanitizer {
 		}
 	}
 	
+	/**
+	 * Regex replace callback for armoring links against further processing.
+	 * @param array $matches
+	 * @return string
+	 * @access private
+	 */
+	function armorLinksCallback( $matches ) {
+		return str_replace( ':', '&#58;', $matches[1] );
+	}
+	
 	/**
 	 * Return an associative array of attribute names and values from
 	 * a partial tag string. Attribute names are forces to lowercase,
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 3c18bf5dc2d6..22c6158ea27c 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -2579,6 +2579,24 @@ Bug 2304: HTML attribute safety (named web link)
 
 !! end
 
+!! test
+Bug 3244: HTML attribute safety (extension; safe)
+!! input
+<div style="<nowiki>background:blue</nowiki>"></div>
+!! result
+<div style="background:blue"></div>
+
+!! end
+
+!! test
+Bug 3244: HTML attribute safety (extension; unsafe)
+!! input
+<div style="<nowiki>border-left:expression(alert(document.cookie))</nowiki>"></div>
+!! result
+<div></div>
+
+!! end
+
 
 TODO:
 more images
-- 
cgit v1.2.3


From 924f7a32668c2c6000ef263cb31422b3441f86de Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 24 Aug 2005 03:11:29 +0000
Subject: Bump 1.5rc2; rc1 tarball was mistakenly pulled from CVS HEAD

---
 RELEASE-NOTES                | 8 ++++++--
 includes/DefaultSettings.php | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0dbb7834a030..44e9d34fe0ad 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,11 +3,11 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
-== MediaWiki 1.5 release candidate 1 ==
+== MediaWiki 1.5 release candidate 2 ==
 
 August 23, 2005
 
-MediaWiki 1.5rc1 is a preview release of the new 1.5 release series.
+MediaWiki 1.5rc2 is a preview release of the new 1.5 release series.
 Numerous bug fixes since last beta, plus a security fix; see change
 log below for full details.
 
@@ -19,6 +19,10 @@ of a JavaScript injection feature on Microsoft Internet Explorer.
 This version expands the returned text and properly checks it
 before output.
 
+A 1.5rc1 release was mistakenly made from the incorrect source code
+branch; 1.5rc2 is identical to the actual 1.5rc1 in revision control
+except for version number.
+
 
 == MediaWiki 1.5 beta 4 ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f6f263911bbb..d374759d193d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5rc1';
+$wgVersion			= '1.5rc2';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From 858ba19a8554e594687f3da1fe6594f83a5fc276 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 24 Aug 2005 07:23:22 +0000
Subject: * Fix upgrade from 1.4 due to version number check breakage * Fix
 upgrade from 1.4 with no old revisions version_compare() fails comparing
 'alpha' to 'rc'; it understands only 'RC'. Changes to check for Revision
 class in the updater scripts designed for 1.4/1.5 dual-mode operation.

---
 RELEASE-NOTES                  | 6 ++++++
 maintenance/namespaceDupes.php | 3 +--
 maintenance/updaters.inc       | 2 +-
 maintenance/userDupes.inc      | 3 +--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 44e9d34fe0ad..9d908f701226 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -694,6 +694,12 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix URL sanitization in HTML attributes, which broke in this branch
 
 
+=== Changes since 1.5rc2 ===
+
+* Fix upgrade from 1.4 due to version number check breakage
+* Fix upgrade from 1.4 with no old revisions
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index ccbdd52d6c93..35d325cf6194 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -141,8 +141,7 @@ class NamespaceConflictChecker {
 	}
 	
 	function newSchema() {
-		global $wgVersion;
-		return version_compare( $wgVersion, '1.5alpha', 'ge' );
+		return class_exists( 'Revision' );
 	}
 }
 
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index c2034ce9a99b..bf1dc7bdc9b3 100644
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -361,7 +361,7 @@ function do_schema_restructuring() {
 		echo "......Locking tables.\n";
 		$wgDatabase->query( "LOCK TABLES $page WRITE, $revision WRITE, $old WRITE, $cur WRITE", $fname );
 
-		$maxold = $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname );
+		$maxold = intval( $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname ) );
 		echo wfTimestamp();
 		echo "......maxold is {$maxold}\n";
 
diff --git a/maintenance/userDupes.inc b/maintenance/userDupes.inc
index 10704dff016b..377d1bccbc05 100644
--- a/maintenance/userDupes.inc
+++ b/maintenance/userDupes.inc
@@ -160,8 +160,7 @@ class UserDupes {
 	 * @access private
 	 */
 	function newSchema() {
-		global $wgVersion;
-		return version_compare( $wgVersion, '1.5alpha', 'ge' );
+		return class_exists( 'Revision' );
 	}
 	
 	/**
-- 
cgit v1.2.3


From edcfdb522cec608d45daced2f07a647abe5c21a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Wed, 24 Aug 2005 15:36:55 +0000
Subject: + $wgMagicWordsEn;

---
 languages/LanguageNn.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/languages/LanguageNn.php b/languages/LanguageNn.php
index 27f33414b127..6ef8dbefc1f3 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -82,7 +82,6 @@ if($wgMetaNamespace === FALSE)
 	MAG_FORCETOC             => array( 0,    '__FORCETOC__', '__ALLTIDINNHALDSLISTE__', '__ALLTIDINNHOLDSLISTE__'   ),
 	MAG_TOC                  => array( 0,    '__TOC__', '__INNHALDSLISTE__', '__INNHOLDSLISTE__'                    ),
 	MAG_NOEDITSECTION        => array( 0,    '__NOEDITSECTION__', '__INGABOLKENDRING__', '__INGABOLKREDIGERING__', '__INGENDELENDRING__'),
-	MAG_START                => array( 0,    '__START__'                                                            ),
 	MAG_CURRENTMONTH         => array( 1,    'CURRENTMONTH', 'MÅNADNO', 'MÅNEDNÅ'                                   ),
 	MAG_CURRENTMONTHNAME     => array( 1,    'CURRENTMONTHNAME', 'MÅNADNONAMN', 'MÅNEDNÅNAVN'                       ),
 	MAG_CURRENTMONTHABBREV   => array( 1,    'CURRENTMONTHABBREV', 'MÅNADNOKORT', 'MÅNEDNÅKORT'                     ),
@@ -95,7 +94,6 @@ if($wgMetaNamespace === FALSE)
 	MAG_PAGENAME             => array( 1,    'PAGENAME', 'SIDENAMN', 'SIDENAVN'                                     ),
 	MAG_PAGENAMEE            => array( 1,    'PAGENAMEE', 'SIDENAMNE', 'SIDENAVNE'                                  ),
 	MAG_NAMESPACE            => array( 1,    'NAMESPACE', 'NAMNEROM', 'NAVNEROM'                                    ),
-	MAG_MSG                  => array( 0,    'MSG:'                                                                 ),
 	MAG_SUBST                => array( 0,    'SUBST:', 'LIMINN:'                                                    ),
 	MAG_MSGNW                => array( 0,    'MSGNW:', 'IKWIKMELD:'                                                 ),
 	MAG_END                  => array( 0,    '__END__', '__SLUTT__'                                                 ),
@@ -106,7 +104,6 @@ if($wgMetaNamespace === FALSE)
 	MAG_IMG_WIDTH            => array( 1,    '$1px', '$1pk'                                                         ),
 	MAG_IMG_CENTER           => array( 1,    'center', 'centre', 'sentrum'                                          ),
 	MAG_IMG_FRAMED           => array( 1,    'framed', 'enframed', 'frame', 'ramme'                                 ),
-	MAG_INT                  => array( 0,    'INT:'                                                                 ),
 	MAG_SITENAME             => array( 1,    'SITENAME', 'NETTSTADNAMN'                                             ),
 	MAG_NS                   => array( 0,    'NS:', 'NR:'                                                           ),
 	MAG_LOCALURL             => array( 0,    'LOCALURL:', 'LOKALLENKJE:', 'LOKALLENKE:'                             ),
@@ -120,7 +117,8 @@ if($wgMetaNamespace === FALSE)
 	MAG_CURRENTWEEK          => array( 1,    'CURRENTWEEK', 'VEKENRNO', 'UKENRNÅ'                                   ),
 	MAG_CURRENTDOW           => array( 1,    'CURRENTDOW', 'VEKEDAGNRNO', 'UKEDAGNRNÅ'                              ),
 	MAG_REVISIONID           => array( 1,    'REVISIONID', 'VERSJONSID'                                             )
-);
+) + $wgMagicWordsEn;
+
 
 #-------------------------------------------------------------------
 # Default messages
-- 
cgit v1.2.3


From fbdfc8dc683822bf5bc3afc005d6735b2c594fbc Mon Sep 17 00:00:00 2001
From: Alexander Sigachov <ajvol@users.mediawiki.org>
Date: Wed, 24 Aug 2005 22:23:57 +0000
Subject: To language.php 1.633.2.8

---
 languages/LanguageRu.php | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 90baced485f5..9a1b4947c331 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -1,7 +1,7 @@
 <?php
 /** Russian (русский язык)
   *
-  * Based on Language.php 1.633.2.4
+  * Based on Language.php 1.633.2.8
   *
   * @package MediaWiki
   * @subpackage Language
@@ -202,6 +202,7 @@ if($wgMetaNamespace === FALSE)
 'article' => 'Статья',
 'help'                  => 'Справка',
 'helppage'            => '{{ns:project}}:Справка',
+'wikititlesuffix' => '{{SITENAME}}',
 'bugreports'  => 'Отчёт об ошибке',
 'bugreportspage' => '{{ns:project}}:Отчёт об ошибке',
 'sitesupport'   => 'Пожертвования', # To enable, something like 'Donations', '-' to disable
@@ -243,6 +244,7 @@ if($wgMetaNamespace === FALSE)
 'go'            => 'Перейти',
 "history"             => 'История',
 'history_short' => 'История',
+'updatedmarker' => 'Обновлено с моего последнего посещения',
 'info_short'    => 'Информация',
 'printableversion' => 'Версия для печати',
 'print' => 'Печать',
@@ -308,6 +310,7 @@ if($wgMetaNamespace === FALSE)
 'showtoc' => 'показать',
 'hidetoc' => 'убрать',
 'thisisdeleted' => "Просмотреть или восстановить $1?",
+'viewdeleted' => 'Просмотреть $1?',
 'restorelink1' => 'одно удаление',
 'restorelink' => "$1 удаление(й)",
 'feedlinks' => 'В виде:',
@@ -508,7 +511,8 @@ $1",
 'whitelistacctitle' => 'У вас нет прав чтобы создать учётную запись',
 'whitelistacctext' => 'Для того чтобы иметь возможность создавать учётные записи в этой вики вы должны [[Special:Userlogin|зарегистрироваться]] и иметь соответствующие права.',
 'loginreqtitle' => 'Требуется авторизация',
-'loginreqtext'  => 'Вы должны [[{{ns:special}}:Userlogin|представиться системе]] для того чтобы просматривать остальные страницы.',
+'loginreqlink' => 'представиться системе',
+'loginreqpagetext'  => 'Вы должны $1 для того чтобы просматривать остальные страницы.',
 'accmailtitle' => 'Пароль выслан.',
 'accmailtext' => "Пароль для '$1' выслан на $2.",
 'newarticle'    => '(Новая)',
@@ -520,7 +524,7 @@ $1",
 'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
 'anontalkpagetext' => "---- ''Эта страница обсуждения принадлежит анонимному участнику, который ещё не зарегистрировался или который не представился регистрированным именем. Для его идентификации используется цифоровой [[IP-адрес]]. Если Вы — анонимный участник и полагаете, что получили сообщения, адресованные не Вам (один IP-адрес может использоваться несколькими участниками), [[Служебная:Userlogin|представьтесь системе]], чтобы впредь избежать возможной путаницы с другими анонимными участниками.''",
 'noarticletext' => '(Сейчас на этой странице нет текста)',
-'clearyourcache' => "'''Замечание:''' Чтобы после сохранения увидеть сделанные изменения, очистите кэш своего браузера: '''Mozilla / Firefox:''' ''Ctrl+Shift+R'', '''IE:''' ''Ctrl+F5'', '''Safari:''' ''Cmd+Shift+R'', '''Konqueror''' ''F5''.",
+'clearyourcache' => "'''Замечание:''' Чтобы после сохранения увидеть сделанные изменения, очистите кэш своего браузера: '''Mozilla / Firefox''': ''Ctrl+Shift+R'', '''IE:''' ''Ctrl+F5'', '''Safari''': ''Cmd+Shift+R'', '''Konqueror''': ''F5'', '''Opera''': очистить кеш через меню ''Tools→Preferences''.",
 'usercssjsyoucanpreview' => "<strong>Подсказка:</strong> Используйте кнопку предварительного просмотра чтобы протестировать ваш новый css-файл или js-файл перед сохранением.",
 'usercsspreview' => "'''Помните что это только предварительный просмотр вашего css-файла, он ещё не сохранён!'''",
 'userjspreview' => "'''Помните что это только предварительный просмотр вашего javascrpt-файла, он ещё не сохранён!'''",
@@ -544,7 +548,7 @@ $1",
 Если вы не хотите, чтобы ваши тексты свободно распространялись и редактировались,
 не помещайте их сюда.<br />
 Вы также подтверждаете, что являетесь автором вносимых дополнений, или скопировали их из
-источника допускающего свободное распространение и изменение своего содержимого.<br />
+источника, допускающего свободное распространение и изменение своего содержимого.<br />
 <strong>НЕ РАЗМЕЩАЙТЕ БЕЗ РАЗРЕШЕНИЯ ОХРАНЯЕМЫЕ АВТОРСКИМ ПРАВОМ МАТЕРИАЛЫ!</strong>",
 'copyrightwarning2' => "Пожалуйста, обратите внимание, что все ваши добавления
 могут быть отредактированы или удалены другими участниками.
@@ -633,11 +637,8 @@ $2 — Показывать перенаправления &nbsp; Искать $
     <input type="hidden" name="oe" value="$2" />
 
     <input type="text" name="q" size="31" maxlength="255" value="$1" />
-    <input type="submit" name="btnG" value="$3" />
-  <div>
-    <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label>
-    <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label>
-  </div>
+    <input type="submit" name="btnG" value="Поиск по сайту с помощью Google" />
+    <input type="hidden" name="sitesearch" value="{{SERVER}}" />
 </form>
 
 <form name="web" method="get" action="http://www.yandex.ru/yandsearch">
@@ -648,7 +649,7 @@ $2 — Показывать перенаправления &nbsp; Искать $
   <input type="hidden" name="referrer2" value="{{SITENAME}} (русская версия)" />
 
   <input type="text" name="text" size="31" maxlength="255" value="$1" />
-  <input type="submit" value="Поиск по сайту" />
+  <input type="submit" value="Поиск по сайту с помощью Яндекса" />
 </form>',
 'blanknamespace' => 'Статьи',
 
@@ -872,9 +873,11 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'linkstoimage'  => 'Следующие страницы ссылаются на данный файл:',
 'nolinkstoimage' => 'Нет страниц, ссылающихся на данный файл.',
 'sharedupload' => "Этот файл взят из [[Commons:Заглавная_страница|Викихранилища]] (WikiCommons), репозитория изображений и других свободно распространяемых медиа-файлов, общего для всех проектов [[Фонд Викимедиа|Фонда Викимедиа]]. См. '''[[Commons:Image:{{PAGENAME}}|страницу описания]]''', где находится описание изображения, в том числе и лицензия на него.",
-'shareduploadwiki' => 'Смотри [$1 страницу описания файла] для объяснений.',
+'shareduploadwiki' => 'Дополнительную информацию можно найти на $1.',
+'shareduploadwiki-linktext' => 'странице описания файла',
 'shareddescriptionfollows' => '-',
-'noimage'       => "Файла с таким именем не существует. вы можете [$1 загрузить его].",
+'noimage'       => "Файла с таким именем не существует. вы можете $1.",
+'noimage-linktext'       => 'загрузить его',
 'uploadnewversion' => "[$1 Загрузить новую версию этого изображения]",
 
 # Statistics
@@ -1131,8 +1134,9 @@ $NEWPAGE
 'unprotectcomment' => 'Причина снятия защиты',
 
 # Undelete
-'undelete' => 'Восстановить стёртую страницу',
+'undelete' => 'Просмотреть стёртые страницы',
 'undeletepage' => 'Просмотреть и восстановить стёртые страницы',
+'viewdeletedpage' => 'Просмотреть стёртые страницы',
 'undeletepagetext' => 'Следующие страницы были стёрты, но всё ещё находятся в архиве и поэтому могут быть восстановлены. Архив периодически очищается.',
 'undeletearticle' => 'Восстановить стёртую статью',
 'undeleterevisions' => "В архиве $1 версий",
@@ -1253,7 +1257,7 @@ IP-адреса.',
 'setstewardflag'    => 'Установить флаг «Стюард»',
 'bureaucratlog'         => 'Журнал_бюрократа',
 'rightslogtext'         => 'Это журнал изменений прав пользователя.',
-'bureaucratlogentry'    => "Пользователь $1 переведён из группы «$2» в группу «$3»",
+'bureaucratlogentry'    => "Для участника $1 изменены права доступа:",
 'rights'                        => 'Права:',
 'set_user_rights'       => 'Установить права пользователя',
 'user_rights_set'       => "<strong>Права пользователя $1 обновлены</strong></strong>",
@@ -1886,6 +1890,15 @@ $1
 'trackbacklink' => 'Trackback',
 'trackbackdeleteok' => 'Trackback был удалён.',
 
+# delete conflict
+
+'deletedwhileediting' => 'Внимание: пока вы редактировали эту страницу она была удалена!',
+'confirmrecreate' => 'Участник [[User:$1|$1]] ([[User talk:$1|обсуждение]]) удалил эту статью после того, как вы начали её редактировать, причина удаления:
+: \'\'$2\'\'
+Пожалуйста подтвердите, что вы хотите создать статью заново.',
+'recreate' => 'Создать заново',
+'tooltip-recreate' => '',
+
 'unit-pixel' => 'пкс',
 );
 
-- 
cgit v1.2.3


From 36f9f1173bce8971bc3a2d559951fd7bc2f4c1ef Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 25 Aug 2005 00:45:45 +0000
Subject: BACKPORT FROM HEAD: Fix #2108: Sort entries when using category
 browser

---
 RELEASE-NOTES     |  2 +-
 includes/Skin.php | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9d908f701226..f54df93e22b3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -698,7 +698,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * Fix upgrade from 1.4 due to version number check breakage
 * Fix upgrade from 1.4 with no old revisions
-
+* (bug 2108) Sort entries when using category browser
 
 === Caveats ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index e84c72777a71..a84b3f3c6962 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -436,22 +436,30 @@ END;
 
 			# get a big array of the parents tree
 			$parenttree = $wgTitle->getParentCategoryTree();
-
 			# Skin object passed by reference cause it can not be
-			# accessed under the method subfunction walkThrough.
-			$s .= Skin::drawCategoryBrowser($parenttree, $this);
+			# accessed under the method subfunction drawCategoryBrowser
+			$tempout = explode("\n", Skin::drawCategoryBrowser($parenttree, $this) );
+			# Clean out bogus first entry and sort them
+			unset($tempout[0]);
+			asort($tempout);
+			# Output one per line
+			$s .= implode("<br />\n", $tempout);
 		}
 
 		return $s;
 	}
 
-	# Render the array as a serie of links
-	function drawCategoryBrowser ($tree, &$skin) {
+	/** Render the array as a serie of links.
+	 * @param array $tree Categories tree returned by Title::getParentCategoryTree
+	 * @param object &skin Skin passed by reference
+	 * @return string separated by &gt;, terminate with "\n"
+	 */
+	function drawCategoryBrowser($tree, &$skin) {
 		$return = '';
 		foreach ($tree as $element => $parent) {
 			if (empty($parent)) {
 				# element start a new list
-				$return .= '<br />';
+				$return .= "\n";
 			} else {
 				# grab the others elements
 				$return .= Skin::drawCategoryBrowser($parent, $skin) . ' &gt; ';
-- 
cgit v1.2.3


From b96ae5febe79e727b7735b923cdfb6695fade5e3 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 25 Aug 2005 03:41:47 +0000
Subject: XSS issue : now sanitize search query input

---
 RELEASE-NOTES              | 1 +
 includes/SpecialSearch.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f54df93e22b3..26fdfad983ab 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -699,6 +699,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix upgrade from 1.4 due to version number check breakage
 * Fix upgrade from 1.4 with no old revisions
 * (bug 2108) Sort entries when using category browser
+* XSS issue : now sanitize search query input
 
 === Caveats ===
 
diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 87174832d05c..0a6e17f7704d 100644
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -35,7 +35,7 @@ require_once( 'Revision.php' );
 function wfSpecialSearch( $par = '' ) {
 	global $wgRequest, $wgUser;
 	
-	$search = $wgRequest->getText( 'search', $par );
+	$search = Sanitizer::removeHTMLtags($wgRequest->getText( 'search', $par ));
 	$searchPage = new SpecialSearch( $wgRequest, $wgUser );
 	if( $wgRequest->getVal( 'fulltext' ) ||
 		!is_null( $wgRequest->getVal( 'offset' ) ) ||
-- 
cgit v1.2.3


From 0c2469a1a3d88053c416fc09b8b08207cc785287 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 25 Aug 2005 04:06:03 +0000
Subject: Note about the XSS issue for next release

---
 RELEASE-NOTES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 26fdfad983ab..3a2388a04b07 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,11 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5 release candidate 3 ==
+
+This release solves a XSS issue with the search form. It got introduced
+in 1.5 beta1. The 1.4 series are not vulnerable.
+
 == MediaWiki 1.5 release candidate 2 ==
 
 August 23, 2005
-- 
cgit v1.2.3


From aee36976db5a432b7b863a87e02d490d408eba11 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 25 Aug 2005 04:32:20 +0000
Subject: Page subtitle HTML fixes from HEAD.

---
 includes/Article.php                    | 2 +-
 includes/SpecialBlockip.php             | 2 +-
 includes/SpecialRecentchangeslinked.php | 2 +-
 includes/SpecialSearch.php              | 4 ++--
 includes/SpecialWatchlist.php           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 1a9e40d23079..d77346092f2e 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1583,7 +1583,7 @@ class Article {
 
 		wfDebug( "Article::confirmProtect\n" );
 
-		$sub = $this->mTitle->getPrefixedText();
+		$sub = htmlspecialchars( $this->mTitle->getPrefixedText() );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
 		$check = '';
diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 8d7c3bb61713..28ef283d581a 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -67,7 +67,7 @@ class IPBlockForm {
 		$action = $titleObj->escapeLocalURL( "action=submit" );
 
 		if ( "" != $err ) {
-			$wgOut->setSubtitle( wfMsg( 'formerror' ) );
+			$wgOut->setSubtitle( wfMsgHtml( 'formerror' ) );
 			$wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
 		}
 
diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index 938a1609024e..5aaa49032947 100644
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -36,7 +36,7 @@ function wfSpecialRecentchangeslinked( $par = NULL ) {
 	}
 	$id = $nt->getArticleId();
 	
-	$wgOut->setSubtitle( wfMsg( 'rclsub', $nt->getPrefixedText() ) );
+	$wgOut->setSubtitle( htmlspecialchars( wfMsg( 'rclsub', $nt->getPrefixedText() ) ) );
 
 	if ( ! $days ) {
 		$days = $wgUser->getOption( 'rcdays' );
diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 0a6e17f7704d..5cb499ccf072 100644
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -35,7 +35,7 @@ require_once( 'Revision.php' );
 function wfSpecialSearch( $par = '' ) {
 	global $wgRequest, $wgUser;
 	
-	$search = Sanitizer::removeHTMLtags($wgRequest->getText( 'search', $par ));
+	$search = $wgRequest->getText( 'search', $par );
 	$searchPage = new SpecialSearch( $wgRequest, $wgUser );
 	if( $wgRequest->getVal( 'fulltext' ) ||
 		!is_null( $wgRequest->getVal( 'offset' ) ) ||
@@ -224,7 +224,7 @@ class SpecialSearch {
 	function setupPage( $term ) {
 		global $wgOut;
 		$wgOut->setPageTitle( wfMsg( 'searchresults' ) );
-		$wgOut->setSubtitle( wfMsg( 'searchquery', $term ) );
+		$wgOut->setSubtitle( htmlspecialchars( wfMsg( 'searchquery', $term ) ) );
 		$wgOut->setArticleRelated( false );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 	}
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index a90f1492f102..c0accdaaae37 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -22,7 +22,7 @@ function wfSpecialWatchlist( $par ) {
 	$fname = 'wfSpecialWatchlist';
 
 	$wgOut->setPagetitle( wfMsg( 'watchlist' ) );
-	$sub = wfMsg( 'watchlistsub', $wgUser->getName() );
+	$sub = htmlspecialchars( wfMsg( 'watchlistsub', $wgUser->getName() ) );
 	$wgOut->setSubtitle( $sub );
 	$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-- 
cgit v1.2.3


From 9cf3b0816f98b59fb8098deecfa14291a81286bd Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 25 Aug 2005 05:50:26 +0000
Subject: Bump version to 1.5rc3

---
 RELEASE-NOTES                | 17 +++++++++++++++--
 includes/DefaultSettings.php |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3a2388a04b07..c45e49c07f30 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -5,8 +5,21 @@ setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
 == MediaWiki 1.5 release candidate 3 ==
 
-This release solves a XSS issue with the search form. It got introduced
-in 1.5 beta1. The 1.4 series are not vulnerable.
+August 24, 2005
+
+MediaWiki 1.5rc3 is a preview release of the new 1.5 release series.
+It fixes several major problems in 1.5rc2:
+
+* Fixed a cross-site scripting injection in the search form
+  (broken since 1.5beta1)
+
+* Fixed upgrades from 1.4 database schema
+  (broken since 1.5rc2)
+
+1.3 and 1.4 releases are not vulnerable to the XSS bug, but anyone
+running an earlier 1.5 beta or release candidate should upgrade
+immediately.
+
 
 == MediaWiki 1.5 release candidate 2 ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d374759d193d..ead63ccdafef 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5rc2';
+$wgVersion			= '1.5rc3';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From d880e3c8e0a4cc593177b0d567e8751659b0f779 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 25 Aug 2005 13:24:30 +0000
Subject: Encyclopedia hardcoding

---
 languages/LanguageFr.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index ccb1efd62d26..3b0af859bc11 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -156,7 +156,7 @@ require_once( 'LanguageUtf8.php' );
 'disclaimerpage' => '{{ns:4}}:Avertissements généraux',
 'errorpagetitle' => 'Erreur',
 'returnto'      => 'Revenir à la page $1.',
-'tagline'       => 'Un article de {{SITENAME}}, l\'encyclopédie libre.',
+'tagline'       => 'Un article de {{SITENAME}}.',
 'whatlinkshere' => 'Références à cette page',
 'help'          => 'Aide',
 'search'        => 'Rechercher',
@@ -207,7 +207,7 @@ Voir $1.',
 'history'	=> 'Historique de la page',
 'history_short' => 'Historique',
 'sitetitle'     => '{{SITENAME}}',
-'sitesubtitle'  => 'L\'encyclopédie libre',
+'sitesubtitle'  => '',
 'retrievedfrom' => 'Récupérée de « $1 »',
 'newmessages'   => 'Vous avez des $1.',
 'newmessageslink' => 'nouveaux messages',
@@ -611,7 +611,7 @@ Pour incorporer l'image dans un article, placez dans celui-ci un lien rédigé c
 '''<nowiki>[[image:nom_du_fichier.png|autre texte]]</nowiki>''' ou
 '''<nowiki>[[media:nom_du_fichier.ogg]]</nowiki>''' pour les sons.
 
-N'oubliez pas que, comme toutes les pages de {{SITENAME}}, les fichiers que vous copiez peuvent être modifiés ou supprimés par les autres utilisateurs s'ils estiment que cela est dans l'intérêt de l'encyclopédie. Sachez aussi que votre accès au serveur peut être bloqué si vous faites un mauvais usage du système.",
+N'oubliez pas que, comme toutes les pages de {{SITENAME}}, les fichiers que vous copiez peuvent être modifiés ou supprimés par les autres utilisateurs s'ils estiment que cela est dans l'intérêt du site. Sachez aussi que votre accès au serveur peut être bloqué si vous faites un mauvais usage du système.",
 'uploadlog'  => 'log d\'upload',
 'uploadlogpage' => 'Log_d\'upload',
 'uploadlogpagetext' => 'Voici la liste des derniers fichiers copiés sur le serveur.
-- 
cgit v1.2.3


From 265bd5814be928307db31fbca06aa1ce0afb1020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 26 Aug 2005 13:50:17 +0000
Subject: * Making null the default $args so that hooks without arguments can
 be created

---
 includes/Hooks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 021d799cf066..442f87fa8eb1 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -30,7 +30,7 @@ if (defined('MEDIAWIKI')) {
 	 * in here than would normally be necessary.
 	 */
 	
-	function wfRunHooks($event, $args) {
+	function wfRunHooks($event, $args = null) {
 		
 		global $wgHooks;
 
-- 
cgit v1.2.3


From 9b1a67ff916019e70f27bba2e1fff342607c421e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 26 Aug 2005 13:54:11 +0000
Subject: * Null no longer needs to be passed explicitly to wfRunHooks()

---
 includes/SpecialUserlogin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 0d2b80ae8bef..57859a4ca34d 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -147,7 +147,7 @@ class LoginForm {
 			$wgUser->sendConfirmationMail();
 		}
 
-		wfRunHooks( 'AddNewAccount', null );
+		wfRunHooks( 'AddNewAccount' );
 
 		if( $this->hasSessionCookie() ) {
 			return $this->successfulLogin( wfMsg( 'welcomecreation', $wgUser->getName() ) );
-- 
cgit v1.2.3


From 06fece38e43e0d0d2323d2a7426362df8d798b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 26 Aug 2005 14:05:43 +0000
Subject: * No longer passing the name of the language class by reference

---
 includes/Setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index 1a580c163d8b..37ebfda7630a 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -152,7 +152,7 @@ wfProfileIn( $fname.'-language1' );
 
 require_once( "$IP/languages/Language.php" );
 
-function setupLangObj(&$langclass) {
+function setupLangObj($langclass) {
 	global $IP;
 
 	if( ! class_exists( $langclass ) ) {
-- 
cgit v1.2.3


From 7de9912effa4c6b98a487621219b2c0517390267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 26 Aug 2005 14:09:42 +0000
Subject: * Rewrite, now supports more info from extensions and is object
 oriented

---
 includes/SpecialVersion.php | 170 ++++++++++++++++++++++++++++++--------------
 1 file changed, 118 insertions(+), 52 deletions(-)

diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index 9b5e15038398..d854b44eb168 100644
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -1,82 +1,148 @@
 <?php
 /**
- * Give information about the version MediaWiki, PHP, and the database
+ * Give information about the version of MediaWiki, PHP, the DB and extensions
  *
  * @package MediaWiki
  * @subpackage SpecialPage
+ *
+ * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
 /**
  * constructor
  */
 function wfSpecialVersion() {
-	global $wgOut, $wgVersion, $wgExtensionCredits;
+	$version = new SpecialVersion;
+	$version->execute();
+}
+
+class SpecialVersion {
+	/**
+	 * @var object
+	 */
+	var $langObj;
 	
-	$dbr =& wfGetDB( DB_SLAVE );
+	/**
+	 * Constructor
+	 */
+	function SpecialVersion() {
+		// English motherfucker, do you speak it?
+		$this->langObj = setupLangObj( 'LanguageEn' );
+		$this->langObj->initEncoding();
+	}
 	
-	$out = "
-<div dir='ltr'>
-This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''',  
-copyright (C) 2001-2005 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
-Tim Starling, Erik Möller, and others.
- 
-MediaWiki is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
- 
-MediaWiki is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+	function execute() {
+		global $wgOut;
+		
+		$wgOut->setRobotpolicy( 'index,follow' );
+		$wgOut->addWikiText( $this->MediaWikiCredits() . $this->extensionCredits() );
+		$wgOut->addHTML( $this->IPInfo() );
+	}
+
+	function MediaWikiCredits() {
+		global $wgVersion;
+		
+		$dbr =& wfGetDB( DB_SLAVE );
+		
+		$ret =
+		"__NOTOC__
+		<div dir='ltr'>
+		This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''',  
+		copyright (C) 2001-2005 Magnus Manske, Brion Vibber, Lee Daniel Crocker,
+		Tim Starling, Erik Möller, and others.
+		 
+		MediaWiki is free software; you can redistribute it and/or modify
+		it under the terms of the GNU General Public License as published by
+		the Free Software Foundation; either version 2 of the License, or
+		(at your option) any later version.
+		 
+		MediaWiki is distributed in the hope that it will be useful,
+		but WITHOUT ANY WARRANTY; without even the implied warranty of
+		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+		GNU General Public License for more details.
+		
+		You should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public License]
+		along with this program; if not, write to the Free Software
+		Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+		or [http://www.gnu.org/copyleft/gpl.html read it online]
+		
+		* [http://www.mediawiki.org/ MediaWiki]: $wgVersion
+		* [http://www.php.net/ PHP]: " . phpversion() . " (" . php_sapi_name() . ")
+		* " . $dbr->getSoftwareLink() . ": " . $dbr->getServerVersion() . "
+		</div>";
+
+		return str_replace( "\t\t", '', $ret );
+	}
 
-You should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public License]
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-or [http://www.gnu.org/copyleft/gpl.html read it online]
+	function extensionCredits() {
+		global $wgExtensionCredits, $wgExtensionFunctions, $wgSkinExtensionFunction;
+		
+		if ( ! count( $wgExtensionCredits ) && ! count( $wgExtensionFunctions ) && ! count( $wgSkinExtensionFunction ) )
+			return '';
 
-* [http://www.mediawiki.org/ MediaWiki]: $wgVersion
-* [http://www.php.net/ PHP]: " . phpversion() . " (" . php_sapi_name() . ")
-* " . $dbr->getSoftwareLink() . ": " . $dbr->getServerVersion() . "
-</div>
-";
-	if ( count( $wgExtensionCredits ) > 0 ) {
 		$extensionTypes = array(
 			'specialpage' => 'Special pages',
 			'parserhook' => 'Parser hooks',
-			'other' => 'Other'
+			'other' => 'Other',
 		);
 		
-		$out .= "== Extensions ==\n";
-		
+		$out = "\n* Extensions:\n";
 		foreach ( $extensionTypes as $type => $text ) {
-			if ( count( @$wgExtensionCredits[$type] ) > 0 ) {
-				$out .= "=== $text ===\n";
+			if ( count( @$wgExtensionCredits[$type] ) ) {
+				$out .= "** $text:\n";
 				foreach ( $wgExtensionCredits[$type] as $extension ) {
-					$out .= formatExtensionCredits( $extension['name'], $extension['author'], @$extension['url'], @$extension['version'] ); 
+					wfSuppressWarnings();
+					$out .= $this->formatCredits(
+						$extension['name'],
+						$extension['version'],
+						$extension['author'],
+						$extension['url'],
+						$extension['description']
+					);
+					wfRestoreWarnings();
 				}
 			}
+		}
 
+		if ( count( $wgExtensionFunctions ) ) {
+			$out .= "** Extension functions:\n";
+			$out .= '***' . $this->langObj->listToText( $wgExtensionFunctions ) . "\n";
 		}
+
+		if ( count( $wgSkinExtensionFunction ) ) {
+			$out .= "** Skin extension functions:\n";
+			$out .= '***' . $this->langObj->listToText( $wgSkinExtensionFunction ) . "\n";
+		}
+
+		return $out;
+	}
+
+	function formatCredits( $name, $version = null, $author = null, $url = null, $description = null) {
+		$ret = '*** ';
+		if ( isset( $url ) )
+			$ret .= "[$url ";
+		$ret .= "''$name";
+		if ( isset( $version ) )
+			$ret .= " (version $version)";
+		$ret .= "''";
+		if ( isset( $url ) )
+			$ret .= ']';
+		if ( isset( $description ) )
+			$ret .= ', ' . $description;
+		if ( isset( $description ) && isset( $author ) )
+			$ret .= ', ';
+		if ( isset( $author ) )
+			$ret .= ' by ' . $this->langObj->listToText( (array)$author );
+
+		return "$ret\n";
 	}
-	$wgOut->addWikiText( $out );
-	
-	global $wgIP;
-	$wgOut->addHTML( '<!-- visited from '
-		. str_replace( '--', ' - - ', htmlspecialchars( $wgIP ) )
-		. " -->\n" );
-}
 
-function formatExtensionCredits( $name, $author, $url = null, $version = null ) {
-	$ret = '* ';
-	if ( isset( $url ) )
-		$ret .= "[$url ";
-	$ret .= $name;
-	if ( isset( $url ) )
-		$ret .= ']';
-	if ( isset( $version ) )
-		$ret .= " $version";
-	$ret .= " by $author\n";
-	return $ret;
+	function IPInfo() {
+		global $wgIP;
+		
+		$ip =  str_replace( '--', ' - - ', htmlspecialchars( $wgIP ) );
+		return "<!-- visited from $ip -->\n";
+	}
 }
 ?>
-- 
cgit v1.2.3


From fb48a666500114a442b1ba838b51a61680e14ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 26 Aug 2005 14:13:43 +0000
Subject:  * Adding a new hook, SpecialContributionsBeforeMainOutput

---
 includes/SpecialContributions.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index c15a8f1a8958..3105a33c9240 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -226,6 +226,8 @@ function wfSpecialContributions( $par = null ) {
 
 	$wgOut->setSubtitle( wfMsgHtml( 'contribsub', $ul ) );
 
+	wfRunHooks('SpecialContributionsBeforeMainOutput', $id );
+
 	$arr =  $wgContLang->getFormattedNamespaces();
 	$nsform = "<form method='get' action=\"$wgScript\">\n";
 	$nsform .= wfElement("input", array(
-- 
cgit v1.2.3


From 0baa1354addb8b13b3f8b1b7bb51bbfceb3636f0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 26 Aug 2005 21:42:34 +0000
Subject: * (bug 3280) Respect 'move' group permission on page moves

---
 RELEASE-NOTES                |  5 +++++
 includes/SkinTemplate.php    | 14 ++++++--------
 includes/SpecialMovepage.php |  2 +-
 includes/Title.php           |  3 ++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c45e49c07f30..2ebbb60fdd4e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -719,6 +719,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2108) Sort entries when using category browser
 * XSS issue : now sanitize search query input
 
+
+=== Changes since 1.5rc3 ===
+* (bug 3280) Respect 'move' group permission on page moves
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index d3f8ee544c66..fe0c1c42ab32 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -621,14 +621,12 @@ class SkinTemplate extends Skin {
 						'href' => $this->mTitle->getLocalUrl( 'action=delete' )
 					);
 				}
-				if ( $wgUser->isLoggedIn() ) {
-					if ( $this->mTitle->userCanMove()) {
-						$content_actions['move'] = array(
-							'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false,
-							'text' => wfMsg('move'),
-							'href' => $this->makeSpecialUrl("Movepage/$this->thispage" )
-						);
-					}
+				if ( $this->mTitle->userCanMove()) {
+					$content_actions['move'] = array(
+						'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false,
+						'text' => wfMsg('move'),
+						'href' => $this->makeSpecialUrl("Movepage/$this->thispage" )
+					);
 				}
 			} else {
 				//article doesn't exist or is deleted
diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 58f445cf1dad..4d4abaf16e6b 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -17,7 +17,7 @@ function wfSpecialMovepage( $par = null ) {
 	global $wgUser, $wgOut, $wgRequest, $action, $wgOnlySysopMayMove;
 
 	# check rights. We don't want newbies to move pages to prevents possible attack
-	if ( $wgUser->isAnon() or $wgUser->isBlocked() or ($wgOnlySysopMayMove and $wgUser->isNewbie())) {
+	if ( !$wgUser->isAllowed( 'move' ) or $wgUser->isBlocked() or ($wgOnlySysopMayMove and $wgUser->isNewbie())) {
 		$wgOut->errorpage( "movenologin", "movenologintext" );
 		return;
 	}
diff --git a/includes/Title.php b/includes/Title.php
index 31d21d87513e..8d93ec604ba6 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -950,7 +950,8 @@ class Title {
 			}
 		}
 
-		if( $action == 'move' && !$this->isMovable() ) {
+		if( $action == 'move' &&
+			!( $this->isMovable() && $wgUser->isAllowed( 'move' ) ) ) {
 			wfProfileOut( $fname );
 			return false;
 		}
-- 
cgit v1.2.3


From f5859afe0441048d386ceb82224c89ef2ee1fbc6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 28 Aug 2005 21:59:17 +0000
Subject: * (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete

---
 RELEASE-NOTES             | 2 ++
 includes/Database.php     | 2 +-
 includes/SkinTemplate.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2ebbb60fdd4e..32df2ea30943 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -721,7 +721,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 
 === Changes since 1.5rc3 ===
+
 * (bug 3280) Respect 'move' group permission on page moves
+* (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete
 
 
 === Caveats ===
diff --git a/includes/Database.php b/includes/Database.php
index 0035866aef22..e482b8dbba81 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1472,7 +1472,7 @@ class Database {
 	/**
 	 * @todo document
 	 */
-	function resultObject( &$result ) {
+	function resultObject( $result ) {
 		if( empty( $result ) ) {
 			return NULL;
 		} else {
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index fe0c1c42ab32..ee896710aff0 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -225,7 +225,7 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'jsmimetype', $wgJsMimeType );
 		$tpl->setRef( 'charset', $wgOutputEncoding );
 		$tpl->set( 'headlinks', $out->getHeadLinks() );
-		$tpl->setRef('headscripts', $out->getScript() );
+		$tpl->set('headscripts', $out->getScript() );
 		$tpl->setRef( 'wgScript', $wgScript );
 		$tpl->setRef( 'skinname', $this->skinname );
 		$tpl->setRef( 'stylename', $this->stylename );
-- 
cgit v1.2.3


From 086d0bb15b9e5e7453b65aa921090fe9e14eb0bb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 29 Aug 2005 23:45:27 +0000
Subject: Bump to 1.5rc4. * Security fix for <math> * Security fix for tables

---
 RELEASE-NOTES                | 21 +++++++++++++++++++++
 includes/Article.php         |  2 ++
 includes/DefaultSettings.php |  2 +-
 includes/Parser.php          | 30 ++++++++++++++++++++----------
 maintenance/parserTests.inc  |  1 +
 maintenance/parserTests.txt  | 39 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 32df2ea30943..8e049986a3cd 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,25 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5 release candidate 4 ==
+
+August 29, 2005
+
+MediaWiki 1.5rc4 is a preview release of the new 1.5 release series.
+It fixes compatibility with PHP 5.1, and corrects two cross-site scripting
+security bugs:
+
+* <math> tags were handled incorrectly when TeX rendering support is off,
+  as in the default configuration.
+* Extension or <nowiki> sections in Wiki table syntax could bypass HTML
+  style attribute restrictions for cross-site scripting attacks against
+  Microsoft Internet Explorer
+
+Wikis where the optional math support has been *enabled* are not vulnerable
+to the first, but are vulnerable to the second.
+
+
+
 == MediaWiki 1.5 release candidate 3 ==
 
 August 24, 2005
@@ -724,6 +743,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * (bug 3280) Respect 'move' group permission on page moves
 * (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete
+* Security fix for <math>
+* Security fix for tables
 
 
 === Caveats ===
diff --git a/includes/Article.php b/includes/Article.php
index d77346092f2e..960e5b099343 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -173,6 +173,7 @@ class Article {
 		$striparray=array();
 		$parser=new Parser();
 		$parser->mOutputType=OT_WIKI;
+		$parser->mOptions = new ParserOptions();
 		$striptext=$parser->strip($text, $striparray, true);
 
 		# now that we can be sure that no pseudo-sections are in the source,
@@ -1119,6 +1120,7 @@ class Article {
 				$striparray=array();
 				$parser=new Parser();
 				$parser->mOutputType=OT_WIKI;
+				$parser->mOptions = new ParserOptions();
 				$oldtext=$parser->strip($oldtext, $striparray, true);
 
 				# now that we can be sure that no pseudo-sections are in the source,
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ead63ccdafef..37fd7fa9fc61 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5rc3';
+$wgVersion			= '1.5rc4';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
diff --git a/includes/Parser.php b/includes/Parser.php
index 8b5c8697f1f6..6b11efa271e5 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -377,16 +377,14 @@ class Parser
 		}
 
 		# math
-		$text = Parser::extractTags('math', $text, $math_content, $uniq_prefix);
-		foreach( $math_content as $marker => $content ){
-			if( $render ) {
-				if( $this->mOptions->getUseTeX() ) {
+		if( $this->mOptions->getUseTeX() ) {
+			$text = Parser::extractTags('math', $text, $math_content, $uniq_prefix);
+			foreach( $math_content as $marker => $content ){
+				if( $render ) {
 					$math_content[$marker] = renderMath( $content );
 				} else {
-					$math_content[$marker] = '&lt;math&gt;'.$content.'&lt;math&gt;';
+					$math_content[$marker] = '<math>'.$content.'</math>';
 				}
-			} else {
-				$math_content[$marker] = '<math>'.$content.'</math>';
 			}
 		}
 
@@ -650,8 +648,11 @@ class Parser
 			$fc = substr ( $x , 0 , 1 ) ;
 			if ( preg_match( '/^(:*)\{\|(.*)$/', $x, $matches ) ) {
 				$indent_level = strlen( $matches[1] );
+				
+				$attributes = $this->unstripForHTML( $matches[2] );
+
 				$t[$k] = str_repeat( '<dl><dd>', $indent_level ) .
-					'<table' . Sanitizer::fixTagAttributes ( $matches[2], 'table' ) . '>' ;
+					'<table' . Sanitizer::fixTagAttributes ( $attributes, 'table' ) . '>' ;
 				array_push ( $td , false ) ;
 				array_push ( $ltd , '' ) ;
 				array_push ( $tr , false ) ;
@@ -678,7 +679,8 @@ class Parser
 				array_push ( $tr , false ) ;
 				array_push ( $td , false ) ;
 				array_push ( $ltd , '' ) ;
-				array_push ( $ltr , Sanitizer::fixTagAttributes ( $x, 'tr' ) ) ;
+				$attributes = $this->unstripForHTML( $x );
+				array_push ( $ltr , Sanitizer::fixTagAttributes ( $attributes, 'tr' ) ) ;
 			}
 			else if ( '|' == $fc || '!' == $fc || '|+' == substr ( $x , 0 , 2 ) ) { # Caption
 				# $x is a table row
@@ -720,7 +722,10 @@ class Parser
 					}
 					if ( count ( $y ) == 1 )
 						$y = "{$z}<{$l}>{$y[0]}" ;
-					else $y = $y = "{$z}<{$l}".Sanitizer::fixTagAttributes($y[0], $l).">{$y[1]}" ;
+					else {
+						$attributes = $this->unstripForHTML( $y[0] );
+						$y = "{$z}<{$l}".Sanitizer::fixTagAttributes($attributes, $l).">{$y[1]}" ;
+					}
 					$t[$k] .= $y ;
 					array_push ( $td , true ) ;
 				}
@@ -3315,6 +3320,11 @@ class Parser
 	 */
 	function attributeStripCallback( &$text, $args ) {
 		$text = $this->replaceVariables( $text, $args );
+		$text = $this->unstripForHTML( $text );
+		return $text;
+	}
+	
+	function unstripForHTML( $text ) {
 		$text = $this->unstrip( $text, $this->mStripState );
 		$text = $this->unstripNoWiki( $text, $this->mStripState );
 		return $text;
diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index b2cd97159429..39596e5f8567 100644
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -303,6 +303,7 @@ class ParserTest {
 			'wgDefaultUserOptions' => array(),
 			'wgNoFollowLinks' => true,
 			'wgThumbnailScriptPath' => false,
+			'wgUseTeX' => false,
 			);
 		$this->savedGlobals = array();
 		foreach( $settings as $var => $val ) {
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index 22c6158ea27c..e9a93009853d 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -2598,6 +2598,45 @@ Bug 3244: HTML attribute safety (extension; unsafe)
 !! end
 
 
+!! test
+Math section safety when disabled
+!! input
+<math><script>alert(document.cookies);</script></math>
+!! result
+<p>&lt;math&gt;&lt;script&gt;alert(document.cookies);&lt;/script&gt;&lt;/math&gt;
+</p>
+!! end
+
+
+!! test
+Table attribute legitimate extension
+!! input
+{|
+!+ style="<nowiki>color:blue</nowiki>"| status
+|}
+!! result
+<table>
+<tr>
+<th style="color:blue"> status
+</th></tr></table>
+
+!!end
+
+!! test
+Table attribute safety
+!! input
+{|
+!+ style="<nowiki>border-width:expression(0+alert(document.cookie))</nowiki>"| status
+|}
+!! result
+<table>
+<tr>
+<th> status
+</th></tr></table>
+
+!! end
+
+
 TODO:
 more images
 more tables
-- 
cgit v1.2.3


From a16c395e73d333729ab2ee8a6c06d7b955acf448 Mon Sep 17 00:00:00 2001
From: Alexander Sigachov <ajvol@users.mediawiki.org>
Date: Tue, 30 Aug 2005 20:20:14 +0000
Subject: fix pipe links

---
 languages/LanguageRu.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 9a1b4947c331..3ef2e6c650e7 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -640,7 +640,8 @@ $2 — Показывать перенаправления &nbsp; Искать $
     <input type="submit" name="btnG" value="Поиск по сайту с помощью Google" />
     <input type="hidden" name="sitesearch" value="{{SERVER}}" />
 </form>
-
+<br />
+<br />
 <form name="web" method="get" action="http://www.yandex.ru/yandsearch">
   <input type="hidden" name="serverurl" value="{{SERVER}}" />
   <input type="hidden" name="server_name" value="{{SITENAME}} (русская версия)" />
@@ -842,7 +843,7 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 Пожалуйста, проследуйте по следующей ссылке: ($2) к странице с описанием и заполните информацию о файле, такую как: источник файла, когда и кем был создан файл, а также любую другую информацию известную вам об этом файле.",
 'uploadwarning' => 'Предупреждение',
 'savefile'              => 'Записать файл',
-'uploadedimage' => "загружен [[$1|«$1»]]",
+'uploadedimage' => "загружен «[[$1]]»",
 'uploaddisabled' => 'Извините, загрузка запрещена.',
 'uploadscripted' => 'Файл содержит HTML-код или скрипт, который может быть ошибочно обработан браузером.',
 'uploadcorrupt' => 'Файл либо повреждён, либо имеет неверное расширение. Пожалуйста, проверьте файл и попробуйте загрузить его ещё раз.',
@@ -1093,7 +1094,7 @@ $NEWPAGE
 'actioncomplete' => 'Действие выполнено',
 'deletedtext'   => "«$1» была удалена.
 См. $2 для просмотра списка последних удалений.",
-'deletedarticle' => "удалена [[$1|«$1»]]",
+'deletedarticle' => "удалена «[[$1]]»",
 'dellogpage'    => 'Список_удалений',
 'dellogpagetext' => 'Ниже приведён список самых свежих удалений.
 Везде используется время сервера (по Гринвичу, UTC).
@@ -1121,8 +1122,8 @@ $NEWPAGE
 'protectlogpage' => 'Журнал_защиты',
 'protectlogtext' => "Ниже — список установок и снятий защиты со статей.
 См. дополнительную информацию на [[{{ns:project}}:Protected page]].",
-'protectedarticle' => "защищена страница [[$1|«$1»]]",
-'unprotectedarticle' => "снята защита со страницы [[$1|«$1»]]",
+'protectedarticle' => "защищена страница «[[$1]]»",
+'unprotectedarticle' => "снята защита со страницы «[[$1]]»",
 'protectsub' =>"(Установка защиты для «$1»)",
 'confirmprotecttext' => 'Вы действительно хотите установить защиту этой страницы?',
 'confirmprotect' => 'Подтвердите установку защиты страницы',
@@ -1144,7 +1145,7 @@ $NEWPAGE
 Если с момента удаления была создана новая страница с таким же названием, восстановленные версии будут указаны в журнале изменений перед новыми записями, и текущая версия существующей страницы автоматически заменена не будет.',
 'undeleterevision' => "Стёртая версия от $1",
 'undeletebtn' => 'Восстановить!',
-'undeletedarticle' => "«$1» восстановлена",
+'undeletedarticle' => "«[[$1]]» восстановлена",
 'undeletedrevisions' => "$1 изменений восстановлено",
 'undeletedtext'   => "Статья [[$1]] была восстановлена.
 См. [[{{ns:project}}:Список_удалений]] для просмотра списка свежих удалений и восстановлений.",
@@ -1198,7 +1199,7 @@ $NEWPAGE
 'unblockiptext' => 'Используйте форму ниже, чтобы восстановить возможность записи с ранее заблокированного
 IP-адреса.',
 'ipusubmit'             => 'Разблокировать этот адрес',
-'ipusuccess'    => "IP-адрес [[$1|«$1»]] разблокирован",
+'ipusuccess'    => "IP-адрес «[[$1]]» разблокирован",
 'ipblocklist'   => 'Список заблокированных IP-адресов и пользователей',
 'blocklistline' => "$1, $2 заблокировал $3 ($4)",
 'infiniteblock' => 'бессрочная блокировка',
@@ -1209,7 +1210,7 @@ IP-адреса.',
 'contribslink'  => 'вклад',
 'autoblocker'   => "Вы автоматически заблокированны, потому что у вас такой же IP-адрес, как у [[user:$1|«$1»]]. Причина блокировки участника «$1»: $2.",
 'blocklogpage'  => 'Журнал_блокировок',
-'blocklogentry' => '[[$1|«$1»]] заблокирован на период $2',
+'blocklogentry' => '«[[$1]]» заблокирован на период $2',
 'blocklogtext'  => 'Это — журнал действий по блокированию и разблокированию участников. Автоматически блокируемые IP-адреса здесь не указываются. См. [[{{ns:special}}:Ipblocklist|Cписок активных запретов и блокировок]].',
 'unblocklogentry'       => '«$1» разблокирован',
 'range_block_disabled'  => 'Способность администратора создавать диапазон блокирования запрещена.',
-- 
cgit v1.2.3


From a1f9d88bc30e9e61b4007933d98b96c7d8a93cc2 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 31 Aug 2005 15:01:02 +0000
Subject: Might or might not fix a php5 notice error (undefined variable)

---
 includes/GlobalFunctions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index da8517aeae13..5efe1c20eb31 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1058,8 +1058,9 @@ define('TS_EXIF', 4);
  * @return string Time in the format specified in $outputtype
  */
 function wfTimestamp($outputtype=TS_UNIX,$ts=0) {
-	if ($ts==0) { 
-		$uts=time(); 
+	$uts = 0;
+	if ($ts==0) {
+		$uts=time();
 	} elseif (preg_match("/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/",$ts,$da)) {
 		# TS_DB
 		$uts=gmmktime((int)$da[4],(int)$da[5],(int)$da[6],
-- 
cgit v1.2.3


From b6476b55a591b1cf34f2ee16dcd6ede416a4e6ee Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 2 Sep 2005 04:45:25 +0000
Subject: * (bug 3292) Fix move-over-redirect test when current entries are not
 plaintext Patch by Tietew:
 http://bugzilla.wikimedia.org/attachment.cgi?id=834&action=view

---
 RELEASE-NOTES      | 5 +++++
 includes/Title.php | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8e049986a3cd..56fdca6fd885 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -747,6 +747,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Security fix for tables
 
 
+=== Changes since 1.5rc4 ===
+
+* (bug 3292) Fix move-over-redirect test when current entries are not plaintext
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/includes/Title.php b/includes/Title.php
index 8d93ec604ba6..40f13ed38ccd 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1847,7 +1847,7 @@ class Title {
 		# Is it a redirect?
 		$id  = $nt->getArticleID();
 		$obj = $dbw->selectRow( array( 'page', 'revision', 'text'),
-			array( 'page_is_redirect','old_text' ),
+			array( 'page_is_redirect','old_text','old_flags' ),
 			array( 'page_id' => $id, 'page_latest=rev_id', 'rev_text_id=old_id' ),
 			$fname, 'FOR UPDATE' );
 
@@ -1855,14 +1855,18 @@ class Title {
 			# Not a redirect
 			return false;
 		}
+		$text = Revision::getRevisionText( $obj );
 
 		# Does the redirect point to the source?
-		if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $obj->old_text, $m ) ) {
+		if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $text, $m ) ) {
 			$redirTitle = Title::newFromText( $m[1] );
 			if( !is_object( $redirTitle ) ||
 				$redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() ) {
 				return false;
 			}
+		} else {
+			# Fail safe
+			return false;
 		}
 
 		# Does the article have a history?
-- 
cgit v1.2.3


From 27ef88043c3795f3c5d3593821fc068d9feb1473 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 2 Sep 2005 05:19:37 +0000
Subject: * (bug 2078) Don't hide watch tab on preview

---
 RELEASE-NOTES             | 1 +
 includes/SkinTemplate.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 56fdca6fd885..4aeef5b014d2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -750,6 +750,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 === Changes since 1.5rc4 ===
 
 * (bug 3292) Fix move-over-redirect test when current entries are not plaintext
+* (bug 2078) Don't hide watch tab on preview
 
 
 === Caveats ===
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index ee896710aff0..752ea26d4b0c 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -642,7 +642,7 @@ class SkinTemplate extends Skin {
 			}
 			wfProfileOut( "$fname-live" );
 
-			if( $wgUser->isLoggedIn() and $action != 'submit' ) {
+			if( $this->loggedin ) {
 				if( !$this->mTitle->userIsWatching()) {
 					$content_actions['watch'] = array(
 						'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
-- 
cgit v1.2.3


From 65b947124242c37b77cf0b2a0d9062bf896ece84 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 2 Sep 2005 05:45:08 +0000
Subject: * (bug 3306) Document $wgLocalTZoffset

---
 RELEASE-NOTES                |  1 +
 includes/DefaultSettings.php | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4aeef5b014d2..a64f13ee1f80 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -751,6 +751,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * (bug 3292) Fix move-over-redirect test when current entries are not plaintext
 * (bug 2078) Don't hide watch tab on preview
+* (bug 3306) Document $wgLocalTZoffset
 
 
 === Caveats ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 37fd7fa9fc61..fa79214ffe25 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1386,6 +1386,9 @@ $wgBrowserBlackList = array(
  * Fake out the timezone that the server thinks it's in. This will be used for
  * date display and not for what's stored in the DB. Leave to null to retain
  * your server's OS-based timezone value. This is the same as the timezone.
+ *
+ * This variable is currently used ONLY for signature formatting, not for
+ * anything else.
  */
 # $wgLocaltimezone = 'GMT';
 # $wgLocaltimezone = 'PST8PDT';
@@ -1393,6 +1396,27 @@ $wgBrowserBlackList = array(
 # $wgLocaltimezone = 'CET';
 $wgLocaltimezone = null;
 
+/**
+ * Set an offset from UTC in hours to use for the default timezone setting
+ * for anonymous users and new user accounts.
+ *
+ * This setting is used for most date/time displays in the software, and is
+ * overrideable in user preferences. It is *not* used for signature timestamps.
+ *
+ * You can set it to match the configured server timezone like this:
+ *   $wgLocalTZoffset = date("Z") / 3600;
+ *
+ * If your server is not configured for the timezone you want, you can set
+ * this in conjunction with the signature timezone and override the TZ
+ * environment variable like so:
+ *   $wgLocaltimezone="Europe/Berlin";
+ *   putenv("TZ=$wgLocaltimezone");
+ *   $wgLocalTZoffset = date("Z") / 3600;
+ *
+ * Leave at NULL to show times in universal time (UTC/GMT).
+ */
+$wgLocalTZoffset = null;
+
 
 /**
  * When translating messages with wfMsg(), it is not always clear what should be
-- 
cgit v1.2.3


From 7ed392a1d9d913e5d3ab3c2ebcb48edadc33823d Mon Sep 17 00:00:00 2001
From: Rowan Collins <imsop@users.mediawiki.org>
Date: Sat, 3 Sep 2005 10:53:24 +0000
Subject: Applying quick fix for bug 3131 (pre-filled dest name getting
 overwritten by JavaScript) to 1.5 branch.

---
 includes/SpecialUpload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index a10b2aa85ef8..286516da9359 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -558,7 +558,7 @@ class UploadForm {
 	<table border='0'><tr>
 
 	<td align='right'>{$sourcefilename}:</td><td align='left'>
-	<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' onchange='fillDestFilename()' size='40' />
+	<input tabindex='1' type='file' name='wpUploadFile' id='wpUploadFile' " . ($this->mDestFile?"":"onchange='fillDestFilename()' ") . "size='40' />
 	</td></tr><tr>
 
 	<td align='right'>{$destfilename}:</td><td align='left'>
-- 
cgit v1.2.3


From 92bf875e184486e4d839fc2d459810d1cf0f5544 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 10 Sep 2005 23:04:39 +0000
Subject: Copy SVG fixes from HEAD: * Support SVG rendering with rsvg * Cap
 arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide * (bug
 3127) Render large SVGs at image page size correctly

---
 RELEASE-NOTES                |  3 +++
 includes/DefaultSettings.php |  3 +++
 includes/Image.php           | 18 ++++++++++++------
 includes/ImagePage.php       |  3 +--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a64f13ee1f80..d96ac7421f28 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -752,6 +752,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3292) Fix move-over-redirect test when current entries are not plaintext
 * (bug 2078) Don't hide watch tab on preview
 * (bug 3306) Document $wgLocalTZoffset
+* Support SVG rendering with rsvg
+* Cap arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide
+* (bug 3127) Render large SVGs at image page size correctly
 
 
 === Caveats ===
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index fa79214ffe25..a6318421054b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1086,11 +1086,14 @@ $wgSVGConverters = array(
 	'sodipodi' => '$path/sodipodi -z -w $width -f $input -e $output',
 	'inkscape' => '$path/inkscape -z -w $width -f $input -e $output',
 	'batik' => 'java -Djava.awt.headless=true -jar $path/batik-rasterizer.jar -w $width -d $output $input',
+	'rsvg' => '$path/rsvg -w$width -h$height $input $output',
 	);
 /** Pick one of the above */
 $wgSVGConverter = 'ImageMagick';
 /** If not in the executable PATH, specify */
 $wgSVGConverterPath = '';
+/** Don't scale a SVG larger than this unless its native size is larger */
+$wgSVGMaxSize = 1024;
 
 /** Set $wgCommandLineMode if it's not set already, to avoid notices */
 if( !isset( $wgCommandLineMode ) ) {
diff --git a/includes/Image.php b/includes/Image.php
index 5f33d6ca30d8..2076a747847e 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -582,7 +582,7 @@ class Image
 		
 		if (!$mime || $mime==='unknown' || $mime==='unknown/unknown') return false;
 		
-		#if it's SVG, check if ther's a converter enabled    
+		#if it's SVG, check if there's a converter enabled    
 		if ($mime === 'image/svg') {
 			global $wgSVGConverters, $wgSVGConverter;
 			
@@ -936,7 +936,11 @@ class Image
 			return null;
 		}
 
-		if( $width >= $this->width && !$this->mustRender() ) {
+		global $wgSVGMaxSize;
+		$maxsize = $this->mustRender()
+			? max( $this->width, $wgSVGMaxSize )
+			: $this->width - 1;
+		if( $width > $maxsize ) {
 			# Don't make an image bigger than the source
 			$thumb = new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() );
 			wfProfileOut( $fname );
@@ -1009,12 +1013,14 @@ class Image
 			if( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
 				global $wgSVGConverterPath;
 				$cmd = str_replace(
-					array( '$path/', '$width', '$input', '$output' ),
-					array( $wgSVGConverterPath,
-						   $width,
+					array( '$path/', '$width', '$height', '$input', '$output' ),
+					array( $wgSVGConverterPath ? "$wgSVGConverterPath/" : "",
+						   intval( $width ),
+						   intval( $height ),
 						   wfEscapeShellArg( $this->imagePath ),
 						   wfEscapeShellArg( $thumbPath ) ),
 					$wgSVGConverters[$wgSVGConverter] );
+				wfDebug( "reallyRenderThumb SVG: $cmd\n" );
 				$conv = shell_exec( $cmd );
 			} else {
 				$conv = false;
@@ -1027,7 +1033,7 @@ class Image
 				" -quality 85 -background white -geometry {$width} ".
 				wfEscapeShellArg($this->imagePath) . " " .
 				wfEscapeShellArg($thumbPath);				
-			wfDebug("reallyRenderThumb: running ImageMagick: $cmd");
+			wfDebug("reallyRenderThumb: running ImageMagick: $cmd\n");
 			$conv = shell_exec( $cmd );
 		} else {
 			# Use PHP's builtin GD library functions.
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 5f2ddc4a340b..0a40e55a4d22 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -168,8 +168,7 @@ class ImagePage extends Article {
 					$width = floor( $width * $maxHeight / $height );
 					$height = $maxHeight;
 				}
-				if ( !$this->img->mustRender()
-				   && ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) ) {
+				if ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) {
 					if( $wgUseImageResize ) {
 						$thumbnail = $this->img->getThumbnail( $width );
 						if ( $thumbnail == null ) {
-- 
cgit v1.2.3


From ce8fc86d7cf0a0a5fbbf899d05585abc069313eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Mon, 12 Sep 2005 19:56:35 +0000
Subject: Backported some changes

---
 languages/LanguageFi.php | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/languages/LanguageFi.php b/languages/LanguageFi.php
index 1b96dff3272e..09a1a510dd19 100644
--- a/languages/LanguageFi.php
+++ b/languages/LanguageFi.php
@@ -7,7 +7,7 @@
 
 require_once( 'LanguageUtf8.php' );
 
-# Revised 2005-06-22 for MediaWiki 1.5a2 and CVS -- Nikerabbit
+# Revised 2005-09-12 for MediaWiki 1.5rc4 -- Nikerabbit
 
 /* private */ $wgNamespaceNamesFi = array(
 	NS_MEDIA            => 'Media',
@@ -442,7 +442,7 @@ Sivun lähdekoodi:',
 'noarticletext'       => '<big>\'\'\'{{GRAMMAR:inessive|{{SITENAME}}}} ei ole tämän nimistä sivua.\'\'\'</big>
 * Voit kirjoittaa uuden sivun \'\'\'<span class="plainlinks">[{{SERVER}}{{localurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} {{PAGENAME}}]</span>.\'\'\'
 * Jos olet luonut sivun tällä nimellä, se on saatettu poistaa — katso [[Special:Log/delete|poistoloki]].',
-'clearyourcache'      => '\'\'\'Huomautus:\'\'\' Selaimen välimuisti pitää tyhjentää asetusten tallentamisen jälkeen, jotta muutokset tulisivat voimaan: \'\'\'Mozilla, Firefox ja Safari:\'\'\' napsauta shift-näppäin pohjassa päivitä tai  paina \'\'shift-ctrl-r\'\' / \'\'shift-cmd-r\'\', \'\'\'IE:\'\'\' \'\'ctrl-f5\'\' tai \'\'\'Konqueror:\'\'\' \'\'F5\'\'.',
+'clearyourcache'      => '\'\'\'Huomautus:\'\'\' Selaimen välimuisti pitää ehkä tyhjentää asetusten tallentamisen jälkeen, jotta muutokset tulisivat voimaan: \'\'\'Mozilla, Firefox ja Safari:\'\'\' napsauta shift-näppäin pohjassa päivitä tai  paina \'\'shift-ctrl-r\'\' / \'\'shift-cmd-r\'\', \'\'\'IE:\'\'\' \'\'ctrl-f5\'\' tai \'\'\'Konqueror:\'\'\' \'\'F5\'\'.',
 'usercssjsyoucanpreview' => '\'\'\'Vinkki:\'\'\' Käytä esikatselupainiketta testataksesi uutta CSS:ää tai JavaScriptiä ennen tallennusta.',
 'usercsspreview'      => '\'\'\'Tämä on vasta CSS:n testaus ja esikatselu.\'\'\'',
 'userjspreview'       => '\'\'\'Tämä on vasta JavaScriptin testaus ja esikatselu.\'\'\'',
@@ -518,7 +518,7 @@ Sivun lähdekoodi:',
 'notextmatches'       => 'Hakusanaa ei löytynyt sivujen teksteistä',
 'prevn'               => '← $1 edellistä',
 'nextn'               => '$1 seuraavaa →',
-'viewprevnext'        => 'Näytä [$3] kerralla.<br />$1 | $2',
+'viewprevnext'        => "Näytä [$3] kerralla.\n\n$1 | $2",
 'showingresults'      => '<b>$1</b> tulosta tuloksesta <b>$2</b> alkaen.',
 'showingresultsnum'   => 'Alla on <b>$3</b> hakutulosta alkaen <b>$2.</b> tuloksesta.',
 'nonefound'           => '\'\'\'Huomautus\'\'\': Epäonnistuneet haut johtuvat usein hyvin yleisten sanojen, kuten \'\'on\'\' ja \'\'ei\'\', etsimisestä tai useamman kuin yhden hakutermin määrittelemisestä. Vain sivut, joilla on kaikki hakutermin sanat, näkyvät tuloksissa.',
@@ -533,7 +533,7 @@ Sivun lähdekoodi:',
 'prefsnologin'        => 'Et ole kirjautunut sisään',
 'prefsnologintext'    => 'Sinun täytyy [[Special:Userlogin|kirjautua sisään]], jotta voisit muuttaa asetuksia.',
 'prefslogintext'      => 'Olet kirjautunut sisään käyttäjänä \'\'\'$1\'\'\'. Sisäinen tunnistenumerosi on \'\'\'$2\'\'\'.',
-'prefsreset'          => 'Asetukset on palautettu talletettujen mukaisiksi.',
+'prefsreset'          => 'Asetukset on palautettu tallennetuista asetuksistasi.',
 'qbsettings'          => 'Pikavalikko',
 'changepassword'      => 'Vaihda salasanaa',
 'skin'                => 'Ulkonäkö',
@@ -552,7 +552,7 @@ Sivun lähdekoodi:',
 'prefs-rc'            => 'Tuoreet muutokset ja tyngät',
 'prefs-misc'          => 'Muut asetukset',
 'saveprefs'           => 'Tallenna asetukset',
-'resetprefs'          => 'Palauta alkuperäiset asetukset',
+'resetprefs'          => 'Palauta tallennetut asetukset',
 'oldpassword'         => 'Vanha salasana',
 'newpassword'         => 'Uusi salasana',
 'retypenew'           => 'Uusi salasana uudelleen',
@@ -565,7 +565,7 @@ Sivun lähdekoodi:',
 'contextchars'        => 'Sisällön merkkien määrä riviä kohden',
 'stubthreshold'       => 'Tynkäsivun osoituskynnys',
 'recentchangescount'  => 'Sivujen määrä tuoreissa muutoksissa',
-'savedprefs'          => 'Asetuksesi tallennettiin.',
+'savedprefs'          => 'Asetuksesi tallennettiin onnistuneesti.',
 'timezonelegend'      => 'Aikavyöhyke',
 'timezonetext'        => 'Paikallisen ajan ja palvelimen ajan (UTC) välinen aikaero tunteina.',
 'localtime'           => 'Paikallinen aika',
@@ -600,16 +600,12 @@ Sivun lähdekoodi:',
 
 # Default group names and descriptions
 #
-'group-anon-name'       => 'Anonyymi',
-'group-anon-desc'       => 'Käyttäjät, joilla ei ole tunnusta tai jotka eivät ole kirjautuneet sisään',
-'group-loggedin-name'   => 'Käyttäjä',
-'group-loggedin-desc'   => 'Käyttäjät, jotka ovat kirjautuneet sisään',
-'group-admin-name'      => 'Ylläpitäjä',
-'group-admin-desc'      => 'Luotetut käyttäjät voivat estää käyttäjiä ja poistaa ja suojata artikkeleita',
-'group-bureaucrat-name' => 'Byrokraatti',
+'group-sysop-name'      => 'Ylläpitäjät',
+'group-sysop-desc'      => 'Luotetut käyttäjät voivat estää käyttäjiä ja poistaa ja suojata artikkeleita',
+'group-bureaucrat-name' => 'Byrokraatit',
 'group-bureaucrat-desc' => 'Byrokraatit voivat tehdä ylläpitäjiä',
-'group-steward-name'    => 'Ylivalvoja',
-'group-steward-desc'    => 'Ylivalvojilla on kaikki oikeudet',
+'group-bot-name'        => 'Botit',
+'group-bot-desc'        => '',
 
 # Recent changes
 #
@@ -644,7 +640,7 @@ Sivun lähdekoodi:',
 'uploadlink'          => 'Tallenna kuvia',
 'reupload'            => 'Uusi tallennus',
 'reuploaddesc'        => 'Paluu tallennuslomakkeelle.',
-'uploadnologin'       => 'Et ole kirjaunut sisään',
+'uploadnologin'       => 'Et ole kirjautunut sisään',
 'uploadnologintext'   => 'Sinun pitää olla [[Special:Userlogin|kirjautuneena sisään]], jotta voisit tallentaa tiedostoja.',
 'upload_directory_read_only' => 'Palvelimella ei ole kirjoitusoikeuksia tallennushakemistoon "$1".',
 'uploaderror'         => 'Tallennusvirhe',
@@ -762,7 +758,7 @@ Huomaa, että {{GRAMMAR:inessive|{{SITENAME}}}} muut voivat muokata tai poistaa
 'randompage'          => 'Satunnainen sivu',
 'shortpages'          => 'Lyhyet sivut',
 'longpages'           => 'Pitkät sivut',
-'deadendpages'        => 'Sivut, joilta ei linkkejä',
+'deadendpages'        => 'Sivut, joilla ei ole linkkejä',
 'listusers'           => 'Käyttäjälista',
 'specialpages'        => 'Toimintosivut',
 'spheading'           => 'Toimintosivut',
@@ -975,7 +971,7 @@ Palaute ja lisäapu osoitteessa:
 # Block/unblock IP
 #
 'blockip'             => 'Aseta muokkausesto',
-'blockiptext'         => 'Tällä lomakkeella voit estää käyttäjän tai IP-osoitteen muokkausoikeudet. Muokkausoikeuksien poistamiseen pitää olla syy, esimerkiksi sivujen vandalisointi. Kirjoita syy siihen varattuun kenttään.<br />Vanhenemisajat noudattavat GNUn standardimuotoa, joka on kuvattu tar-manuaalissa ([http://www.gnu.org/software/tar/manual/html_chapter/tar_7.html] [EN]), esimerkiksi ”1 hour”, ”2 days”, ”next Wednesday”, ”1 January 2017”. Esto voi olla myös ”indefinite” tai ”infinite”, joka kestää siihen asti, että se poistetaan.',
+'blockiptext'         => 'Tällä lomakkeella voit estää käyttäjän tai IP-osoitteen muokkausoikeudet. Muokkausoikeuksien poistamiseen pitää olla syy, esimerkiksi sivujen vandalisointi. Kirjoita syy siihen varattuun kenttään.<br />Vanhenemisajat noudattavat GNUn standardimuotoa, joka on kuvattu tar-manuaalissa ([http://www.gnu.org/software/tar/manual/html_chapter/tar_7.html] [EN]), esimerkiksi ”1 hour”, ”2 days”, ”next Wednesday”, 2005-08-29”. Esto voi olla myös ”indefinite” tai ”infinite”, joka kestää kunnes se poistetaan.',
 'ipaddress'           => 'IP-osoite', // TODO bug
 'ipadressorusername'  => 'IP-osoite tai käyttäjätunnus',
 'ipbexpiry'           => 'Umpeutuu',
@@ -990,7 +986,7 @@ Palaute ja lisäapu osoitteessa:
 'unblockip'           => 'Muokkauseston poisto',
 'unblockiptext'       => 'Tällä lomakkeella voit poistaa käyttäjän tai IP-osoitteen muokkauseston.',
 'ipusubmit'           => 'Poista esto',
-'ipusuccess'          => 'IP-osoitteen tai käyttäjän <b>$1<b> esto poistettu', // TODO NOWIKIMARKUP
+'ipusuccess'          => 'IP-osoitteen tai käyttäjän <b>$1</b> esto poistettu', // TODO NOWIKIMARKUP
 'ipblocklist'         => 'Lista estetyistä IP-osoitteista',
 'ipblocklistempty'    => 'Estolista on tyhjä.',
 'blocklistline'       => '$1 — $2 on estänyt käyttäjän $3 ($4)',
@@ -1039,7 +1035,7 @@ Palaute ja lisäapu osoitteessa:
 'setbureaucratflag'   => 'Tee käyttäjästä myös byrokraatti',
 'bureaucratlog'       => 'Byrokraattiloki',
 'rightslogtext'       => 'Alla on loki on käyttäjien käyttöoikeuksien muutoksista.',
-'bureaucratlogentry'  => 'Käyttäjän $1 ryhmäoikeudet muutettiin ryhmästä $2 ryhmään $3', // TODO: Inflect me
+'bureaucratlogentry'  => 'Käyttäjän [[$1|]] sai oikeudet$3', // TODO: Inflect me
 'rights'              => 'Oikeudet:',
 'set_user_rights'     => 'Aseta käyttäjän oikeudet',
 'user_rights_set'     => 'Käyttäjän <b>$1</b> oikeudet päivitetty.',
-- 
cgit v1.2.3


From f98b421d2df8c43ee6e567904a727970dc909da1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 12 Sep 2005 21:52:45 +0000
Subject: * (bug 3448) Set page_len on undelete

---
 RELEASE-NOTES                |  1 +
 includes/SpecialUndelete.php | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d96ac7421f28..69f2add5a0c6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -755,6 +755,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Support SVG rendering with rsvg
 * Cap arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide
 * (bug 3127) Render large SVGs at image page size correctly
+* (bug 3448) Set page_len on undelete
 
 
 === Caveats ===
diff --git a/includes/SpecialUndelete.php b/includes/SpecialUndelete.php
index 09ef8678e5fc..5613b283f8b7 100644
--- a/includes/SpecialUndelete.php
+++ b/includes/SpecialUndelete.php
@@ -214,10 +214,22 @@ class PageArchive {
 			);
 		$revision = null;
 		while( $row = $dbw->fetchObject( $result ) ) {
+			if( $row->ar_text_id ) {
+				// Revision was deleted in 1.5+; text is in
+				// the regular text table, use the reference.
+				// Specify null here so the so the text is
+				// dereferenced for page length info if needed.
+				$revText = null;
+			} else {
+				// Revision was deleted in 1.4 or earlier.
+				// Text is squashed into the archive row, and
+				// a new text table entry will be created for it.
+				$revText = Revision::getRevisionText( $row, 'ar_' );
+			}
 			$revision = new Revision( array(
 				'page'       => $pageId,
 				'id'         => $row->ar_rev_id,
-				'text'       => Revision::getRevisionText( $row, 'ar_' ),
+				'text'       => $revText,
 				'comment'    => $row->ar_comment,
 				'user'       => $row->ar_user,
 				'user_text'  => $row->ar_user_text,
-- 
cgit v1.2.3


From ec50b42fa35e8c3c4bc0c8aea313742559d173bf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 12 Sep 2005 22:48:17 +0000
Subject: Copy bug 2800 fix from head

---
 RELEASE-NOTES       | 1 +
 includes/Linker.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69f2add5a0c6..bb5958b44d10 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -756,6 +756,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Cap arbitrary SVG renders to given image size or $wgSVGMaxSize pixels wide
 * (bug 3127) Render large SVGs at image page size correctly
 * (bug 3448) Set page_len on undelete
+* (bug 2800) Don't scale up small iamges on |thumb| without explicit size
 
 
 === Caveats ===
diff --git a/includes/Linker.php b/includes/Linker.php
index bf25abd7fbbf..40e1390ea287 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -406,7 +406,7 @@ class Linker {
 					 $wopt = User::getDefaultOption( 'thumbsize' );
 				}
 				
-				$width = $wgThumbLimits[$wopt];
+				$width = min( $img->getWidth(), $wgThumbLimits[$wopt] );
 			}
 			
 			return $prefix.$this->makeThumbLinkObj( $img, $label, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
-- 
cgit v1.2.3


From b215aaf80974cf89ff99a3530e12f2ed3fd366e0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 13 Sep 2005 01:28:03 +0000
Subject: * Use the real file link instead of the default-size rasterized
 version for   large SVG images on image description page * Include the file
 name/type/size line for non-resized images copy from head

---
 RELEASE-NOTES          |  3 +++
 includes/ImagePage.php | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bb5958b44d10..05e757f25c0c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -757,6 +757,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3127) Render large SVGs at image page size correctly
 * (bug 3448) Set page_len on undelete
 * (bug 2800) Don't scale up small iamges on |thumb| without explicit size
+* Use the real file link instead of the default-size rasterized version for
+  large SVG images on image description page
+* Include the file name/type/size line for non-resized images
 
 
 === Caveats ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 0a40e55a4d22..8ce5fbb5358f 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -132,7 +132,7 @@ class ImagePage extends Article {
 		global $wgOut, $wgUser, $wgImageLimits, $wgRequest,
 		       $wgUseImageResize, $wgRepositoryBaseUrl,
 		       $wgUseExternalEditor, $wgServer, $wgFetchCommonsDescriptions;
-		$full_url  = $this->img->getViewURL();
+		$full_url  = $this->img->getURL();
 		$anchoropen = '';
 		$anchorclose = '';
 
@@ -172,20 +172,25 @@ class ImagePage extends Article {
 					if( $wgUseImageResize ) {
 						$thumbnail = $this->img->getThumbnail( $width );
 						if ( $thumbnail == null ) {
-							$url = $full_url;
+							$url = $img->getViewURL();
 						} else {
-							$url = $thumbnail->getUrl();
+							$url = $thumbnail->getURL();
 						}
 					} else {
 						# No resize ability? Show the full image, but scale
 						# it down in the browser so it fits on the page.
-						$url = $full_url;
+						$url = $img->getViewURL();
 					}
 					$anchoropen  = "<a href=\"{$full_url}\">";
-					$anchorclose = "</a><br />\n$anchoropen{$msg}</a>";
+					$anchorclose = "</a><br />";
+					if( $this->img->mustRender() ) {
+						$showLink = true;
+					} else {
+						$anchorclose .= "\n$anchoropen{$msg}</a>";
+					}
 				} else {
-					$url = $full_url;
-					$showLink = $this->img->mustRender();
+					$url = $this->img->getViewURL();
+					$showLink = true;
 				}
 				$wgOut->addHTML( '<div class="fullImageLink" id="file">' . $anchoropen .
 				     "<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" .
@@ -199,7 +204,7 @@ class ImagePage extends Article {
 					$icon->toHtml() .
 					'</a></div>' );
 				}
-
+				
 				$showLink = true;
 			}
 
@@ -209,7 +214,7 @@ class ImagePage extends Article {
 				$info = wfMsg( 'fileinfo',
 					ceil($this->img->getSize()/1024.0),
 					$this->img->getMimeType() );
-
+	
 				if (!$this->img->isSafeFile()) {
 					$warning = wfMsg( 'mediawarning' );
 					$wgOut->addWikiText( <<<END
-- 
cgit v1.2.3


From cb2fa92bade1923d475a8fd5df1354f6d896bdd1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 13 Sep 2005 07:04:42 +0000
Subject: * (bug 3412) Clean up date format handling so ~~~~-sigs work with
 default   format as designed. Documentation comments updated.

---
 RELEASE-NOTES          |  2 ++
 includes/Defines.php   | 11 ++++++++
 languages/Language.php | 72 ++++++++++++++++++++++++--------------------------
 3 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 05e757f25c0c..9bcf4d607fdc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -760,6 +760,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Use the real file link instead of the default-size rasterized version for
   large SVG images on image description page
 * Include the file name/type/size line for non-resized images
+* (bug 3412) Clean up date format handling so ~~~~-sigs work with default
+  format as designed. Documentation comments updated.
 
 
 === Caveats ===
diff --git a/includes/Defines.php b/includes/Defines.php
index 67789ec96636..e17dc2b7809e 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -129,4 +129,15 @@ define( 'ALF_NO_LINK_LOCK', 4 );
 define( 'ALF_NO_BLOCK_LOCK', 8 );
 /**#@-*/
 
+/**#@+
+ * Date format selectors; used in user preference storage and by
+ * Language::date() and co.
+ */
+define( 'MW_DATE_DEFAULT', '0' );
+define( 'MW_DATE_MDY', '1' );
+define( 'MW_DATE_DMY', '2' );
+define( 'MW_DATE_YMD', '3' );
+define( 'MW_DATE_ISO', 'ISO 8601' );
+/**#@-*/
+
 ?>
diff --git a/languages/Language.php b/languages/Language.php
index ac312ed5c176..239bf2a1b5c7 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -110,11 +110,11 @@ if(isset($wgExtraNamespaces)) {
 # Whether to use user or default setting in Language::date()
 
 /* private */ $wgDateFormatsEn = array(
-	'No preference',
-	'16:12, January 15, 2001',
-	'16:12, 15 January 2001',
-	'16:12, 2001 January 15',
-	'ISO 8601' => '2001-01-15 16:12:34'
+	MW_DATE_DEFAULT => 'No preference',
+	MW_DATE_MDY => '16:12, January 15, 2001',
+	MW_DATE_DMY => '16:12, 15 January 2001',
+	MW_DATE_YMD => '16:12, 2001 January 15',
+	MW_DATE_ISO => '2001-01-15 16:12:34'
 );
 
 /* private */ $wgUserTogglesEn = array(
@@ -2394,23 +2394,28 @@ class Language {
 	 * all children.
 	 *
 	 *<code>
-	 * function timeanddate([...], $format = '0') {
+	 * function timeanddate([...], $format = true) {
 	 * 	$datePreference = $this->dateFormat($format);
 	 * [...]
 	 *</code>
 	 *
-	 * @param mixed $format
+	 * @param bool $usePrefs: if false, the site/language default is used
 	 * @return string
 	 */
-	function dateFormat( $format ) {
-		global $wgUser;
+	function dateFormat( $usePrefs = true ) {
+		global $wgUser, $wgAmericanDates;
 
-		if ( !$wgUser->isLoggedIn() || $format === false ) {
-			$options = $this->getDefaultUserOptions();
-			return (string)$options['date'];
+		if( $usePrefs ) {
+			$datePreference = $wgUser->getOption( 'date' );
 		} else {
-			return $wgUser->getOption( 'date' );
+			$options = $this->getDefaultUserOptions();
+			$datePreference = (string)$options['date'];
 		}
+
+		if( $datePreference == MW_DATE_DEFAULT || $datePreference == '' ) {
+			return $wgAmericanDates ? MW_DATE_MDY : MW_DATE_DMY;
+		}
+		return $datePreference;
 	}
 
 	/**
@@ -2419,30 +2424,26 @@ class Language {
 	 *               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
 	 * @param bool   $adj whether to adjust the time output according to the
 	 *               user configured offset ($timecorrection)
-	 * @param mixed  $format what format to return, if it's false output the
-	 *               default one.
+	 * @param bool   $format true to use user's date format preference
 	 * @param string $timecorrection the time offset as returned by
 	 *               validateTimeZone() in Special:Preferences
 	 * @return string
 	 */
 	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
-		global $wgAmericanDates, $wgUser;
+		global $wgUser;
 
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
 
-		$datePreference = $this->dateFormat($format);
-
-		if ($datePreference == '0'
-		    || $datePreference == '' ) {$datePreference = $wgAmericanDates ? '0' : '2';}
+		$datePreference = $this->dateFormat( $format );
 
 		$month = $this->getMonthName( substr( $ts, 4, 2 ) );
 		$day = $this->formatNum( 0 + substr( $ts, 6, 2 ) );
 		$year = $this->formatNum( substr( $ts, 0, 4 ), true );
 
 		switch( $datePreference ) {
-			case '2': return "$day $month $year";
-			case '3': return "$year $month $day";
-			case 'ISO 8601': return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
+			case MW_DATE_DMY: return "$day $month $year";
+			case MW_DATE_YMD: return "$year $month $day";
+			case MW_DATE_ISO: return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
 			default: return "$month $day, $year";
 		}
 	}
@@ -2453,23 +2454,20 @@ class Language {
 	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
 	* @param bool   $adj whether to adjust the time output according to the
 	*               user configured offset ($timecorrection)
-	* @param mixed  $format what format to return, if it's false output the
-	*               default one (default true)
+	* @param bool   $format true to use user's date format preference
 	* @param string $timecorrection the time offset as returned by
 	*               validateTimeZone() in Special:Preferences
 	* @return string
 	*/
 	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
-		global $wgUser, $wgAmericanDates;
+		global $wgUser;
 
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
-		$datePreference = $this->dateFormat($format);
-
-		if ($datePreference == '0') {$datePreference = $wgAmericanDates ? '0' : '2';}
+		$datePreference = $this->dateFormat( $format );
 
 		$t = substr( $ts, 8, 2 ) . ':' . substr( $ts, 10, 2 );
 
-		if ( $datePreference === 'ISO 8601' ) {
+		if ( $datePreference == MW_DATE_ISO ) {
 			$t .= ':' . substr( $ts, 12, 2 );
 		}
 		return $this->formatNum( $t );
@@ -2481,22 +2479,20 @@ class Language {
 	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
 	* @param bool   $adj whether to adjust the time output according to the
 	*               user configured offset ($timecorrection)
-	* @param mixed  $format what format to return, if it's false output the
-	*               default one (default true)
+	* @param bool   $format true to use user's date format preference
 	* @param string $timecorrection the time offset as returned by
 	*               validateTimeZone() in Special:Preferences
 	* @return string
 	*/
 	function timeanddate( $ts, $adj = false, $format = true, $timecorrection = false) {
-		global $wgUser, $wgAmericanDates;
+		global $wgUser;
 
 		$datePreference = $this->dateFormat($format);
-
 		switch ( $datePreference ) {
-			case 'ISO 8601': return $this->date( $ts, $adj, $datePreference, $timecorrection ) . ' ' .
-				$this->time( $ts, $adj, $datePreference, $timecorrection );
-			default: return $this->time( $ts, $adj, $datePreference, $timecorrection ) . ', ' .
-				$this->date( $ts, $adj, $datePreference, $timecorrection );
+			case MW_DATE_ISO: return $this->date( $ts, $adj, $format, $timecorrection ) . ' ' .
+				$this->time( $ts, $adj, $format, $timecorrection );
+			default: return $this->time( $ts, $adj, $format, $timecorrection ) . ', ' .
+				$this->date( $ts, $adj, $format, $timecorrection );
 		}
 	}
 
-- 
cgit v1.2.3


From 0c6082614d7770d4eac9a896f649429670f1217f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 13 Sep 2005 18:19:53 +0000
Subject: Bug 1423: LanguageJa.php update needed

---
 RELEASE-NOTES            |    3 +-
 languages/LanguageJa.php | 2520 ++++++++++++++++++++++++++++++++--------------
 2 files changed, 1755 insertions(+), 768 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9bcf4d607fdc..b779c63e9834 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -762,8 +762,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Include the file name/type/size line for non-resized images
 * (bug 3412) Clean up date format handling so ~~~~-sigs work with default
   format as designed. Documentation comments updated.
-
-
+* (bug 1423) LanguageJa.php update
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php
index 1dc06a74da07..7ab5a6ce9dc6 100644
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -21,8 +21,8 @@ require_once( "LanguageUtf8.php" );
 	NS_MEDIAWIKI_TALK => "MediaWiki‐ノート", /* MediaWiki_talk */
 	NS_TEMPLATE       => "Template", /* Template */
 	NS_TEMPLATE_TALK  => "Template‐ノート", /* Template_talk */
-	NS_HELP           => "ヘルプ", /* Help */
-	NS_HELP_TALK      => "ヘルプ‐ノート", /* Help_talk */
+	NS_HELP           => "Help", /* Help */
+	NS_HELP_TALK      => "Help‐ノート", /* Help_talk */
 	NS_CATEGORY       => "Category", /* Category */
 	NS_CATEGORY_TALK  => "Category‐ノート" /* Category_talk */
 ) + $wgNamespaceNamesEn;
@@ -37,811 +37,1779 @@ require_once( "LanguageUtf8.php" );
 	'cologneblue' => "ケルンブルー",
 ) + $wgSkinNamesEn;
 
-
+/* private */ $wgDateFormatsJa = array(
+	MW_DATE_DEFAULT => '2001年1月15日 16:12 (デフォルト)',
+	MW_DATE_ISO => '2001-01-15 16:12:34'
+);
 
 /* private */ $wgWeekdayAbbreviationsJa = array(
 	"日", "月", "火", "水", "木", "金", "土"
 );
 
-
-
 /* private */ $wgAllMessagesJa = array(
-# User Toggles
-
-"tog-underline" => "リンクにアンダーラインをつける",
-"tog-highlightbroken" => "未作成のページへのリンクをハイライトする",
-"tog-justify" => "段落を均等割り付けする",
-"tog-hideminor" => "最近更新したページから細部の編集を隠す",
-"tog-usenewrc" => "最近更新したページを拡張する (全てのブラウザで使えません)",
-"tog-numberheadings" => "見出しに番号を振る",
-"tog-showtoolbar" => "編集ボタンを表示する",
-"tog-editondblclick" => "ダブルクリックで編集する (JavaScript)",
-"tog-editsection" => "セクション編集を有効にする",
-"tog-editsectiononrightclick" => "セクションタイトルの右クリックでセクション編集を行えるようにする (JavaScript)",
-"tog-showtoc" => "目次を表示する (4つ以上の見出しがあるページ)",
-"tog-rememberpassword" => "セッションを越えてパスワードを記憶する",
-"tog-editwidth" => "テキストボックスを横幅いっぱいに表示する",
-"tog-watchdefault" => "編集した記事をウォッチリストに追加する",
-"tog-minordefault" => "細部の編集をデフォルトでチェックする",
-"tog-previewontop" => "プレビューをテキストボックスの前に配置する",
-"tog-nocache" => "ページをキャッシュしない",
-# Dates
-
-'sunday' => "日曜日",
-'monday' => "月曜日",
-'tuesday' => "火曜日",
-'wednesday' => "水曜日",
-'thursday' => "木曜日",
-'friday' => "金曜日",
-'saturday' => "土曜日",
-'january' => "1月",
-'february' => "2月",
-'march' => "3月",
-'april' => "4月",
-'may_long' => "5月",
-'june' => "6月",
-'july' => "7月",
-'august' => "8月",
-'september' => "9月",
-'october' => "10月",
-'november' => "11月",
-'december' => "12月",
-'jan' => "1月",
-'feb' => "2月",
-'mar' => "3月",
-'apr' => "4月",
-'may' => "5月",
-'jun' => "6月",
-'jul' => "7月",
-'aug' => "8月",
-'sep' => "9月",
-'oct' => "10月",
-'nov' => "11月",
-'dec' => "12月",
 
+# The navigation toolbar, int: is used here to make sure that the appropriate
+# messages are automatically pulled from the user-selected language file.
+
+/*
+The sidebar for MonoBook is generated from this message, lines that do not
+begin with * or ** are discarded, furthermore lines that do begin with ** and
+do not contain | are also discarded, but don't depend on this behaviour for
+future releases. Also note that since each list value is wrapped in a unique
+XHTML id it should only appear once and include characters that are legal
+XHTML id names.
+
+Note to translators: Do not include this message in the language files you
+submit for inclusion in MediaWiki, it should always be inherited from the
+parent class in order maintain consistency across languages.
+*/
+# 'sidebar' => '',
+
+# User preference toggles
+'tog-underline' => 'リンクの下線:',
+'tog-highlightbroken' => '未作成のページへのリンクを<a href="javascript:void(0);" class="new" onclick="return false;">ハイライト</a>する (チェックしないとこのように<a href="javascript:void(0);" class="internal" onclick="return false;">?</a>なる)',
+'tog-justify' => '段落を均等割り付けする',
+'tog-hideminor' => '最近更新したページから細部の編集を隠す',
+'tog-usenewrc' => '最近更新したページを拡張する（対応していないブラウザもあります）',
+'tog-numberheadings' => '見出しに番号を振る',
+'tog-showtoolbar' => '編集ボタンを表示する',
+'tog-editondblclick' => 'ダブルクリックで編集する (JavaScript)',
+'tog-editsection' => 'セクション編集用リンクを有効にする',
+'tog-editsectiononrightclick' => 'セクションタイトルの右クリックでセクション編集を行えるようにする (JavaScript)',
+'tog-showtoc' => '目次を表示する (4つ以上の見出しがあるページ)',
+'tog-rememberpassword' => 'セッションを越えてパスワードを記憶する',
+'tog-editwidth' => 'テキストボックスを横幅いっぱいに表示する',
+'tog-watchdefault' => '編集した記事をウォッチリストに追加する',
+'tog-minordefault' => '細部の編集をデフォルトでチェックする',
+'tog-previewontop' => 'プレビューをテキストボックスの前に配置する',
+'tog-previewonfirst' => '編集時にはじめからプレビューを表示する',
+'tog-nocache' => 'ページをキャッシュしない',
+'tog-enotifwatchlistpages' => 'ページが更新されたときにメールを受け取る',
+'tog-enotifusertalkpages' => '自分の会話ページが更新されたときにメールを受け取る',
+'tog-enotifminoredits' => '細部の編集でもメールを受け取る',
+'tog-enotifrevealaddr' => 'あなた以外に送られる通知メールにあなたのメールアドレスを記載する',
+'tog-shownumberswatching' => 'ページをウォッチしているユーザー数を表示する',
+'tog-fancysig' => '署名を自動的に利用者ページへリンクさせない',
+'tog-externaleditor' => '編集に外部アプリケーションを使う',
+'tog-externaldiff' => '差分表示に外部アプリケーションを使う',
+
+'underline-always' => '常に付ける',
+'underline-never' => '常に付けない',
+'underline-default' => 'ブラウザに従う',
+
+'skinpreview' => '(プレビュー)',
+
+# dates
+'sunday' => '日曜日',
+'monday' => '月曜日',
+'tuesday' => '火曜日',
+'wednesday' => '水曜日',
+'thursday' => '木曜日',
+'friday' => '金曜日',
+'saturday' => '土曜日',
+'january' => '1月',
+'february' => '2月',
+'march' => '3月',
+'april' => '4月',
+'may_long' => '5月',
+'june' => '6月',
+'july' => '7月',
+'august' => '8月',
+'september' => '9月',
+'october' => '10月',
+'november' => '11月',
+'december' => '12月',
+'jan' => '1月',
+'feb' => '2月',
+'mar' => '3月',
+'apr' => '4月',
+'may' => '5月',
+'jun' => '6月',
+'jul' => '7月',
+'aug' => '8月',
+'sep' => '9月',
+'oct' => '10月',
+'nov' => '11月',
+'dec' => '12月',
 # Bits of text used by many pages:
 #
-"mainpage"		=> "メインページ",
-"about"			=> "About",
-"aboutsite"      => "{{SITENAME}}について",
-"aboutpage"		=> "{{ns:4}}:About",
-"help"			=> "ヘルプ",
-"helppage"		=> "{{ns:4}}:Help",
-"bugreports"	=> "バグの報告",
-"bugreportspage" => "{{ns:4}}:バグの報告",
-"faq"			=> "FAQ",
-"faqpage"		=> "{{ns:4}}:FAQ",
-"edithelp"		=> "ヘルプを編集",
-"edithelppage"	=> "{{ns:4}}:編集の仕方",
-"cancel"		=> "中止",
-"qbfind"		=> "検索",
-"qbbrowse"		=> "閲覧",
-"qbedit"		=> "編集",
-"qbpageoptions" => "ページ・オプション",
-"qbpageinfo"	=> "ページ情報",
-"qbmyoptions"	=> "オプション",
-"mypage"		=> "マイ・ページ",
-"mytalk"		=> "マイ・トーク",
-"currentevents" => "最近の出来事",
-"errorpagetitle" => "エラー",
-"returnto"		=> "$1 に戻る。",
-"tagline"      	=> "出典: フリー百科事典『ウィキペディア（{{SITENAME}}）』",
-"whatlinkshere"	=> "ここにリンクしているページ",
-"help"			=> "ヘルプ",
-"search"		=> "検索",
-"history"		=> "履歴",
-"printableversion" => "印刷用バージョン",
-"editthispage"	=> "このページを編集",
-"deletethispage" => "このページを削除",
-"protectthispage" => "このページを保護",
-"unprotectthispage" => "ページ保護解除",
-"talkpage"		=> "この記事のノート",
-"subjectpage"	=> "サブジェクト・ページ",
-"otherlanguages" => "他の言語",
-"redirectedfrom" => "($1 から転送)",
-"lastmodified"	=> "最終更新 $1。",
-"viewcount"		=> "このページは $1 回アクセスされました。",
-"printsubtitle" => "(From {{SERVER}})",
-"protectedpage" => "保護されたページ",
-"administrators" => "{{ns:4}}:Administrators",
-"sysoptitle"	=> "シスオペによるアクセスが必要",
-"sysoptext"		=> "あなたの要求した処理は \"sysop\" のみが実行できます。
- $1を参照してください。",
-"developertitle" => "開発者によるアクセスが必要",
-"developertext"	=> "あなたの要求した処理を実行できるのは、 \"developer\" のみです。 $1を参照してください。",
-"nbytes"		=> "$1 バイト",
-"go"			=> "行く",
-"ok"			=> "OK",
-"sitetitle"		=> "{{SITENAME}}",
-"sitesubtitle"	=> "フリー百科事典",
-"retrievedfrom" => "Retrieved from \"$1\"",
+'categories' => 'カテゴリ',
+'category' => 'カテゴリ',
+'category_header' => 'カテゴリ: “$1”',
+'subcategories' => 'サブカテゴリ',
+
+
+'linktrail' => '/^$/sD',
+'linkprefix' => '/^(.*?)([a-zA-Z\\x80-\\xff]+)$/sD',
+'mainpage' => 'メインページ',
+'mainpagetext' => 'Wikiソフトウェアが正常にインストールされました。',
+'mainpagedocfooter' => '[http://meta.wikimedia.org/wiki/MediaWiki_localization インターフェイスの変更方法]や、そのほかの使い方・設定に関しては[http://meta.wikimedia.org/wiki/Help:Contents ユーザーズガイド]を参照してください。',
+
+'portal' => 'コミュニティ・ポータル',
+'portal-url' => 'Project:コミュニティ・ポータル',
+'about' => '解説',
+'aboutsite' => '{{SITENAME}}について',
+'aboutpage' => 'Project:About',
+'article' => '本文',
+'help' => 'ヘルプ',
+'helppage' => 'Help:Contents',
+'bugreports' => 'バグの報告',
+'bugreportspage' => 'Project:バグの報告',
+'sitesupport' => '寄付',
+'sitesupport-url' => 'Project:Site support',
+'faq' => 'FAQ',
+'faqpage' => '{{ns:4}}:FAQ',
+'edithelp' => '編集の仕方',
+'newwindow' => '（新しいウィンドウが開きます）',
+'edithelppage' => 'Help:編集の仕方',
+'cancel' => '中止',
+'qbfind' => '検索',
+'qbbrowse' => '閲覧',
+'qbedit' => '編集',
+'qbpageoptions' => '個人用ツール',
+'qbpageinfo' => 'ページ情報',
+'qbmyoptions' => 'オプション',
+'qbspecialpages' => '特別ページ',
+'moredotdotdot' => 'すべて表示する',
+'mypage' => 'マイ・ページ',
+'mytalk' => 'マイ・トーク',
+'anontalk' => 'このIPとの会話',
+'navigation' => 'ナビゲーション',
+
+# Metadata in edit box
+'metadata' => 'Metadata',
+'metadata_page' => '{{ns:Project}}:Metadata',
+
+'currentevents' => '最近の出来事',
+'currentevents-url' => '最近の出来事',
+
+'disclaimers' => '免責事項',
+'disclaimerpage' => 'Project:免責事項',
+'errorpagetitle' => 'エラー',
+'returnto' => '$1 に戻る。',
+'tagline' => '出典: {{SITENAME}}',
+'whatlinkshere' => 'リンク元',
+'help' => 'ヘルプ',
+'search' => '検索',
+'go' => '表示',
+'history' => '履歴',
+'history_short' => '履歴',
+'info_short' => 'ページ情報',
+'printableversion' => '印刷用バージョン',
+'print' => 'Print',
+'edit' => '編集',
+'editthispage' => 'このページを編集',
+'delete' => '削除',
+'deletethispage' => 'このページを削除',
+'undelete_short1' => '削除済1版',
+'undelete_short' => '削除済$1版',
+'protect' => '保護',
+'protectthispage' => 'このページを保護',
+'unprotect' => '保護解除',
+'unprotectthispage' => 'ページ保護解除',
+'newpage' => '新規ページ',
+'talkpage' => 'このページのノート',
+'specialpage' => '特別ページ',
+'personaltools' => '個人用ツール',
+'postcomment' => '新規にコメントを投稿',
+'addsection' => '+',
+'articlepage' => '項目を表示',
+'subjectpage' => 'サブジェクト・ページ',
+'talk' => 'ノート',
+'views' => '表示',
+'toolbox' => 'ツールボックス',
+'userpage' => '利用者ページを表示',
+'wikipediapage' => '{{SITENAME}}ページを表示',
+'imagepage' => '画像のページを表示',
+'viewtalkpage' => 'ノートを表示',
+'otherlanguages' => '他の言語',
+'redirectedfrom' => '（$1 から転送）',
+'lastmodified' => '最終更新 $1。',
+'viewcount' => 'このページは $1 回アクセスされました。',
+'copyright' => 'Content is available under $1.',
+'poweredby' => '{{SITENAME}} is powered by [http://www.mediawiki.org/ MediaWiki], an open source wiki engine.',
+'printsubtitle' => '(From {{SERVER}}/)',
+'protectedpage' => '保護されたページ',
+'administrators' => '{{ns:Project}}:管理者',
+
+'sysoptitle' => '管理者によるアクセスが必要',
+'sysoptext' => 'あなたの要求した処理は管理者のみが実行できます。
+$1を参照してください。',
+'developertitle' => '開発者によるアクセスが必要',
+'developertext' => 'あなたの要求した処理は開発者のみが実行できます。
+$1 を参照してください。',
+
+'badaccess' => '権限がありません',
+'badaccesstext' => 'あなたの要求した処理は "$2" の権限を持ったユーザーのみが実行できます。詳しくは $1 を参照してください。',
+
+'versionrequired' => 'MediaWiki Version $1 が必要',
+'versionrequiredtext' => 'このページの利用には MediaWiki Version $1 が必要です。[[{{ns:Special}}:Version]]を確認してください。',
+
+'nbytes' => '$1 バイト',
+'ok' => 'OK',
+'sitetitle' => '{{SITENAME}}',
+'pagetitle' => '$1 - {{SITENAME}}',
+'sitesubtitle' => '-',
+'retrievedfrom' => ' "$1" より作成',
+'newmessages' => '$1が届いています。',
+'newmessageslink' => '新しいメッセージ',
+'editsection' => '編集',
+'toc' => '目次',
+'showtoc' => '表示',
+'hidetoc' => '非表示',
+'thisisdeleted' => '$1 を参照または復帰する。',
+'restorelink1' => '削除された 1 編集',
+'restorelink' => '削除された $1 編集',
+'feedlinks' => 'Feed:',
+'sitenotice' => '-',
+
+# Short words for each namespace, by default used in the 'article' tab in monobook
+'nstab-main' => '本文',
+'nstab-user' => '利用者ページ',
+'nstab-media' => 'Media',
+'nstab-special' => '特別ページ',
+'nstab-wp' => '解説',
+'nstab-image' => '画像',
+'nstab-mediawiki' => '定型文',
+'nstab-template' => 'Template',
+'nstab-help' => 'Help',
+'nstab-category' => 'カテゴリ',
 
 # Main script and global functions
 #
-"nosuchaction"	=> "そのような動作はありません",
-"nosuchactiontext" => "URI で指定された動作は {{SITENAME}} で認識できません。",
-"nosuchspecialpage" => "そのような特別ページはありません。",
-"nospecialpagetext" => "その特別ページの要求は {{SITENAME}} には理解できません。",
+'nosuchaction' => 'そのような動作はありません',
+'nosuchactiontext' => 'このURIで指定された動作は{{SITENAME}}で認識できません。',
+'nosuchspecialpage' => 'そのような特別ページはありません',
+'nospecialpagetext' => '要求された特別ページは存在しません。有効な特別ページの一覧は[[{{ns:Special}}:Specialpages]]にあります。',
 
 # General errors
 #
-"error"			=> "エラー",
-"databaseerror" => "データベース・エラー",
-"dberrortext"	=> "データベース検索の文法エラー。
-最後に実行を試みた問い合わせ:
+'error' => 'エラー',
+'databaseerror' => 'データベース・エラー',
+'dberrortext' => 'データベース検索の文法エラー。これは恐らくソフトウェアのバグを表しています。
+
+最後に実行を試みた問い合わせ: 
 <blockquote><tt>$1</tt></blockquote>
-from within function \"<tt>$2</tt>\".
-MySQL returned error \"<tt>$3: $4</tt>\".",
-"noconnect"		=> "$1 のデータベースに接続できません。",
-"nodb"			=> "$1 のデータベースを選択できません。",
-"readonly"		=> "データベースはロックされています",
-"enterlockreason" => "ロックする理由を入力して下さい。ロックが解除されるのがいつになるかの見積もりについても述べて下さい。",
-"readonlytext"	=> "ウィキペディア・データベースは現在、新しい記事の追加や修正を受け付けない「ロック」状態になっています。
-これはおそらくは定期的なメンテナンスのためで、メンテナンス終了後は正常な状態に復帰します。
-データベースをロックした管理者は次のような説明をしています：
-<p>$1
-<p>The {{SITENAME}} database is currently locked to new
-entries and other modifications, probably for routine database maintenance,
-after which it will be back to normal.
-The administrator who locked it offered this explanation:
-<p>$1",
-"missingarticle" => "データベースは、\"$1\"という題のページの、存在するはずの文章を見つけることができませんでした。
-<p>これはデータベースのエラーではなく、ソフトウェアのバグだろうと思われます。
-<p>URI と共に管理者に報告して下さるようにお願いします。
-<p>The database did not find the text of a page
-that it should have found, named \"$1\".
-<p>This is not a database error, but likely a bug in the software.
-<p>Please report this to an administrator, making note of the URI.",
-"internalerror" => "内部処理エラー Internal error",
-"filecopyerror" => "ファイルを\"$1\"から\"$2\"へ複製できませんでした。Could not copy file \"$1\" to \"$2\".",
-"filerenameerror" => "ファイル名を\"$1\"から\"$2\"へ変更できませんでした。Could not rename file \"$1\" to \"$2\".",
-"filedeleteerror" => "ファイル\"$1\"を削除できませんでした。Could not delete file \"$1\".",
-"filenotfound"	=> "ファイルを\"$1\"は見つかりませんでした。Could not find file \"$1\".",
-"unexpected"	=> "エラー：\"$1\" と \"$2\" が同じです。Unexpected value: \"$1\"=\"$2\".",
-"formerror"		=> "エラー: フォームを送信できませんでした。 Error: could not submit form",
-"badarticleerror" => "この動作はこのページではとることができません。 This action cannot be performed on this page.",
-"cannotdelete"	=> "指定されたページ、または画像を削除できませんでした。 Could not delete the page or image specified.",
+
+from within function "<tt>$2</tt>". MySQL returned error "<tt>$3: $4</tt>".',
+'dberrortextcl' => 'A database query syntax error has occurred.
+The last attempted database query was:
+"$1"
+from within function "$2".
+MySQL returned error "$3: $4".
+',
+'noconnect' => '申し訳ありません。何らかの問題によりデータベースに接続できません。<br/>$1',
+'nodb' => 'データベース $1 を選択できません。',
+'cachederror' => 'あなたがアクセスしたページのコピーを保存したものを表示しています。また、コピーは更新されません。',
+'laggedslavemode' => '警告: ページに最新の編集が反映されていない可能性があります。反映されるまでしばらくお待ちください。',
+'readonly' => 'データベースはロックされています',
+'enterlockreason' => 'ロックする理由を入力してください。ロックが解除されるのがいつになるかの見積もりについても述べてください。',
+'readonlytext' => 'データベースは現在、新しいページの追加や編集を受け付けない「ロック状態」になっています。これはおそらく定期的なメンテナンスのためで、メンテナンス終了後は正常な状態に復帰します。データベースをロックした管理者は次のような説明をしています:
+
+$1
+
+----
+The database is currently locked to new entries and other modifications, probably for routine database maintenance, after which it will be back to normal. The administrator who locked it offered this explanation:
+
+$1',
+'missingarticle' => '<p>"$1" という題のページは見つかりませんでした。すでに削除された版を参照しようとしている可能性があります。これがソフトウェアのバグだと思われる場合は、URIと共に管理者に報告して下い。</p>
+<p>The database did not find the text of a page that it should have found, named "$1". This is usually caused by following an outdated diff or history link to a page that has been deleted. If this is not the case, you may have found a bug in the software. Please report this to an administrator, making note of the URL.</p>',
+
+
+'readonly_lag' => 'データベースはスレーブ・サーバがマスタ・サーバに同期するまで自動的にロックされています。しばらくお待ちください。
+
+The database has been automatically locked while the slave database servers catch up to the master.',
+'internalerror' => '内部処理エラー',
+'filecopyerror' => 'ファイル "$1" から "$2" のコピーに失敗しました。',
+'filerenameerror' => 'ファイル名を "$1" から "$2" へ変更できませんでした。',
+'filedeleteerror' => 'ファイル "$1" の削除に失敗しました。',
+'filenotfound' => 'ファイル "$1" が見つかりません。',
+'unexpected' => '値が異常です: $1 = "$2"',
+'formerror' => 'エラー: フォームの送信に失敗しました。',
+'badarticleerror' => 'このページでは要求された処理を行えません。',
+'cannotdelete' => '指定されたページ、または画像の削除に失敗しました。',
+'badtitle' => 'ページタイトルの間違い',
+'badtitletext' => '要求されたページは無効か、何もないか、正しくない inter-language または inter-wiki のタイトルです。',
+'perfdisabled' => 'この機能はデータベースの負荷を軽くするために現在使えなくなっています。',
+'perfdisabledsub' => 'ここには $1 のコピーを表示しています。',
+'perfcached' => '以下のデータはキャッシュであり、しばらく更新されていません。',
+'wrong_wfQuery_params' => 'Incorrect parameters to wfQuery()<br />
+Function: $1<br />
+Query: $2
+',
+'viewsource' => 'ソースを表示',
+'protectedtext' => 'このページは編集できないように保護されています。これにはいくつか理由があります。詳しくは[[{{ns:Project}}:保護されたページ]]をご覧ください。
+
+下にソースを表示しています。',
+
+'sqlhidden' => '(SQL query hidden)',
 
 # Login and logout pages
 #
-"logouttitle"	=> "ユーザー ログアウト",
-"logouttext"	=> "
-ログアウトしました。
-ウィキペディアを匿名で使い続うことができます。
-あるいはログインして元の、あるいは別のユーザーとして使うこともできます。
-<P>You are now logged out.
-You can continue to use {{SITENAME}} anonymously, or you can log in
-again as the same or as a different user.\n",
-
-"welcomecreation" => "<h2>$1 さん、ようこそ!</h2><p>あなたのアカウントができました。
-お好みに合わせてユーザーオプションを変更することをお忘れなく。",
-
-"loginpagetitle" => "ユーザー・ログイン",
-"yourname"		=> "あなたのユーザー名",
-"yourpassword"	=> "あなたのパスワード",
-"yourpasswordagain" => "パスワード再入力",
-"newusersonly"	=> " (新規ユーザのみ)",
-"remembermypassword" => "セッションをまたがってパスワードを保持する。",
-"loginproblem"	=> "<b>ログインでエラーが発生しました。</b><br />再度実行してください。",
-"alreadyloggedin" => "<strong>ユーザ $1 は、すでにログイン済みです。</strong><br />\n",
-
-"login"			=> "ログイン",
-"userlogin"		=> "ログイン",
-"logout"		=> "ログアウト",
-"userlogout"	=> "ログアウト",
-"createaccount"	=> "新規アカウント作成",
-"badretype"		=> "両方のパスワードが一致しません。",
-"userexists"	=> "そのユーザー名はすでに使われています。ほかの名前をお選びください。",
-"youremail"		=> "電子メール",
-"yournick"		=> "ニックネーム (署名用)",
-"emailforlost"	=> "パスワードを忘れたときには、あたらしいパスワードを電子メールで受け取ることが出来ます。",
-"loginerror"	=> "ログイン・エラー",
-"noname"		=> "ユーザ名を正しく指定していません。",
-"loginsuccesstitle" => "ログイン成功",
-"loginsuccess"	=> "あなたは現在 {{SITENAME}} に \"$1\" としてログインしています。",
-"nosuchuser"	=> " \"$1\" というユーザーは見当たりません。
-綴りが正しいか再度確認するか、下記のフォームを使ってアカウントを作成してください。",
-"wrongpassword"	=> "パスワードが間違っています。再度入力してください。",
-"mailmypassword" => "新しいパスワードを、メールで送る",
-"passwordremindertitle" => "Password reminder from {{SITENAME}} （ウィキペディアからのパスワードのお知らせ）",
-"passwordremindertext" => "どなたか ($1 のIPアドレスの使用者)が、{{SITENAME}}のログイン・パスワードの再発行を依頼しました。
-ユーザ \"$2\" のパスワードを、 \"$3\" に変更しました。
-ログイン後、別のパスワードに変更しましょう。",
-"noemail"		=> "ユーザ \"$1\" のメール・アドレスは登録されていません。",
-"passwordsent"	=> "あたらしいパスワードは \"$1\" さんの登録済みメール・アドレスにお送りしました。メールを受け取ったら、再度ログインしてください。",
+'logouttitle' => 'ユーザー ログアウト',
+'logouttext' => '<p>ログアウトしました。このまま{{SITENAME}}を匿名で使い続けることができます。もう一度ログインして元の、あるいは別のユーザーとして使うこともできます。</p>
+<p>※いくつかのページはブラウザのキャッシュをクリアするまでログインしているかのように表示されることがあります。</p>',
+
+'welcomecreation' => '== $1 さん、ようこそ! ==
+あなたのアカウントができました。お好みに合わせて[[Special:Preferences|ユーザーオプション]]を変更することをお忘れなく。',
+
+
+'loginpagetitle' => 'ユーザー ログイン',
+'yourname' => 'あなたのユーザー名',
+'yourpassword' => 'あなたのパスワード',
+'yourpasswordagain' => 'パスワード再入力',
+'newusersonly' => '（新規ユーザーのみ）',
+'remembermypassword' => 'セッションを越えてパスワードを記憶する',
+'yourdomainname' => 'あなたのドメイン',
+'externaldberror' => '外部の認証データベースでエラーが発生たか、または外部アカウント情報の更新が許可されていません。',
+'loginproblem' => '<b>ログインでエラーが発生しました。</b><br />再度実行してください。',
+'alreadyloggedin' => '<b style="color:red">ユーザー $1 は、すでにログイン済みです。</b><br />',
+
+'login' => 'ログイン',
+'loginprompt' => '{{SITENAME}}にログインするにはクッキーを有効にする必要があります。',
+'userlogin' => 'ログインまたはアカウント作成',
+'logout' => 'ログアウト',
+'userlogout' => 'ログアウト',
+'notloggedin' => 'ログインしていません',
+'createaccount' => '新規アカウント作成',
+'createaccountmail' => '電子メール経由',
+'badretype' => '両方のパスワードが一致しません。',
+'userexists' => 'そのユーザー名はすでに使われています。ほかの名前をお選びください。',
+'youremail' => 'メールアドレス*',
+'yourrealname' => 'あなたの本名*',
+'yourlanguage' => 'インターフェース言語',
+'yourvariant' => '字体変換',
+'yournick' => 'ニックネーム（署名用）',
+'email' => 'メールアドレス',
+'emailforlost' => '<nowiki>*</nowiki>マークの項目は任意です。メールアドレスを入力すると、他の人があなたのメールアドレスを知ることなくあなたにメールを送れるようになります。またパスワードを忘れた際にメールでパスワードの再発行を受けられます。本名を入力すると、ページ・クレジットに利用者名（アカウント名）の代わりに本名が表示されます。',
+'prefs-help-email-enotif' => 'このアドレスはあなたが有効にした各種メール通知の送信先としても利用されます。',
+'prefs-help-realname' => '* 本名 (任意): 本名を入力すると、ページ・クレジットに利用者名（アカウント名）の代わりに本名が表示されます。',
+'loginerror' => 'ログイン失敗',
+'prefs-help-email' => '* メールアドレス (任意): メールアドレスを入力すると、他のユーザーがあなたの利用者ページまたは会話ページから、あなたの身元を知ることなく、あなたに連絡が取れるようになります。',
+'nocookiesnew' => 'ユーザーのアカウントは作成されましたが、ログインしていません。{{SITENAME}}ではログインにクッキーを使います。あなたはクッキーを無効な設定にしているようです。クッキーを有効にしてから作成したユーザー名とパスワードでログインしてください。',
+'nocookieslogin' => '{{SITENAME}}ではログインにクッキーを使います。あなたはクッキーを無効な設定にしているようです。クッキーを有効にして、もう一度試してください。',
+'noname' => 'ユーザ名を正しく指定していません。',
+'loginsuccesstitle' => 'ログイン成功',
+'loginsuccess' => '{{SITENAME}} に "$1" としてログインしました。',
+'nosuchuser' => '"$1" というユーザーは見当たりません。綴りが正しいことを再度確認するか、下記のフォームを使ってアカウントを作成してください。',
+'nosuchusershort' => '"$1" というユーザーは見当たりません。綴りが正しいことを再度確認してください。',
+'wrongpassword' => 'パスワードが間違っています。再度入力してください。',
+'mailmypassword' => '新しいパスワードをメールで送る',
+'passwordremindertitle' => 'Password reminder from {{SITENAME}}',
+'passwordremindertext' => 'どなたか（$1 のIPアドレスの使用者）が{{SITENAME}}のログイン用パスワードの再発行を依頼しました。
+
+ユーザー "$2" のパスワードを "$3" に変更しました。
+ログインして別のパスワードに変更してください。',
+'noemail' => 'ユーザー "$1" のメールアドレスは登録されていません。',
+'passwordsent' => '新しいパスワードを "$1" さんの登録済みメールアドレスに送信しました。メールを受け取ったら、再度ログインしてください。',
+'eauthentsent' => '指定されたメールアドレスにアドレス確認のためのメールを送信しました。このアカウントが本当にあなたのものであるか確認するため、あなたがメールの内容に従わない限り、その他のメールはこのアカウント宛には送信されません。',
+# 'loginend' => '',
+'mailerror' => 'メールの送信中にエラーが発生しました: $1',
+'acct_creation_throttle_hit' => 'あなたは既に $1 アカウントを作成しています。これ以上作成できません。',
+'emailauthenticated' => 'あなたのメールアドレスは $1 に認証されています。',
+'emailnotauthenticated' => 'あなたのメールアドレスは<strong>認証されていません</strong>。認証されるまで以下のいかなるメールも送られません。',
+'noemailprefs' => '<strong>メールアドレスが登録されていません</strong>。以下の機能は無効です。',
+'emailconfirmlink' => '電子メールアドレスを確認する',
+'invalidemailaddress' => '入力されたメールアドレスが正しい形式に従っていないため、受け付けられません。正しい形式で入力し直すか、メールアドレス欄を空にしてください。',
+
+# Edit page toolbar
+'bold_sample' => '強い強調（太字）',
+'bold_tip' => '強い強調（太字）',
+'italic_sample' => '弱い強調（斜体）',
+'italic_tip' => '弱い強調（斜体）',
+'link_sample' => '項目名',
+'link_tip' => '内部リンク',
+'extlink_sample' => 'http://www.example.com リンクのタイトル',
+'extlink_tip' => '外部リンク（http:// を忘れずにつけてください）',
+'headline_sample' => '見出し',
+'headline_tip' => '標準の見出し',
+'math_sample' => '\\\\int f(x)dx',
+'math_tip' => '数式 (LaTeX)',
+'nowiki_sample' => 'そのまま表示させたい文字を入力',
+'nowiki_tip' => '入力文字をそのまま表示',
+'image_sample' => 'Example.jpg',
+'image_tip' => '埋め込み画像（[[画像:～]]に直してください）',
+'media_sample' => 'Example.mp3',
+'media_tip' => 'メディアファイル（音声）へのリンク',
+'sig_tip' => '時刻つきの署名',
+'hr_tip' => '水平線（利用は控えめに）',
+# 'infobox' => '',
+# alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror
+# 'infobox_alert' => '',
 
 # Edit pages
 #
-"summary"		=> "要約",
-"minoredit"		=> "これは細部の修正です。",
-"savearticle"	=> "ページを保存",
-"preview"		=> "プレビュー",
-"showpreview"	=> "プレビューを実行",
-"blockedtitle"	=> "ユーザはブロックされています。",
-"blockedtext"	=> "あなたのユーザ名またはIPアドレスは $1 によってブロックされています。
-その理由は次の通りです。:<br />$2<p>詳細は管理者にお問い合わせください。",
-"newarticle"	=> "(新規)",
-"newarticletext" => "新しい記事を書き込んでください。",
-"noarticletext" => "(このページには現在記事がありません。)",
-"updated"		=> "(更新)",
-"note"			=> "<strong>注釈:</strong> ",
-"previewnote"	=> "これはプレビューです。まだ保存されていません!",
-"previewconflict" => "このプレビューは、上の文章編集エリアの文章を保存した場合に
-どう見えるようになるかを示すものです。
-<p>" /* "This preview reflects the text in the upper
-text editing area as it will appear if you choose to save." */,
-"editing"		=> "Editing $1",
-"editconflict"	=> "編集競合: $1",
-"explainconflict" => "あなたがこのページを編集し始めてから誰か他の人が
-このページを変更してしまいました。
-上の文章エリアは現在の最新の状態を反映しています。
-あなたの加える変更の内容は下の文章エリアに示されています。
-変更内容を、上の文章エリアの内容に組み込んで下さい。
-<b>上の文章エリアの内容だけ</b>が、\"Save page\"をクリックした時に
-保存されることになります。<br />"
-/* Someone else has changed this page since you
-started editing it.
-The upper text area contains the page text as it currently exists.
-Your changes are shown in the lower text area.
-You will have to merge your changes into the existing text.
-<b>Only</b> the text in the upper text area will be saved when you
-press \"Save page\".\n<p>" */,
-"yourtext"		=> "あなたの文章",
-"storedversion" => "保存された版",
-"editingold"	=> "<strong>警告: あなたはこのページの古い版を
-編集しています。もしもこの文章を保存すると、この版以降に追加された
-全ての変更が無効になってしまいます。</strong>",
-/* <p><strong>WARNING: You are editing an out-of-date
-revision of this page.
-If you save it, any changes made since this revision will be lost.</strong>\n" */
-"yourdiff"		=> "あなたの更新内容",
-"copyrightwarning" => "{{SITENAME}}に投稿された文書は、すべて GNU Free Documentation License によって発行されたものとみなされますので、留意してください。
-<p>(詳細は $1 を参照, また、参考までに非公式日本語訳は &lt;http://www.opensource.jp/fdl/fdl.ja.html&gt;　を参照)。
-<p>あなたの文章が他人によって自由に編集、配布されることを望まない場合は、投稿を控えて下さい。
-<p>また、あなたの投稿する文章はあなた自身によって書かれたものであるか、パブリック・ドメインかそれに類する自由なリソースからの複製であることを約束して下さい。
-<strong>著作権のある作品を許諾なしに投稿してはいけません!</strong>",
-
+'summary' => '編集内容の要約',
+'subject' => '題名・見出し',
+'minoredit' => 'これは細部の編集です',
+'watchthis' => 'ウォッチリストに追加',
+'savearticle' => '保存する',
+'preview' => 'プレビュー',
+'showpreview' => 'プレビューを実行',
+'showdiff' => '差分を表示',
+'blockedtitle' => '投稿ブロック',
+'blockedtext' => 'ご使用のユーザー名またはIPアドレスは $1 によって投稿をブロックされています。その理由は次の通りです。
+:$2
+
+$1 または他の[[Project:管理者|管理者]]にこの件についてメールで問い合わせることができます。ただし、[[Special:Preferences|オプション]]に正しい電子メールアドレスが登録されていない場合、「このユーザーにメールを送信」機能が使えないことに注意してください。あなたのIPアドレスは「$3」です。問い合わせを行う際には、このIPアドレスを必ず書いてください。',
+
+
+'whitelistedittitle' => '編集にはログインが必要',
+'whitelistedittext' => 'このページを編集するには[[Special:Userlogin|ログイン]]する必要があります。',
+'whitelistreadtitle' => '閲覧にはログインが必要',
+'whitelistreadtext' => 'このページを閲覧するには[[Special:Userlogin|ログイン]]する必要があります。',
+'whitelistacctitle' => 'アカウントの作成は許可されていません',
+'whitelistacctext' => '{{SITENAME}}のアカウントを作成するには、適切な権限を持ったユーザーで[[Special:Userlogin|ログイン]]する必要があります。',
+'loginreqtitle' => 'ログインが必要',
+# 'loginreqtext' => '',
+'accmailtitle' => 'パスワードを送信しました',
+'accmailtext' => '"$1" のパスワードを $2 に送信しました。',
+'newarticle' => '(新規)',
+'newarticletext' => 'ページを新規に作成するには新しい内容を書き込んでください。',
+'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
+'anontalkpagetext' => "----
+''これはアカウントをまだ作成していないか、あるいは使っていない匿名ユーザーのための会話ページです。{{SITENAME}}では匿名ユーザーの識別は利用者名の代わりに[[IPアドレス]]を用います。IPアドレスは何人かで共有されることがあります。もしも、あなたが匿名ユーザーで無関係なコメントがここに寄せられる場合は、[[Special:Userlogin|アカウントを作成するかログインして]]他の匿名ユーザーと間違えられないようにしてくださるようお願いします。",
+'noarticletext' => '（{{SITENAME}}には現在この名前の項目はありません）',
+'clearyourcache' => "'''注意:''' 保存した後、ブラウザのキャッシュをクリアする必要があります。'''Mozilla / Firefox / Safari:''' [Shift] を押しながら [再読み込み] をクリック、または [Shift]-[Ctrl]-[R] (Macでは [Cmd]-[Shift]-[R]); '''IE:''' [Ctrl] を押しながら [更新] をクリック、または [Ctrl]-[F5]; '''Konqueror:''' [再読み込み] をクリック、または [F5]; '''Opera:''' 「ツール」→「設定」からキャッシュをクリア。",
+'usercssjsyoucanpreview' => '<strong>Tip:</strong> 「プレビューを実行」ボタンを使うと保存前に新しいスタイルシート・スクリプトをテストできます。',
+'usercsspreview' => "'''あなたはユーザスタイルシートをプレビューしています。まだ保存されていないので注意してください。'''",
+'userjspreview' => "'''あなたはユーザスクリプトをテスト・プレビューしています。まだ保存されていないので注意してください。'''",
+'updated' => '（更新）',
+'note' => '<strong>注釈:</strong> ',
+'previewnote' => 'これはプレビューです。まだ保存されていません!',
+'previewconflict' => 'このプレビューは、上の文章編集エリアの文章を保存した場合にどう見えるようになるかを示すものです。',
+'editing' => '$1 を編集中',
+'editingsection' => '$1 を編集中 (セクション)',
+'editingcomment' => '$1 を編集中 (新規コメント)',
+'editconflict' => '編集競合: $1',
+'explainconflict' => 'あなたがこのページを編集し始めた後に、他の誰かがこのページを変更しました。上側のテキストエリアは現在の最新の状態です。あなたの編集していた文章は下側のテキストエリアに示されています。編集していた文章を、上側のテキストエリアの文章に組み込んでください。<strong>上側のテキストエリアの内容だけ</strong>が、“投稿する”をクリックした時に実際に保存されます。',
+'yourtext' => 'あなたの文章',
+'storedversion' => '保存された版',
+'nonunicodebrowser' => '<strong>警告: あなたの使用しているブラウザはUnicode互換ではありません。項目を編集する前にブラウザを変更してください。</strong>',
+'editingold' => '<strong>警告: あなたはこのページの古い版を編集しています。もしこの文章を保存すると、この版以降に追加された全ての変更が無効になってしまいます。</strong>',
+'yourdiff' => 'あなたの更新内容',
+'copyrightwarning' => "'''■投稿する前に以下を確認してください■'''
+* {{SITENAME}}に投稿された文書は、すべて$2（詳細は$1を参照）によって公開されることに同意してください。
+* あなたの文章が他人によって自由に編集、配布されることを望まない場合は、投稿を控えてください。
+* あなたの投稿する文章はあなた自身によって書かれたものであるか、パブリック・ドメインかそれに類する自由なリソースからの複製であることを約束してください。'''あなたが著作権を保持していない作品を許諾なしに投稿してはいけません！'''",
+'copyrightwarning2' => "'''■投稿する前に以下を確認してください■'''
+* あなたの文章が他人によって自由に編集、配布されることを望まない場合は、投稿を控えてください。
+* あなたの投稿する文章はあなた自身によって書かれたものであるか、パブリック・ドメインかそれに類する自由なリソースからの複製であることを約束してください（詳細は$1を参照）。'''あなたが著作権を保持していない作品を許諾なしに投稿してはいけません！'''",
+'longpagewarning' => "'''注意:''' このページのサイズは $1 キロバイトです。古いブラウザの一部に 32 キロバイト以上のページを編集すると問題が起きるものがあります。ページを節に分けることを検討してください。",
+'readonlywarning' => '<strong>警告: データベースがメンテナンスのためにロックされたため、今は編集結果を正しく保存できません。文章をカットアンドペーストしてローカルファイルとして保存し、後ほど保存をやり直してください。</strong>',
+'protectedpagewarning' => "'''警告:''' このページは保護されています。管理者しか編集できません。詳しくは[[Project:保護の方針|保護の方針]]を参照してください。",
+'templatesused' => 'このページで使われているテンプレート:',
 
 # History pages
 #
-"revhistory"	=> "改訂履歴",
-"nohistory"		=> "このページには改訂履歴がありません。  There is no edit history for this page.",
-"revnotfound"	=> "要求された版が見つかりません Revision not found",
-"revnotfoundtext" => "要求されたこのページの旧版は見つかりませんでした。
-URLをもう一度確認して、このページにアクセスしてみて下さい。
+'revhistory' => '改訂履歴',
+'nohistory' => 'このページには変更履歴がありません。',
+'revnotfound' => '要求された版が見つかりません。',
+'revnotfoundtext' => '要求されたこのページの旧版は見つかりませんでした。このページにアクセスしたURLをもう一度確認してください。
 
 The old revision of the page you asked for could not be found.
-Please check the URL you used to access this page.\n",
-"loadhist"		=> "改訂履歴の読み込み中",
-"currentrev"	=> "最新版",
-"revisionasof"	=> "$1の版",
-"cur"			=> "最新版",
-"next"			=> "次の版",
-"last"			=> "前の版",
-"orig"			=> "最古版",
-"histlegend"	=> "凡例: (最新版) = 最新版との比較,
-(前の版) = 直前の版との比較, M = 細部の修正",
+Please check the URL you used to access this page.',
+'loadhist' => '変更履歴の読み込み中',
+'currentrev' => '最新版',
+'revisionasof' => '$1の版',
+'revisionasofwithlink' => '$1 の版を表示しています ; $2<br />$3 | $4',
+'previousrevision' => '←前の版',
+'nextrevision' => '次の版→',
+'currentrevisionlink' => '最新版を表示',
+'cur' => '最新版',
+'next' => '次の版',
+'last' => '前の版',
+'orig' => '最古版',
+'histlegend' => '凡例:（最新版）= 最新版との比較、（前の版）= 直前の版との比較、M = 細部の編集',
+'history_copyright' => '-',
+'deletedrev' => '[deleted]',
+'histfirst' => '最古',
+'histlast' => '最新',
 
 # Diffs
 #
-"difference"	=> "(版間での差分)" /* "(Difference between revisions)" */,
-"loadingrev"	=> "差分をとるために古い版を読み込んでいます" /*"loading revision for diff" */,
-"lineno"		=> "$1 行" /* "Line $1:" */,
-"editcurrent"	=> "この頁の最新版を編集" /* "Edit the current version of this page" */,
+'difference' => '（版間での差分）',
+'loadingrev' => '差分をとるために古い版を読み込んでいます',
+'lineno' => '$1 行',
+'editcurrent' => 'このページの最新版を編集',
+'selectnewerversionfordiff' => '比較する新しい版を選択',
+'selectolderversionfordiff' => '比較する古い版を選択',
+'compareselectedversions' => '選択した版同士を比較',
+
+# Search results
+#
+'searchresults' => '検索結果',
+'searchresulttext' => '{{SITENAME}}の検索に関する詳しい情報は、[[{{ns:Project}}:検索]]をご覧ください。',
+'searchquery' => '問い合わせ: "$1"',
+'badquery' => 'おかしな形式の検索問い合わせ',
+'badquerytext' => '問い合わせを処理できませんでした。おそらく3文字未満の語を検索しようとしたためですが、まだ対応していません。例えば「魚 and and 大きさ」のように、表現を誤記しているのかもしれません。',
+'matchtotals' => '"$1" を検索し、 $2 の項目名及び $3 ページの本文と一致しました。',
+'nogomatch' => '[[$1|検索した名称のページ]]は存在しませんでした。全文検索を試みます。',
+'titlematches' => '項目名と一致',
+'notitlematches' => '項目名とは一致しませんでした',
+'textmatches' => 'ページ内本文と一致',
+'notextmatches' => 'ページ内本文とは一致しませんでした',
+'prevn' => '前 $1',
+'nextn' => '次 $1',
+'viewprevnext' => '（$1）（$2）($3) を見る',
+'showingresults' => '<b>$2</b> 件目から <b>$1</b> 件を表示しています。',
+'showingresultsnum' => '<b>$2</b> 件目から <b>$3</b> 件を表示しています。',
+'nonefound' => "'''※'''検索がうまくいかないのは、「ある」や「から」のような一般的な語で索引付けがされていないか、複数の検索語を指定している（全ての検索語を含むページだけが結果に示されます）などのためかもしれません。",
+'powersearch' => '検索',
+'powersearchtext' => '検索する名前空間 :<br />
+$1<br />
+$2リダイレクトを含める &nbsp; &nbsp; &nbsp; $3 $9',
+'searchdisabled' => '<p>全文検索はサーバー負荷の都合から、一時的に使用停止しています。元に戻るまでGoogleでの全文検索を利用してください。検索結果は少し古い内容となります。</p>',
+
+'googlesearch' => '<form method="get" action="http://www.google.com/search" id="googlesearch">
+<table>
+<tr><td>
+<a href="http://www.google.com/"><img src="http://www.google.com/logos/Logo_40wht.gif" border="0" alt="Google" /></a>
+</td><td>
+<input type="hidden" name="domains" value="{{SERVER}}" />
+<input type="hidden" name="ie" value="$2" />
+<input type="hidden" name="oe" value="$2" />
+<input type="text" name="q" size="31" maxlength="255" value="$1" />
+<input type="submit" name="btnG" value="$3" /><br />
+<small><input type="radio" name="sitesearch" value="" id="gWWW" style="vertical-align:middle"/><label for="gWWW">WWW</label>
+<input type="radio" name="sitesearch" value="{{SERVER}}" checked="checked" id="gwiki" style="vertical-align:middle"/><label for="gwiki">{{SERVER}}/</label></small>
+</td></tr>
+</table>
+</form>',
+
+'blanknamespace' => '(標準)',
+
+# Preferences page
+#
+'preferences' => 'オプション',
+'prefsnologin' => 'ログインしていません',
+'prefsnologintext' => 'ユーザーオプションを変更するためには、[[Special:Userlogin|ログイン]]する必要があります。',
+'prefslogintext' => 'あなたは "$1" としてログインしています。あなたのユーザー番号は $2 です。
+
+オプションの変更詳細については[[Project:オプションのヘルプ|オプションのヘルプ]]をご覧ください。',
+
+'prefsreset' => 'ユーザー設定は初期化されました。',
+'qbsettings' => 'クイックバー設定',
+'changepassword' => 'パスワード変更',
+'skin' => '外装',
+'math' => '数式の表記方法',
+'dateformat' => '日付の書式',
+'math_failure' => '構文解析失敗',
+'math_unknown_error' => '不明なエラー',
+'math_unknown_function' => '不明な関数',
+'math_lexing_error' => '字句解析エラー',
+'math_syntax_error' => '構文エラー',
+'math_image_error' => 'PNGへの変換に失敗しました。latex, dvips, gs, convertが正しくインストールされているか確認してください。',
+'math_bad_tmpdir' => 'TeX一時ディレクトリを作成または書き込みできません',
+'math_bad_output' => 'TeX出力用ディレクトリを作成または書き込みできません',
+'math_notexvc' => 'texvcプログラムが見つかりません。math/READMEを読んで正しく設定してください。',
+'prefs-personal' => '利用者の情報',
+'prefs-rc' => '最近更新とスタブの表示',
+'prefs-misc' => 'その他の設定',
+'saveprefs' => '設定の保存',
+'resetprefs' => '設定の初期化',
+'oldpassword' => '古いパスワード',
+'newpassword' => '新しいパスワード',
+'retypenew' => '新しいパスワードを再入力してください',
+'textboxsize' => '編集画面',
+'rows' => '縦',
+'columns' => '横',
+'searchresultshead' => '検索結果の表示',
+'resultsperpage' => '1ページあたりの表示件数',
+'contextlines' => '1件あたりの行数',
+'contextchars' => '1行あたりの文字数',
+'stubthreshold' => 'スタブ表示にする閾値',
+'recentchangescount' => '最近更新したページの表示件数',
+'savedprefs' => 'ユーザー設定を保存しました',
+'timezonelegend' => 'タイムゾーン',
+'timezonetext' => 'UTCとあなたの地域の標準時間との差を入力してください（日本国内は9:00）。',
+'localtime' => 'あなたの現在時刻',
+'timezoneoffset' => '時差¹',
+'servertime' => 'サーバの現在時刻',
+'guesstimezone' => '自動設定',
+'emailflag' => '他のユーザーからのメール送付を差し止める',
+'defaultns' => '標準で検索する名前空間:',
+'default' => 'デフォルト',
+'files' => '画像等',
+
+# User levels special page
+#
 
-# 検索結果（Search results）
+# switching pan
+# 'groups-lookup-group' => '',
+# 'groups-group-edit' => '',
+# 'editgroup' => '',
+# 'addgroup' => '',
+
+'userrights-lookup-user' => 'ユーザーの所属グループの管理',
+'userrights-user-editname' => 'ユーザー名:',
+'editusergroup' => '編集',
+
+# group editing
+# 'groups-editgroup' => '',
+# 'groups-addgroup' => '',
+# 'groups-editgroup-preamble' => '',
+'groups-editgroup-name' => 'グループ名:',
+# 'groups-editgroup-description' => '',
+# 'savegroup' => '',
+# 'groups-tableheader' => '',
+# 'groups-existing' => '',
+# 'groups-noname' => '',
+# 'groups-already-exists' => '',
+# 'addgrouplogentry' => '',
+# 'changegrouplogentry' => '',
+# 'renamegrouplogentry' => '',
+
+# user groups editing
 #
-"searchresults" => "検索結果" /* "Search results" */,
-"searchresulttext" => "{{SITENAME}} の検索についての詳しい情報は、 $1 をご覧下さい。"
-  /* "For more information about searching Wikipedia, see $1." */ ,
-"searchquery"	=> "問い合わせ \"$1\" について、" /* "For query \"$1\"" */,
-"badquery"		=> "おかしな形式の検索問い合わせ" /* "Badly formed search query" */,
-"badquerytext"	=> "問い合わせを処理できませんでした。
-これはおそらく、3文字未満の語を検索しようとしたためですが、これにはまだ対応していません。
-例えば「魚 and and 大きさ」のように、表現を誤記しているのかもしれません。"
-  /* "We could not process your query.
-This is probably because you have attempted to search for a
-word fewer than three letters long, which is not yet supported.
-It could also be that you have mistyped the expression, for
-example \"fish and and scales\".
-Please try another query." */,
-"matchtotals"	=> "問い合わせ「$1」は $2 の記事の題及び $3 の記事の本文と一致しました。"
-  /* "The query \"$1\" matched $2 article titles
-and the text of $3 articles." */,
-"titlematches"	=> "記事の題と一致" /* "Article title matches" */,
-"notitlematches" => "記事の題とは一致しませんでした" /* "No article title matches" */,
-"textmatches"	=> "記事本文と一致" /* "Article text matches" */,
-"notextmatches"	=> /* "No article text matches" */ "記事本文とは一致しませんでした",
-"prevn"			=> "前 $1" /* "previous $1" */,
-"nextn"			=> "次 $1" /* "next $1" */,
-"viewprevnext"	=> "($1) ($2) ($3) を見る" /* "View ($1) ($2) ($3)." */,
-"showingresults" => "$2 からの $1 個の結果を次に示します" /* "Showing below <b>$1</b> results starting with #<b>$2</b>." */,
-"nonefound"		=> "<strong>Note</strong>: 検索がうまくいかないのは、「ある」や「から」のような一般的な語で索引付けされていないとか、
-複数の検索語を指定している (全ての検索語を含む頁だけが結果に示されます。) とかのためかもしれません。"
-  /* "<strong>Note</strong>: unsuccessful searches are
-often caused by searching for common words like \"have\" and \"from\",
-which are not indexed, or by specifying more than one search term (only pages
-containing all of the search terms will appear in the result)." */,
-
-# Preferences page ユーザーオプション設定頁
+'userrights-editusergroup' => 'ユーザーの所属グループ',
+'saveusergroups' => 'ユーザーの所属グループを保存',
+'userrights-groupsmember' => '所属グループ:',
+'userrights-groupsavailable' => '有効なグループ:',
+'userrights-groupshelp' => 'このユーザーから削除したい、またはこのユーザーに追加したいグループを選択してください。選択されていないグループは変更されません。選択を解除するには [CTRL]+[左クリック] です。',
+# 'userrights-logcomment' => '',
+
+# Default group names and descriptions
 #
-"preferences"	=> "オプション" /* "Preferences" */,
-"prefsnologin" => "ログインしていません" /* "Not logged in" */,
-"prefsnologintext"	=>  "ユーザーオプションを変更するためには、
-[[Special:Userlogin|ログイン]]している必要があります。"
-/* "You must be <a href=\"" .
-  "{{localurle:Special:Userlogin}}\">logged in</a>
-to set user preferences." */,
-"prefsreset"	=> "ユーザー設定は初期化されました。" /* "Preferences have been reset from storage." */,
-"qbsettings"	=> "クイックバー設定" /* "Quickbar settings" */,
-"changepassword" => "パスワード変更" /* "Change password" */,
-"skin"			=> "外装" /* "Skin" */,
-"saveprefs"		=> "設定の保存" /* "Save preferences" */,
-"resetprefs"	=> "設定の初期化" /* "Reset preferences" */,
-"oldpassword"	=> "古いパスワード" /* "Old password" */,
-"newpassword"	=> "新しいパスワード" /* "New password" */,
-"retypenew"		=> "新しいパスワードを再入力して下さい" /* "Retype new password" */,
-"textboxsize"	=> "テキストボックスの大きさ" /* "Editing" */,
-"rows"			=> "縦" /* "Rows" */,
-"columns"		=> "横" /* "Columns" */,
-"searchresultshead" => "検索結果の表示" /* "Search result settings" */,
-"resultsperpage" => "1ページあたりの表示件数" /* "Hits to show per page" */,
-"contextlines"	=> "1件あたりの行数" /* "Lines to show per hit" */,
-"contextchars"	=> "1行あたりの文字数" /* "Characters of context per line" */,
-"recentchangescount" => "最近更新されたページの表示件数" /* "Number of titles in recent changes" */,
-"savedprefs"	=> "ユーザー設定を保存しました" /* "Your preferences have been saved." */,
-"timezonetext"  => "UTCとあなたの地域の標準時間との差を入力して下さい" /* "Enter number of hours your local time differs
-from server time (UTC)." */,
-"localtime"	=> "あなたの地域の標準時間" /* "Local time" */,
-"timezoneoffset" =>"差" /* "Offset" */,
-"emailflag"		=> "他のユーザーからのメール送付を差し止める" /* "Disable e-mail from other users" */,
-
-# 最近更新したページ（Recent changes）
+# 'group-anon-name' => '',
+# 'group-anon-desc' => '',
+# 'group-loggedin-name' => '',
+# 'group-loggedin-desc' => '',
+# 'group-admin-name' => '',
+# 'group-admin-desc' => '',
+# 'group-bureaucrat-name' => '',
+# 'group-bureaucrat-desc' => '',
+# 'group-steward-name' => '',
+# 'group-steward-desc' => '',
+
+
+# Recent changes
 #
-"recentchanges" => "最近更新したページ",
-"recentchangestext" => "最近付け加えられた変更はこのページで確認することができます。
-[[{{ns:4}}:新規参加者の方、ようこそ]]！
-以下のページも参照して下さい:
-[[wikipedia:ウィキペディア　よくある質問集]],
-[[{{ns:4}}:ウィキペディアの基本方針とガイドライン]]
-（特に[[{{ns:4}}:記事名のつけ方]],
-[[{{ns:4}}:中立的な観点]]）,
-[[{{ns:4}}:ウィキペディアで起こしがちな間違い]].
-
-ウィキペディアが成功するためには、あなたの投稿する内容が他人の著作権などによって束縛されていないことがとても重要です。[[{{ns:4}}:著作権]]
-法的責任問題は、プロジェクトに致命傷を与えることもある問題です。他人の著作物などを流用することは絶対に避けてください。
-また次のページも参照して下さい。[http://meta.wikipedia.org/wiki/Special:Recentchanges recent meta discussion]"
-
-/* Track the most recent changes to Wikipedia on this page.
-[[Wikipedia:Welcome,_newcomers|Welcome, newcomers]]!
-Please have a look at these pages: [[wikipedia:FAQ|Wikipedia FAQ]],
-[[Wikipedia:Policies and guidelines|Wikipedia policy]]
-(especially [[wikipedia:Naming conventions|naming conventions]],
-[[wikipedia:Neutral point of view|neutral point of view]]),
-and [[wikipedia:Most common Wikipedia faux pas|most common Wikipedia faux pas]].
-
-If you want to see Wikipedia succeed, it's very important that you don't add
-material restricted by others' [[wikipedia:Copyrights|copyrights]].
-The legal liability could really hurt the project, so please don't do it.
-See also the [http://meta.wikipedia.org/wiki/Special:Recentchanges recent meta discussion]. */,
-"rcloaderr"		=> "最近の更新情報をダウンロード中" /* "Loading recent changes" */,
-"rcnote"		=> "以下は最近<strong>$2</strong>日間の<strong>$1</strong>件の更新です。"
-  /* "Below are the last <strong>$1</strong> changes in last <strong>$2</strong> days." */,
-# "rclinks"		=> "最近$2時間/$3日間の$1件分を表示する" /* "Show last $1 changes in last $2 hours / last $3 days" */,
-"rclinks"		=> "最近$2日間の$1件分を表示する" /* "Show last $1 changes in last $2 days." */,
-"rchide"		=> "in $4 form; $1 minor edits; $2 secondary namespaces; $3 multiple edits.",
-"diff"			=> "差分" /* "diff" */,
-"hist"			=> "履歴" /* "hist" */,
-"hide"			=> "省略" /* "hide" */,
-"show"			=> "表示" /* "show" */,
-"tableform"		=> "表" /* "table" */,
-"listform"		=> "リスト" /* "list" */,
-"nchanges"		=> "$1件の変更" /* "$1 changes" */,
+'changes' => '更新',
+'recentchanges' => '最近更新したページ',
+'recentchanges-url' => 'Special:Recentchanges',
+'recentchangestext' => '最近付け加えられた変更はこのページで確認できます。',
+'rcloaderr' => '最近の更新情報をダウンロード中',
+'rcnote' => '以下は最近 <strong>$2</strong> 日間に編集された <strong>$1</strong> ページです。（<strong>N</strong>=新規項目、<strong>M</strong>=細部の編集、日時はオプションで未設定ならUTC）',
+'rcnotefrom' => '以下は <b>$2</b> までの更新です。（最大 <b>$1</b> 件）',
+'rclistfrom' => '$1以後現在までの更新を表示',
+'showhideminor' => '細部の編集を$1 | ボットによる編集を$2 | ログインユーザによる編集を$3 | パトロールされた編集を$4',
+'rclinks' => '最近 $2 日間の $1 件分を表示する<br />$3',
+'rchide' => 'in $4 form; $1 minor edits; $2 secondary namespaces; $3 multiple edits.',
+'rcliu' => '; $1 edits from logged in users',
+'diff' => '差分',
+'hist' => '履歴',
+'hide' => '隠す',
+'show' => '表示',
+'tableform' => '表',
+'listform' => '一覧',
+'nchanges' => '$1件の変更',
+'minoreditletter' => 'M',
+'newpageletter' => 'N',
+'sectionlink' => '→',
+'number_of_watching_users_RCview' => '[$1]',
+'number_of_watching_users_pageview' => '[$1人がウォッチしています]',
 
 # Upload
 #
-"upload"		=> "アップロード Upload",
-"uploadbtn"		=> "ファイルをアップロードする Upload file",
-"uploadlink"	=> "イメージのアップロード Upload images",
-"reupload"		=> "再アップロード Re-upload",
-"reuploaddesc"	=> "アップロードのフォームへ戻る Return to the upload form.",
-"uploadnologin" => "ログインしていません、 Not logged in",
-"uploadnologintext"	=> "ユーザーオプションを変更するためには、
-[[Special:Userlogin|ログイン]]している必要があります。
-
-You must be [[Special:Userlogin|logged in]]
-to upload files.",
-"uploaderror"	=> "アップロード エラー  Upload error",
-"uploadtext"	=> "'''ご注意！'''
-ここにファイルをアップロードする前に、ウィキペディアの[[Project:画像利用の方針|画像利用の方針]]を
-よく読んで、方針に反することのないようにして下さい。.
-
-これまでにアップロードされたイメージの一覧や検索には、
-[[Special:Imagelist|画像リスト]]が便利です。
-アップロードと削除の記録は[[Project:Upload_log|にあります]]。
-
-記事に必要な画像を新しくアップロードする場合には、以下のフォームを利用して下さい。
-
-ほとんどのブラウザーでは、\"Browse\"というボタンが表示されます。そのボタンを押すと、
-あなたの使用しているコンピューター（のオペレーティング・システム）でファイルを開く
-際のの標準的な手続きが始まります。ファイルを選択して、Browseというボタンの横にある
-空欄にファイル名が入力された状態にして下さい。
-また、あなたがそのファイルをアップロードすることが著作権を侵害に該当しないことを
-あなたが表明する必要があります。そのために、チェック欄にチェックを入れて下さい。
-ファイルをアップロードするボタンを押すことで、アップロード手続きは完了します。
-もしもあなたのインターネット接続が低速のものであれば、アップロードには多少時間が
-かかります。
-
-望ましいフォーマットは、写真などのイメージの場合はJPEG、手書きのものやアイコン
-などはPNG、サウンドにはOGGです。
-
-混乱を避けるために説明的な名前をつけて下さい。
-
-画像を記事に組み入れるためには、次のようなフォーマットでリンクを張ります。
-'''<nowiki>[[画像:file.jpg]]</nowiki>'''  '''<nowiki>[[画像:file.png|説明文]]</nowiki>'''
-また、サウンドには '''<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>''' を用います。
-
-ウィキペディアの他のページと同じく、あなたがアップロードしたファイルも、より
-よい百科事典作成のために他のユーザーによって編集、削除されることがあります。
-また、アップロード機能を乱用した利用者は、アップロード機能の使用を禁じされることも
-ありますのでご承知下さい。",
-
-/* <strong>STOP!</strong> Before you upload here,
-make sure to read and follow Wikipedia's <a href=\"" .
-"{{localurle:Wikipedia:Image_use_policy}}\">image use policy</a>.
-<p>To view or search previously uploaded images,
-go to the <a href=\"" . "{{localurle:Special:Imagelist}}" .
-"\">list of uploaded images</a>.
-Uploads and deletions are logged on the <a href=\"" .
-"{{localurle:Wikipedia:Upload_log}}\">upload log</a>.
-<p>Use the form below to upload new image files for use in
-illustrating your articles.
-On most browsers, you will see a \"Browse...\" button, which will
-bring up your operating system's standard file open dialog.
-Choosing a file will fill the name of that file into the text
-field next to the button.
-You must also check the box affirming that you are not
-violating any copyrights by uploading the file.
-Press the \"Upload\" button to finish the upload.
-This may take some time if you have a slow internet connection.
-<p>The preferred formats are JPEG for photographic images, PNG
-
-for drawings and other iconic images, and OGG for sounds.
-Please name your files descriptively to avoid confusion.
-To include the image in an article, use a link in the form
-<b>[[image:file.jpg]]</b> or <b>[[image:file.png|alt text]]</b>
-or <b>[[media:file.ogg]]</b> for sounds.
-<p>Please note that as with Wikipedia pages, others may edit or
-delete your uploads if they think it serves the encyclopedia, and
-you may be blocked from uploading if you abuse the system." */
-"uploadlog"		=> "upload log",
-"uploadlogpage" => "Upload_log",
-"uploadlogpagetext" => "以下は最近のファイルのアップロードのログです。
-記録は全てサーバーの時間であるUTCに基づくものです。
-<ul>
-</ul>
-"
-/* Below is a list of the most recent file uploads.
-All times shown are server time (UTC). */,
-
-"filename"		=> "ファイル名",
-"filedesc"		=> "ファイルの概要",
-"copyrightpage" => "{{ns:4}}:Copyrights",
-
-"copyrightpagename" => "ウィキペディアの著作権",
-"uploadedfiles"	=> "アップロードされたファイル",
-"ignorewarning"	=> "警告を無視し、保存してしまう" /* "Ignore warning and save file anyway." */,
-"minlength"		=> "ファイル名は3文字以上である必要があります。" /* "Image names must be at least three letters." */,
-"badfilename"	=> "ファイル名は\"$1\"へ変更されました。" /* "Image name has been changed to \"$1\"." */,
-"badfiletype"	=> "\".$1\" は推奨されているファイルフォーマットではありません。" /*
-"\".$1\" is not a recommended image file format." */,
-"largefile"		=> "ファイルサイズは100キロバイト以下に抑えることが推奨されています。"
-  /* It is recommended that images not exceed 100k in size." */,
-"successfulupload" => "アップロード成功" /* "Successful upload" */,
-"fileuploaded"	=> "ファイル\"$1\は無事にアップロードされました。
-以下のリンク($2)をクリックし、ファイルについての情報－出典、製作者や時期、
-その他知っている情報を書き込んで下さい。
-
-" /* " "File \"$1\" uploaded successfully.
-Please follow this link: ($2) to the description page and fill
-in information about the file, such as where it came from, when it was
-created and by whom, and anything else you may know about it." */,
-
-"uploadwarning" => "アップロード 警告" /* "Upload warning" */,
-"savefile"		=> "ファイルを保存" /* "Save file" */,
-"uploadedimage" => "\"[[$1]]\"をアップロードしました。" /* "uploaded \"$1\"" */,
+'upload' => 'アップロード',
+'uploadbtn' => 'アップロード',
+'uploadlink' => '画像のアップロード',
+'reupload' => '再アップロード',
+'reuploaddesc' => 'アップロードのフォームへ戻る',
+'uploadnologin' => 'ログインしていません',
+'uploadnologintext' => 'ファイルをアップロードするには[[Special:Userlogin|ログイン]]する必要があります。',
+'upload_directory_read_only' => 'アップロード先のディレクトリ ($1) にウェブサーバが書き込めません。',
+'uploaderror' => 'アップロード エラー',
+'uploadtext' => "ファイルを新しくアップロードする場合には、以下のフォームを利用してください。
+* 過去にアップロードされた画像は[[Special:Imagelist|{{int:Imagelist}}]]で閲覧したり探したりできます。
+* アップロードや削除は[[Special:Log|ログのページ]]に記録されます。
+* 「{{int:Uploadbtn}}」ボタンを押すと、アップロードが完了します。
+ページに画像を挿入するには '''<nowiki>[[{{ns:6}}:File.jpg]]</nowiki>''' や '''<nowiki>[[{{ns:6}}:File.png|thumb|代替テキスト]]</nowiki>''' といった書式を使います。画像ページではなくファイルに直接リンクするには '''<nowiki>[[{{ns:-2}}:File.ogg]]</nowiki>''' とします。",
+
+
+
+'uploadlog' => 'アップロードログ',
+'uploadlogpage' => 'アップロードログ',
+'uploadlogpagetext' => '以下は最近のファイルのアップロードのログです。',
+'filename' => 'ファイル名',
+'filedesc' => 'ファイルの概要',
+'filestatus' => '著作権情報',
+'filesource' => 'ファイルの出典',
+'copyrightpage' => '{{ns:Project}}:Copyrights',
+'copyrightpagename' => '{{SITENAME}}の著作権',
+'uploadedfiles' => 'アップロードされたファイル',
+'ignorewarning' => '警告を無視し、保存してしまう',
+'minlength' => 'ファイル名は3文字以上である必要があります。',
+'illegalfilename' => 'ファイル名 "$1" にページ・タイトルとして使えない文字が含まれています。ファイル名を変更してからもう一度アップロードしてください。',
+'badfilename' => 'ファイル名は "$1" へ変更されました。',
+'badfiletype' => '".$1" は推奨されているファイルフォーマットではありません。',
+'largefile' => 'ファイルサイズは $1 バイト以下に抑えることが推奨されています。このファイルは $2 バイトです。',
+'emptyfile' => 'あなたがアップロードしようとしているファイルは内容が空であるか、もしくはファイル名の指定が間違っています。もう一度、ファイル名が正しいか、あるいはアップロードしようとしたファイルであるかどうかを確認してください。',
+'fileexists' => 'この名前のファイルは既に存在しています。$1と置き換えるかどうかお確かめください。',
+'successfulupload' => 'アップロード成功',
+'fileuploaded' => 'ファイル "$1" は無事にアップロードされました。
+
+画像詳細ページ $2 に行き、ファイルについての情報―出典、製作者や時期、その他知っている情報を書き込んでください。
+
+この画像をページに貼り付ける際にはページ内に <tt><nowiki>[[</nowiki>{{ns:Image}}:$1|thumb|画像の説明]]</tt> を挿入してください。',
+'uploadwarning' => 'アップロード 警告',
+'savefile' => 'ファイルを保存',
+'uploadedimage' => '"$1" をアップロードしました。',
+'uploaddisabled' => '申し訳ありませんが、アップロードは現在使用できません。',
+'uploadscripted' => 'このファイルはウェブブラウザが誤って解釈してしまうおそれのあるHTMLまたはスクリプトコードを含んでいます。',
+'uploadcorrupt' => '指定したファイルは壊れているか拡張子が正しくありません。ファイルを確認の上再度アップロードをしてください。',
+'uploadvirus' => 'このファイルにはウイルスが含まれています!! &nbsp;詳細: $1',
+'sourcefilename' => 'ファイル名',
+'destfilename' => '掲載するファイル名',
 
 # Image list
 #
-"imagelist"		=> "画像リスト",
-"imagelisttext"	        => "$1枚の画像を$2に表示しています",
-"getimagelist"	        => "画像リストを取得",
-"ilsubmit"		=> "検索",
-"showlast"		=> "$2に$1枚の画像を表示",
-"byname"		=> "名前順",
-"bydate"		=> "日付順",
-"bysize"		=> "サイズ順",
-"imgdelete"		=> "削除",
-"imgdesc"		=> "詳細",
-"imglegend"		=> "凡例: (詳細)=画像の詳細を表示/編集",
-"imghistory"	        => "画像の履歴",
-"revertimg"		=> "差戻",
-"deleteimg"		=> "削除",
-"deleteimgcompletely"		=> "削除",
-"imghistlegend"         => "凡例: (最新)=最新版の画像, (削除)=この版の画像を削除, (差戻)=この版の画像に差し戻す<br /><b>アップロードされた画像を見るには日付をクリックします。</b>",
-"imagelinks"	        => "リンク",
-"linkstoimage"	        => "この画像にリンクしているページの一覧:",
-"nolinkstoimage"        => "この画像にリンクしているページはありません。",
+'imagelist' => '画像リスト',
+'imagelisttext' => '$1 枚の画像を $2 に表示しています',
+'getimagelist' => '画像リストを取得',
+'ilsubmit' => '検索',
+'showlast' => '$2に $1 枚の画像を表示',
+'byname' => '名前順',
+'bydate' => '日付順',
+'bysize' => 'サイズ順',
+'imgdelete' => '削除',
+'imgdesc' => '詳細',
+'imglegend' => '凡例: （詳細）= 画像の詳細を表示/編集',
+'imghistory' => '画像の履歴',
+'revertimg' => '差戻',
+'deleteimg' => '削除',
+'deleteimgcompletely' => '全版削除',
+'imghistlegend' => '凡例:（最新）= 最新版の画像、（削除）= この版の画像を削除、（差戻）= この版の画像に差し戻す<br />
+<b>アップロードされた画像を見るには日付をクリックします。</b>',
+'imagelinks' => 'リンク',
+'linkstoimage' => 'この画像にリンクしているページの一覧:',
+'nolinkstoimage' => 'この画像にリンクしているページはありません。',
+'sharedupload' => 'このファイルは共有されており、他のプロジェクトで使用されている可能性があります。',
+'shareduploadwiki' => '詳しい情報は$1を参照してください。',
+'shareddescriptionfollows' => '-',
+'noimage' => 'このファイル名の画像はありません。$1。',
+'uploadnewversion' => '[$1 このファイルの新しいバージョンをアップロードする]',
 
 # Statistics
 #
-"statistics"	        => "アクセス統計",
-"sitestats"		=> "サイト全体の統計",
-"userstats"		=> "ユーザー登録統計",
-"sitestatstext"         => "<p>データベース内には <b>$1</b> ページのデータがあります。
-この数字には「会話ページ」や「{{SITENAME}}関連のページ」、「書きかけのページ」、「リダイレクト」など、記事とはみなせないページが含まれています。
-これらを除いた、記事とみなされるページ数は約 <b>$2</b> ページになります。</p>
-<p>ページの総閲覧回数は <b>$3</b> 回です。また、ソフトウェアの更新(2002/06/20)以来、<b>$4</b> 回の編集が行われました。
-平均すると、１ページあたり <b>$5</b> 回の編集が行われ、１編集あたり <b>$6</b> 回閲覧されています。</p>",
-"userstatstext"         => "登録済みの利用者は <b>$1</b> 人で、内 <b>$2</b> 人が管理者権限を持っています。($3を参照)",
+'statistics' => 'アクセス統計',
+'sitestats' => 'サイト全体の統計',
+'userstats' => 'ユーザー登録統計',
+'sitestatstext' => "データベース内には'''$1'''ページのデータがあります。この数字には「ノートページ」や「{{SITENAME}}関連のページ」、「書きかけのページ」、「リダイレクト」など、記事とはみなせないページが含まれています。これらを除いた、記事とみなされるページ数は約'''$2'''ページになります。
+
+ページの総閲覧回数は'''$3'''回です。また、'''$4'''回の編集が行われました。平均すると、1ページあたり'''$5'''回の編集が行われ、1編集あたり'''$6'''回閲覧されています。",
+
+'userstatstext' => "登録済みの利用者は'''$1'''人で、内'''$2'''人 ('''$4%''') が管理者権限を持っています。($3を参照)",
+
+# Maintenance Page
+#
+'maintenance' => 'メンテナンスページ',
+'maintnancepagetext' => 'このページには毎日のメンテナンスに便利なツールがあります。いくつかの機能はデータベースに負荷を与えるので、修正の度に再読み込みをしないでください。',
+'maintenancebacklink' => 'メンテナンスページに戻る',
+'disambiguations' => '曖昧さ回避ページ',
+'disambiguationspage' => 'Template:Disambig',
+'disambiguationstext' => '以下のページは<b>曖昧さ回避ページ</b>へリンクしています。これらのページはより適した主題のページへリンクされるべきです。<br />
+$1 にリンクしているページは曖昧さ回避ページと見なされます。',
+'doubleredirects' => '二重リダイレクト',
+'doubleredirectstext' => '以下はリダイレクトにリンクしているリダイレクトの一覧です。最も左のリダイレクトは二番目のリダイレクトが指している、恐らく「真に」リダイレクトしたいページを指すよう、変更されるべきです。',
+'brokenredirects' => '迷子のリダイレクト',
+'brokenredirectstext' => '以下は存在しないページにリンクしているリダイレクトです。',
+'selflinks' => '自己リンクのあるページ',
+'selflinkstext' => '以下のページは本来あるべきでない、自分自身へのリンクを含んでいます。',
+'mispeelings' => 'スペルミスのあるページ',
+'mispeelingstext' => 'The following pages contain a common misspelling, which are listed on $1. The correct spelling might be given (like this).',
+'mispeelingspage' => 'List of common misspellings',
+'missinglanguagelinks' => '言語間リンクのないページ',
+'missinglanguagelinksbutton' => '次の言語への言語間リンクのないページを検索',
+'missinglanguagelinkstext' => 'これらのページは $1 版へリンクしていません。リダイレクトとサブページは表示されません。',
+
 
 # Miscellaneous special pages
 #
-"orphans"		=> "孤立しているページ",
-"lonelypages"	        => "孤立しているページ",
-"unusedimages"	        => "使われていない画像",
-"popularpages"	        => "人気のページ",
-"nviews"		=> "$1 回表示",
-"wantedpages"	        => "投稿が望まれているページ",
-"nlinks"		=> "$1 個のリンク",
-"allpages"		=> "全ページ",
-"randompage"	        => "おまかせ表示",
-"shortpages"	        => "短いページ",
-"longpages"		=> "長いページ",
-"listusers"		=> "登録ユーザー一覧",
-"specialpages"	        => "特別ページ",
-"spheading"		=> "特別ページ",
-"protectpage"	        => "Protect page",
-"recentchangeslinked"   => "リンクを見張る",
-"rclsub"		=> "(to pages linked from \"$1\")",
-"debug"			=> "デバッグ (debug)",
-"newpages"		=> "新しいページ",
-"movethispage"	        => "このページを移動する",
-"unusedimagestext" => "<p>ご注意:他言語版のウィキペディアも含め、他のウェブサイトがURLを直接用いて画像にリンクしている場合もあります。
-以下の画像一覧には、そのような形で利用されている画像が含まれている可能性があります。",
-"booksources"	=> "文献資料",
-"booksourcetext" => "以下のリストは、新本、古本などを販売している外部サイトへのリンクです。
-あなたがお探しの本について、更に詳しい情報が提供されている場合もあります｡
-ウィキペディアはこれらの業務とは提携関係は持っていません。また、このリストはリストされたサイトへのウィキペディアの支持を表すものでもありません。",
-
-# Email this user
+'orphans' => '孤立しているページ',
+'geo' => 'GEO coordinates',
+'validate' => 'ページの評価',
+'lonelypages' => '孤立しているページ',
+'uncategorizedpages' => 'カテゴリ未導入のページ',
+'uncategorizedcategories' => '上位カテゴリのないカテゴリ',
+'unusedcategories' => '未使用のカテゴリ',
+'unusedimages' => '使われていない画像',
+'popularpages' => '人気のページ',
+'nviews' => '$1 回表示',
+'wantedpages' => '投稿が望まれているページ',
+'mostlinked' => '最もリンクされているページ',
+'nlinks' => '$1 個のリンク',
+'allpages' => '全ページ',
+'randompage' => 'おまかせ表示',
+'randompage-url' => 'Special:Randompage',
+'shortpages' => '短いページ',
+'longpages' => '長いページ',
+'deadendpages' => '有効なページへのリンクがないページ',
+'listusers' => '登録ユーザーの一覧',
+'specialpages' => '特別ページ',
+'spheading' => '特別ページ',
+'restrictedpheading' => '制限された特別ページ',
+'protectpage' => 'ページの保護',
+'recentchangeslinked' => 'リンク先の更新',
+'rclsub' => '（"$1" からリンクされているページ）',
+'debug' => 'デバッグ',
+'newpages' => '新しいページ',
+'ancientpages' => '更新されていないページ',
+'intl' => '言語間リンク',
+'move' => '移動',
+'movethispage' => 'このページを移動',
+'unusedimagestext' => '<p>他のウェブサイトがURLを直接用いて画像にリンクしている場合もあります。以下の画像一覧には、そのような形で利用されている画像が含まれている可能性があります。</p>',
+'unusedcategoriestext' => '以下のカテゴリページはどの項目・カテゴリからも使われていません。',
+
+'booksources' => '文献資料',
+'categoriespagetext' => '{{SITENAME}}には以下のカテゴリが存在します。',
+'data' => 'Data',
+'userrights' => 'ユーザー権限の管理',
+# 'groups' => '',
+
+'booksourcetext' => '以下のリストは、新本、古本などを販売している外部サイトへのリンクです。あなたがお探しの本について、更に詳しい情報が提供されている場合もあります。',
+'isbn' => 'ISBN',
+# 'rfcurl' => '',
+# 'pubmedurl' => '',
+'alphaindexline' => '$1―$2',
+'version' => 'バージョン情報',
+'log' => 'ログ',
+'alllogstext' => 'アップロード、削除、保護、投稿ブロック、権限変更のログがまとめて表示されています。ログの種類、実行した利用者、影響を受けたページ（利用者）による絞り込みができます。',
+
+# Special:Allpages
+'nextpage' => '次のページ（$1）',
+'allpagesfrom' => '表示開始ページ:',
+'allarticles' => '全ページ',
+'allnonarticles' => '項目以外の全ページ',
+'allinnamespace' => '全ページ ($1 名前空間)',
+'allnotinnamespace' => '全ページ ($1 名前空間を除く)',
+'allpagesprev' => '前へ',
+'allpagesnext' => '次へ',
+'allpagessubmit' => '表示',
+
+# E this user
 #
-"mailnologin"	=> "送信先のアドレスがありません。" /* No send address"*/,
-"mailnologintext" => "ログインしていません。メールを送信するためには、
-あなたの電子メールアドレスを[[Special:Userlogin|ユーザーオプション]]
-で指定し、
-[[Special:Userlogin|ログイン]]している必要があります。"
-/* You must be <a href=\"" .
-  "{{localurle:Special:Userlogin}}\">logged in</a>
-and have a valid e-mail address in your <a href=\"" .
-  "{{localurle:Special:Preferences}}\">preferences</a>
-to send e-mail to other users." */,
-"emailuser"		=> "このユーザーにメールを送る" /* "E-mail this user" */,
-"emailpage"		=> "メール送信ページ" /* "E-mail user" */,
-"emailpagetext"	=> "もしメールを送る先のユーザーが、有効なメールアドレスを
+'mailnologin' => '送信先のアドレスがありません。',
+'mailnologintext' => '他のユーザーに宛てにメールを送信するためには、[[Special:Userlogin|ログイン]]し、あなたのメールアドレスを[[Special:Preference|ユーザーオプション]]に設定する必要があります。',
+'emailuser' => 'このユーザーにメールを送信',
+'emailpage' => 'メール送信ページ',
+'emailpagetext' => 'もしメールを送る先のユーザーが、有効なメールアドレスを
 ユーザーオプションに登録してあれば、下のフォームを通じてメールを送ることができます。
 あなたが登録したご自分のメールアドレスはFrom:の欄に自動的に組み込まれ、受け取った相手が
-返事を出せるようになっています。"
-
-/* "If this user has entered a valid e-mail address in
-is user preferences, the form below will send a single message.
-The e-mail address you entered in your user preferences will appear
-as the \"From\" address of the mail, so the recipient will be able
-to reply."*/,
-"noemailtitle"	=> "送り先のメールアドレスがありません。" /* "No e-mail address" */,
-"noemailtext"	=> "このユーザーは有効なメールアドレスを登録していないか、メールを受け取りたくないというオプションを選択しています。"
- /* "This user has not specified a valid e-mail address,
-or has chosen not to receive e-mail from other users." */,
-"emailfrom"		=> "あなたのアドレス" /* "From" */,
-"emailto"		=> "あて先" /* "To" */,
-"emailsubject"	=> "題名" /* "Subject" */,
-"emailmessage"	=> "本文" /* "Message" */,
-"emailsend"		=> "メール送信" /* "Send" */,
-"emailsent"		=> "メールを送りました" /* "E-mail sent" */,
-"emailsenttext" => "メールは無事送信されました。" /* "Your e-mail message has been sent." */,
-
-# Watchlist ウォッチリスト
-#
-"watchlist"		=> "ウォッチリスト",
-"watchlistsub"	=> "(ユーザー名 \"$1\")" /* (for user \"$1\") */,
-"nowatchlist"	=> "あなたのウォッチリストは空です。" /* "You have no items on your watchlist." */,
-"watchnologin"	=> "ログインしていません" /* "Not logged in" */,
-"watchnologintext"	=> "ウォッチリストを変更するためには、
-[[Special:Userlogin|ログイン]]している必要があります。"
-/* "You must be <a href=\"" .
-  "{{localurle:Special:Userlogin}}\">logged in</a>
-to modify your watchlist." */,
-"addedwatch"	=> "ウォッチリストに加えました" /* "Added to watchlist" */,
-"addedwatchtext" => "ページ\"$1\" をあなたの
-<a href=\"{{localurle:Special:Watchlist}}\">ウォッチリスト</a>
-に追加しました。
-このページと、付属のノートのページに変更があった際にはそれをウォッチリストで
-知ることができます。また、
-<a href=\"{{localurle:Special:Recentchanges}}\">最近更新したページ</a> では
-ウォッチリストに含まれているページは<b>ボールド体</b>で表示され、見つけやすく
-なります。</p>
-
-<p>もしもウォッチリストから特定のページを削除したい場合には、サイドバーにある
-\"ウォッチリストから削除\" のリンクをクリックして下さい。",
-
-/* The page \"$1\" has been added to your <a href=\"" .
-  "{{localurle:Special:Watchlist}}\">watchlist</a>.
-Future changes to this page and its associated Talk page will be listed there,
-and the page will appear <b>bolded</b> in the <a href=\"" .
-  "{{localurle:Special:Recentchanges}}\">list of recent changes</a> to
-make it easier to pick out.</p>
-
-<p>If you want to remove the page from your watchlist later, click \"Stop watching\" in the sidebar." */
-
-"removedwatch"	=> "ウォッチリストから削除しました" /* "Removed from watchlist" */,
-"removedwatchtext" => "ページ\"$1\はウォッチリストから削除されました。" /* "The page \"$1\" has been removed from your watchlist." */,
-"watchthispage"	=> "ウォッチリストに追加" /* "Watch this page" */,
-"unwatchthispage" => "ウォッチリストから削除" /* "Stop watching" */,
-"notanarticle"	=> "これは記事ではありません。" /* "Not an article" */,
-
-# Delete/protect/revert  （ここは管理者用の部分なので当面英文を残しておきます。）
+返事を出せるようになっています。',
+'usermailererror' => 'メール送信時に以下のエラーが発生しました:',
+'defemailsubject' => '{{SITENAME}} (ja) e-mail',
+'noemailtitle' => '送り先のメールアドレスがありません。',
+'noemailtext' => 'このユーザーは有効なメールアドレスを登録していないか、メールを受け取りたくないというオプションを選択しています。',
+'emailfrom' => 'あなたのアドレス',
+'emailto' => 'あて先',
+'emailsubject' => '題名',
+'emailmessage' => '本文',
+'emailsend' => 'メール送信',
+'emailsent' => 'メールを送りました',
+'emailsenttext' => 'メールは無事送信されました。',
+
+# Watchlist
 #
-"deletepage"	=> "Delete page (ページ削除)",
-"confirm"		=> "Confirm (確認)",
-"confirmdelete" => "Confirm delete (削除確認)",
-"deletesub"		=> "(Deleting \"$1\") (サブページ\"$1\"を削除)",
-"confirmdeletetext" => "指定されたページまたはイメージは、その更新履歴と共に
-データベースから永久に削除されようとしています。
-あなたが削除を望んでおり、それがもたらす帰結を理解しており、かつあなたの
-しようとしていることが[[{{ns:4}}:Policy|ウィキペディアの基本方針]]に即したものであることを確認して下さい。
-
-You are about to permanently delete a page
-or image along with all of its history from the database.
-Please confirm that you intend to do this, that you understand the
-consequences, and that you are doing this in accordance with
-[[{{ns:4}}:Policy]].",
-"actioncomplete" => "削除を完了しました。　Action complete",
-"deletedtext"	=> "\"$1\" は削除されました。　\"$1\" has been deleted.
-最近の削除に関しては$2 を参照して下さい。
-See $2 for a record of recent deletions.",
-"deletedarticle" => "\"$1\"　を削除しました",
-"dellogpage"	=> "削除記録　Deletion_log",
-"dellogpagetext" => "以下に示すのは最近の削除記録です。時間はサーバーの時間（UTC）によって記録されています。
-
-Below is a list of the most recent deletions.
-All times shown are server time (UTC).
-<ul>
-</ul>
-",
-"deletionlog"	=> "削除記録　deletion log",
-"reverted"		=> "以前のバージョンへの差し戻し。　Reverted to earlier revision",
-"deletecomment"	=> "削除の理由　Reason for deletion",
-"imagereverted" => "以前のバージョンへの差し戻しに成功しました。　Revert to earlier version was successful.",
-
-# Contributions ユーザーの投稿記録
-#
-"contributions"	=> "ユーザーの投稿記録",
-"contribsub"	=> "ユーザー名：$1",
-"nocontribs"	=> "ユーザーの投稿記録は見つかりませんでした。",
-"ucnote"		=> "以下に示すのが過去<b>$2</b>日間における、最大<b>$1</b>件の投稿・編集です。"
-  /*Below are this user's last <b>$1</b> changes in the last <b>$2</b> days."*/,
-"uclinks"		=> "$1 件の投稿・編集を見る。; $2日間分の投稿・編集を見る。
+'watchlist' => 'ウォッチリスト',
+'watchlistsub' => '（ユーザー名 "$1"）',
+'nowatchlist' => 'あなたのウォッチリストは空です。',
+'watchnologin' => 'ログインしていません',
+'watchnologintext' => 'ウォッチリストを変更するためには、[[Special:Userlogin|ログイン]]している必要があります。',
+'addedwatch' => 'ウォッチリストに追加しました',
+'addedwatchtext' => "ページ \"$1\" をあなたの[[Special:Watchlist|ウォッチリスト]]に追加しました。
+
+このページと、付属のノートのページに変更があった際にはそれをウォッチリストで知ることができます。また、[[Special:Recentchanges|最近更新したページ]]ではウォッチリストに含まれているページは'''ボールド体'''で表示され、見つけやすくなります。
+
+ウォッチリストから特定のページを削除したい場合には、サイドバーかタブにある \"ウォッチリストから削除\" のリンクをクリックしてください。",
+
+'removedwatch' => 'ウォッチリストから削除しました',
+'removedwatchtext' => 'ページ "$1" をウォッチリストから削除しました。',
+'watch' => 'ウォッチリストに追加',
+'watchthispage' => 'ウォッチリストに追加',
+'unwatch' => 'ウォッチリストから削除',
+'unwatchthispage' => 'ウォッチリストから削除',
+'notanarticle' => 'これは記事ではありません。',
+'watchnochange' => 'その期間内にウォッチリストにあるページはどれも編集されていません。',
+'watchdetails' => '* ウォッチリストに入っているページ数（ノート除く）: $1
+* [[Special:Watchlist/edit|ウォッチリストの一覧・編集]]',
+'wlheader-enotif' => '* メール通知が有効になっています',
+'wlheader-showupdated' => "* あなたが最後に訪問したあとに変更されたページは'''ボールド体'''で表示されます",
+'watchmethod-recent' => 'ウォッチリストの中から最近編集されたものを抽出',
+'watchmethod-list' => '最近編集された中からウォッチしているページを抽出',
+'removechecked' => 'チェックした項目をウォッチリストから削除',
+'watchlistcontains' => 'あなたのウォッチリストには $1 ページ登録されています。',
+'watcheditlist' => 'ウォッチリストに登録しているページを文字コード順に表示しています。
+
+チェックボックスにチェックし、「ウォッチリストから削除」のボタンをクリックするとウォッチリストから削除されます。
 
-View the last $1 changes; view the last $2 days.",
+※ウォッチリストからページを削除すると、付随するノートページも削除されます。',
+'removingchecked' => '要求された項目をウォッチリストから削除しています:',
+'couldntremove' => '"$1" をウォッチリストから削除できません。',
+'iteminvalidname' => '"$1" をウォッチリストから削除できません。ページ名が不正です。',
+'wlnote' => '以下は最近 <strong>$2</strong> 時間に編集された <strong>$1</strong> ページです。',
+'wlshowlast' => '最近の [$1時間] [$2日間] [$3] のものを表示する',
+'wlsaved' => '現在、バックアップされたウォッチリストのみの表示となっています。',
+'wlhideshowown' => '自分の編集を$1',
+'wlshow' => '表示',
+'wlhide' => '隠す',
 
-# What links here このページにリンクしている他のページ
+'enotif_mailer' => '{{SITENAME}} Notification Mailer',
+'enotif_reset' => 'すべてのページを訪問済みにする',
+'enotif_newpagetext' => '(新規ページ)',
+'changed' => '変更',
+'created' => '作成',
+'enotif_subject' => '{{SITENAME}} のページ "$PAGETITLE" が $PAGEEDITOR によって$CHANGEDORCREATEDされました',
+'enotif_lastvisited' => '
+あなたが最後に閲覧してからの差分を見るには以下のURLにアクセスしてください:
+$1',
+'enotif_body' => 'Dear $WATCHINGUSERNAME,
+
+{{SITENAME}}のページ $PAGETITLE が $PAGEEDITDATE に
+$PAGEEDITOR によって$CHANGEDORCREATEDされました。
+現在の版を見るには次のURLにアクセスしてください:
+$PAGETITLE_URL
+$NEWPAGE
+
+編集内容の要約: $PAGESUMMARY ($PAGEMINOREDIT)
+
+投稿者:
+メール: $PAGEEDITOR_EMAIL
+ウィキ: $PAGEEDITOR_WIKI
+
+あなたがこのページを訪れない限り、これ以上の通知は送信されません。
+ウォッチリストからすべての通知フラグをリセットすることもできます。
+
+                         {{SITENAME}} 通知システム
+
+--
+ウォッチリストの設定を変更する:
+{{SERVER}}{{localurl:Special:Watchlist/edit}}
+
+助けが必要ですか:
+{{SERVER}}{{localurl:Help:Contents}}',
+
+
+
+
+
+
+
+
+
+# Delete/protect/revert
 #
-"whatlinkshere"	=> "ここにリンクしている他のページ" /* "what links here" */,
-"notargettitle" => "対象となるページが存在しません" /* "No target" */,
-"notargettext"	=> "対象となるページ又はユーザーが指定されていません" /* "You have not specified a target page or user
-to perform this function on." */,
-"linklistsub"	=> "リンクのリスト" /* "(List of links)" */,
-"linkshere"		=> "以下のページが指定されたページにリンクしています。" /* "The following pages link to here:" */,
-"nolinkshere"	=> "指定されたページにリンクしているページはありません。" /* "No pages link to here." */,
-"isredirect"	=> "リダイレクトページ" /* "redirect page" */,
-
-# Block/unblock IP （この部分は管理者用なので当面英文を残しておきます。）
+'deletepage' => 'ページ削除',
+'confirm' => '確認',
+'excontent' => "内容: '$1'",
+'excontentauthor' => "内容: '$1' (投稿者 $2 のみ)",
+'exbeforeblank' => "白紙化前の内容: '$1'",
+'exblank' => '白紙ページ',
+'confirmdelete' => '削除の確認',
+'deletesub' => '（"$1" を削除）',
+'historywarning' => '警告: 削除しようとしているページには履歴があります:',
+'confirmdeletetext' => '指定されたページまたは画像は、その更新履歴と共にデータベースから永久に削除されようとしています。あなたが削除を望んでおり、それがもたらす帰結を理解しており、かつあなたのしようとしていることが[[Project:Policy|基本方針]]に即したものであることを確認してください。',
+'actioncomplete' => '完了しました',
+'deletedtext' => '"$1" は削除されました。最近の削除に関しては $2 を参照してください。',
+'deletedarticle' => '"$1" を削除しました。',
+'dellogpage' => '削除記録',
+'dellogpagetext' => '以下は最近の削除と復帰の記録です。',
+'deletionlog' => '削除記録',
+'reverted' => '以前のバージョンへの差し戻し (Reverted to earlier revision)',
+'deletecomment' => '削除の理由',
+'imagereverted' => '以前のバージョンへの差し戻しに成功しました。',
+'rollback' => 'Roll back edits',
+'rollback_short' => 'Rollback',
+'rollbacklink' => 'rollback',
+'rollbackfailed' => 'Rollback に失敗しました。',
+'cantrollback' => '投稿者がただ一人であるため、編集を差し戻せません。',
+'alreadyrolled' => 'ページ [[$1]] の [[User:$2|$2]] ([[User talk:$2|会話]] | [[Special:Contributions/$2|履歴]]) による編集の rollback に失敗しました。誰か他のユーザーが編集を行ったか rollback されたのかもしれません。
+
+このページの最後の編集は [[User:$3|$3]] ([[User talk:$3|会話]] | [[Special:Contributions/$3|履歴]]) によるものです。',
+
+#   only shown if there is an edit comment
+'editcomment' => '編集内容の要約: <i>$1</i>',
+'revertpage' => 'Reverted edit of $2, changed back to last version by $1',
+'sessionfailure' => 'あなたのログイン・セッションに問題が発生しました。この動作はセッションハイジャックを防ぐために取り消されました。ブラウザの「戻る」を押してからページを再読込し、もう一度送信してください。',
+'protectlogpage' => '保護記録',
+'protectlogtext' => '以下はページの保護・保護解除の一覧です。詳細は[[{{ns:Project}}:保護されたページ]]を参照してください。',
+'protectedarticle' => '"$1" を保護しました。',
+'unprotectedarticle' => '"$1" の保護を解除しました。',
+'protectsub' => '（"$1" の保護）',
+'confirmprotecttext' => '本当にこのページを保護しますか?',
+'confirmprotect' => '保護の確認',
+'protectmoveonly' => '移動のみ差し止める',
+'protectcomment' => '保護の理由',
+'unprotectsub' => '（"$1" の保護解除）',
+'confirmunprotecttext' => '本当にこのページの保護を解除しますか?',
+'confirmunprotect' => '保護解除の確認',
+'unprotectcomment' => '保護解除の理由',
+
+# Undelete
+'undelete' => '削除されたページを参照する',
+'undeletepage' => '削除された編集の参照と復帰',
+'undeletepagetext' => '以下のページは削除されていますが、アーカイブに残っているため、復帰できます。アーカイブは定期的に消去されます。',
+'undeletearticle' => '削除済みページの復帰',
+'undeleterevisions' => '($1 版が保存されています)',
+'undeletehistory' => 'ページの復帰を行うと、履歴にある全ての編集が復帰します。削除後に同じ名前のページが作成されている場合、削除以前の編集は新しい履歴の前に表示され、最新版は置き換わりません。',
+'undeleterevision' => '削除された $1 の版',
+'undeletebtn' => '復帰!',
+'undeletedarticle' => '"$1" を復帰しました。',
+'undeletedrevisions' => '$1 版を復帰',
+'undeletedtext' => '[[:$1]]を無事復帰しました。最近の削除と復帰の記録は[[Special:Log/delete]]を参照してください。',
+
+# Namespace form on various pages
+'namespace' => '名前空間:',
+'invert' => '選択した名前空間を隠す',
+
+# Contributions
 #
-"blockip"		=> "Block IP address",
-"blockiptext"	=> "Use the form below to block write access
-from a specific IP address.
-This should be done only only to prevent valndalism, and in
-accordance with [[{{ns:4}}:Policy|{{SITENAME}} policy]].
-Fill in a specific reason below (for example, citing particular
-pages that were vandalized).",
-"ipaddress"		=> "IP Address",
-"ipbreason"		=> "Reason",
-"ipbsubmit"		=> "Block this address",
-"badipaddress"	=> "The IP address is badly formed.",
-"blockipsuccesssub" => "Block succeeded",
-"blockipsuccesstext" => "The IP address \"$1\" has been blocked.
-<br />See [[Special:Ipblocklist|IP block list]] to review blocks.",
-"unblockip"		=> "Unblock IP address",
-"unblockiptext"	=> "Use the form below to restore write access
-to a previously blocked IP address.",
-"ipusubmit"		=> "Unblock this address",
-"ipusuccess"	=> "IP address \"$1\" unblocked",
-"ipblocklist"	=> "List of blocked IP addresses",
-"blocklistline"	=> "$1, $2 blocked $3 ($4)",
-"blocklink"		=> "block",
-"unblocklink"	=> "unblock",
-"contribslink"	=> "contribs",
-
-# Developer tools  （この部分は管理者用なので当面英文を残しておきます。）
+'contributions' => 'ユーザーの投稿記録',
+'mycontris' => '自分の投稿記録',
+'contribsub' => 'ユーザー名：$1',
+'nocontribs' => 'ユーザーの投稿記録は見つかりませんでした。',
+# 'ucnote' => '',
+# 'uclinks' => '',
+'uctop' => ' (top)',
+'newbies' => '新規ユーザー',
+'contribs-showhideminor' => '$1 minor edits',
+
+# What links here
 #
-"lockdb"		=> "Lock database",
-"unlockdb"		=> "Unlock database",
-"lockdbtext"	=> "Locking the database will suspend the ability of all
-users to edit pages, change their preferences, edit their watchlists, and
-other things requiring changes in the database.
-Please confirm that this is what you intend to do, and that you will
-unlock the database when your maintenance is done.",
-"unlockdbtext"	=> "Unlocking the database will restore the ability of all
-users to edit pages, change their preferences, edit their watchlists, and
-other things requiring changes in the database.
-Please confirm that this is what you intend to do.",
-"lockconfirm"	=> "Yes, I really want to lock the database.",
-"unlockconfirm"	=> "Yes, I really want to unlock the database.",
-"lockbtn"		=> "Lock database",
-"unlockbtn"		=> "Unlock database",
-"locknoconfirm" => "You did not check the confirmation box.",
-"lockdbsuccesssub" => "Database lock succeeded",
-"unlockdbsuccesssub" => "Database lock removed",
-"lockdbsuccesstext" => "The {{SITENAME}} database has been locked.
-<br />Remember to remove the lock after your maintenance is complete.",
-"unlockdbsuccesstext" => "The {{SITENAME}} database has been unlocked.",
-
-# Move page ページの移動
+'whatlinkshere' => 'リンク元',
+'notargettitle' => '対象となるページが存在しません',
+'notargettext' => '対象となるページ又はユーザーが指定されていません',
+'linklistsub' => 'リンクのリスト',
+'linkshere' => '指定したページは以下のページからリンクされています',
+'nolinkshere' => '指定されたページにリンクしているページはありません。',
+'isredirect' => 'リダイレクトページ',
+
+# Block/unblock IP
 #
-"movepage"		=> "ページの移動",
-"movepagetext"	=> "以下のフォームを利用して、ページ名を変更し、
-そのページに付随する履歴の情報を変更先のページへ移動することができます。
-変更されるページは、変更後は変更先へのリダイレクトページになります。
-更新前のページへと張られたリンクは変更されません。また、ページに付随する
-ノートのページも移動されません。
-<b>注意！</b>
-これは人気のあるページにとって抜本的で予想外の変更になるかも知れません。
-ページの移動に伴う諸帰結をよく理解してから移動に踏み切るようにして下さい。"
-
-/* "Using the form below will rename a page, moving all
-of its history to the new name.
-The old title will become a redirect page to the new title.
-Links to the old page title will not be changed, and the talk
-page, if any, will not be moved.
-<b>WARNING!</b>
-This can be a drastic and unexpected change for a popular page;
-please be sure you understand the consequences of this before
-proceeding." */,
-"movearticle"	=> "ページの移動",
-"movenologin"	=> "ログインしていません",
-"movenologintext" => "この機能を利用するためには、ユーザー登録をして、
-[[Special:Userlogin|ログイン]]している必要が
-あります。",
-"newtitle"		=> "新しいページへ" /* "To new title" */,
-"movepagebtn"	=> "ページを移動" /* "Move page" */,
-"pagemovedsub"	=> "無事移動しました。" /* "Move succeeded" */,
-"pagemovedtext" => "ページ\"[[$1]]\" は \"[[$2]]\" に移動しました。" /* "Page \"[[$1]]\" moved to \"[[$2]]\"." */,
-"articleexists" => "指定された移動先には既にページが存在するか、名前が不適切です。" /* "A page of that name already exists, or the
-name you have chosen is not valid.
-Please choose another name." */,
-"movedto"		=> "移動先:" /* "moved to" */,
-"movetalk"		=> "付随するノートのページが存在する場合にはそれも同時に移動させる" /* "Move \"talk\" page as well, if applicable." */,
-"talkpagemoved" => "付随のノートのページも移動しました。" /* "The corresponding talk page was also moved." */,
-"talkpagenotmoved" => "付随のノートのページは<b>移動されませんでした。</b>" /* "The corresponding talk page was <strong>not</strong> moved." */,
-
-# Math
-
-'mw_math_png' => "常にPNG",
-'mw_math_simple' => "シンプルな数式はHTML、それ以外はPNG",
-'mw_math_html' => "できる限りHTML、さもなければPNG",
-'mw_math_source' => "TeXのままにする (テキストブラウザ向け)",
-'mw_math_modern' => "可能ならばMathMLを使う (実験中の機能)",
-'mw_math_mathml' => 'MathML',
+'blockip' => 'ユーザーのブロック',
+'blockiptext' => '指定されたIPアドレスからの投稿をブロックすることができます。投稿ブロックは荒らしを防ぐためであり、[[Project:Policy|{{SITENAME}}の基本方針]]に従っているべきです。明確な理由を以下に記入してください（例えば、荒らされたページを引用する）。',
+'ipaddress' => 'IPアドレス',
+'ipadressorusername' => 'IPアドレス / ユーザー名',
+'ipbexpiry' => '期間',
+'ipbreason' => '理由',
+'ipbsubmit' => 'このアドレスまたはユーザーを投稿ブロックする',
+'ipbother' => '期間 (その他のとき)',
+'ipboptions' => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,無期限:infinite',
+'ipbotheroption' => 'その他',
+'badipaddress' => 'IPアドレスが異常です。',
+'blockipsuccesssub' => 'ブロックに成功しました。',
+'blockipsuccesstext' => 'IPアドレスまたはユーザー "$1" は投稿をブロックされました。<br/>
+[[Special:Ipblocklist|投稿ブロック中のユーザーやIPアドレス]]で確認できます。',
+'unblockip' => 'IPアドレスの投稿ブロックを解除する',
+'unblockiptext' => '以下のフォームでIPアドレスまたはユーザーの投稿ブロックを解除できます。',
+'ipusubmit' => 'このアドレスまたはユーザーの投稿ブロックを解除する',
+'ipusuccess' => 'IPアドレス "$1" の投稿ブロックが解除されました。',
+'ipblocklist' => '投稿ブロック中のユーザーやIPアドレス',
+'blocklistline' => '$1, $2 は $3 をブロック （$4）',
+'infiniteblock' => '無期限',
+'expiringblock' => '$1 に解除',
+'ipblocklistempty' => '投稿ブロック中のユーザーやIPアドレスはありません。',
+'blocklink' => 'block',
+'unblocklink' => 'ブロック解除',
+'contribslink' => '投稿記録',
+'autoblocker' => '投稿ブロックされているユーザー "$1" と同じIPアドレスのため、自動的にブロックされています。ブロックの理由は "$2" です。',
+'blocklogpage' => '投稿ブロック記録',
+'blocklogentry' => '"$1" を $2 ブロックしました',
+'blocklogtext' => 'このページは投稿ブロックと解除の記録です。自動的に投稿ブロックされたIPアドレスは一覧されていません。現時点で有効な投稿ブロックは[[Special:Ipblocklist|投稿ブロック中のユーザーやIPアドレス]]をご覧ください。',
+'unblocklogentry' => '"$1" をブロック解除しました',
+'range_block_disabled' => '広域ブロックは無効に設定されています。',
+'ipb_expiry_invalid' => '不正な期間です。',
+'ip_range_invalid' => '不正なIPアドレス範囲です。',
+'proxyblocker' => 'Proxy blocker',
+'proxyblockreason' => 'Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.
+
+:あなたの使用しているIPアドレスはオープン・プロクシであるため投稿ブロックされています。あなたのインターネット・サービス・プロバイダ、もしくは技術担当者に連絡を取り、これが深刻なセキュリティ問題であることを伝えてください。',
+'proxyblocksuccess' => 'Done.
+',
+'sorbs' => 'SORBS DNSBL',
+'sorbsreason' => 'あなたのIPアドレスはオープンプロクシであると、[http://www.sorbs.net/ SORBS] DNSBLに掲載されています。',
+'sorbs_create_account_reason' => 'あなたのIPアドレスがオープンプロクシであると、[http://www.sorbs.net/ SORBS] DNSBLに掲載されているため、アカウントを作成できません。',
+
+
+# Developer tools
+#
+'lockdb' => 'データベースのロック',
+'unlockdb' => 'データベースのロック解除',
+'lockdbtext' => 'データベースをロックすると全てのユーザーはページを編集できなくなり、オプションを変更できなくなり、ウォッチリストを編集できなくなるなど、データベースに書き込む全ての作業ができなくなります。本当にデータベースをロックして良いかどうか確認してください。メンテナンスが終了したらロックを解除してください。',
+'unlockdbtext' => 'データベースのロックを解除することでユーザーはページを編集できるようになり、オプションを変更できるようになり、ウォッチリストを編集できるようになりなど、データベースに書き込む全ての作業ができるようになります。本当にデータベースのロックを解除していいかどうか確認してください。',
+'lockconfirm' => '本当にデータベースをロックする',
+'unlockconfirm' => 'ロックを解除する',
+'lockbtn' => 'ロック',
+'unlockbtn' => 'ロック解除',
+'locknoconfirm' => 'チェックボックスにチェックされていません。',
+'lockdbsuccesssub' => 'データベースはロックされました。',
+'unlockdbsuccesssub' => 'データベースのロックは解除されました',
+'lockdbsuccesstext' => 'データベースはロックされました。メンテナンスが終了したら忘れずにロックを解除しましょう。',
+'unlockdbsuccesstext' => 'データベースのロックは解除されました。',
+
+# Make sysop
+'makesysoptitle' => 'ユーザーを管理者にする',
+'makesysoptext' => 'このフォームは通常のユーザーを管理者にするために使用します。管理者にするユーザー名を入力し、このユーザーを管理者にするボタンを押してください。',
+'makesysopname' => 'ユーザー名:',
+'makesysopsubmit' => 'このユーザーを管理者にする',
+'makesysopok' => '<b>ユーザー "$1" を管理者にしました。</b>',
+'makesysopfail' => '<b>ユーザー "$1" を管理者にできませんでした。ユーザー名を正しく入力していたかどうか確認してください。</b>',
+'setbureaucratflag' => '"bureaucrat" フラグをセット',
+'setstewardflag' => 'Stewardフラグをセット',
+'bureaucratlog' => '権限変更記録',
+'rightslogtext' => '以下はユーザーの権限変更の一覧です。',
+'bureaucratlogentry' => '$1 の権限を "$2" から "$3" に変更しました。',
+'rights' => '権限:',
+'set_user_rights' => 'ユーザー権限の設定',
+'user_rights_set' => '<b>ユーザー "$1" の権限が更新されました</b>',
+'set_rights_fail' => '<b>ユーザー "$1" の権限を設定できませんでした。ユーザー名を正しく入力していたかどうか確認してください。</b>',
+'makesysop' => 'ユーザーを管理者にする',
+'already_sysop' => 'ユーザーは既に管理者です。',
+'already_bureaucrat' => 'ユーザーは既にビューロクラットです。',
+'already_steward' => 'ユーザーは既にStewardです。',
+
+# Validation
+'val_yes' => 'はい',
+'val_no' => 'いいえ',
+'val_of' => '$1点 ($2点中)',
+'val_revision' => '版',
+'val_time' => '時刻',
+'val_user_stats_title' => '$1による評価',
+'val_my_stats_title' => 'あなたの評価記録',
+'val_list_header' => '<th>#</th><th>評価基準</th><th>範囲</th><th>操作</th>',
+'val_add' => '追加',
+'val_del' => '削除',
+'val_show_my_ratings' => '自分の評価を表示',
+'val_revision_number' => '版 #$1',
+'val_warning' => "'''絶対に'''コミュニティの'''完全な合意無しに'''ここの記述を'''変更しないでください'''。",
+'val_rev_for' => '$1 を評価中',
+'val_details_th_user' => 'ユーザー $1',
+'val_validation_of' => '"$1" に対する評価',
+'val_revision_of' => '$1 の版',
+'val_revision_changes_ok' => 'あなたの評価が記録されました。',
+'val_rev_stats' => '"$1" に対する評価の一覧</a> <a href="$2">(この版)',
+'val_revision_stats_link' => '詳細',
+'val_iamsure' => 'これで採点する。',
+'val_details_th' => '<sub>ユーザー</sub>＼<sup>評価基準</sup>',
+'val_clear_old' => '古い版に対する自分の評価を取り消す',
+'val_merge_old' => '"意見なし" とした箇所について以前の評価を引き継ぐ',
+'val_form_note' => "----
+'''ヒント:''' 「{{int:Val_merge_old}}」にチェックを入れると、このフォームで「意見なし」と選択した評価項目について、以前の版であなたが行った評価とコメントを引き継ぎます。つまり、あなたがこのページに対して、ある評価項目についてのみ評価を変更したい場合は、その評価項目でのみ、新しい評価値を選び、コメントを入力してください。そしてその他の評価項目を「意見なし」のままにしておけば、以前の評価がそのまま引き継がれます。",
+'val_noop' => '意見なし',
+'val_topic_desc_page' => 'Project:評価基準',
+'val_votepage_intro' => 'このテキストを[{{SERVER}}{{localurl:MediaWiki:Val_votepage_intro}} 編集してください]。',
+'val_percent' => '<b>$1%</b><br />($4名による<br />$3の評価のうち$2)',
+'val_percent_single' => '<b>$1%</b><br />(1名による<br />$3の評価のうち$2)',
+'val_total' => '合計',
+'val_version' => '版',
+'val_tab' => '評価',
+'val_this_is_current_version' => 'これは最新版です',
+'val_version_of' => '$1 の版',
+'val_table_header' => '<tr><th>クラス</th>$1<th colspan=4>提案</th>$1<th>コメント</th></tr>',
+'val_stat_link_text' => 'この項目に対する評価の一覧',
+'val_view_version' => 'この版を表示',
+'val_validate_version' => 'この版を評価する',
+'val_user_validations' => 'このユーザーは$1ページで評価をしています。',
+'val_no_anon_validation' => '評価をするには[[Special:Userlogin|ログイン]]する必要があります。',
+'val_validate_article_namespace_only' => "評価は標準名前空間に対してのみ可能です。このページは'''標準名前空間のページではありません'''。",
+'val_validated' => '評価を保存しました。',
+'val_article_lists' => '評価された項目',
+'val_page_validation_statistics' => '$1 に対する評価の一覧',
+
+# Move page
+#
+'movepage' => 'ページの移動',
+'movepagetext' => '下のフォームを利用すると、ページ名を変更し、その履歴も変更先へ移動することができます。古いページは変更先へのリダイレクトページとなります。ページの中身と変更前のページに張られたリンクは変わりません。ですから、二重になったり壊れてしまったリダイレクトをチェックする必要があります。
+
+変更先がすでに存在する場合には、履歴が移動元ページへのリダイレクトただ一つである場合を除いて、移動できません。つまり、間違えてページ名を変更した場合には元に戻せます。
+
+<strong>注意！</strong> よく閲覧されるページや、他の多くのページからリンクされているページを移動すると予期せぬ結果が起こるかもしれません。ページの移動に伴う影響をよく考えてから踏み切るようにしてください。',
+
+
+'movepagetalktext' => '付随するノートのページがある場合には、基本的には、一緒に移動されることになります。
+
+但し、以下の場合については別です。
+*名前空間をまたがる移動の場合
+*移動先に既に履歴のあるノートページが存在する場合
+*下のチェックボックスのチェックマークを消した場合
+
+これらの場合、ノートページを移動する場合には、別に作業する必要があります。',
+
+'movearticle' => '移動するページ',
+'movenologin' => 'ログインしていません',
+'movenologintext' => 'ページを移動するためには、ユーザー登録の上、[[Special:Userlogin|ログイン]]している必要があります。',
+'newtitle' => '新しいページ名',
+'movepagebtn' => 'ページを移動',
+'pagemovedsub' => '無事移動しました。',
+'pagemovedtext' => 'ページ "[[$1]]" は "[[$2]]" に移動しました。',
+'articleexists' => '指定された移動先には既にページが存在するか、名前が不適切です。',
+'talkexists' => 'ページ自身は移動されましたが、付随のノートページは移動先のページが存在したため移動できませんでした。手動で内容を統合してください。',
+'movedto' => '移動先:',
+'movetalk' => 'ノートページが付随する場合には、それも一緒に移動する',
+'talkpagemoved' => '付随のノートのページも移動しました。',
+'talkpagenotmoved' => '付随のノートのページは<strong>移動されませんでした。</strong>',
+'1movedto2' => '$1 を $2 へ移動',
+'1movedto2_redir' => '$1 をこのページあてのリダイレクト $2 へ移動',
+'movelogpage' => '移動記録',
+'movelogpagetext' => '以下は最近のページ移動の記録です。',
+'movereason' => '理由',
+'revertmove' => '差し戻し',
+'delete_and_move' => '削除して移動する',
+'delete_and_move_text' => '== 削除が必要です ==
+移動先 "[[$1]]" は既に存在しています。このページを移動のために削除しますか？',
+
+'delete_and_move_reason' => '移動のための削除',
+'selfmove' => '移動元と移動先のページ名が同じです。自分自身へは移動できません。',
+'immobile_namespace' => '移動先のページ名は特別なページです。その名前空間にページを移動することはできません。',
+
+# Export
+
+'export' => 'ページデータの書き出し',
+'exporttext' => 'ここでは単独のまたは複数のページのテキストと編集履歴をXMLの形で書き出すことができます。書き出されたXML文書はは他のMediaWikiで動いているウィキに取り込んだり、変換したり、個人的な楽しみに使ったりできます。
+
+ページデータを書き出すには下のテキストボックスに書き出したいページのタイトルを一行に一ページずつ記入してください。また編集履歴とともに全ての古い版を含んで書き出すのか、最新版のみを書き出すのか選択してください。
+
+後者のケースではリンクの形で使うこともできます。例: [[メインページ]]の最新版を取得するには[[{{ns:Special}}:Export/メインページ]]を使用します。',
+
+
+'exportcuronly' => 'すべての履歴を含ませずに、最新版のみを書き出す',
+
+# Namespace 8 related
+
+'allmessages' => '表示メッセージ一覧',
+'allmessagesname' => '名称',
+'allmessagesdefault' => 'デフォルトのテキスト',
+'allmessagescurrent' => '現在のテキスト',
+'allmessagestext' => 'これはMediaWiki名前空間にある全てのシステムメッセージの一覧です。',
+'allmessagesnotsupportedUI' => 'このサイトでは、あなたの現在のインターフェイス言語 <b>$1</b> における {{ns:Special}}:Allmessages はサポートされていません。',
+'allmessagesnotsupportedDB' => 'wgUseDatabaseMessages が無効のため、{{ns:Special}}:Allmessages はサポートされません。',
+
+# Thumbnails
+
+'thumbnail-more' => '拡大',
+'missingimage' => '<b>Missing image</b><br /><i>$1</i>
+',
+'filemissing' => '<i>ファイルがありません</i>',
+
+# Special:Import
+'import' => 'ページデータの取り込み',
+'importinterwiki' => 'Transwikiインポート',
+'importtext' => '元となるウィキから {{ns:Special}}:Export を使ってXMLファイルを書き出し、それをここにアップロードしてください。',
+'importfailed' => '取り込みに失敗しました: $1',
+'importnotext' => '内容が空か、テキストがありません。',
+'importsuccess' => '取り込みに成功しました。',
+'importhistoryconflict' => '取り込み時にいくつかの版が競合しました（以前に同じページを取り込んでいませんか）。',
+'importnosources' => 'Transwikiの読み込み元が定義されていないため、履歴の直接アップロードは無効になっています。',
+
+# Keyboard access keys for power users
+'accesskey-search' => 'f',
+'accesskey-minoredit' => 'i',
+'accesskey-save' => 's',
+'accesskey-preview' => 'p',
+'accesskey-diff' => 'd',
+'accesskey-compareselectedversions' => 'v',
+
+# tooltip help for some actions, most are in Monobook.js
+'tooltip-search' => 'ウィキ内を検索 [alt-f]',
+'tooltip-minoredit' => 'この編集を細部の変更とマーク [alt-i]',
+'tooltip-save' => '編集を保存します。 [alt-s]',
+'tooltip-preview' => '編集結果を確認します。保存前に是非使用してください。 [alt-p]',
+'tooltip-diff' => 'あなたが編集した版の変更点を表示します。[alt-d]',
+'tooltip-compareselectedversions' => '選択された二つの版の差分を表示します。 [alt-v]',
+'tooltip-watch' => 'このページをウォッチリストへ追加します。 [alt-w]',
+
+# stylesheets
+'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */
+#bodyContent { font-size:118% }',
+#'Monobook.js' => '/* edit this file to change js things in the monobook skin */',
+
+# Metadata
+'nodublincore' => 'Dublin Core RDF metadata disabled for this server.',
+'nocreativecommons' => 'Creative Commons RDF metadata disabled for this server.',
+'notacceptable' => 'ウィキサーバーはあなたの使用しているクライアントが読める形式で情報を提供できません。',
+
+# Attribution
+
+'anonymous' => '{{SITENAME}}の匿名ユーザー',
+'siteuser' => '{{SITENAME}}のユーザー$1',
+'lastmodifiedby' => '最終更新は $2 による $1 の編集です。',
+'and' => 'および',
+'othercontribs' => '$1の版に基づきます。',
+'others' => 'その他のユーザー',
+'siteusers' => '{{SITENAME}}のユーザー$1',
+'creditspage' => 'ページ・クレジット',
+'nocredits' => 'このページには有効なクレジット情報がありません。',
+
+# Spam protection
+
+'spamprotectiontitle' => 'スパム防御フィルター',
+'spamprotectiontext' => 'あなたが保存しようとしたページはスパム・フィルターによって保存をブロックされました。これは主に外部サイトへのリンクが原因です。',
+'spamprotectionmatch' => '以下はスパム・フィルターによって検出されたテキストです: $1',
+'subcategorycount' => 'このカテゴリには $1 のサブカテゴリがあります。',
+'subcategorycount1' => 'このカテゴリには $1 のサブカテゴリがあります。',
+'categoryarticlecount' => 'このカテゴリには $1 の項目があります。',
+'categoryarticlecount1' => 'このカテゴリには $1 の項目があります。',
+'usenewcategorypage' => '1
+
+Set first character to "0" to disable the new category page layout.',
+'listingcontinuesabbrev' => ' の続き',
+
+# Info page
+'infosubtitle' => 'ページ情報',
+'numedits' => '編集数（項目）: $1',
+'numtalkedits' => '編集数（ノート）: $1',
+'numwatchers' => 'ウォッチしているユーザー数: $1',
+'numauthors' => '投稿者数（項目）: $1',
+'numtalkauthors' => '投稿者数（ノート）: $1',
+
+# Math options
+'mw_math_png' => '常にPNG',
+'mw_math_simple' => 'シンプルな数式はHTML、それ以外はPNG',
+'mw_math_html' => 'できる限りHTML、さもなければPNG',
+'mw_math_source' => 'TeXのままにする (テキストブラウザ向け)',
+'mw_math_modern' => '最近のブラウザで推奨',
+'mw_math_mathml' => '可能ならばMathMLを使う (実験中の機能)',
+
+# Patrolling
+'markaspatrolleddiff' => 'パトロール済みにする',
+'markaspatrolledlink' => "<div class='patrollink'>[$1]</div>",
+'markaspatrolledtext' => 'この項目をパトロール済みにする',
+'markedaspatrolled' => 'パトロール済みにしました',
+'markedaspatrolledtext' => '選択された編集をパトロール済みにしました。',
+'rcpatroldisabled' => 'RCパトロールが無効です',
+'rcpatroldisabledtext' => '最近更新されたページのパトロール機能は現在無効になっています。',
+
+# Monobook.js: tooltips and access keys for monobook
+'Monobook.js' => "/* tooltips and access keys */
+ta = new Object();
+ta['pt-userpage'] = new Array('.','自分の利用者ページ'); 
+ta['pt-anonuserpage'] = new Array('.','あなたのIPアドレス用の利用者ページ'); 
+ta['pt-mytalk'] = new Array('n','自分の会話ページ'); 
+ta['pt-anontalk'] = new Array('n','あなたのIPアドレスからなされた編集の会話ページ'); 
+ta['pt-preferences'] = new Array('','オプションの変更'); 
+ta['pt-watchlist'] = new Array('l','変更を監視しているページの一覧'); 
+ta['pt-mycontris'] = new Array('y','自分の投稿記録'); 
+ta['pt-login'] = new Array('o','ログインすることが推奨されますが、しなくても構いません。'); 
+ta['pt-anonlogin'] = new Array('o','ログインすることが推奨されますが、しなくても構いません。'); 
+ta['pt-logout'] = new Array('o','ログアウト'); 
+ta['ca-talk'] = new Array('t','項目のノート'); 
+ta['ca-edit'] = new Array('e','このページを編集できます。投稿の前に「プレビューを実行」ボタンを使ってください。'); 
+ta['ca-addsection'] = new Array('+','このページにコメントを加える'); 
+ta['ca-viewsource'] = new Array('e','このページは保護されています。ページのソースを閲覧できます。'); 
+ta['ca-history'] = new Array('h','このページの過去の版'); 
+ta['ca-protect'] = new Array('=','このページを保護'); 
+ta['ca-delete'] = new Array('d','このページを削除'); 
+ta['ca-undelete'] = new Array('d','削除されたページを復帰する'); 
+ta['ca-move'] = new Array('m','このページを移動'); 
+ta['ca-watch'] = new Array('w','このページをウォッチリストへ追加'); 
+ta['ca-unwatch'] = new Array('w','このページをウォッチリストから外す'); 
+ta['search'] = new Array('f','ウィキ内を検索'); 
+ta['p-logo'] = new Array('','メインページ'); 
+ta['n-mainpage'] = new Array('z','メインページに移動'); 
+ta['n-portal'] = new Array('','このプロジェクトについて、あなたのできることを探す場所です'); 
+ta['n-currentevents'] = new Array('','最近の出来事'); 
+ta['n-recentchanges'] = new Array('r','最近更新が行われたページの一覧'); 
+ta['n-randompage'] = new Array('x','ランダムに記事を選んで表示'); 
+ta['n-help'] = new Array('','ヘルプ・使い方'); 
+ta['n-sitesupport'] = new Array('','私たちをサポートしてください'); 
+ta['t-whatlinkshere'] = new Array('j','このページにリンクしているページの一覧'); 
+ta['t-recentchangeslinked'] = new Array('k','最近更新が行われたこのページのリンク先'); 
+ta['feed-rss'] = new Array('','このページのRSSフィード'); 
+ta['feed-atom'] = new Array('','このページのAtomフィード'); 
+ta['t-contributions'] = new Array('','ユーザーの投稿記録'); 
+ta['t-emailuser'] = new Array('','このユーザーにメールを送信'); 
+ta['t-upload'] = new Array('u','画像やメディアファイルをアップロード'); 
+ta['t-specialpages'] = new Array('q','特別ページの一覧'); 
+ta['ca-nstab-main'] = new Array('c','本文を表示'); 
+ta['ca-nstab-user'] = new Array('c','利用者ページを表示'); 
+ta['ca-nstab-media'] = new Array('c','メディアページを表示'); 
+ta['ca-nstab-special'] = new Array('','これは特別ページです。編集することはできません。'); 
+ta['ca-nstab-wp'] = new Array('a','{{SITENAME}}ページを表示'); 
+ta['ca-nstab-image'] = new Array('c','画像ページを表示'); 
+ta['ca-nstab-mediawiki'] = new Array('c','定型文を表示'); 
+ta['ca-nstab-template'] = new Array('c','テンプレートを表示'); 
+ta['ca-nstab-help'] = new Array('c','ヘルプページを表示'); 
+ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
+
+# image deletion
+'deletedrevision' => '古い版 $1 を削除しました。',
+
+# browsing diffs
+'previousdiff' => '← 前の差分へ',
+'nextdiff' => '次の差分へ →',
+
+'imagemaxsize' => '画像ページで表示する画像の最大値:',
+'thumbsize' => 'サムネイルの大きさ:',
+'showbigimage' => '高解像度版をダウンロードする ($1x$2, $3 KB)',
+
+'newimages' => '新着画像ギャラリー',
+'noimages' => '画像がありません。',
+
+# short names for language variants used for language conversion links.
+# to disable showing a particular link, set it to 'disable', e.g.
+# 'variantname-zh-sg' => 'disable',
+'variantname-zh-cn' => '簡体 (中国)',
+'variantname-zh-tw' => '正字 (台湾)',
+'variantname-zh-hk' => '正字 (香港)',
+'variantname-zh-sg' => '簡体 (シンガポール)',
+'variantname-zh' => '無変換',
+
+# labels for User: and Title: on Special:Log pages
+'specialloguserlabel' => 'ユーザー名:',
+'speciallogtitlelabel' => 'タイトル:',
+
+'passwordtooshort' => 'パスワードが短すぎます。$1文字以上の文字列にしてください。',
+
+# Media Warning
+'mediawarning' => "'''警告:''' このファイルは悪意のあるコードを含んでいる可能性があり、実行するとコンピューターが危害を被る場合があります。
+----",
+
+'fileinfo' => '$1KB, MIME type: <code>$2</code>',
+
+# Metadata
+'metadata' => 'Metadata',
+
+# Exif tags
+'exif-imagewidth' => '画像の幅',
+'exif-imagelength' => '画像の高さ',
+'exif-bitspersample' => 'ビット深度',
+'exif-compression' => '圧縮形式',
+'exif-photometricinterpretation' => '画素構成',
+'exif-orientation' => '画像方向',
+'exif-samplesperpixel' => 'コンポーネント数',
+'exif-planarconfiguration' => 'データ格納形式',
+'exif-ycbcrsubsampling' => 'YCCの画素構成（Cの間引き率）',
+'exif-ycbcrpositioning' => 'YCCの画素構成（YとCの位置）',
+'exif-xresolution' => '水平方向の解像度',
+'exif-yresolution' => '垂直方向の解像度',
+'exif-resolutionunit' => '解像度の単位',
+'exif-stripoffsets' => '画像データの場所',
+'exif-rowsperstrip' => 'ストリップのライン数',
+'exif-stripbytecounts' => 'ストリップのデータ量',
+'exif-jpeginterchangeformat' => 'JPEGのSOIへのオフセット',
+'exif-jpeginterchangeformatlength' => 'JPEGデータのバイト数',
+'exif-transferfunction' => '再生階調カーブ特性',
+'exif-whitepoint' => '参照白色点の色度座標値',
+'exif-primarychromaticities' => '原色の色度座標値',
+'exif-ycbcrcoefficients' => '色変換マトリックス係数',
+'exif-referenceblackwhite' => '参照黒色点値・参照白色点値',
+'exif-datetime' => 'ファイル変更日時',
+'exif-imagedescription' => '画像のタイトル',
+'exif-make' => '画像入力機器のメーカー名',
+'exif-model' => '画像入力機器のモデル名',
+'exif-software' => '使用ソフトウェア',
+'exif-artist' => '作者名',
+'exif-copyright' => '著作権者',
+'exif-exifversion' => 'EXIFバージョン',
+'exif-flashpixversion' => '対応フラッシュピックスバージョン',
+'exif-colorspace' => '色空間情報',
+'exif-componentsconfiguration' => '各コンポーネントの意味',
+'exif-compressedbitsperpixel' => '画像圧縮モード',
+'exif-pixelydimension' => '実効画像高さ',
+'exif-pixelxdimension' => '実効画像幅',
+'exif-makernote' => 'メーカーノート',
+'exif-usercomment' => 'ユーザーコメント',
+'exif-relatedsoundfile' => '関連音声ファイル',
+'exif-datetimeoriginal' => '画像データ生成日時',
+'exif-datetimedigitized' => 'デジタルデータ作成日時',
+'exif-subsectime' => 'ファイル変更日時の秒未満',
+'exif-subsectimeoriginal' => '画像データ生成日時 (秒未満)',
+'exif-subsectimedigitized' => 'デジタルデータ作成日時 (秒未満)',
+'exif-exposuretime' => '露出時間',
+'exif-fnumber' => 'F値',
+'exif-exposureprogram' => '露出プログラム',
+'exif-spectralsensitivity' => 'スペクトル感度',
+'exif-isospeedratings' => 'ISOスピードレート',
+'exif-oecf' => '光電変換関数',
+'exif-shutterspeedvalue' => 'シャッタースピード',
+'exif-aperturevalue' => '絞り値',
+'exif-brightnessvalue' => '輝度値',
+'exif-exposurebiasvalue' => '露光補正値',
+'exif-maxaperturevalue' => 'レンズ最小F値',
+'exif-subjectdistance' => '被写体距離',
+'exif-meteringmode' => '測光方式',
+'exif-lightsource' => '光源',
+'exif-flash' => 'フラッシュ',
+'exif-focallength' => 'レンズの焦点距離',
+'exif-subjectarea' => '主要被写体の位置',
+'exif-flashenergy' => 'フラッシュ強度',
+'exif-spatialfrequencyresponse' => '空間周波数応答',
+'exif-focalplanexresolution' => '水平方向の焦点面解像度',
+'exif-focalplaneyresolution' => '垂直方向の焦点面解像度',
+'exif-focalplaneresolutionunit' => '焦点面解像度の単位',
+'exif-subjectlocation' => '被写体の場所',
+'exif-exposureindex' => '露出インデックス',
+'exif-sensingmethod' => 'センサー方式',
+'exif-filesource' => 'ファイルソース',
+'exif-scenetype' => 'シーンタイプ',
+'exif-cfapattern' => 'CFAパターン',
+'exif-customrendered' => '画像処理',
+'exif-exposuremode' => '露出モード',
+'exif-whitebalance' => 'ホワイトバランス',
+'exif-digitalzoomratio' => 'デジタルズームの倍率',
+'exif-focallengthin35mmfilm' => 'レンズの焦点距離（35mmフィルム換算）',
+'exif-scenecapturetype' => '被写体の種別',
+'exif-gaincontrol' => 'ゲインコントロール',
+'exif-contrast' => 'コントラスト',
+'exif-saturation' => '彩度',
+'exif-sharpness' => 'シャープネス',
+'exif-devicesettingdescription' => '装置セッティングの説明',
+'exif-subjectdistancerange' => '被写体距離の範囲',
+'exif-imageuniqueid' => 'ユニーク画像ID',
+'exif-gpsversionid' => 'GPSタグのバージョン',
+'exif-gpslatituderef' => '北緯/南緯',
+'exif-gpslatitude' => '緯度',
+'exif-gpslongituderef' => '東経/西経',
+'exif-gpslongitude' => '経度',
+'exif-gpsaltituderef' => '高度の単位',
+'exif-gpsaltitude' => '高度',
+'exif-gpstimestamp' => 'GPS時刻（原子時計）',
+'exif-gpssatellites' => '測位に用いた衛星信号',
+'exif-gpsstatus' => 'GPS受信機の状態',
+'exif-gpsmeasuremode' => 'GPSの測位方法',
+'exif-gpsdop' => '測位の精度',
+'exif-gpsspeedref' => '速度の単位',
+'exif-gpsspeed' => '速度',
+'exif-gpstrackref' => '進行方向の単位',
+'exif-gpstrack' => '進行方向',
+'exif-gpsimgdirectionref' => '撮影の方向の単位',
+'exif-gpsimgdirection' => '撮影の方向',
+'exif-gpsmapdatum' => '測地系',
+'exif-gpsdestlatituderef' => '目的地の北緯/南緯',
+'exif-gpsdestlatitude' => '目的地の緯度',
+'exif-gpsdestlongituderef' => '目的地の東経/西経',
+'exif-gpsdestlongitude' => '目的地の経度',
+'exif-gpsdestbearingref' => '目的地の方角の単位',
+'exif-gpsdestbearing' => '目的地の方角',
+'exif-gpsdestdistanceref' => '目的地までの距離の単位',
+'exif-gpsdestdistance' => '目的地までの距離',
+'exif-gpsprocessingmethod' => 'GPS処理方法',
+'exif-gpsareainformation' => 'GPSエリア名',
+'exif-gpsdatestamp' => 'GPS測位日時',
+'exif-gpsdifferential' => 'ディファレンシャル補正',
+
+# Make & model, can be wikified in order to link to the camera and model name
+
+'exif-make-value' => '$1',
+'exif-model-value' => '$1',
+'exif-software-value' => '$1',
+
+# Exif attributes
+
+'exif-compression-1' => '非圧縮',
+'exif-compression-6' => 'JPEG圧縮',
+
+'exif-photometricinterpretation-1' => 'RGB',
+'exif-photometricinterpretation-6' => 'YCbCr',
+
+'exif-orientation-1' => '通常',
+'exif-orientation-2' => '左右反転',
+'exif-orientation-3' => '180°回転',
+'exif-orientation-4' => '上下反転',
+'exif-orientation-5' => '反時計回りに90°回転 上下反転',
+'exif-orientation-6' => '時計回りに90°回転',
+'exif-orientation-7' => '時計回りに90°回転 上下反転',
+'exif-orientation-8' => '反時計回りに90°回転',
+
+'exif-planarconfiguration-1' => '点順次フォーマット',
+'exif-planarconfiguration-2' => '面順次フォーマット',
+
+'exif-xyresolution-i' => '$1 dpi',
+'exif-xyresolution-c' => '$1 dpc',
+
+'exif-colorspace-1' => 'sRGB',
+'exif-colorspace-ffff.h' => 'その他',
+
+'exif-componentsconfiguration-0' => 'なし',
+'exif-componentsconfiguration-1' => 'Y',
+'exif-componentsconfiguration-2' => 'Cb',
+'exif-componentsconfiguration-3' => 'Cr',
+'exif-componentsconfiguration-4' => 'R',
+'exif-componentsconfiguration-5' => 'G',
+'exif-componentsconfiguration-6' => 'B',
+
+'exif-exposureprogram-0' => '未定義',
+'exif-exposureprogram-1' => 'マニュアル',
+'exif-exposureprogram-2' => 'ノーマルプログラム',
+'exif-exposureprogram-3' => '露出優先',
+'exif-exposureprogram-4' => 'シャッター優先',
+'exif-exposureprogram-5' => 'クリエイティブプログラム',
+'exif-exposureprogram-6' => 'アクションプログラム',
+'exif-exposureprogram-7' => 'ポートレイトモード（近景）',
+'exif-exposureprogram-8' => 'ランドスケープモード（遠景）',
+
+'exif-subjectdistance-value' => '$1 メートル',
+
+'exif-meteringmode-0' => '不明',
+'exif-meteringmode-1' => '平均',
+'exif-meteringmode-2' => '中央重点',
+'exif-meteringmode-3' => 'スポット',
+'exif-meteringmode-4' => 'マルチスポット',
+'exif-meteringmode-5' => '分割測光',
+'exif-meteringmode-6' => '部分測光',
+'exif-meteringmode-255' => 'その他',
+
+'exif-lightsource-0' => '不明',
+'exif-lightsource-1' => '昼光',
+'exif-lightsource-2' => '蛍光灯',
+'exif-lightsource-3' => 'タングステン（白熱灯）',
+'exif-lightsource-4' => 'フラッシュ',
+'exif-lightsource-9' => '晴天',
+'exif-lightsource-10' => '曇天',
+'exif-lightsource-11' => '日陰',
+'exif-lightsource-12' => '昼光色蛍光灯 (D 5700 - 7100K)',
+'exif-lightsource-13' => '昼白色蛍光灯 (N 4600 - 5400K)',
+'exif-lightsource-14' => '白色蛍光灯 (W 3900 - 4500K)',
+'exif-lightsource-15' => '温白色蛍光灯 (WW 3200 - 3700K)',
+'exif-lightsource-17' => '標準光A',
+'exif-lightsource-18' => '標準光B',
+'exif-lightsource-19' => '標準光C',
+'exif-lightsource-20' => 'D55',
+'exif-lightsource-21' => 'D65',
+'exif-lightsource-22' => 'D75',
+'exif-lightsource-23' => 'D50',
+'exif-lightsource-24' => 'ISOスタジオタングステン',
+'exif-lightsource-255' => 'その他',
+
+'exif-focalplaneresolutionunit-2' => 'インチ',
+
+'exif-sensingmethod-1' => '未定義',
+'exif-sensingmethod-2' => '単板カラーセンサー',
+'exif-sensingmethod-3' => '2板カラーセンサー',
+'exif-sensingmethod-4' => '3板カラーセンサー',
+'exif-sensingmethod-5' => '色順次カラーセンサー',
+'exif-sensingmethod-7' => '3線リニアセンサー',
+'exif-sensingmethod-8' => '色順次リニアセンサー',
+
+'exif-filesource-3' => 'デジタルスチルカメラ',
+
+'exif-scenetype-1' => '直接撮影された画像',
+
+'exif-customrendered-0' => '通常',
+'exif-customrendered-1' => 'カスタム',
+
+'exif-exposuremode-0' => '自動',
+'exif-exposuremode-1' => 'マニュアル',
+'exif-exposuremode-2' => 'オートブラケット',
+
+'exif-whitebalance-0' => '自動',
+'exif-whitebalance-1' => 'マニュアル',
+
+'exif-scenecapturetype-0' => '標準',
+'exif-scenecapturetype-1' => '風景',
+'exif-scenecapturetype-2' => '人物',
+'exif-scenecapturetype-3' => '夜景',
+
+'exif-gaincontrol-0' => 'なし',
+'exif-gaincontrol-1' => '弱増感',
+'exif-gaincontrol-2' => '強増感',
+'exif-gaincontrol-3' => '弱減感',
+'exif-gaincontrol-4' => '強増感',
+
+'exif-contrast-0' => '標準',
+'exif-contrast-1' => '軟調',
+'exif-contrast-2' => '硬調',
+
+'exif-saturation-0' => '標準',
+'exif-saturation-1' => '低彩度',
+'exif-saturation-2' => '高彩度',
+
+'exif-sharpness-0' => '標準',
+'exif-sharpness-1' => '弱',
+'exif-sharpness-2' => '強',
+
+'exif-subjectdistancerange-0' => '不明',
+'exif-subjectdistancerange-1' => 'マクロ',
+'exif-subjectdistancerange-2' => '近景',
+'exif-subjectdistancerange-3' => '遠景',
+
+// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => '北緯',
+'exif-gpslatitude-s' => '南緯',
+
+// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => '東経',
+'exif-gpslongitude-w' => '西経',
+
+'exif-gpsstatus-a' => '測位中',
+'exif-gpsstatus-v' => '未測位',
+
+'exif-gpsmeasuremode-2' => '2次元測位',
+'exif-gpsmeasuremode-3' => '3次元測位',
+
+// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-k' => 'キロメートル毎時',
+'exif-gpsspeed-m' => 'マイル毎時',
+'exif-gpsspeed-n' => 'ノット',
+
+// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => '真方位',
+'exif-gpsdirection-m' => '磁方位',
+
+# external editor support
+'edit-externally' => '外部アプリケーションを使ってこのファイルを編集する',
+'edit-externally-help' => '詳しい情報は[http://meta.wikimedia.org/wiki/Help:External_editors 外部エディタに関する説明（英語）]をご覧ください。',
+
+# 'all' in various places, this might be different for inflected languages
+'recentchangesall' => 'すべて',
+'imagelistall' => 'すべて',
+'watchlistall1' => 'すべて',
+'watchlistall2' => 'すべて',
+'namespacesall' => 'すべて',
+
+# E-mail address confirmation
+'confirmemail' => 'メールアドレスの確認',
+'confirmemail_text' => 'このウィキではメール通知を受け取る前にメールアドレスの確認が必要です。以下のボタンを押すと「{{int:Confirmemail_subject}}」という件名の確認メールがあなたのメールアドレスに送られます。メールには確認用コードを含むリンクが書かれています。そのリンクを開くことによってメールアドレスの正当性が確認されます。',
+'confirmemail_send' => '確認用コードを送信する',
+'confirmemail_sent' => '確認メールを送信しました。',
+'confirmemail_sendfailed' => '確認メールを送信できませんでした。メールアドレスに不正な文字が含まれていないかどうか確認してください。',
+'confirmemail_invalid' => '確認用コードが正しくありません。このコードは期限切れです。',
+'confirmemail_success' => 'あなたのメールアドレスは確認されました。ログインしてウィキを楽しんでください。',
+'confirmemail_loggedin' => 'あなたのメールアドレスは確認されました。',
+'confirmemail_error' => 'あなたの確認を保存する際に内部エラーが発生しました。',
+
+'confirmemail_subject' => '{{SITENAME}} e-mail address confirmation',
+'confirmemail_body' => 'どなたか（IPアドレス $1 の使用者）がこのメールアドレスを使用して
+{{SITENAME}} にアカウント "$2" を登録しました。
+
+このアカウントが本当にあなたのものであるか確認し、
+{{SITENAME}} のメール通知機能を有効にするために以下のURLにアクセスしてください:
+$3
+
+もし {{SITENAME}} について身に覚えがない場合は、リンクを開かないでください。
+確認用コードは  $4 に期限切れになります。
+
+-- 
+{{SITENAME}} メールアドレス確認システム
+{{SERVER}}/',
+
+
+
+
+# Inputbox extension, may be useful in other contexts as well
+'tryexact' => '一致する項目を検索',
+'searchfulltext' => '全文検索',
+'createarticle' => '項目を作成',
+
+# Scary transclusion
+'scarytranscludedisabled' => '[Interwiki transcluding is disabled]',
+'scarytranscludefailed' => '[Template fetch failed for $1; sorry]',
+'scarytranscludetoolong' => '[URL is too long; sorry]',
+
+# Trackbacks
+'trackbackbox' => "<div id='mw_trackbacks'>
+この項目へのトラックバック:
+$1
+</div>",
+'trackback' => '; $4$5 : [$2 $1]',
+'trackbackexcerpt' => ';$4$5
+:[$2 $1]: <nowiki>$3</nowiki>',
+'trackbackremove' => ' ([$1 削除])',
+'trackbacklink' => 'トラックバック',
+'trackbackdeleteok' => 'トラックバックを削除しました。',
+
+'unit-pixel' => 'px',
 
 );
 
@@ -863,32 +1831,52 @@ class LanguageJa extends LanguageUtf8 {
 	}
 
 	function getDateFormats() {
-		return false;
+		global $wgDateFormatsJa;
+		return $wgDateFormatsJa;
 	}
-
-	function date( $ts, $adj = false, $format = false, $tc = false ) {
+	
+	function date( $ts, $adj = false, $format = true, $tc = false ) {
 		global $wgWeekdayAbbreviationsJa;
+		
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
-
-		$x = getdate(mktime(( (int)substr( $ts, 8, 2) ),
-			(int)substr( $ts, 10, 2 ), (int)substr( $ts, 12, 2 ),
-			(int)substr( $ts, 4, 2 ), (int)substr( $ts, 6, 2 ),
-			(int)substr( $ts, 0, 4 )));
-		$d = substr( $ts, 0, 4 ) . "年" .
-			$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-			(0 + substr( $ts, 6, 2 )) . "日 (" .
-			$wgWeekdayAbbreviationsJa[$x["wday"]] . ")";
+		$datePreference = $this->dateFormat( $format );
+		
+		if( $datePreference == MW_DATE_ISO ) {
+			$d = substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .
+					substr($ts, 6, 2);
+			return $d;
+		}
+		
+		$year = (int)substr( $ts, 0, 4 );
+		$month = (int)substr( $ts, 4, 2 );
+		$mday = (int)substr( $ts, 6, 2 );
+		$hour = (int)substr( $ts, 8, 2 );
+		$minute = (int)substr( $ts, 10, 2 );
+		$second = (int)substr( $ts, 12, 2 );
+		
+		$time = mktime( $hour, $minute, $second, $month, $mday, $year );
+		$date = getdate( $time );
+		
+		$d = $year . "年" .
+				$this->getMonthAbbreviation( $month ) .
+				$mday . "日 (" .
+				$wgWeekdayAbbreviationsJa[ $date['wday'] ]. ")";
 		return $d;
 	}
 
-	function time( $ts, $adj = false, $format = false, $tc = false ) {
+	function time( $ts, $adj = false, $format = true, $tc = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
-
+		$datePreference = $this->dateFormat( $format );
+		
 		$t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
+		if ( $datePreference == MW_DATE_ISO ) {
+			$t .= ':' . substr( $ts, 12, 2 );
+		}
+		
 		return $t;
 	}
 
-	function timeanddate( $ts, $adj = false, $format = false, $tc = false ) {
+	function timeanddate( $ts, $adj = false, $format = true, $tc = false ) {
 		return $this->date( $ts, $adj, $format, $tc ) . " " . $this->time( $ts, $adj, $format, $tc );
 	}
 
-- 
cgit v1.2.3


From 8c6bdef7cc8b083eab585df01a7338b17977ecd3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 14 Sep 2005 08:11:21 +0000
Subject: * (bug 3405) Don't use raw letters as aliases of MSGNW: and SUBST:

---
 RELEASE-NOTES            | 3 +++
 languages/LanguageMk.php | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b779c63e9834..a0df9e25898a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -763,6 +763,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3412) Clean up date format handling so ~~~~-sigs work with default
   format as designed. Documentation comments updated.
 * (bug 1423) LanguageJa.php update
+* (bug 3405) Don't use raw letters as aliases of MSGNW: and SUBST:
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index c29bbe1d945a..fa2436e742f7 100644
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -68,8 +68,8 @@
 	MAG_PAGENAME			=>	array( 1, 'PAGENAME', 'СТРАНИЦА' ),
 	MAG_PAGENAMEE			=>	array( 1, 'PAGENAMEE', 'СТРАНИЦАИ' ),
 	MAG_NAMESPACE			=>	array( 1, 'NAMESPACE', 'ИМЕПРОСТОР' ),
-	MAG_SUBST			=>	array( 0, 'SUBST:', 'ЗАМЕСТ:', 'З' ),
-	MAG_MSGNW			=>	array( 0, 'MSGNW:', 'ИЗВЕШТNW:', 'Н' ),
+	MAG_SUBST			=>	array( 0, 'SUBST:', 'ЗАМЕСТ:' ),
+	MAG_MSGNW			=>	array( 0, 'MSGNW:', 'ИЗВЕШТNW:' ),
 	MAG_END				=>	array( 0, '', '__КРАЈ__' ),
 	MAG_IMG_THUMBNAIL		=>	array( 1, 'thumbnail', 'thumb', 'мини' ),
 	MAG_IMG_RIGHT			=>	array( 1, 'right', 'десно', 'д' ),
-- 
cgit v1.2.3


From 09ff86305041abe7ece74b10658b9163554959c8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 16 Sep 2005 05:16:30 +0000
Subject: * (bug 3475) anon contrib links on Special:Newpages

---
 RELEASE-NOTES                |  1 +
 includes/SpecialNewpages.php | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a0df9e25898a..64c8f7d38b8b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -729,6 +729,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3192): properly check 'limit' parameter on Special:Contributions
 * (bug 3244) Fix remote image loading hack, JavaScript injection on MSIE
 * Fix URL sanitization in HTML attributes, which broke in this branch
+* (bug 3475) anon contrib links on Special:Newpages
 
 
 === Changes since 1.5rc2 ===
diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index feb4c54105e1..3b24cc2a1df2 100644
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -62,11 +62,13 @@ class NewPagesPage extends QueryPage {
 		$length = wfMsg( 'nbytes', $wgLang->formatNum( $result->length ) );
 
 		if ( $u == 0 ) { # not by a logged-in user
-			$ul = $ut;
-		}
-		else {
-			$ul = $skin->makeLink( $wgContLang->getNsText(NS_USER) . ":{$ut}", $ut );
+			$userPage = Title::makeTitle( NS_SPECIAL, 'Contributions' );
+			$linkParams = 'target=' . urlencode( $ut );
+		} else {
+			$userPage = Title::makeTitle( NS_USER, $ut );
+			$linkParams = '';
 		}
+		$ul = $skin->makeLinkObj( $userPage, htmlspecialchars( $ut ), $linkParams );
 
 		$d = $wgLang->timeanddate( $result->timestamp, true );
 
-- 
cgit v1.2.3


From b3aa2c45bfdf2b357788ed96048f749f09183410 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 17 Sep 2005 00:22:00 +0000
Subject: * (bug 3485) Fix bogus warning about filename capitalization when off

---
 RELEASE-NOTES              | 1 +
 includes/SpecialUpload.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 64c8f7d38b8b..08547f60c095 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -765,6 +765,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   format as designed. Documentation comments updated.
 * (bug 1423) LanguageJa.php update
 * (bug 3405) Don't use raw letters as aliases of MSGNW: and SUBST:
+* (bug 3485) Fix bogus warning about filename capitalization when off
 
 
 === Caveats ===
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 286516da9359..4020b2083003 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -213,7 +213,12 @@ class UploadForm {
 		 */
 		if ( ! $this->mIgnoreWarning ) {
 			$warning = '';
-			if( $this->mUploadSaveName != ucfirst( $filtered ) ) {
+			
+			global $wgCapitalLinks;
+			if( $wgCapitalLinks ) {
+				$filtered = ucfirst( $filtered );
+			}
+			if( $this->mUploadSaveName != $filtered ) {
 				$warning .=  '<li>'.wfMsg( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
 			}
 	
-- 
cgit v1.2.3


From 1082a5359f0385fa5483aada83568dcea46cea0e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 17 Sep 2005 07:22:53 +0000
Subject: * (bug 2792) Update rebuildrecentchanges.inc for new schema copy fix
 from HEAD

---
 RELEASE-NOTES                        |  1 +
 maintenance/rebuildrecentchanges.inc | 69 ++++++++++++++----------------------
 2 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 08547f60c095..9704938b81ad 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -766,6 +766,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 1423) LanguageJa.php update
 * (bug 3405) Don't use raw letters as aliases of MSGNW: and SUBST:
 * (bug 3485) Fix bogus warning about filename capitalization when off
+* (bug 2792) Update rebuildrecentchanges.inc for new schema
 
 
 === Caveats ===
diff --git a/maintenance/rebuildrecentchanges.inc b/maintenance/rebuildrecentchanges.inc
index 888588fa57f6..012032b077d9 100644
--- a/maintenance/rebuildrecentchanges.inc
+++ b/maintenance/rebuildrecentchanges.inc
@@ -16,54 +16,37 @@ function rebuildRecentChangesTablePass1()
 
 	$dbw->delete( 'recentchanges', '*' );
 
-	print( "Loading from CUR table...\n" );
+	print( "Loading from page and revision tables...\n" );
 	
-	$dbw->insertSelect( 'recentchanges', 'cur', 
+	global $wgRCMaxAge;
+	$cutoff = time() - $wgRCMaxAge;
+	$dbw->insertSelect( 'recentchanges', array( 'page', 'revision' ),
 		array(
-			'rc_timestamp' => 'cur_timestamp',
-			'rc_cur_time' => 'cur_timestamp',
-			'rc_user' => 'cur_user',
-			'rc_user_text' => 'cur_user_text',
-			'rc_namespace' => 'cur_namespace',
-			'rc_title' => 'cur_title',
-			'rc_comment' => 'cur_comment',
-			'rc_minor' => 'cur_minor_edit',
-			'rc_bot' => 0,
-			'rc_new' => 'cur_is_new',
-			'rc_cur_id' => 'cur_id',
-			'rc_this_oldid' => 0,
-			'rc_last_oldid' => 0,
-			'rc_type' => $dbw->conditional( 'cur_is_new != 0', RC_NEW, RC_EDIT ),
-		), '*', $fname, array( 'ORDER BY' => 'cur_timestamp DESC', 'LIMIT' => 5000 )
+			'rc_timestamp'  => 'rev_timestamp',
+			'rc_cur_time'   => 'rev_timestamp',
+			'rc_user'       => 'rev_user',
+			'rc_user_text'  => 'rev_user_text',
+			'rc_namespace'  => 'page_namespace',
+			'rc_title'      => 'page_title',
+			'rc_comment'    => 'rev_comment',
+			'rc_minor'      => 'rev_minor_edit',
+			'rc_bot'        => 0,
+			'rc_new'        => 'page_is_new',
+			'rc_cur_id'     => 'page_id',
+			'rc_this_oldid' => 'rev_id',
+			'rc_last_oldid' => 0, // is this ok?
+			'rc_type'       => $dbw->conditional( 'page_is_new != 0', RC_NEW, RC_EDIT ),
+		), array(
+			'rev_timestamp > ' . $dbw->timestamp( $cutoff ),
+			'rev_page=page_id'
+		), $fname, array( 'ORDER BY' => 'rev_timestamp', 'LIMIT' => 5000 )
 	);
-	
-	print( "Loading from OLD table...\n" );
-
-	$sql = "INSERT INTO $recentchanges (rc_timestamp,rc_cur_time,rc_user," .
-      "rc_user_text,rc_namespace,rc_title,rc_comment,rc_minor,rc_bot,rc_new," .
-      "rc_cur_id,rc_this_oldid,rc_last_oldid,rc_type) SELECT old_timestamp,cur_timestamp," .
-	  "old_user,old_user_text,old_namespace,old_title,old_comment," .
-	  "old_minor_edit,0,0,cur_id,old_id,0,0 FROM $old,$cur " .
-	  "WHERE old_namespace=cur_namespace AND old_title=cur_title ORDER BY old_timestamp DESC " .
-	  "LIMIT 5000";
-	$dbw->query( $sql );
-
-	$sql = "SELECT rc_timestamp FROM $recentchanges " .
-	  "ORDER BY rc_timestamp DESC" . $dbw->limitResult( 1, 5000 );
-	$res = $dbw->query( $sql );
-	$obj = $dbw->fetchObject( $res );
-	if( $obj ) {
-		$ts = $obj->rc_timestamp;
-	
-		$sql = "DELETE FROM $recentchanges WHERE rc_timestamp < '{$ts}'";
-		$dbw->query( $sql );
-	}
 }
 
 function rebuildRecentChangesTablePass2()
 {
 	$dbw =& wfGetDB( DB_MASTER );
-	extract( $dbw->tableNames( 'recentchanges', 'cur', 'old' ) );
+	extract( $dbw->tableNames( 'recentchanges', 'revision' ) );
 
 	$ns = $id = $count = 0;
 	$title = $ct =  "";
@@ -84,9 +67,9 @@ function rebuildRecentChangesTablePass2()
 			# Switch! Look up the previous last edit, if any
 			$lastCurId = IntVal( $obj->rc_cur_id );
 			$emit = $obj->rc_timestamp;
-			$sql2 = "SELECT old_id FROM $old,$cur " .
-				"WHERE old_namespace=cur_namespace AND old_title=cur_title AND cur_id={$lastCurId} ".
-				"AND old_timestamp<'{$emit}' ORDER BY old_timestamp DESC LIMIT 1";
+			$sql2 = "SELECT rev_id FROM $revision " .
+				"WHERE rev_page={$lastCurId} ".
+				"AND rev_timestamp<'{$emit}' ORDER BY rev_timestamp DESC LIMIT 1";
 			$res2 = $dbw->query( $sql2 );
 			if( $row = $dbw->fetchObject( $res2 ) ) {
 				$lastOldId = IntVal( $row->old_id );
-- 
cgit v1.2.3


From 764be6bb42f235346499c3e0e74142b095a2373c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 17 Sep 2005 07:35:24 +0000
Subject: typo in last rev

---
 maintenance/rebuildrecentchanges.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance/rebuildrecentchanges.inc b/maintenance/rebuildrecentchanges.inc
index 012032b077d9..cfc7af7620b0 100644
--- a/maintenance/rebuildrecentchanges.inc
+++ b/maintenance/rebuildrecentchanges.inc
@@ -72,7 +72,7 @@ function rebuildRecentChangesTablePass2()
 				"AND rev_timestamp<'{$emit}' ORDER BY rev_timestamp DESC LIMIT 1";
 			$res2 = $dbw->query( $sql2 );
 			if( $row = $dbw->fetchObject( $res2 ) ) {
-				$lastOldId = IntVal( $row->old_id );
+				$lastOldId = intval( $row->rev_id );
 			} else {
 				# No previous edit
 				$lastOldId = 0;
-- 
cgit v1.2.3


From f42270d0ee857b53ca2bb836a775bc869090ccdb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 17 Sep 2005 11:20:39 +0000
Subject: * Special:Import/importDump fixes: report XML parse errors, accept
 <minor/>

---
 RELEASE-NOTES              |  1 +
 includes/SpecialImport.php | 23 +++++++++++++++++--
 includes/WikiError.php     | 25 ++++++++++++++++++--
 maintenance/importDump.php | 57 +++++++++++++++++++++++++++-------------------
 4 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9704938b81ad..452c99ce0feb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -767,6 +767,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3405) Don't use raw letters as aliases of MSGNW: and SUBST:
 * (bug 3485) Fix bogus warning about filename capitalization when off
 * (bug 2792) Update rebuildrecentchanges.inc for new schema
+* Special:Import/importDump fixes: report XML parse errors, accept <minor/>
 
 
 === Caveats ===
diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 07b2df54afa6..7b4cbe0a1416 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -128,6 +128,7 @@ class WikiRevision {
 	var $user_text = "";
 	var $text = "";
 	var $comment = "";
+	var $minor = false;
 	
 	function setTitle( $text ) {
 		$this->title = Title::newFromText( $text );
@@ -154,6 +155,10 @@ class WikiRevision {
 		$this->comment = $text;
 	}
 	
+	function setMinor( $minor ) {
+		$this->minor = (bool)$minor;
+	}
+	
 	function getTitle() {
 		return $this->title;
 	}
@@ -173,6 +178,10 @@ class WikiRevision {
 	function getComment() {
 		return $this->comment;
 	}
+	
+	function getMinor() {
+		return $this->minor;
+	}
 
 	function importOldRevision() {
 		$fname = "WikiImporter::importOldRevision";
@@ -211,7 +220,7 @@ class WikiRevision {
 			'user'       => $userId,
 			'user_text'  => $userText,
 			'timestamp'  => $this->timestamp,
-			'minor_edit' => 0
+			'minor_edit' => $this->minor,
 			) );
 		$revId = $revision->insertOn( $dbw );
 		$article->updateIfNewerOn( $dbw, $revision );
@@ -239,6 +248,7 @@ class WikiImporter {
 	
 	function throwXmlError( $err ) {
 		$this->debug( "FAILURE: $err" );
+		wfDebug( "WikiImporter XML error: $err\n" );
 	}
 	
 	# --------------
@@ -256,11 +266,14 @@ class WikiImporter {
 		xml_set_object( $parser, &$this );
 		xml_set_element_handler( $parser, "in_start", "" );
 		
+		$offset = 0; // for context extraction on error reporting
 		do {
 			$chunk = $this->mSource->readChunk();
 			if( !xml_parse( $parser, $chunk, $this->mSource->atEnd() ) ) {
-				return new WikiXmlError( $parser );
+				wfDebug( "WikiImporter::doImport encountered XML parsing error\n" );
+				return new WikiXmlError( $parser, 'XML import parse failure', $chunk, $offset );
 			}
+			$offset += strlen( $chunk );
 		} while( $chunk !== false && !$this->mSource->atEnd() );
 		xml_parser_free( $parser );
 		
@@ -380,6 +393,7 @@ class WikiImporter {
 		$this->debug( "in_siteinfo $name" );
 		switch( $name ) {
 		case "sitename":
+		case "base":
 		case "generator":
 		case "case":
 		case "namespaces":
@@ -466,6 +480,9 @@ class WikiImporter {
 		case "comment":
 			$this->workRevision->setComment( $this->appenddata );
 			break;
+		case "minor":
+			$this->workRevision->setMinor( true );
+			break;
 		default:
 			$this->debug( "Bad append: {$this->appendfield}" );
 		}
@@ -479,6 +496,7 @@ class WikiImporter {
 		case "id":
 		case "timestamp":
 		case "comment":
+		case "minor":
 		case "text":
 			$this->parenttag = "revision";
 			$this->appendfield = $name;
@@ -514,6 +532,7 @@ class WikiImporter {
 		switch( $name ) {
 		case "username":
 		case "ip":
+		case "id":
 			$this->parenttag = "contributor";
 			$this->appendfield = $name;
 			xml_set_element_handler( $parser, "in_nothing", "out_append" );
diff --git a/includes/WikiError.php b/includes/WikiError.php
index f693003a5ffa..46738fccf5b9 100644
--- a/includes/WikiError.php
+++ b/includes/WikiError.php
@@ -89,15 +89,36 @@ class WikiXmlError extends WikiError {
 	 * @param resource $parser
 	 * @param string $message
 	 */
-	function WikiXmlError( $parser, $message = '' ) {
+	function WikiXmlError( $parser, $message = 'XML parsing error', $context = null, $offset = 0 ) {
 		$this->mXmlError = xml_get_error_code( $parser );
+		$this->mColumn = xml_get_current_column_number( $parser );
+		$this->mLine = xml_get_current_line_number( $parser );
+		$this->mByte = xml_get_current_byte_index( $parser );
+		$this->mContext = $this->_extractContext( $context, $offset );
 		$this->mMessage = $message;
 		xml_parser_free( $parser );
+		wfDebug( "WikiXmlError: " . $this->getMessage() . "\n" );
 	}
 
 	/** @return string */	
 	function getMessage() {
-		return $this->mMessage . ': ' . xml_error_string( $this->mXmlError );
+		return sprintf( '%s at line %d, col %d (byte %d%s): %s',
+			$this->mMessage,
+			$this->mLine,
+			$this->mColumn,
+			$this->mByte,
+			$this->mContext,
+			xml_error_string( $this->mXmlError ) );
+	}
+	
+	function _extractContext( $context, $offset ) {
+		if( is_null( $context ) ) {
+			return null;
+		} else {
+			// Hopefully integer overflow will be handled transparently here
+			$inlineOffset = $this->mByte - $offset;
+			return '; "' . substr( $context, $inlineOffset, 16 ) . '"';
+		}
 	}
 }
 
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 95c0f31bc4a4..15110ffd21bd 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -2,17 +2,17 @@
 /**
  * Copyright (C) 2005 Brion Vibber <brion@pobox.com>
  * http://www.mediawiki.org/
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
+ * 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.,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -33,35 +33,38 @@ class BackupReader {
 	var $pageCount = 0;
 	var $revCount  = 0;
 	var $dryRun    = false;
-	
+
 	function BackupReader() {
 		$this->stderr = fopen( "php://stderr", "wt" );
 	}
-	
+
 	function reportPage( $page ) {
 		$this->pageCount++;
 	}
-	
+
 	function handleRevision( $rev ) {
 		$title = $rev->getTitle();
+		if (!$title) {
+			return;
+		}
 		$display = $title->getPrefixedText();
 		$timestamp = $rev->getTimestamp();
 		#echo "$display $timestamp\n";
-		
+
 		$this->revCount++;
 		$this->report();
-		
+
 		if( !$this->dryRun ) {
 			call_user_func( $this->importCallback, $rev );
 		}
 	}
-	
+
 	function report( $final = false ) {
 		if( $final xor ( $this->pageCount % $this->reportingInterval == 0 ) ) {
 			$this->showReport();
 		}
 	}
-	
+
 	function showReport() {
 		if( $this->reporting ) {
 			$delta = wfTime() - $this->startTime;
@@ -75,35 +78,35 @@ class BackupReader {
 			$this->progress( "$this->pageCount ($rate pages/sec $revrate revs/sec)" );
 		}
 	}
-	
+
 	function progress( $string ) {
 		fwrite( $this->stderr, $string . "\n" );
 	}
-	
+
 	function importFromFile( $filename ) {
 		if( preg_match( '/\.gz$/', $filename ) ) {
 			$filename = 'compress.zlib://' . $filename;
 		}
 		$file = fopen( $filename, 'rt' );
-		$this->importFromHandle( $file );
+		return $this->importFromHandle( $file );
 	}
-	
+
 	function importFromStdin() {
 		$file = fopen( 'php://stdin', 'rt' );
-		$this->importFromHandle( $file );
+		return $this->importFromHandle( $file );
 	}
-	
+
 	function importFromHandle( $handle ) {
 		$this->startTime = wfTime();
-		
+
 		$source = new ImportStreamSource( $handle );
 		$importer = new WikiImporter( $source );
-		
+
 		$importer->setPageCallback( array( &$this, 'reportPage' ) );
 		$this->importCallback =  $importer->setRevisionCallback(
 			array( &$this, 'handleRevision' ) );
-		
-		$importer->doImport();
+
+		return $importer->doImport();
 	}
 }
 
@@ -112,16 +115,22 @@ if( isset( $options['quiet'] ) ) {
 	$reader->reporting = false;
 }
 if( isset( $options['report'] ) ) {
-	$reader->reportingInterval = IntVal( $options['report'] );
+	$reader->reportingInterval = intval( $options['report'] );
 }
 if( isset( $options['dry-run'] ) ) {
 	$reader->dryRun = true;
 }
 
 if( isset( $args[0] ) ) {
-	$reader->importFromFile( $args[0] );
+	$result = $reader->importFromFile( $args[0] );
+} else {
+	$result = $reader->importFromStdin();
+}
+
+if( WikiError::isError( $result ) ) {
+	echo $result->getMessage() . "\n";
 } else {
-	$reader->importFromStdin();
+	echo "Done!\n";
 }
 
 ?>
-- 
cgit v1.2.3


From 01d9f7fe7a8179dd72e07e3534cac6a16699ffd1 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 17 Sep 2005 22:48:00 +0000
Subject: Bug 3491: typo

---
 languages/LanguageFr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 3b0af859bc11..78901daaf03e 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -382,7 +382,7 @@ Veuillez vous identifier dès que vous l\'aurez reçu.',
 'preview'      => 'Prévisualiser',
 'showpreview'  => 'Prévisualisation',
 'blockedtitle' => 'Utilisateur bloqué',
-'blockedtext'  => 'Votre compte utilisateur ou votre adresse IP ont été bloqués par $1 pour la raison suivante :<br />$2<p>Vous pouvez contacter $1 ou un des autres [[{{ns:4}}:Administrateurs|administateurs]] pour en discuter.',
+'blockedtext'  => 'Votre compte utilisateur ou votre adresse IP ont été bloqués par $1 pour la raison suivante :<br />$2<p>Vous pouvez contacter $1 ou un des autres [[{{ns:4}}:Administrateurs|administrateurs]] pour en discuter.',
 'whitelistedittitle' => 'Login requis pour rédiger',
 'whitelistedittext' => 'Vous devez être [[Special:Userlogin|connecté]] pour pouvoir rédiger',
 'whitelistreadtitle' => 'Login requis pour lire',
-- 
cgit v1.2.3


From bade2faede61069f0978a0e36c5f7e6c6fd1d62a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 18 Sep 2005 01:21:39 +0000
Subject: * (bug 3489) PHP 5.1 compat problem with captioned images

---
 RELEASE-NOTES       | 1 +
 includes/Parser.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 452c99ce0feb..19b4e728e9a7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -768,6 +768,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3485) Fix bogus warning about filename capitalization when off
 * (bug 2792) Update rebuildrecentchanges.inc for new schema
 * Special:Import/importDump fixes: report XML parse errors, accept <minor/>
+* (bug 3489) PHP 5.1 compat problem with captioned images
 
 
 === Caveats ===
diff --git a/includes/Parser.php b/includes/Parser.php
index 6b11efa271e5..6424109ae6c3 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1337,7 +1337,8 @@ class Parser
 					$found = false;
 					while (isset ($a[$k+1]) ) {
 						#look at the next 'line' to see if we can close it there
-						$next_line =  array_shift(array_splice( $a, $k + 1, 1) );
+						$spliced = array_splice( $a, $k + 1, 1 );
+						$next_line = array_shift( $spliced );
 						if( preg_match("/^(.*?]].*?)]](.*)$/sD", $next_line, $m) ) {
 						# the first ]] closes the inner link, the second the image
 							$found = true;
-- 
cgit v1.2.3


From c5892b977b24cd24e10d6719cc8ac33c2797a5fa Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 18 Sep 2005 10:50:49 +0000
Subject: fix 3490: typo

---
 languages/LanguageFr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 78901daaf03e..60fc12ad0fd7 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -1053,7 +1053,7 @@ Dans ce cas, vous devrez renommer ou fusionner la page manuellement si vous le d
 
 # Export page
 'export'	=> 'Exporter des pages',
-'exporttext'	=> 'Vous pouvez exporter en XML le texte et l\'historique d\'une page ou d\'un ensemble de pages; le résultat peut alores être importé dans un autre wiki fonctionnant avec le logiciel MediaWiki, transformé ou sauvegardé pour votre usage personnel.',
+'exporttext'	=> 'Vous pouvez exporter en XML le texte et l\'historique d\'une page ou d\'un ensemble de pages; le résultat peut alors être importé dans un autre wiki fonctionnant avec le logiciel MediaWiki, transformé ou sauvegardé pour votre usage personnel.',
 'exportcuronly'	=> 'Exporter uniquement la version courante sans l\'historique',
 
 # Namespace 8 related
-- 
cgit v1.2.3


From 43f734008f77809e8c92f3c4f93812bb8a03c3cd Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 18 Sep 2005 11:11:57 +0000
Subject: Fix #3350: missing label for move talk page

---
 RELEASE-NOTES                | 2 +-
 includes/SpecialMovepage.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 19b4e728e9a7..93734ce80f20 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -769,7 +769,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2792) Update rebuildrecentchanges.inc for new schema
 * Special:Import/importDump fixes: report XML parse errors, accept <minor/>
 * (bug 3489) PHP 5.1 compat problem with captioned images
-
+* (bug 3350) Missing label for move talk page checkbox.
 
 === Caveats ===
 
diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 4d4abaf16e6b..47f4f55f085b 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -148,9 +148,9 @@ class MovePageForm {
 			$wgOut->addHTML( "
 		<tr>
 			<td align='right'>
-				<input type='checkbox' name=\"wpMovetalk\"{$moveTalkChecked} value=\"1\" />
+				<input type='checkbox' id=\"wpMovetalk\" name=\"wpMovetalk\"{$moveTalkChecked} value=\"1\" />
 			</td>
-			<td>{$movetalk}</td>
+			<td><label for=\"wpMovetalk\">{$movetalk}</label></td>
 		</tr>" );
 		}
 		$wgOut->addHTML( "
-- 
cgit v1.2.3


From d71f854b12950a077b773cf8a6df2c7fafd7cc23 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 19 Sep 2005 06:18:33 +0000
Subject: * (bug 2570) Add 'watch this page' checkbox on uploads, watch uploads
   by default when 'watchdefault' option is on Note: since uploads don't log
 an entry on the recentchanges table currently this is of limited use -- you
 only see edits to the image page in watchlist.

---
 RELEASE-NOTES              |  3 +++
 includes/Image.php         | 29 ++++++++++++++++++-----------
 includes/SpecialUpload.php | 19 ++++++++++++++++---
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 93734ce80f20..045b2b03e0c1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -770,6 +770,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Special:Import/importDump fixes: report XML parse errors, accept <minor/>
 * (bug 3489) PHP 5.1 compat problem with captioned images
 * (bug 3350) Missing label for move talk page checkbox.
+* (bug 2570) Add 'watch this page' checkbox on uploads, watch uploads
+  by default when 'watchdefault' option is on
+
 
 === Caveats ===
 
diff --git a/includes/Image.php b/includes/Image.php
index 2076a747847e..15e45937ef25 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1261,7 +1261,7 @@ class Image
 	/**
 	 * Record an image upload in the upload log and the image table
 	 */
-	function recordUpload( $oldver, $desc, $copyStatus = '', $source = '' ) {
+	function recordUpload( $oldver, $desc, $copyStatus = '', $source = '', $watch = false ) {
 		global $wgUser, $wgLang, $wgTitle, $wgDeferredUpdateList;
 		global $wgUseCopyrightUpload, $wgUseSquid, $wgPostCommitUpdateList;
 
@@ -1321,15 +1321,7 @@ class Image
 		$descTitle = $this->getTitle();
 		$purgeURLs = array();
 
-		if ( $dbw->affectedRows() ) {
-			# Successfully inserted, this is a new image
-			$id = $descTitle->getArticleID();
-
-			if ( $id == 0 ) {
-				$article = new Article( $descTitle );
-				$article->insertNewArticle( $textdesc, $desc, false, false, true );
-			}
-		} else {
+		if( $dbw->affectedRows() == 0 ) {
 			# Collision, this is an update of an image
 			# Insert previous contents into oldimage
 			$dbw->insertSelect( 'oldimage', 'image', 
@@ -1366,12 +1358,27 @@ class Image
 					'img_name' => $this->name
 				), $fname
 			);
+		}
+
+		$article = new Article( $descTitle );
+		$minor = false;
+		$watch = $watch || $wgUser->isWatched( $descTitle );
+		$suppressRC = true; // There's already a log entry, so don't double the RC load
+		
+		if( $descTitle->exists() ) {
+			// TODO: insert a null revision into the page history for this update.
+			if( $watch ) {
+				$wgUser->addWatch( $descTitle );
+			}
 			
 			# Invalidate the cache for the description page
 			$descTitle->invalidateCache();
 			$purgeURLs[] = $descTitle->getInternalURL();
+		} else {
+			// New image; create the description page.
+			$article->insertNewArticle( $textdesc, $desc, $minor, $watch, $suppressRC );
 		}
-
+		
 		# Invalidate cache for all pages using this image
 		$linksTo = $this->getLinksTo();
 		
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 4020b2083003..cac683657915 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -53,8 +53,10 @@ class UploadForm {
 		
 		$this->mUploadDescription = $request->getText( 'wpUploadDescription' );
 		$this->mUploadCopyStatus  = $request->getText( 'wpUploadCopyStatus' );
-		$this->mUploadSource      = $request->getText( 'wpUploadSource');
-		
+		$this->mUploadSource      = $request->getText( 'wpUploadSource' );
+		$this->mWatchthis         = $request->getBool( 'wpWatchthis' );
+		wfDebug( "UploadForm: watchthis is: '$this->mWatchthis'\n" );
+
 		$this->mAction            = $request->getVal( 'action' );
 		
 		$this->mSessionKey        = $request->getInt( 'wpSessionKey' );
@@ -270,7 +272,8 @@ class UploadForm {
 			$success = $img->recordUpload( $this->mUploadOldVersion,
 			                                $this->mUploadDescription,
 			                                $this->mUploadCopyStatus,
-			                                $this->mUploadSource );
+			                                $this->mUploadSource,
+			                                $this->mWatchthis );
 
 			if ( $success ) {
 				$this->showSuccess();
@@ -487,6 +490,7 @@ class UploadForm {
 		<input type='hidden' name='wpSessionKey' value=\"" . htmlspecialchars( $this->mSessionKey ) . "\" />
 		<input type='hidden' name='wpUploadDescription' value=\"" . htmlspecialchars( $this->mUploadDescription ) . "\" />
 		<input type='hidden' name='wpDestFile' value=\"" . htmlspecialchars( $this->mDestFile ) . "\" />
+		<input type='hidden' name='wpWatchthis' value=\"" . htmlspecialchars( intval( $this->mWatchthis ) ) . "\" />
 	{$copyright}
 	<table border='0'>
 		<tr>
@@ -558,6 +562,10 @@ class UploadForm {
 	" ;
 		  }
 
+		$watchChecked = $wgUser->getOption( 'watchdefault' )
+			? 'checked="checked"'
+			: '';
+		
 		$wgOut->addHTML( "
 	<form id='upload' method='post' enctype='multipart/form-data' action=\"$action\">
 	<table border='0'><tr>
@@ -575,6 +583,11 @@ class UploadForm {
 	  . htmlspecialchars( $this->mUploadDescription ) .
 	"</textarea>
 	</td></tr><tr>
+	
+	<td></td><td align='left'>
+	<input type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' />
+	<label for='wpWatchthis'>" . wfMsgHtml( 'watchthis' ) . "</label>
+	</td></tr><tr>
 	{$source}
 	</tr>
 	<tr><td></td><td align='left'>
-- 
cgit v1.2.3


From 885afb1813513d2737ef63443005517f2e6400f3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 22 Sep 2005 22:07:31 +0000
Subject: Removing old copy of geomap.php which somehow got stuck in here

---
 extensions/geomap.php | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 extensions/geomap.php

diff --git a/extensions/geomap.php b/extensions/geomap.php
deleted file mode 100644
index 46c83a7fcea2..000000000000
--- a/extensions/geomap.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?
-$wgExtensionFunctions[] = "wfGeomapExtension";
- 
-function wfGeomapExtension ()
-	{
-	global $wgParser ;
-	$wgParser->setHook ( "geomap" , parse_geomap ) ;
-	}
-
-function parse_geomap ( $text )
-	{
-	global $wgGeomapURL ;
-	if ( !isset ( $wgGeomapURL  ) ) return "" ; # Hide broken extension
-	
-	$url = $wgGeomapURL ;
-#	$url = "http://127.0.0.1/extensions/geo/index.php" ;
-	$url .= "?params=" . urlencode ( $text ) ;
-
-	$ret = '
-<object data="' . $url . '" width="500" height="500" type="image/svg+xml" border=1>
-<embed src="' . $url . '" width="500" height="500" type="image/svg+xml" />
-</object>' ;
-
-#	$ret = "<iframe width=200 height=200 src=\"{$url}\"/>" ;
-	return $ret ;
-	}
-
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From f6160ee7dd5cad6f37cee3b70b1c500d01efdcd8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 24 Sep 2005 03:47:37 +0000
Subject: * (bug 3182) Clear link cache during import to prevent memory leak

---
 RELEASE-NOTES              | 1 +
 includes/SpecialImport.php | 4 ++++
 maintenance/importDump.php | 1 +
 3 files changed, 6 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 045b2b03e0c1..140c7430d13f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -772,6 +772,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3350) Missing label for move talk page checkbox.
 * (bug 2570) Add 'watch this page' checkbox on uploads, watch uploads
   by default when 'watchdefault' option is on
+* (bug 3182) Clear link cache during import to prevent memory leak
 
 
 === Caveats ===
diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 7b4cbe0a1416..9c626ed4e69e 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -197,6 +197,10 @@ class WikiRevision {
 			$userText = $this->getUser();
 		}
 
+		// avoid memory leak...?
+		global $wgLinkCache;
+		$wgLinkCache->clear();
+		
 		$article = new Article( $this->title );
 		$pageId = $article->getId();
 		if( $pageId == 0 ) {
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 15110ffd21bd..3a58550c6b1c 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -45,6 +45,7 @@ class BackupReader {
 	function handleRevision( $rev ) {
 		$title = $rev->getTitle();
 		if (!$title) {
+			$this->progress( "Got bogus revision with null title!" );
 			return;
 		}
 		$display = $title->getPrefixedText();
-- 
cgit v1.2.3


From f2c3ed42d240e0eecf00b84b862de2ace69ed701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Fri, 30 Sep 2005 15:25:57 +0000
Subject: * (bug 3577) Added a RevisionAfterGetRevisionText hook to
 getRevisionText()

---
 includes/Revision.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/Revision.php b/includes/Revision.php
index e7e9b3ba4407..ee2d4976c22b 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -471,6 +471,7 @@ class Revision {
 			global $wgInputEncoding, $wgContLang;
 			$text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
 		}
+		wfRunHooks( 'RevisionAfterGetRevisionText', array( &$text ) );
 		wfProfileOut( $fname );
 		return $text;
 	}
-- 
cgit v1.2.3


From 79ff0033c0eae82a905eeb04398a28784cc28cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 30 Sep 2005 19:12:46 +0000
Subject: Bug 3573: Full Greek Translation (with namespace changes)

---
 RELEASE-NOTES            |    1 +
 languages/LanguageEl.php | 1993 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 1963 insertions(+), 31 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 140c7430d13f..eaf7de000a7b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -773,6 +773,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2570) Add 'watch this page' checkbox on uploads, watch uploads
   by default when 'watchdefault' option is on
 * (bug 3182) Clear link cache during import to prevent memory leak
+* (bug 3573) Full Greek Translation
 
 
 === Caveats ===
diff --git a/languages/LanguageEl.php b/languages/LanguageEl.php
index 0a5887c382ac..d322b4064e5b 100644
--- a/languages/LanguageEl.php
+++ b/languages/LanguageEl.php
@@ -1,5 +1,27 @@
 <?php
 /** Greek (Ελληνικά)
+  *
+  * Translation by Pasok Internet Volunteers
+  * http://forum.pasok.gr
+  * version 1.0 (initial release)
+  *
+  *The project for the translation of MediaWiki into Greek 
+  *was undertaken by a group of ICT volunteers working under 
+  *the auspices of the Greek political party PASOK.
+  *
+  *The idea behind this effort was  to provide an extensible,
+  *easy-to-use and non-intimidating tool for content development
+  *and project management, to be used throughout the administrative 
+  *and political structure of PASOK by staff, volunteers, party members 
+  *and elected officials (all of whom possess varying degrees of ICT skills).
+  *
+  *The PASOK ICT team and the volunteers who worked on this project are 
+  *now returning the translated interface to the Open-Source Community 
+  *with over 98% of the messages translated into user-friendly Greek.
+  *
+  *We hope that it will be used as a tool by other civil society organizations
+  *in Greece, and that it will enhance the collective creation and the dissemination 
+  *of knowledge - an essential component of the democratic process.
   *
   * @package MediaWiki
   * @subpackage Language
@@ -10,60 +32,1969 @@ require_once( 'LanguageUtf8.php' );
 
 $wgNamespaceNamesEl = array(
 	NS_MEDIA            => 'Μέσον',
-	NS_SPECIAL          => 'Ειδικό',
+	NS_SPECIAL          => 'Special',
 	NS_MAIN	            => '',
 	NS_TALK	            => 'Συζήτηση',
 	NS_USER             => 'Χρήστης',
-	NS_USER_TALK        => 'Συζήτηση_χρήστη',
+	NS_USER_TALK        => 'Συζήτηση_χρηστών',
 	NS_PROJECT          => $wgMetaNamespace,
 	NS_PROJECT_TALK     => $wgMetaNamespace . '_συζήτηση',
-	NS_IMAGE            => 'Εικόνα',
-	NS_IMAGE_TALK       => 'Συζήτηση_εικόνας',
+	NS_IMAGE            => 'Εικόνες',
+	NS_IMAGE_TALK       => 'Συζήτηση_εικόνων',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Πρότυπο',
-	NS_TEMPLATE_TALK    => 'Συζήτηση_προτύπου',
+	NS_TEMPLATE_TALK    => 'Συζήτηση_προτύπων',
 	NS_HELP             => 'Βοήθεια',
 	NS_HELP_TALK        => 'Συζήτηση_βοήθειας',
 	NS_CATEGORY         => 'Κατηγορία',
-	NS_CATEGORY_TALK    => 'Συζήτηση_κατηγορίας',
+	NS_CATEGORY_TALK    => 'Συζήτηση_κατηγοριών',
 ) + $wgNamespaceNamesEn;
 
 $wgAllMessagesEl = array(
 
-'sunday' => 'Κυριακή',
-'monday' => 'Δευτέρα',
-'tuesday' => 'Τρίτη',
-'wednesday' => 'Τετάρτη',
-'thursday' => 'Πέμπτη',
-'friday' => 'Παρασκευή',
-'saturday' => 'Σαββάτο',
+# User preference toggles
+#----------------------------------------#
+'tog-underline' => 'Υπογράμμιση συνδέσμων',
+'tog-highlightbroken' => 'Κατεστραμένοι σύνδεσμοι μορφοποίησης <a href="" class="new">όπως αυτός</a> (εναλλακτικά: όπως αυτός<a href="" class="internal">?</a>).',
+'tog-justify' => 'Στοίχιση παραγράφων',
+'tog-hideminor' => 'Απόκρυψη αλλαγών μικρής κλίμακας',
+'tog-usenewrc' => 'Ανάδειξη πρόσφατων αλλαγών (δεν λειτουργεί σε όλους τους browser)',
+'tog-numberheadings' => 'Αυτόματη αρίθμιση τίτλων',
+'tog-showtoolbar' => 'Εμφάνιση μπάρας εργαλείων επεξεργασίας',
+'tog-editondblclick' => 'Επεξεργασία σελίδων με διπλό κλικ (JavaScript)',
+'tog-editsection' => 'Ενεργοποίηση επεξεργασίας τμημάτων μέσω των συνδέσμων [επεξεργασία]',
+'tog-editsectiononrightclick' => 'Ενεργοποίηση επεξεργασίας τμήματος με δεξύ κλικ<br /> στους τίτλους των τμημάτων (JavaScript)',
+'tog-showtoc' => 'Εμφάνιση πίνακα περιεχομένων <br />(για σελίδες με περισσότερες από τρεις κεφαλίδες)',
+'tog-rememberpassword' => 'Διατήρηση του κωδικού πρόσβασης σε αυτό τον υπολογιστή',
+'tog-editwidth' => 'Πλαίσιο επεξεργασίας στο μέγιστο πλάτος',
+'tog-watchdefault' => 'Προσθήκη των σελίδων που επεξεργάζεστε στη λίστα παρακολούθησης.',
+'tog-minordefault' => 'Προκαθορίστε να χαρακτηρίζονται όλες οι αλλαγές "μικρής κλίμακας".',
+'tog-previewontop' => 'Εμφάνιση προεπισκόπησης πριν από το πλαίσο επεξεργασίας και όχι μετά',
+'tog-previewonfirst' => 'Εμφάνιση προεπισκόπησης κατά την πρώτη επεξεργασία',
+'tog-nocache' => 'Απενεργοποίηση της δυνατότητας δημιουργίας cache των σελίδων',
+'tog-enotifwatchlistpages' => 'Ειδοποίηση με e-mail σχετικά με αλλαγές στις σελίδες που παρακολουθώ.',
+'tog-enotifusertalkpages' => 'Ειδοποίηση με e-mail σχετικά με αλλαγές στη συζήτηση της δικής μου σελίδας χρήστη',
+'tog-enotifminoredits' => 'Ειδοποίηση με e-mail και για τις αλλαγές μικρής κλίμακας σε αυτή τη σελίδα',
+'tog-enotifrevealaddr' => 'Εμφάνιση της ηλεκτρονικής μου διεύθυνσης στις ειδοποιήσεις που μου αποστέλλονται.',
+'tog-shownumberswatching' => 'Εμφάνιση του αριθμού των συνδεδεμένων χρηστών',
+'tog-fancysig' => 'Απλή υπογραφή (χωρίς τη χρήση αυτόματου συνδέσμου)',
+'tog-externaleditor' => 'Εξ αρχής χρήση εξωτερικού επεξεργαστή κειμένου',
+'tog-externaldiff' => 'Εξ αρχής χρήση εξωτερικού λογισμικού αντιπαραβολής (diffing)',
+
+'underline-always' => 'Πάντα',
+'underline-never' => 'Ποτέ',
+'underline-default' => 'Όπως ορίζεται από το browser σας.',
 
+'skinpreview' => '(προεπισκόπηση)',
+
+#Months
+#-----------#
+'jan' => 'Ιαν',
 'january' => 'Ιανουαρίου',
+'feb' => 'Φεβρ',
 'february' => 'Φεβρουαρίου',
+'mar' => 'Μαρτ',
 'march' => 'Μαρτίου',
+'apr' => 'Απρ',
 'april' => 'Απριλίου',
+'may' => 'Μαΐου',
 'may_long' => 'Μαΐου',
+'jun' => 'Ιουν',
 'june' => 'Ιουνίου',
+'jul' => 'Ιουλ',
 'july' => 'Ιουλίου',
+'aug' => 'Αυγ',
 'august' => 'Αυγούστου',
+'sep' => 'Σεπτ',
 'september' => 'Σεπτεμβρίου',
+'oct' => 'Οκτ',
 'october' => 'Οκτωβρίου',
+'nov' => 'Νοε',
 'november' => 'Νοεμβρίου',
+'dec' => 'Δεκ',
 'december' => 'Δεκεμβρίου',
 
-'jan' => 'Ιαν',
-'feb' => 'Φεβρ',
-'mar' => 'Μαρτ',
-'apr' => 'Απρ',
-'may' => 'Μαΐου',
-'jun' => 'Ιουν',
-'jul' => 'Ιουλ',
-'aug' => 'Αυγ',
-'sep' => 'Σεπτ',
-'oct' => 'Οκτ',
-'nov' => 'Νοεμβ',
-'dec' => 'Δεκ',
+#Days
+#-------#
+'sunday' => 'Κυριακή',
+'monday' => 'Δευτέρα',
+'tuesday' => 'Τρίτη',
+'wednesday' => 'Τετάρτη',
+'thursday' => 'Πέμπτη',
+'friday' => 'Παρασκευή',
+'saturday' => 'Σαββάτο',
+
+
+# Bits of text used by many pages:
+#----------------------------------------------------#
+'categories' => 'Κατηγορίες',
+'category' => 'κατηγορία',
+'category_header' => 'Άρθρα στην κατηγορία "$1"',
+'subcategories' => 'Υποκατηγορίες',
+
+'linktrail' => '/^([a-z]+)(.*)$/sD',
+'linkprefix' => '/^(.*?)([a-zA-Z\x80-\xff]+)$/sD',
+'mainpage' => 'Αρχική σελίδα',
+'mainpagetext' => 'To λογισμικό Wiki εγκαταστάθηκε επιτυχώς.',
+
+'mainpagedocfooter' => 'Περισσότερες πληροφορίες σχετικά με τη χρήση και με τη ρύθμιση παραμέτρων θα βρείτε στους συνδέσμους: [http://meta.wikipedia.org/wiki/MediaWiki_i18n Οδηγίες για τροποποίηση του περιβάλλοντος εργασίας] και [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Εγχειρίδιο χρήστη].',
+
+'portal' => 'Ο ιστοχώρος της κοινότητας',
+'portal-url' => '{{ns:4}}:Ο_ιστοχώρος_της_κοινότητας',
+'about' => 'Σχετικά με',
+'aboutsite' => 'Σχετικά με το {{SITENAME}}',
+'aboutpage' => '{{ns:4}}:Σχετικά με',
+'article' => 'Σελίδα κειμένου (ή άλλου περιεχομένου)',
+'help' => 'Βοήθεια',
+'helppage' => '{{ns:12}}:Περιεχόμενα',
+#'wikititlesuffix' => '{{SITENAME}}',
+'bugreports' => 'Αναφορές σφαλμάτων',
+'bugreportspage' => '{{ns:4}}:Αναφορά_σφάλματος',
+'sitesupport' => 'Υποστήριξη ιστοχώρου',
+'sitesupport-url' => '{{ns:4}}:Υποστήριξη_ιστοχώρου',
+'faq' => 'Συνήθεις ερωτήσεις (FAQ)',
+'faqpage' => '{{ns:12}}:Συνήθεις ερωτήσεις (FAQ)',
+'edithelp' => 'Βοήθεια σχετικά με την επεξεργασία',
+'newwindow' => '(ανοίγει σε ξεχωριστό παράθυρο)',
+'edithelppage' => '{{ns:12}}:Επεξεργασία',
+'cancel' => 'Ακύρωση',
+'qbfind' => 'Εύρεση',
+'qbbrowse' => 'Περιήγηση',
+'qbedit' => 'Επεξεργασία',
+'qbpageoptions' => 'Αυτή η σελίδα',
+'qbpageinfo' => 'Συμφραζόμενα',
+'qbmyoptions' => 'Οι σελίδες μου',
+'qbspecialpages' => 'Σελίδες λειτουργιών',
+'moredotdotdot' => 'Περισσότερα...',
+'mypage' => 'Η σελίδα μου',
+'mytalk' => 'Οι συζητήσεις μου',
+'anontalk' => 'Οι συζητήσεις αυτής της διεύθυνσης IP',
+'navigation' => 'Πλοήγηση',
+
+
+# Metadata in edit box
+#---------------------------------#
+'metadata' => '<b>Μεταδεδομένα</b> (επεξήγηση στο σύνδεσμο <a href="$1">here</a>)',
+'metadata_page' => '{{ns:project}}:Μεταδεδομένα',
+
+'currentevents' => 'Τρέχοντα γεγονότα',
+'currentevents-url' => 'Τρέχοντα γεγονότα',
+
+'disclaimers' => 'Αποποίηση ευθυνών',
+'disclaimerpage' => '{{ns:4}}:Αποποίηση_ευθύνης',
+
+'errorpagetitle' => 'Σφάλμα',
+'returnto' => 'Επιστροφή στη σελίδα $1.',
+'tagline' => 'Από {{SITENAME}}',
+'whatlinkshere' => 'Αναφορές στη σελίδα',
+'help' => 'Βοήθεια',
+'search' => 'Αναζήτηση',
+'go' => 'Μετάβαση',
+'history_short' => 'Ιστορικό',
+'info_short' => 'Πληροφορίες',
+'printableversion' => 'Εκτυπώσιμη έκδοση',
+'print' => 'Εκτύπωση',
+'edit' => 'Επεξεργασία',
+'editthispage' => 'Επεξεργασία αυτής της σελίδας',
+'delete' => 'Διαγραφή',
+'deletethispage' => 'Διαγραφή αυτής της σελίδας',
+'undelete_short1' => 'Να αναστραφεί η διαγραφή μίας επεξεργασίας.',
+'undelete_short' => 'Να αναστραφεί η διαγραφή $1 επεξεργασιών.',
+'protect' => 'Προστασία',
+'protectthispage' => 'Κλείδωμα της σελίδας',
+'unprotect' => 'Άρση προστασίας',
+'unprotectthispage' => 'Άρση προστασίας αυτής της σελίδας',
+'newpage' => 'Νέα σελίδα',
+'talkpage' => 'Συζήτηση για αυτή τη σελίδα',
+'specialpage' => 'Σελίδα λειτουργιών',
+'personaltools' => 'Προσωπικά εργαλεία',
+'postcomment' => 'Καταχωρίστε ένα σχόλιο.',
+'addsection' => '+',
+'articlepage' => 'Εμφάνιση σελίδας κειμένου',
+'subjectpage' => 'Εμφάνιση θέματος',
+'talk' => 'Συζήτηση',
+'views' => 'Εμφανίσεις',
+'toolbox' => 'Εργαλεία',
+'userpage' => 'Εμφάνιση σελίδας χρήστη',
+'wikipediapage' => 'Εμφάνιση σελίδας βοήθειας',
+'imagepage' => 'Εμφάνιση σελίδας εικόνων',
+'viewtalkpage' => 'Εμφάνιση συζήτησης',
+'otherlanguages' => 'Άλλες γλώσσες',
+'redirectedfrom' => '(Ανακατεύθυνση από $1)',
+'lastmodified' => 'Η σελίδα αυτή τροποποιήθηκε τελευταία φορά στις $1.',
+'viewcount' => 'Αυτή η σελίδα έχει προσπελαστεί $1 φορές.',
+'copyright' => 'Το περιεχόμενο είναι διαθέσιμο σύμφωνα με την $1.',
+'poweredby' => 'Το {{SITENAME}} χρησιμοποιεί [http://www.mediawiki.org/|MediaWiki] -μια μηχανή Wiki ανοιχτού λογισμικού.',
+'printsubtitle' => '(Προέλευση {{SERVER}})',
+'protectedpage' => 'Κλειδωμένη σελίδα',
+'administrators' => '{{ns:4}}:Διαχειριστές',
+
+'sysoptitle' => 'Απαιτείται η πρόσβαση διαχειριστή.',
+'sysoptext' => 'Το αίτημά σας αφορά σε ενέργεια 
+
+που εκτελείται μόνον από διαχειριστές
+ 
+(βλ.$1).',
+'developertitle' => 'Απαιτείται η πρόσβαση των προγραμματιστών.',
+'developertext' => 'Η ενέργεια αυτή μπορεί να εκτελείται μόνον από τους προγραμματιστές (βλ. $1).',
+'badaccess' => 'Ακατάλληλη άδεια',
+
+'badaccesstext' => 'Η ενέργεια που ζητήσατε μπορεί να εκτελεσθεί μόνον από χρήστες στους οποίους έχει δοθεί άδεια "$2".
+Βλ. $1.',
+
+'versionrequired' => 'Απαιτείται η έκδοση $1 του MediaWiki.',
+'versionrequiredtext' => 'Για να χρησιμοποιήσετε αυτή τη σελίδα απαιτείται η έκδοση $1 του MediaWiki . Βλ. [[Special:Έκδοση]]',
+'nbytes' => '$1 bytes',
+#'ok' => 'OK',
+'sitetitle' => '{{SITENAME}}',
+'pagetitle' => "$1 - {{SITENAME}}",
+#'sitesubtitle'	=> 'The Free Encyclopedia', # FIXME
+'retrievedfrom' => 'Ανακτήθηκε από το "$1".',
+'newmessages' => 'Έχετε $1.',
+'newmessageslink' => 'νέο μήνυμα',
+'editsection' => 'επεξεργασία',
+'toc' => 'Πίνακας περιεχομένων',
+'showtoc' => 'εμφάνιση',
+'hidetoc' => 'απόκρυψη',
+'thisisdeleted' => 'Εμφάνιση ή αποκατάσταση της $1;',
+'restorelink' => '$1 επεξεργασίες έχουν διαγραφεί.',
+'feedlinks' => 'Ροή δεδομένων:',
+#'sitenotice' => '-', # the equivalent to wgSiteNotice
+
+
+# Short words for each namespace, by default used in the 'article' tab in monobook
+#---------------------------------------------------------------------------------------------------------------------------------#
+'nstab-main' => 'Άρθρο',
+'nstab-user' => 'Σελίδα χρήστη',
+'nstab-media' => 'Ηλεκτρονικά μέσα',
+'nstab-special' => 'Σελίδα λειτουργιών',
+'nstab-wp' => 'Σχετικά με',
+'nstab-image' => 'Εικόνα',
+'nstab-mediawiki' => 'Μήνυμα',
+'nstab-template' => 'Πρότυπο',
+'nstab-help' => 'Βοήθεια',
+'nstab-category' => 'Κατηγορία',
+
+# Main script and global functions
+#--------------------------------------------------#
+'nosuchaction' => 'Δεν υπάρχει τέτοια ενέργεια.',
+'nosuchactiontext' => 'Η ενέργεια που καθορίστηκε από την διεύθυνση URL δεν αναγνωρίζεται από το Wiki.',
+'nosuchspecialpage' => 'Δεν υπάρχει τέτοια σελίδα λειτουργιών.',
+'nospecialpagetext' => 'Έχετε ζητήσει μια ειδική σελίδα που δεν αναγνωρίζεται από το Wiki.',
+
+# General errors
+#------------------------#
+'error' => 'Σφάλμα',
+'databaseerror' => 'Σφάλμα στη βάση δεδομένων',
+
+'dberrortext' => 'Σημειώθηκε συντακτικό σφάλμα σε αίτημα προς τη βάση δεδομένων. Πιθανόν να πρόκειται για ένδειξη σφάλματος στο λογισμικό. Το τελευταίο αίτημα προς τη βάση δεδομένων που επιχειρήθηκε ήταν: <blockquote><tt>$1</tt></blockquote> μέσα από τη λειτουργία "<tt>$2</tt>".  Το MySQL επέστρεψε σφάλμα "<tt>$3: $4</tt>".',
+
+'dberrortextcl' => 'Σημειώθηκε συντακτικό σφάλμα σε αίτημα προς τη βάση δεδομένων. Το τελευταίο αίτημα που επιχειρήθηκε ήταν: "$1" μέσα από τη λειτουργία "$2". Το MySQL επέστρεψε σφάλμα "$3: $4".',
+'noconnect' => 'Λυπούμαστε! Λόγω τεχνικών δυσκολιών το Wiki δεν μπορεί να επικοινωνήσει με τον server της βάσης δεδομένων. <br />
+
+$1',
+
+'nodb' => 'Αδύνατη η επιλογή της βάσης δεδομένων $1',
+'cachederror' => 'Το ακόλουθο κείμενο προέρχεται από το προσωρινό αρχείο (cache) και πιθανόν να μην περιέχει τις πιο πρόσφατες αλλαγές.',
+'laggedslavemode' => 'Προειδοποίηση: Η σελίδα μπορεί να μην έχει ενημερωθεί με τις πρόσφατες αλλαγές.<br/>',
+'readonly' => 'Κλειδωμένη βάση δεδομένων',
+'enterlockreason' => 'Εξηγήστε τους λόγους για το κλείδωμα και το πότε, κατά την εκτίμησή σας, το κλείδωμα αυτό θα αναιρεθεί.',
+
+'readonlytext' => 'Η βάση δεδομένων είναι προσωρινά κλειδωμένη και δεν μπορεί να δεχθεί νέα λήμματα και άλλες τροποποιήσεις -πιθανότατα λόγω συντήρησης. Μετά τη συντήρηση θα επανέλθει σε κανονική λειτουργία.  Η αιτιολογία για το κλείδωμα της βάσης δεδομένων ήταν η εξής: <p>$1',
+
+'missingarticle' => 'Η βάση δεδομένων δεν βρήκε το αναμενόμενο περιεχόμενο σελίδας κάτω από το όνομα "$1".
+
+<p> Αυτό συμβαίνει όταν ακολουθούμε συνδέσμους μιας παλιάς \'αντιπαραβολής\' ή \'ίστορικού\' σε σελίδες που έχουν διαγραφεί. Αν δεν πρόκειται για τέτοια περίπτωση, είναι πιθανόν να υπάρχει σφάλμα στο λογισμικό. Σας παρακαλούμε να το αναφέρετε στους διαχειριστές, παραπέμποντας στο συγκεκριμένο URL.',
+
+'readonly_lag' => 'Η βάση δεδομένων έχει κλειδωθεί αυτόματα για να μπορέσουν οι επιμέρους servers των αντιγράφων της βάσης δεδομένων (slaves) να καλύψουν τη διαφορά με τον κεντρικό server του πρωτοτύπου της βάσης (master).',
+
+'internalerror' => 'Εσωτερικό σφάλμα',
+'filecopyerror' => 'Δεν ήταν δυνατή η αντιγραφή του αρχείου "$1" στο "$2".',
+'filerenameerror' => 'Δεν είναι δυνατή η μετονομασία του αρχείου "$1" σε "$2".',
+'filedeleteerror' => 'Δεν ήταν δυνατή η διαγραφή του αρχείου "$1".',
+'filenotfound' => 'Δεν είναι δυνατή η ανεύρεση του αρχείου "$1".',
+'unexpected' => 'Μη προσδοκώμενη τιμή: "$1"="$2"',
+'formerror' => 'Λάθος: Δεν ολοκληρώθηκε η υποβολή της φόρμας!',
+'badarticleerror' => 'Η ενέργεια αυτή δεν μπορεί να εκτελεσθεί στη συγκεκριμένη σελίδα.',
+'cannotdelete' => 'Αδύνατη η διαγραφή της συγκεκριμένης σελίδας ή εικόνας (Ενδεχομένως να έχει ήδη διαγραφεί από άλλο χρήστη.)',
+'badtitle' => 'Ακατάλληλος τίτλος',
+'badtitletext' => 'Ο τίτλος της σελίδας που ζητήσατε είναι άκυρος ή κενός ή πρόκειται για έναν εσφαλμένα συνδεδεμένο διαγλωσσικό τίτλο (ή εσφαλμένα συνδεδεμένο τίτλο ανάμεσα σε διαφορετικά Wiki).',
+'perfdisabled' => 'Λυπούμαστε! Αυτή η λειτουργία έχει προσωρινά απενεργοποιηθεί επειδή επιβραδύνει τη βάση δεδομένων σε βαθμό που κανένας χρήστης δεν μπορεί να χρησιμοποιήσει το Wiki.',
+'perfdisabledsub' => 'Αυτό είναι ένα αποθηκευμένο αντίγραφο της $1:',
+'perfcached' => 'Τα δεδομένα που ακολουθούν είναι cached και είνα πιθανόν να μην είναι πλήρως ενημερωμένα:',
+
+'wrong_wfQuery_params' => 'Λανθανσμένες παράμετροι στο wfQuery()<br />
+Λειτουργία: $1<br />
+Αίτημα: $2',
+
+'viewsource' => 'Εμφάνιση κώδικα',
+
+'protectedtext' => 'Η σελίδα αυτή είναι κλειδωμένη και δεν είναι δυνατή η επεξεργασία της. Για περισσότερες πληροφορίες σχετικά με τους λόγους για τους οποίους προστατεύεται η σελίδα, παρακαλούμε επισκεφθείτε το σύνδεσμο 
+[[{{ns:4}}:Κλειδωμένες_σελίδες]].
+
+Μπορείτε να δείτε και να αντιγράψετε τον πηγαίο κώδικα αυτής σελίδας:',
+
+'sqlhidden' => '(το αίτημα SQL δεν εμφανίζεται)',
+
+
+# Login and logout pages
+#-------------------------------------#
+'logouttitle' => 'Έξοδος χρήστη',
+'logouttext' => 'Έχετε αποσυνδεθεί.
+Μπορείτε να παραμείνετε στο {{SITENAME}} ανώνυμα, ή μπορείτε να συνδεθείτε ξανά με το ίδιο ή με διαφορετικό (εάν έχετε) όνομα χρήστη. Έχετε υπ\' όψη σας πως αρκετές σελίδες θα συνεχίσουν να εμφανίζονται κανονικά, σαν να μην έχετε αποσυνδεθεί, μέχρι να καθαρίσετε το cache του browser σας.',
+
+'welcomecreation' => '== Καλώς ήλθατε, $1! ==
+
+Ο λογαριασμός σας έχει δημιουργθεί. Μπορείτε να εξατομικεύσετε το {{SITENAME}} σύμφωνα με τις ανάγκες σας μέσα από το σύνδεσμο [[Special:Preferences|Προτιμήσεις]].',
+
+'loginpagetitle' => 'Είσοδος χρήστη',
+'yourname' => 'Όνομα χρήστη',
+'yourpassword' => 'Κωδικός',
+'yourpasswordagain' => 'Πληκτρολογήστε ξανά τον κωδικό',
+'newusersonly' => '(μόνον νέοι χρήστες)',
+'remembermypassword' => 'Διατήρηση του κωδικού πρόσβασης σε αυτόν τον υπολογιστή',
+#'yourdomainname' => 'Your domain',
+'externaldberror' => 'Συνέβη εξωτερικό σφάλμα πιστοποίησης στη βάση δεδομένων ή δεν σας έχει επιτραπεί να ενημερώσετε τον εξωτερικό σας λογαριασμό.',
+'loginproblem' => '<b>Εμφανίστηκε πρόβλημα κατά την είσοδό σας.</b><br />Παρακαλούμε δοκιμάστε ξανά!',
+'alreadyloggedin' => '<font color=red><b>Ο χρήστης $1, είναι ήδη συνδεδεμένος!</b></font><br />',
+'login' => 'Είσοδος',
+'loginprompt' => 'Πρέπει να έχετε ενεργοποιήσει τα cookies για να συνδεθείτε στο {{SITENAME}}.',
+'userlogin' => 'Δημιουργία Λογαριασμού/Είσοδος',
+'logout' => 'Έξοδος',
+'userlogout' => 'Έξοδος χρήστη',
+'notloggedin' => 'Δεν έχετε συνδεθεί.',
+'createaccount' => 'Δημιουργία νέου λογαριασμού',
+'createaccountmail' => 'Με ηλεκτρονικό ταχυδρομείο',
+'badretype' => 'Οι κωδικοί που έχετε δηλώσει δεν συμφωνούν μεταξύ τους.',
+'userexists' => 'Το όνομα χρήστη που συμπληρώσατε είναι ήδη σε χρήση. Παρακαλούμε διαλέξτε ένα άλλο όνομα.',
+'youremail' => 'Ηλεκτρονική διεύθυνση*',
+'yourrealname' => 'Όνομα και επώνυμο*',
+'yourlanguage' => 'Γλώσσα διασύνδεσης',
+'yourvariant' => 'Η γλώσσα που χρησιμοποιείτε',
+'yournick' => 'Το ψευδώνυμό σας (για την υπογραφή)',
+'email' => 'αλληλογραφία',
+
+'emailforlost' => 'Τα πεδία που σημειώνονται με αστερίσκο (*) είναι προαιρετικά. Αφήνοντας μια ηλεκτρονική διεύθυνση στο αρχείο δίνετε τη δυνατότητα σε άλλους χρήστες να επικοινωνήσουν μαζί σας μέσω αυτής της ιστοσελίδας, χωρίς η διεύθυνσή σας να εμφανίζεται δημόσια. Η ηλεκτρονική σας διεύθυνση μπορεί επίσης να χρησιμοποιηθεί για να σας σταλεί ένας νέος κωδικός πρόσβασης αν κάποτε τον χάσετε. Το πραγματικό σας όνομα, αν επιλέξετε να μας το δώσετε, θα χρησιμοποιηθεί μόνον για την αναγνώριση της συνεισφοράς σας.',
+
+'prefs-help-email-enotif' => 'Αυτή η διεύθυνση χρησιμοποιείται για να σας αποστέλλονται ειδοποιήσεις εφόσον έχετε ενεργοποιήσει τις σχετικές επιλογές.',
+'prefs-help-realname' => '* Πραγματικό όνομα (προαιρετικό): εφόσον εισάγετε το όνομά σας, αυτό θα μπορεί να χρησιμοποιηθεί για να αναγνωριστεί ευρύτερα η δουλειά σας.',
+'loginerror' => 'Λάθος σύνδεσης',
+
+'prefs-help-email' => '* Email (προαιρετικό): Δίνει τη δυνατότητα σε άλλους χρήστες να επικοινωνήσουν μαζί σας μέσω της σελίδας χρήστη (ή της συζήτησης για την σελίδα χρήστη) χωρίς να εμφανίζεται η ταυτότητά σας.',
+
+'nocookiesnew' => 'Ο λογαριασμός χρήστη έχει δημιουργηθεί, αλλά δεν έχετε ακόμα συνδεθεί. Το {{SITENAME}} χρησιμοποιεί cookies κατά τη σύνδεση των χρηστών. Τα cookies είναι απενεργοποιημένα στον υπολογιστή σας. Παρακαλούμε ενεργοποιήστε τα και στη συνέχεια συνδεθείτε χρησιμοποιώντας το νέο όνομα χρήστη σας και τον κωδικό σας.',
+
+'nocookieslogin' => 'Το {{SITENAME}} χρησιμοποιεί cookies κατά τη σύνδεση των χρηστών. Τα cookies είναι απενεργοποιημένα στον υπολογιστή σας. Παρακαλούμε ενεργοποιήστε τα και ξαναδοκιμάστε!',
+'noname' => 'Το όνομα χρήστη που έχετε καθορίσει δεν είναι έγκυρο.',
+'loginsuccesstitle' => 'Επιτυχής σύνδεση',
+'loginsuccess' => 'Είστε συνδεδεμένος(-η) στο {{SITENAME}} ως "$1".',
+
+'nosuchuser' => 'Δεν υπάρχει χρήστης με το όνομα "$1".
+Ελέγξτε την ορθογραφία ή χρησιμοποιείστε την παρακάτω φόρμα για να δημιουργήσετε ένα νέο λογαριασμό.',
+
+'nosuchusershort' => 'Δεν υπάρχει χρήστης με το όνομα "$1". Παρακαλούμε ελέγξτε την ορθογραφία.',
+'wrongpassword' => 'Ο κωδικός που πληκτρολογήσατε είναι λανθασμένος. Παρακαλούμε προσπαθήστε ξανά.',
+'mailmypassword' => 'Στείλτε μου ένα νέο κωδικό.',
+'passwordremindertitle' => 'Υπενθύμιση κωδικού από το {{SITENAME}}',
+
+'passwordremindertext' => 'Κάποιος (πιθανώς εσείς) με διεύθυνση IP $1, ζήτησε να σας στείλουμε ένα νέο κωδικό πρόσβασης στο {{SITENAME}}. Ο κωδικός πρόσβασης για το χρήστη "$2" είναι αυτή τη στιγμή "$3". Συνιστούμε να συνδεθείτε και να αλλάξετε αυτόν τον κωδικό το συντομότερο δυνατόν.',
+
+'noemail' => 'Δεν υπάρχει ηλεκτρονική διεύθυνση για το χρήστη "$1".',
+
+'passwordsent' => 'Σας έχει σταλεί ένας νέος κωδικός στην ηλεκτρονική διέθυνση που δηλώσατε για "$1".
+Σας παρακαλούμε να ξανασυνδεθείτε μόλις τον λάβετε.',
+
+'eauthentsent' => 'Ένα μήνυμα επαλήθευσης έχει σταλεί στην ηλεκτρονική διεύθυνση που έχετε δηλώσει στο σύστημα. Πριν αρχίσει η αποστολή μηνυμάτων στη συγκεκριμένη διεύθυνση, πρέπει να ακολουθήσετε τις οδηγίες που βρίσκονται στο μήνυμα που σας έχει σταλεί για να επαληθεύσετε ότι η συγκεκριμένη ηλεκτρονική διεύθυνση ανήκει πραγματικά σε εσάς. ',
+
+'loginend' => '&nbsp;',
+'mailerror' => 'Λάθος στην αποστολή του μηνύματος: $1',
+'acct_creation_throttle_hit' => 'Λυπούμαστε, έχετε ήδη δημιουργήσει $1 λογαριασμούς και δεν μπορείτε να δημιουργήσετε άλλους.',
+'emailauthenticated' => 'Η ηλεκτρονική σας διεύθυνση επιβεβαιώθηκε στις $1.',
+
+'emailnotauthenticated' => 'Η ηλεκτρονική σας διεύθυνση δεν έχει επαληθευθεί ακόμα. Μέχρι να ολοκληρώσετε την επαλήθευση της διεύθυνσής σας, δεν είναι δυνατόν το σύστημα να σας αποστείλει αλληλογραφία για καμμία από τις ακόλουθες λειτορυγίες.',
+
+'noemailprefs' => '<strong>Δεν έχει ορισθεί ηλεκτρονική διέυθυνση</strong>, οι λειτουργίες που ακολουθούν δεν θα είναι δυνατόν να ολοκληρωθούν.',
+'emailconfirmlink' => 'Επαληθεύστε την ηλεκτρονική σας διεύθυνση',
+'invalidemailaddress' => 'Η ηλεκτρονική διεύθυνση δεν έγινε δεκτή γιατί ενδεχομένως δεν είχε έγκυρη μορφή. Παρακαλούμε συμπληρώστε μια σωστά διαμορφωμένη διεύθυνση ή αφήστε το πεδίο κενό.',
+
+
+# Edit page toolbar
+#----------------------------#
+'bold_sample' => 'Έντονο κείμενο',
+'bold_tip' => 'Έντονο κείμενο',
+
+'italic_sample' => 'Κείμενο με πλάγιους χαρακτήρες',
+'italic_tip' => 'Κείμενο με πλάγιους χαρακτήρες',
+
+'link_sample' => 'Τίτλος συνδέσμου',
+'link_tip' => 'Εσωτερικός σύνδεσμος',
+
+'extlink_sample' => 'http://www.paradeigma.com τίτλος συνδέσμου',
+'extlink_tip' => 'Εξωτερικός σύνδεσμος (μην ξεχάστε το πρόθεμα http:// )',
+
+'headline_sample' => 'Κείμενο τίτλου',
+'headline_tip' => 'Δεύτερος τίτλος (επίπεδο 2)',
+
+'math_sample' => 'Εισαγωγή τύπου εδώ',
+'math_tip' => 'Μαθηματικός τύπος (LaTeX)',
+
+'nowiki_sample' => 'Εισάγετε εδώ το μη μορφοποιημένο κείμενο.',
+'nowiki_tip' => 'Να αγνοηθεί η μορφοποίηση Wiki.',
+
+'image_sample' => 'paradeigma.jpg',
+'image_tip' => 'Ενσωματωμένη εικόνα',
+
+'media_sample' => 'paradeigma.mp3',
+'media_tip' => 'Σύνδεσμος αρχείου πολυμέσων',
+
+'sig_tip' => 'Υπογραφή με ημερομηνία',
+'hr_tip' => 'Οριζόντια γραμμή (να χρησιμοποιείται με μέτρο!)',
+
+'infobox' => 'Πατήσετε κάποιο κουμπί για να δείτε ένα παράδειγμα κειμένου',
+# alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror
+'infobox_alert' => 'Παρακαλούμε εισάγετε το κείμενο που θέλετε να μορφοποιήσετε.
+ Θα εμφανιστεί στο πλαίσιο για αντιγραφή και επικόλληση.
+Παράδειγμα:
+Το $1
+θα γίνει:
+$2',
+
+
+# Edit pages
+#-----------------#
+'summary' => 'Σύνοψη',
+'subject' => 'Θέμα/επικεφαλίδα',
+'minoredit' => 'Αλλαγή μικρής κλίμακας',
+'watchthis' => 'Παρακολούθηση αυτής της σελίδας',
+'savearticle' => 'Αποθήκευση σελίδας',
+'preview' => 'Προεπισκόπηση',
+'showpreview' => 'Προεπισκόπηση',
+'showdiff' => 'Δείτε τις αλλαγές',
+'blockedtitle' => 'Ο χρήστης έχει υποστεί φραγή.',
+
+'blockedtext' => 'Το όνομα χρήστη ή η διεύθυνση IP σας έχει υποστεί φραγή από τον/την $1 με την αιτιολογία :<br />\'\'$2\'\'<p> Μπορείτε να απευθυνθείτε στον/στην $1 ή σε κάποιον άλλον από τους [[{{ns:4}}:Διαχειριστές |διαχειριστές]] για να συζητήσετε το πρόβλημα.
+
+Έχετε υπ\' όψη σας ότι δεν μπορείτε να χρησιμοποιήσετε τη δυνατότητα "αποστολή e-mail σε χρήστη" εκτός αν έχετε μια έγκυρη διεύθυνση e-mail δηλωμένη στις [[Special:Preferences|Προτιμήσεις χρήστη]].
+
+<br>
+<br>Η διεύθυνση IP σας είναι: $3. Παρακαλούμε να την αναφέρετε σε κάθε σας αίτημα.',
+
+'whitelistedittitle' => 'Για να επεξεργαστείτε μια σελίδα πρέπει πρώτα να συνδεθείτε.',
+'whitelistedittext' => 'Πρέπει να [[Special:Userlogin|συνδεθείτε]] για να επεξεργαστείτε μια σελίδα.',
+'whitelistreadtitle' => 'Για να διαβάσετε πρέπει πρώτα να συνδεθείτε.',
+'whitelistreadtext' => 'Πρέπει να [[Special:Userlogin|συνδεθείτε]] για να διαβάσετε σελίδες.',
+'whitelistacctitle' => 'Δεν έχετε το δικαίωμα να δημιουργήσετε λογαριασμό.',
+'whitelistacctext' => 'Για να σας επιτραπεί η δημιουργία λογαριασμού σε αυτό το Wiki πρέπει να [[Special:Userlogin|συνδεθείτε]] και να κατέχετε την κατάλληλη άδεια.',
+'loginreqtitle' => 'Απαιτείται η σύνδεση του χρήστη.',
+'loginreqtext' => 'Πρέπει να [[Special:Userlogin|συνδεθείτε]] για να δείτε άλλες σελίδες.',
+'accmailtitle' => 'Ο κωδικός έχει σταλεί.',
+'accmailtext' => 'Ο κωδικός για τον/την \'$1\' έχει σταλεί στο $2.',
+'newarticle' => '(Νέο)',
+
+'newarticletext' => 'Έχετε ακολουθήσει ένα σύνδεσμο που δεν υπάρχει ακόμα. Για να δημιουργήσετε μια νέα σελίδα εδώ, αρχίστε να γράφετε το κείμενό σας στο πλαίσιο.(Βλ. [[{{ns:12}}:Περιεχόμενα|Σελίδα βοήθειας]] για περισσότερες πληροφορίες).
+Αν έχετε βρεθεί εδώ κατά λάθος, απλώς πατήστε \'\'\'επιστροφή (back)\'\'\' στον browser του υπολογιστή σας.',
+
+#'talkpagetext' => '<!-- MediaWiki:talkpagetext -->',
+
+'anontalkpagetext' => '----\'\'Αυτή η σελίδα συζήτησης προορίζεται για ανώνυμους χρήστες που δεν έχουν δημιουργήσει ακόμα λογαριασμό (ή που δεν τον χρησιμοποιούν). Έτσι για την ταυτοποίηση ενός ανώνυμου χρήστη χρησιμοποιείται η [[{{ns:12}}:διεύθυνση IP  |διεύθυνση IP ]] του. Είναι όμως πιθανόν η διεύθυνση αυτή να είναι κοινή για πολλούς διαφορετικούς χρήστες (όπως π.χ. για τους χρήστες ενός Internet Cafe ή ενός [[{{ns:12}}:proxy server|proxy server]]). Αν είστε ανώνυμος χρήστης και έχετε δεχθεί σχόλια άσχετα με τα θέματά σας (κάτι που μπορεί να συμβεί αν χρησιμοποιείτε την ίδια [[{{ns:12}}:διεύθυνση IP|διεύθυνση IP]] με κάποιον άλλο ανώνυμο χρήστη) θα ήταν καλό να [[Special:Userlogin|δημιουργήσετε ένα λογαριασμό χρήστη ή να συνδεθείτε]] για να αποφεύγεται η σύγχυση\'\'.',
+
+'noarticletext' => '(Δεν υπάρχει κείμενο στη σελίδα)',
+
+'clearyourcache' => '\'\'\'Σημείωση:\'\'\' Μετά την αποθήκευση, θα χρειαστεί να καθαρίσετε  το cache στον browser για να μπορέσετε να δείτε τις αλλαγές: \'\'\'Mozilla:\'\'\' click \'\'Reload\'\' (or \'\'Ctrl-R\'\'), \'\'\'IE / Opera:\'\'\' \'\'Ctrl-F5\'\', \'\'\'Safari:\'\'\' \'\'Cmd-R\'\', \'\'\'Konqueror\'\'\' \'\'Ctrl-R\'\'.<br/>',
+
+'usercssjsyoucanpreview' => '<strong>Χρήσιμη συμβουλή:</strong> Χρησιμοποιήστε το κουμπί "Προεπισκόπηση" για να ελέγξτε τα νέα σας CSS/JS πριν τα αποθηκεύσετε.',
+'usercsspreview' => '\'\'\'Σας υπενθυμίζουμε ότι κάνετε απλώς έλεγχο/προεπισκόπηση του CSS του χρήστη -δεν το έχετε ακόμα αποθηκεύσει! \'\'\'',
+'userjspreview' => '\'\'\'Σας υπενθυμίζουμε ότι κάνετε απλώς έλεγχο/προεπισκόπηση του JavaScript του χρήστη -δεν το έχετε ακόμα αποθηκεύσει!\'\'\'',
+'updated' => '(Ενημερώθηκε.)',
+'note' => '<strong>Προσοχή: </strong>',
+'previewnote' => 'Σας υπενθυμίζουμε ότι βλέπετε μόνον την προεπισκόπηση -δεν έχετε ακόμα αποθηκεύσει τις αλλαγές σας!',
+'previewconflict' => 'Αυτή η προεπισκόπηση απεικονίζει το κείμενο στην επάνω περιοχή επεξεργασίας κειμένου, όπως θα εμφανιστεί εάν επιλέξετε να το αποθηκεύσετε.',
+'editing' => 'Επεξεργασία $1',
+'editingsection' => 'Επεξεργασία $1 (τμήμα)',
+'editingcomment' => 'Επεξεργασία $1 (σχόλια)',
+'editconflict' => 'Ανταγωνιστικές επεξεργασίες: $1',
+
+'explainconflict' => 'Κάποιος άλλος χρήστης έχει αλλάξει αυτή τη σελίδα από τότε που αρχίσατε να την επεξεργάζεστε. Στο επάνω τμήμα βρίσκεται το τρέχον κείμενο της σελίδας. Οι δικές σας αλλαγές εμφανίζονται στο κάτω τμήμα. Θα πρέπει να ενσωματώσετε εσείς τις αλλαγές σας στο τρέχον κείμενο. <b>Μόνον</b> το επάνω τμήμα θα αποθηκευθεί όταν πατήσετε "Αποθήκευση σελίδας".<p>',
+
+'yourtext' => 'Το κείμενό σας',
+'storedversion' => 'Αποθηκευμένη έκδοση',
+
+'nonunicodebrowser' => '<strong>ΠΡΟΣΟΧΗ! Ο browser σας δεν είναι συμβατός με unicode. Παρακαλούμε χρησιμοποιήστε έναν άλλο browser για επεξεργαστείστε αυτό το άρθρο έτσι ώστε να αποδοθούν σωστά όλοι οι ελληνικοί χαρακτήρες. </strong><br/>',
+
+'editingold' => '<strong>ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Επεξεργάζεστε μια παλιότερη αναθεώρηση αυτής της σελίδας. Αν προσπαθείστε να την αποθηκεύσετε, όσες αλλαγές έχουν γίνει πριν από αυτή την αναθεώρηση θα χαθούν.</strong><br/>',
+
+'yourdiff' => 'Διαφορές',
+
+'copyrightwarning' => 'Ολες οι προσθήκες/ αλλαγές στο {{SITENAME}} θα πρέπει να συμφωνούν με την $2 (Βλ. $1 για λεπτομέρειες).
+Αν δεν επιθυμείτε τα κείμενά σας να τα επεξεργαστούν κατά την κρίση τους άλλοι χρήστες και να τα διαδώσουν κατά βούληση παρακαλούμε να μην τα αναρτήσετε σε αυτό το χώρο. Ότι συνεισφέρετε στο χώρο αυτό σε κείμενα, διαγράμματα, στοιχεία ή εικόνες πρέπει να είναι δικά σας έργα ή να ανήκουν στο δημόσιο τομέα (public domain) ή να προέρχονται από ελεύθερες ή ανοιχτές πηγές με ρητή άδεια αναδημοσίευσης. <br />
+
+Τέλος μας υπόσχεστε και δηλώνετε πως ότι γράφετε σε αυτό τον χώρο είναι πρωτότυπο δικό σας έργο και, άσχετα με την έκτασή του, δεν έχει εκχωρηθεί σε τρίτους η δημοσίευση και η εκμετάλλευσή του. 
+<strong>ΠΑΡΑΚΑΛΟΥΜΕ ΝΑ ΜΗΝ ΑΝΑΡΤΗΣΕΤΕ ΚΕΙΜΕΝΑ ΤΡΙΤΩΝ ΕΑΝ ΔΕΝ ΕΧΕΤΕ ΤΗΝ ΑΔΕΙΑ ΤΟΥ ΙΔΙΟΚΤΗΤΗ ΤΟΥ COPYRIGHT!</strong>',
+
+'copyrightwarning2' => 'Έχετε υπ\' όψη σας ότι όλες οι προσθήκες/αλλαγές που κάνετε στο {{SITENAME}} μπορούν να υποστούν επεξεργασία και αλλαγές ή ακόμα και να διαγραφούν από άλλους χρήστες.
+Αν δεν επιθυμείτε τα κείμενά σας να τα επεξεργαστούν κατά την κρίση τους άλλοι χρήστες και να τα διαδώσουν κατά βούληση παρακαλούμε να μην τα αναρτήσετε σε αυτό το χώρο. Ότι συνεισφέρετε στο χώρο αυτό σε κείμενα, διαγράμματα, στοιχεία ή εικόνες πρέπει να είναι δικά σας έργα ή να ανήκουν στο δημόσιο τομέα (public domain) ή να προέρχονται από ελεύθερες ή ανοιχτές πηγές με ρητή άδεια αναδημοσίευσης. <br />
+Τέλος μας υπόσχεστε και δηλώνετε πως ότι γράφετε σε αυτό τον χώρο είναι πρωτότυπο δικό σας έργο και, άσχετα με την έκτασή του, δεν έχει εκχωρηθεί σε τρίτους η δημοσίευση και η εκμετάλλευσή του. 
+<strong>ΠΑΡΑΚΑΛΟΥΜΕ ΝΑ ΜΗΝ ΑΝΑΡΤΗΣΕΤΕ ΚΕΙΜΕΝΑ ΤΡΙΤΩΝ ΕΑΝ ΔΕΝ ΕΧΕΤΕ ΤΗΝ ΑΔΕΙΑ ΤΟΥ ΙΔΙΟΚΤΗΤΗ ΤΟΥ COPYRIGHT!</strong>',
+
+'longpagewarning' => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η σελίδα έχει μέγεθος $1kb. Είναι πιθανόν μερικοί browser να παρουσιάσουν προβλήματα στην επεξεργασία σελίδων της τάξης των 32kb και άνω. Μπορείτε να αποφύγετε το πρόβλημα κόβωντας τη σελίδα σε μικρότερα τμήματα.<br/>',
+
+'readonlywarning' => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η βάση δεδομένων έχει κλειδωθεί προσωρινά για συντήρηση και δεν θα μπορέσετε να αποθηκεύσετε αυτά που έχετε επεξεργαστεί.  Μπορείτε αν θέλετε να αποθηκεύσετε το κείμενο στον υπολογιστή σας (με αποκοπή-και-επικόλληση) και να το ξαναχρησιμοποιήσετε αργότερα όταν η συντήρηση θα έχει ολοκληρωθεί.',
+
+'protectedpagewarning' => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ:  Η σελίδα αυτή έχει κλειδωθεί -η οποιαδήποτε επεξεργασία της μπορεί να γίνει μόνον από διαχειριστές. Βεβαιωθείτε πως ακολουθείτε [[{{ns:4}}:Σελίδες_υπό_προστασία|τους κανόνες για τις υπό προστασία σελίδες]].<br/>',
+
+'templatesused' => 'Πρότυπα που χρησιμοποιήθηκαν στη σελίδα αυτή:',
+
+
+# History pages
+#----------------------#
+'revhistory' => 'Ιστορικό αναθεωρήσεων',
+'nohistory' => 'Δεν υπάρχει ιστορικό επεξεργασίας για αυτή τη σελίδα.',
+'revnotfound' => 'Η αναθεώρηση δεν βρέθηκε.',
+'revnotfoundtext' => 'Η παλιά αναθεώρηση της σελίδας που ζητήσατε δεν ήταν δυνατόν να βρεθεί. Παρακαλούμε ελέγξτε τo URL που χρησιμοποιήσατε για να φτάσετε σε αυτήν τη σελίδα.',
+'loadhist' => 'Φόρτωση ιστορικού σελίδας',
+'currentrev' => 'Τρέχουσα αναθεώρηση',
+'revisionasof' => 'Αναθεώρηση της $1',
+'revisionasofwithlink' => 'Αναθεώρηση της $1; $2<br />$3 | $4',
+'previousrevision' => '&larr;Παλιότερη αναθεώρηση',
+'nextrevision' => 'Νεώτερη αναθεώρηση&rarr;',
+'currentrevisionlink' => 'εμφάνιση της τρέχουσας αναθεώρησης',
+'cur' => 'τρέχουσα',
+'next' => 'επόμενη',
+'last' => 'τελευταία',
+'orig' => '\'πρωτότυπη\'',
+
+'histlegend' => 'Σύγκριση διαφορών: Επιλέξτε τις εκδόσεις που θέλετε να συγκρίνετε και πατήστε enter ή κάντε κλικ στην μπάρα "Σύγκριση...". <br />
+Υπόμνημα: (τρέχον) = διαφορές με την τρέχουσα έκδοση,
+(τελευταίο) = διαφορές με την προηγούμενη έκδοση, μ = αλλαγές μικρής κλίμακας.',
+
+#'history_copyright' => '-',
+'deletedrev' => '[διαγράφτηκε]',
+'histfirst' => 'Η πιο παλιά',
+'histlast' => 'Η πιο πρόσφατη',
+
+
+# Diffs
+#--------#
+'difference' => '(Διαφορές μεταξύ αναθεωρήσεων)',
+'loadingrev' => 'φόρτωση αναθεώρησης για \'σύγκριση\'',
+'lineno' => 'Γραμμή $1:',
+'editcurrent' => 'Επεξεργασία της τρέχουσας έκδοσης της σελίδας',
+'selectnewerversionfordiff' => 'Επιλέξτε μια πιο πρόσφατη έκδοση για σύγκριση.',
+'selectolderversionfordiff' => 'Επιλέξτε μια παλιότερη έκδοση για σύγκριση.',
+'compareselectedversions' => 'Σύγκριση των εκδόσεων που έχουν επιλεγεί',
+
+
+# Search results
+#------------------------#
+'searchresults' => 'Αποτελέσματα αναζήτησης',
+'searchresulttext' => 'Για περισσότερες πληροφορίες σχετικά με την αναζήτηση στο {{SITENAME}}, βλ. [[{{ns:12}}:Αναζήτηση|Αναζήτηση στο {{SITENAME}}]].',
+'searchquery' => 'Κριτήρια αναζήτησης: "$1"',
+'badquery' => 'Λανθασμένη μορφή αιτήματος αναζήτησης',
+
+'badquerytext' => 'Το σύστημα δεν μπόρεσε να επεξεργαστεί το αίτημα σας. Αυτό πιθανόν οφείλεται στο ότι αναζητήσατε μια λέξη με λιγότερα από τρία γράμματα (κάτι που δεν υποστηρίζεται προς το παρόν). Μπορεί επίσης να οφείλεται σε λάθος πληκτρολόγησης π.χ. "Διάλογος και διαλούβευση". Παρακαλoύμε δοκιμάστε πάλι.',
+
+'matchtotals' => 'Το αίτημα "$1" βρήκε $2 παρόμοιους τίτλους σελίδων και παρόμοιο κείμενο σε $3 σελίδες',
+'nogomatch' => 'Δεν υπάρχει καμμία σελίδα με αυτόν ακριβώς τον τίτλο -έγινε αναζήτηση με το πλήρες κείμενο.',
+'titlematches' => 'Τίτλοι άρθρων που ανταποκρίνονται',
+'notitlematches' => 'Δεν υπάρχουν αντίστοιχοι τίτλοι σελίδων.',
+'textmatches' => 'Κείμενα σελίδων που ανταποκρίνονται:',
+'notextmatches' => 'Δεν υπάρχουν αντίστοιχα κείμενα σελίδων.',
+'prevn' => '$1 προηγουμένων',
+'nextn' => '$1 επομένων',
+'viewprevnext' => 'Εμφάνιση ($1) ($2) ($3).',
+'showingresults' => 'Εμφάνιση <b>$1</b> αποτελεσμάτων που αρχίζουν με #<b>$2</b>',
+'showingresultsnum' => 'Εμφάνιση <b>$3</b> αποτελεσμάτων που αρχίζουν με #<b>$2</b>',
+
+'nonefound' => '\'\'\'Σημείωση\'\'\': Οι ανεπιτυχείς αναζητήσεις οφείλονται συνήθως στο ότι έχουμε συμπεριλάβει στα κριτήρια πολύ συνηθισμένες λέξεις, όπως "έχει" ή "από" (που δεν υπάρχουν στο ευρετήριο) ή στο ότι προκαθορίσαμε πολλά κριτήρια αναζήτησης ταυτοχρόνως. (Στην τελευταία περίπτωση, μόνον οι σελίδες που περιέχουν \'\'όλα\'\' τα κριτήρια αναζήτησης θα εμφανιστούν στα αποτελέσματα).<br/>',
+
+'powersearch' => 'Αναζήτηση',
+
+'powersearchtext' => 'Αναζήτηση στις περιοχές :<br />
+
+$1<br />
+$2 Εμφάνιση ανακατευθύνσεων &nbsp; Κριτήρια αναζήτησης $3 $9',
+
+'googlesearch' => '
+<div style="margin-left: 2em">
+
+<!-- Google search -->
+<div style="width:130px;float:left;text-align:center;position:relative;top:-8px"><a href="http://www.google.com/" style="padding:0;background-image:none"><img src="http://www.google.com/logos/Logo_40wht.gif" alt="Google" style="border:none" /></a></div>
+
+<form method="get" action="http://www.google.com/search" style="margin-left:135px">
+  <div>
+    <input type="hidden" name="domains" value="{{SERVER}}" />
+    <input type="hidden" name="num" value="50" />
+
+    <input type="hidden" name="ie" value="$2" />
+    <input type="hidden" name="oe" value="$2" />
+    
+    <input type="text" name="q" size="31" maxlength="255" value="$1" />
+    <input type="submit" name="btnG" value="Google Search" />
+  </div>
+  <div style="font-size:90%">
+    <input type="radio" name="sitesearch" id="gwiki" value="{{SERVER}}" checked="checked" /><label for="gwiki">{{SITENAME}}</label>
+    <input type="radio" name="sitesearch" id="gWWW" value="" /><label for="gWWW">WWW</label>
+
+  </div>
+</form>
+
+</div>',
+'blanknamespace' => '(Αρχική περιοχή)',
+
+
+# Preferences page
+#-----------------------------#
+'preferences' => 'Προτιμήσεις',
+'prefsnologin' => 'Δεν έχετε συνδεθεί.',
+
+'prefsnologintext' => 'Πρέπει να έχετε [[Special:Userlogin|συνδεθεί]]
+για να καθορίσετε τις προτιμήσεις χρήστη.',
+
+'prefslogintext' => 'Έχετε συνδεθεί ως "$1".
+Ο εσωτερικός σας αριθμός ταυτοποίησης (ID) είναι $2.
+
+Στον παρακάτω σύνδεσμο θα βρείτε πληροφορίες για το πώς θα "αποκρυπτογραφήσετε" τις διάφορες επιλογές: 
+[[{{ns:12}}:Προτιμήσεις_Χρηστών]]',
+
+'prefsreset' => 'Οι προτιμήσεις σας έχουν αποκατασταθεί σύμφωνα με την αποθηκευμένη έκδοσή τους.',
+#'qbsettings' => 'Quickbar',
+'changepassword' => 'Αλλαγή κωδικού',
+'skin' => 'Οπτική οργάνωση (skin)',
+'math' => 'Απόδοση μαθηματικών',
+'dateformat' => 'Μορφή ημερομηνίας',
+'math_failure' => 'Δεν μπόρεσε να γίνει ανάλυση του όρου.',
+'math_unknown_error' => 'Άγνωστο λάθος',
+'math_unknown_function' => 'άγνωστη συνάρτηση',
+'math_lexing_error' => 'Σφάλμα στην λεξική ανάλυση',
+'math_syntax_error' => 'Λάθος σύνταξης',
+'math_image_error' => 'Η μετατροπή σε PNG απέτυχε. Παρακαλούμε ελέγξτε ότι έχουν εγκατασταθεί σωστά τα latex, dvips, gs, και ξαναπροσπαθήστε!',
+'math_bad_tmpdir' => 'Δεν είναι δυνατή η δημιουργία μαθηματικών δεδομένων (ή η εγγραφή σε προσωρινό κατάλογο) ',
+'math_bad_output' => 'Δεν είναι δυνατή η δημιουργία  μαθηματικών δεδομένων (ή η εγγραφή σε κατάλογο εξόδου)',
+'math_notexvc' => 'Αγνοείται το εκτελέσιμο texvc -παρακαλούμε συμβουλευτείτε το math/README για να ρυθμίσετε τις παραμέτρους.',
+'prefs-personal' => 'Στοιχεία χρήστη',
+'prefs-rc' => 'Πρόσφατες αλλαγές και εμφάνιση πολύ σύντομων άρθρων',
+'prefs-misc' => 'Διάφορες ρυθμίσεις',
+'saveprefs' => 'Αποθήκευση προτιμήσεων',
+'resetprefs' => 'Επαναφορά προτιμήσεων',
+'oldpassword' => 'Παλιός κωδικός',
+'newpassword' => 'Νέος κωδικός πρόσβασης',
+'retypenew' => 'Πληκτρολογήστε ξανά το νέο κωδικό.',
+'textboxsize' => 'Επεξεργασία',
+'rows' => 'Σειρές',
+'columns' => 'Στήλες',
+'searchresultshead' => 'Αποτελέσματα αναζήτησης/Ρυθμίσεις',
+'resultsperpage' => 'Αποτελέσματα ανά σελίδα',
+'contextlines' => 'Σειρές που θα εμφανίζονται ανά αποτέλεσμα',
+'contextchars' => 'Αριθμός χαρακτήρων στο εμφανιζόμενο κείμενο',
+'stubthreshold' => 'Ελάχιστο μέγεθος πολύ σύντομων σελίδων (stub)',
+'recentchangescount' => 'Αριθμός τίτλων στις πρόσφατες αλλαγές',
+'savedprefs' => 'Οι προτιμήσεις σας έχουν αποθηκευθεί.',
+'timezonelegend' => 'Ζώνη ώρας (Time zone)',
+'timezonetext' => 'Συμπληρώστε τον αριθμό των ωρών κατά τις οποίες η τοπική σας ώρα διαφέρει από την ώρα του server (UTC).',
+'localtime' => 'Εμφάνιση τοπικής ώρας',
+'timezoneoffset' => 'Διαφορά ωρών',
+'servertime' => 'Η ώρα του server είναι:',
+'guesstimezone' => 'Συμπλήρωση μέσω του browser',
+'emailflag' => 'Απενεργοποίηση ηλεκτρονικού ταχυδρομείου από άλλους χρήστες',
+'defaultns' => 'Προκαθορισμένη αναζήτηση στις περιοχές:',
+'default' => 'Προκαθορισμένο',
+'files' => 'Αρχεία',
+
+
+# User levels special page
+#--------------------------------------#
+
+# switching pan
+'groups-lookup-group' => 'Διαχείριση των δικαιωμάτων της ομάδας',
+'groups-group-edit' => 'Υπάρχουσες ομάδες:',
+'editgroup' => 'Ομάδα επεξεργασίας',
+'addgroup' => 'Προσθήκη ομάδας',
+
+'userrights-lookup-user' => 'Διαχείριση ομάδων χρηστών',
+'userrights-user-editname' => 'Δηλώστε όνομα χρήστη:',
+'editusergroup' => 'Επεξεργασία \'Ομάδα Χρηστών\'',
+
+# group editing
+'groups-editgroup' => 'Επεξεργασία ομάδας',
+'groups-addgroup' => 'Προσθήκη ομάδας',
+
+'groups-editgroup-preamble' => 'Εαν το όνομα της περιγραφής αρχίζει με άνω-κάτω τελεία, το υπόλοιπο του ονόματος θα εκληφθεί ως τίτλος μηνύματος και, για το λόγο αυτό, το κείμενο θα χωροθετηθεί με βάση το όνομα της περιοχής MediaWiki',
+
+'groups-editgroup-name' => 'Επωνυμία ομάδας:',
+'groups-editgroup-description' => 'Περιγραφή ομάδας (max 255 χαρακτήρες):<br />',
+'savegroup' => 'Αποθήκευση ομάδας',
+'groups-tableheader' => 'ID || Επωνυμία|| Περιγραφή || Δικαιώματα',
+'groups-existing' => 'Υπάρχουσες ομάδες',
+'groups-noname' => 'Παρακαλούμε δηλώστε μία έγκυρη επωνυμία ομάδας',
+'groups-already-exists' => 'Υπάρχει ήδη ομάδα με αυτό το όνομα',
+'addgrouplogentry' => 'H ομάδα $2 έχει προστεθεί.',
+'changegrouplogentry' => 'Η ομάδα $2 έχει υποστεί αλλαγή.',
+'renamegrouplogentry' => 'Μετονομασία της ομάδας $2 σε $3',
+
+# user groups editing
+#
+'userrights-editusergroup' => 'Επεξεργασία ομάδων χρηστών',
+'saveusergroups' => 'Αποθήκευση ομάδων χρηστών',
+'userrights-groupsmember' => 'Μελος της ομάδας:',
+'userrights-groupsavailable' => 'Υπάρχουσες ομάδες:',
+
+'userrights-groupshelp' => 'Επιλέξτε όμάδες στις οποίες επιθυμείτε να προστεθεί ο χρήστης ή ομάδες από τις οποίες επιθυμείτε να αφαιρεθεί ο χρήστης. Μπορείτε να αναιρέσετε την επιλογή μιας ομάδας με το πλήκτο CTRL + αριστερό κλικ',
+
+'userrights-logcomment' => 'Τα μέλη της ομάδας έχουν αλλάξει $1 σε $2',
+
+
+# Default group names and descriptions
+#-------------------------------------------------------------#
+'group-anon-name' => 'Ανώνυμος',
+'group-anon-desc' => 'Ανώνυμοι χρήστες',
+'group-loggedin-name' => 'Χρήστης',
+'group-loggedin-desc' => 'Γενικοί συνδεδεμένοι χρήστες',
+'group-admin-name' => 'Διαχειριστής',
+'group-admin-desc' => 'Έμπειροι χρήστες έχουν τη δυνατότητα να επιβάλλουν φραγή ή να διαγράφουν άρθρα.',
+'group-bureaucrat-name' => 'Διαχειριστής',
+'group-bureaucrat-desc' => 'Οι διαχειριστές μπορούν να ορίζουν επιπλέον διαχειριστές',
+'group-steward-name' => 'Διαχειριστής',
+'group-steward-desc' => 'Πλήρης πρόσβαση',
+
+
+# Recent changes
+#--------------------------#
+'changes' => 'αλλαγές',
+'recentchanges' => 'Πρόσφατες αλλαγές',
+'recentchanges-url' => 'Special:Recentchanges',
+'recentchangestext' => 'Παρακολουθείστε σε αυτή τη σελίδα τις πιο πρόσφατες αλλαγές στο Wiki.',
+'rcloaderr' => 'Φόρτωση πρόσφατων αλλαγών',
+'rcnote' => 'Ακολουθούν οι <strong>$1</strong> πιο πρόσφατες αλλαγές στο διάστημα των τελευταίων <strong>$2</strong> ημερών.',
+'rcnotefrom' => 'Ακολουθούν οι αλλαγές από <b>$2</b> (εμφάνιση <b>$1</b> αλλαγών max).',
+'rclistfrom' => 'Εμφάνιση νέων αλλαγών αρχίζοντας από $1',
+'showhideminor' => '$1 αλλαγές μικρής κλίμακας | $2 διαχειριστές | $3 συνδεδεμένοι χρήστες | $4 επεξεργασίες υπό παρακολούθηση',
+'rclinks' => 'Εμφάνιση των τελευταίων $1 αλλαγών στο διάστημα των τελευταίων $2 ημερών <br />$3',
+'rchide' => 'σε μορφή $4 : $1 επεξεργασίες μικρής κλίμακας, $2 δευτερεύουσες περιοχές, $3 πολλαπλές επεξεργασίες',
+'rcliu' => '; $1 επεξεργασίες από συνδεδεμένους χρήστες',
+'diff' => '\'διαφορά\'',
+'hist' => '\'ιστορικό\'',
+'hide' => 'απόκρυψη',
+'show' => 'εμφάνιση',
+'tableform' => 'πίνακας',
+'listform' => 'κατάλογος',
+'nchanges' => '$1 αλλαγές',
+'minoreditletter' => 'μ',
+'newpageletter' => 'N',
+#'sectionlink' => '&rarr;',
+'number_of_watching_users_RCview' => '[$1]',
+'number_of_watching_users_pageview' => '[$1 χρήστης (-ες) που παρακολουθούν]',
+
+
+# Upload
+#------------#
+'upload' => 'Φόρτωση αρχείου',
+'uploadbtn' => 'Φόρτωση αρχείου',
+'uploadlink' => 'Φόρτωση εικόνων',
+'reupload' => 'Επανάληψη φόρτωσης',
+'reuploaddesc' => 'Επιστροφή στη φόρμα φόρτωσης',
+'uploadnologin' => 'Δεν έχετε συνδεθεί!',
+'uploadnologintext' => 'Για να φορτώσετε αρχεία πρέπει πρώτα να [[Special:Userlogin|συνδεθείτε]].',
+'upload_directory_read_only' => 'Δεν είναι δυνατή η εγγραφή στον κατάλογο ($1) από τον server.',
+'uploaderror' => 'Σφάλμα στη φόρτωση αρχείου',
+
+'uploadtext' => '\'\'\'ΠΕΡΙΜΕΝΕΤΕ!\'\'\' Πριν προχωρήσετε στη φόρτωση αρχείων σε αυτό το χώρο βεβαιωθείτε πως διαβάσατε και πως ακολουθείτε τους [[{{ns:4}}:Κανόνες_χρήσης_εικόνων|Κανόνες χρήσης εικόνων]].
+
+Μπορείτε να δείτε ή να αναζητήσετε εικόνες που έχουν φορτωθεί κατά το παρελθόν κάτω από το σύνδεσμο [[Special:Imagelist|Κατάλογος εικόνων που έχουν φορτωθεί]].
+Οι φορτώσεις και οι διαγραφές έχουν καταγραφεί στη σελίδα
+[[{{ns:4}}:Καταγραφές_φόρτωσης|Καταγραφές φόρτωσης]].
+
+Χρησιμοποιήστε την παρακάτω φόρμα για να φορτώσετε νέα αρχεία εικόνας που θα χρησιμοποιηθούν στον οπτικό εμπλουτισμό των σελίδων. Στους περισσότερους browsers υπάρχει ένα κουμπί "Browse..." το οποίο εμφανίζει το πεδίο διαλόγου του συστήματός σας για το άνοιγμα αρχείων. Αν επιλέξετε ένα αρχείο, το όνομά τoυ θα συμπληρωθέι αυτόματα στο πεδίο κειμένου που βρίσκεται δίπλα στο κουμπί. Μην ξεχάστε να επιβεβαιώσετε (σημειώνοντας το ανάλογο κουτάκι) πως με τη φόρτωση του συγκεκριμένου αρχείου δεν παραβιάζετε πνευματικά δικαιώματα.
+
+Πατήστε το κουμπί "Upload" για να ολοκληρωθέι η φόρτωση.
+Η διαδικασία μπορεί να διαρκέσει λίγο περισσότερο αν διαθέτετε αργή σύνδεση με το internet.
+
+Οι προτιμώμενες μορφές αρχείου είναι: JPEG για φωτογραφίες, PNG για σχήματα και άλλες εικόνες και OGG για αρχεία ήχου. Δώστε περιγραφικά ονόματα στα αρχεία σας για να αποφευχθεί τυχόν σύγχυση.
+
+Για να συμπεριληφθεί μια εικόνα σε μια σελίδα, χρησιμοποιήστε συνδέσμους της μορφής
+\'\'\'<nowiki>[[{{ns:6}}:file.jpg]]</nowiki>\'\'\' ή
+\'\'\'<nowiki>[[{{ns:6}}:file.png|alt text]]</nowiki>\'\'\' ή
+\'\'\'<nowiki>[[{{ns:-2}}:file.ogg]]</nowiki>\'\'\' για αρχεία ήχου.
+
+Σας παρακαλούμε να λάβετε υπ΄όψη σας ότι, ακριβώς όπως συμβαίνει με τις σελίδες Wiki, είναι δυνατόν άλλοι χρήστες να επεξεργαστούν ή να διαγράψουν κατά την κρίση τους αρχεία που έχετε φορτώσει. Έχετε επίσης υπ΄όψη σας πως είναι δυνατόν να υποστείτε φραγή σαν χρήστης αν διαπιστωθεί πως έχετε κάνει κατάχρηση του συστήματος.<br/>',
+
+'uploadlog' => 'Φόρτωση αρχείου γεγονότων',
+'uploadlogpage' => 'Καταγραφές φόρτωσης',
+'uploadlogpagetext' => 'Ακολουθεί κατάλογος των αρχείων που έχουν φορτωθεί πρόσφατα.',
+'filename' => 'Όνομα αρχείου',
+'filedesc' => 'Σύνοψη',
+'filestatus' => 'Κατάσταση του copyright',
+'filesource' => 'Πηγή',
+'copyrightpage' => '{{ns:12}}:Copyrights',
+'copyrightpagename' => '{{SITENAME}} copyright',
+'uploadedfiles' => 'Αρχεία που έχουν φορτωθεί',
+'ignorewarning' => 'Αγνόηση της προειδοποίησης. Αποθήκευση αρχείου.',
+'minlength' => 'Τα ονόματα εικόνων δεν πρέπει να περιέχουν λιγότερους από τρεις χαρακτήρες.',
+'illegalfilename' => 'Το όνομα του αρχείου "$1" περιέχει χαρακτήρες που δεν επιτρέπονται στους τίτλους των σελίδων. Παρακαλούμε δώστε άλλο όνομα στο αρχείο και προσπαθήστε ξανά να το ανεβάσετε.',
+'badfilename' => 'Το όνομα της εικόνας άλλαξε σε "$1".',
+'badfiletype' => 'Το ".$1" δεν είναι προτεινόμενος τύπος εικόνας.',
+'largefile' => 'Συνιστούμε οι εικόνες να μην υπερβαίνουν σε μέγεθος τα 100k .',
+
+'emptyfile' => 'Το αρχείο που φορτώσατε φαίνεται να είναι κενό. Αυτό μπορεί να οφείλεται σε λάθος πληκτρολόγησης του ονόματος του αρχείου. Παρακαλούμε ελέγξτε εαν αυτό είναι πραγματικά το αρχείο που θέλετε να φορτώσετε.',
+
+'fileexists' => 'Υπάρχει ήδη αρχείο με αυτό το όνομα -παρακαλούμε ελέγξτε στο $1. Είστε βέβαιος (-η) πως θέλετε να αλλάξετε το όνομα του αρχείου;',
+'successfulupload' => 'Επιτυχής φόρτωση',
+
+'fileuploaded' => 'Το αρχείο $1 φορτώθηκε επιτυχώς!
+Παρακαλούμε ακολουθήστε το σύνδεσμο: $2 προς τη σελίδα της περιγραφής και συμπληρώστε πληροφορίες σχετικές με το αρχείο, όπως το από πού προήλθε, πότε δημιουργήθηκε και από ποιόν, και οτιδήποτε άλλο γνωρίζετε σχετικά με αυτό. Αν πρόκειται για εικόνα μπορείτε να την ενθέσετε με τον εξής τρόπο: <tt><nowiki>[[{{ns:6}}:$1|thumb|Description]]</nowiki></tt>',
+
+'uploadwarning' => 'Προειδοιποίηση φόρτωσης',
+'savefile' => 'Αποθήκευση αρχείου',
+'uploadedimage' => 'Η φόρτωση του "$1" ολοκληρώθηκε.',
+'uploaddisabled' => 'Λυπούμαστε, η φόρτωση έχει απενεργοποιηθεί.',
+'uploadscripted' => 'Αυτό το αρχείο περιέχει κώδικα HTML ή script που μπορεί να παρερμηνευθεί από μερικούς browser.',
+'uploadcorrupt' => 'Το αρχείο είναι κατεστραμένο ή έχει κάποια λανθασμένη επέκταση. Παρακαλούμε ελέγξτε το και ξαναδοκιμάστε να το ανεβάσετε.',
+'uploadvirus' => 'Το αρχείο περιέχει ιό! Λεπτομέρειες: $1',
+'sourcefilename' => 'Όνομα πηγαίου αρχείου',
+'destfilename' => 'Όνομα αρχείου προορισμού',
+
+
+# Image list
+#----------------#
+'imagelist' => 'Κατάλογος εικόνων',
+'imagelisttext' => 'Ακολουθεί κατάλογος $1 εικόνων ταξινομημένων κατά σειρά $2.',
+'getimagelist' => 'Προσκόμιση καταλόγου εικόνων',
+'ilsubmit' => 'Αναζήτηση',
+'showlast' => 'Εμφάνιση των $1 πιο πρόσφατων εικόνων κατά σειρά $2.',
+'byname' => 'ονόματος',
+'bydate' => 'ημερομηνίας',
+'bysize' => 'μεγέθους',
+'imgdelete' => '\'διαγραφή\'',
+'imgdesc' => '\'περιγραφή\'',
+'imglegend' => 'Υπόμνημα: (\'περιγραφή\') = εμφάνιση/επεξεργασία της περιγραφής εικόνας',
+'imghistory' => 'Ιστορικό εικόνας',
+'revertimg' => '\'επαναφορά\'',
+'deleteimg' => '\'διαγραφή\'',
+'deleteimgcompletely' => 'Διαγραφή όλων των αναθεωρήσεων',
+
+'imghistlegend' => 'Υπόμνημα: (\'τρέχον\') = αυτή είναι η τρέχουσα εικόνα, (\'διαγραφή\') = διαγραφή αυτής της παλιότερης έκδοσης, (\'επαναφορά\') = επαναφορά σε αυτή την παλιότερη έκδοση
+
+<br /><i>Κάνοντας κλικ στην ημερομηνία θα δείτε την εικόνα που φορτώθηκε εκείνη την ημέρα</i>.',
+
+'imagelinks' => 'Σύνδεσμοι εικόνων',
+'linkstoimage' => 'Οι ακόλουθες σελίδες συνδέονται με αυτή την εικόνα:',
+'nolinkstoimage' => 'Δεν υπάρχουν σελίδες που συνδέονται με αυτήν την εικόνα.',
+'sharedupload' => 'Το αρχείο αυτό φορτώθηκε για κοινή χρήση και είναι δυνατόν να χρησιμοποιείται ταυτοχρόνως σε περισσότερα από ένα έργα.',
+'shareduploadwiki' => 'Παρακαλούμε συμβουλευθείτε την [$1 σελίδα περιγραφής αρχείου] για περισσότερες πληροφορίες.',
+#'shareddescriptionfollows' => '-',
+'noimage' => 'Δεν υπάρχει αρχείο με αυτό το όνομα, μπορείτε να [$1 το φορτώσετε].',
+'uploadnewversion' => '[$1 Φορτώστε μια νέα έκδοση αυτού του αρχείου]',
+
+
+# Statistics
+#---------------#
+'statistics' => 'Στατιστικές',
+'sitestats' => 'Στατιστικές ιστοχώρου',
+'userstats' => 'Στατιστικές χρηστών',
+
+'sitestatstext' => 'Υπάρχουν συνολικά \'\'\'$1\'\'\' σελίδες στη βάση δεδομένων. Σε αυτές συμπεριλαμβάνονται και οι σελίδες "συζήτησης", σελίδες σχετικά με το {{SITENAME}}, σελίδες με πολύ σύντομο κείμενο (stub), ανακατευθύνσεις, και άλλες που πιθανόν να μην χαρακτηρίζονται σελίδες-με- κείμενο (ή περιεχόμενο).
+Επιπλέον υπάρχουν και \'\'\'$2\'\'\' άλλες σελίδες που πληρούν τα κριτήρια και χαρακτηρίζονται, επίσης, σελίδες περιεχομένου.
+
+Από τη στιγμή που δημιουργήθηκε αυτό το Wiki έχουν καταγραφεί \'\'\'$3\'\'\' επισκέψεις σε σελίδες και \'\'\'$4\'\'\' επεξεργασίες σε σελίδες.
+Ο μέσος όρος κατά την τελευταία ενημέρωση ήταν \'\'\'$5\'\'\' επεξεργασίες ανά σελίδα και \'\'\'$6\'\'\' επισκέψεις ανά επεξεργασία.',
+
+'userstatstext' => 'Υπάρχουν \'\'\'$1\'\'\' εγγεγραμένοι χρήστες.
+\'\'\'$2\'\'\' από αυτούς είναι διαχειριστές (βλ. $3 | διαχειριστές).',
+
+
+# Maintenance Page
+#-----------------------------#
+'maintenance' => 'Σελίδα συντήρησης',
+
+'maintnancepagetext' => 'Η σελίδα αυτή περιέχει διάφορα εύχρηστα εργαλεία για την καθημερινή συντήρηση. 
+
+Μερικές από τις λειτουργίες αυτές είναι δυνατόν να καταπονήσουν τη βάση δεδομένων, για το λόγο αυτό σας παρακαλούμε να κάνετε \'επαναφόρτωση\' μετά από κάθε στοιχείο που έχετε επιδιορθώσει;-)',
+
+'maintenancebacklink' => 'Επιστροφή στη σελίδα συντήρησης',
+'disambiguations' => 'Σελίδες αποσαφήνισης',
+'disambiguationspage' => '{{ns:4}}:Σύνδεσμοι_προς_τις_σελίδες_αποσαφήνισης',
+
+'disambiguationstext' => 'Οι σελίδες που ακολουθούν συνδέονται με μια <i>σελίδα αποσαφήνισης</i> ενώ θα έπρεπε κανονικά να συνδέονται με το αντίστοιχο θέμα.<br />Μια σελίδα θεωρείται σελίδα αποσαφήνισης όταν συνδέεται μέσω της $1.<br />Σύνδεσμοι μέσα από άλλες περιοχές <i>δεν</i> περιλαμβάνονται σε αυτό τον κατάλογο.',
+
+'doubleredirects' => 'Διπλές ανακατευθύνσεις',
+
+'doubleredirectstext' => 'Κάθε σειρά περιέχει συνδέσμους προς την πρώτη και τη δεύτερη σελίδα ανακατεύθυνσης, όπως επίσης και την πρώτη αράδα του κειμένου στη δεύτερη σελίδα ανακατεύθυνσης η οποία και είναι, κανονικά, ο πραγματικός προορισμός της ανακατεύθυνσης -εκεί δηλαδή όπου θα έπρεπε να είχατε οδηγηθεί από την αρχή.',
+
+'brokenredirects' => 'Κατεστραμένες ανακατευθύνσεις',
+'brokenredirectstext' => 'Οι παρακάτω ανακατευθύνσεις οδηγούν σε σελίδες που δεν υπάρχουν.',
+'selflinks' => 'Σελίδες με αυτο-συνδέσμους',
+'selflinkstext' => 'Οι εξής σελίδες έχουν σύνδεσμο προς τον εαυτό τους -αυτό δεν θα έπρεπε να συμβαίνει.',
+'mispeelings' => 'Σελίδες με ορθογραφικά λάθη',
+'mispeelingstext' => 'Οι παρακάτω σελίδες περιέχουν συνηθισμένα ορθογραφικά λάθη, τα οποία βρίσκονται συγκεντρωμένα στο $1. Η σωστή ορθογραφία πρέπει να τοποθετείται (εντός παρενθέσεων).',
+'mispeelingspage' => 'Κατάλογος συνηθισμένων ορθογραφικών λαθών',
+'missinglanguagelinks' => 'Αγνοούμενοι σύνδεσμοι γλώσσας',
+'missinglanguagelinksbutton' => 'Εύρεση αγνοουμένων συνδέσμων γλώσσας για',
+'missinglanguagelinkstext' => 'Αυτές οι σελίδες <i>δεν</i> συνδέονται με τις ομόλογές τους στο $1. Οι ανακατευθύνσεις και οι υποσελίδες <i>δεν</i> εμφανίζονται.',
+
+# Miscellaneous special pages
+#
+'orphans' => 'Ορφανές σελίδες',
+'geo' => 'Γεωγραφικές συντεταγμένες',
+'validate' => 'Επικύρωση σελίδας',
+'lonelypages' => 'Ορφανές σελίδες',
+'uncategorizedpages' => 'Αταξινόμητες σελίδες',
+'uncategorizedcategories' => 'Αταξινόμητες κατηγορίες',
+'unusedcategories' => 'Κενές κατηγορίες',
+'unusedimages' => 'Αχρησιμοποίητες εικόνες',
+'popularpages' => 'Δημοφιλείς σελίδες',
+'nviews' => '$1 επισκέψεις',
+'wantedpages' => 'Σελίδες σε ζήτηση',
+'mostlinked'	=> 'Οι σελίδες με τις περισσότερες αναφορές',
+'nlinks' => '$1 σύνδεσμοι',
+'allpages' => 'Όλες οι σελίδες',
+'randompage' => 'Σελίδα στην τύχη',
+'randompage-url' => 'Special:Randompage',
+'shortpages' => 'Σύντομες σελίδες',
+'longpages' => 'Εκτενείς σελίδες',
+'deadendpages' => 'Αδιέξοδες σελίδες',
+'listusers' => 'Κατάλογος χρηστών',
+'specialpages' => 'Σελίδες λειτουργιών',
+'spheading' => 'Σελίδες λειτουργιών για όλους τους χρήστες',
+'restrictedpheading' => 'Ειδικές σελίδες με περιορισμούς πρόσβασης',
+'blockpheading' => 'Διαβαθμίσεις φραγής',
+'createaccountpheading' => 'διαβάθμιση \'δημιουργίας λογαριασμού\'',
+'deletepheading' => 'Διαβαθμίσεις διαγραφής',
+'userrightspheading' => 'Διαβαθμίσεις δικαιωμάτων χρηστών',
+'grouprightspheading' => 'Διαβάθμιση δικαιωμάτων ομάδας',
+'siteadminpheading' => 'Διαβαθμίσεις διαχείρισης ιστοχώρου',
+/** obsoletes
+'sysopspheading' => 'Μόνον για χρήση των διαχειριστών',
+'developerspheading' => 'Μόνον για χρήση των προγραμματιστών',
+*/
+'protectpage' => 'Προστασία σελίδας',
+'recentchangeslinked' => 'Σχετικές αλλαγές',
+'rclsub' => '(σε σελίδες που συνδέονται από το "$1")',
+'debug' => 'Διόρθωση σφαλμάτων',
+'newpages' => 'Νέες σελίδες',
+'ancientpages' => 'Οι παλιότερες σελίδες',
+'intl' => 'Διαγλωσσικοί σύνδεσμοι',
+'move' => 'Μετακίνηση',
+'movethispage' => 'Μετακίνηση αυτής της σελίδας',
+
+'unusedimagestext' => '<p>Παρακαλούμε να λάβετε υπ` όψη σας πως άλλες ιστοσελίδες είναι δυνατόν να  συνδέονται με μια εικόνα με απευθείας URL - για το λόγο αυτό μπορεί μερικές εικόνες να εμφανίζονται ακόμα εδώ παρόλο που στην πραγματικότητα είναι σε χρήση.</p>',
+
+'unusedcategoriestext' => 'Οι ακόλουθες κατηγοριοποιημένες σελίδες δεν συνδέονται με άλλο άρθρο ή κατηγορία.',
+'booksources' => 'Πηγές βιβλίων',
+'categoriespagetext' => 'Υπάρχουν οι ακόλουθες κατηγορίες στο Wiκi.',
+'data' => 'Δεδομένα',
+'userrights' => 'Διαχείριση δικαιωμάτων χρηστών',
+'groups' => 'Ομάδες χρηστών',
+
+'booksourcetext' => 'Ακολουθούν σύνδεσμοι για διαδικτυακούς τόπους που εμπορεύονται καινούργια ή μεταχειρισμένα βιβλία και όπου μπορείτε να αναζητήσετε τα βιβλία που σας ενδιαφέρουν. Το {{SITENAME}} δεν έχει σχέση με αυτές τις επιχειρήσεις και ο κατάλογος αυτός δεν αποτελεί κατά κανένα τρόπο προώθηση ή διαφήμισή τους.',
+
+'isbn' => 'ISBN',
+'rfcurl' => 'http://www.faqs.org/rfcs/rfc$1.html',
+#'pubmedurl' => 'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1',
+'alphaindexline' => '$1 έως $2',
+'version' => 'Έκδοση',
+'log' => 'Καταγραφές γεγονότων',
+
+'alllogstext' => 'Εποπτική εμφάνιση όλων των ενεργειών φόρτωσης αρχείων, διαγραφής, προστασίας, φραγής και όλων των καταγραφών των διαχειριστών στο αρχείο γεγονότων. Μπορείτε να περιορίσετε τα αποτελέσματα που εμφανίζονται επιλέγοντας συγκεκριμένο είδος γεγονότων, όνομα χρήστη ή τη σελίδα που επηρεάστηκε.',
+
+
+# Special:Allpages
+#--------------------------#
+'nextpage' => 'Επόμενη σελίδα ($1)',
+'allpagesfrom' => 'Εμφάνιση όλων των σελίδων που αρχίζουν στο:',
+'allarticles' => 'Όλα τα άρθρα',
+'allnonarticles' => 'Όλα τα μη-άρθρα',
+'allinnamespace' => 'Όλες οι σελίδες (στην περιοχή $1)',
+'allnotinnamespace' => 'Όλες οι σελίδες (που δεν βρίσκονται στην περιοχή $1)',
+'allpagesprev' => 'Προηγούμενες',
+'allpagesnext' => 'Επόμενες',
+'allpagessubmit' => 'Μετάβαση',
+
+
+# E this user
+#-----------------#
+'mailnologin' => 'Δεν υπάρχει διεύθυνση παραλήπτη.',
+
+'mailnologintext' => 'Πρέπει να έχετε [[Special:Userlogin|συνδεθεί]] και να έχετε δηλώσει
+μια έγκυρη ηλεκτρονική διεύθυνση στις [[Special:Preferences|Προτιμήσεις]]
+για να στείλετε e-mail σε άλλους χρήστες.',
+
+'emailuser' => 'Στείλτε e-mail σε αυτόν το χρήστη',
+'emailpage' => 'Αποστολή e-mail σε χρήστη',
+
+'emailpagetext' => 'Συπληρώνοντας την παρακάτω φόρμα θα στείλετε ένα μήνυμα εφόσον ο παραλήπτης έχει δηλώσει μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου στις \'προτιμήσεις χρήστη\'. Η διεύθυνση ηλεκτρονικού ταχυδρομείου που έχετε δηλώσει στις δικές σας \'προτιμήσεις χρήστη\' θα εμφανιστεί ως διεύθυνση αποστολέα του μηνύματος, ούτως ώστε ο παραλήπτης να μπορέσει να σας απαντήσει.',
+
+'usermailererror' => 'Σφάλμα ηλεκτρονικού ταχυδρομείου:',
+'defemailsubject' => 'Ηλεκτρονικό ταχυδρομείο {{SITENAME}}',
+'noemailtitle' => 'Δεν υπάρχει ηλεκτρονική διεύθυνση.',
+'noemailtext' => 'Ο χρήστης αυτός δεν έχει δηλώσει την ηλεκτρονική του διέθυνση ή έχει επιλέξει να μην δέχεται μηνύματα από άλλους χρήστες.',
+'emailfrom' => 'Αποστολέας',
+'emailto' => 'Προς',
+'emailsubject' => 'Θέμα',
+'emailmessage' => 'Μήνυμα',
+'emailsend' => 'Αποστολή',
+'emailsent' => 'Το μήνυμα έχει σταλεί',
+'emailsenttext' => 'Το μήνυμά σας έχει σταλεί.',
+
+
+# Watchlist
+#---------------#
+'watchlist' => 'Λίστα παρακολούθησης',
+'watchlistsub' => '(για το χρήστη "$1")',
+'nowatchlist' => 'Δεν υπάρχουν εγγραφές στη λίστα παρακολούθησης.',
+'watchnologin' => 'Δεν έχετε συνδεθεί.',
+'watchnologintext' => 'Για να κάνετε αλλαγές στη λίστα παρακολούθησης πρέπει να <a href="{{localurl:Special:Userlogin}}"> συνδεθείτε </a>.',
+'addedwatch' => 'Η σελίδα έχει προστεθεί στη λίστα παρακολούθησης.',
+
+'addedwatchtext' => 'Η σελίδα "$1" έχει προστεθεί στη [[Special:Watchlist|λίστα παρακολούθησης]].
+Μελλοντικές αλλαγές στη σελίδα καθώς και στη σχετική με τη σελίδα συζήτηση θα φαίνονται \'\'\'με έντονα γράμματα\'\'\' στη [[Special:Recentchanges|λίστα πρόσφατων αλλαγών]] έτσι ώστε να διευκολύνεται η παρακολούθηση.
+
+
+<p>Αν θελήσετε να αφαιρέσετε τη σελίδα αυτή από τη λίστα παρακολούθησης, κάνετε κλικ στην επιλογή "παύση παρακολούθησης" στην μπάρα ενεργειών.',
+
+'removedwatch' => 'Αφαιρέθηκε απο τη λίστα παρακολούθησης.',
+'removedwatchtext' => 'Η σελίδα "$1" έχει αφαιρεθεί από τη λίστα παρακολούθησής σας.',
+'watch' => 'Παρακολούθηση',
+'watchthispage' => 'Παρακολούθηση αυτής της σελίδας',
+'unwatch' => 'Παύση παρακολούθησης',
+'unwatchthispage' => 'Παύση παρακολούθησης αυτής της σελίδας',
+'notanarticle' => 'Η σελίδα αυτή δεν είναι σελίδα περιεχομένου.',
+'watchnochange' => 'Δεν υπήρξε δραστηριότητα επεξεργασίας στις σελίδες που παρακολουθείτε κατά την εμφανιζόμενη χρονική περίοδο.',
+'watchdetails' => '(Υπό παρακολούθηση: $1 σελίδες, χωρίς τις σελίδες συζήτησης. $2 συνολικά σελίδες έχουν υποστεί επεξεργασία. $3... <a href="$4">Προβολή και επεξεργασία ολόκληρης της λίστας </a>)',
+'wlheader-enotif' => '* Η ειδοποίηση με ηλεκτρονικό ταχυδρομείο έχει ενεργοποιηθεί.',
+'wlheader-showupdated' => '* Σελίδες που έχουν υποστεί αλλαγές από την τελευταία φορά που τις επισκεφθήκατε εμφανίζονται με \'\'\'έντονους χαρακτήρες\'\'\'.',
+'watchmethod-recent' => 'Έλεγχος πρόσφατων αλλαγών σε σελίδες υπό παρακολούθηση',
+'watchmethod-list' => 'Έλεγχος σελίδων υπό παρακολούθηση για πρόσφατες αλλαγές',
+'removechecked' => 'Αφαίρεση επιλεγμένων σελίδων από τη λίστα παρακολούθησης',
+'watchlistcontains' => 'Η λίστα παρακολούθησής σας περιέχει $1 σελίδες.',
+
+'watcheditlist' => 'Ακολουθεί μια λίστα των σελίδων που παρακολουθείτε (κατά αλφαβητική σειρά). Σημειώστε τις σελίδες που επιθυμείτε να αφαιρέσετε από τη λίστα σας και επικυρώστε με ένα κλικ στο κουμπί \'αφαίρεση σελίδων\' στο κάτω μέρος της οθόνης.',
+
+'removingchecked' => 'Εξάλειψη των αντικειμένων που ζητήσατε να αφαιρεθούν από τη λίστα παρακολούθησης...',
+'couldntremove' => 'Δεν ήταν δυνατόν να εξαλειφθεί το στοιχείο $1...',
+'iteminvalidname' => 'Πρόβλημα με το στοιχείο "$1", άκυρο όνομα...',
+'wlnote' => 'Ακολουθούν οι $1 πιο πρόσφατες αλλαγές κατά τη διάρκεια των τελευταίων <b>$2</b> ωρών.',
+'wlshowlast' => 'Εμφάνιση των τελευταίων $1 ωρών $2 ημερών $3',
+'wlsaved' => 'Αποθηκευμένη έκδοση της λίστας παρακολούθησης',
+'wlhideshowown' => '$1 από τις επεξεργασίες μου',
+'wlshow' => 'Εμφάνιση',
+'wlhide' => 'Απόκρυψη',
+'enotif_mailer' => 'Σύστημα ειδοποίησης μέσω αλληλογραφίας του {{SITENAME}}',
+'enotif_reset' => 'Σημειώστε όλες τις σελίδες ως αναγνωσμένες.',
+'enotif_newpagetext' => 'Αυτή είναι μια νέα σελίδα.',
+'changed' => 'έχει αλλάξει',
+'created' => 'δημιουργήθηκε',
+'enotif_subject' => 'Η σελίδα $PAGETITLE του {{SITENAME}}έχει $CHANGEDORCREATED από το χρήστη $PAGEEDITOR',
+'enotif_lastvisited' => 'Δείτε το $1 για όλες τις αλλαγές που έγιναν από την τελευταία σας επίσκεψη.',
+'enotif_body' => 'Αγαπητέ $WATCHINGUSERNAME...
+
+Η σελίδα $PAGETITLE του {{SITENAME}}έχει $CHANGEDORCREATED στις $PAGEEDITDATE από το χρήστη $PAGEEDITOR -ακολουθήστε το σύνδεσμο $PAGETITLE_URL για να δείτε την τρέχουσα αναθεώρηση.
+
+$NEWPAGE
+
+Περιγραφή: $PAGESUMMARY $PAGEMINOREDIT
+
+Επικοινωνήστε με το συγκεκριμένο χρήστη:
+mail: $PAGEEDITOR_EMAIL
+wiki: $PAGEEDITOR_WIKI
+
+Δεν θα υπάρξει άλλη ειδοποίηση για περαιτέρω αλλαγές αν δεν επισκεφθείτε τη σελίδα. Μπορείτε επίσης να επαναφέρετε την επιλογή ειδοποίησης για όλες τις σελίδες στη λίστα παρακολούθησής σας.
+
+Φιλικά,<<br/>
+Tο σύστημα ειδοποίησης του {{SITENAME}}
+
+--
+Για να αλλάξετε τις προτιμήσεις της λίστας παρακολούθησής σας, ακολουθήστε το σύνδεσμο:
+{{SERVER}}{{localurl:Special:Watchlist/edit}}
+
+Ερωτήσεις και περισσότερες πληροφορίες: 
+{{SERVER}}{{localurl:{{ns:12}}:Περιεχόμενα}}',
+
+
+# Delete/protect/revert
+#----------------------------------#
+'deletepage' => 'Διαγραφή σελίδας',
+'confirm' => 'Επιβεβαίωση',
+'excontent' => 'το περιεχόμενο ήταν:',
+'excontentauthor' => 'το περιεχόμενο ήταν: \'$1\' (και οι μοναδικές συνεισφορές ήταν του \'$2\')',
+'exbeforeblank' => 'το περιεχόμενο πριν απο την εκκαθάριση ήταν:',
+'exblank' => 'η σελίδα ήταν κενή',
+'confirmdelete' => 'Επιβεβαίωση διαγραφής',
+'deletesub' => '(Διαγραφή της "$1")',
+'historywarning' => 'ΠΡΟΕΙΔΟΠΟΙΗΣΗ! Η σελίδα που πρόκειται να διαγράψετε έχει ιστορικό.<br/>',
+'confirmdeletetext' => 'Πρόκειται να διαγράψετε οριστικά από τη βάση δεδομένων μια σελίδα (ή μια εικόνα) μαζί με το ιστορικό της. Παρακαλούμε επιβεβαιώστε ότι θέλετε πραγματικά να το κάνετε, ότι αντιλαμβάνεσθε τις συνέπειες και ότι το κάνετε σύμφωνα με τους [[{{ns:4}}:Κανόνες|Κανόνες]].',
+'actioncomplete' => 'Η ενέργεια ολοκληρώθηκε.',
+'deletedtext' => 'Η "$1" έχει διαγραφεί.
+Για το ιστορικό των πρόσφατων διαγραφών ανατρέξτε στο σύνδεσμο $2',
+'deletedarticle' => 'Η $1 διαγράφτηκε.',
+'dellogpage' => 'Καταγραφές διαγραφών',
+'dellogpagetext' => 'Λίστα των πιο πρόσφατων διαγραφών',
+'deletionlog' => 'Καταγραφές διαγραφών',
+'reverted' => 'Επαναφορά σε προηγούμενη αναθεώρηση',
+'deletecomment' => 'Αιτιολογία διαγραφής',
+'imagereverted' => 'Η επαναφορά σε παλιότερη έκδοση ήταν επιτυχής.',
+'rollback' => 'Επαναφορά επεξεργασιών',
+'rollback_short' => 'Επαναφορά',
+'rollbacklink' => 'Επαναφορά στην προηγούμενη',
+'rollbackfailed' => 'Η επαναφορά απέτυχε.',
+'cantrollback' => 'Δεν είναι δυνατή η αναίρεση αυτής της αλλαγής, πρόκειται για την αρχική ενέργεια δημιουργίας της σελίδας.',
+
+'alreadyrolled' => 'Αδύνατον να αναιρεθεί η τελευταία αλλαγή της σελίδας [[$1]]
+από το χρήστη [[User:$2|$2]] ([[User talk:$2|Συζήτηση]]), κάποιος έχει ήδη αναιρέσει την αλλαγή ή έχει αλλάξει εκ νέου τη σελίδα.
+
+Τελευταία αλλαγή από το χρήστη [[User:$3|$3]] ([[User talk:$3|Συζήτηση]]).',
+#   only shown if there is an edit comment
+'editcomment' => 'Το σχόλιο της επεξεργασίας ήταν: "<i>$1</i>".',
+'revertpage' => 'Ανάκληση των αλλαγών $2 (επιστροφή στην προηγούμενη αναθεώρηση $1)',
+
+'sessionfailure' => 'Υπάρχει πρόβλημα με τη σύνδεσή σας -η ενέργεια αυτή ακυρώθηκε προληπτικά για την αντιμετώπιση τυχόν πειρατείας συνόδου (session hijacking). Παρακαλoύμε πατήστε "Επιστροφή", ξαναφορτώστε τη σελίδα από την οποία φθάσατε εδώ και προσπαθήστε ξανά.',
+
+'protectlogpage' => 'Καταγραφές προστασίας (κλειδώματος)',
+
+'protectlogtext' => 'Ακολουθεί κατάλογος ενεργειών κλειδώματος και ξεκλειδώματος σελίδων.
+(Βλ. [[{{ns:4}}:Σελίδες_υπό_προστασία]] για περισσότερες πληροφορίες).',
+
+'protectedarticle' => 'Κλειδωμένο $1',
+'unprotectedarticle' => 'έχει αρθεί η προστασία του $1',
+'protectsub' => '(Κλειδώνεται η "$1")',
+'confirmprotecttext' => 'Θέλετε πραγματικά να κλειδώσετε αυτή τη σελίδα;',
+'confirmprotect' => 'Επιβεβαίωση κλειδώματος',
+'protectmoveonly' => 'Προστασία μόνον από μετακινήσεις',
+'protectcomment' => 'Αιτιολογία προστασίας',
+'unprotectsub' => '(Άρση προστασίας για το "$1")',
+'confirmunprotecttext' => 'Θέλετε πραγματικά να ξεκλειδώσετε αυτή τη σελίδα;',
+'confirmunprotect' => 'Επιβεβαίωση ξεκλειδώματος',
+'unprotectcomment' => 'Αιτιολογία για την άρση προστασίας',
+
+
+# Undelete
+#---------------#
+'undelete' => 'Αποκατάσταση σελίδων που έχουν διαγραφεί',
+'undeletepage' => 'Εμφάνιση και αποκατάσταση σελίδων που έχουν διαγραφεί',
+'undeletepagetext' => 'Οι σελίδες που ακολουθούν έχουν διαγραφεί αλλά βρίσκονται ακόμα αποθηκευμένες στο αρχείο και μπορούν να αποκατασταθούν. (Κατά καιρούς γίνεται εκκαθάριση του αρχείου.)',
+'undeletearticle' => 'Αποκατάσταση σελίδας που έχει διαγραφεί',
+'undeleterevisions' => '$1 αναθεωρήσεις έχουν αρχειοθετηθεί.',
+
+'undeletehistory' => 'Αν αποκαταστήσετε αυτή τη σελίδα, όλες οι αναθεωρήσεις θα αποκατασταθούν στο ιστορικό. Αν μετά τη διαγραφή αυτής της σελίδας έχει δημιουργηθεί μια νέα σελίδα με το ίδιο όνομα, οι αναθεωρήσεις που αποκαταστάθηκαν θα εμφανιστούν στο πρότερο ιστορικό και η τρέχουσα αναθεώρηση της σελίδας δεν θα αντικαταστθεί αυτομάτως.',
+
+'undeleterevision' => 'Αναθεώρηση που έχει διαγραφεί στις $1',
+'undeletebtn' => 'Αποκατάσταση!',
+'undeletedarticle' => 'αποκατάσταση "$1"',
+'undeletedrevisions' => 'Αποκατάσταση $1 αναθεωρήσεων',
+
+'undeletedtext' => 'Η [[$1]] έχει αποκατασταθεί επιτυχώς.
+(Βλ. [[Special:Log|Σελίδες που έχουν διαγραφεί]] για λεπτομερή στοιχεία σχετικά με τις πρόσφατες διαγραφές και αποκαταστάσεις).',
+
+
+# Namespace form on various pages
+#-------------------------------------------------------#
+'namespace' => 'Περιοχή:',
+'invert' => 'Αντιστροφή της επιλογής',
+
+
+# Contributions
+#---------------------#
+'contributions' => 'Συνεισφορές χρήστη',
+'mycontris' => 'Οι προσθήκες μου',
+'contribsub' => 'Για τον/την $1',
+'nocontribs' => 'Δεν βρέθηκαν αλλαγές με αυτά τα κριτήρια.',
+'ucnote' => 'Ακολουθούν οι τελευταίες <b>$1</b> αλλαγές του χρήστη κατά τη διάρκεια των τελευταίων <b>$2</b> ημερών.',
+'uclinks' => 'Εμφάνιση των τελευταίων $1 αλλαγών - Εμφάνιση των τελευταίων $2 ημερών',
+'uctop' => ' (τελευταία)',
+'newbies' => 'νέοι χρήστες',
+'contribs-showhideminor' => '$1 αλλαγές μικρής κλίμακας',
+
+
+# What links here
+#-------------------------#
+'whatlinkshere' => 'Αναφορές στη σελίδα',
+'notargettitle' => 'Δεν έχει καθοριστεί προορισμός.',
+'notargettext' => 'Δεν έχετε καθορίσει ένα χρήστη ή μια σελίδα προορισμού για να εκτελεσθεί αυτή η λειτουργία.',
+'linklistsub' => '(Κατάλογος συνδέσμων)',
+'linkshere' => 'Εδώ παραπέμπουν οι ακόλουθες σελίδες:',
+'nolinkshere' => 'Δεν υπάρχουν σελίδες με συνδέσεις προς τα εδώ.',
+'isredirect' => 'ανακατεύθυνση σελίδας',
+
+
+# Block/unblock IP
+#--------------------------#
+'blockip' => 'Φραγή χρήστη ή διεύθυνσης IP',
+
+'blockiptext' => 'Χρησιμοποιήστε την παρακάτω φόρμα για να εμποδίσετε παρεμβάσεις στο κείμενο από μια συγκεκριμένη διεύθυνση IP ή όνομα χρήστη.
+Το μέτρο αυτό πρέπει να λαμβάνεται μόνο σε περιπτώσεις βανδαλισμού σελίδων και πάντα σύμφωνα με τους [[{{ns:4}}:Κανόνες|Κανόνες]].
+Παρακαλούμε να αιτιολογήσετε την ενέργειά σας (παραπέμποντας π.χ. σε συγκεκριμένες σελίδες που υπέστησαν βανδαλισμό).',
+
+'ipaddress' => 'Διεύθυνση IP/όνομα χρήστη',
+'ipadressorusername' => 'Διεύθυνση IP ή όνομα χρήστη',
+'ipbexpiry' => 'Λήξη',
+'ipbreason' => 'Αιτιολογία',
+'ipbsubmit' => 'Φραγή σε αυτό το χρήστη',
+'ipbother' => 'Άλλη ώρα',
+'ipboptions' => '2 hours:2 ώρες,1 day:1 ημέρα,3 days:3 ημέρες,1 week:1 εβδομάδα,2 weeks:2 εβδομάδες,1month:1 μήνα,3 months:3 μήνες,6 months:6 μήνες,1 year:1 χρόνο,infinite:επ΄αόριστον',
+'ipbotheroption' => 'άλλη',
+'badipaddress' => 'Άκυρη διεύθυνση IP.',
+'blockipsuccesssub' => 'Η φραγή ολοκληρώθηκε επιτυχώς.',
+'blockipsuccesstext' => 'Η διεύθυνση "$1" έχει υποστεί φραγή. <br />Δείτε τη [[Special:Ipblocklist|λίστα διευθύνσεων IP που έχουν υποστεί φραγή]] για να το επιβεβαιώσετε.',
+'unblockip' => 'Άρση φραγής χρήστη',
+'unblockiptext' => 'Χρησιμοποιήστε την παρακάτω φόρμα για να αποκαταστήσετε την πρόσβαση σε επεξεργασία, σε μια διεύθυνση IP ή σε ένα χρήστη που είχε αποκλειστεί με φραγή.',
+'ipusubmit' => 'Άρση φραγής αυτής της διεύθυνσης',
+'ipusuccess' => 'Η άρση της φραγής του/της "$1" ολοκληρώθηκε επιτυχώς.',
+'ipblocklist' => 'Λίστα διευθύνσεων IP και ονομάτων χρηστών που έχουν υποστεί φραγή.',
+'blocklistline' => 'Φραγή του/της $3 από τους $1, $2 (λήγει $4)',
+'blocklink' => 'φραγή',
+'unblocklink' => 'Άρση φραγής',
+'contribslink' => 'Συνεισφορές/Προσθήκες',
+'autoblocker' => 'Έχετε υποστεί αυτόματα φραγή από το σύστημα επειδή χρησιμοποιείτε την ίδια διεύθυνση IP με το χρήστη "$1". Αιτιολογία "$2".',
+'blocklogpage' => 'Καταγραφές φραγής',
+'blocklogentry' => 'Φραγή του/της "$1" με χρόνο λήξης $2',
+
+'blocklogtext' => 'Σε αυτή τη σελίδα υπάρχουν οι καταγραφές φραγής και κατάργησης φραγής των χρηστών (αρχείο γεγονότων).
+
+<br />Δεν συμπεριλαμβάνονται οι διευθύνσεις IP που υπέστησαν αυτόματα φραγή. <br />Στο σύνδεσμο [[Special:Ipblocklist|διευθύνεις IP που έχουν υποστεί φραγή]] θα βρείτε τον πλήρη κατάλογο με τις τρέχουσες φραγές.',
+
+'unblocklogentry' => 'Άρση φραγής του "$1"',
+'range_block_disabled' => 'Η δυνατότητα του διαχειριστή να δημιουργεί περιοχές φραγής είναι απενεργοποιημένη.',
+'ipb_expiry_invalid' => 'Άκυρος χρόνος λήξης',
+'ip_range_invalid' => 'Το εύρος των διευθύνσεων IP δεν είναι έγκυρο.',
+'proxyblocker' => 'Εργαλείο φραγής διακομιστών (proxy blocker)',
+
+'proxyblockreason' => 'Η διεύθυνσήη IP σας έχει υποστεί φραγή γιατί είναι open proxy. Παρακαλούμε επικοινωνείστε με την υπηρεσία παροχής Internet που χρησιμοποιείτε ή με την τεχνική υποστήριξη, για να θέσετε υπ΄ όψη τους αυτό το σοβαρό θέμα ασφάλειας.',
+
+'proxyblocksuccess' => 'Ολοκληρώθηκε!',
+#'sorbs' => 'SORBS DNSBL',
+'sorbsreason' => 'Η διεύθνυση IP σας έχει χαρακτηρισθεί ως open proxy στο [http://www.sorbs.net SORBS] DNSBL.',
+'sorbs_create_account_reason' => 'Η διεύθυνση IP σας έχει χαρακτηρισθεί open proxy στο [http://www.sorbs.net SORBS] DNSBL. Δεν μπορείτε να δημιουργήσετε λογαριασμό χρήστη.',
+
+
+# Developer tools
+#-------------------------#
+'lockdb' => 'Κλείδωμα βάσης δεδομένων',
+'unlockdb' => 'Ξεκλείδωμα βάσης δεδομένων',
+
+'lockdbtext' => 'Το κλείδωμα της βάσης δεδομένων αναιρεί τη δυνατότητα όλων των χρηστών να επεξεργαστούν σελίδες, να αλλάξουν τις προτιμήσεις τους, να επεξεργαστούν τις λίστες παρακολούθησης και να εκτελέσουν οποιαδήποτε ενέργεια επηρεάζει τη βάση δεδομένων. Παρακαλούμε να επιβεβαιώσετε ότι γνωρίζετε τις επιπτώσεις της ενέργειάς σας και ότι θα ξεκλειδώσετε τη βάση δεδομένων μόλις ολοκληρωθεί η συντήρηση.',
+
+'unlockdbtext' => 'Το ξεκλείδωμα της βάσης δεδομένων θα αποκαταστήσει τη δυνατότητα των χρηστών να επεξεργάζονται σελίδες, να αλλάζουν τις προτιμήσεις τους, να τροποποιούν τις λίστες παρακολούθησης και να προβαίνουν γενικότερα σε ενέργειες που επιφέρουν αλλαγές στη βάση δεδομένων. Παρακαλούμε επιβεβαιώστε πως θέλετε να προχωρήσετε.',
+
+'lockconfirm' => 'Ναι, επιθυμώ να κλειδώσω τη βάση δεδομένων.',
+'unlockconfirm' => 'Ναι, επιθυμώ να ξεκλειδώσω τη βάση δεδομένων.',
+'lockbtn' => 'Κλείδωμα βάσης δεδομένων',
+'unlockbtn' => 'Ξεκλείδωμα βάσης δεδομένων',
+'locknoconfirm' => 'Δεν έχετε σημειώσει το κουτάκι της επιβεβαίωσης.',
+'lockdbsuccesssub' => 'Η βάση δεδομένων κλειδώθηκε επιτυχώς.',
+'unlockdbsuccesssub' => 'Άρση κλειδώματος τη βάσης δεδομένων',
+
+
+# Make sysop
+#-------------------#
+'lockdbsuccesstext' => 'Η βάση δεδομένων έχει κλειδωθεί.
+<br />Μην ξεχάσετε να την ξεκλειδώσετε όταν τελειώσετε τη συντήρηση.',
+
+'makesysoptitle' => 'Κάντε ένα χρήστη διαχειριστή',
+
+'makesysoptext' => 'Η φόρμα αυτή απευθύνεται στους διαχειριστές και χρησιμεύει στο να χαρακτηρισθεί ένας χρήστης \'διαχειριστής\'. Πληκτρολογήστε το όνομα του χρήστη στο πεδίο κειμένου και επικυρώστε πατώντας το αντίστοιχο κουμπί.',
+
+'makesysopname' => 'Όνομα χρήστη:',
+'makesysopsubmit' => 'Κάνετε αυτό το χρήστη διαχειριστή',
+'makesysopok' => '<b>Ο χρήστης "$1" είναι εφεξής διαχειριστής</b>',
+'makesysopfail' => '<b>Ο χαρακτηρισμός του χρήστη "$1" σε διαχειριστή δεν ολοκληρώθηκε. (Βεβαιωθείτε πως δεν υπήρχαν λάθη στην πληκτρολόγηση του ονόματός του.)</b>',
+'setbureaucratflag' => 'Σηματοδότηση διαχειριστή (flag)',
+#'setstewardflag' => 'Set steward flag',
+'bureaucratlog' => 'Καταγραφές διαχειριστών',
+'rightslogtext' => 'Καταγραφές των αλλαγών στα δικαιώματα χρηστών.',
+'bureaucratlogentry' => 'Τα δικαιώματα του χρήστη "$1" είναι "$2"',
+'rights' => 'Δικαιώματα:',
+'set_user_rights' => 'Καθορισμός δικαιωμάτων χρήστη',
+'user_rights_set' => '<b>Τα δικαιώματα χρήστη για τον/την "$1" έχουν ενημερωθεί.</b>',
+'set_rights_fail' => '<b>Δεν ήταν δυνατή η ρύθμιση των δικαιωμάτων για το χρήστη "$1". Βεβαιωθείτε πως έχετε πληκτρολογήσει σωστά το όνομα.</b>',
+'makesysop' => 'Χαρακτηρισμός χρήστη ως διαχειριστή',
+'already_sysop' => 'Ο χρήστης αυτός είναι ήδη διαχειριστής.',
+'already_bureaucrat' => 'Ο χρήστης αυτός είναι ήδη διαχειριστής.',
+'already_steward' => 'Ο χρήστης αυτός είναι ήδη διαχειριστής.',
+
+
+# Validation
+#----------------#
+'val_yes' => 'Ναι',
+'val_no' => 'Όχι',
+'val_of' => '$1 από $2',
+'val_revision' => 'Αναθεώρηση',
+'val_time' => 'Χρόνος',
+'val_user_stats_title' => 'Επισκόπηση επικυρώσεων του χρήστη $1',
+'val_my_stats_title' => 'Επισκόπηση των επικυρώσεών μου',
+#'val_list_header' => '<th>#</th><th>Topic</th><th>Range</th><th>Action</th>',
+'val_add' => 'Προσθήκη',
+'val_del' => 'Διαγραφή',
+'val_show_my_ratings' => 'Εμφάνιση των επικυρώσεών μου',
+'val_revision_number' => 'Αναθεώρηση #$1',
+'val_warning' => '<b>Ποτέ, <i>ποτέ</i>, μην αλλάξετε κάτι εδώ χωρίς τη <i>ρητή</i> συναίνεση της κοινότητας!</b>',
+'val_rev_for' => 'Αναθεωρήσεις για την $1',
+'val_details_th_user' => 'Χρήστης $1',
+'val_validation_of' => 'Επικύρωση της "$1"',
+'val_revision_of' => 'Αναθεώρηση της $1',
+'val_revision_changes_ok' => 'Η βαθμολόγησή σας έχει αποθηκευθεί.!',
+'val_rev_stats' => 'Εμφάνιση των στατιστικών επικύρωσης για την "$1" <a href="$2">here</a>',
+'val_revision_stats_link' => 'λεπτομέρειες',
+'val_iamsure' => 'Σημειώστε σε αυτό το κουτάκι ότι πραγματικά το εννοείτε!',
+#'val_details_th' => '<sub>User</sub> \ <sup>Topic</sup>',
+'val_clear_old' => 'Εκκαθάριση των υπολοίπων δεδομένων επικύρωσης για $1',
+'val_merge_old' => 'Να χρησιμοποιηθεί η προηγούμενη αξιολόγησή μου όπου έχω δηλώσει \'χωρίς άποψη\'.',
+
+'val_form_note' => '<b>ΧΡΗΣΙΜΗ ΣΥΜΒΟΥΛΗ:</b> Ενσωμάτωση δεδομένων σημαίνει πως, για την αναθεώρηση του άρθρου που επιλέγετε, όλες οι επιλογές όπου έχετε δηλώσει \'χωρίς άποψη\' θα προσαρμοστούν στις αντίστοιχες επιλογές της τελευταίας έκδοσης για την οποία \'\'έχετε\'\' εκφράσει άποψη.  Αν για παράδειγμα θέλετε να αλλάξετε μια επιλογή μόνον σε μία αναθεώρηση αλλά θέλετε να διατηρήσετε τις άλλες ρυθμίσεις για αυτό το άρθρο σε αυτήν την αναθεώρηση, επιλέξτε απλώς ποια επιλογή προτίθεστε να \'\'αλλάξετε\'\'. Με την "ενσωμάτωση" θα συμπληρωθούν αυτόματα οι άλλες επιλογές από τις προηγούμενες ρυθμίσεις.',
+
+'val_noop' => 'Χωρίς άποψη',
+'val_topic_desc_page' => '{{ns:4}}:Θέματα_Επικύρωσης',
+'val_votepage_intro' => 'Αλλάξτε αυτό το κείμενο <a href="{{SERVER}}{{localurl:MediaWiki:Val_votepage_intro}}">εδώ</a>!',
+'val_percent' => '<b>$1%</b><br />($2 από $3 μονάδες<br />από $4 χρήστες)',
+'val_percent_single' => '<b>$1%</b><br />($2 από $3 μονάδες<br />από ένα χρήστη)',
+'val_total' => 'Σύνολο',
+'val_version' => 'Έκδοση',
+'val_tab' => 'Επικύρωση',
+'val_this_is_current_version' => 'αυτή είναι η τρέχουσα έκδοση',
+'val_version_of' => 'Έκδοση της $1',
+'val_table_header' => '<tr><th>Κλάση</th>$1<th colspan=4>Πρόταση</th>$1<th>Σχόλιο</th></tr>',
+'val_stat_link_text' => 'Στατιστικές επικύρωσης αυτού του άρθρου',
+'val_view_version' => 'Εμφάνιση αυτής της έκδοσης',
+'val_validate_version' => 'Επικύρωση αυτής της έκδοση',
+'val_user_validations' => 'Ο χρήστης έχει επικυρώσει $1 σελίδα(-ες)',
+'val_no_anon_validation' => 'Πρέπει να συνδεθείτε ως χρήστης για να επικυρώσετε ένα άρθρο.',
+'val_validate_article_namespace_only' => 'Μόνο άρθρα μπορούν να επικυρωθούν.  Αυτή η σελίδα <i>δεν<i> ανήκει στην περιοχή των άρθρων.',
+'val_validated' => 'Επικυρώθηκε.',
+'val_article_lists' => 'Λίστα επικυρωμένων άρθρων',
+'val_page_validation_statistics' => 'Στατιστικές επικύρωσης σελίδας για την $1',
+
+
+
+# Move page
+#-----------------#
+'movepage' => 'Μετακίνηση σελίδας',
+
+'movepagetext' => 'Χρησιμοποιήστε τη φόρμα που ακολουθεί για να μετονομάσετε σελίδες και για να μεταφέρετε όλο το ιστορικό τους κάτω από το νέο όνομα. Κάτω από τον παλιό τίτλο της σελίδας θα παραμείνει μια σελίδα ανακατεύθυνσης στο νέο τίτλο. Οι τυχόν σύνδεσμοι που οδηγούσαν στην παλιά σελίδα δεν θα επηρεαστούν. Βεβαιωθείτε πως [[Special:Maintenance|ελέγξατε]] τα διπλά διαστήματα και τους κατεστραμένους συνδέσμους. Αναλαμβάνετε την ευθύνη να επιβεβαιώσετε ότι οι συνδεσμοι εξακολουθούν να οδηγούν προς τις κατευθύνσεις που πρέπει.
+
+Λάβετε υπ` όψη σας ότι η σελίδα \'\'\'δεν\'\'\' θα μετακινηθεί αν υπάρχει ήδη μια άλλη σελίδα κάτω από το νέο τίτλο, εκτός αν η σελίδα αυτή είναι κενή \'\'\'και\'\'\' χωρίς ιστορικό επεξεργασίας. Αυτό σημαίνει ότι, στην περίπτωση που έχετε κάνει λάθος, μπορείτε να μετονομάσετε μια σελίδα ξαναδίνοντας της την αρχική της ονομασία αλλά δεν μπορείτε να αντικαταστήσετε μια υπάρχουσα σελίδα. 
+
+
+<b>ΠΡΟΣΟΧΗ!</b>
+Η μετονομασία σελίδας είναι μια αιφνίδια και δραστική αλλαγή όταν πρόκειται για δημοφιλείς σελίδες. Παρακαλούμε, πριν το αποφασίσετε, να εξετάσετε προσεκτικά τις πιθανές επιπτώσεις αυτής της ενέργειας .',
+
+'movepagetalktext' => 'Η σελίδα συζήτησης που αντιστοιχεί, εάν υπάρχει, θα μετακινηθεί αυτόματα μαζί με αυτήν \'\'\'έκτός αν:\'\'\'
+*Μετακινείτε τη σελίδα σε διαφορετική περιοχή (namespace),
+*Υπάρχει κάτω από το νέο όνομα μια σελίδα συζήτησης που δεν είναι κενή, ή 
+*Έχετε αφαιρέσει τη σημείωση (check) από το κουτάκι που υπάρχει παρακάτω.
+
+Σε αυτές τις περιπτώσεις, θα πρέπει να μετακινήσετε (ή να ενσωματώσετε αν το θέλετε) τη σελίδα με αντιγραφή-και-επικόλληση.',
+
+'movearticle' => 'Μετακίνηση σελίδας',
+'movenologin' => 'Δεν έχετε συνδεθεί.',
+'movenologintext' => 'Για να μετακινήσετε μια σελίδα πρέπει να είστε εγγεγραμένος χρήστης και [[Special:Userlogin|να έχετε συνδεθεί]] στο Wiκi.',
+'newtitle' => 'νέος τίτλος',
+'movepagebtn' => 'Μετακίνηση σελίδας',
+'pagemovedsub' => 'Η μετακίνηση ήταν επιτυχής',
+'pagemovedtext' => 'Η σελίδα "[[$1]]" μετακινήθηκε στη "[[$2]]".',
+'articleexists' => 'Υπάρχει ήδη σελίδα με αυτό το όνομα. Παρακαλούμε δώστε άλλο όνομα στη σελίδα.',
+'talkexists' => 'Η ίδια η σελίδα μετακινήθηκε επιτυχώς αλλά όχι και η σελίδα συζήτησης, λόγω του ότι υπάρχει ήδη άλλη σελίδα συζήτησης κάτω από το νέο τίτλο. Παρακαλούμε ενοποιήστε τις δύο σελίδες με \'αντιγραφή-και-επικόλληση\'.',
+'movedto' => 'Μεκακινήθηκε στο',
+'movetalk' => 'Μετακίνηση της σελίδας "συζήτηση" (εάν υπάρχει)',
+'talkpagemoved' => 'Η αντίστοιχη σελίδα συζήτησης έχει επίσης μεταφερθεί.',
+'talkpagenotmoved' => 'Η σελίδα συζήτησης που αντιστοιχεί <strong>δεν</strong> έχει μεταφερθεί.',
+'1movedto2' => 'Η $1 μετονομάστηκε σε $2',
+'1movedto2_redir' => 'Η $1 μετακινήθηκε στη θέση $2 (με ανακατεύθυνση)',
+'movelogpage' => '΄Μετακίνηση αρχείου καταγραφών',
+'movelogpagetext' => 'Ακολουθεί η λίστα με τις σελίδες που έχουν μετακινηθεί.',
+'movereason' => 'Αιτιολογία',
+'revertmove' => 'έπαναφορά',
+'delete_and_move' => 'Διαγραφή και μετακίνηση',
+
+'delete_and_move_text' => '==Χρειάζεται διαγραφή.==
+
+Το άρθρο [[$1]] υπάρχει ήδη. Θέλετε να το διαγράψετε για να εκτελεσθεί η μετακίνηση;',
+
+'delete_and_move_reason' => 'Διαγράφτηκε για να εκτελεθεί η μετακίνηση.',
+'selfmove' => 'Ο τίτλος προέλευσης είναι ο ίδιος με τον τίτλο προορισμού -δεν είναι δυνατόν να μετακινηθεί μια σελίδα προς τον εαυτό της.',
+
+'immobile_namespace' => 'Ο τίτλος του προορισμού είναι ειδικού τύπου -δεν είναι δυνατή η μετακίνηση σελίδων σε εκείνη την περιοχή.',
+
+
+# Export
+#----------#
+'export' => 'Εξαγωγή σελίδων',
+
+'exporttext' => 'Μπορείτε να κάνετε εξαγωγή του κειμένου και του ιστορικού επεξεργασίας μιας συγκεκριμένης σελίδας (ή περισσοτέρων σελίδων που έχουν ομαδοποιηθεί με χρήση XML).  
+
+Για την εξαγωγή ολόκληρων άρθρων, συμπληρώστε τους τίτλους στο παρακάτω πλαίσιο (ένα τίτλο σε κάθε σειρά) και επιλέξτε ανάμεσα από το να εξαγάγετε μόνο την τρέχουσα έκδοση (με τις πληροφορίες της πιο πρόσφατης επεξεργασίας) ή εναλλακτικά και τις παλιότερες εκδόσεις (με τις αντίστοιχες καταγραφές στη σελιδα του ιστορικού).
+
+Στην τελευταία περίπτωση μπορείτε να κάνετε και χρήση συνδέσμου, π.χ. [[{{ns:Special}}:Export/Train]] για το άρθρο [[Train]].',
+
+'exportcuronly' => 'Να συμπεριληφθεί μόνον η τρέχουσα αναθεώρηση, όχι το πλήρες ιστορικό.',
+
+
+# Namespace 8 related
+#----------------------------------#
+'allmessages' => 'Όλα τα μηνύματα του συστήματος',
+'allmessagesname' => 'Όνομα',
+'allmessagesdefault' => 'Προκαθορισμένο κείμενο',
+'allmessagescurrent' => 'Παρόν κείμενο',
+'allmessagestext' => 'Η λίστα με όλα τα μηνύματα συστήματος που βρίσκονται στην περιοχή MediaWiki:',
+'allmessagesnotsupportedUI' => 'Η τρέχουσα γλώσσα διασύνδεσής σας <b>$1</b> δεν υποστηρίζεται από το Special:AllMessages σε αυτό τον ιστοχώρο.',
+'allmessagesnotsupportedDB' => 'Special:Το AllMessages δεν υποστηρίζεται επειδή το wgUseDatabaseMessages είναι απενεργοποιημένο.',
+
+
+# Thumbnails
+#------------------#
+'thumbnail-more' => 'Μεγέθυνση',
+'missingimage' => '<b>Αγνοούμενη εικόνα</b><br /><i>$1</i>',
+'filemissing' => 'Αγνοούμενο αρχείο',
+
+
+# Special:Import
+#----------------------#
+'import' => 'Εισαγωγή σελίδων',
+'importinterwiki' => 'Εισαγωγή από άλλο Wiki',
+'importtext' => 'Παρακαλούμε εξάγετε το αρχείο από το πηγαίο Wiki (χρησιμοποιώντας Special:Export), αποθηκεύστε το στο δίσκο του υπολογιστή σας και φορτώστε το από εκεί.',
+'importfailed' => 'Η εισαγωγή απέτυχε: $1',
+'importnotext' => 'Κενό (-ή) ή χωρίς κείμενο',
+'importsuccess' => 'Η εισαγωγή επέτυχε!',
+'importhistoryconflict' => 'Υπάρχει αντιφατικό ιστορικό αναθεωρήσεων (μπορεί να έχετε κάνει παλιότερα  εισαγωγή αυτής της σελίδας).',
+'importnosources' => 'Δεν έχουν καθοριστεί πηγές για την εισαγωγή από άλλο Wiki και η απευθείας φόρτωση στο ιστορικό έχει απενεργοποιηθεί.',
+
+
+# Keyboard access keys for power users
+#------------------------------------------------------------#
+'accesskey-search' => 'f',
+'accesskey-minoredit' => 'i',
+'accesskey-save' => 's',
+'accesskey-preview' => 'p',
+'accesskey-diff' => 'd',
+'accesskey-compareselectedversions' => 'v',
+
+
+# Tooltip help for some actions, most are in Monobook.js
+#--------------------------------------------------------------------------------------#
+'tooltip-search' => 'Αναζήτηση στο Wiki [alt-f]',
+'tooltip-minoredit' => 'Χαρακτηρήστε τις αλλαγές "μικρής κλίμακας" [alt-i]',
+'tooltip-save' => 'Αποθήκευση αλλαγών [alt-s]',
+'tooltip-preview' => 'Προεπισκόπηση - Παρακαλούμε να χρησιμοποιήτε αυτή την επιλογή πριν αποθηκεύσετε τις αλλαγές σας! [alt-p]',
+'tooltip-diff' => 'Προβολή των αλλαγών που κάνατε στο κείμενο. [alt-d]',
+'tooltip-compareselectedversions' => 'Εμφάνιση των διαφορών ανάμεσα στις δύο αναθεωρήσεις της σελίδας που έχετε επιλέξει. [alt-v]',
+'tooltip-watch' => 'Προσθήκη της σελίδας στη λίστα παρακολούθησης [alt-w]',
+
+
+# stylesheets
+#-------------------#
+'Monobook.css' => '/* edit this file to customize the monobook skin for the entire site */',
+#'Monobook.js' => '/* edit this file to change js things in the monobook skin */',
+
+
+# Metadata
+#---------------#
+'nodublincore' => 'Τα μεταδεδομένα RDF που αφορούν στο Dublin Core έχουν απενεργοποιηθεί σε αυτό τον server.',
+'nocreativecommons' => 'Τα μεταδεδομένα RDF που αφορούν στο Creative Commons έχουν απενεργοποιηθεί σε αυτό τον server.',
+'notacceptable' => 'Ο server του Wiki δεν μπορεί να αποδόσει δεδομένα σε μορφή που τα διαβάζει ο client',
+
+
+# Attribution
+#-----------------#
+'anonymous' => 'Ανώνυμος(-οι) χρήστης(-ες) του {{SITENAME}}',
+'siteuser' => '{{SITENAME}} χρήστης $1',
+'lastmodifiedby' => 'Η σελίδα αυτή τροποποιήθηκε τελευταία φορά στις  $1 από το χρήστη $2.',
+'and' => 'και',
+'othercontribs' => 'Βασισμένο στη δουλειά του/της $1',
+'others' => 'άλλοι',
+'siteusers' => '{{SITENAME}} χρήστης (-ες) $1',
+'creditspage' => 'Αναγνώριση συνεισφοράς στη σελίδα',
+'nocredits' => 'Δεν υπάρχουν πληροφορίες σχετικά με την αναγνώριση συνεισφοράς σε αυτή τη σελίδα.',
+
+
+# Spam protection
+#--------------------------#
+'spamprotectiontitle' => 'Φίλτρο προστασίας από spam',
+'spamprotectiontext' => 'Η σελίδα που επιχειρήσατε να αποθηκεύσετε απομονώθηκε από το φίλτρο spam. Αυτό οφείλεται, πιθανότατα, στην ύπαρξη ενός (ή περισσότερων) συνδέσμων προς εξωτερικές σελίδες.',
+'spamprotectionmatch' => 'Το φίλτρο spam έχει τεθεί σε ενέργεια εξ αιτίας του εξής κειμένου: $1',
+'subcategorycount' => 'Υπάρχουν $1 υποκατηγορίες σε αυτή την κατηγορία.',
+'subcategorycount1' => 'Υπάρχει $1 υποκατηγορία σε αυτή την κατηγορία.',
+'categoryarticlecount' => 'Υπάρχουν $1 άρθρα σε αυτή την κατηγορία.',
+'categoryarticlecount1' => 'Υπάρχει $1 άρθρο σε αυτή την κατηγορία.',
+
+'usenewcategorypage' => '1
+
+Τοποθετείστε ένα "0" στη θέση του πρώτου χαρακτήρα για να μην αλλάξει η διάταξη στη σελίδα κατηγοριών.',
+
+'listingcontinuesabbrev' => 'συνεχίζεται...',
+
+
+# Info page
+#---------------#
+'infosubtitle' => 'Πληροφορίες για τη σελίδα',
+'numedits' => 'Αριθμός επεξεργασιών (στο άρθρο): $1',
+'numtalkedits' => 'Αριθμός επεξεργασιών (στη σελίδα συζήτησης): $1',
+'numwatchers' => 'Αριθμός παρακολουθήσεων: $1',
+'numauthors' => 'Αριθμός διακριτών συγγραφέων (στο άρθρο): $1',
+'numtalkauthors' => 'Αριθμός διακριτών συγγραφέων (στη σελίδα συζήτησης): $1',
+
+
+# Math options
+#---------------------#
+'mw_math_png' => 'Απόδοση πάντα σε PNG',
+'mw_math_simple' => 'HTML αν είναι αρκετά απλό, διαφορετικά PNG',
+'mw_math_html' => 'HTML αν είναι δυνατόν, διαφορετικά PNG',
+'mw_math_source' => 'Να παραμείνει ως TeX (για text browsers)',
+'mw_math_modern' => 'Προτεινόμενο για σύγχρονους browser',
+'mw_math_mathml' => 'MathML όποτε είναι δυνατόν (πειραματικό)',
+
+
+# Patrolling
+#--------------#
+'markaspatrolleddiff' => 'Να σημειωθεί \'υπό παρακολούθηση\'',
+'markaspatrolledlink' => '<div class=\'patrollink\'>[$1]</div>',
+'markaspatrolledtext' => 'Να σημειωθεί αυτό το άρθρο ως \'υπό παρακολούθηση\'.',
+'markedaspatrolled' => 'Σημειωμένο ως \'υπό παρακολούθηση\'',
+'markedaspatrolledtext' => 'Η αναθεώρηση που έχει επιλεγεί έχει σημειωθεί ως \'υπό παρακολούθηση\'.',
+'rcpatroldisabled' => 'Η λειτουργία \'Παρακολούθηση Πρόσφατων Αλλαγών\' έχει απενεργοποιηθεί.',
+'rcpatroldisabledtext' => 'Η λειτουργία \'Παρακολούθηση Πρόσφατων Αλλαγών\' είναι αυτή τη στιγμή απενεργοποιημένη.',
+
+
+# Monobook.js: tooltips and access keys for monobook
+#------------------------------------------------------------------------------------#
+'Monobook.js' => '/* tooltips and access keys */
+ta = new Object();
+ta[\'pt-userpage\'] = new Array(\'.\',\'Η προσωπική μου σελίδα στο Wiκi\');
+ta[\'pt-anonuserpage\'] = new Array(\'.\',\'Η σελίδα χρήστη στον οποίο αντιστοιχεί η διεύθυνση IP που έχετε\');
+ta[\'pt-mytalk\'] = new Array(\'n\',\'Η σελίδα συζητήσεών μου\');
+ta[\'pt-anontalk\'] = new Array(\'n\',\'Συζήτηση σχετικά με τις αλλαγές που έγιναν από αυτή τη διεύθυνση IP\');
+ta[\'pt-preferences\'] = new Array(\'\',\'Οι προτιμήσεις μου\');
+ta[\'pt-watchlist\'] = new Array(\'l\',\'Η λίστα με τις σελίδες που παρακολουθείτε για αλλαγές\');
+ta[\'pt-mycontris\'] = new Array(\'y\',\'Κατάλογος των συνεισφορών μου\');
+ta[\'pt-login\'] = new Array(\'o\',\'Σας προτείνουμε να συνδεθείτε παρόλο που δεν είναι αναγκαίο.\');
+ta[\'pt-anonlogin\'] = new Array(\'o\',\'Σας προτείνουμε να συνδεθείτε παρόλο που δεν είναι αναγκαίο.\');
+ta[\'pt-logout\'] = new Array(\'o\',\'Αποσύνδεση\');
+ta[\'ca-talk\'] = new Array(\'t\',\'Συζήτηση για το παρόν άρθρο\');
+ta[\'ca-edit\'] = new Array(\'e\',\'Μπορείτε να επεξεργαστείτε αυτό το άρθρο. Χρησιμοποιείστε την "Προεπισκόπηση" πριν αποθηκεύσετε.\');
+ta[\'ca-addsection\'] = new Array(\'+\',\'Προσθέστε σχόλιο στη συζήτηση.\');
+ta[\'ca-viewsource\'] = new Array(\'e\',\'Αυτό το άρθρο είναι κλειδωμένο. Μπορείτε να δείτε τον πηγαίο κώδικά του.\');
+ta[\'ca-history\'] = new Array(\'h\',\'Παλιές αναθεωρήσεις του άρθρου.\');
+ta[\'ca-protect\'] = new Array(\'=\',\'Κλείδωμα αυτού του άρθρου\');
+ta[\'ca-delete\'] = new Array(\'d\',\'Διαγραφή αυτής της σελίδας\');
+ta[\'ca-undelete\'] = new Array(\'d\',\'Αποκαταστήστε τις αλλαγές που έγιναν σε αυτή τη σελίδα πριν διαγραφεί.\');
+ta[\'ca-move\'] = new Array(\'m\',\'Μετακινήστε αυτή τη σελίδα\');
+ta[\'ca-nomove\'] = new Array(\'\',\'Δεν έχετε εξουσιοδότηση να μετακινήσετε αυτή τη σελίδα.\');
+ta[\'ca-watch\'] = new Array(\'w\',\'Προσθήκη της σελίδας στη λίστα παρακολούθησης\');
+ta[\'ca-unwatch\'] = new Array(\'w\',\'Αφαίρεση της σελίδας από τη λίστα παρακολούθησης\');
+ta[\'search\'] = new Array(\'f\',\'Αναζήτηση στο WiKi\');
+ta[\'p-logo\'] = new Array(\'\',\'Αρχική σελίδα\');
+ta[\'n-mainpage\'] = new Array(\'z\',\'Δείτε την Αρχική σελίδα\');
+ta[\'n-portal\'] = new Array(\'\',\'Σχετικά με το Wiκi - πώς μπορείτε να βοηθήσετε, πού μπορείτε να απευθυνθείτε\');
+ta[\'n-currentevents\'] = new Array(\'\',\'Πληροφορίες για πρόσφατα γεγονότα\');
+ta[\'n-recentchanges\'] = new Array(\'r\',\'Η λίστα με τις πρόσφατες αλλαγές στο WiKi\');
+ta[\'n-randompage\'] = new Array(\'x\',\'Επισκεφθείτε μια τυχαία σελίδα του Wiκi\');
+ta[\'n-help\'] = new Array(\'\',\'Το μέρος για να βρείτε τις απαντήσεις που ψάχνετε.\');
+ta[\'n-sitesupport\'] = new Array(\'\',\'Βοηθήστε το έργο.\');
+ta[\'t-whatlinkshere\'] = new Array(\'j\',\'Λίστα από άρθρα που αναφέρουν το παρόν άρθρο\');
+ta[\'t-recentchangeslinked\'] = new Array(\'k\',\'Πρόσφατες αλλαγές σε άρθρα που συνδέονται με το παρόν\');
+ta[\'feed-rss\'] = new Array(\'\',\'RSS feed για\' αυτή την σελίδα\');
+ta[\'feed-atom\'] = new Array(\'\',\'Atom feed για\' αυτή την σελίδα\');
+ta[\'t-contributions\'] = new Array(\'\',\'Δείτε τη λίστα με τις συνεισφορές αυτού του χρήστη στο Wiκi\');
+ta[\'t-emailuser\'] = new Array(\'\',\'Αποστολή μηνύματος σε αυτό το χρήστη\');
+ta[\'t-upload\'] = new Array(\'u\',\'Φόρτωση εικόνας ή αρχείου πολυμέσων\');
+ta[\'t-specialpages\'] = new Array(\'q\',\'Η λίστα με όλες τις σελίδες λειτουργιών\');
+ta[\'ca-nstab-main\'] = new Array(\'c\',\'Άρθρο\');
+ta[\'ca-nstab-user\'] = new Array(\'c\',\'Δείτε τη σελίδα του χρήστη\');
+ta[\'ca-nstab-media\'] = new Array(\'c\',\'Δείτε τη σελίδα πολυμέσων\');
+ta[\'ca-nstab-special\'] = new Array(\'\',\'Αυτή είναι ειδική σελίδα και δεν μπορείτε να την επεξεργαστείτε.\');
+ta[\'ca-nstab-wp\'] = new Array(\'a\',\'Δείτε τη σελίδα του συστήματος\');
+ta[\'ca-nstab-image\'] = new Array(\'c\',\'Δείτε την εικόνα\');
+ta[\'ca-nstab-mediawiki\'] = new Array(\'c\',\'Δείτε το μήνυμα του συστήματος\');
+ta[\'ca-nstab-template\'] = new Array(\'c\',\'Δείτε το πρότυπο\');
+ta[\'ca-nstab-help\'] = new Array(\'c\',\'Δείτε τη σελίδα βοήθειας\');
+ta[\'ca-nstab-category\'] = new Array(\'c\',\'Δείτε τη σελίδα κατηγοριών\');',
+
+
+# image deletion
+#------------------------#
+'deletedrevision' => 'Η παλιά έκδοση της $1 διαγράφτηκε.',
+
+
+# browsing diffs
+#----------------------#
+'previousdiff' => '&larr; Δείτε την προηγούμενη \'διαφορά\'',
+'nextdiff' => 'Μετάβαση στην επόμενη \'διαφορά\' &rarr;',
+
+'imagemaxsize' => 'Περιορισμός του μεγέθους των εικόνων (στις σελίδες περιγραφής εικόνων) σε:',
+'thumbsize'	=> 'Μεγεθος μινιατούρας:',
+'showbigimage' => 'Κατέβασμα του αρχείου υψηλής ανάλυσης ($1x$2, $3 KB)',
+
+'newimages' => 'Πινακοθήκη νέων εικόνων',
+'noimages' => 'Δεν υπάρχουν εικόνες.',
+
+
+# short names for language variants used for language conversion links.
+# to disable showing a particular link, set it to 'disable', e.g.
+# 'variantname-zh-sg' => 'disable',
+'variantname-zh-cn' => 'cn',
+'variantname-zh-tw' => 'tw',
+'variantname-zh-hk' => 'hk',
+'variantname-zh-sg' => 'sg',
+'variantname-zh' => 'zh',
+
+
+# labels for User: and Title: on Special:Log pages
+#--------------------------------------------------------------------------#
+'specialloguserlabel' => 'Χρήστης:',
+'speciallogtitlelabel' => 'Τίτλος:',
+'passwordtooshort' => 'Ο κωδικός σας είναι πολύ σύντομος. Πρέπει να περιέχει τουλάχιστον $1 χαρακτήρες.',
+
+# Media Warning
+#-----------------------#
+'mediawarning' => '\'\'\'Προειδοποίηση\'\'\': Το αρχείο αυτό μπορεί να περιέχει κακοπροαίρετο κώδικα που μπορεί να βλάψει το σύστημα του υπολογιστή σας.
+
+<hr>',
+
+'fileinfo' => '$1KB, MIME type: <code>$2</code>',
+
+# Metadata
+#---------------#
+'metadata' => 'Μεταδεδομένα',
+
+
+# Exif tags
+#-------------#
+'exif-imagewidth' => 'Πλάτος',
+'exif-imagelength' => 'Υψος',
+'exif-bitspersample' => 'Bits ανά στοιχείο',
+'exif-compression' => 'Σχήμα συμπίεσης',
+'exif-photometricinterpretation' => 'Σύνθεση των pixel ',
+'exif-orientation' => 'Προσαντολισμός',
+'exif-samplesperpixel' => 'Αριθμός στοιχείων',
+'exif-planarconfiguration' => 'Διάταξη δεδομένων',
+'exif-ycbcrsubsampling' =>'Αναλογικό δείγμα σε φωτεινότητα και χρώμα',
+'exif-ycbcrpositioning' =>'Ρύθμιση φωτεινότητας και χρώματος',
+'exif-xresolution' => 'Οριζόντια ανάλυση',
+'exif-yresolution' => 'Κατακόρυφη ανάλυση',
+'exif-resolutionunit' => 'Μονάδα μέτρησης ανάλυσης X και Y',
+'exif-stripoffsets' => 'Τοποθέτηση δεδομένων εικόνας',
+'exif-rowsperstrip' =>'Αριθμός σειρών ανά λωρίδα',
+'exif-stripbytecounts' =>'Bytes ανά συμπιεσμένη λωρίδα',
+'exif-jpeginterchangeformat' => 'Μετάθεση σε JPEG SOI',
+'exif-jpeginterchangeformatlength' => 'Bytes δεδομένων JPEG',
+'exif-transferfunction' => 'Λειτουργία μεταφοράς',
+'exif-whitepoint' =>'Χρωματικός προσδιορισμός λευκού',
+'exif-primarychromaticities' =>'Πρωτεύοντες χρωματισμοί',
+'exif-ycbcrcoefficients' =>'Συντελεστές μητρών μετασχηματισμού χρώματος',
+'exif-referenceblackwhite' => 'Ζεύγος μαύρων και άσπρων αξιών αναφοράς',
+'exif-datetime' => 'Δηλώστε την ημερομηνία και την ώρα της επεξεργασίας.',
+'exif-imagedescription' => 'Τίτλος εικόνας',
+'exif-make' => 'Κατασκευαστής φωτογραφικής μηχανής',
+'exif-model' => 'Μοντέλο φωτογραφικής μηχανής',
+'exif-software' => 'Λογισμικό που χρησιμοποιήθηκε',
+'exif-artist' => 'Δημιουργός',
+'exif-copyright' => 'Ιδιοκτήτης του copyright',
+'exif-exifversion' => 'Έκδοση exif',
+'exif-flashpixversion' => 'Υποστηριζόμενη έκδοση Flashpix',
+'exif-colorspace' => 'Χρωματική περιοχή',
+'exif-componentsconfiguration' => 'Νόημα του κάθε στοιχείου',
+'exif-compressedbitsperpixel' => 'Κατάσταση συμπίεσης εικόνας',
+'exif-pixelydimension' => 'Έγκυρο πλάτος εικόνας',
+'exif-pixelxdimension' => 'Έγκυρο ύψος εικόνας',
+'exif-makernote' => 'Σημειώσεις του κατασκευαστή',
+'exif-usercomment' => 'Σχόλια χρήστη',
+'exif-relatedsoundfile' => 'Σχετικό αρχείο ήχου',
+'exif-datetimeoriginal' => 'Ημερομηνία και ώρα της παραγωγής ψηφιακών δεδομένων',
+'exif-datetimedigitized' => 'Ημερομηνία και ώρα της μετατροπής σε ψηφιακή μορφή',
+#'exif-subsectime' =>'DateTime subseconds',
+#'exif-subsectimeoriginal' =>'DateTimeOriginal subseconds',
+#'exif-subsectimedigitized' =>'DateTimeDigitized subseconds',
+'exif-exposuretime' => 'Χρόνος έκθεσης',
+'exif-fnumber' => 'Αριθμός F',
+'exif-exposureprogram' => 'Πρόγραμμα έκθεσης',
+'exif-spectralsensitivity' => 'Ευαισθησία φάσματος',
+'exif-isospeedratings' => 'Βαθμολόγηση ταχύτητας ISO',
+'exif-oecf' => 'Οπτικοηλεκτρονικός συντελεστής μετατροπής',
+'exif-shutterspeedvalue' => 'Ταχύτητα κλείστρου',
+'exif-aperturevalue' => 'Διάφραγμα',
+'exif-brightnessvalue' => 'Φωτεινότητα',
+'exif-exposurebiasvalue' => 'Προτεραιότητα έκθεσης',
+'exif-maxaperturevalue' => 'Μέγιστο διάφραγμα ξηράς',
+'exif-subjectdistance' => 'Απόσταση αντικειμένου',
+'exif-meteringmode' => 'Κατάσταση λειτουργίας φωτόμετρου',
+'exif-lightsource' => 'Πηγή φωτός',
+'exif-flash' => 'Φλας',
+'exif-focallength' => 'Εστιακή απόσταση του φακού',
+'exif-subjectarea' => 'Θεματική περιοχή',
+'exif-flashenergy' => 'Ενέργεια του φλας',
+'exif-spatialfrequencyresponse' =>'Χωρική απόκριση συχνότητας',
+'exif-focalplanexresolution' => 'Ανάλυση εστιακού επιπέδου Χ',
+'exif-focalplaneyresolution' => 'Ανάλυση εστιακού πειπέδου Υ',
+'exif-focalplaneresolutionunit' => 'Μονάδα μέτρησης ανάλυσης εστιακού επιπέδου',
+'exif-subjectlocation' => 'Τοποθέτηση του αντικειμένου',
+'exif-exposureindex' => 'Δείκτης έκθεσης',
+'exif-sensingmethod' => 'Μέθοδος αισθητήρα',
+'exif-filesource' => 'Πηγή αρχείου',
+'exif-scenetype' => 'Τύπος σκηνής',
+'exif-cfapattern' => 'CFA pattern',
+'exif-customrendered' => 'Ειδική επεξεργασία εικόνας',
+'exif-exposuremode' => 'Κατάσταση λειτουργίας έκθεσης',
+'exif-whitebalance' => 'Ισορροπία των λευκών',
+'exif-digitalzoomratio' => 'Αναλογία ψηφιακού zoom',
+'exif-focallengthin35mmfilm' => 'Εστιακή απόσταση σε φιλμ 35 mm',
+'exif-scenecapturetype' => 'Τύπος σύλληψης της σκηνής',
+'exif-gaincontrol' => 'Έλεγχος πεδίου',
+'exif-contrast' => 'Αντίθεση',
+'exif-saturation' => 'Κορεσμός',
+'exif-sharpness' => 'Όξυνση',
+'exif-devicesettingdescription' => 'Περιγραφή των ρυθμίσεων του μηχανήματος',
+'exif-subjectdistancerange' => 'Περιοχή διακύμανσης της απόστασης του αντικειμένου',
+'exif-imageuniqueid' => 'Μονοσήμαντη ταυτοποίηση εικόνας',
+'exif-gpsversionid' => 'Έκδοση με GPS tag',
+'exif-gpslatituderef' => 'Βόρειο ή Νότιο γεωγραφικό πλάτος',
+'exif-gpslatitude' => 'Γεωγραφικό πλάτος',
+'exif-gpslongituderef' => 'Ανατολικό ή Δυτικό γεωγραφικό μήκος',
+'exif-gpslongitude' => 'Γεωγραφικό μήκος',
+'exif-gpsaltituderef' => 'Αναφορές υψομέτρου',
+'exif-gpsaltitude' => 'Υψόμετρο',
+'exif-gpstimestamp' => 'Ώρα GPS (ατομικό ρολόι)',
+'exif-gpssatellites' => 'Δορυφόροι που χρησιμοποιήθηκαν για τις μετρήσεις',
+'exif-gpsstatus' => 'Κατάσταση δέκτη',
+'exif-gpsmeasuremode' => 'Τρόπος λειτουργίας μετρήσεων',
+'exif-gpsdop' => 'Ακρίβεια μέτρησης',
+'exif-gpsspeedref' => 'Μονάδα μέτρησης ταχύτητας',
+'exif-gpsspeed' => 'Ταχύτητα δέκτη GPS',
+'exif-gpstrackref' => 'Αναφορές για την κατεύθυνση της κίνησης',
+'exif-gpstrack' => 'Κατεύθυνση κίνησης',
+'exif-gpsimgdirectionref' => 'Αναφορές για την κατεύθυνση της εικόνας',
+'exif-gpsimgdirection' => 'Κατεύθυνση της εικόνας',
+'exif-gpsmapdatum' => 'Στοιχεία γεωδετικών μετρήσεων ΄που έχουν χρησιμοποιηθεί',
+'exif-gpsdestlatituderef' => 'Αναφορές για το γεωγραφικό πλάτος του προορισμού',
+'exif-gpsdestlatitude' => 'Αναφορές γεωγραφικού πλάτους',
+'exif-gpsdestlongituderef' => 'Αναφορές για το γεωγραφικό μήκος του προορισμού',
+'exif-gpsdestlongitude' => 'Γεωγραφικό πλάτος προορισμού',
+'exif-gpsdestbearingref' => 'Αναφορές για τις συντεταγμένες προορισμού',
+'exif-gpsdestbearing' => 'Συντεταγμένες προορισμού',
+'exif-gpsdestdistanceref' => 'Αναφορές για την απόσταση μέχρι τον προορισμό',
+'exif-gpsdestdistance' => 'Απόσταση μέχρι τον προορισμό',
+'exif-gpsprocessingmethod' => 'Όνομα μεθόδου επεξεργασίας GPS',
+'exif-gpsareainformation' => 'Όνομα περιοχής GPS',
+'exif-gpsdatestamp' => 'Ημερομηνία GPS',
+'exif-gpsdifferential' => 'Διαφορική διόρθωση GPS',
+
+
+# Make & model, can be wikified in order to link to the camera and model name
+
+'exif-make-value' => '$1',
+'exif-model-value' => '$1',
+'exif-software-value' => '$1',
+
+'exif-compression-1' => 'Έχει αποσυμπιεστεί.',
+'exif-compression-6' => 'JPEG',
+
+'exif-photometricinterpretation-1' => 'RGB',
+'exif-photometricinterpretation-6' => 'YCbCr',
+
+'exif-orientation-1' => 'Φυσικός', // 0th row: top; 0th column: left
+'exif-orientation-2' => 'Έχει αντιστραφεί οριζόντια.', // 0th row: top; 0th column: right
+'exif-orientation-3' => 'Έχει περιστραφεί κατά 180° μοίρες.', // 0th row: bottom; 0th column: right
+'exif-orientation-4' => 'Έχει αντιστραφεί κατακόρυφα.', // 0th row: bottom; 0th column: left
+'exif-orientation-5' => 'Έχει περιστραφεί κατά 90° μοίρες με φορά αντίθετα προς τη φορά των δεικτών του ρολογιού και έχει αντιστραφεί κατακόρυφα.', // 0th row: left; 0th column: top
+'exif-orientation-6' => 'Έχει περιστραφεί κατά 90° μοίρες κατά τη φορά των δεικτών του ρολογιού.', // 0th row: right; 0th column: top
+'exif-orientation-7' => 'Έχει περιστραφεί κατά 90° μοίρες κατά τη φορά των δεικτών του ρολογιού και έχει αντιστραφεί κατακόρυφα.',  // 0th row: right; 0th column: bottom
+'exif-orientation-8' => 'Έχει περιστραφή κατά 90° μοίρες αντίθετα προς τη φορά των δεικτών του ρολογιού.', // 0th row: left; 0th column: bottom
+
+'exif-planarconfiguration-1' => 'πεπλατυσμένος σχηματισμός',
+'exif-planarconfiguration-2' => 'επίπεδος σχηματισμός',
+
+'exif-xyresolution-i' => '$1 dpi',
+'exif-xyresolution-c' => '$1 dpc',
+
+'exif-colorspace-1' => 'sRGB',
+'exif-colorspace-ffff.h' => 'FFFF.H',
+'exif-componentsconfiguration-0' => 'δεν υπάρχει',
+'exif-componentsconfiguration-1' => 'Y',
+'exif-componentsconfiguration-2' => 'Cb',
+'exif-componentsconfiguration-3' => 'Cr',
+'exif-componentsconfiguration-4' => 'R',
+'exif-componentsconfiguration-5' => 'G',
+'exif-componentsconfiguration-6' => 'B',
+
+'exif-exposureprogram-0' => 'Δεν έχει προκαθοριστεί',
+'exif-exposureprogram-1' => 'Χειροκίνητο',
+'exif-exposureprogram-2' => 'Κανονικό πρόγραμμα',
+'exif-exposureprogram-3' => 'Προτεραιότητα διαφράγματος',
+'exif-exposureprogram-4' => 'Προτεραιότητα κλείστρου',
+'exif-exposureprogram-5' => 'Δημιουργικό πρόγραμμα (με προτεραιότητα το βάθος πεδίου)',
+'exif-exposureprogram-6' => 'Δημιουργικό πρόγραμμα (με προτεραιόττηα την ταχύτητα του κλείστρου)',
+'exif-exposureprogram-7' => 'Επιλογή λειτουργίας "πορτραίτου" (για φωτογραφίες closeup με το φόντο εκτός εστίασης)',
+'exif-exposureprogram-8' => 'Επιλογή λειτουργίας "τοπίου" (για φωτογραφίες τοπίου με εστιασμένο φόντο)',
+
+'exif-subjectdistance-value' => '$1 μέτρα',
+'exif-meteringmode-0' => 'Άγνωστη',
+'exif-meteringmode-1' => 'Μέση τιμή',
+'exif-meteringmode-2' => 'Μέση τιμή με έμφαση στο κέντρο',
+'exif-meteringmode-3' => 'Ένα σημείο',
+'exif-meteringmode-4' => 'Πολλά σημεία',
+'exif-meteringmode-5' => 'Μοτίβο',
+'exif-meteringmode-6' => 'Μερική',
+'exif-meteringmode-255' => 'Άλλο',
+'exif-lightsource-0' => 'Άγνωστη',
+'exif-lightsource-1' => 'Φως ημέρας',
+'exif-lightsource-2' => 'Φωσφορίζον',
+'exif-lightsource-3' => 'Tungsten (φωτισμός από λυχνίες πυράκτωσης)',
+'exif-lightsource-4' => 'Φλας',
+'exif-lightsource-9' => 'Αίθριος καιρός',
+'exif-lightsource-10' => 'Συννεφιά',
+'exif-lightsource-11' => 'Σκιά',
+'exif-lightsource-12' => 'Φως ημέρας φωσφορίζον (D 5700 – 7100K)',
+'exif-lightsource-13' => 'Λευκό φως ημέρας  (N 4600 – 5400K)',
+'exif-lightsource-14' => 'Κρύο λευκό φως fluorescent (W 3900 – 4500K)',
+'exif-lightsource-15' => 'Λευκό φως φωσφορίζον (WW 3200 – 3700K)',
+'exif-lightsource-17' => 'Τυποποιημένος φωτισμός A',
+'exif-lightsource-18' => 'Τυποποιημένος φωτισμός B',
+'exif-lightsource-19' => 'Τυποποιημένος φωτισμός C',
+'exif-lightsource-20' => 'D55',
+'exif-lightsource-21' => 'D65',
+'exif-lightsource-22' => 'D75',
+'exif-lightsource-23' => 'D50',
+#'exif-lightsource-24' => 'ISO studio tungsten',
+'exif-lightsource-255' => 'Άλλη πηγή φωτός',
+
+'exif-focalplaneresolutionunit-2' => 'ίντσες',
+
+'exif-sensingmethod-1' => 'Δεν έχει καθοριστεί',
+'exif-sensingmethod-2' => 'One-chip color area sensor',
+'exif-sensingmethod-3' => 'Two-chip color area sensor',
+'exif-sensingmethod-4' => 'Three-chip color area sensor',
+'exif-sensingmethod-5' => 'Color sequential area sensor',
+'exif-sensingmethod-7' => 'Trilinear sensor',
+'exif-sensingmethod-8' => 'Color sequential linear sensor',
+
+'exif-filesource-3' => 'DSC',
+'exif-scenetype-1' => 'Εικόνα που φωτογραφήθηκε απ` ευθείας',
+
+'exif-customrendered-0' => 'Κανονική επεξεργασία',
+'exif-customrendered-1' => 'Ειδική επεξεργασία',
+
+'exif-exposuremode-0' => 'Αυτόματη έκθεση',
+'exif-exposuremode-1' => 'Χειροκίνητη έκθεση',
+'exif-exposuremode-2' => 'Αυτόματο bracket',
+
+'exif-whitebalance-0' => 'Αυτόματη ισορροπία των λευκών',
+'exif-whitebalance-1' => 'Χειροκίνητη ισορροπία των λευκών',
+
+'exif-scenecapturetype-0' => 'Συνήθης',
+'exif-scenecapturetype-1' => 'Τοπίο',
+'exif-scenecapturetype-2' => 'Πορτραίτο',
+'exif-scenecapturetype-3' => 'Νυκτερινή σκηνή',
+
+'exif-gaincontrol-0' => 'Κανένα',
+'exif-gaincontrol-1' => 'Χαμηλό κέρδος επάνω',
+'exif-gaincontrol-2' => 'Υψηλό κέρδος επάνω',
+'exif-gaincontrol-3' => 'Χαμηλό κέρδος κάτω',
+'exif-gaincontrol-4' => 'Υψηλό κέρδος κατω',
+
+'exif-contrast-0' => 'Φυσικό',
+'exif-contrast-1' => 'Απαλό',
+'exif-contrast-2' => 'Ισχυρό',
+
+'exif-saturation-0' => 'Φυσικός',
+'exif-saturation-1' => 'Χαμηλός κορεσμός',
+'exif-saturation-2' => 'Υψηλός κορεσμός',
+
+'exif-sharpness-0' => 'Φυσική',
+'exif-sharpness-1' => 'Απαλή',
+'exif-sharpness-2' => 'Σκληρή',
+
+'exif-subjectdistancerange-0' => 'Άγνωστη',
+'exif-subjectdistancerange-1' => 'Macro',
+'exif-subjectdistancerange-2' => 'Κοντινή λήψη',
+'exif-subjectdistancerange-3' => 'Μακρίνή λήψη',
+
+// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => 'Βόρειο γεωγραφικό πλάτος',
+'exif-gpslatitude-s' => 'Νότιο γεωγραφικό πλάτος',
+
+// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => 'Ανατολικό γεωγραφικό μήκος',
+'exif-gpslongitude-w' => 'Δυτικό γεωγραφικό μήκος',
+
+'exif-gpsstatus-a' => 'Μέτρηση εν εξελίξει',
+'exif-gpsstatus-v' => 'Διαλειτουργικότητα μετρήσεων',
+
+'exif-gpsmeasuremode-2' => 'μέτρηση δύο διαστάσεων',
+'exif-gpsmeasuremode-3' => 'μέτρηση τριών διαστάσεων',
+
+// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-k' => 'Χιλιόμετρα/ώρα',
+'exif-gpsspeed-m' => 'Μίλια/ώρα',
+'exif-gpsspeed-n' => 'Κόμβοι',
+
+// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => 'Πραγματική κατεύθυνση',
+'exif-gpsdirection-m' => 'Μαγνητική κατεύθυνση',
+
+
+# external editor support
+#-------------------------------------#
+'edit-externally' => 'Επεξεργαστείτε το συγκεκριμένο αρχείο χρησιμοποιώντας μια από τις εξωτερικές εφαρμογές.',
+'edit-externally-help' => 'Για περισσότερες πληροφορίες ακολουθήστε το σύνδεσμο: [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions].',
+
+
+# 'all' in various places, this might be different for inflicted languages
+#---------------------------------------------------------------------------------------------------------#
+'recentchangesall' => 'όλες',
+'imagelistall' => 'όλες',
+'watchlistall1' => 'όλες',
+'watchlistall2' => 'όλες',
+'contributionsall' => 'όλες',
+
+
+# E-mail address confirmation
+#--------------------------------------------#
+'confirmemail' => 'Επαλήθευση διεύθυνσης e-mail',
+
+'confirmemail_text' => 'Το σύστημα χρειάζεται να επαληθεύσει τη διεύθυνση e-mail που δώσατε για να χρησιμοποιήσετε τις δυνατότητες αλληλογραφίας. Κάνετε κλικ στο παρακάτω κουμπί και θα σας αποσταλεί μήνυμα επαλήθευσης στη διεύθυνσή σας. Στο μήνυμα αυτό θα εμφανίζεται ένας σύνδεσμος που Θα περιέχει τον κωδικό επαλήθευσης -ακολουθήστε το σύνδεσμο αυτό για να μπορέσει το σύστημα να επαληθεύσει τη διεύθυνση αλληλογραφίας σας.',
+
+'confirmemail_send' => 'Αποστολή κωδικού επαλήθευσης με e-mail .',
+'confirmemail_sent' => 'Το μήνυμα επαλήθευσης έχει σταλεί, ελέγξτε την αλληλογραφία σας.',
+'confirmemail_sendfailed' => 'Δεν ήταν δυνατή η αποστολή του μηνύματος επαλήθευσης. Ελέγξτε την ηλεκτρονική διεύθυνση που συμπληρώσατε για πιθανά λάθη πληκτρολόγησης.',
+'confirmemail_invalid' => 'Λάθος κωδικός επαλήθευσης. Είναι πιθανόν ο κωδικός σας να έχει λήξει.',
+'confirmemail_success' => 'Η ηλεκτρονική σας διεύθυνση σας επαληθεύτηκε. Μπορείτε πλέον να συνδεθείτε και να απολαύσετε τις δυνατότητες του Wiκi.',
+'confirmemail_loggedin' => 'Η ηλεκτρονική σας διεύθυνση επαληθεύτηκε.',
+'confirmemail_error' => 'Παρουσιάστηκε λάθος κατά την αποθήκευση των ρυθμίσεών σας.',
+'confirmemail_subject' => 'Επαλήθευση ηλεκτρονικής διεύθυνσης του {{SITENAME}}',
+
+'confirmemail_body' =>  'Κάποιος, πιθανόν εσείς από τη διεύθυνση IP $1, δημιούργησε στο {{SITENAME}} ένα λογαριασμό χρήστη "$2" με τη συγκεκριμένη ηλεκτρονική διεύθυνση. 
+
+Για να επιβεβαιώσετε ότι αυτός ο λογαριασμός χρήστη ανήκει πραγματικά σε εσάς και για να ενεργοποιηθούν οι δυνατότητες e-mail του {{SITENAME}}, ακολουθήστε αυτό το σύνδεσμο:
+
+$3
+
+Αν ο χρήστης που δημιούργησε το συγκεκριμένο λογαριασμό δεν είστε εσείς, μην ακολουθήστε το σύνδεσμο. Ο κωδικός επιβεβαίωσης θα λήξει στις $4',
+
+
+
+# Inputbox extension, may be useful in other contexts as well
+#----------------------------------------------------------------------------------------------#
+'tryexact' => 'Δοκιμάστε την επακριβή αντιστοιχία.',
+'searchfulltext' => 'Αναζήτηση με το πλήρες κείμενο',
+'createarticle' => 'Δημιουργία άρθρου',
+
+
+# Scary transclusion
+#------------------------------#
+'scarytranscludedisabled' => '[Η ενσωμάτωση εξωτερικών ιστοσελίδων σε αυτό το Wiki είναι απενεργοποιημένη.]',
+'scarytranscludefailed' => '[Λυπούμαστε, η προσκόμιση προτύπου για το $1 απέτυχε.]',
+'scarytranscludetoolong' => '[Λυπούμαστε η διεύθυνση URL είναι πολύ μεγάλη.]',
+
+
+# Trackbacks
+#------------------#
+/*'trackbackbox' => '<div id=\'mw_trackbacks\'>
+Trackbacks for this article:<br/>
+$1
+</div>',
+*/
+'trackback' => '; $4$5 : [$2 $1]',
+'trackbackexcerpt' => '; $4$5 : [$2 $1]: <nowiki>$3</nowiki>',
+'trackbackremove' => ' ([$1΄- Διαγραφή])',
+'trackbacklink' => 'Επιστροφή για αναζήτηση',
+'trackbackdeleteok' => 'Η επιστροφή για αναζήτηση έχει διαγραφεί επιτυχώς.',
+
+
 );
 
 /** @package MediaWiki */
@@ -73,19 +2004,19 @@ class LanguageEl extends LanguageUtf8 {
 		global $wgNamespaceNamesEl;
 		return $wgNamespaceNamesEl;
 	}
-
+	
 	function getMessage( $key ) {
 		global $wgAllMessagesEl;
 
 		return isset( $wgAllMessagesEl[$key] ) ? $wgAllMessagesEl[$key] : parent::getMessage( $key );
 	}
-
+	
 	function fallback8bitEncoding() {
-		return 'windows-1253';
+		return 'iso-8859-7';
 	}
-
-	function formatNum( $number ) {
-		return strtr($number, '.,', ',.' );
+	
+	function formatNum( $number, $year = false ) {
+		return $year ? $number : strtr($this->commafy( $number ), '.,', ',.' );
 	}
 }
 
-- 
cgit v1.2.3


From 7c23ad61f020ce18aa5928ed2f0fdc310d6a3f19 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 30 Sep 2005 22:06:40 +0000
Subject: Reverting hook in getRevisionText() which was added with no
 explanation of what it's meant to do. Incorrect modification in this location
 would cause data corruption, so is almost certainly wrong.

---
 includes/Revision.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/includes/Revision.php b/includes/Revision.php
index ee2d4976c22b..e7e9b3ba4407 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -471,7 +471,6 @@ class Revision {
 			global $wgInputEncoding, $wgContLang;
 			$text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
 		}
-		wfRunHooks( 'RevisionAfterGetRevisionText', array( &$text ) );
 		wfProfileOut( $fname );
 		return $text;
 	}
-- 
cgit v1.2.3


From c269794f2be72b7cd2111d4addd10b183d2b3e6a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 5 Oct 2005 01:24:23 +0000
Subject: * (bug 3595) Warn and abort if importDump.php called in read-only
 mode.

---
 RELEASE-NOTES              | 1 +
 maintenance/importDump.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eaf7de000a7b..c70005e02195 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -774,6 +774,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   by default when 'watchdefault' option is on
 * (bug 3182) Clear link cache during import to prevent memory leak
 * (bug 3573) Full Greek Translation
+* (bug 3595) Warn and abort if importDump.php called in read-only mode.
 
 
 === Caveats ===
diff --git a/maintenance/importDump.php b/maintenance/importDump.php
index 3a58550c6b1c..f4e8d3c87728 100644
--- a/maintenance/importDump.php
+++ b/maintenance/importDump.php
@@ -111,6 +111,10 @@ class BackupReader {
 	}
 }
 
+if( wfReadOnly() ) {
+	die( "Wiki is in read-only mode; you'll need to disable it for import to work.\n" );
+}
+
 $reader = new BackupReader();
 if( isset( $options['quiet'] ) ) {
 	$reader->reporting = false;
-- 
cgit v1.2.3


From cfc4e7c808b87beeeb1bd85c8374a291fd7750da Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 5 Oct 2005 01:34:09 +0000
Subject: * (bug 3598) Update message cache on message page deletion, patch by
 Tietew

---
 RELEASE-NOTES        |  1 +
 includes/Article.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c70005e02195..f885caa4785f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -775,6 +775,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3182) Clear link cache during import to prevent memory leak
 * (bug 3573) Full Greek Translation
 * (bug 3595) Warn and abort if importDump.php called in read-only mode.
+* (bug 3598) Update message cache on message page deletion, patch by Tietew
 
 
 === Caveats ===
diff --git a/includes/Article.php b/includes/Article.php
index 960e5b099343..4e3d291fb544 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2357,8 +2357,14 @@ class Article {
 		}
 	}
 
-	function onArticleDelete($title_obj) {
-		$title_obj->touchLinks();
+	function onArticleDelete( $title ) {
+		global $wgMessageCache;
+		
+		$title->touchLinks();
+		
+		if( $title->getNamespace() == NS_MEDIAWIKI) {
+			$wgMessageCache->replace( $title->getDBkey(), false );
+		}
 	}
 
 	function onArticleEdit($title_obj) {
-- 
cgit v1.2.3


From bf701ab576edb48c7526b6139075b40dcc77b8c8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 6 Oct 2005 02:45:42 +0000
Subject: * Blacklist additional MSIE CSS safety tricks Bump to 1.5.0

---
 RELEASE-NOTES                | 254 ++++++++++++++++++++++++-------------------
 UPGRADE                      |   4 +-
 includes/DefaultSettings.php |   2 +-
 includes/Sanitizer.php       |  18 ++-
 maintenance/parserTests.txt  |  39 +++++++
 5 files changed, 198 insertions(+), 119 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f885caa4785f..0b783459c70a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,147 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5.0 final ==
+
+October 5, 2005
+
+MediaWiki 1.5.0 is the new stable release branch of MediaWiki, and is
+recommended for all new installations.
+
+Any wikis running a 1.5 beta or release candidate are strongly recommended
+to upgrade to the final release, which includes a number of bug fixes and
+a security fix for CSS bugs in Microsoft Internet Explorer.
+
+IMPORTANT: Running a 1.3 or 1.4 wiki and don't want to jump to 1.5 yet?
+Be sure to upgrade to 1.3.17 or 1.4.11, also released today. Versions
+prior to 1.3.16 and 1.4.10 have a serious data corruption bug which is
+triggered by a spambot known to operate in the wild.
+
+
+=== What's new in 1.5? ===
+
+Schema:
+  The core table schema has changed significantly. This should make better
+  use of the database's cache and disk I/O, and make significantly speed up
+  rename and delete operations on pages with very long edit histories.
+  
+  Unfortunately this does mean upgrading a wiki of size from 1.4 will require
+  some downtime for the schema restructuring, but future storage backend
+  changes should be able to integrate into the new system more easily.
+
+Permalinks:
+  The current revision of a page now has a permanent 'oldid' number assigned
+  immediately, and the id numbers are now preserved across deletion/undeletion.
+  A permanent reference to the current revision of a page is now just a matter
+  of going to the 'history' tab and copying the first link in the list.
+
+Page move log:
+  Renames of pages are now recorded in Special:Log and the page history.
+  A handy revert link is available from the log for sysops.
+
+Editing diff:
+  Ever lost track of what you'd done so far during an edit? A 'Show diff'
+  button on the edit page now makes it easy to remember.
+
+Uploads:
+  It's now possible to specify the final filename of an upload distinct
+  from the original filename on your disk.
+  
+  An image link for a missing file will now take you straight to the upload page.
+  
+  More metadata is pre-extracted from uploaded images, which will ease pressure
+  on disk or NFS volumes used to store images. EXIF metadata is displayed on
+  the image description page if PHP is configured with the necessary module.
+  
+  If .svg files are added to the upload whitelist, you can choose to render
+  them to rasterized .png images for inline display using one of several
+  external helper programs. See DefaultSettings.php for SVG options.
+
+User accounts:
+  There are some changes to the user permissions system, with assignable
+  groups. Note that this does *not* allow you to make pages which are only
+  accessible to certain groups.
+  
+  For details see: http://meta.wikimedia.org/wiki/Help:User_rights
+
+E-mail:
+  User-to-user e-mail can now be restricted to require a mail-back confirmation
+  first to reduce potential for abuse with false addresses.
+  
+  Updates to user talk pages and watchlist entries can optionally send e-mail
+  notifications.
+
+External hooks:
+  A somewhat experimental interface for hooking in an external editor
+  application is included.
+
+And...
+  A bunch of stuff we forgot to mention.
+
+
+=== What's gone? ===
+
+Latin-1:
+  Wikis must now be encoded in Unicode UTF-8; this has been the default for
+  some time, but some languages could optionally be installed in Latin-1 mode.
+  This is no longer supported.
+  
+  You can check if your current wiki is in Latin-1 mode by using your browser's
+  "view source"; look for a line like this:
+  
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  
+  If it says charset=utf-8, you're ready. If it says charset=iso8859-1,
+  you may need to convert your data. (English-language wikis avoiding
+  any accented characters may be able to get away without conversion.)
+
+MySQL 3.x:
+  Some optimization hacks for MySQL 3.x have been removed as part of the schema
+  clean-up (specifically, the inverse_timestamp fields).
+  
+  MediaWiki 1.5 may still run on 3.x, but wikis of non-trivial size should
+  very seriously consider upgrading to a more modern release. MySQL 3.x support
+  will probably be entirely dropped in the next major release.
+
+Special:Maintenance
+  These tools were, ironically enough, not really maintained. This special
+  page has been removed; insofar as some of its pieces were useful and haven't
+  already been supplanted by other special pages they should be rewritten in
+  an efficient and safe manner in the future.
+
+
+=== Caveats ===
+
+Upgrade:
+  Wikis in Latin-1 encoding are no longer supported; only Unicode UTF-8.
+  A new option $wgLegacyEncoding is provided to allow on-the-fly recoding of
+  old page text entries, but other metadata fields (titles, comments etc) need
+  to be pre-converted. The standard upgrade process does not yet fully automate
+  this, but you can try the alternate partial-upgrader in upgrade1_5.php.
+  
+  The upgrade from 1.4 to 1.5 schema has not been tested for all cases, so
+  it's possible you may experience problems in some combinations.
+
+Backups:
+  The text entries of deleted pages are no longer removed from the main
+  text table on deletion. If you provide public backup dumps of your databases,
+  you will probably want to use the new XML-format dump generator, available
+  as maintenance/dumpBackup.php.
+  
+  For more information on how we run our own public data dumps at Wikimedia,
+  see http://meta.wikimedia.org/wiki/Data_dumps
+
+PostgreSQL:
+  The table definitions for PostgreSQL install are out of date. PostgreSQL
+  support may return in later releases, pending appropriate patches.
+
+MySQL 4.1+:
+  Some users may encounter installation problems with MySQL 4.1 or higher
+  due to strange charset encoding / collation configurations. Try setting
+  to 'latin1' or 'utf8' if you encounter problems.
+
+
+
 == MediaWiki 1.5 release candidate 4 ==
 
 August 29, 2005
@@ -167,117 +308,7 @@ NOT to run a live production web site on this alpha release.
 **  DON'T SAY WE DIDN'T WARN YOU, MAN. WE TOTALLY DID RIGHT HERE.  **
 
 
-=== Big changes ===
-
-Schema:
-  The core table schema has changed significantly. This should make better
-  use of the database's cache and disk I/O, and make significantly speed up
-  rename and delete operations on pages with very long edit histories.
-  
-  Unfortunately this does mean upgrading a wiki of size from 1.4 will require
-  some downtime for the schema restructuring, but future storage backend
-  changes should be able to integrate into the new system more easily.
-
-Permalinks:
-  The current revision of a page now has a permanent 'oldid' number assigned
-  immediately, and the id numbers are now preserved across deletion/undeletion.
-  A permanent reference to the current revision of a page is now just a matter
-  of going to the 'history' tab and copying the first link in the list.
-
-Page move log:
-  Renames of pages are now recorded in Special:Log and the page history.
-  A handy revert link is available from the log for sysops.
-
-Editing diff:
-  Ever lost track of what you'd done so far during an edit? A 'Show diff'
-  button on the edit page now makes it easy to remember.
-
-Uploads:
-  It's now possible to specify the final filename of an upload distinct
-  from the original filename on your disk.
-  
-  An image link for a missing file will now take you straight to the upload page.
-  
-  More metadata is pre-extracted from uploaded images, which will ease pressure
-  on disk or NFS volumes used to store images. EXIF metadata is displayed on
-  the image description page if PHP is configured with the necessary module.
-
-User accounts:
-  There are some changes to the user permissions system, with assignable
-  groups. This is still somewhat in flux; do not rely on the present system
-  that you see in this alpha to still be there.
-
-E-mail:
-  User-to-user e-mail can now be restricted to require a mail-back confirmation
-  first to reduce potential for abuse with false addresses.
-  
-  Updates to user talk pages and watchlist entries can optionally send e-mail
-  notifications.
-
-External hooks:
-  A somewhat experimental interface for hooking in an external editor
-  application is included. This may not be on by default in final release,
-  depending on support.
-
-And...
-  A bunch of stuff we forgot to mention.
-
-
-=== What's gone? ===
-
-Latin-1:
-  Wikis must now be encoded in Unicode UTF-8; this has been the default for
-  some time, but some languages could optionally be installed in Latin-1 mode.
-  This is no longer supported.
-
-MySQL 3.x:
-  Some optimization hacks for MySQL 3.x have been removed as part of the schema
-  clean-up (specifically, the inverse_timestamp fields). MediaWiki 1.5 should
-  still run, but wikis of significant size should very seriously consider
-  upgrading to a more modern release. MySQL 3.x support will probably be
-  entirely dropped in the next major release later this year.
-
-Special:Maintenance
-  These tools were, ironically enough, not really maintained. This special
-  page has been removed; insofar as some of its pieces were useful and haven't
-  already been supplanted by other special pages they should be rewritten in
-  an efficient and safe manner in the future.
-
-
-=== What's still waiting? ===
-
-These things should be fixed by the time 1.5.0 final is released:
-
-Upgrade:
-  Wikis in Latin-1 encoding are no longer supported; only Unicode UTF-8.
-  A new option $wgLegacyEncoding is provided to allow on-the-fly recoding of
-  old page text entries, but other metadata fields (titles, comments etc) need
-  to be pre-converted. The upgrade process does not yet fully automate this.
-  
-  In general the upgrade from 1.4 to 1.5 schema has not been tested for all
-  cases, and there may be problems.
-
-Backups:
-  The text entries of deleted pages are no longer removed from the main
-  text table on deletion. If you provide public backup dumps of your databases,
-  you will probably want to use the new XML-format dump generator... but
-  this hasn't been finished yet.
-
-PostgreSQL:
-  The table definitions for PostgreSQL install are out of date, and patches
-  to support PostgreSQL from the main installer are still pending.
-
-MySQL 4.1+:
-  Proper charset encoding / collation configuration for installs on MySQL 4.1
-  and higher still needs to be fiddled with. Some bits may fail on the UTF-8
-  setting due to some long field keys.
-
-Authentication plugin fixes:
-  The AuthPlugin interface needs some improvements to work better with LDAP,
-  HTTP basic auth, and other such environments. Some patches are pending.
-
-
-=== Smaller changes ===
+=== Smaller changes since 1.4 ===
 
 Various bugfixes, small features, and a few experimental things:
 
@@ -776,6 +807,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3573) Full Greek Translation
 * (bug 3595) Warn and abort if importDump.php called in read-only mode.
 * (bug 3598) Update message cache on message page deletion, patch by Tietew
+* Blacklist additional MSIE CSS safety tricks
 
 
 === Caveats ===
diff --git a/UPGRADE b/UPGRADE
index dffa094f1103..ae841ea96022 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -20,9 +20,9 @@ Basically, to upgrade a wiki you:
 == IMPORTANT: Upgrading to 1.5 ==
 
 Major changes have been made to the schema from 1.4.x. The updater
-has not been fully tested for all conditions, and might well break.
+has not been fully tested for all conditions, and might well break
+under some combinations of versions.
 
-DO NOT ATTEMPT TO UPGRADE A LIVE, PUBLIC SITE TO 1.5 AT THIS TIME.
 NEVER EVER ATTEMPT TO PERFORM AN UPGRADE WITHOUT BACKING UP FIRST!
 
 On a large site, the schema update might take a long time. It might
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a6318421054b..cd606cfc3f46 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5rc4';
+$wgVersion			= '1.5.0';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 04ca272e546f..fbf70fc05c79 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -554,11 +554,19 @@ class Sanitizer {
 			
 			# Strip javascript "expression" from stylesheets.
 			# http://msdn.microsoft.com/workshop/author/dhtml/overview/recalc.asp
-			if( $attribute == 'style' && preg_match(
-				'/(expression|tps*:\/\/|url\\s*\().*/is',
-					Sanitizer::decodeCharReferences( $value ) ) ) {
-				# haxx0r
-				continue;
+			if( $attribute == 'style' ) {
+				// Remove any comments; IE gets token splitting wrong
+				$value = preg_replace( '!/\\*.*?\\*/!S', ' ', $value );
+				
+				$stripped = Sanitizer::decodeCharReferences( $value );
+				$stripped = preg_replace( '!\\\\([0-9A-Fa-f]{1,6})[ \\n\\r\\t\\f]?!e',
+					'codepointToUtf8(hexdec("$1"))', $stripped );
+				$stripped = str_replace( '\\', '', $stripped );
+				if( preg_match( '/(expression|tps*:\/\/|url\\s*\().*/is',
+						$stripped ) ) {
+					# haxx0r
+					continue;
+				}
 			}
 			
 			# Templates and links may be expanded in later parsing,
diff --git a/maintenance/parserTests.txt b/maintenance/parserTests.txt
index e9a93009853d..d69e0ad25b0b 100644
--- a/maintenance/parserTests.txt
+++ b/maintenance/parserTests.txt
@@ -2637,6 +2637,45 @@ Table attribute safety
 !! end
 
 
+# More MSIE fun discovered by Tom Gilder
+
+!! test
+MSIE CSS safety test: spurious slash
+!! input
+<div style="background-image:u\rl(javascript:alert('boo'))">evil</div>
+!! result
+<div>evil</div>
+
+!! end
+
+!! test
+MSIE CSS safety test: hex code
+!! input
+<div style="background-image:u\72l(javascript:alert('boo'))">evil</div>
+!! result
+<div>evil</div>
+
+!! end
+
+!! test
+MSIE CSS safety test: comment in url
+!! input
+<div style="background-image:u/**/rl(javascript:alert('boo'))">evil</div>
+!! result
+<div style="background-image:u rl(javascript:alert('boo'))">evil</div>
+
+!! end
+
+!! test
+MSIE CSS safety test: comment in expression
+!! input
+<div style="background-image:expres/**/sion(alert('boo4'))">evil4</div>
+!! result
+<div style="background-image:expres sion(alert('boo4'))">evil4</div>
+
+!! end
+
+
 TODO:
 more images
 more tables
-- 
cgit v1.2.3


From d9f504cf305843b430a943d30326aca3ed8efd68 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 6 Oct 2005 23:35:23 +0000
Subject: * (bug 3629) Fix date & time format for Frisian backport from HEAD

---
 RELEASE-NOTES            |  5 +++
 languages/LanguageFy.php | 79 +++++++++++++++++++++++++++++++++---------------
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0b783459c70a..e9f5aed50093 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -810,6 +810,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Blacklist additional MSIE CSS safety tricks
 
 
+=== Changes since 1.5.0 ===
+
+* (bug 3629) Fix date & time format for Frisian
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/languages/LanguageFy.php b/languages/LanguageFy.php
index ba85faacd61a..f32586b19a59 100644
--- a/languages/LanguageFy.php
+++ b/languages/LanguageFy.php
@@ -42,9 +42,9 @@ if($wgMetaNamespace === FALSE)
 
 /* private */ $wgDateFormatsFy = array(
 	'Gjin foarkar',
-	'16:12, jan 15, 2001',
-	'16:12, 15 jan 2001',
-	'16:12, 2001 jan 15',
+	'16.12, jan 15, 2001',
+	'16.12, 15 jan 2001',
+	'16.12, 2001 jan 15',
 	'ISO 8601' => '2001-01-15 16:12:34'
 );
 
@@ -948,36 +948,67 @@ class LanguageFy extends LanguageUtf8 {
 		return $wgDateFormatsFy;
 	}
 
-	function date( $ts, $adj = false ) {
+	/**
+	 * @access public
+	 * @param mixed  $ts the time format which needs to be turned into a
+	 *               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	 * @param bool   $adj whether to adjust the time output according to the
+	 *               user configured offset ($timecorrection)
+	 * @param bool   $format true to use user's date format preference
+	 * @param string $timecorrection the time offset as returned by
+	 *               validateTimeZone() in Special:Preferences
+	 * @return string
+	 */
+	function date( $ts, $adj = false, $format = true, $timecorrection = false ) {
 		global $wgUser;
 
-		if ( $adj ) { $ts = $this->userAdjust( $ts ); }
-
-		switch ( $wgUser->getOption( 'date' ) ) {
-			# jan 8, 2001
-			case '0': case '1': return $d = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) )
-				. ' ' . (0 + substr( $ts, 6, 2 )) . ', ' . substr( $ts, 0, 4 );
-			# 8 jannewaris 2001
-			case '2': return (0 + substr( $ts, 6, 2 )) . ' ' .
-				$this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . ' ' .
-				substr( $ts, 0, 4 );
-			case 'ISO 8601': return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
-			# 2001 jannewaris 8
-			default: return substr( $ts, 0, 4 ) . ' ' .
-				$this->getMonthAbbreviation( substr( $ts, 4, 2 ) )
-				. ' ' . (0 + substr( $ts, 6, 2 ));
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+
+		$datePreference = $this->dateFormat( $format );
+
+		$month = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) );
+		$day = $this->formatNum( 0 + substr( $ts, 6, 2 ) );
+		$year = $this->formatNum( substr( $ts, 0, 4 ), true );
+
+		switch( $datePreference ) {
+			case MW_DATE_DMY: return "$day $month $year";
+			case MW_DATE_YMD: return "$year $month $day";
+			case MW_DATE_ISO: return substr($ts, 0, 4). '-' . substr($ts, 4, 2). '-' .substr($ts, 6, 2);
+			default: return "$month $day, $year";
 		}
 	}
 
-	function timeanddate( $ts, $adj = false ) {
+	/**
+	* @access public
+	* @param mixed  $ts the time format which needs to be turned into a
+	*               date('YmdHis') format with wfTimestamp(TS_MW,$ts)
+	* @param bool   $adj whether to adjust the time output according to the
+	*               user configured offset ($timecorrection)
+	* @param bool   $format true to use user's date format preference
+	* @param string $timecorrection the time offset as returned by
+	*               validateTimeZone() in Special:Preferences
+	* @return string
+	*/
+	function time( $ts, $adj = false, $format = true, $timecorrection = false ) {
 		global $wgUser;
 
-		switch ( $wgUser->getOption( 'date' ) ) {
-			case 'ISO 8601': return $this->date( $ts, $adj ) . ' ' . $this->time( $ts, $adj );
-			default: return $this->time( $ts, $adj ) . ', ' . $this->date( $ts, $adj );
+		if ( $adj ) { $ts = $this->userAdjust( $ts, $timecorrection ); }
+		$datePreference = $this->dateFormat( $format );
+
+		if ( $datePreference == MW_DATE_ISO ) {
+			$sep = ':';
+		} else {
+			$sep = '.';
 		}
-	}
+		
+		$t = substr( $ts, 8, 2 ) . $sep . substr( $ts, 10, 2 );
 
+		if ( $datePreference == MW_DATE_ISO ) {
+			$t .= $sep . substr( $ts, 12, 2 );
+		}
+		return $this->formatNum( $t );
+	}
+	
 	function getMessage( $key ) {
 		global $wgAllMessagesFy;
 		if( isset( $wgAllMessagesFy[$key] ) ) {
-- 
cgit v1.2.3


From 2fb8c47e46053736b7a0a2302ff0659743d00a0f Mon Sep 17 00:00:00 2001
From: Tom Gilder <tomgilder@users.mediawiki.org>
Date: Thu, 6 Oct 2005 23:39:57 +0000
Subject: (bug 3635) Premature instantiation of User object

---
 includes/User.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 902283182495..478efde5578b 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -50,8 +50,6 @@ class User {
 	 * @static
 	 */
 	function newFromName( $name ) {
-		$u = new User();
-
 		# Force usernames to capital
 		global $wgContLang;
 		$name = $wgContLang->ucfirst( $name );
@@ -71,6 +69,7 @@ class User {
 			return null;
 		}
 
+		$u = new User();
 		$u->setName( $canonicalName );
 		$u->setId( $u->idFromName( $canonicalName ) );
 		return $u;
-- 
cgit v1.2.3


From 93d16a0a5c6a80640409cea664149751df373106 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 7 Oct 2005 20:55:26 +0000
Subject: * (bug 3641) Fix handling of unrecognized file uploads with known
 extensions Copy fix from HEAD.

---
 RELEASE-NOTES              |  1 +
 includes/SpecialUpload.php | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e9f5aed50093..43e6d6250ad0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -813,6 +813,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 === Changes since 1.5.0 ===
 
 * (bug 3629) Fix date & time format for Frisian
+* (bug 3641) Fix handling of unrecognized file uploads with known extensions
 
 
 === Caveats ===
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index cac683657915..b12067421f54 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -697,14 +697,18 @@ class UploadForm {
 	 */
 	function verifyExtension( $mime, $extension ) {
 		$fname = 'SpecialUpload::verifyExtension';
-		
-		if (!$mime || $mime=="unknown" || $mime=="unknown/unknown") {
-			wfDebug( "$fname: passing file with unknown mime type\n" );
-			return true; 
-		}
-		
-		$magic=& wfGetMimeMagic();
-		
+
+		$magic =& wfGetMimeMagic();
+
+		if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' )
+			if ( ! $magic->getTypesForExtension( $extension ) ) {
+				wfDebug( "$fname: passing file with unknown mime type and unknown extension\n" );
+				return true;
+			} else {
+				wfDebug( "$fname: rejecting file with unknown mime type but known extension\n" );
+				return false;
+			}
+
 		$match= $magic->isMatchingExtension($extension,$mime);
 		
 		if ($match===NULL) {
-- 
cgit v1.2.3


From 9a9f7f00d24e0b4dcf4d427f300425d765eaef61 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 7 Oct 2005 21:40:46 +0000
Subject: * (bug 3643) Fix image page display of large images with resizing
 disabled

---
 RELEASE-NOTES          | 1 +
 includes/ImagePage.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 43e6d6250ad0..3a65d86da73a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -814,6 +814,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * (bug 3629) Fix date & time format for Frisian
 * (bug 3641) Fix handling of unrecognized file uploads with known extensions
+* (bug 3643) Fix image page display of large images with resizing disabled
 
 
 === Caveats ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 8ce5fbb5358f..d67a3e23d4fd 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -172,14 +172,14 @@ class ImagePage extends Article {
 					if( $wgUseImageResize ) {
 						$thumbnail = $this->img->getThumbnail( $width );
 						if ( $thumbnail == null ) {
-							$url = $img->getViewURL();
+							$url = $this->img->getViewURL();
 						} else {
 							$url = $thumbnail->getURL();
 						}
 					} else {
 						# No resize ability? Show the full image, but scale
 						# it down in the browser so it fits on the page.
-						$url = $img->getViewURL();
+						$url = $this->img->getViewURL();
 					}
 					$anchoropen  = "<a href=\"{$full_url}\">";
 					$anchorclose = "</a><br />";
-- 
cgit v1.2.3


From e879cebcdfb00f66718a4db9f776c0f6f211234e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 8 Oct 2005 05:58:36 +0000
Subject: Copy fixes to fix from head

---
 includes/MimeMagic.php     | 21 +++++++++++++++++++++
 includes/SpecialUpload.php |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index 5be0ee602954..d72041256522 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -304,6 +304,27 @@ class MimeMagic {
 		return in_array( $mime, $types );
 	}
 	
+	/**
+	 * Returns true if the extension represents a type which can
+	 * be reliably detected from its content. Use this to determine
+	 * whether strict content checks should be applied to reject
+	 * invalid uploads; if we can't identify the type we won't
+	 * be able to say if it's invalid.
+	 *
+	 * @todo Be more accurate when using fancy mime detector plugins;
+	 *       right now this is the bare minimum getimagesize() list.
+	 * @return bool
+	 */
+	function isRecognizableExtension( $extension ) {
+		static $types = array(
+			'gif', 'jpeg', 'jpg', 'png', 'swf', 'psd',
+			'bmp', 'tiff', 'tif', 'jpc', 'jp2',
+			'jpx', 'jb2', 'swc', 'iff', 'wbmp',
+			'xbm'
+		);
+		return in_array( strtolower( $extension ), $types );
+	}
+	
 	
 	/** mime type detection. This uses detectMimeType to detect the mim type of the file,
 	* but applies additional checks to determine some well known file formats that may be missed
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index b12067421f54..52d145b88e2e 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -701,11 +701,11 @@ class UploadForm {
 		$magic =& wfGetMimeMagic();
 
 		if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' )
-			if ( ! $magic->getTypesForExtension( $extension ) ) {
-				wfDebug( "$fname: passing file with unknown mime type and unknown extension\n" );
+			if ( ! $magic->isRecognizableExtension( $extension ) ) {
+				wfDebug( "$fname: passing file with unknown detected mime type; unrecognized extension '$extension', can't verify\n" );
 				return true;
 			} else {
-				wfDebug( "$fname: rejecting file with unknown mime type but known extension\n" );
+				wfDebug( "$fname: rejecting file with unknown detected mime type; recognized extension '$extension', so probably invalid file\n" );
 				return false;
 			}
 
-- 
cgit v1.2.3


From 0ac04d94b72aba0779e1b0c9283e5e2735a14e2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Sun, 9 Oct 2005 06:03:49 +0000
Subject: * Added a hook to allow extensions to modify the redirect behaviour

---
 includes/Article.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 4e3d291fb544..ca01130ee61c 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -756,14 +756,14 @@ class Article {
 				$wgOut->setRobotpolicy( 'noindex,follow' );
 			}
 			if ( '' != $this->mRedirectedFrom ) {
-				$sk = $wgUser->getSkin();
-				$redir = $sk->makeKnownLink( $this->mRedirectedFrom, '',
-				  'redirect=no' );
-				$s = wfMsg( 'redirectedfrom', $redir );
-				$wgOut->setSubtitle( $s );
-
-				# Can't cache redirects
-				$pcache = false;
+				if ( wfRunHooks( 'ArticleViewRedirect', array( &$this ) ) ) {
+					$sk = $wgUser->getSkin();
+					$redir = $sk->makeKnownLink( $this->mRedirectedFrom, '', 'redirect=no' );
+					$s = wfMsg( 'redirectedfrom', $redir );
+					$wgOut->setSubtitle( $s );
+					# Can't cache redirects
+					$pcache = false;
+				}
 			} elseif ( !empty( $rdfrom ) ) {
 				global $wgRedirectSources;
 				if( $wgRedirectSources && preg_match( $wgRedirectSources, $rdfrom ) ) {
-- 
cgit v1.2.3


From 2a0b5723ec9d9067ff2b25b284d6d360f07ebc76 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 11 Oct 2005 05:35:01 +0000
Subject: * Fix meta robots tag on Special:Version again to avoid listing
 vulnerable   versions for convenient harvesting by automated worms

---
 RELEASE-NOTES               | 2 ++
 includes/SpecialVersion.php | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3a65d86da73a..4571b543a9db 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -815,6 +815,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3629) Fix date & time format for Frisian
 * (bug 3641) Fix handling of unrecognized file uploads with known extensions
 * (bug 3643) Fix image page display of large images with resizing disabled
+* Fix meta robots tag on Special:Version again to avoid listing vulnerable
+  versions for convenient harvesting by automated worms
 
 
 === Caveats ===
diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index d854b44eb168..8e8112907dae 100644
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -35,7 +35,6 @@ class SpecialVersion {
 	function execute() {
 		global $wgOut;
 		
-		$wgOut->setRobotpolicy( 'index,follow' );
 		$wgOut->addWikiText( $this->MediaWikiCredits() . $this->extensionCredits() );
 		$wgOut->addHTML( $this->IPInfo() );
 	}
-- 
cgit v1.2.3


From 7b1b9147e54c9455b0f1360c858255b241efc895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Tue, 11 Oct 2005 21:25:21 +0000
Subject: Bug 3497: Update to the German translation (1.5)

---
 languages/LanguageDe.php | 89 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 81 insertions(+), 8 deletions(-)

diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index b91937b64cfd..8331e628be50 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -93,6 +93,9 @@ if($wgMetaNamespace === FALSE)
 'tog-enotifrevealaddr' 		=> 'Ihre E-Mail-Adresse wird in Benachrichtigungsmails gezeigt',
 'tog-shownumberswatching' 	=> 'Zeige die Anzahl seitenbeobachtender Benutzer (in Letzte Änderungen, Beobachtungsliste und Artikelseiten)',
 'tog-fancysig'			=> 'Einfache Unterschrift (Spitzname ohne Link)',
+'tog-externaleditor' => 'Benutze standardmäßig externen Editor',
+'tog-externaldiff' => 'Benutze standardmäßig externen Diff',
+
 # Dates
 'sunday' => "Sonntag",
 'monday' => "Montag",
@@ -230,6 +233,14 @@ und das [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Benutzerhandbuc
 "restorelink" => "$1 gelöschte Bearbeitungsvorgänge",
 "feedlinks" => "Feed:",
 
+# Namespace form on various pages
+'namespace' => 'Namensraum:',
+'invert' => 'Kehre Selektion um',
+
+# 'all' in various places, this might be different for inflected languages
+'watchlistall2' => 'Alles',
+'namespacesall' => 'Alle',
+
 # Kurzworte für jeden Namespace, u.a. von MonoBook verwendet
 'nstab-main' => 'Artikel',
 'nstab-user' => 'Benutzerseite',
@@ -238,6 +249,7 @@ und das [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide Benutzerhandbuc
 'nstab-image' => 'Bild',
 'nstab-help' => 'Hilfe',
 'nstab-category' => 'Kategorie',
+'nstab-wp' => 'Projektseite',
 
 # Editier-Werkzeugleiste
 "bold_sample"=>"Fetter Text",
@@ -565,6 +577,11 @@ Ihre interne ID-Nummer ist $2.",
 "emailflag"		=> "Keine E-Mail von anderen Benutzern erhalten",
 'enotifnewpages'	=> 'Sende mir eine Benachrichtigungsmail, wenn jemand eine neue Seite anlegt.',
 "defaultns"		=> "In diesen Namensräumen soll standardmäßig gesucht werden:",
+'skinpreview' => '(Vorschau)',
+'yourlanguage'	=> 'Sprache',
+'imagemaxsize' => 'Verkleinere Bilder auf Bildbeschreibungsseiten auf: ',
+'thumbsize'	=> 'Thumbnail-	Größe: ',
+'files'			=> 'Bilder',
 
 # Recent changes
 #
@@ -632,6 +649,8 @@ Alle Zeiten sind UTC.
 "filedesc"		=> "Beschreibung",
 "filestatus" => "Copyright-Status",
 "filesource" => "Quelle",
+'sourcefilename' => 'Quelldatei',
+'destfilename' => 'Dateiname ändern',
 "copyrightpage" => "Project:Copyright",
 "copyrightpagename" => "{{SITENAME}} copyright",
 "uploadedfiles"	=> "Hochgeladene Dateien",
@@ -641,6 +660,7 @@ Alle Zeiten sind UTC.
 "badfiletype"	=> "\".$1\" ist kein empfohlenes Dateiformat.",
 "largefile"		=> "Bitte keine Bilder über 100 KByte hochladen.",
 'emptyfile'		=> "Die hochgeladene Datei ist leer. Der Grund kann ein Tippfehler im Dateinamen sein. Bitte kontrollieren Sie, ob Sie die Datei wirklich hochladen wollen.",
+'fileexists'		=> 'Eine Datei mit diesem Namen existiert schon. Bitte überprüfen Sie $1, falls Sie sich nicht sicher sind, ob Sie diese Datei überschreiben wollen.',
 "uploadedimage" => "\"[[$1]]\" hochgeladen",
 'uploadscripted' => 'Diese Datei enthält HTML- oder Scriptcode der irrtümlich von einem Webbrowser ausgeführt werden könnte.',
 'uploadvirus' => 'Diese Datei enthält einen Virus! Details: $1',
@@ -651,7 +671,7 @@ Bitte verwenden Sie diesen ($2) Link zur Beschreibungsseite und füllen Sie die
  aus, insbesondere seine Herkunft, von wem und wann es
  gemacht wurde und besondere Angaben zum Copyright, falls notwendig.
  Falls es sich um ein Bild handelte, so können Sie mit
- <tt><nowiki>[[Image:$1|thumb|Description]]</nowiki></tt> ein Vorschaubild
+ <tt><nowiki>[[Bild:$1|thumb|Beschreibung]]</nowiki></tt> ein Vorschaubild
  auf der Seite erzeugen lassen.",
 "uploadwarning" => "Warnung",
 "savefile"		=> "Datei speichern",
@@ -724,24 +744,53 @@ Davon haben <b>$2</b> Administrator-Rechte (siehe $3).",
 "nviews"		=> "$1 Abfragen",
 "wantedpages"	=> "Gewünschte Seiten",
 "nlinks"		=> "$1 Verweise",
-"allpages"		=> "Alle Artikel",
 "randompage"	=> "Zufälliger Artikel",
 "shortpages"	=> "Kurze Artikel",
 "longpages"		=> "Lange Artikel",
 "listusers"		=> "Benutzerverzeichnis",
 "specialpages"	=> "Spezialseiten",
 "spheading"		=> "Spezialseiten",
+'restrictedpheading'	=> 'Spezialseiten für Administratoren',
 "protectpage"	=> "Artikel schützen",
 "recentchangeslinked" => "Verlinkte Seiten",
 "rclsub"		=> "(auf Artikel von \"$1\")",
 "debug"			=> "Debug",
 "newpages"		=> "Neue Artikel",
+'newimages'	=> 'Neue Dateien',
 "ancientpages" => "Älteste Artikel",
 "movethispage"	=> "Artikel verschieben",
 "unusedimagestext" => "<p>Bitte beachten Sie, dass andere Wikis möglicherweise einige dieser Bilder benutzen.",
 "booksources"	=> "Buchhandlungen",
 "booksourcetext" => "Dies ist eine Liste mit Links zu Internetseiten, die neue und gebrauchte Bücher verkaufen. Dort kann es auch weitere Informationen über die Bücher geben, die Sie interessieren. {{SITENAME}} ist mit keinem dieser Anbieter geschäftlich verbunden.",
 "alphaindexline" => "$1 bis $2",
+'mostlinked'	=> 'Meistverlinke Seiten',
+'uncategorizedpages'	=> 'Nicht kategorisierte Artikel',
+'uncategorizedcategories'	=> 'Nicht kategorisierte Kategorien',
+'unusedcategories' => 'Verwaiste Kategorien',
+
+# Special:Allpages
+'allpages'	=> 'Alle Artikel',
+'nextpage'	=> "Nächste Seite ($1)",
+'allpagesfrom'	=> 'Seiten anzeigen ab:',
+'allarticles'	=> 'Alle Artikel',
+'allnonarticles'	=> 'Alle Nicht-Artikel',
+'allinnamespace'	=> "Alle Seiten im Namensraum: $1",
+'allnotinnamespace'	=> "Alle Seiten (ohne Namensraum: $1)",
+'allpagesprev'	=> 'Vorherige',
+'allpagesnext'	=> 'Nächste',
+'allpagessubmit'	=> 'Zeige',
+
+#Special:Logs
+'log'		=> 'Logbücher',
+'alllogstext'	=> 'Kombinierte Anzeige der Datei-, Lösch-, Seitenschutz-, Verschiebungs-, Benutzerblockaden- und Bürokraten-Logbücher.
+Sie können die Anzeige einschränken, indem Sie ein Logbuch auswählen und/oder einen Benutzernamen, bzw. eine Seite angeben..',
+'specialloguserlabel' => 'Benutzer: ',
+'speciallogtitlelabel' => 'Titel: ',
+"1movedto2"		=> "$1 wurde nach $2 verschoben",
+"1movedto2_redir" => "$1 wurde nach $2 verschoben und überschrieb einen Redirect",
+'movelogpage' => 'Verschiebungslogbuch',
+'movelogpagetext' => 'Liste verschobener Seiten',
+'rightslogtext'		=> 'Dies ist ein Logbuch für Änderungen an Benutzerrechten.',
 
 # Email this user
 #
@@ -839,6 +888,7 @@ Hilfe zur Benutzung gibt {{SERVER}}{{localurl:WikiHelpdesk}}',
 "deletepage"	=> "Seite löschen",
 "confirm"		=> "Bestätigen",
 "excontent" => "Alter Inhalt: '$1'",
+"excontentauthor" => "Alter Inhalt: '$1' (einziger Autor war '$2')",
 "exbeforeblank" => "Inhalt vor dem Leeren der Seite: '$1'",
 "exblank" => "Seite war leer",
 "confirmdelete" => "Löschung bestätigen",
@@ -900,7 +950,7 @@ dieses Artikels erscheinen.",
 "nocontribs"	=> "Es wurden keine Änderungen für diese Kriterien gefunden.",
 "ucnote"		=> "Dies sind die letzten <b>$1</b> Beiträge des Benutzers in den letzten <b>$2</b> Tagen.",
 "uclinks"		=> "Zeige die letzten $1 Beiträge; zeige die letzten $2 Tage.",
-"uctop"		=> " (top)" ,
+"uctop"		=> " (aktuell)" ,
 
 # What links here
 #
@@ -919,8 +969,12 @@ dieses Artikels erscheinen.",
 Dies sollte nur erfolgen, um Vandalismus zu verhindern, in Übereinstimmung mit unseren [[Project:Leitlinien|Leitlinien]].
 Bitte tragen Sie den Grund für die Blockade ein.",
 "ipaddress"		=> "IP-Adresse",
+'ipadressorusername' => 'IP-Adresse oder Benutzername',
 "ipbreason"		=> "Grund",
 "ipbsubmit"		=> "Adresse blockieren",
+'ipbother'		=> 'Andere Zeit',
+'ipboptions'		=> '2 Stunden:2 hours,1 Tag:1 day,3 Tage:3 days,1 Woche:1 week,2 Wochen:2 weeks,1 Monat:1 month,3 Monate:3 months,6 Monate:6 months,1 Jahr:1 year,Unendlich:infinite',
+'ipbotheroption'	=> 'Andere',
 "badipaddress"	=> "Die IP-Adresse hat ein falsches Format.",
 "blockipsuccesssub" => "Blockade erfolgreich",
 "blockipsuccesstext" => "Die IP-Adresse \"$1\" wurde blockiert.
@@ -953,6 +1007,24 @@ Bitte tragen Sie den Grund für die Blockade ein.",
 <br />Bitte geben Sie die Datenbank wieder frei, sobald die Wartung abgeschlossen ist.",
 "unlockdbsuccesstext" => "Die {{SITENAME}}-Datenbank wurde freigegeben.",
 
+
+# User levels special page
+#
+'userrights' => 'Benutzerrechtsverwaltung',
+
+'userrights-lookup-user' => 'Verwalte Gruppenzugehörigkeit',
+'userrights-user-editname' => 'Benutzername: ',
+'editusergroup' => 'Bearbeite Benutzerrechte',
+
+# user groups editing
+#
+'userrights-editusergroup' => 'Bearbeite Gruppenzugehörigkeit des Benutzers',
+'saveusergroups' => 'Speichere Gruppenzugehörigkeit',
+'userrights-groupsmember' => 'Mitglied von: ',
+'userrights-groupsavailable' => 'Verfügbare Gruppen: ',
+'userrights-groupshelp' => 'Wähle die Gruppen, aus denen der Benutzer entfernt oder zu denen er hinzugefügt werden soll.
+Nicht selektierte Gruppen werden nicht geändert. Eine Selektion kann mit Strg + Linksklick (bzw. Ctrl + Linksklick) entfernt werden.',
+
 # Move page
 #
 "movepage"		=> "Artikel verschieben",
@@ -1015,7 +1087,6 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 "set_user_rights"	=> "Benutzerrechte setzen",
 "user_rights_set"	=> "<b>Benutzerrechte für \"$1\" aktualisiert</b>",
 "set_rights_fail"	=> "<b>Benutzerrechte für \"$1\" konnten nicht gesetzt werden. (Haben Sie den Namen korrekt eingegeben?)</b>",
-"1movedto2"		=> "$1 wurde nach $2 verschoben",
 "allmessages"		=> "Alle MediaWiki-Meldungen",
 "allmessagestext"	=> "Dies ist eine Liste aller möglichen Meldungen im MediaWiki-Namensraum.",
 "thumbnail-more"	=> "vergrößern",
@@ -1028,7 +1099,7 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 "intl"			=> "InterWikiLinks",
 "version"		=> "Version",
 "protectlogpage"	=> "Seitenschutz-Logbuch",
-"protectlogtext"	=> "Dies ist eine Liste der blockierten Seiten. Siehe [[Project:Geschützte Seiten]] für mehr Informationen.",
+"protectlogtext"	=> "Dies ist eine Liste der blockierten Seiten. Siehe [[{{SITENAME}}:Geschützte Seiten]] für mehr Informationen.",
 "protectedarticle" => "Artikel [[$1]] geschützt",
 "unprotectedarticle" => "Artikel [[$1]] freigegeben",
 "protectsub" =>"(Sperren von \"$1\")",
@@ -1078,6 +1149,10 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 "nocookieslogin" => "{{SITENAME}} benutzt Cookies zum Einloggen der Benutzer. Sie haben Cookies deaktiviert, bitte aktivieren Sie diese und versuchen es erneut.",
 "subcategorycount" => "Diese Kategorie hat $1 Unterkategorien.",
 "categoryarticlecount" => "Dieser Kategorie gehören $1 Artikel an.",
+'categoryarticlecount1' => "Dieser Kategorie gehört $1 Artikel an.",
+'categoriespagetext' => 'In diesem Wiki gibt es die folgenden Kategorien:',
+'unusedcategoriestext' => 'Die folgenden Kategorieseiten existieren, obwohl sie nicht verwendet werden.',
+'groups-editgroup-name'     => 'Gruppenname: ',
 # math
 	'mw_math_png' => "Immer als PNG darstellen",
 	'mw_math_simple' => "Einfaches TeX als HTML darstellen, sonst PNG",
@@ -1085,9 +1160,7 @@ Diskussions-Seite nicht, da schon eine mit dem neuen Titel existiert. Bitte glei
 	'mw_math_source' =>"Als TeX belassen (für Textbrowser)",
 	'mw_math_modern' => "Empfehlenswert für moderne Browser",
 	'mw_math_mathml' => 'MathML (experimentell)',
-# labels for User: and Title: on Special:Log pages
-'specialloguserlabel' => 'Benutzer: ',
-'speciallogtitlelabel' => 'Titel: ',
+	
 'passwordtooshort' => 'Ihr Passwort ist zu kurz. Es muss mindestens $1 Zeichen lang sein.',
 
 # Media Warning
-- 
cgit v1.2.3


From ed7f6c9094145c599474ed21f78fe966c336188f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 12 Oct 2005 06:33:20 +0000
Subject: * (bug 3684) Fix typo in fatal error backtraces in Hooks.php

---
 RELEASE-NOTES      |  1 +
 includes/Hooks.php | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4571b543a9db..730f51e8325e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -817,6 +817,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3643) Fix image page display of large images with resizing disabled
 * Fix meta robots tag on Special:Version again to avoid listing vulnerable
   versions for convenient harvesting by automated worms
+* (bug 3684) Fix typo in fatal error backtraces in Hooks.php
 
 
 === Caveats ===
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 442f87fa8eb1..3e337f80959c 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -35,7 +35,7 @@ if (defined('MEDIAWIKI')) {
 		global $wgHooks;
 
 		if (!is_array($wgHooks)) {
-			wfDieDebugBacktrace("Global hooks array is not an array!\n");
+			wfDebugDieBacktrace("Global hooks array is not an array!\n");
 			return false;
 		}
 
@@ -44,7 +44,7 @@ if (defined('MEDIAWIKI')) {
 		}
 		
 		if (!is_array($wgHooks[$event])) {
-			wfDieDebugBacktrace("Hooks array for event '$event' is not an array!\n");
+			wfDebugDieBacktrace("Hooks array for event '$event' is not an array!\n");
 			return false;
 		}
 		
@@ -63,7 +63,7 @@ if (defined('MEDIAWIKI')) {
 			
 			if (is_array($hook)) {
 				if (count($hook) < 1) {
-					wfDieDebugBacktrace("Empty array in hooks for " . $event . "\n");
+					wfDebugDieBacktrace("Empty array in hooks for " . $event . "\n");
 				} else if (is_object($hook[0])) {
 					$object = $hook[0];
 					if (count($hook) < 2) {
@@ -82,7 +82,7 @@ if (defined('MEDIAWIKI')) {
 						$have_data = true;
 					}
 				} else {
-					wfDieDebugBacktrace("Unknown datatype in hooks for " . $event . "\n");
+					wfDebugDieBacktrace("Unknown datatype in hooks for " . $event . "\n");
 				}
 			} else if (is_string($hook)) { # functions look like strings, too
 				$func = $hook;
@@ -90,7 +90,7 @@ if (defined('MEDIAWIKI')) {
 				$object = $hook;
 				$method = "on" . $event;
 			} else {
-				wfDieDebugBacktrace("Unknown datatype in hooks for " . $event . "\n");
+				wfDebugDieBacktrace("Unknown datatype in hooks for " . $event . "\n");
 			}
 			
 			/* We put the first data element on, if needed. */
-- 
cgit v1.2.3


From aff5547b90f00781fa0471dccb70ab2dfcb0b799 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 13 Oct 2005 09:11:09 +0000
Subject: * Backport fix for reference usage notice in Special:Search on PHP
 4.4.0

---
 RELEASE-NOTES              | 1 +
 includes/SpecialSearch.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 730f51e8325e..8ff412f2dd56 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -818,6 +818,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix meta robots tag on Special:Version again to avoid listing vulnerable
   versions for convenient harvesting by automated worms
 * (bug 3684) Fix typo in fatal error backtraces in Hooks.php
+* Backport fix for reference usage notice in Special:Search on PHP 4.4.0
 
 
 === Caveats ===
diff --git a/includes/SpecialSearch.php b/includes/SpecialSearch.php
index 5cb499ccf072..fe883874d2b4 100644
--- a/includes/SpecialSearch.php
+++ b/includes/SpecialSearch.php
@@ -161,7 +161,7 @@ class SpecialSearch {
 			return;
 		}
 
-		$search =& SearchEngine::create();
+		$search = SearchEngine::create();
 		$search->setLimitOffset( $this->limit, $this->offset );
 		$search->setNamespaces( $this->namespaces );
 		$search->showRedirects = $this->searchRedirects;
-- 
cgit v1.2.3


From 9734dfbd366b9eaef553f9f1c9fa0f0fb8017ac7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 16 Oct 2005 20:32:25 +0000
Subject: * Backport database connect error display fix from HEAD

---
 RELEASE-NOTES         |  1 +
 includes/Database.php | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8ff412f2dd56..57aac2f650a6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -819,6 +819,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   versions for convenient harvesting by automated worms
 * (bug 3684) Fix typo in fatal error backtraces in Hooks.php
 * Backport fix for reference usage notice in Special:Search on PHP 4.4.0
+* Backport database connect error display fix from HEAD
 
 
 === Caveats ===
diff --git a/includes/Database.php b/includes/Database.php
index e482b8dbba81..c6554a1dbc7f 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1620,13 +1620,12 @@ class ResultWrapper {
  */
 function wfEmergencyAbort( &$conn, $error ) {
 	global $wgTitle, $wgUseFileCache, $title, $wgInputEncoding, $wgOutputEncoding;
-	global $wgSitename, $wgServer, $wgMessageCache;
+	global $wgSitename, $wgServer, $wgMessageCache, $wgLogo;
 
 	# I give up, Brion is right. Getting the message cache to work when there is no DB is tricky.
 	# Hard coding strings instead.
 
-	$noconnect = 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server. <br />
-$1';
+	$noconnect = "<h1><img src='$wgLogo' style='float:left;margin-right:1em' alt=''>$wgSitename has a problem</h1><p><strong>Sorry! This site is experiencing technical difficulties.</strong></p><p>Try waiting a few minutes and reloading.</p><p><small>(Can't contact the database server: $1)</small></p>";
 	$mainpage = 'Main Page';
 	$searchdisabled = <<<EOT
 <p style="margin: 1.5em 2em 1em">$wgSitename search is disabled for performance reasons. You can search via Google in the meantime.
@@ -1664,11 +1663,13 @@ border=\"0\" ALT=\"Google\"></A>
 	}
 
 	# No database access
-	$wgMessageCache->disable();
+	if ( is_object( $wgMessageCache ) ) {
+		$wgMessageCache->disable();
+	}
 	
 	$msg = wfGetSiteNotice();
 	if($msg == '') {
-		$msg = str_replace( '$1', $error, $noconnect );
+		$msg = str_replace( '$1', htmlspecialchars( $error ), $noconnect );
 	}
 	$text = $msg;
 
-- 
cgit v1.2.3


From b8761b452b05827236a95135a440aca4436a466f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 16 Oct 2005 20:46:43 +0000
Subject: * (bug 2773) Print style sheet no longer overrides RTL text direction

---
 RELEASE-NOTES                | 1 +
 skins/common/commonPrint.css | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 57aac2f650a6..9e5e6bbce001 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -820,6 +820,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3684) Fix typo in fatal error backtraces in Hooks.php
 * Backport fix for reference usage notice in Special:Search on PHP 4.4.0
 * Backport database connect error display fix from HEAD
+* (bug 2773) Print style sheet no longer overrides RTL text direction
 
 
 === Caveats ===
diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 8835f3a41f48..76b054cd7b3e 100644
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -62,7 +62,6 @@ div.thumb div a img {
 }
 div.thumb div div.thumbcaption {
     border: none;
-    text-align: left;
     padding: 0.3em 0 0.1em 0;
 }
 div.magnify { display: none; }
@@ -120,7 +119,6 @@ ul {
     font-size: 11pt;
     padding: 0 ! important;
     margin: 0 ! important;
-    text-align: left;
 }
 #footer {
     border-top: 1px solid black;
-- 
cgit v1.2.3


From bbf371c1cbf0b14fd12db7b919d34e6bce8785d9 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 20 Oct 2005 20:56:12 +0000
Subject: Fix id attribute for top link

---
 RELEASE-NOTES      | 2 ++
 skins/MonoBook.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9e5e6bbce001..fc0349035aef 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -821,6 +821,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Backport fix for reference usage notice in Special:Search on PHP 4.4.0
 * Backport database connect error display fix from HEAD
 * (bug 2773) Print style sheet no longer overrides RTL text direction
+* MonoBook skin top link id changed from "contentTop" to "top" (shared with
+  name attribute)
 
 
 === Caveats ===
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 2556c4b0b196..c4ec9832878b 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -76,7 +76,7 @@ class MonoBookTemplate extends QuickTemplate {
     <div id="globalWrapper">
       <div id="column-content">
 	<div id="content">
-	  <a name="top" id="contentTop"></a>
+	  <a name="top" id="top"></a>
 	  <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
 	  <h1 class="firstHeading"><?php $this->text('title') ?></h1>
 	  <div id="bodyContent">
-- 
cgit v1.2.3


From 2a080fa5b645bbe5657d92e4082e9304fb3e66fb Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Fri, 21 Oct 2005 20:47:39 +0000
Subject: backport from head (1.143): quotes

---
 includes/SpecialPreferences.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index bd462909c3b8..bdf9e1e45c98 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -772,14 +772,14 @@ class PreferencesForm {
 		#
 		$wgOut->addHTML('<fieldset><legend>' . wfMsg('prefs-misc') . '</legend>');
 
-		$msgUnderline = htmlspecialchars(wfMsg("tog-underline"));
-		$msgUnderlinenever = htmlspecialchars(wfMsg("underline-never"));
-		$msgUnderlinealways = htmlspecialchars(wfMsg("underline-always"));
-		$msgUnderlinedefault = htmlspecialchars(wfMsg("underline-default"));
-		$uopt = $wgUser->getOption("underline");
-		$s0 = $uopt == 0 ? " selected=\"selected\"" : "";
-		$s1 = $uopt == 1 ? " selected=\"selected\"" : "";
-		$s2 = $uopt == 2 ? " selected=\"selected\"" : "";
+		$msgUnderline = htmlspecialchars(wfMsg('tog-underline'));
+		$msgUnderlinenever = htmlspecialchars(wfMsg('underline-never'));
+		$msgUnderlinealways = htmlspecialchars(wfMsg('underline-always'));
+		$msgUnderlinedefault = htmlspecialchars(wfMsg('underline-default'));
+		$uopt = $wgUser->getOption('underline');
+		$s0 = $uopt == 0 ? ' selected="selected"' : '';
+		$s1 = $uopt == 1 ? ' selected="selected"' : '';
+		$s2 = $uopt == 2 ? ' selected="selected"' : '';
 		$wgOut->addHTML("
 <div class='toggle'><label>$msgUnderline
 <select name=\"wpOpunderline\">
-- 
cgit v1.2.3


From 552be723f6a6870bdd83131164e021de5eb68e55 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 22 Oct 2005 06:56:09 +0000
Subject: * Wrap message page insertions in a transaction to speed up
 installation Testing on my Mac w/ MySQL 5.0.13 this gets the message page
 setup down to under a minute; fast enough that the browser doesn't time out.
 :P Still too slow; bulk inserts would perhaps be an improvement.

---
 RELEASE-NOTES                      | 1 +
 maintenance/InitialiseMessages.inc | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fc0349035aef..c179a78ec71d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -823,6 +823,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2773) Print style sheet no longer overrides RTL text direction
 * MonoBook skin top link id changed from "contentTop" to "top" (shared with
   name attribute)
+* Wrap message page insertions in a transaction to speed up installation
 
 
 === Caveats ===
diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index 3976d1864d66..811637a2c4fd 100755
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -159,6 +159,9 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
 	$talk = $wgContLang->getNsText( NS_TALK );
 	$mwtalk = $wgContLang->getNsText( NS_MEDIAWIKI_TALK );
 	
+	# Merge these into a single transaction for speed
+	$dbw->begin();
+
 	# Process each message
 	foreach ( $sortedArray as $key => $enMsg ) {
 		if ( $key == '' ) {
@@ -199,6 +202,7 @@ function initialiseMessagesReal( $overwrite = false, $messageArray = false ) {
 			$article->updateRevisionOn( $dbw, $revision );
 		}
 	}
+	$dbw->commit();
 
 	# Clear the relevant memcached key
 	print 'Clearing message cache...';
-- 
cgit v1.2.3


From 31026e694916249cf73e7725a4efae2b95ad1b6b Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 22 Oct 2005 16:15:17 +0000
Subject: Fix textarea attribute for special:movepage

---
 RELEASE-NOTES                | 2 +-
 includes/SpecialMovepage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c179a78ec71d..36b10e9026c4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -824,7 +824,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * MonoBook skin top link id changed from "contentTop" to "top" (shared with
   name attribute)
 * Wrap message page insertions in a transaction to speed up installation
-
+* Fix Special:MovePage invalid HTML attribute for reason textarea
 
 === Caveats ===
 
diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 47f4f55f085b..b07274079b48 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -140,7 +140,7 @@ class MovePageForm {
 		<tr>
 			<td align='right' valign='top'><br />{$movereason}:</td>
 			<td align='left' valign='top'><br />
-				<textarea type='text' cols='60' rows='2' name=\"wpReason\" value=\"{$encReason}\"></textarea>
+				<textarea cols='60' rows='2' name='wpReason' id='wpReason'>{$encReason}</textarea>
 			</td>
 		</tr>" );
 
-- 
cgit v1.2.3


From cd7641ca45d64c456a41828925c473210ee18349 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 22 Oct 2005 20:26:23 +0000
Subject: * Avoid notice warning on edit with no User-Agent header

---
 RELEASE-NOTES         |  2 ++
 includes/EditPage.php | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 36b10e9026c4..70525c6e7e05 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -825,6 +825,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   name attribute)
 * Wrap message page insertions in a transaction to speed up installation
 * Fix Special:MovePage invalid HTML attribute for reason textarea
+* Avoid notice warning on edit with no User-Agent header
+
 
 === Caveats ===
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1bf5650be9ed..027d0881a075 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -960,9 +960,19 @@ END
 		}
 	}
 
-
+	/**
+	 * Check if the browser is on a blacklist of user-agents known to
+	 * mangle UTF-8 data on form submission. Returns true if Unicode
+	 * should make it through, false if it's known to be a problem.
+	 * @return bool
+	 * @access private
+	 */
 	function checkUnicodeCompliantBrowser() {
 		global $wgBrowserBlackList;
+		if( empty( $_SERVER["HTTP_USER_AGENT"] ) ) {
+			// No User-Agent header sent? Trust it by default...
+			return true;
+		}
 		$currentbrowser = $_SERVER["HTTP_USER_AGENT"];
 		foreach ( $wgBrowserBlackList as $browser ) {
 			if ( preg_match($browser, $currentbrowser) ) {
-- 
cgit v1.2.3


From 738546ef033fec0fb749b8406d46ed63df2f488c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 22 Oct 2005 21:18:26 +0000
Subject: * (bug 3734) Swapped out obsolete recount.sql with initStats.php

---
 RELEASE-NOTES             |  1 +
 maintenance/initStats.php | 25 +++++++++++++++++++++++++
 maintenance/recount.sql   |  8 --------
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 maintenance/initStats.php
 delete mode 100644 maintenance/recount.sql

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 70525c6e7e05..a65edccf7c7b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -826,6 +826,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Wrap message page insertions in a transaction to speed up installation
 * Fix Special:MovePage invalid HTML attribute for reason textarea
 * Avoid notice warning on edit with no User-Agent header
+* (bug 3734) Swapped out obsolete recount.sql with initStats.php
 
 
 === Caveats ===
diff --git a/maintenance/initStats.php b/maintenance/initStats.php
new file mode 100644
index 000000000000..85804596bead
--- /dev/null
+++ b/maintenance/initStats.php
@@ -0,0 +1,25 @@
+<?php
+
+require_once( 'commandLine.inc' );
+
+$dbr =& wfGetDB( DB_SLAVE );
+
+$edits = $dbr->selectField( 'revision', 'COUNT(rev_id)', '' );
+$pages = $dbr->selectField( 'page', 'COUNT(page_id)',
+	array(
+		'page_namespace' => 0,
+		'page_is_redirect' => 0,
+		'page_len > 0',
+	)
+); // HACK APPROXIMATION
+
+echo "$wgDBname: setting edits $edits, pages $pages\n";
+
+$dbw =& wfGetDB( DB_MASTER );
+$dbw->insert( 'site_stats',
+	array( 'ss_row_id'=> 1,
+	       'ss_total_views'   => 0,
+	       'ss_total_edits'   => $edits,
+	       'ss_good_articles' => $pages ) );
+
+?>
\ No newline at end of file
diff --git a/maintenance/recount.sql b/maintenance/recount.sql
deleted file mode 100644
index d9fec31fb5c4..000000000000
--- a/maintenance/recount.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- 
--- Recalculate the article count
--- 
-
-SELECT @foo:=COUNT(*) FROM /*$wgDBprefix*/cur
-  WHERE cur_namespace=0 AND cur_is_redirect=0 AND cur_text like '%[[%';
-UPDATE /*$wgDBprefix*/site_stats SET ss_good_articles=@foo, ss_total_pages=-1, ss_users=-1, ss_admins=-1;
-
-- 
cgit v1.2.3


From 55c864f2d85f6bd83682236520a5ad151e2b7fc4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 25 Oct 2005 23:21:16 +0000
Subject: * (bug 3735) Fix to run under MySQL 5's strict mode

---
 RELEASE-NOTES        | 1 +
 includes/Article.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a65edccf7c7b..92a93901787e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -827,6 +827,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix Special:MovePage invalid HTML attribute for reason textarea
 * Avoid notice warning on edit with no User-Agent header
 * (bug 3734) Swapped out obsolete recount.sql with initStats.php
+* (bug 3735) Fix to run under MySQL 5's strict mode
 
 
 === Caveats ===
diff --git a/includes/Article.php b/includes/Article.php
index ca01130ee61c..5eb42c5da3d9 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -940,6 +940,7 @@ class Article {
 			'page_random'       => wfRandom(),
 			'page_touched'      => $dbw->timestamp(),
 			'page_latest'       => 0, # Fill this in shortly...
+			'page_len'          => 0, # Fill this in shortly...
 		), $fname );
 		$newid = $dbw->insertId();
 
@@ -978,7 +979,7 @@ class Article {
 				'page_latest'      => $revision->getId(),
 				'page_touched'     => $dbw->timestamp(),
 				'page_is_new'      => ($lastRevision === 0) ? 1 : 0,
-				'page_is_redirect' => Article::isRedirect( $text ),
+				'page_is_redirect' => Article::isRedirect( $text ) ? 1 : 0,
 				'page_len'         => strlen( $text ),
 			),
 			$conditions,
-- 
cgit v1.2.3


From 259c2ea5237305ab3fc6232a69aaf016c0c88d79 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 26 Oct 2005 01:10:44 +0000
Subject: * (bug 3786) Experimental support for MySQL 4.1/5.0 utf8 charset mode
   NOTE: Enabling this may break existing wikis, and still doesn't   work for
 all Unicode characters due to MySQL limitations.

$wgDBmysql5 runs 'SET NAMES utf8' on connection, and the installer
uses an alternate mysql5/tables.sql which sets utf8 charset on
tables and varbinary on a couple fields.
---
 RELEASE-NOTES                 |   3 +
 config/index.php              |  34 +-
 includes/Database.php         |   8 +
 includes/DefaultSettings.php  |  18 +
 maintenance/mysql5/tables.sql | 855 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 917 insertions(+), 1 deletion(-)
 create mode 100644 maintenance/mysql5/tables.sql

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 92a93901787e..ddd6e9578f2c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -828,6 +828,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Avoid notice warning on edit with no User-Agent header
 * (bug 3734) Swapped out obsolete recount.sql with initStats.php
 * (bug 3735) Fix to run under MySQL 5's strict mode
+* (bug 3786) Experimental support for MySQL 4.1/5.0 utf8 charset mode
+  NOTE: Enabling this may break existing wikis, and still doesn't
+  work for all Unicode characters due to MySQL limitations.
 
 
 === Caveats ===
diff --git a/config/index.php b/config/index.php
index 310a14e408b4..e78ef5946bf0 100644
--- a/config/index.php
+++ b/config/index.php
@@ -373,6 +373,7 @@ print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</t
 	$conf->DBpassword = importPost( "DBpassword" );
 	$conf->DBpassword2 = importPost( "DBpassword2" );
 	$conf->DBprefix = importPost( "DBprefix" );
+	$conf->DBmysql5 = (importPost( "DBmysql5" ) == "true") ? "true" : "false";
 	$conf->RootPW = importPost( "RootPW" );
 	$conf->LanguageCode = importPost( "LanguageCode", "en" );
 	$conf->SysopName = importPost( "SysopName", "WikiSysop" );
@@ -543,6 +544,14 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			 	<a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
 			 	>http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b>";
 		}
+		if( $wgDBmysql5 ) {
+			if( $mysqlNewAuth ) {
+				print "; enabling MySQL 4.1/5.0 charset mode";
+			} else {
+				print "; <b class='error'>MySQL 4.1/5.0 charset mode enabled,
+					but older version detected; will likely fail.</b>";
+			}
+		}
 		print "</li>\n";
 
 		@$sel = mysql_select_db( $wgDBname, $wgDatabase->mConn );
@@ -597,7 +606,13 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		} else {
 			# FIXME: Check for errors
 			print "<li>Creating tables...";
-			dbsource( "../maintenance/tables.sql", $wgDatabase );
+			if( $wgDBmysql5 ) {
+				print " using MySQL 5 table defs...";
+				dbsource( "../maintenance/mysql5/tables.sql", $wgDatabase );
+			} else {
+				print " using MySQL 3/4 table defs...";
+				dbsource( "../maintenance/tables.sql", $wgDatabase );
+			}
 			dbsource( "../maintenance/interwiki.sql", $wgDatabase );
 			print " done.</li>\n";
 
@@ -936,6 +951,20 @@ if( count( $errs ) ) {
 
 		<p>Avoid exotic characters; something like <tt>mw_</tt> is good.</p>
 	</dt>
+	
+	<dd><label class="column">Database charset</label>
+		<div>Select one:</div>
+		<ul class="plain">
+		<li><?php aField( $conf, "DBmysql5", "Backwards-compatible UTF-8", "radio", "false" ); ?></li>
+		<li><?php aField( $conf, "DBmysql5", "Experimental MySQL 4.1/5.0 UTF-8", "radio", "true" ); ?></li>
+		</ul>
+	</dd>
+	<dt>
+		<b>EXPERIMENTAL:</b> You can enable explicit Unicode charset support
+		for MySQL 4.1 and 5.0 servers. This is not well tested and may
+		cause things to break. <b>If upgrading an older installation, leave
+		in backwards-compatible mode.</b>
+	</dt>
 
 	<dd>
 		<?php
@@ -1133,6 +1162,9 @@ if ( \$wgCommandLineMode ) {
 # If you're on MySQL 3.x, this next line must be FALSE:
 \$wgDBmysql4 = {$conf->DBmysql4};
 
+# Experimental charset support for MySQL 4.1/5.0.
+\$wgDBmysql5 = {$conf->DBmysql5};
+
 ## Shared memory settings
 \$wgMainCacheType = $cacheType;
 \$wgMemCachedServers = $mcservers;
diff --git a/includes/Database.php b/includes/Database.php
index c6554a1dbc7f..724a6e98d8c4 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -245,6 +245,14 @@ class Database {
 		if ( !$success ) {
 			$this->reportConnectionError();
 		}
+		
+		global $wgDBmysql5;
+		if( $wgDBmysql5 ) {
+			// Tell the server we're communicating with it in UTF-8.
+			// This may engage various charset conversions.
+			$this->query( 'SET NAMES utf8' );
+		}
+		
 		$this->mOpened = $success;
 		return $success;
 	}
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cd606cfc3f46..438c1a3a0e6b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -450,6 +450,24 @@ $wgDBtransactions	= false;
 /** Set to true to use enhanced fulltext search */
 $wgDBmysql4			= false;
 
+/**
+ * Set to true to engage MySQL 4.1/5.0 charset-related features;
+ * for now will just cause sending of 'SET NAMES=utf8' on connect.
+ *
+ * WARNING: THIS IS EXPERIMENTAL!
+ *
+ * May break if you're not using the table defs from mysql5/tables.sql.
+ * May break if you're upgrading an existing wiki if set differently.
+ * Broken symptoms likely to include incorrect behavior with page titles,
+ * usernames, comments etc containing non-ASCII characters.
+ * Might also cause failures on the object cache and other things.
+ *
+ * Even correct usage may cause failures with Unicode supplementary
+ * characters (those not in the Basic Multilingual Plane) unless MySQL
+ * has enhanced their Unicode support.
+ */
+$wgDBmysql5			= false;
+
 /**
  * Other wikis on this site, can be administered from a single developer
  * account.
diff --git a/maintenance/mysql5/tables.sql b/maintenance/mysql5/tables.sql
new file mode 100644
index 000000000000..9d19a30e778c
--- /dev/null
+++ b/maintenance/mysql5/tables.sql
@@ -0,0 +1,855 @@
+-- Experimental table definitions for MySQL 4.1 and 5.0 with
+-- explicit character set support. Not fully tested, may have
+-- surprises!
+--
+-- TODO: Test various fields
+-- TODO: Anything else need to be moved to VARBINARY and BLOB?
+-- TODO: UCS-2 better than UTF-8?
+-- TODO: Find out how to get 4-byte UTF-8 chars into MySQL...
+--       An alternate UCS-2 that does UTF-16 conversion would work.
+-- TODO: Work on collation usage
+
+-- ------------------------------------------------------------
+
+-- SQL to create the initial tables for the MediaWiki database.
+-- This is read and executed by the install script; you should
+-- not have to run it by itself unless doing a manual install.
+
+--
+-- General notes:
+--
+-- If possible, create tables as InnoDB to benefit from the
+-- superior resiliency against crashes and ability to read
+-- during writes (and write during reads!)
+--
+-- Only the 'searchindex' table requires MyISAM due to the
+-- requirement for fulltext index support, which is missing
+-- from InnoDB.
+--
+--
+-- The MySQL table backend for MediaWiki currently uses
+-- 14-character CHAR or VARCHAR fields to store timestamps.
+-- The format is YYYYMMDDHHMMSS, which is derived from the
+-- text format of MySQL's TIMESTAMP fields.
+--
+-- Historically TIMESTAMP fields were used, but abandoned
+-- in early 2002 after a lot of trouble with the fields
+-- auto-updating.
+--
+-- The PostgreSQL backend uses DATETIME fields for timestamps,
+-- and we will migrate the MySQL definitions at some point as
+-- well.
+--
+--
+-- The /*$wgDBprefix*/ comments in this and other files are
+-- replaced with the defined table prefix by the installer
+-- and updater scripts. If you are installing or running
+-- updates manually, you will need to manually insert the
+-- table prefix if any when running these scripts.
+--
+
+
+--
+-- The user table contains basic account information,
+-- authentication keys, etc.
+--
+-- Some multi-wiki sites may share a single central user table
+-- between separate wikis using the $wgSharedDB setting.
+--
+-- Note that when a external authentication plugin is used,
+-- user table entries still need to be created to store
+-- preferences and to key tracking information in the other
+-- tables.
+--
+CREATE TABLE /*$wgDBprefix*/user (
+  user_id int(5) unsigned NOT NULL auto_increment,
+  
+  -- Usernames must be unique, must not be in the form of
+  -- an IP address. _Shouldn't_ allow slashes or case
+  -- conflicts. Spaces are allowed, and are _not_ converted
+  -- to underscores like titles. (Conflicts?)
+  user_name varchar(255) binary NOT NULL default '',
+  
+  -- Optional 'real name' to be displayed in credit listings
+  user_real_name varchar(255) binary NOT NULL default '',
+  
+  -- Password hashes, normally hashed like so:
+  -- MD5(CONCAT(user_id,'-',MD5(plaintext_password)))
+  user_password tinyblob NOT NULL default '',
+  
+  -- When using 'mail me a new password', a random
+  -- password is generated and the hash stored here.
+  -- The previous password is left in place until
+  -- someone actually logs in with the new password,
+  -- at which point the hash is moved to user_password
+  -- and the old password is invalidated.
+  user_newpassword tinyblob NOT NULL default '',
+  
+  -- Note: email should be restricted, not public info.
+  -- Same with passwords.
+  user_email tinytext NOT NULL default '',
+  
+  -- Newline-separated list of name=value pairs.
+  user_options blob NOT NULL default '',
+  
+  -- This is a timestamp which is updated when a user
+  -- logs in, logs out, changes preferences, or performs
+  -- some other action requiring HTML cache invalidation
+  -- to ensure that the UI is updated.
+  user_touched char(14) binary NOT NULL default '',
+  
+  -- A pseudorandomly generated value that is stored in
+  -- a cookie when the "remember password" feature is
+  -- used (previously, a hash of the password was used, but
+  -- this was vulnerable to cookie-stealing attacks)
+  user_token char(32) binary NOT NULL default '',
+  
+  -- Initially NULL; when a user's e-mail address has been
+  -- validated by returning with a mailed token, this is
+  -- set to the current timestamp.
+  user_email_authenticated CHAR(14) BINARY,
+  
+  -- Randomly generated token created when the e-mail address
+  -- is set and a confirmation test mail sent.
+  user_email_token CHAR(32) BINARY,
+  
+  -- Expiration date for the 
+  user_email_token_expires CHAR(14) BINARY,
+
+  PRIMARY KEY user_id (user_id),
+  UNIQUE INDEX user_name (user_name),
+  INDEX (user_email_token)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- User permissions have been broken out to a separate table;
+-- this allows sites with a shared user table to have different
+-- permissions assigned to a user in each project.
+--
+-- This table replaces the old user_rights field which used a
+-- comma-separated blob.
+--
+CREATE TABLE /*$wgDBprefix*/user_groups (
+  -- Key to user_id
+  ug_user int(5) unsigned NOT NULL default '0',
+  
+  -- Group names are short symbolic string keys.
+  -- The set of group names is open-ended, though in practice
+  -- only some predefined ones are likely to be used.
+  --
+  -- At runtime $wgGroupPermissions will associate group keys
+  -- with particular permissions. A user will have the combined
+  -- permissions of any group they're explicitly in, plus
+  -- the implicit '*' and 'user' groups.
+  ug_group char(16) NOT NULL default '',
+  
+  PRIMARY KEY (ug_user,ug_group),
+  KEY (ug_group)
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+-- Stores notifications of user talk page changes, for the display
+-- of the "you have new messages" box
+CREATE TABLE /*$wgDBprefix*/user_newtalk (
+ user_id int(5) NOT NULL default '0',
+ user_ip varchar(40) NOT NULL default '',
+ INDEX user_id (user_id),
+ INDEX user_ip (user_ip)
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Core of the wiki: each page has an entry here which identifies
+-- it by title and contains some essential metadata.
+--
+CREATE TABLE /*$wgDBprefix*/page (
+  -- Unique identifier number. The page_id will be preserved across
+  -- edits and rename operations, but not deletions and recreations.
+  page_id int(8) unsigned NOT NULL auto_increment,
+  
+  -- A page name is broken into a namespace and a title.
+  -- The namespace keys are UI-language-independent constants,
+  -- defined in Namespace.php.
+  page_namespace int NOT NULL,
+  
+  -- The rest of the title, as text.
+  -- Spaces are transformed into underscores in title storage.
+  page_title varchar(255) binary NOT NULL,
+  
+  -- Comma-separated set of permission keys indicating who
+  -- can move or edit the page.
+  page_restrictions tinyblob NOT NULL default '',
+  
+  -- Number of times this page has been viewed.
+  page_counter bigint(20) unsigned NOT NULL default '0',
+  
+  -- 1 indicates the article is a redirect.
+  page_is_redirect tinyint(1) unsigned NOT NULL default '0',
+  
+  -- 1 indicates this is a new entry, with only one edit.
+  -- Not all pages with one edit are new pages.
+  page_is_new tinyint(1) unsigned NOT NULL default '0',
+  
+  -- Random value between 0 and 1, used for Special:Randompage
+  page_random real unsigned NOT NULL,
+  
+  -- This timestamp is updated whenever the page changes in
+  -- a way requiring it to be re-rendered, invalidating caches.
+  -- Aside from editing this includes permission changes,
+  -- creation or deletion of linked pages, and alteration
+  -- of contained templates.
+  page_touched char(14) binary NOT NULL default '',
+
+  -- Handy key to revision.rev_id of the current revision.
+  -- This may be 0 during page creation, but that shouldn't
+  -- happen outside of a transaction... hopefully.
+  page_latest int(8) unsigned NOT NULL,
+  
+  -- Uncompressed length in bytes of the page's current source text.
+  page_len int(8) unsigned NOT NULL,
+
+  PRIMARY KEY page_id (page_id),
+  UNIQUE INDEX name_title (page_namespace,page_title),
+  
+  -- Special-purpose indexes
+  INDEX (page_random),
+  INDEX (page_len)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- Every edit of a page creates also a revision row.
+-- This stores metadata about the revision, and a reference
+-- to the text storage backend.
+--
+CREATE TABLE /*$wgDBprefix*/revision (
+  rev_id int(8) unsigned NOT NULL auto_increment,
+  
+  -- Key to page_id. This should _never_ be invalid.
+  rev_page int(8) unsigned NOT NULL,
+  
+  -- Key to text.old_id, where the actual bulk text is stored.
+  -- It's possible for multiple revisions to use the same text,
+  -- for instance revisions where only metadata is altered
+  -- or a rollback to a previous version.
+  rev_text_id int(8) unsigned NOT NULL,
+  
+  -- Text comment summarizing the change.
+  -- This text is shown in the history and other changes lists,
+  -- rendered in a subset of wiki markup.
+  rev_comment tinyblob NOT NULL default '',
+  
+  -- Key to user_id of the user who made this edit.
+  -- Stores 0 for anonymous edits and for some mass imports.
+  rev_user int(5) unsigned NOT NULL default '0',
+  
+  -- Text username or IP address of the editor.
+  rev_user_text varchar(255) binary NOT NULL default '',
+  
+  -- Timestamp
+  rev_timestamp char(14) binary NOT NULL default '',
+  
+  -- Records whether the user marked the 'minor edit' checkbox.
+  -- Many automated edits are marked as minor.
+  rev_minor_edit tinyint(1) unsigned NOT NULL default '0',
+  
+  -- Not yet used; reserved for future changes to the deletion system.
+  rev_deleted tinyint(1) unsigned NOT NULL default '0',
+  
+  PRIMARY KEY rev_page_id (rev_page, rev_id),
+  UNIQUE INDEX rev_id (rev_id),
+  INDEX rev_timestamp (rev_timestamp),
+  INDEX page_timestamp (rev_page,rev_timestamp),
+  INDEX user_timestamp (rev_user,rev_timestamp),
+  INDEX usertext_timestamp (rev_user_text,rev_timestamp)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Holds text of individual page revisions.
+--
+-- Field names are a holdover from the 'old' revisions table in
+-- MediaWiki 1.4 and earlier: an upgrade will transform that
+-- table into the 'text' table to minimize unnecessary churning
+-- and downtime. If upgrading, the other fields will be left unused.
+--
+CREATE TABLE /*$wgDBprefix*/text (
+  -- Unique text storage key number.
+  -- Note that the 'oldid' parameter used in URLs does *not*
+  -- refer to this number anymore, but to rev_id.
+  old_id int(8) unsigned NOT NULL auto_increment,
+  
+  -- Depending on the contents of the old_flags field, the text
+  -- may be convenient plain text, or it may be funkily encoded.
+  old_text mediumblob NOT NULL default '',
+  
+  -- Comma-separated list of flags:
+  -- gzip: text is compressed with PHP's gzdeflate() function.
+  -- utf8: text was stored as UTF-8.
+  --       If $wgLegacyEncoding option is on, rows *without* this flag
+  --       will be converted to UTF-8 transparently at load time.
+  -- object: text field contained a serialized PHP object.
+  --         The object either contains multiple versions compressed
+  --         together to achieve a better compression ratio, or it refers
+  --         to another row where the text can be found.
+  old_flags tinyblob NOT NULL default '',
+  
+  PRIMARY KEY old_id (old_id)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- Holding area for deleted articles, which may be viewed
+-- or restored by admins through the Special:Undelete interface.
+-- The fields generally correspond to the page, revision, and text
+-- fields, with several caveats.
+--
+CREATE TABLE /*$wgDBprefix*/archive (
+  ar_namespace int NOT NULL default '0',
+  ar_title varchar(255) binary NOT NULL default '',
+  
+  -- Newly deleted pages will not store text in this table,
+  -- but will reference the separately existing text rows.
+  -- This field is retained for backwards compatibility,
+  -- so old archived pages will remain accessible after
+  -- upgrading from 1.4 to 1.5.
+  -- Text may be gzipped or otherwise funky.
+  ar_text mediumblob NOT NULL default '',
+  
+  -- Basic revision stuff...
+  ar_comment tinyblob NOT NULL default '',
+  ar_user int(5) unsigned NOT NULL default '0',
+  ar_user_text varchar(255) binary NOT NULL,
+  ar_timestamp char(14) binary NOT NULL default '',
+  ar_minor_edit tinyint(1) NOT NULL default '0',
+  
+  -- See ar_text note.
+  ar_flags tinyblob NOT NULL default '',
+  
+  -- When revisions are deleted, their unique rev_id is stored
+  -- here so it can be retained after undeletion. This is necessary
+  -- to retain permalinks to given revisions after accidental delete
+  -- cycles or messy operations like history merges.
+  -- 
+  -- Old entries from 1.4 will be NULL here, and a new rev_id will
+  -- be created on undeletion for those revisions.
+  ar_rev_id int(8) unsigned,
+  
+  -- For newly deleted revisions, this is the text.old_id key to the
+  -- actual stored text. To avoid breaking the block-compression scheme
+  -- and otherwise making storage changes harder, the actual text is
+  -- *not* deleted from the text table, merely hidden by removal of the
+  -- page and revision entries.
+  --
+  -- Old entries deleted under 1.2-1.4 will have NULL here, and their
+  -- ar_text and ar_flags fields will be used to create a new text
+  -- row upon undeletion.
+  ar_text_id int(8) unsigned,
+  
+  KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Track page-to-page hyperlinks within the wiki.
+--
+CREATE TABLE /*$wgDBprefix*/pagelinks (
+  -- Key to the page_id of the page containing the link.
+  pl_from int(8) unsigned NOT NULL default '0',
+  
+  -- Key to page_namespace/page_title of the target page.
+  -- The target page may or may not exist, and due to renames
+  -- and deletions may refer to different page records as time
+  -- goes by.
+  pl_namespace int NOT NULL default '0',
+  pl_title varchar(255) binary NOT NULL default '',
+  
+  UNIQUE KEY pl_from(pl_from,pl_namespace,pl_title),
+  KEY (pl_namespace,pl_title)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Track links to images *used inline*
+-- We don't distinguish live from broken links here, so
+-- they do not need to be changed on upload/removal.
+--
+CREATE TABLE /*$wgDBprefix*/imagelinks (
+  -- Key to page_id of the page containing the image / media link.
+  il_from int(8) unsigned NOT NULL default '0',
+  
+  -- Filename of target image.
+  -- This is also the page_title of the file's description page;
+  -- all such pages are in namespace 6 (NS_IMAGE).
+  il_to varchar(255) binary NOT NULL default '',
+  
+  UNIQUE KEY il_from(il_from,il_to),
+  KEY (il_to)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- Track category inclusions *used inline*
+-- This tracks a single level of category membership
+-- (folksonomic tagging, really).
+--
+CREATE TABLE /*$wgDBprefix*/categorylinks (
+  -- Key to page_id of the page defined as a category member.
+  cl_from int(8) unsigned NOT NULL default '0',
+  
+  -- Name of the category.
+  -- This is also the page_title of the category's description page;
+  -- all such pages are in namespace 14 (NS_CATEGORY).
+  cl_to varchar(255) binary NOT NULL default '',
+  
+  -- The title of the linking page, or an optional override
+  -- to determine sort order. Sorting is by binary order, which
+  -- isn't always ideal, but collations seem to be an exciting
+  -- and dangerous new world in MySQL...
+  --
+  -- For MySQL 4.1+ with charset set to utf8, the sort key *index*
+  -- needs cut to be smaller than 1024 bytes (at 3 bytes per char).
+  -- To sort properly on the shorter key, this field needs to be
+  -- the same shortness.
+  cl_sortkey varchar(86) binary NOT NULL default '',
+  
+  -- This isn't really used at present. Provided for an optional
+  -- sorting method by approximate addition time.
+  cl_timestamp timestamp NOT NULL,
+  
+  UNIQUE KEY cl_from(cl_from,cl_to),
+  
+  -- We always sort within a given category...
+  KEY cl_sortkey(cl_to,cl_sortkey),
+  
+  -- Not really used?
+  KEY cl_timestamp(cl_to,cl_timestamp)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- Contains a single row with some aggregate info
+-- on the state of the site.
+--
+CREATE TABLE /*$wgDBprefix*/site_stats (
+  -- The single row should contain 1 here.
+  ss_row_id int(8) unsigned NOT NULL,
+  
+  -- Total number of page views, if hit counters are enabled.
+  ss_total_views bigint(20) unsigned default '0',
+  
+  -- Total number of edits performed.
+  ss_total_edits bigint(20) unsigned default '0',
+  
+  -- An approximate count of pages matching the following criteria:
+  -- * in namespace 0
+  -- * not a redirect
+  -- * contains the text '[['
+  -- See isCountable() in includes/Article.php
+  ss_good_articles bigint(20) unsigned default '0',
+  
+  -- Total pages, theoretically equal to SELECT COUNT(*) FROM page; except faster
+  ss_total_pages bigint(20) default -1,
+
+  -- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
+  ss_users bigint(20) default -1,
+
+  -- Deprecated, no longer updated as of 1.5
+  ss_admins int(10) default -1,
+
+  UNIQUE KEY ss_row_id (ss_row_id)
+
+) TYPE=InnoDB;
+
+--
+-- Stores an ID for every time any article is visited;
+-- depending on $wgHitcounterUpdateFreq, it is
+-- periodically cleared and the page_counter column
+-- in the page table updated for the all articles
+-- that have been visited.)
+--
+CREATE TABLE /*$wgDBprefix*/hitcounter (
+  hc_id INTEGER UNSIGNED NOT NULL
+) TYPE=HEAP MAX_ROWS=25000;
+
+
+--
+-- The internet is full of jerks, alas. Sometimes it's handy
+-- to block a vandal or troll account.
+--
+CREATE TABLE /*$wgDBprefix*/ipblocks (
+  -- Primary key, introduced for privacy.
+  ipb_id int(8) NOT NULL auto_increment,
+  
+  -- Blocked IP address in dotted-quad form or user name.
+  ipb_address varchar(40) binary NOT NULL default '',
+  
+  -- Blocked user ID or 0 for IP blocks.
+  ipb_user int(8) unsigned NOT NULL default '0',
+  
+  -- User ID who made the block.
+  ipb_by int(8) unsigned NOT NULL default '0',
+  
+  -- Text comment made by blocker.
+  ipb_reason tinyblob NOT NULL default '',
+  
+  -- Creation (or refresh) date in standard YMDHMS form.
+  -- IP blocks expire automatically.
+  ipb_timestamp char(14) binary NOT NULL default '',
+  
+  -- Indicates that the IP address was banned because a banned
+  -- user accessed a page through it. If this is 1, ipb_address
+  -- will be hidden, and the block identified by block ID number.
+  ipb_auto tinyint(1) NOT NULL default '0',
+  
+  -- Time at which the block will expire.
+  ipb_expiry char(14) binary NOT NULL default '',
+
+  PRIMARY KEY ipb_id (ipb_id),
+  INDEX ipb_address (ipb_address),
+  INDEX ipb_user (ipb_user)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Uploaded images and other files.
+--
+CREATE TABLE /*$wgDBprefix*/image (
+  -- Filename.
+  -- This is also the title of the associated description page,
+  -- which will be in namespace 6 (NS_IMAGE).
+  img_name varchar(255) binary NOT NULL default '',
+  
+  -- File size in bytes.
+  img_size int(8) unsigned NOT NULL default '0',
+  
+  -- For images, size in pixels.
+  img_width int(5)  NOT NULL default '0',
+  img_height int(5)  NOT NULL default '0',
+  
+  -- Extracted EXIF metadata stored as a serialized PHP array.
+  img_metadata mediumblob NOT NULL,
+  
+  -- For images, bits per pixel if known.
+  img_bits int(3)  NOT NULL default '0',
+  
+  -- Media type as defined by the MEDIATYPE_xxx constants
+  img_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
+  
+  -- major part of a MIME media type as defined by IANA
+  -- see http://www.iana.org/assignments/media-types/
+  img_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") NOT NULL default "unknown",
+  
+  -- minor part of a MIME media type as defined by IANA
+  -- the minor parts are not required to adher to any standard
+  -- but should be consistent throughout the database
+  -- see http://www.iana.org/assignments/media-types/
+  img_minor_mime varchar(32) NOT NULL default "unknown",
+  
+  -- Description field as entered by the uploader.
+  -- This is displayed in image upload history and logs.
+  img_description tinyblob NOT NULL default '',
+  
+  -- user_id and user_name of uploader.
+  img_user int(5) unsigned NOT NULL default '0',
+  img_user_text varchar(255) binary NOT NULL default '',
+  
+  -- Time of the upload.
+  img_timestamp char(14) binary NOT NULL default '',
+  
+  PRIMARY KEY img_name (img_name),
+  
+  -- Used by Special:Imagelist for sort-by-size
+  INDEX img_size (img_size),
+  
+  -- Used by Special:Newimages and Special:Imagelist
+  INDEX img_timestamp (img_timestamp)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- Previous revisions of uploaded files.
+-- Awkwardly, image rows have to be moved into
+-- this table at re-upload time.
+--
+CREATE TABLE /*$wgDBprefix*/oldimage (
+  -- Base filename: key to image.img_name
+  oi_name varchar(255) binary NOT NULL default '',
+  
+  -- Filename of the archived file.
+  -- This is generally a timestamp and '!' prepended to the base name.
+  oi_archive_name varchar(255) binary NOT NULL default '',
+  
+  -- Other fields as in image...
+  oi_size int(8) unsigned NOT NULL default 0,
+  oi_width int(5) NOT NULL default 0,
+  oi_height int(5) NOT NULL default 0,
+  oi_bits int(3) NOT NULL default 0,
+  oi_description tinyblob NOT NULL default '',
+  oi_user int(5) unsigned NOT NULL default '0',
+  oi_user_text varchar(255) binary NOT NULL default '',
+  oi_timestamp char(14) binary NOT NULL default '',
+
+  INDEX oi_name (oi_name(10))
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Primarily a summary table for Special:Recentchanges,
+-- this table contains some additional info on edits from
+-- the last few days.
+--
+CREATE TABLE /*$wgDBprefix*/recentchanges (
+  rc_id int(8) NOT NULL auto_increment,
+  rc_timestamp varchar(14) binary NOT NULL default '',
+  rc_cur_time varchar(14) binary NOT NULL default '',
+  
+  -- As in revision
+  rc_user int(10) unsigned NOT NULL default '0',
+  rc_user_text varchar(255) binary NOT NULL default '',
+  
+  -- When pages are renamed, their RC entries do _not_ change.
+  rc_namespace int NOT NULL default '0',
+  rc_title varchar(255) binary NOT NULL default '',
+  
+  -- as in revision...
+  rc_comment varchar(255) binary NOT NULL default '',
+  rc_minor tinyint(3) unsigned NOT NULL default '0',
+  
+  -- Edits by user accounts with the 'bot' rights key are
+  -- marked with a 1 here, and will be hidden from the
+  -- default view.
+  rc_bot tinyint(3) unsigned NOT NULL default '0',
+  
+  rc_new tinyint(3) unsigned NOT NULL default '0',
+  
+  -- Key to page_id (was cur_id prior to 1.5).
+  -- This will keep links working after moves while
+  -- retaining the at-the-time name in the changes list.
+  rc_cur_id int(10) unsigned NOT NULL default '0',
+  
+  -- rev_id of the given revision
+  rc_this_oldid int(10) unsigned NOT NULL default '0',
+  
+  -- rev_id of the prior revision, for generating diff links.
+  rc_last_oldid int(10) unsigned NOT NULL default '0',
+  
+  -- These may no longer be used, with the new move log.
+  rc_type tinyint(3) unsigned NOT NULL default '0',
+  rc_moved_to_ns tinyint(3) unsigned NOT NULL default '0',
+  rc_moved_to_title varchar(255) binary NOT NULL default '',
+  
+  -- If the Recent Changes Patrol option is enabled,
+  -- users may mark edits as having been reviewed to
+  -- remove a warning flag on the RC list.
+  -- A value of 1 indicates the page has been reviewed.
+  rc_patrolled tinyint(3) unsigned NOT NULL default '0',
+  
+  -- Recorded IP address the edit was made from, if the
+  -- $wgPutIPinRC option is enabled.
+  rc_ip char(15) NOT NULL default '',
+  
+  PRIMARY KEY rc_id (rc_id),
+  INDEX rc_timestamp (rc_timestamp),
+  INDEX rc_namespace_title (rc_namespace, rc_title),
+  INDEX rc_cur_id (rc_cur_id),
+  INDEX new_name_timestamp(rc_new,rc_namespace,rc_timestamp),
+  INDEX rc_ip (rc_ip)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+CREATE TABLE /*$wgDBprefix*/watchlist (
+  -- Key to user_id
+  wl_user int(5) unsigned NOT NULL,
+  
+  -- Key to page_namespace/page_title
+  -- Note that users may watch patches which do not exist yet,
+  -- or existed in the past but have been deleted.
+  wl_namespace int NOT NULL default '0',
+  wl_title varchar(255) binary NOT NULL default '',
+  
+  -- Timestamp when user was last sent a notification e-mail;
+  -- cleared when the user visits the page.
+  -- FIXME: add proper null support etc
+  wl_notificationtimestamp varchar(14) binary NOT NULL default '0',
+  
+  UNIQUE KEY (wl_user, wl_namespace, wl_title),
+  KEY namespace_title (wl_namespace,wl_title)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+--
+-- Used by texvc math-rendering extension to keep track
+-- of previously-rendered items.
+--
+CREATE TABLE /*$wgDBprefix*/math (
+  -- Binary MD5 hash of the latex fragment, used as an identifier key.
+  math_inputhash varbinary(16) NOT NULL,
+  
+  -- Not sure what this is, exactly...
+  math_outputhash varbinary(16) NOT NULL,
+  
+  -- texvc reports how well it thinks the HTML conversion worked;
+  -- if it's a low level the PNG rendering may be preferred.
+  math_html_conservativeness tinyint(1) NOT NULL,
+  
+  -- HTML output from texvc, if any
+  math_html text,
+  
+  -- MathML output from texvc, if any
+  math_mathml text,
+  
+  UNIQUE KEY math_inputhash (math_inputhash)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- When using the default MySQL search backend, page titles
+-- and text are munged to strip markup, do Unicode case folding,
+-- and prepare the result for MySQL's fulltext index.
+--
+-- This table must be MyISAM; InnoDB does not support the needed
+-- fulltext index.
+--
+CREATE TABLE /*$wgDBprefix*/searchindex (
+  -- Key to page_id
+  si_page int(8) unsigned NOT NULL,
+  
+  -- Munged version of title
+  si_title varchar(255) NOT NULL default '',
+  
+  -- Munged version of body text
+  si_text mediumtext NOT NULL default '',
+  
+  UNIQUE KEY (si_page),
+  FULLTEXT si_title (si_title),
+  FULLTEXT si_text (si_text)
+
+) TYPE=MyISAM, DEFAULT CHARSET=utf8;
+
+--
+-- Recognized interwiki link prefixes
+--
+CREATE TABLE /*$wgDBprefix*/interwiki (
+  -- The interwiki prefix, (e.g. "Meatball", or the language prefix "de")
+  iw_prefix char(32) NOT NULL,
+  
+  -- The URL of the wiki, with "$1" as a placeholder for an article name.
+  -- Any spaces in the name will be transformed to underscores before
+  -- insertion.
+  iw_url char(127) NOT NULL,
+  
+  -- A boolean value indicating whether the wiki is in this project
+  -- (used, for example, to detect redirect loops)
+  iw_local BOOL NOT NULL,
+  
+  -- Boolean value indicating whether interwiki transclusions are allowed.
+  iw_trans TINYINT(1) NOT NULL DEFAULT 0,
+  
+  UNIQUE KEY iw_prefix (iw_prefix)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- Used for caching expensive grouped queries
+--
+CREATE TABLE /*$wgDBprefix*/querycache (
+  -- A key name, generally the base name of of the special page.
+  qc_type char(32) NOT NULL,
+  
+  -- Some sort of stored value. Sizes, counts...
+  qc_value int(5) unsigned NOT NULL default '0',
+  
+  -- Target namespace+title
+  qc_namespace int NOT NULL default '0',
+  qc_title char(255) binary NOT NULL default '',
+  
+  KEY (qc_type,qc_value)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+--
+-- For a few generic cache operations if not using Memcached
+--
+CREATE TABLE /*$wgDBprefix*/objectcache (
+  keyname char(255) binary not null default '',
+  value mediumblob,
+  exptime datetime,
+  unique key (keyname),
+  key (exptime)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+-- For article validation
+CREATE TABLE /*$wgDBprefix*/validate (
+  val_user int(11) NOT NULL default '0',
+  val_page int(11) unsigned NOT NULL default '0',
+  val_revision int(11) unsigned NOT NULL default '0',
+  val_type int(11) unsigned NOT NULL default '0',
+  val_value int(11) default '0',
+  val_comment varchar(255) NOT NULL default '',
+  val_ip varchar(20) NOT NULL default '',
+  KEY val_user (val_user,val_revision)
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE /*$wgDBprefix*/logging (
+  -- Symbolic keys for the general log type and the action type
+  -- within the log. The output format will be controlled by the
+  -- action field, but only the type controls categorization.
+  log_type char(10) NOT NULL default '',
+  log_action char(10) NOT NULL default '',
+  
+  -- Timestamp. Duh.
+  log_timestamp char(14) NOT NULL default '19700101000000',
+  
+  -- The user who performed this action; key to user_id
+  log_user int unsigned NOT NULL default 0,
+  
+  -- Key to the page affected. Where a user is the target,
+  -- this will point to the user page.
+  log_namespace int NOT NULL default 0,
+  log_title varchar(255) binary NOT NULL default '',
+  
+  -- Freeform text. Interpreted as edit history comments.
+  log_comment varchar(255) NOT NULL default '',
+  
+  -- LF separated list of miscellaneous parameters
+  log_params blob NOT NULL default '',
+
+  KEY type_time (log_type, log_timestamp),
+  KEY user_time (log_user, log_timestamp),
+  KEY page_time (log_namespace, log_title, log_timestamp)
+
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
+
+
+
+
+
+-- Hold group name and description
+--CREATE TABLE /*$wgDBprefix*/groups (
+--  gr_id int(5) unsigned NOT NULL auto_increment,
+--  gr_name varchar(50) NOT NULL default '',
+--  gr_description varchar(255) NOT NULL default '',
+--  gr_rights tinyblob,
+--  PRIMARY KEY  (gr_id)
+--
+--) TYPE=InnoDB;
+
+CREATE TABLE /*$wgDBprefix*/trackbacks (
+	tb_id		INTEGER AUTO_INCREMENT PRIMARY KEY,
+	tb_page		INTEGER REFERENCES page(page_id) ON DELETE CASCADE,
+	tb_title	VARCHAR(255) NOT NULL,
+	tb_url		VARCHAR(255) NOT NULL,
+	tb_ex		TEXT,
+	tb_name		VARCHAR(255),
+
+	INDEX (tb_page)
+) TYPE=InnoDB, DEFAULT CHARSET=utf8;
-- 
cgit v1.2.3


From 15e0e505c2cf2254ed2a12d0825cca4e552d9a45 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 26 Oct 2005 01:58:39 +0000
Subject: * Sanitizer CSS comment processing order fix

---
 RELEASE-NOTES          | 1 +
 includes/Sanitizer.php | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ddd6e9578f2c..dce879a4d062 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -831,6 +831,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3786) Experimental support for MySQL 4.1/5.0 utf8 charset mode
   NOTE: Enabling this may break existing wikis, and still doesn't
   work for all Unicode characters due to MySQL limitations.
+* Sanitizer CSS comment processing order fix
 
 
 === Caveats ===
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index fbf70fc05c79..3816b9de03c7 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -555,10 +555,13 @@ class Sanitizer {
 			# Strip javascript "expression" from stylesheets.
 			# http://msdn.microsoft.com/workshop/author/dhtml/overview/recalc.asp
 			if( $attribute == 'style' ) {
+				$stripped = Sanitizer::decodeCharReferences( $value );
+				
 				// Remove any comments; IE gets token splitting wrong
-				$value = preg_replace( '!/\\*.*?\\*/!S', ' ', $value );
+				$stripped = preg_replace( '!/\\*.*?\\*/!S', ' ', $stripped );
+				$value = htmlspecialchars( $stripped );
 				
-				$stripped = Sanitizer::decodeCharReferences( $value );
+				// ... and continue checks
 				$stripped = preg_replace( '!\\\\([0-9A-Fa-f]{1,6})[ \\n\\r\\t\\f]?!e',
 					'codepointToUtf8(hexdec("$1"))', $stripped );
 				$stripped = str_replace( '\\', '', $stripped );
-- 
cgit v1.2.3


From da7fc15ee36564f4aacf591b6cf1dfe12e2bf41a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 26 Oct 2005 02:23:44 +0000
Subject: Bump version number so I don't forget before releasing ;)

---
 includes/DefaultSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 438c1a3a0e6b..73dce6e781ef 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5.0';
+$wgVersion			= '1.5.1';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From 2d47ced12c210b6d4cbd7bc53960e63d6251fce1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 26 Oct 2005 09:48:54 +0000
Subject: Update release notes

---
 RELEASE-NOTES | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dce879a4d062..7a409a46757b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,42 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5.1 ==
+
+October 26, 2005
+
+MediaWiki 1.5.1 is a bugfix and security maintenance release, and is a
+recommended upgrade for all installations.
+
+This release includes further corrections to the inline CSS style sanitation
+which works around a JavaScript "feature" on Microsoft Internet Explorer.
+Users of Microsoft Internet Explorer for Windows may be vulnerable to
+XSS injections on prior versions; users of standards-compliant browsers
+are not vulnerable.
+
+Major fixes include:
+* Image pages work again with resizing disabled
+* Works in MySQL 5.0 strict mode
+
+There is experimental support in this release for explicitly declaring
+the UTF-8 charset in the database; this has been tested with MySQL 5.0.15
+but should work on 4.1 as well.
+
+IMPORTANT: Changing this setting on an existing wiki may produce interesting
+data corruption, depending on server configuration. Page contents should,
+usually, be unaffected, but page titles and other items may be. Limitations
+in MySQL's Unicode support mean that characters outside the BMP cannot be used
+in page titles or various other fields when using this mode.
+
+Table definitions are in maintenance/mysql5/tables.sql, and the runtime
+option to send 'SET NAMES utf8' is set by $wgDBmysql5 = true.
+
+(MySQL 3.23.x and 4.0.x do not support character set declarations; on these
+versions MediaWiki simply works with UTF-8 data and MySQL is blissfully
+unaware of it.)
+
+
+
 == MediaWiki 1.5.0 final ==
 
 October 5, 2005
-- 
cgit v1.2.3


From d9c80508a4945d834b3286f74f4150ff584b1fb8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 26 Oct 2005 21:32:11 +0000
Subject: * Fix Special:BrokenRedirects on MySQL 5.0

---
 RELEASE-NOTES                       | 5 +++++
 includes/SpecialBrokenRedirects.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7a409a46757b..46009c9c89e5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -870,6 +870,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Sanitizer CSS comment processing order fix
 
 
+=== Changes since 1.5.1 ===
+
+* Fix Special:BrokenRedirects on MySQL 5.0
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/includes/SpecialBrokenRedirects.php b/includes/SpecialBrokenRedirects.php
index 41011209dab1..4c3a8ed0c12f 100644
--- a/includes/SpecialBrokenRedirects.php
+++ b/includes/SpecialBrokenRedirects.php
@@ -38,7 +38,7 @@ class BrokenRedirectsPage extends PageQueryPage {
 		                p1.page_title     AS title,
 		                pl_namespace,
 		                pl_title
-		           FROM $pagelinks, $page AS p1
+		           FROM ($pagelinks, $page AS p1)
 		      LEFT JOIN $page AS p2
 		             ON pl_namespace=p2.page_namespace AND pl_title=p2.page_title
 		          WHERE p1.page_is_redirect=1
-- 
cgit v1.2.3


From 62f8e4db548e545dc11b892145d0c86eb0912e01 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 27 Oct 2005 23:03:36 +0000
Subject: * (bug 3809) Backport fix for detecting diff3 failure

---
 RELEASE-NOTES                |  1 +
 includes/GlobalFunctions.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 46009c9c89e5..efd41ea84ecb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -873,6 +873,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 === Changes since 1.5.1 ===
 
 * Fix Special:BrokenRedirects on MySQL 5.0
+* (bug 3809) Backport fix for detecting diff3 failure
 
 
 === Caveats ===
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 5efe1c20eb31..bd4c61a118e4 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -790,6 +790,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	# This check may also protect against code injection in
 	# case of broken installations.
 	if(! file_exists( $wgDiff3 ) ){
+		wfDebug( "diff3 not found\n" );
 		return false;
 	}
 
@@ -804,7 +805,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	fwrite( $yourtextFile, $yours ); fclose( $yourtextFile );
 
 	# Check for a conflict
-	$cmd = wfEscapeShellArg( $wgDiff3 ) . ' -a --overlap-only ' .
+	$cmd = $wgDiff3 . ' -a --overlap-only ' .
 	  wfEscapeShellArg( $mytextName ) . ' ' .
 	  wfEscapeShellArg( $oldtextName ) . ' ' .
 	  wfEscapeShellArg( $yourtextName );
@@ -818,7 +819,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	pclose( $handle );
 
 	# Merge differences
-	$cmd = wfEscapeShellArg( $wgDiff3 ) . ' -a -e --merge ' .
+	$cmd = $wgDiff3 . ' -a -e --merge ' .
 	  wfEscapeShellArg( $mytextName, $oldtextName, $yourtextName );
 	$handle = popen( $cmd, 'r' );
 	$result = '';
@@ -831,6 +832,11 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	} while ( true );
 	pclose( $handle );
 	unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
+
+	if ( $result === '' && $old !== '' && $conflict == false ) {
+		wfDebug( "Unexpected null result from diff3.\nCommand: $cmd\nOutput: " . `$cmd 2>&1` . "\n" );
+		$conflict = true;
+	}
 	return ! $conflict;
 }
 
-- 
cgit v1.2.3


From 9fcfd48eb8e4fc29820af2f87cc5a686b2eab3b6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 27 Oct 2005 23:09:30 +0000
Subject: Don't re-run diff3 with missing files for the debug comment; it'll be
 wrong.

---
 includes/GlobalFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index bd4c61a118e4..4e558d00f55a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -834,7 +834,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
 	unlink( $mytextName ); unlink( $oldtextName ); unlink( $yourtextName );
 
 	if ( $result === '' && $old !== '' && $conflict == false ) {
-		wfDebug( "Unexpected null result from diff3.\nCommand: $cmd\nOutput: " . `$cmd 2>&1` . "\n" );
+		wfDebug( "Unexpected null result from diff3. Command: $cmd\n" );
 		$conflict = true;
 	}
 	return ! $conflict;
-- 
cgit v1.2.3


From 1a037e72c08093c3172cbb4312ab01834c51cd04 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Oct 2005 06:30:13 +0000
Subject: * MySQL 5.0 strict mode fix for moving unwatched pages

---
 RELEASE-NOTES            | 1 +
 includes/WatchedItem.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index efd41ea84ecb..7260da819a8a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -874,6 +874,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * Fix Special:BrokenRedirects on MySQL 5.0
 * (bug 3809) Backport fix for detecting diff3 failure
+* MySQL 5.0 strict mode fix for moving unwatched pages
 
 
 === Caveats ===
diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index b27c53faf95c..cb9d3db8cd1f 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -160,6 +160,11 @@ class WatchedItem {
 			);
 		}
 		$dbw->freeResult( $res );
+		
+		if( empty( $values ) ) {
+			// Nothing to do
+			return true;
+		}
 
 		# Perform replace
 		# Note that multi-row replace is very efficient for MySQL but may be inefficient for
-- 
cgit v1.2.3


From 66fb27176f9b795033c99c27121c11b845657f74 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Oct 2005 09:02:36 +0000
Subject: * (bug 3782) Throw fatal installation warning if
 mbstring.func_overload on.   Why do people invent these crazy options that
 change language semantics?

---
 RELEASE-NOTES    | 2 ++
 config/index.php | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7260da819a8a..c31b14d7f745 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -875,6 +875,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix Special:BrokenRedirects on MySQL 5.0
 * (bug 3809) Backport fix for detecting diff3 failure
 * MySQL 5.0 strict mode fix for moving unwatched pages
+* (bug 3782) Throw fatal installation warning if mbstring.func_overload on.
+  Why do people invent these crazy options that change language semantics?
 
 
 === Caveats ===
diff --git a/config/index.php b/config/index.php
index e78ef5946bf0..48b982499b06 100644
--- a/config/index.php
+++ b/config/index.php
@@ -220,6 +220,14 @@ if( ini_get( "magic_quotes_sybase" ) ) {
 	<?php
 }
 
+if( ini_get( "mbstring.func_overload" ) ) {
+	$fatal = true;
+	?><li class='error'><strong>Fatal: <a href='http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload'>mbstring.func_overload</a> is active!</strong>
+	This option causes errors and may corrupt data unpredictably;
+	you cannot install or use MediaWiki unless this option is disabled.
+	<?php
+}
+
 if( $fatal ) {
 	dieout( "</ul><p>Cannot install wiki.</p>" );
 }
-- 
cgit v1.2.3


From 65d95799d710c4d812cc0ebc2a8f8a4f24c7778e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Oct 2005 09:34:04 +0000
Subject: * (bug 3762) Define missing Special:Import UI messages

---
 RELEASE-NOTES          | 1 +
 languages/Language.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c31b14d7f745..e52b7ff58e7c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -877,6 +877,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * MySQL 5.0 strict mode fix for moving unwatched pages
 * (bug 3782) Throw fatal installation warning if mbstring.func_overload on.
   Why do people invent these crazy options that change language semantics?
+* (bug 3762) Define missing Special:Import UI messages
 
 
 === Caveats ===
diff --git a/languages/Language.php b/languages/Language.php
index 239bf2a1b5c7..79752d42d047 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1620,6 +1620,8 @@ article [[Train]].
 'importsuccess'	=> 'Import succeeded!',
 'importhistoryconflict' => 'Conflicting history revision exists (may have imported this page before)',
 'importnosources' => 'No transwiki import sources have been defined and direct history uploads are disabled.',
+'importnofile' => 'No import file was uploaded.',
+'importuploaderror' => 'Upload of import file failed; perhaps the file is bigger than the allowed upload size.',
 
 # Keyboard access keys for power users
 'accesskey-search' => 'f',
-- 
cgit v1.2.3


From 5d3d247ac56a4a46b68f140ce3d671fe2223a4ae Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Oct 2005 09:40:10 +0000
Subject: * (bug 3771) Handle internal functions in backtrace in wfAbruptExit()
 http://bugzilla.wikimedia.org/attachment.cgi?id=1011

---
 RELEASE-NOTES                | 1 +
 includes/GlobalFunctions.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e52b7ff58e7c..74a0f1dcdd93 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -878,6 +878,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3782) Throw fatal installation warning if mbstring.func_overload on.
   Why do people invent these crazy options that change language semantics?
 * (bug 3762) Define missing Special:Import UI messages
+* (bug 3771) Handle internal functions in backtrace in wfAbruptExit()
 
 
 === Caveats ===
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4e558d00f55a..afb7fc026086 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -418,8 +418,8 @@ function wfAbruptExit( $error = false ){
 	if( function_exists( 'debug_backtrace' ) ){ // PHP >= 4.3
 		$bt = debug_backtrace();
 		for($i = 0; $i < count($bt) ; $i++){
-			$file = $bt[$i]['file'];
-			$line = $bt[$i]['line'];
+			$file = isset($bt[$i]['file']) ? $bt[$i]['file'] : "unknown";
+			$line = isset($bt[$i]['line']) ? $bt[$i]['line'] : "unknown";
 			wfDebug("WARNING: Abrupt exit in $file at line $line\n");
 		}
 	} else {
-- 
cgit v1.2.3


From 7ec6d4fd7bef60af37f67114530c4faeb1f61332 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 28 Oct 2005 09:48:29 +0000
Subject: * (bug 3649) Remove obsolete, broken moveCustomMessages script

---
 RELEASE-NOTES                               |   1 +
 maintenance/archives/moveCustomMessages.inc | 160 ----------------------------
 maintenance/archives/moveCustomMessages.php |  29 -----
 3 files changed, 1 insertion(+), 189 deletions(-)
 delete mode 100644 maintenance/archives/moveCustomMessages.inc
 delete mode 100644 maintenance/archives/moveCustomMessages.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 74a0f1dcdd93..325cfaf5dcde 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -879,6 +879,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   Why do people invent these crazy options that change language semantics?
 * (bug 3762) Define missing Special:Import UI messages
 * (bug 3771) Handle internal functions in backtrace in wfAbruptExit()
+* (bug 3649) Remove obsolete, broken moveCustomMessages script
 
 
 === Caveats ===
diff --git a/maintenance/archives/moveCustomMessages.inc b/maintenance/archives/moveCustomMessages.inc
deleted file mode 100644
index 83664dca0729..000000000000
--- a/maintenance/archives/moveCustomMessages.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-#### FIXME THIS FILE IS BADLY BROKEN FOR NEW SCHEMA
-/**
- * @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
- */
-
-/** */
-function isTemplateInitialised() {
-	global $wgAllMessagesEn;
-	$fname = 'isTemplateInitialised';
-
-	$dbw =& wfGetDB( DB_MASTER );
-	$n = $dbw->selectField( 'page', 'count(*)', array( 'page_namespace' => NS_MEDIAWIKI ) );
-	return $n > count( $wgAllMessagesEn ) ? false : true;
-}
-
-function moveCustomMessages( $phase ) {
-	global $wgUser, $wgAllMessagesEn, $wgDeferredUpdateList, $wgLang, $wgContLang;
-	global $targets, $template, $replaceCount;
-
-	$wgUser = new User;
-	$wgUser->setLoaded( true ); # Don't load from DB
-	$wgUser->setName( "Template namespace initialisation script" );
-	$wgUser->addRight( "bot" );
-
-	$dbw =& wfGetDB( DB_MASTER );
-
-	$dbw->ignoreErrors( true );
-
-	# Compose DB key array
-	$dbkeys = array();
-
-	foreach ( $wgAllMessagesEn as $key => $enValue ) {
-		$title = Title::newFromText( $wgContLang->ucfirst( $key ) );
-		$dbkeys[$title->getDBkey()] = 1;
-	}
-
-	$res = $dbw->select( 'page', array( 'page_id', 'page_title' ), array( 'page_namespace' => NS_MEDIAWIKI ) );
-
-	# Compile target array
-	$targets = array();
-	while ( $row = $dbw->fetchObject( $res ) ) {
-		if ( !array_key_exists( $row->cur_title, $dbkeys ) ) {
-			$targets[$row->cur_title] = 1;
-		}
-	}
-	$dbw->freeResult( $res );
-
-	# Create redirects from destination to source
-	if ( $phase == 0 || $phase == 1 ) {
-		print "Creating redirects\n";
-		foreach ( $targets as $partial => $dummy ) {
-			print "$partial...";
-			$nt = Title::makeTitle( NS_TEMPLATE, $partial );
-			$ot = Title::makeTitle( NS_MEDIAWIKI, $partial );
-
-			if ( $nt->createRedirect( $ot, "" ) ) {
-				print "redirected\n";
-			} else {
-				print "not redirected\n";
-			}
-		}
-		if ( $phase == 0 ) {
-			print "\nRedirects created. Update live script files now.\nPress ENTER to continue.\n\n";
-			readconsole();
-		}
-	}
-
-	# Move pages
-	if ( $phase == 0 || $phase == 2 ) {
-		print "\nMoving pages...\n";
-		foreach ( $targets as $partial => $dummy ) {
-			$dbw->query( "BEGIN" );
-			$ot = Title::makeTitle( NS_MEDIAWIKI, $partial );
-			$nt = Title::makeTitle( NS_TEMPLATE, $partial );
-			print "$partial...";
-
-			if ( $ot->moveNoAuth( $nt ) === true ) {
-				print "moved\n";
-			} else {
-				print "not moved\n";
-			}
-			# Do deferred updates
-			while ( count( $wgDeferredUpdateList ) ) {
-				$up = array_pop( $wgDeferredUpdateList );
-				$up->doUpdate();
-			}
-			$dbw->query( "COMMIT" );
-		}
-	}
-
-	# Convert text
-	if ( $phase == 0 || $phase == 3 ) {
-		print "\nConverting text...\n";
-		
-		$parser = new Parser;
-		$options = ParserOptions::newFromUser( $wgUser );
-		$completedTitles = array();
-		$titleChars = Title::legalChars();
-		$mediaWiki = $wgLang->getNsText( NS_MEDIAWIKI );
-		$template = $wgLang->getNsText( NS_TEMPLATE );
-		$linkRegex = "/\[\[$mediaWiki:([$titleChars]*?)\]\]/";
-		$msgRegex = "/{{msg:([$titleChars]*?)}}/";
-
-		foreach ( $targets as $partial => $dummy ) {
-			$dest = Title::makeTitle( NS_MEDIAWIKI, $partial );
-			$linksTo = $dest->getLinksTo();
-			foreach( $linksTo as $source ) {
-				$dbw->query( "BEGIN" );
-				$pdbk = $source->getPrefixedDBkey();
-				if ( !array_key_exists( $pdbk, $completedTitles ) ) {	
-					$completedTitles[$pdbk] = 1;
-					$id = $source->getArticleID();
-					$row = $dbw->selectRow( 'cur', array( 'cur_text' ), 
-						array( 'cur_id' => $source->getArticleID() ) );
-					$parser->startExternalParse( $source, $options, OT_WIKI );
-					$text = $parser->strip( $row->cur_text, $stripState, false );
-					# {{msg}} -> {{}}
-					$text = preg_replace( $msgRegex, "{{\$1}}", $text );
-					# [[MediaWiki:]] -> [[Template:]]
-					$text = preg_replace_callback( $linkRegex, "wfReplaceMediaWiki", $text );
-					$text = $parser->unstrip( $text, $stripState );
-					$text = $parser->unstripNoWiki( $text, $stripState );
-					if ( $text != $row->cur_text ) {
-						print "$pdbk\n";
-						$art = new Article( $source );
-						$art->updateArticle( $text, "", false, false );
-						# Do deferred updates
-						while ( count( $wgDeferredUpdateList ) ) {
-							$up = array_pop( $wgDeferredUpdateList );
-							$up->doUpdate();
-						}
-					} else {
-						print "($pdbk)\n";
-					}
-				} 
-				$dbw->query( "COMMIT" );
-			}
-		}
-	}
-}
-
-
-#--------------------------------------------------------------------------------------------------------------
-function wfReplaceMediaWiki( $m ) {
-	global $targets, $template, $replaceCount;
-	$title = Title::newFromText( $m[1] );
-	$partial = $title->getDBkey();
-
-	if ( array_key_exists( $partial, $targets ) ) {
-		$text = "[[$template:{$m[1]}]]";
-	} else {
-		$text = $m[0];
-	}
-	return $text;
-}
-
-?>
diff --git a/maintenance/archives/moveCustomMessages.php b/maintenance/archives/moveCustomMessages.php
deleted file mode 100644
index ea79bc21a0b2..000000000000
--- a/maintenance/archives/moveCustomMessages.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @deprecated
- * @package MediaWiki
- * @subpackage MaintenanceArchive
- */
-
-/** */
-
-# Move "custom messages" from the MediaWiki namespace to the Template namespace
-# Usage: php moveCustomMessages.php [<lang>] [phase]
-
-# Script works in three phases:
-#   1. Create redirects from Template to MediaWiki namespace. Skip if you don't want them
-#   2. Move pages from MediaWiki to Template namespace.
-#   3. Convert the text to suit the new syntax
-
-chdir( ".." );
-require_once( "liveCmdLine.inc" );
-require_once( "moveCustomMessages.inc" );
-
-$phase = 0;
-if ( is_numeric( @$argv[3] ) && $argv[3] > 0) {
-	$phase = intval($argv[3]);
-}
-
-moveCustomMessages( $phase );
-
-?>
-- 
cgit v1.2.3


From fce6c2792ef1eb34e0aaf83dbfdb4dde48d3c8de Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 29 Oct 2005 06:03:31 +0000
Subject: * (bug 3667) Add missing global in page move code Might or might not
 mollify PHP 4.1.2, but it's a correctness thing anyway.

---
 RELEASE-NOTES      | 1 +
 includes/Title.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 325cfaf5dcde..4a197e728897 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -880,6 +880,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3762) Define missing Special:Import UI messages
 * (bug 3771) Handle internal functions in backtrace in wfAbruptExit()
 * (bug 3649) Remove obsolete, broken moveCustomMessages script
+* (bug 3667) Add missing global in page move code
 
 
 === Caveats ===
diff --git a/includes/Title.php b/includes/Title.php
index 40f13ed38ccd..499c6a2693db 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1659,6 +1659,7 @@ class Title {
 			$u->doUpdate();
 		}
 
+		global $wgUser;
 		wfRunHooks( 'TitleMoveComplete', array( &$this, &$nt, &$wgUser, $pageid, $redirid ) );
 		return true;
 	}
-- 
cgit v1.2.3


From 7cfaad9b9fb104c6f2db4f5d5daaf7aa0b3926a8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 29 Oct 2005 06:42:21 +0000
Subject: * (bug 3761) Avoid deprecation warnings in Special:Import

---
 RELEASE-NOTES              | 1 +
 includes/SpecialImport.php | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4a197e728897..4cacb66ff798 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -881,6 +881,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3771) Handle internal functions in backtrace in wfAbruptExit()
 * (bug 3649) Remove obsolete, broken moveCustomMessages script
 * (bug 3667) Add missing global in page move code
+* (bug 3761) Avoid deprecation warnings in Special:Import
 
 
 === Caveats ===
diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 9c626ed4e69e..728f80c16774 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -267,7 +267,7 @@ class WikiImporter {
 		# case folding violates XML standard, turn it off
 		xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
 		
-		xml_set_object( $parser, &$this );
+		xml_set_object( $parser, $this );
 		xml_set_element_handler( $parser, "in_start", "" );
 		
 		$offset = 0; // for context extraction on error reporting
@@ -522,9 +522,8 @@ class WikiImporter {
 		}
 		xml_set_element_handler( $parser, "in_page", "out_page" );
 		
-		$out = call_user_func( $this->mRevisionCallback,
-			&$this->workRevision,
-			&$this );
+		$out = call_user_func_array( $this->mRevisionCallback,
+			array( &$this->workRevision, &$this ) );
 		if( !empty( $out ) ) {
 			global $wgOut;
 			$wgOut->addHTML( "<li>" . $out . "</li>\n" );
-- 
cgit v1.2.3


From 0a22192eb920a360bb957d97d75fe9dd43489f58 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 30 Oct 2005 01:30:44 +0000
Subject: * (bug 2885) Remove unnecessary reference parameter which broke
 classic skin   talk notification on PHP 5.0.5

---
 RELEASE-NOTES      | 2 ++
 includes/Title.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4cacb66ff798..f250aca82f82 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -882,6 +882,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3649) Remove obsolete, broken moveCustomMessages script
 * (bug 3667) Add missing global in page move code
 * (bug 3761) Avoid deprecation warnings in Special:Import
+* (bug 2885) Remove unnecessary reference parameter which broke classic skin
+  talk notification on PHP 5.0.5
 
 
 === Caveats ===
diff --git a/includes/Title.php b/includes/Title.php
index 499c6a2693db..e147b28e1299 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2043,7 +2043,7 @@ class Title {
 	 * @param Title $title
 	 * @return bool
 	 */
-	function equals( &$title ) {
+	function equals( $title ) {
 		return $this->getInterwiki() == $title->getInterwiki()
 			&& $this->getNamespace() == $title->getNamespace()
 			&& $this->getDbkey() == $title->getDbkey();
-- 
cgit v1.2.3


From eba14cf02759c71438e5cae756deb7426c398c79 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 1 Nov 2005 07:10:56 +0000
Subject: * (bug 3845) Update attribute.php for 1.5 schema

---
 RELEASE-NOTES             |  1 +
 maintenance/attribute.php | 60 ++++++++++-------------------------------------
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f250aca82f82..1e02101d1605 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -884,6 +884,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3761) Avoid deprecation warnings in Special:Import
 * (bug 2885) Remove unnecessary reference parameter which broke classic skin
   talk notification on PHP 5.0.5
+* (bug 3845) Update attribute.php for 1.5 schema
 
 
 === Caveats ===
diff --git a/maintenance/attribute.php b/maintenance/attribute.php
index d885fd286e77..d8acd0cd4c84 100644
--- a/maintenance/attribute.php
+++ b/maintenance/attribute.php
@@ -24,7 +24,7 @@ $source = $args[0];
 $dest = $args[1];
 
 $dbr =& wfGetDB( DB_SLAVE );
-extract( $dbr->tableNames( 'cur','old','user' ));
+extract( $dbr->tableNames( 'page', 'revision','user' ));
 $eSource = $dbr->strencode( $source );
 $eDest = $dbr->strencode( $dest );
 
@@ -52,10 +52,12 @@ fwrite( $sqlfile,
 
 $omitTitle = "Wikipedia:Changing_attribution_for_an_edit";
 
-# Get old entries
-print "\nOld entries\n\n";
+# Get revisions
+print "\nPage revisions\n\n";
 
-$res = $dbr->query( "SELECT old_namespace, old_title, old_id, old_timestamp FROM $old WHERE old_user_text='$eSource'" );
+$res = $dbr->query( "SELECT page_namespace, page_title, rev_id, rev_timestamp
+FROM $revision,$page
+WHERE rev_user_text='$eSource' and rev_page=page_id" );
 $row = $dbr->fetchObject( $res );
 
 if ( $row ) {
@@ -65,23 +67,18 @@ if ( $row ) {
 		break;
 	}
 */
-	fwrite( $logfile, "**Old IDs: " );
-	fwrite( $sqlfile, "UPDATE old SET old_user=$uid, old_user_text='$eDest' WHERE old_id IN (\n" );
+	fwrite( $logfile, "**Revision IDs: " );
+	fwrite( $sqlfile, "UPDATE $revision SET rev_user=$uid, rev_user_text='$eDest' WHERE rev_id IN (\n" );
 	
 	for ( $first=true; $row; $row = $dbr->fetchObject( $res ) ) {
-		$ns = $wgLang->getNsText( $row->old_namespace );
-		if ( $ns ) {
-			$fullTitle = "$ns:{$row->old_title}";
-		} else {
-			$fullTitle = $row->old_title;
-		}
+		$title = Title::makeTitle( $row->page_namespace, $row->page_title );
+		$fullTitle = $title->getPrefixedDbKey();
 		if ( $fullTitle == $omitTitle ) {
 			continue;
 		}
 
 		print "$fullTitle\n";
-		$url = "http://$lang.wikipedia.org/w/wiki.phtml?title=" . urlencode( $fullTitle );
-		$url .= "&oldid={$row->old_id}";
+		$url = $title->getFullUrl( "oldid={$row->rev_id}" );
 		
 		# Output
 		fwrite( $sqlfile, "      " );
@@ -92,45 +89,14 @@ if ( $row ) {
 			fwrite( $logfile, ", " );
 		}
 
-		fwrite( $sqlfile, "{$row->old_id} -- $url\n" );
-		fwrite( $logfile, "[$url {$row->old_id}]" );
+		fwrite( $sqlfile, "{$row->rev_id} -- $url\n" );
+		fwrite( $logfile, "[$url {$row->rev_id}]" );
 
 	}
 	fwrite( $sqlfile, ");\n" );
 	fwrite( $logfile, "\n" );
 }
 
-# Get cur entries
-print "\n\nCur entries\n\n";
-
-$res = $dbr->query( "SELECT cur_title, cur_namespace, cur_timestamp, cur_id FROM $cur WHERE cur_user_text='$eSource'" );
-$row = $dbr->fetchObject( $res );
-if ( $row ) {
-	fwrite( $sqlfile, "\n\nUPDATE cur SET cur_user=$uid, cur_user_text='$eDest' WHERE cur_id IN(\n" );
-	fwrite( $logfile, "**Cur entries:\n" );
-	for ( $first=true; $row; $row = $dbr->fetchObject( $res ) ) {
-		$ns = $wgLang->getNsText( $row->cur_namespace );
-		if ( $ns ) {
-			$fullTitle = "$ns:{$row->cur_title}";
-		} else {
-			$fullTitle = $row->cur_title;
-		}
-		if ( $fullTitle == $omitTitle ) {
-			continue;
-		}
-		$url = "http://$lang.wikipedia.org/wiki/" . urlencode($fullTitle);
-		if ( $first ) {
-			fwrite( $sqlfile, "      " );
-			$first = false;
-		} else {
-			fwrite( $sqlfile, "    , " );
-		}
-		fwrite( $sqlfile, "{$row->cur_id} -- $url\n" );
-		fwrite( $logfile, "***[[$fullTitle]] {$row->cur_timestamp}\n" );
-		print "$fullTitle\n";
-	}
-	fwrite( $sqlfile, ");\n" );
-}
 print "\n";
 
 fclose( $sqlfile );
-- 
cgit v1.2.3


From 18ef528166bc1c0368b2ef70881e8e853906fbac Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 3 Nov 2005 00:37:45 +0000
Subject: * Fix Parser::unstrip on PHP 4.4.1 and PHP 5.1.0RC4

---
 RELEASE-NOTES       | 1 +
 includes/Parser.php | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1e02101d1605..33c4e47066d3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -885,6 +885,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2885) Remove unnecessary reference parameter which broke classic skin
   talk notification on PHP 5.0.5
 * (bug 3845) Update attribute.php for 1.5 schema
+* Fix Parser::unstrip on PHP 4.4.1 and PHP 5.1.0RC4
 
 
 === Caveats ===
diff --git a/includes/Parser.php b/includes/Parser.php
index 6424109ae6c3..2b31b196ce4a 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -468,11 +468,10 @@ class Parser
 	 */
 	function unstrip( $text, &$state ) {
 		# Must expand in reverse order, otherwise nested tags will be corrupted
-		$contentDict = end( $state );
-		for ( $contentDict = end( $state ); $contentDict !== false; $contentDict = prev( $state ) ) {
-			if( key($state) != 'nowiki' && key($state) != 'html') {
-				for ( $content = end( $contentDict ); $content !== false; $content = prev( $contentDict ) ) {
-					$text = str_replace( key( $contentDict ), $content, $text );
+		foreach( array_reverse( $state, true ) as $tag => $contentDict ) {
+			if( $tag != 'nowiki' && $tag != 'html' ) {
+				foreach( array_reverse( $contentDict, true ) as $uniq => $content ) {
+					$text = str_replace( $uniq, $content, $text );
 				}
 			}
 		}
-- 
cgit v1.2.3


From ddddc48ab9720aeb08f11d6e802bcab4a22b10a3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 3 Nov 2005 02:32:48 +0000
Subject: Bump to 1.5.2 for various fixes

---
 RELEASE-NOTES                | 15 +++++++++++++++
 includes/DefaultSettings.php |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 33c4e47066d3..eafdecd4b406 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,21 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+
+== MediaWiki 1.5.2 ==
+
+November 2, 2005
+
+MediaWiki 1.5.2 is a bugfix maintenance release.
+
+A change in PHP 4.4.1 and PHP 5.1.0RC broke handling of extension and
+<pre> sections, causing garbage data to be inserted in output and saved
+edits. This version works around the change.
+
+Several other glitches with MySQL 5.0 and PHP 5.0.5 were also fixed;
+see the change log below for a complete list.
+
+
 == MediaWiki 1.5.1 ==
 
 October 26, 2005
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 73dce6e781ef..2bba50784350 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5.1';
+$wgVersion			= '1.5.2';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From b4b32048d6c81824a8ad5b01f9e7b92003339290 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 07:37:18 +0000
Subject: * (bug 3612) Remove old broken version of maintenance/compressOld.php
   The working version is in maintenance/storage/compressOld.php

---
 RELEASE-NOTES               |   6 ++
 maintenance/compressOld.inc | 230 --------------------------------------------
 maintenance/compressOld.php |  83 ----------------
 3 files changed, 6 insertions(+), 313 deletions(-)
 delete mode 100644 maintenance/compressOld.inc
 delete mode 100644 maintenance/compressOld.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index eafdecd4b406..84f011c1d8cd 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -903,6 +903,12 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix Parser::unstrip on PHP 4.4.1 and PHP 5.1.0RC4
 
 
+=== Changes since 1.5.2 ===
+
+* (bug 3612) Remove old broken version of maintenance/compressOld.php
+  The working version is in maintenance/storage/compressOld.php
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/maintenance/compressOld.inc b/maintenance/compressOld.inc
deleted file mode 100644
index f6a9f430351c..000000000000
--- a/maintenance/compressOld.inc
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * @package MediaWiki
- * @subpackage Maintenance
- */
-
-/** */
-require_once( 'Revision.php' );
-
-/** @todo document */
-function compressOldPages( $start = 0 ) {
-	$fname = 'compressOldPages';
-
-	$chunksize = 50;
-	print "Starting from old_id $start...\n";
-	$dbw =& wfGetDB( DB_MASTER );
-	$old = $dbw->tableName( 'old' );
-	do {
-		$end = $start + $chunksize;
-		$res = $dbw->select( 'old', array( 'old_id','old_flags','old_namespace','old_title','old_text' ),
-			"old_id>=$start", $fname, array( 'ORDER BY' => 'old_id', 'LIMIT' => $chunksize, 'FOR UPDATE' ) );
-		if( $dbw->numRows( $res ) == 0 ) {
-			break;
-		}
-		$last = $start;
-		while( $row = $dbw->fetchObject( $res ) ) {
-			# print "  {$row->old_id} - {$row->old_namespace}:{$row->old_title}\n";
-			compressPage( $row );
-			$last = $row->old_id;
-		}
-		$dbw->freeResult( $res );
-		$start = $last + 1; # Deletion may leave long empty stretches
-		print "$start...\n";
-	} while( true );
-}
-
-/** @todo document */
-function compressPage( $row ) {
-	$fname = 'compressPage';
-	if( false !== strpos( $row->old_flags, "gzip" ) ) {
-		print "Already compressed row {$row->old_id}?\n";
-		return false;
-	}
-	$dbw =& wfGetDB( DB_MASTER );
-	$flags = $row->old_flags ? "{$row->old_flags},gzip" : "gzip";
-	$compress = gzdeflate( $row->old_text );
-	$dbw->update( 'old', 
-		array( /* SET */
-			'old_flags' => $flags,
-			'old_text' => $compress
-		), array( /* WHERE */
-			'old_id' => $row->old_id
-		), $fname, 'LIMIT 1'
-	);
-	return true;
-}
-
-define( 'LS_INDIVIDUAL', 0 );
-define( 'LS_CHUNKED', 1 );
-
-/** @todo document */
-function compressWithConcat( $startId, $maxChunkSize, $maxChunkFactor, $factorThreshold, $beginDate, $endDate )
-{
-	$fname = 'compressWithConcat';
-	$loadStyle = LS_CHUNKED;
-	
-	$dbr =& wfGetDB( DB_SLAVE );
-	$dbw =& wfGetDB( DB_MASTER );
-
-	# Get all articles by page_id
-	$maxPageId = $dbr->selectField( 'page', 'max(page_id)', '', $fname );
-	$pageConds = array();
-
-	if ( $exclude_ns0 ) {
-		print "Excluding main namespace\n";
-		$pageConds[] = 'page_namespace<>0';
-	}
-	if ( $queryExtra ) {
-                $pageConds[] = $queryExtra;
-	}
-
-	# For each article, get a list of revisions which fit the criteria
-	# No recompression, use a condition on old_flags
-	$conds = array("old_flags NOT LIKE '%object%'");
-	
-	if ( $beginDate ) {
-		$conds[] = "rev_timestamp>'" . $beginDate . "'";
-	} 
-	if ( $endDate )  {
-		$conds[] = "rev_timestamp<'" . $endDate . "'";
-	}
-	if ( $loadStyle == LS_CHUNKED ) {
-		$tables = array( 'revision', 'text' );
-		$fields = array( 'rev_id', 'rev_text_id', 'old_flags', 'old_text' );
-		$conds[] = 'rev_text_id=old_id';
-		$revLoadOptions = 'FOR UPDATE';
-	} else {
-		$tables = array( 'revision' );
-		$fields = array( 'rev_id', 'rev_text_id' );
-		$revLoadOptions = array();
-	}
-
-	$oldReadsSinceLastSlaveWait = 0;	#check slave lag periodically
-	$totalMatchingRevisions = 0;
-	$masterPos = false;
-	for ( $pageId = $startId; $pageId <= $maxPageId; $pageId++ ) {
-		$pageRes = $dbr->select( 'page', array('page_id', 'page_namespace', 'page_title'), 
-			$pageConds + array('page_id' => $pageId), $fname );
-		if ( $dbr->numRows( $pageRes ) == 0 ) {
-			continue;
-		}
-		$pageRow = $dbr->fetchObject( $pageRes );
-
-		# Display progress
-		$titleObj = Title::makeTitle( $pageRow->page_namespace, $pageRow->page_title );
-		print "$pageId\t" . $titleObj->getPrefixedDBkey() . " ";
-
-		# Load revisions
-		$revRes = $dbw->select( $tables, $fields,
-			array( 'rev_page' => $pageRow->page_id ) + $conds, 
-			$fname,
-			$revLoadOptions
-		);
-		$revs = array();
-		while ( $revRow = $dbw->fetchObject( $revRes ) ) {
-			$revs[] = $revRow;
-		}
-		
-		if ( count( $revs ) < 2) {
-			# No revisions matching, no further processing
-			print "\n";
-			continue;
-		}
-
-		# For each chunk
-		$i = 0;
-		while ( $i < count( $revs ) ) {
-			if ( $i < count( $revs ) - $maxChunkSize ) {
-				$thisChunkSize = $maxChunkSize;
-			} else {
-				$thisChunkSize = count( $revs ) - $i;
-			}
-
-			$chunk = new ConcatenatedGzipHistoryBlob();
-			$stubs = array();
-			$dbw->begin();
-			$usedChunk = false;
-			$primaryOldid = $revs[$i]->rev_text_id;
-			
-			# Get the text of each revision and add it to the object
-			for ( $j = 0; $j < $thisChunkSize && $chunk->isHappy( $maxChunkFactor, $factorThreshold ); $j++ ) {
-				$oldid = $revs[$i + $j]->rev_text_id;
-				
-				# Get text
-				if ( $loadStyle == LS_INDIVIDUAL ) {
-					$textRow = $dbw->selectRow( 'text', 
-						array( 'old_flags', 'old_text' ),
-						array( 'old_id' => $oldid ),
-						$fname,
-						'FOR UPDATE'
-					);
-					$text = Revision::getRevisionText( $textRow );
-				} else {
-					$text = Revision::getRevisionText( $revs[$i + $j] );
-				}
-
-				if ( $text === false ) {
-					print "\nError, unable to get text in old_id $oldid\n";
-					#$dbw->delete( 'old', array( 'old_id' => $oldid ) );
-				}
-
-				if ( $j == 0 ) {
-					$chunk->setText( $text );
-					print '.';
-				} else {
-					# Don't make a stub if it's going to be longer than the article
-					# Stubs are typically about 100 bytes
-					if ( strlen( $text ) < 120 ) {
-						$stub = false;
-						print 'x';
-					} else {
-						$stub = $chunk->addItem( $text );
-						$stub->setLocation( $primaryOldid );
-						$hash = $stub->getHash();
-						$stub = serialize( $stub );
-						print '.';
-						$usedChunk = true;
-					}
-					$stubs[$j] = $stub;
-				}
-			}
-			$thisChunkSize = $j;
-			
-			# If we couldn't actually use any stubs because the pages were too small, do nothing
-			if ( $usedChunk ) {
-				# Store the main object
-				$dbw->update( 'text',
-					array( /* SET */
-						'old_text' => serialize( $chunk ),
-						'old_flags' => 'object',
-					), array( /* WHERE */
-						'old_id' => $primaryOldid
-					)
-				);
-
-				# Store the stub objects
-				for ( $j = 1; $j < $thisChunkSize; $j++ ) {
-					# Skip if not compressing
-					if ( $stubs[$j] !== false ) {
-						$dbw->update( 'text',
-							array( /* SET */
-								'old_text' => $stubs[$j],
-								'old_flags' => 'object',
-							), array( /* WHERE */
-								'old_id' => $revs[$i + $j]->rev_text_id
-							)
-						);
-					}
-				}
-			}
-			# Done, next
-			print "/";
-			$dbw->commit();
-			$i += $thisChunkSize;
-		}
-		print "\n";
-	}
-	return true;
-}
-?>
diff --git a/maintenance/compressOld.php b/maintenance/compressOld.php
deleted file mode 100644
index 0d449c4c7cd6..000000000000
--- a/maintenance/compressOld.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Compress the old table, old_flags=gzip
- *
- * @package MediaWiki
- * @subpackage Maintenance
- */
-
-/** */
-
-/**
- * Usage: 
- *
- * Non-wikimedia
- * php compressOld.php [-t <type>] [-c <chunk-size>] [-b <begin-date>] [-e <end-date>] [-s <start-id>]
- *
- * Wikimedia
- * php compressOld.php <database> [-t <type>] [-c <chunk-size>] [-b <begin-date>] [-e <end-date>] [-s <start-id>]
- *     [-f <max-factor>] [-h <factor-threshold>]
- *
- * <type> is either:
- *   gzip: compress revisions independently
- *   concat: concatenate revisions and compress in chunks (default)
- * 
- * <start-id> is the old_id to start from
- * 
- * The following options apply only to the concat type:
- *    <begin-date> is the earliest date to check for uncompressed revisions
- *    <end-date> is the latest revision date to compress
- *    <chunk-size> is the maximum number of revisions in a concat chunk
- *    <max-factor> is the maximum ratio of compressed chunk bytes to uncompressed avg. revision bytes
- *    <factor-threshold> is a minimum number of KB, where <max-factor> cuts in
- *
- */
-
-die( 'compressOld is known to be broken at the moment.' );
-
-$optionsWithArgs = array( 't', 'c', 's', 'f', 'h' );
-require_once( "commandLine.inc" );
-require_once( "compressOld.inc" );
-
-if( !function_exists( "gzdeflate" ) ) {
-	print "You must enable zlib support in PHP to compress old revisions!\n";
-	print "Please see http://www.php.net/manual/en/ref.zlib.php\n\n";
-	die();
-}
-
-$defaults = array( 
-	't' => 'concat',
-	'c' => 20,
-	's' => 0,
-	'f' => 3,
-	'h' => 100,
-	'b' => '',
-	'e' => '',
-);
-
-$args = $args + $defaults;
-
-if ( $args['t'] != 'concat' && $args['t'] != 'gzip' ) {
-	print "Type \"{$args['t']}\" not supported\n";
-}
-
-print "Depending on the size of your database this may take a while!\n";
-print "If you abort the script while it's running it shouldn't harm anything,\n";
-print "but if you haven't backed up your data, you SHOULD abort now!\n\n";
-print "Press control-c to abort first (will proceed automatically in 5 seconds)\n";
-#sleep(5);
-
-$success = true;
-if ( $args['t'] == 'concat' ) {
-	$success = compressWithConcat( $args['s'], $args['c'], $args['f'], $args['h'], $args['b'], $args['e'] );
-} else {
-	compressOldPages( $args['s'] );
-} 
-
-if ( $success ) {
-	print "Done.\n";
-}
-
-exit();
-
-?>
-- 
cgit v1.2.3


From eb04db4d1c24f2a0799dcaa00656c54de6098f91 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 08:28:13 +0000
Subject: * (bug 2740) Accept image deletions on 'enter' submit from MSIE
 Confirmation checkbox is gone now; the submit button had been coopted to
 replace it in the submission variables, but some user agents don't go looking
 for a default button when you submit by hitting 'enter' in a text entry
 widget. Just check that the form was posted; we already have the edit token
 check to confirm that it's not a forged request.

---
 RELEASE-NOTES          | 1 +
 includes/ImagePage.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 84f011c1d8cd..14eb0cab6201 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -907,6 +907,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * (bug 3612) Remove old broken version of maintenance/compressOld.php
   The working version is in maintenance/storage/compressOld.php
+* (bug 2740) Accept image deletions on 'enter' submit from MSIE
 
 
 === Caveats ===
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index d67a3e23d4fd..b6524e191107 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -366,7 +366,7 @@ END
 	{
 		global $wgUser, $wgOut, $wgRequest;
 
-		$confirm = $wgRequest->getBool( 'wpConfirmB' );
+		$confirm = $wgRequest->wasPosted();
 		$image = $wgRequest->getVal( 'image' );
 		$oldimage = $wgRequest->getVal( 'oldimage' );
 
-- 
cgit v1.2.3


From b53da7cafb51bbe61a0795fbbe57a702a7b77fa8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 08:50:52 +0000
Subject: * (bug 3933) specify XML namespace for Atom 0.3 feeds
 http://bugzilla.wikimedia.org/attachment.cgi?id=1058&action=view

---
 RELEASE-NOTES     | 1 +
 includes/Feed.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 14eb0cab6201..b52b5a813d05 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -908,6 +908,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3612) Remove old broken version of maintenance/compressOld.php
   The working version is in maintenance/storage/compressOld.php
 * (bug 2740) Accept image deletions on 'enter' submit from MSIE
+* (bug 3933) specify XML namespace for Atom 0.3 feeds
 
 
 === Caveats ===
diff --git a/includes/Feed.php b/includes/Feed.php
index a798ce44ec7c..6a2862762104 100644
--- a/includes/Feed.php
+++ b/includes/Feed.php
@@ -240,7 +240,7 @@ class AtomFeed extends ChannelFeed {
 		global $wgVersion, $wgOut;
 		
 		$this->outXmlHeader();
-		?><feed version="0.3" xml:lang="<?php print $this->getLanguage() ?>">	
+		?><feed version="0.3" xmlns="http://purl.org/atom/ns#" xml:lang="<?php print $this->getLanguage() ?>">	
 		<title><?php print $this->getTitle() ?></title>
 		<link rel="alternate" type="text/html" href="<?php print $this->getUrl() ?>"/>
 		<modified><?php print $this->formatTime( wfTimestampNow() ) ?>Z</modified>
-- 
cgit v1.2.3


From a2139786365bfdebc4829d77c9db089fba8d30a1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 09:34:30 +0000
Subject: * (bug 3939) Don't try to load text for interwiki redirect target

---
 RELEASE-NOTES        |  1 +
 includes/Article.php | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b52b5a813d05..cccad9713ca9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -909,6 +909,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   The working version is in maintenance/storage/compressOld.php
 * (bug 2740) Accept image deletions on 'enter' submit from MSIE
 * (bug 3933) specify XML namespace for Atom 0.3 feeds
+* (bug 3939) Don't try to load text for interwiki redirect target
 
 
 === Caveats ===
diff --git a/includes/Article.php b/includes/Article.php
index 5eb42c5da3d9..408c5d0cb3c4 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -429,15 +429,17 @@ class Article {
 						return false;
 					}
 				}
-				$redirData = $this->pageDataFromTitle( $dbr, $rt );
-				if( $redirData ) {
-					$redirRev = Revision::newFromId( $redirData->page_latest );
-					if( !is_null( $redirRev ) ) {
-						$this->mRedirectedFrom = $this->mTitle->getPrefixedText();
-						$this->mTitle = $rt;
-						$data = $redirData;
-						$this->loadPageData( $data );
-						$revision = $redirRev;
+				if( $rt->getInterwiki() == '' ) {
+					$redirData = $this->pageDataFromTitle( $dbr, $rt );
+					if( $redirData ) {
+						$redirRev = Revision::newFromId( $redirData->page_latest );
+						if( !is_null( $redirRev ) ) {
+							$this->mRedirectedFrom = $this->mTitle->getPrefixedText();
+							$this->mTitle = $rt;
+							$data = $redirData;
+							$this->loadPageData( $data );
+							$revision = $redirRev;
+						}
 					}
 				}
 			}
-- 
cgit v1.2.3


From de838e6ae728da62936b3ebd5aa36cbffb1f4d84 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 11:01:43 +0000
Subject: * (bug 3948) Avoid notice warning in debug statement in bad search

---
 RELEASE-NOTES             | 1 +
 includes/SearchMySQL4.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cccad9713ca9..bf8046842cb9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -910,6 +910,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2740) Accept image deletions on 'enter' submit from MSIE
 * (bug 3933) specify XML namespace for Atom 0.3 feeds
 * (bug 3939) Don't try to load text for interwiki redirect target
+* (bug 3948) Avoid notice warning in debug statement in bad search
 
 
 === Caveats ===
diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index 76025c4c6a6b..256579f1c283 100644
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -64,7 +64,7 @@ class SearchMySQL4 extends SearchMySQL {
 			wfDebug( "Would search with '$searchon'\n" );
 			wfDebug( "Match with /\b" . implode( '\b|\b', $this->searchTerms ) . "\b/\n" );
 		} else {
-			wfDebug( "Can't understand search query '{$this->filteredText}'\n" );
+			wfDebug( "Can't understand search query '{$filteredText}'\n" );
 		}
 		
 		$searchon = $this->db->strencode( $searchon );
-- 
cgit v1.2.3


From cf76bf0b70b5a8718250480f9609554c1d55fced Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 21:29:24 +0000
Subject: * Recognize Special:Search consistently so read whitelist works

---
 RELEASE-NOTES |  1 +
 index.php     | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bf8046842cb9..cb43ba481f94 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -911,6 +911,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3933) specify XML namespace for Atom 0.3 feeds
 * (bug 3939) Don't try to load text for interwiki redirect target
 * (bug 3948) Avoid notice warning in debug statement in bad search
+* Recognize Special:Search consistently so read whitelist works
 
 
 === Caveats ===
diff --git a/index.php b/index.php
index 196bf89fe6ed..5ce265e87879 100644
--- a/index.php
+++ b/index.php
@@ -92,6 +92,13 @@ wfProfileOut( 'main-misc-setup' );
 # Debug statement for user levels
 // print_r($wgUser);
 
+$search = $wgRequest->getText( 'search' );
+if( !is_null( $search ) && $search !== '' ) {
+	// Compatibility with old search URLs which didn't use Special:Search
+	// Do this above the read whitelist check for security...
+	$wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
+}
+
 # If the user is not logged in, the Namespace:title of the article must be in
 # the Read array in order for the user to see it. (We have to check here to
 # catch special pages etc. We check again in Article::view())
@@ -102,10 +109,6 @@ if ( !is_null( $wgTitle ) && !$wgTitle->userCanRead() ) {
 }
 
 wfProfileIn( 'main-action' );
-$search = $wgRequest->getText( 'search' );
-if( $wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
-	$wgTitle = Title::makeTitle( NS_SPECIAL, 'Search' );
-}
 
 if( !$wgDisableInternalSearch && !is_null( $search ) && $search !== '' ) {
 	require_once( 'includes/SpecialSearch.php' );
-- 
cgit v1.2.3


From 89183c21536ebd8f307732ea1abaa2c6f6567f0c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 16 Nov 2005 23:05:41 +0000
Subject: * (bug 3987) typo

---
 maintenance/rebuildall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance/rebuildall.php b/maintenance/rebuildall.php
index 91f5492c0a9b..7c44e300285f 100644
--- a/maintenance/rebuildall.php
+++ b/maintenance/rebuildall.php
@@ -30,7 +30,7 @@ rebuildRecentChangesTablePass2();
 # rebuildLinkTables();
 
 # Use the slow incomplete one instead. It's designed to work in the background
-print "\n\n** Rebuilding links tables -- this can take a long time. It should be safe to about via ctrl+C if you get bored.\n";
+print "\n\n** Rebuilding links tables -- this can take a long time. It should be safe to abort via ctrl+C if you get bored.\n";
 refreshLinks( 1 );
 
 print "Done.\n";
-- 
cgit v1.2.3


From aaa460261e478312cc57510693db72a497bab2ec Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 18 Nov 2005 04:37:52 +0000
Subject: * (bug 4013) typo in fr

---
 RELEASE-NOTES            | 1 +
 languages/LanguageFr.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index cb43ba481f94..844ec8642e70 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -912,6 +912,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3939) Don't try to load text for interwiki redirect target
 * (bug 3948) Avoid notice warning in debug statement in bad search
 * Recognize Special:Search consistently so read whitelist works
+* (bug 4013) typo in fr
 
 
 === Caveats ===
diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 60fc12ad0fd7..a947d41d51f2 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -1142,7 +1142,7 @@ Si il ne s\'agit pas de vous, n\'ouvrez pas le lien. Ce code de confirmation exp
 'exif-compression' => 'Type de compression',
 'exif-samplesperpixel' => 'Nombre d\'échantillons',
 'exif-xresolution' => 'Résolution de l\'image en largeur',
-'exif-yresolution' => 'Résolution de l\'image en hauter',
+'exif-yresolution' => 'Résolution de l\'image en hauteur',
 'exif-jpeginterchangeformat' => 'Position du SOI JPEG',
 'exif-jpeginterchangeformatlength' => 'Taille en octet des données JPEG',
 'exif-transferfunction' => 'Fonction de transfert',
-- 
cgit v1.2.3


From 23ff66b8cb0f8bd6db03a0c46100811851d9f6cf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 18 Nov 2005 20:05:37 +0000
Subject: * (bug 3996) Fix text for new entries in RC RSS/Atom feed

---
 RELEASE-NOTES                     | 1 +
 includes/SpecialRecentchanges.php | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 844ec8642e70..58658ba57459 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -913,6 +913,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3948) Avoid notice warning in debug statement in bad search
 * Recognize Special:Search consistently so read whitelist works
 * (bug 4013) typo in fr
+* (bug 3996) Fix text for new entries in RC RSS/Atom feed
 
 
 === Caveats ===
diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index c7549af4807c..75bcda521b46 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -540,7 +540,13 @@ function rcFormatDiff( $row ) {
 			}
 			wfProfileOut( "$fname-dodiff" );
 		} else {
-			$diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' . 
+			$rev = Revision::newFromId( $row->rc_this_oldid );
+			if( is_null( $rev ) ) {
+				$newtext = '';
+			} else {
+				$newtext = $rev->getText();
+			}
+			$diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
 				'<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
 		}
 		
-- 
cgit v1.2.3


From 5dfef9a263314f5f825774de9f27b6c7dfd3d1cb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 23 Nov 2005 18:42:11 +0000
Subject: * (bug 2894) Enhanced Recent Changes link fixes

Patch from P. K. CHAN:
http://bugzilla.wikimedia.org/attachment.cgi?id=1091

plus additional fix:
http://bugzilla.wikimedia.org/attachment.cgi?id=1093
---
 RELEASE-NOTES            |  1 +
 includes/ChangesList.php | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58658ba57459..1e976606e04c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -914,6 +914,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Recognize Special:Search consistently so read whitelist works
 * (bug 4013) typo in fr
 * (bug 3996) Fix text for new entries in RC RSS/Atom feed
+* (bug 2894) Enhanced Recent Changes link fixes
 
 
 === Caveats ===
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index bc1fcb78a66c..3578d2720137 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -205,8 +205,8 @@ class ChangesList {
 			$r .= '&nbsp;</tt>' ;
 
 			$o = '' ;
-			if ( $rc_last_oldid != 0 ) {
-				$o = 'oldid='.$rc_last_oldid ;
+			if ( $rc_this_oldid != 0 ) {
+				$o = 'oldid='.$rc_this_oldid ;
 			}
 			if ( $rc_type == RC_LOG ) {
 				$link = $rcObj->timestamp ;
@@ -475,16 +475,17 @@ class ChangesList {
 		} else {
 			$rcIdQuery = '';
 		}
-		$query = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid";
+		$querycur = $curIdEq."&diff=0&oldid=$rc_this_oldid";
+		$querydiff = $curIdEq."&diff=$rc_this_oldid&oldid=$rc_last_oldid";
 		$aprops = ' tabindex="'.$baseRC->counter.'"';
-		$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $query, '' ,'' , $aprops );
+		$curLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['cur'], $querycur, '' ,'' , $aprops );
 		if( $rc_type == RC_NEW || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
 			if( $rc_type != RC_NEW ) {
 				$curLink = $message['cur'];
 			}
 			$diffLink = $message['diff'];
 		} else {
-			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $query . $rcIdQuery, '' ,'' , $aprops );
+			$diffLink = $this->skin->makeKnownLinkObj( $rc->getTitle(), $message['diff'], $querydiff . $rcIdQuery, '' ,'' , $aprops );
 		}
 
 		# Make "last" link
-- 
cgit v1.2.3


From c5c73008007e059ba29220262a3823c47987a3d0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 26 Nov 2005 01:07:59 +0000
Subject: * (bug 3065) Update both watched namespaces when renaming pages

---
 RELEASE-NOTES            |  1 +
 includes/WatchedItem.php | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1e976606e04c..81a19f982c91 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -915,6 +915,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4013) typo in fr
 * (bug 3996) Fix text for new entries in RC RSS/Atom feed
 * (bug 2894) Enhanced Recent Changes link fixes
+* (bug 3065) Update both watched namespaces when renaming pages
 
 
 === Caveats ===
diff --git a/includes/WatchedItem.php b/includes/WatchedItem.php
index cb9d3db8cd1f..1912f5400b6c 100644
--- a/includes/WatchedItem.php
+++ b/includes/WatchedItem.php
@@ -133,13 +133,27 @@ class WatchedItem {
 	}
 
 	/**
+	 * Check if the given title already is watched by the user, and if so
+	 * add watches on a new title. To be used for page renames and such.
+	 *
+	 * @param Title $ot Page title to duplicate entries from, if present
+	 * @param Title $nt Page title to add watches on
 	 * @static
 	 */
 	function duplicateEntries( $ot, $nt ) {
+		WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() );
+		WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() );
+	}
+	
+	/**
+	 * @static
+	 * @access private
+	 */
+	function doDuplicateEntries( $ot, $nt ) {
 		$fname = "WatchedItem::duplicateEntries";
 		global $wgMemc, $wgDBname;
-		$oldnamespace = $ot->getNamespace() & ~1;
-		$newnamespace = $nt->getNamespace() & ~1;
+		$oldnamespace = $ot->getNamespace();
+		$newnamespace = $nt->getNamespace();
 		$oldtitle = $ot->getDBkey();
 		$newtitle = $nt->getDBkey();
 
-- 
cgit v1.2.3


From ea14360859eced89721f010b5a7202f3aa65625f Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 27 Nov 2005 14:57:04 +0000
Subject: Backport from HEAD : move parentheses out of <a> link

---
 RELEASE-NOTES                     | 2 +-
 includes/SpecialContributions.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 81a19f982c91..b49ba1d33594 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -916,7 +916,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3996) Fix text for new entries in RC RSS/Atom feed
 * (bug 2894) Enhanced Recent Changes link fixes
 * (bug 3065) Update both watched namespaces when renaming pages
-
+* Move parentheses out of <a> link in Special:Contributions
 
 === Caveats ===
 
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 3105a33c9240..ffbfe91c733c 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -348,7 +348,7 @@ function ucListEdit( $sk, $row ) {
 	if( $row->rev_id == $row->page_latest ) {
 		$topmarktext .= '<strong>' . $messages['uctop'] . '</strong>';
 		if( !$row->page_is_new ) {
-			$difftext .= $sk->makeKnownLinkObj( $page, '(' . $messages['diff'] . ')', 'diff=0' );
+			$difftext .= '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=0' ) . ')';
 		} else {
 			$difftext .= $messages['newarticle'];
 		}
@@ -366,7 +366,7 @@ function ucListEdit( $sk, $row ) {
 	if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
 		$difftext = '(' . $messages['diff'] . ')';
 	} else {
-		$difftext = $sk->makeKnownLinkObj( $page, '(' . $messages['diff'].')', 'diff=prev&oldid='.$row->rev_id );
+		$difftext = '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
 	}
 	$histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')';
 
-- 
cgit v1.2.3


From 31636e2c1dec713486f9bafb05cbe9056e77f260 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 1 Dec 2005 08:39:21 +0000
Subject: * (bug 4071) Generate passwords long enough for
 $wgMinimalPasswordLength

---
 RELEASE-NOTES     |  2 ++
 includes/User.php | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b49ba1d33594..dcdb279fa9a7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -917,6 +917,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2894) Enhanced Recent Changes link fixes
 * (bug 3065) Update both watched namespaces when renaming pages
 * Move parentheses out of <a> link in Special:Contributions
+* (bug 4071) Generate passwords long enough for $wgMinimalPasswordLength
+
 
 === Caveats ===
 
diff --git a/includes/User.php b/includes/User.php
index 478efde5578b..8b0f577a8dbb 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -251,13 +251,16 @@ class User {
 	 * @todo Check what is doing really [AV]
 	 */
 	function randomPassword() {
+		global $wgMinimalPasswordLength;
 		$pwchars = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz';
 		$l = strlen( $pwchars ) - 1;
 
-		$np = $pwchars{mt_rand( 0, $l )} . $pwchars{mt_rand( 0, $l )} .
-		  $pwchars{mt_rand( 0, $l )} . chr( mt_rand(48, 57) ) .
-		  $pwchars{mt_rand( 0, $l )} . $pwchars{mt_rand( 0, $l )} .
-		  $pwchars{mt_rand( 0, $l )};
+		$pwlength = max( 7, $wgMinimalPasswordLength );
+		$digit = mt_rand(0, $pwlength - 1);
+		$np = '';
+		for ( $i = 0; $i < $pwlength; $i++ ) {
+			$np .= $i == $digit ? chr( mt_rand(48, 57) ) : $pwchars{ mt_rand(0, $l)};
+		}
 		return $np;
 	}
 
-- 
cgit v1.2.3


From 3b1043a73870cd595adaf29088a26f07ee138250 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 1 Dec 2005 11:08:59 +0000
Subject: * (bug 4035) Fix prev/next revision links on edit page

---
 RELEASE-NOTES         | 1 +
 includes/EditPage.php | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dcdb279fa9a7..e81e2ef0b476 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -918,6 +918,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3065) Update both watched namespaces when renaming pages
 * Move parentheses out of <a> link in Special:Contributions
 * (bug 4071) Generate passwords long enough for $wgMinimalPasswordLength
+* (bug 4035) Fix prev/next revision links on edit page
 
 
 === Caveats ===
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 027d0881a075..09468a2b9f5a 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -526,13 +526,12 @@ class EditPage {
 			}
 			$wgOut->setPageTitle( $s );
 			if ( !$this->checkUnicodeCompliantBrowser() ) {
-				$this->mArticle->setOldSubtitle();
 				$wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
 			}
 			if ( isset( $this->mArticle )
 			     && isset( $this->mArticle->mRevision )
 			     && !$this->mArticle->mRevision->isCurrent() ) {
-				$this->mArticle->setOldSubtitle();
+				$this->mArticle->setOldSubtitle( $this->mArticle->mRevision->getId() );
 				$wgOut->addWikiText( wfMsg( 'editingold' ) );
 			}
 		}
-- 
cgit v1.2.3


From fdfe35195a8e9b436e2b4176db437c2e93f7a535 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 4 Dec 2005 11:09:21 +0000
Subject: * (bug 4165) Correct validation for user language selection (data
 taint)

---
 includes/Setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index 37ebfda7630a..76412c7d17ad 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -217,7 +217,7 @@ $wgLanguageCode = $wgRequest->getText('uselang', '');
 if ($wgLanguageCode == '')
 	$wgLanguageCode = $wgUser->getOption('language');
 # Validate $wgLanguageCode, which will soon be sent to an eval()
-if( empty( $wgLanguageCode ) || preg_match( '/^[^a-z-]*$/', $wgLanguageCode ) ) {
+if( empty( $wgLanguageCode ) || !preg_match( '/^[a-z]+(-[a-z]+)?$/', $wgLanguageCode ) ) {
 	$wgLanguageCode = $wgContLanguageCode;
 }
 
-- 
cgit v1.2.3


From 107dc7e4b4734089af72bffb51ed00a8cdfcbc87 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 4 Dec 2005 11:14:30 +0000
Subject: * (bug 4165) Correct validation for user language selection (data
 taint)

---
 RELEASE-NOTES | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e81e2ef0b476..3a9c22280d79 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,23 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5.3 ==
+
+December 4, 2005
+
+MediaWiki 1.5.3 is a security and bugfix maintenance release.
+
+Validation of the user language option was broken by a code change in
+May 2005, opening the possibility of remote code execution as this
+parameter is used in forming a class name dynamically created with
+eval().
+
+The validation has been corrected in this version. All prior 1.5 release
+and prelease versions are affected; 1.4 and earlier and not affected.
+
+Additionally several bugs have been fixed; see the changelog later in
+this file for a complete list.
+
 
 == MediaWiki 1.5.2 ==
 
@@ -919,6 +936,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Move parentheses out of <a> link in Special:Contributions
 * (bug 4071) Generate passwords long enough for $wgMinimalPasswordLength
 * (bug 4035) Fix prev/next revision links on edit page
+* (bug 4165) Correct validation for user language selection (data taint)
 
 
 === Caveats ===
-- 
cgit v1.2.3


From cc46527f22cdb058bcf52e3a3e0bf3de0147b3c8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 4 Dec 2005 11:17:01 +0000
Subject: bump to 1.5.3.

---
 includes/DefaultSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2bba50784350..61fecd4a84ad 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -28,7 +28,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5.2';
+$wgVersion			= '1.5.3';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From c7cd1a178cfdff389b71a1d911c008ccbe5bef69 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 5 Dec 2005 20:47:57 +0000
Subject: Backport from HEAD: make it a bit cleared: users should not modify
 the file

---
 RELEASE-NOTES                | 2 +-
 includes/DefaultSettings.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3a9c22280d79..b20a58806b1d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -937,7 +937,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4071) Generate passwords long enough for $wgMinimalPasswordLength
 * (bug 4035) Fix prev/next revision links on edit page
 * (bug 4165) Correct validation for user language selection (data taint)
-
+* Clearer message in DefaultSettings.php: edit LocalSettings.php instead
 
 === Caveats ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 61fecd4a84ad..098221ddea63 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1,8 +1,11 @@
 <?php
 /**
- * DO NOT EDIT THIS FILE!
  *
- * To customize your installation, edit "LocalSettings.php".
+ *                 DO NOT EVER EDIT THIS FILE!
+ *
+ *
+ * To customize your installation, edit "LocalSettings.php". If you make
+ * changes here, they will be lost on next upgrade of MediaWiki!
  *
  * Note that since all these string interpolations are expanded
  * before LocalSettings is included, if you localize something
-- 
cgit v1.2.3


From 6498d969db04f21c928432a304ad3aa9c4390d9c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 9 Dec 2005 23:25:42 +0000
Subject: * (bug 3805) Clear 'new messages' flag properly in enotif mode   for
 usernames containing spaces

---
 RELEASE-NOTES               | 7 +++++++
 includes/UserTalkUpdate.php | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b20a58806b1d..b88f607ade91 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -939,6 +939,13 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4165) Correct validation for user language selection (data taint)
 * Clearer message in DefaultSettings.php: edit LocalSettings.php instead
 
+
+=== Changes since 1.5.3 ===
+
+* (bug 3805) Clear 'new messages' flag properly in enotif mode
+  for usernames containing spaces
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not
diff --git a/includes/UserTalkUpdate.php b/includes/UserTalkUpdate.php
index 7c61406026e6..10bf9158f891 100644
--- a/includes/UserTalkUpdate.php
+++ b/includes/UserTalkUpdate.php
@@ -50,7 +50,7 @@ class UserTalkUpdate {
 
 		$this->mAction = $action;
 		$this->mNamespace = $ns;
-		$this->mTitle = $title; # str_replace( '_', ' ', $title ); # I do not know, why this was needed . T. Gries 23.11.2004
+		$this->mTitle = $title;
 		$this->mSummary = $summary;
 		$this->mMinorEdit = $minoredit;
 		$this->mTimestamp = $timestamp;
@@ -62,7 +62,7 @@ class UserTalkUpdate {
 
 		# If the user talk page is our own, clear the flag
 		# when we are reading it or writing it.
-		if ( 0 == strcmp( $this->mTitle, $wgUser->getName() ) ) {
+		if ( 0 == strcmp( str_replace( '_', ' ', $this->mTitle ), $wgUser->getName() ) ) {
 			$wgUser->setNewtalk( 0 );
 			$wgUser->saveSettings();
 		} else {
-- 
cgit v1.2.3


From cea83532edefe4308f9cafa29a2b55910d1f1b93 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 11 Dec 2005 18:50:16 +0000
Subject: Backport from HEAD: Fix 2714 : backlink from special:whatlinkshere
 was hard set as 'existing'

---
 RELEASE-NOTES                     | 2 +-
 includes/SpecialWhatlinkshere.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b88f607ade91..44c6284d7495 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -944,7 +944,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 
 * (bug 3805) Clear 'new messages' flag properly in enotif mode
   for usernames containing spaces
-
+* (bug 2714) Backlink from special:whatlinkshere was hard set as 'existing'
 
 === Caveats ===
 
diff --git a/includes/SpecialWhatlinkshere.php b/includes/SpecialWhatlinkshere.php
index 4d5bfa0564d7..087b517cebb8 100644
--- a/includes/SpecialWhatlinkshere.php
+++ b/includes/SpecialWhatlinkshere.php
@@ -32,7 +32,7 @@ function wfSpecialWhatlinkshere($par = NULL) {
 	$sk = $wgUser->getSkin();
 	$isredir = ' (' . wfMsg( 'isredirect' ) . ")\n";
 
-	$wgOut->addHTML('&lt; '.$sk->makeKnownLinkObj($nt, '', 'redirect=no' )."<br />\n");
+	$wgOut->addHTML('&lt; '.$sk->makeLinkObj($nt, '', 'redirect=no' )."<br />\n");
 
 	wfShowIndirectLinks( 0, $nt, $limit, $offset );
 }
-- 
cgit v1.2.3


From 4c898a36613cfa200ed7cbe3e0e9f09b3577849a Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 11 Dec 2005 19:58:26 +0000
Subject: Backport from HEAD: typo

---
 RELEASE-NOTES                    | 1 +
 maintenance/entities2literals.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 44c6284d7495..ecc68f3759fc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -945,6 +945,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 3805) Clear 'new messages' flag properly in enotif mode
   for usernames containing spaces
 * (bug 2714) Backlink from special:whatlinkshere was hard set as 'existing'
+* (bug 4249) Typo in entities2literals.pl
 
 === Caveats ===
 
diff --git a/maintenance/entities2literals.pl b/maintenance/entities2literals.pl
index a981081ea76b..dd47f6bbf66a 100644
--- a/maintenance/entities2literals.pl
+++ b/maintenance/entities2literals.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/evn perl
+#!/usr/bin/env perl
 # Takes STDIN and converts Converts hexadecimal, decimal and named HTML
 # entities to their respective literals.
 #
-- 
cgit v1.2.3


From 833e689cace75206f5e042faaf1c75d60b4a577f Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 11 Dec 2005 20:27:07 +0000
Subject: Fix 4233: Update LanguageJa.php * patch by tietew
 <tietew-mediazilla@tietew.net>

---
 RELEASE-NOTES            |  1 +
 languages/LanguageJa.php | 87 ++++++++++++++++++++++++------------------------
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ecc68f3759fc..0ad0bb1f5e9b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -946,6 +946,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
   for usernames containing spaces
 * (bug 2714) Backlink from special:whatlinkshere was hard set as 'existing'
 * (bug 4249) Typo in entities2literals.pl
+* (bug 4233) Update for japanese language
 
 === Caveats ===
 
diff --git a/languages/LanguageJa.php b/languages/LanguageJa.php
index 7ab5a6ce9dc6..37dab4533ed2 100644
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -67,7 +67,7 @@ parent class in order maintain consistency across languages.
 
 # User preference toggles
 'tog-underline' => 'リンクの下線:',
-'tog-highlightbroken' => '未作成のページへのリンクを<a href="javascript:void(0);" class="new" onclick="return false;">ハイライト</a>する (チェックしないとこのように<a href="javascript:void(0);" class="internal" onclick="return false;">?</a>なる)',
+'tog-highlightbroken' => '未作成のページへのリンクをハイライトする',
 'tog-justify' => '段落を均等割り付けする',
 'tog-hideminor' => '最近更新したページから細部の編集を隠す',
 'tog-usenewrc' => '最近更新したページを拡張する（対応していないブラウザもあります）',
@@ -177,7 +177,7 @@ parent class in order maintain consistency across languages.
 'navigation' => 'ナビゲーション',
 
 # Metadata in edit box
-'metadata' => 'Metadata',
+'metadata' => 'メタデータ',
 'metadata_page' => '{{ns:Project}}:Metadata',
 
 'currentevents' => '最近の出来事',
@@ -347,7 +347,7 @@ Query: $2
 # Login and logout pages
 #
 'logouttitle' => 'ユーザー ログアウト',
-'logouttext' => '<p>ログアウトしました。このまま{{SITENAME}}を匿名で使い続けることができます。もう一度ログインして元の、あるいは別のユーザーとして使うこともできます。</p>
+'logouttext' => '<p><strong>ログアウトしました。</strong>このまま{{SITENAME}}を匿名で使い続けることができます。もう一度ログインして元の、あるいは別のユーザーとして使うこともできます。</p>
 <p>※いくつかのページはブラウザのキャッシュをクリアするまでログインしているかのように表示されることがあります。</p>',
 
 'welcomecreation' => '== $1 さん、ようこそ! ==
@@ -363,7 +363,7 @@ Query: $2
 'yourdomainname' => 'あなたのドメイン',
 'externaldberror' => '外部の認証データベースでエラーが発生たか、または外部アカウント情報の更新が許可されていません。',
 'loginproblem' => '<b>ログインでエラーが発生しました。</b><br />再度実行してください。',
-'alreadyloggedin' => '<b style="color:red">ユーザー $1 は、すでにログイン済みです。</b><br />',
+'alreadyloggedin' => '<strong>ユーザー $1 は、すでにログイン済みです。</strong><br />',
 
 'login' => 'ログイン',
 'loginprompt' => '{{SITENAME}}にログインするにはクッキーを有効にする必要があります。',
@@ -482,7 +482,7 @@ $1 または他の[[Project:管理者|管理者]]にこの件についてメー
 'editingsection' => '$1 を編集中 (セクション)',
 'editingcomment' => '$1 を編集中 (新規コメント)',
 'editconflict' => '編集競合: $1',
-'explainconflict' => 'あなたがこのページを編集し始めた後に、他の誰かがこのページを変更しました。上側のテキストエリアは現在の最新の状態です。あなたの編集していた文章は下側のテキストエリアに示されています。編集していた文章を、上側のテキストエリアの文章に組み込んでください。<strong>上側のテキストエリアの内容だけ</strong>が、“投稿する”をクリックした時に実際に保存されます。',
+'explainconflict' => 'あなたがこのページを編集し始めた後に、他の誰かがこのページを変更しました。上側のテキストエリアは現在の最新の状態です。あなたの編集していた文章は下側のテキストエリアに示されています。編集していた文章を、上側のテキストエリアの文章に組み込んでください。<strong>上側のテキストエリアの内容だけ</strong>が、「{{int:Savearticle}}」をクリックした時に実際に保存されます。',
 'yourtext' => 'あなたの文章',
 'storedversion' => '保存された版',
 'nonunicodebrowser' => '<strong>警告: あなたの使用しているブラウザはUnicode互換ではありません。項目を編集する前にブラウザを変更してください。</strong>',
@@ -512,7 +512,7 @@ Please check the URL you used to access this page.',
 'loadhist' => '変更履歴の読み込み中',
 'currentrev' => '最新版',
 'revisionasof' => '$1の版',
-'revisionasofwithlink' => '$1 の版を表示しています ; $2<br />$3 | $4',
+'revisionasofwithlink' => '$1 の版; $2<br />$3 | $4',
 'previousrevision' => '←前の版',
 'nextrevision' => '次の版→',
 'currentrevisionlink' => '最新版を表示',
@@ -1057,7 +1057,7 @@ $NEWPAGE
 'undeletebtn' => '復帰!',
 'undeletedarticle' => '"$1" を復帰しました。',
 'undeletedrevisions' => '$1 版を復帰',
-'undeletedtext' => '[[:$1]]を無事復帰しました。最近の削除と復帰の記録は[[Special:Log/delete]]を参照してください。',
+'undeletedtext' => '[[:$1|$1]]を無事復帰しました。最近の削除と復帰の記録は[[Special:Log/delete]]を参照してください。',
 
 # Namespace form on various pages
 'namespace' => '名前空間:',
@@ -1249,8 +1249,8 @@ $NEWPAGE
 'movetalk' => 'ノートページが付随する場合には、それも一緒に移動する',
 'talkpagemoved' => '付随のノートのページも移動しました。',
 'talkpagenotmoved' => '付随のノートのページは<strong>移動されませんでした。</strong>',
-'1movedto2' => '$1 を $2 へ移動',
-'1movedto2_redir' => '$1 をこのページあてのリダイレクト $2 へ移動',
+'1movedto2' => '[[$1]] を [[$2]] へ移動',
+'1movedto2_redir' => '[[$1]] をこのページあてのリダイレクト [[$2]] へ移動',
 'movelogpage' => '移動記録',
 'movelogpagetext' => '以下は最近のページ移動の記録です。',
 'movereason' => '理由',
@@ -1278,9 +1278,9 @@ $NEWPAGE
 # Namespace 8 related
 
 'allmessages' => '表示メッセージ一覧',
-'allmessagesname' => '名称',
-'allmessagesdefault' => 'デフォルトのテキスト',
-'allmessagescurrent' => '現在のテキスト',
+'allmessagesname' => 'メッセージ名',
+'allmessagesdefault' => '既定の文章',
+'allmessagescurrent' => '現在の文章',
 'allmessagestext' => 'これはMediaWiki名前空間にある全てのシステムメッセージの一覧です。',
 'allmessagesnotsupportedUI' => 'このサイトでは、あなたの現在のインターフェイス言語 <b>$1</b> における {{ns:Special}}:Allmessages はサポートされていません。',
 'allmessagesnotsupportedDB' => 'wgUseDatabaseMessages が無効のため、{{ns:Special}}:Allmessages はサポートされません。',
@@ -1301,6 +1301,8 @@ $NEWPAGE
 'importsuccess' => '取り込みに成功しました。',
 'importhistoryconflict' => '取り込み時にいくつかの版が競合しました（以前に同じページを取り込んでいませんか）。',
 'importnosources' => 'Transwikiの読み込み元が定義されていないため、履歴の直接アップロードは無効になっています。',
+'importnofile' => 'ファイルがアップロードされませんでした',
+'importuploaderror' => 'ファイルの取り込みに失敗しました。恐らく、許可されている最大ファイルサイズより大きなファイルをアップロードしようとしています。',
 
 # Keyboard access keys for power users
 'accesskey-search' => 'f',
@@ -1465,10 +1467,10 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'mediawarning' => "'''警告:''' このファイルは悪意のあるコードを含んでいる可能性があり、実行するとコンピューターが危害を被る場合があります。
 ----",
 
-'fileinfo' => '$1KB, MIME type: <code>$2</code>',
+'fileinfo' => '$1KB, MIMEタイプ: <code>$2</code>',
 
 # Metadata
-'metadata' => 'Metadata',
+'metadata' => 'メタデータ',
 
 # Exif tags
 'exif-imagewidth' => '画像の幅',
@@ -1481,8 +1483,8 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'exif-planarconfiguration' => 'データ格納形式',
 'exif-ycbcrsubsampling' => 'YCCの画素構成（Cの間引き率）',
 'exif-ycbcrpositioning' => 'YCCの画素構成（YとCの位置）',
-'exif-xresolution' => '水平方向の解像度',
-'exif-yresolution' => '垂直方向の解像度',
+'exif-xresolution' => '水平解像度',
+'exif-yresolution' => '垂直解像度',
 'exif-resolutionunit' => '解像度の単位',
 'exif-stripoffsets' => '画像データの場所',
 'exif-rowsperstrip' => 'ストリップのライン数',
@@ -1495,25 +1497,25 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'exif-ycbcrcoefficients' => '色変換マトリックス係数',
 'exif-referenceblackwhite' => '参照黒色点値・参照白色点値',
 'exif-datetime' => 'ファイル変更日時',
-'exif-imagedescription' => '画像のタイトル',
-'exif-make' => '画像入力機器のメーカー名',
-'exif-model' => '画像入力機器のモデル名',
-'exif-software' => '使用ソフトウェア',
-'exif-artist' => '作者名',
+'exif-imagedescription' => '画像の説明',
+'exif-make' => '画像入力機器のメーカー',
+'exif-model' => '画像入力機器の機種',
+'exif-software' => 'ファームウェアのバージョン',
+'exif-artist' => '作成者',
 'exif-copyright' => '著作権者',
 'exif-exifversion' => 'EXIFバージョン',
 'exif-flashpixversion' => '対応フラッシュピックスバージョン',
-'exif-colorspace' => '色空間情報',
-'exif-componentsconfiguration' => '各コンポーネントの意味',
+'exif-colorspace' => '色空間',
+'exif-componentsconfiguration' => '各コンポーネントの構成',
 'exif-compressedbitsperpixel' => '画像圧縮モード',
-'exif-pixelydimension' => '実効画像高さ',
-'exif-pixelxdimension' => '実効画像幅',
+'exif-pixelydimension' => '実効画像幅',
+'exif-pixelxdimension' => '実効画像高さ',
 'exif-makernote' => 'メーカーノート',
 'exif-usercomment' => 'ユーザーコメント',
 'exif-relatedsoundfile' => '関連音声ファイル',
 'exif-datetimeoriginal' => '画像データ生成日時',
 'exif-datetimedigitized' => 'デジタルデータ作成日時',
-'exif-subsectime' => 'ファイル変更日時の秒未満',
+'exif-subsectime' => 'ファイル変更日時 (秒未満)',
 'exif-subsectimeoriginal' => '画像データ生成日時 (秒未満)',
 'exif-subsectimedigitized' => 'デジタルデータ作成日時 (秒未満)',
 'exif-exposuretime' => '露出時間',
@@ -1524,8 +1526,8 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'exif-oecf' => '光電変換関数',
 'exif-shutterspeedvalue' => 'シャッタースピード',
 'exif-aperturevalue' => '絞り値',
-'exif-brightnessvalue' => '輝度値',
-'exif-exposurebiasvalue' => '露光補正値',
+'exif-brightnessvalue' => '明るさ',
+'exif-exposurebiasvalue' => '露出補正値',
 'exif-maxaperturevalue' => 'レンズ最小F値',
 'exif-subjectdistance' => '被写体距離',
 'exif-meteringmode' => '測光方式',
@@ -1547,14 +1549,14 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'exif-customrendered' => '画像処理',
 'exif-exposuremode' => '露出モード',
 'exif-whitebalance' => 'ホワイトバランス',
-'exif-digitalzoomratio' => 'デジタルズームの倍率',
+'exif-digitalzoomratio' => 'デジタルズーム倍率',
 'exif-focallengthin35mmfilm' => 'レンズの焦点距離（35mmフィルム換算）',
 'exif-scenecapturetype' => '被写体の種別',
 'exif-gaincontrol' => 'ゲインコントロール',
 'exif-contrast' => 'コントラスト',
 'exif-saturation' => '彩度',
 'exif-sharpness' => 'シャープネス',
-'exif-devicesettingdescription' => '装置セッティングの説明',
+'exif-devicesettingdescription' => '機器設定',
 'exif-subjectdistancerange' => '被写体距離の範囲',
 'exif-imageuniqueid' => 'ユニーク画像ID',
 'exif-gpsversionid' => 'GPSタグのバージョン',
@@ -1562,25 +1564,25 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'exif-gpslatitude' => '緯度',
 'exif-gpslongituderef' => '東経/西経',
 'exif-gpslongitude' => '経度',
-'exif-gpsaltituderef' => '高度の単位',
+'exif-gpsaltituderef' => '高度の基準',
 'exif-gpsaltitude' => '高度',
 'exif-gpstimestamp' => 'GPS時刻（原子時計）',
 'exif-gpssatellites' => '測位に用いた衛星信号',
 'exif-gpsstatus' => 'GPS受信機の状態',
-'exif-gpsmeasuremode' => 'GPSの測位方法',
-'exif-gpsdop' => '測位の精度',
+'exif-gpsmeasuremode' => 'GPS測位方法',
+'exif-gpsdop' => '測位精度',
 'exif-gpsspeedref' => '速度の単位',
 'exif-gpsspeed' => '速度',
-'exif-gpstrackref' => '進行方向の単位',
+'exif-gpstrackref' => '進行方向の基準',
 'exif-gpstrack' => '進行方向',
-'exif-gpsimgdirectionref' => '撮影の方向の単位',
-'exif-gpsimgdirection' => '撮影の方向',
+'exif-gpsimgdirectionref' => '撮影方向の基準',
+'exif-gpsimgdirection' => '撮影方向',
 'exif-gpsmapdatum' => '測地系',
 'exif-gpsdestlatituderef' => '目的地の北緯/南緯',
 'exif-gpsdestlatitude' => '目的地の緯度',
 'exif-gpsdestlongituderef' => '目的地の東経/西経',
 'exif-gpsdestlongitude' => '目的地の経度',
-'exif-gpsdestbearingref' => '目的地の方角の単位',
+'exif-gpsdestbearingref' => '目的地の方角の基準',
 'exif-gpsdestbearing' => '目的地の方角',
 'exif-gpsdestdistanceref' => '目的地までの距離の単位',
 'exif-gpsdestdistance' => '目的地までの距離',
@@ -1633,7 +1635,7 @@ ta['ca-nstab-category'] = new Array('c','カテゴリページを表示');",
 'exif-exposureprogram-1' => 'マニュアル',
 'exif-exposureprogram-2' => 'ノーマルプログラム',
 'exif-exposureprogram-3' => '露出優先',
-'exif-exposureprogram-4' => 'シャッター優先',
+'exif-exposureprogram-4' => 'シャッター速度優先',
 'exif-exposureprogram-5' => 'クリエイティブプログラム',
 'exif-exposureprogram-6' => 'アクションプログラム',
 'exif-exposureprogram-7' => 'ポートレイトモード（近景）',
@@ -1798,13 +1800,12 @@ $3
 'scarytranscludetoolong' => '[URL is too long; sorry]',
 
 # Trackbacks
-'trackbackbox' => "<div id='mw_trackbacks'>
+'trackbackbox' => '<div id="mw_trackbacks">
 この項目へのトラックバック:
 $1
-</div>",
-'trackback' => '; $4$5 : [$2 $1]',
-'trackbackexcerpt' => ';$4$5
-:[$2 $1]: <nowiki>$3</nowiki>',
+</div>',
+# 'trackback' => '',
+# 'trackbackexcerpt' => '',
 'trackbackremove' => ' ([$1 削除])',
 'trackbacklink' => 'トラックバック',
 'trackbackdeleteok' => 'トラックバックを削除しました。',
-- 
cgit v1.2.3


From caad3fec4b1c393d980dedd896ca83b91cd184fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Wed, 14 Dec 2005 22:38:48 +0000
Subject: * (bug 4279) Small correction to LanguageDa.php

---
 RELEASE-NOTES            | 2 ++
 languages/LanguageDa.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0ad0bb1f5e9b..60d2c6f1fb7f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -947,6 +947,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2714) Backlink from special:whatlinkshere was hard set as 'existing'
 * (bug 4249) Typo in entities2literals.pl
 * (bug 4233) Update for japanese language
+* (bug 4279) Small correction to LanguageDa.php
+
 
 === Caveats ===
 
diff --git a/languages/LanguageDa.php b/languages/LanguageDa.php
index edd97d4ea8ec..7f6c017c6ffb 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -570,7 +570,7 @@ eksempel \"fisk og og skaldyr\".
 Prøv en anden forespørgsel.",
 "matchtotals"	=> "Forespørgslen \"$1\" opfyldte $2 artikeltitler
 og teksten i $3 artikler.",
-"nogomatch" => "<span style=\"font-size: 135%; font-weight: bold; margin-left: .6em\">{{SITENAME}} har ingen artikel med dette navn</span> <span style=\"display: block; margin: 1.5em 2em\"> Du kan <strong><a href=\"$1\" class=\"new\">oprette en artikel med dette navn</a></strong> eller <a href=\"/wiki/{{ns:4}}:Efterspurgte_artikler\">efterspørge den</a>. <span style=\"display:block; font-size: 89%; margin-left:.2em\">For at undgå flere artikler om samme emne, bedes du inden oprettelsen søge efter artiklen under alternative navne og stavemåder.</span> </span>",
+"nogomatch" => "{{SITENAME}} har ingen artikel med dette navn. Du kan [[$1|oprette en artikel med dette navn]] eller [[{{ns:4}}:Efterspurgte_artikler|efterspørge den]]. For at undgå flere artikler om samme emne, bedes du inden oprettelsen søge efter artiklen under alternative navne og stavemåder.",
 "titlematches"	=> "Artikeltitler der opfyldte forespørgslen",
 "notitlematches" => "Ingen artikeltitler opfyldte forespørgslen",
 "textmatches"	=> "Artikeltekster der opfyldte forespørgslen",
-- 
cgit v1.2.3


From df1b023cb4de00d7aee8774edce517dbf0cb9c82 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 15 Dec 2005 20:32:15 +0000
Subject: Backport from HEAD: Bug #4267 : switch dv sd ug ks arc languages to
 RTL

---
 RELEASE-NOTES             |  1 +
 languages/LanguageArc.php | 18 ++++++++++++++++++
 languages/LanguageDv.php  | 18 ++++++++++++++++++
 languages/LanguageKs.php  | 18 ++++++++++++++++++
 languages/LanguageSd.php  | 18 ++++++++++++++++++
 languages/LanguageUg.php  | 18 ++++++++++++++++++
 6 files changed, 91 insertions(+)
 create mode 100644 languages/LanguageArc.php
 create mode 100644 languages/LanguageDv.php
 create mode 100644 languages/LanguageKs.php
 create mode 100644 languages/LanguageSd.php
 create mode 100644 languages/LanguageUg.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 60d2c6f1fb7f..34562818296e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -948,6 +948,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4249) Typo in entities2literals.pl
 * (bug 4233) Update for japanese language
 * (bug 4279) Small correction to LanguageDa.php
+* (bug 4267) Switch dv sd ug ks arc languages to RTL
 
 
 === Caveats ===
diff --git a/languages/LanguageArc.php b/languages/LanguageArc.php
new file mode 100644
index 000000000000..3b61cee242d4
--- /dev/null
+++ b/languages/LanguageArc.php
@@ -0,0 +1,18 @@
+<?php
+/** Aramaic language file ( ܕܥܒܪܸܝܛ )
+  *
+  * @package MediaWiki
+  * @subpackage Language
+  */
+
+require_once( 'LanguageUtf8.php' );
+
+class LanguageArc extends LanguageUtf8 {
+	#FIXME: inherit almost everything for now
+
+	function isRTL() {
+		return true;
+	}
+}
+
+?>
diff --git a/languages/LanguageDv.php b/languages/LanguageDv.php
new file mode 100644
index 000000000000..cb4de84fadd9
--- /dev/null
+++ b/languages/LanguageDv.php
@@ -0,0 +1,18 @@
+<?php
+/** Dhivehi language file ( ދިވެހިބަސް',      )
+  *
+  * @package MediaWiki
+  * @subpackage Language
+  */
+
+require_once( 'LanguageUtf8.php' );
+
+class LanguageDv extends LanguageUtf8 {
+	#FIXME: inherit almost everything for now
+
+	function isRTL() {
+		return true;
+	}
+}
+
+?>
diff --git a/languages/LanguageKs.php b/languages/LanguageKs.php
new file mode 100644
index 000000000000..082149b03312
--- /dev/null
+++ b/languages/LanguageKs.php
@@ -0,0 +1,18 @@
+<?php
+/** Kashmiri language file ( कश्मीरी - (ﻚﺸﻤﻳﺮﻳ) )
+  *
+  * @package MediaWiki
+  * @subpackage Language
+  */
+
+require_once( 'LanguageUtf8.php' );
+
+class LanguageKs extends LanguageUtf8 {
+	#FIXME: inherit almost everything for now
+
+	function isRTL() {
+		return true;
+	}
+}
+
+?>
diff --git a/languages/LanguageSd.php b/languages/LanguageSd.php
new file mode 100644
index 000000000000..152681555be2
--- /dev/null
+++ b/languages/LanguageSd.php
@@ -0,0 +1,18 @@
+<?php
+/** Sindhi language file ( सिनधि )
+  *
+  * @package MediaWiki
+  * @subpackage Language
+  */
+
+require_once( 'LanguageUtf8.php' );
+
+class LanguageSd extends LanguageUtf8 {
+	#FIXME: inherit almost everything for now
+
+	function isRTL() {
+		return true;
+	}
+}
+
+?>
diff --git a/languages/LanguageUg.php b/languages/LanguageUg.php
new file mode 100644
index 000000000000..07c87c801590
--- /dev/null
+++ b/languages/LanguageUg.php
@@ -0,0 +1,18 @@
+<?php
+/** Uyghur language file ( Oyghurque )
+  *
+  * @package MediaWiki
+  * @subpackage Language
+  */
+
+require_once( 'LanguageUtf8.php' );
+
+class LanguageUg extends LanguageUtf8 {
+	#FIXME: inherit almost everything for now
+
+	function isRTL() {
+		return true;
+	}
+}
+
+?>
-- 
cgit v1.2.3


From e4275e6b16c355ea804f5a27d2cc7a6d9a00a33a Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 15 Dec 2005 21:07:42 +0000
Subject: Backport from HEAD: Fix #3991: allow the operation of wikicode on
 Protect move only text

---
 RELEASE-NOTES        | 1 +
 includes/Article.php | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 34562818296e..45ddf58824b5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -949,6 +949,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4233) Update for japanese language
 * (bug 4279) Small correction to LanguageDa.php
 * (bug 4267) Switch dv sd ug ks arc languages to RTL
+* (bug 3991) Allow the operation of wikicode on Protect move only text
 
 
 === Caveats ===
diff --git a/includes/Article.php b/includes/Article.php
index 408c5d0cb3c4..23ae0bd21ff8 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1605,7 +1605,7 @@ class Article {
 			$wgOut->setPageTitle( wfMsg( 'confirmprotect' ) );
 			$wgOut->setSubtitle( wfMsg( 'protectsub', $sub ) );
 			$wgOut->addWikiText( wfMsg( 'confirmprotecttext' ) );
-			$moveonly = htmlspecialchars( wfMsg( 'protectmoveonly' ) );
+			$moveonly = wfMsg( 'protectmoveonly' ) ; // add it using addWikiText to prevent xss. bug:3991
 			$protcom = htmlspecialchars( wfMsg( 'protectcomment' ) );
 			$formaction = $this->mTitle->escapeLocalURL( 'action=protect' . $par );
 		}
@@ -1631,7 +1631,10 @@ class Article {
 				<input type='checkbox' name='wpMoveOnly' value='1' id='wpMoveOnly' />
 			</td>
 			<td align='left'>
-				<label for='wpMoveOnly'>{$moveonly}</label>
+				<label for='wpMoveOnly'> ");
+			$wgOut->addWikiText( $moveonly ); // bug 3991
+			$wgOut->addHTML( "
+				</label>
 			</td>
 		</tr> " );
 		}
-- 
cgit v1.2.3


From bf37289b530697c9bf296e5032e4f68410e40fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Tue, 20 Dec 2005 10:48:12 +0000
Subject: * Obsolete REL1_4 schema, shouldn't be in REL1_5

---
 maintenance/postgresql/pg_tables.sql | 285 -----------------------------------
 maintenance/postgresql/pg_users.sql  |  14 --
 2 files changed, 299 deletions(-)
 delete mode 100644 maintenance/postgresql/pg_tables.sql
 delete mode 100644 maintenance/postgresql/pg_users.sql

diff --git a/maintenance/postgresql/pg_tables.sql b/maintenance/postgresql/pg_tables.sql
deleted file mode 100644
index 2e439f9fdb1f..000000000000
--- a/maintenance/postgresql/pg_tables.sql
+++ /dev/null
@@ -1,285 +0,0 @@
---
--- Database schema for MediaWiki PostgreSQL support
---
---
-
-CREATE SCHEMA mediawiki;
-SET search_path=mediawiki;
-
-CREATE TABLE cur (
-    cur_id serial PRIMARY KEY,
-    cur_namespace smallint NOT NULL,
-    cur_title varchar(255) NOT NULL,
-    cur_text text NOT NULL,
-    cur_comment text,
-    cur_user integer DEFAULT 0 NOT NULL,
-    cur_user_text varchar(255) DEFAULT ''::varchar NOT NULL,
-    cur_timestamp timestamp without time zone NOT NULL,
-    cur_restrictions text DEFAULT ''::text NOT NULL,
-    cur_counter bigint DEFAULT 0 NOT NULL,
-    cur_is_redirect smallint DEFAULT 0 NOT NULL,
-    cur_minor_edit smallint DEFAULT 0 NOT NULL,
-    cur_is_new smallint DEFAULT 0 NOT NULL,
-    cur_random double precision DEFAULT random(),
-    cur_touched timestamp without time zone
-);
-CREATE INDEX cur_title_namespace_idx ON cur (cur_title, cur_namespace);
-CREATE INDEX cur_random_idx ON cur (cur_random);
-CREATE INDEX cur_name_title_timestamp_idx ON cur (cur_namespace, cur_title, cur_timestamp);
-CREATE INDEX cur_timestamp_idx ON cur (cur_timestamp);
-
-CREATE TABLE "old" (
-    old_id serial PRIMARY KEY,
-    old_namespace smallint NOT NULL,
-    old_title varchar(255) NOT NULL,
-    old_text text NOT NULL,
-    old_comment text NOT NULL,
-    old_user integer NOT NULL,
-    old_user_text varchar(255) NOT NULL,
-    old_timestamp timestamp without time zone NOT NULL,
-    old_minor_edit smallint NOT NULL,
-    old_flags text NOT NULL
-);
-CREATE INDEX old_name_title_ts_idx ON "old" (old_namespace, old_title, old_timestamp);
-CREATE INDEX old_timestamp ON "old" (old_timestamp);
-
-CREATE TABLE brokenlinks (
-    bl_from integer DEFAULT 0 NOT NULL,
-    bl_to varchar(255) NOT NULL,
-    PRIMARY KEY (bl_from,bl_to)
-
-);
-CREATE INDEX bl_to_idx ON brokenlinks (bl_to);
-
-CREATE TABLE hitcounter (
-    hc_id bigint DEFAULT 0 NOT NULL
-);
-CREATE INDEX hc_id_idx on hitcounter (hc_id);
-
-CREATE TABLE image (
-    img_name varchar(255) PRIMARY KEY,
-    img_size integer NOT NULL,
-    img_description text NOT NULL,
-    img_user integer NOT NULL,
-    img_user_text varchar(255) NOT NULL,
-    img_timestamp timestamp without time zone
-);
-CREATE INDEX img_size_idx ON image (img_size);
-CREATE INDEX img_timestamp ON image (img_timestamp);
-
-CREATE TABLE imagelinks (
-    il_from integer,
-    il_to varchar(255),
-    PRIMARY KEY (il_from, il_to)
-);
-CREATE INDEX il_to_idx ON imagelinks (il_to);
-
-
-CREATE TABLE categorylinks (
-    cl_from integer DEFAULT 0 NOT NULL,
-    cl_to varchar(255) NOT NULL,
-    cl_sortkey varchar(255) NOT NULL,
-    cl_timestamp timestamp without time zone,
-    PRIMARY KEY (cl_from,cl_to)
-);
-CREATE INDEX cl_to_sortkey_idx ON categorylinks (cl_to, cl_sortkey);
-CREATE INDEX cl_to_timestamp ON categorylinks (cl_to, cl_timestamp);
-
-CREATE TABLE links (
-    l_from integer NOT NULL,
-    l_to integer NOT NULL,
-    PRIMARY KEY (l_from,l_to)
-);
-CREATE INDEX l_to_idx ON links (l_to);
-
-
-CREATE TABLE linkscc (
-    lcc_pageid integer PRIMARY KEY,
-    lcc_title varchar(255) DEFAULT ''::character varying NOT NULL,
-    lcc_cacheobj text NOT NULL
-);
-CREATE RULE links_del AS ON DELETE TO links DO DELETE FROM linkscc WHERE (linkscc.lcc_pageid = old.l_from);
-
-CREATE TABLE searchindex (
-    si_page integer PRIMARY KEY,
-    si_title varchar(255) NOT NULL,
-    si_text text NOT NULL
-);
-
-CREATE TABLE "user" (
-    user_id serial PRIMARY KEY,
-    user_name varchar(255) UNIQUE NOT NULL,
-    user_real_name varchar(255) NOT NULL,
-    user_rights text DEFAULT ''::text NOT NULL,
-    user_password text DEFAULT ''::text NOT NULL,
-    user_newpassword text DEFAULT ''::text NOT NULL,
-    user_email text DEFAULT ''::text NOT NULL,
-    user_options text DEFAULT ''::text NOT NULL,
-    user_touched timestamp without time zone DEFAULT '1900-01-01 00:00:00'::timestamp without time zone NOT NULL,
-    user_token char(32) DEFAULT '' NOT NULL
-);
-
-
-CREATE TABLE user_newtalk (
-    user_id integer NOT NULL,
-    user_ip inet NOT NULL
-);
-CREATE INDEX user_newtalk_id_idx ON user_newtalk (user_id);
-CREATE INDEX user_newtalk_ip_idx ON user_newtalk (user_ip);
-
-CREATE TABLE ipblocks (
-    ipb_id serial PRIMARY KEY,
-    ipb_address inet NOT NULL,
-    ipb_user integer NOT NULL,
-    ipb_by integer NOT NULL,
-    ipb_reason text NOT NULL,
-    ipb_timestamp timestamp without time zone NOT NULL,
-    ipb_auto smallint NOT NULL,
-    ipb_expiry timestamp without time zone NOT NULL
-);
-CREATE INDEX ipb_address_idx ON ipblocks (ipb_address);
-CREATE INDEX ipb_user_idx ON ipblocks (ipb_user);
-
-CREATE TABLE math (
-    math_inputhash varchar(16) PRIMARY KEY,
-    math_outputhash varchar(16) NOT NULL,
-    math_html_conservativeness smallint NOT NULL,
-    math_html text,
-    math_mathml text
-);
-
-CREATE TABLE objectcache (
-    keyname varchar(255) PRIMARY KEY,
-    value text,
-    exptime timestamp without time zone
-);
-CREATE INDEX oc_exptime ON objectcache (exptime);
-
-CREATE TABLE archive (
-    ar_namespace smallint NOT NULL,
-    ar_title varchar(255) NOT NULL,
-    ar_text text NOT NULL,
-    ar_comment text NOT NULL,
-    ar_user integer NOT NULL,
-    ar_user_text varchar(255) NOT NULL,
-    ar_timestamp timestamp without time zone NOT NULL,
-    ar_minor_edit smallint NOT NULL,
-    ar_flags text NOT NULL
-);
-
-CREATE TABLE recentchanges (
-    rc_id serial PRIMARY KEY,
-    rc_timestamp timestamp without time zone NOT NULL,
-    rc_cur_time timestamp without time zone NOT NULL,
-    rc_user integer NOT NULL,
-    rc_user_text varchar(255) NOT NULL,
-    rc_namespace smallint NOT NULL,
-    rc_title varchar(255) NOT NULL,
-    rc_comment text NOT NULL,
-    rc_minor smallint NOT NULL,
-    rc_bot smallint NOT NULL,
-    rc_new smallint NOT NULL,
-    rc_cur_id integer NOT NULL,
-    rc_this_oldid integer NOT NULL,
-    rc_last_oldid integer NOT NULL,
-    rc_type smallint NOT NULL,
-    rc_moved_to_ns smallint,
-    rc_moved_to_title varchar,
-    rc_ip inet,
-    rc_patrolled smallint
-);
-CREATE INDEX rc_ip ON recentchanges (rc_ip);
-CREATE INDEX rc_new_name_ts_idx ON recentchanges (rc_new, rc_namespace, rc_timestamp);
-CREATE INDEX rc_cur_id_idx ON recentchanges (rc_cur_id);
-
-CREATE TABLE site_stats (
-    ss_row_id serial PRIMARY KEY,
-    ss_total_views bigint NOT NULL,
-    ss_total_edits bigint NOT NULL,
-    ss_good_articles bigint NOT NULL
-);
-
-CREATE TABLE oldimage (
-    oi_name varchar(255) NOT NULL,
-    oi_archive_name varchar(255) NOT NULL,
-    oi_size integer NOT NULL,
-    oi_description text NOT NULL,
-    oi_user integer NOT NULL,
-    oi_user_text varchar(255) NOT NULL,
-    oi_timestamp timestamp without time zone NOT NULL
-);
-CREATE INDEX oi_name_idx ON oldimage (oi_name);
-
-CREATE TABLE querycache (
-    qc_type char(32),
-    qc_value integer,
-    qc_namespace smallint,
-    qc_title char(255)
-);
-CREATE INDEX qc_type_value_idx ON querycache (qc_type, qc_value);
-
-CREATE TABLE watchlist (
-    wl_user integer NOT NULL,
-    wl_namespace smallint NOT NULL,
-    wl_title varchar(255) NOT NULL,
-    PRIMARY KEY (wl_user, wl_namespace, wl_title)
-);
-CREATE INDEX idx_wl_user ON watchlist (wl_user);
-CREATE INDEX idx_wl_title ON watchlist (wl_title);
-
-CREATE TABLE interwiki (
-    iw_prefix char(32) PRIMARY KEY,
-    iw_url varchar(127) NOT NULL,
-    iw_local smallint NOT NULL
-);
-
-CREATE TABLE profiling (
-    pf_count integer,
-    pf_time double precision,
-    pf_name varchar(255) PRIMARY KEY
-);
-
-CREATE TABLE validate (
-    val_user integer DEFAULT 0 NOT NULL,
-    val_title varchar(255) NOT NULL,
-    val_timestamp timestamp without time zone NOT NULL,
-    val_type integer DEFAULT 0 NOT NULL,
-    val_value integer DEFAULT 0 NOT NULL,
-    val_comment varchar(255) NOT NULL
-);
-CREATE INDEX val_user ON validate (val_user, val_title, val_timestamp);
-
-CREATE TABLE user_rights (
-    user_id integer PRIMARY KEY,
-    user_rights text NOT NULL
-);
-
-CREATE TABLE logging (
-    log_type character(10) NOT NULL,
-    log_action character(10) NOT NULL,
-    log_timestamp timestamp without time zone NOT NULL,
-    log_user integer NOT NULL,
-    log_namespace smallint NOT NULL,
-    log_title character varying(255) NOT NULL,
-    log_comment character varying(255) NOT NULL
-);
-
-CREATE INDEX log_type_time ON logging USING btree (log_type, log_timestamp);
-CREATE INDEX log_user_time ON logging USING btree (log_user, log_timestamp);
-CREATE INDEX log_page_time ON logging USING btree (log_namespace, log_title, log_timestamp);
-
-
--- HACK HACK HACK
-CREATE TABLE "group" (
-  group_id integer PRIMARY KEY,
-  group_name varchar(50) NOT NULL,
-  group_description varchar(255) NOT NULL,
-  group_rights text NOT NULL
-);
-
--- Relation table between user and groups
-CREATE TABLE user_groups (
-	ug_user integer NOT NULL,
-	ug_group integer NOT NULL,
-	PRIMARY KEY  (ug_user,ug_group)
-);
diff --git a/maintenance/postgresql/pg_users.sql b/maintenance/postgresql/pg_users.sql
deleted file mode 100644
index c01eef7dcda0..000000000000
--- a/maintenance/postgresql/pg_users.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- access rights for wiki database users
-CREATE USER {$wgDBuser}
-	PASSWORD '{$wgDBpassword}';
-
-GRANT SELECT,INSERT,UPDATE,DELETE ON
-	archive,brokenlinks,categorylinks,cur,
-	cur_cur_id_seq,hitcounter,image,imagelinks,
-	interwiki,ipblocks,ipblocks_ipb_id_seq,links,
-	linkscc,math,objectcache,"old",old_old_id_seq,
-	oldimage,profiling,querycache,recentchanges,
-	recentchanges_rc_id_seq,searchindex,site_stats,
-	site_stats_ss_row_id_seq,"user",user_newtalk,
-	user_rights,user_user_id_seq,validate,watchlist 
-TO {$wgDBuser};
-- 
cgit v1.2.3


From 5ec96b6abdfba8879a1d9ba11b4855cc13c10972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Wed, 21 Dec 2005 16:18:31 +0000
Subject: * Backported 1.545 => 1.546 from HEAD

---
 includes/Parser.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/includes/Parser.php b/includes/Parser.php
index 2b31b196ce4a..53f11493580c 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -43,9 +43,6 @@ define( 'OT_MSG' , 3 );
 # may want to use in wikisyntax
 define( 'STRIP_COMMENTS', 'HTMLCommentStrip' );
 
-# prefix for escaping, used in two functions at least
-define( 'UNIQ_PREFIX', 'NaodW29');
-
 # Constants needed for external link processing
 define( 'HTTP_PROTOCOLS', 'http:\/\/|https:\/\/' );
 # Everything except bracket, space, or control characters
@@ -101,7 +98,7 @@ class Parser
 	# Cleared with clearState():
 	var $mOutput, $mAutonumber, $mDTopen, $mStripState = array();
 	var $mVariables, $mIncludeCount, $mArgStack, $mLastSection, $mInPre;
-	var $mInterwikiLinkHolders, $mLinkHolders;
+	var $mInterwikiLinkHolders, $mLinkHolders, $mUniqPrefix;
 
 	# Temporary:
 	var $mOptions, $mTitle, $mOutputType,
@@ -153,6 +150,7 @@ class Parser
 			'texts' => array(),
 			'titles' => array()
 		);
+		$this->mUniqPrefix = 'UNIQ' . Parser::getRandomString();
 	}
 
 	/**
@@ -349,7 +347,7 @@ class Parser
 		$gallery_content = array();
 
 		# Replace any instances of the placeholders
-		$uniq_prefix = UNIQ_PREFIX;
+		$uniq_prefix = $this->mUniqPrefix;
 		#$text = str_replace( $uniq_prefix, wfHtmlEscapeFirst( $uniq_prefix ), $text );
 
 		# html
@@ -508,7 +506,7 @@ class Parser
 	 * @access private
 	 */
 	function insertStripItem( $text, &$state ) {
-		$rnd = UNIQ_PREFIX . '-item' . Parser::getRandomString();
+		$rnd = $this->mUniqPrefix . '-item' . Parser::getRandomString();
 		if ( !$state ) {
 			$state = array(
 			  'html' => array(),
@@ -777,7 +775,7 @@ class Parser
 
 		# replaceInternalLinks may sometimes leave behind
 		# absolute URLs, which have to be masked to hide them from replaceExternalLinks
-		$text = str_replace(UNIQ_PREFIX."NOPARSE", "", $text);
+		$text = str_replace($this->mUniqPrefix."NOPARSE", "", $text);
 
 		$text = $this->doMagicLinks( $text );
 		$text = $this->doTableStuff( $text );
@@ -1393,7 +1391,7 @@ class Parser
 						$text = $this->replaceInternalLinks($text);
 
 						# cloak any absolute URLs inside the image markup, so replaceExternalLinks() won't touch them
-						$s .= $prefix . preg_replace("/\b($wgUrlProtocols)/", UNIQ_PREFIX."NOPARSE$1", $this->makeImage( $nt, $text) ) . $trail;
+						$s .= $prefix . preg_replace( "/\b($wgUrlProtocols)/", "{$this->mUniqPrefix}NOPARSE$1", $this->makeImage( $nt, $text) ) . $trail;
 						$wgLinkCache->addImageLinkObj( $nt );
 
 						wfProfileOut( "$fname-image" );
@@ -1445,7 +1443,9 @@ class Parser
 
 			# Special and Media are pseudo-namespaces; no pages actually exist in them
 			if( $ns == NS_MEDIA ) {
-				$s .= $prefix . $sk->makeMediaLinkObj( $nt, $text, true ) . $trail;
+				$link = $sk->makeMediaLinkObj( $nt, $text );
+				# Cloak with NOPARSE to avoid replacement in replaceExternalLinks
+				$s .= $prefix . str_replace( 'http://', "http{$this->mUniqPrefix}NOPARSE://", $link ) . $trail;
 				$wgLinkCache->addImageLinkObj( $nt );
 				continue;
 			} elseif( $ns == NS_SPECIAL ) {
@@ -1751,12 +1751,11 @@ class Parser
 			if( 0 == $prefixLength ) {
 				wfProfileIn( "$fname-paragraph" );
 				# No prefix (not in list)--go to paragraph mode
-				$uniq_prefix = UNIQ_PREFIX;
 				// XXX: use a stack for nestable elements like span, table and div
 				$openmatch = preg_match('/(<table|<blockquote|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|<p|<ul|<li|<\\/tr|<\\/td|<\\/th)/iS', $t );
 				$closematch = preg_match(
 					'/(<\\/table|<\\/blockquote|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'.
-					'<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$uniq_prefix.'-pre|<\\/li|<\\/ul)/iS', $t );
+					'<td|<th|<div|<\\/div|<hr|<\\/pre|<\\/p|'.$this->mUniqPrefix.'-pre|<\\/li|<\\/ul)/iS', $t );
 				if ( $openmatch or $closematch ) {
 					$paragraphStack = false;
 					$output .= $this->closeParagraph();
-- 
cgit v1.2.3


From 09e786f0f986e2ce3e61f10cd836dbe9f9eae999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?=
 <avar@users.mediawiki.org>
Date: Wed, 21 Dec 2005 16:19:01 +0000
Subject: * Backported 1.62 => 1.63 from HEAD

---
 includes/Linker.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index 40e1390ea287..1ed4a51ec36d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -591,7 +591,7 @@ class Linker {
 	 * @access public
 	 * @todo Handle invalid or missing images better.
 	 */
-	function makeMediaLinkObj( $title, $text = '', $nourl=false ) {
+	function makeMediaLinkObj( $title, $text = '' ) {
 		if( is_null( $title ) ) {
 			### HOTFIX. Instead of breaking, return empty string.
 			return $text;
@@ -600,9 +600,6 @@ class Linker {
 			$img  = new Image( $title );
 			if( $img->exists() ) {
 				$url  = $img->getURL();
-				if( $nourl ) {
-					$url = str_replace( "http://", UNIQ_PREFIX . "NOPARSEhttp://", $url );
-				}
 				$class = 'internal';
 			} else {
 				$upload = Title::makeTitle( NS_SPECIAL, 'Upload' );
-- 
cgit v1.2.3


From 6dda31ddb8d4692048c2b95f9f77a8b2e0afe071 Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Wed, 21 Dec 2005 16:35:18 +0000
Subject: backport AutoAuthenticate hook

---
 includes/Setup.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index 76412c7d17ad..1904c3af3055 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -206,7 +206,11 @@ if( $wgCommandLineMode ) {
 	# Prevent loading User settings from the DB.
 	$wgUser->setLoaded( true );
 } else {
-	$wgUser = User::loadFromSession();
+        $wgUser = null;
+	wfRunHooks('AutoAuthenticate',array(&$wgUser));
+	if ($wgUser === null) {
+		$wgUser = User::loadFromSession();
+	}
 }
 
 wfProfileOut( $fname.'-User' );
-- 
cgit v1.2.3


From 2cf1928bdeccd4062a4688996db16893f7bf97af Mon Sep 17 00:00:00 2001
From: Domas Mituzas <midom@users.mediawiki.org>
Date: Wed, 21 Dec 2005 23:02:26 +0000
Subject: documented AutoAuthenticate in this branch as well

---
 RELEASE-NOTES  | 1 +
 docs/hooks.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 45ddf58824b5..dae4b7118dfa 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -950,6 +950,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4279) Small correction to LanguageDa.php
 * (bug 4267) Switch dv sd ug ks arc languages to RTL
 * (bug 3991) Allow the operation of wikicode on Protect move only text
+* Added AutoAuthenticate hook for external User object suppliers
 
 
 === Caveats ===
diff --git a/docs/hooks.txt b/docs/hooks.txt
index b4a267983089..53f5f518041d 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -282,6 +282,9 @@ $isminor: minor flag
 $iswatch: watch flag
 $section: section #
 
+'AutoAuthenticate': called to authenticate users on external/environmental means
+$user: writes user object to this parameter
+
 'BlockIp': before an IP address or user is blocked
 $block: the Block object about to be saved
 $user: the user _doing_ the block (not the one being blocked)
-- 
cgit v1.2.3


From 2d0b635d627d86738715120ebb5ac85c9e2e688b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 22 Dec 2005 00:11:55 +0000
Subject: Update for 1.5.4

---
 RELEASE-NOTES | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dae4b7118dfa..a9fed239aa64 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,27 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5.4 ==
+
+December 21, 2005
+
+MediaWiki 1.5.4 is a security and bugfix maintenance release.
+
+A hardcoded internal placeholder string has been replaced with a random
+one. This closes a hole where security checks in inline style attributes
+could be bypassed, injecting JavaScript code that could execute in
+Microsoft Internet Explorer.
+
+Other browsers would not be vulnerable.
+
+Several minor fixes are included in this release, most notably a fix
+to clear the "you have new messages" flag properly for usernames
+containing spaces when e-mail notification is enabled.
+
+See the changelog at the end of the release notes for a full list of
+fixes.
+
+
 == MediaWiki 1.5.3 ==
 
 December 4, 2005
@@ -951,6 +972,7 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 4267) Switch dv sd ug ks arc languages to RTL
 * (bug 3991) Allow the operation of wikicode on Protect move only text
 * Added AutoAuthenticate hook for external User object suppliers
+* Parser internal placeholder string now fully randomized for safety
 
 
 === Caveats ===
-- 
cgit v1.2.3


From c0dc5fe4c3c489f914edf1f5985952fae5c4f61c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 22 Dec 2005 00:12:14 +0000
Subject: Bump to 1.5.4

---
 includes/DefaultSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 098221ddea63..aeee1a0d73b3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -31,7 +31,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5.3';
+$wgVersion			= '1.5.4';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From d66d68385ca95ddfc36ef73f2b4cd940d92ded1e Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 3 Jan 2006 02:50:43 +0000
Subject: Fixes for WMF vulnerability

---
 includes/DefaultSettings.php |  4 +++-
 includes/Linker.php          |  4 ++++
 includes/MimeMagic.php       | 21 ++++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index aeee1a0d73b3..c1f12bb8c357 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1038,7 +1038,9 @@ $wgMimeTypeBlacklist= array(
 	# PHP scripts may execute arbitrary code on the server
 	'application/x-php', 'text/x-php',
 	# Other types that may be interpreted by some servers
-	'text/x-python', 'text/x-perl', 'text/x-bash', 'text/x-sh', 'text/x-csh'
+	'text/x-python', 'text/x-perl', 'text/x-bash', 'text/x-sh', 'text/x-csh',
+	# Windows metafile, client-side vulnerability on some systems
+	'application/x-msmetafile'
 );
 
 /** This is a flag to determine whether or not to check file extensions on upload. */
diff --git a/includes/Linker.php b/includes/Linker.php
index 1ed4a51ec36d..d37e8148e7b4 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -373,6 +373,10 @@ class Linker {
 		global $wgContLang, $wgUser, $wgThumbLimits;
 		
 		$img   = new Image( $nt );
+		if ( !$img->allowInlineDisplay() ) {
+			return $this->makeKnownLinkObj( $nt );
+		}
+
 		$url   = $img->getViewURL();
 		$prefix = $postfix = '';
 		
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index d72041256522..31f57d0e7d11 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -339,14 +339,21 @@ class MimeMagic {
 		$fname = 'MimeMagic::guessMimeType';
 		$mime= $this->detectMimeType($file,$useExt);
 		
-		if (strpos($mime,"text/")===0 ||
-		    $mime==="application/xml") {
+		// Read a chunk of the file
+		$f = fopen( $file, "rt" );
+		if( !$f ) return "unknown/unknown";
+		$head = fread( $f, 1024 );
+		fclose( $f );
+		
+		$sub4 =  substr( $head, 0, 4 );
+		if ( $sub4 == "\x01\x00\x09\x00" || $sub4 == "\xd7\xcd\xc6\x9a" ) {
+			// WMF kill kill kill
+			// Note that WMF may have a bare header, no magic number.
+			// The former of the above two checks is theoretically prone to false positives
+			$mime = "application/x-msmetafile";
+		}
 		
-			// Read a chunk of the file
-			$f = fopen( $file, "rt" );
-			if( !$f ) return "unknown/unknown";
-			$head = fread( $f, 1024 );
-			fclose( $f );
+		if (strpos($mime,"text/")===0 || $mime==="application/xml") {
 			
 			$xml_type= NULL;
 			$script_type= NULL;
-- 
cgit v1.2.3


From b59ac082d30793a34521867afc98ce05a959ca90 Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 3 Jan 2006 12:01:11 +0000
Subject: Backport from HEAD: Fix #4418: cvs keywords causes conflicts

---
 maintenance/namespace2sql.php | 1 -
 profileinfo.php               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/maintenance/namespace2sql.php b/maintenance/namespace2sql.php
index def033660ce7..8084bfec60a3 100644
--- a/maintenance/namespace2sql.php
+++ b/maintenance/namespace2sql.php
@@ -1,5 +1,4 @@
 <?php
-# $Header$
 #
 # Print SQL to insert namespace names into database.
 # This source code is in the public domain.
diff --git a/profileinfo.php b/profileinfo.php
index 1c603b6709a5..e18c57145770 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -21,7 +21,6 @@
      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
      SOFTWARE.
 
-     $Id$
 -->
 <html>
 <head>
-- 
cgit v1.2.3


From bf3e841785157093e78d507d146be50814a0d385 Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 4 Jan 2006 12:33:47 +0000
Subject: Maintenance script to delete unused accounts

---
 maintenance/removeUnusedAccounts.inc | 49 ++++++++++++++++++++++++++++++++++++
 maintenance/removeUnusedAccounts.php | 42 +++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 maintenance/removeUnusedAccounts.inc
 create mode 100644 maintenance/removeUnusedAccounts.php

diff --git a/maintenance/removeUnusedAccounts.inc b/maintenance/removeUnusedAccounts.inc
new file mode 100644
index 000000000000..ac3b5c4ebcb7
--- /dev/null
+++ b/maintenance/removeUnusedAccounts.inc
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Support functions for the removeUnusedAccounts script
+ *
+ * @package MediaWiki
+ * @subpackage Maintenance
+ * @author Rob Church <robchur@gmail.com>
+ */
+
+# Count the number of edits the specified user has made 
+function CountEdits( $user_id ) {
+	# We've *got* to pull this stuff off the master. If the user *has* made an edit, but it hasn't
+	# been replicated to the slaves yet, we'll end up falsely marking them as inactive. This could
+	# (and usually would) lead to their deletion.
+	$dbw =& wfGetDB( DB_MASTER );
+	$sql = 'SELECT COUNT(rev_id) AS count FROM ' . $dbw->tableName( 'revision' ) . ' WHERE rev_user = ' . $user_id;
+	$res = $dbw->query( $sql );
+	$row = $dbw->fetchObject( $res );
+	return( $row->count );	
+}
+
+# Return an array containing all valid user IDs
+function GetUsers() {
+	# We're safe enough pulling this off a slave
+	$dbr =& wfGetDB( DB_SLAVE );
+	$sql = 'SELECT user_id FROM ' . $dbr->tableName( 'user' );
+	$res = $dbr->query( $sql );
+	$users = array();
+	while( $row = $dbr->fetchObject( $res ) ) {
+		$users[] = $row->user_id;
+	}
+	return( $users );
+}
+
+# Delete one or more users
+function DeleteUsers( $users ) {
+	# Need a master, obviously
+	$dbw =& wfGetDB( DB_MASTER );
+	# We'll do it all in one go, for speed
+	$dbw->begin();
+	$table = $dbw->tableName( 'user' );
+	foreach( $users as $user ) {
+		$dbw->query( 'DELETE FROM ' . $table . ' WHERE user_id = ' . $user . ' LIMIT 1' );
+	}
+	$dbw->commit();
+}
+
+?>
\ No newline at end of file
diff --git a/maintenance/removeUnusedAccounts.php b/maintenance/removeUnusedAccounts.php
new file mode 100644
index 000000000000..dd9214f0d4bd
--- /dev/null
+++ b/maintenance/removeUnusedAccounts.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Remove unused user accounts from the database
+ * An unused account is one which has made no edits
+ *
+ * @package MediaWiki
+ * @subpackage Maintenance
+ * @author Rob Church <robchur@gmail.com>
+ */
+ 
+require_once( 'commandLine.inc' );
+require_once( 'removeUnusedAccounts.inc' );
+echo( "REMOVE UNUSED ACCOUNTS\nThis script will delete all users who have made no edits.\n\n" );
+
+$count = 0;
+$del = array();
+
+# Right, who needs deleting?
+$users = GetUsers();
+echo( "Found " . count( $users ) . " accounts.\n" );
+echo( "Locating inactive users..." );
+foreach( $users as $user ) {
+	if( $user != 1 ) {	# Don't *touch* the first user account, ever
+		if( CountEdits( $user ) == 0 ) {
+			# User has no edits, mark them for deletion
+			$del[] = $user;
+			$count++;
+		}
+	}
+}
+echo( "done.\n" );
+
+# Purge the inactive accounts we found
+echo( $count . " inactive accounts found. Deleting..." );
+DeleteUsers( $del );
+echo( "done.\n" );
+
+# We're done
+echo( "Complete.\n" );
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From e8c3c3d207743d318f764b532fd612bccd09727d Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 4 Jan 2006 12:43:01 +0000
Subject: Mention the delete unused accounts script

---
 RELEASE-NOTES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a9fed239aa64..85a0e573ced6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -974,6 +974,9 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Added AutoAuthenticate hook for external User object suppliers
 * Parser internal placeholder string now fully randomized for safety
 
+=== Changes since 1.5.4 ===
+
+* Maintenance script to delete unused user accounts
 
 === Caveats ===
 
-- 
cgit v1.2.3


From b6ddc145fbfdbe88a49198185917d6e72cd61dd9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 5 Jan 2006 23:18:53 +0000
Subject: Bump to 1.5.5 for upcoming release

---
 includes/DefaultSettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c1f12bb8c357..190cd4918eb9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -31,7 +31,7 @@ require_once( 'includes/SiteConfiguration.php' );
 $wgConf = new SiteConfiguration;
 
 /** MediaWiki version number */
-$wgVersion			= '1.5.4';
+$wgVersion			= '1.5.5';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
-- 
cgit v1.2.3


From 4979d7cb163aefbf4090dad5d07130e3aa7d9d4d Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 5 Jan 2006 23:28:25 +0000
Subject: WMF vulnerability

---
 RELEASE-NOTES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 85a0e573ced6..9c738575511c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -977,6 +977,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 === Changes since 1.5.4 ===
 
 * Maintenance script to delete unused user accounts
+* Added detection for WMF files (application/x-msmetafile), added this 
+  MIME type to the default blacklist. Prevented inline display of images
+  which are not of known image types. This is in response to
+  http://en.wikipedia.org/wiki/Windows_Metafile_vulnerability
+
 
 === Caveats ===
 
-- 
cgit v1.2.3


From b2a8013a4893454f32dc13bd253e141d7fef2f35 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 5 Jan 2006 23:36:45 +0000
Subject: notes for 1.5.5

---
 RELEASE-NOTES | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9c738575511c..2e3e928edc56 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -3,6 +3,29 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it *off* if you can.
 
+== MediaWiki 1.5.5 ==
+
+January 5, 2006
+
+MediaWiki 1.5.5 is a security and bugfix maintenance release.
+
+Detection for uploads of Windows Metafile (.wmf) images has been added
+to help protect against a client-side vulnerability in unpatched Microsoft
+Windows operating systems.
+
+Sites which have enabled uploads and added non-standard file types
+(such as .ogg, .doc, or .pdf) should upgrade to this release to ensure
+that malicious .wmf files can't be uploaded with a fake extension;
+such files could put visitors to the site at risk.
+
+For more details on this, see:
+http://en.wikipedia.org/wiki/Windows_Metafile_vulnerability
+
+Additionally, a maintenance script removeUnusedAccounts.php has been added;
+this replaces an older Perl script which had not been updated for the new
+schema in 1.5.
+
+
 == MediaWiki 1.5.4 ==
 
 December 21, 2005
-- 
cgit v1.2.3