From f2cfcfdd991157dcc42d561734e78483cd4bf204 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= <nikerabbit@users.mediawiki.org>
Date: Fri, 12 Aug 2005 17:18:53 +0000
Subject: [PATCH] *html-safety fixes *made some things localizable or better
 localizable

---
 includes/ChangesList.php          |  4 +-
 includes/ImagePage.php            | 27 ++++++++-----
 includes/SpecialBlockip.php       | 16 ++++----
 includes/SpecialContributions.php |  4 +-
 includes/SpecialIpblocklist.php   | 29 ++++++--------
 includes/SpecialPreferences.php   |  4 +-
 includes/SpecialUpload.php        | 64 +++++++++++++++----------------
 languages/Language.php            | 15 ++++++--
 languages/LanguageAf.php          |  2 +-
 languages/LanguageBg.php          |  4 +-
 languages/LanguageCa.php          |  2 +-
 languages/LanguageCs.php          | 10 +++--
 languages/LanguageCy.php          |  2 +-
 languages/LanguageDa.php          | 10 +++--
 languages/LanguageDe.php          |  2 +-
 languages/LanguageEo.php          |  2 +-
 languages/LanguageEs.php          |  2 +-
 languages/LanguageEt.php          |  2 +-
 languages/LanguageFa.php          |  2 +-
 languages/LanguageFi.php          | 57 +++++++++++++++------------
 languages/LanguageFr.php          |  2 +-
 languages/LanguageFy.php          |  2 +-
 languages/LanguageGa.php          |  4 +-
 languages/LanguageHe.php          |  2 +-
 languages/LanguageHu.php          |  2 +-
 languages/LanguageIa.php          |  2 +-
 languages/LanguageId.php          |  2 +-
 languages/LanguageIs.php          |  4 +-
 languages/LanguageIt.php          |  2 +-
 languages/LanguageJa.php          |  2 +-
 languages/LanguageKu.php          |  4 +-
 languages/LanguageLi.php          |  2 +-
 languages/LanguageMk.php          | 10 +++--
 languages/LanguageMs.php          |  2 +-
 languages/LanguageNds.php         |  2 +-
 languages/LanguageNl.php          |  2 +-
 languages/LanguageNn.php          | 10 +++--
 languages/LanguageNo.php          |  2 +-
 languages/LanguageOc.php          |  2 +-
 languages/LanguagePl.php          |  2 +-
 languages/LanguagePt.php          |  2 +-
 languages/LanguageRo.php          |  2 +-
 languages/LanguageRu.php          | 10 +++--
 languages/LanguageSc.php          |  2 +-
 languages/LanguageSk.php          | 10 +++--
 languages/LanguageSl.php          |  2 +-
 languages/LanguageSq.php          |  2 +-
 languages/LanguageSr.php          |  2 +-
 languages/LanguageSv.php          |  2 +-
 languages/LanguageTa.php          |  2 +-
 languages/LanguageUk.php          |  2 +-
 languages/LanguageWa.php          |  2 +-
 languages/LanguageZh_cn.php       |  2 +-
 languages/LanguageZh_tw.php       |  2 +-
 54 files changed, 207 insertions(+), 159 deletions(-)

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index b224c0a681..1b83947f44 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -19,9 +19,9 @@ class ChangesList {
 	 * Returns the appropiate flags for new page, minor change and patrolling
 	 */
 	function recentChangesFlags( $new, $minor, $patrolled, $nothing = '&nbsp;' ) {
-		$f = $new ? '<span class="newpage">' . htmlspecialchars( wfMsg( 'newpageletter' ) ) . '</span>'
+		$f = $new ? '<span class="newpage">' . wfMsgHtml( 'newpageletter' ) . '</span>'
 				: $nothing;
-		$f .= $minor ? '<span class="minor">' . htmlspecialchars( wfMsg( 'minoreditletter' ) ) . '</span>'
+		$f .= $minor ? '<span class="minor">' . wfMsgHtml( 'minoreditletter' ) . '</span>'
 				: $nothing;
 		$f .= $patrolled ? '<span class="unpatrolled">!</span>' : $nothing;
 		return $f;
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index f7aec17176..9d1c2858ea 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -86,9 +86,9 @@ class ImagePage extends Article {
 		global $wgLang;
 		$r = '<ul id="filetoc">
 			<li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>' .
-			($metadata ? '<li><a href="#metadata">' . wfMsg( 'metadata' ) . '</a></li>' : '') . '
-			<li><a href="#filehistory">' . wfMsg( 'imghistory' ) . '</a></li>
-			<li><a href="#filelinks">' . wfMsg( 'imagelinks' ) . '</a></li>
+			($metadata ? '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
+			<li><a href="#filehistory">' . wfMsgHtml( 'imghistory' ) . '</a></li>
+			<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>
 		</ul>';
 		return $r;
 	}
@@ -103,7 +103,7 @@ class ImagePage extends Article {
 	 */
 	function makeMetadataTable( $exif ) {
 		$r = "{| class=metadata align=right width=250px\n";
-		$r .= '|+ id=metadata | '. htmlspecialchars( wfMsg( 'metadata' ) ) . "\n";
+		$r .= '|+ id=metadata | '. htmlspecialchars( wfMsgHtml( 'metadata' ) ) . "\n";
 		foreach( $exif as $k => $v ) {
 			$tag = strtolower( $k );
 			$r .= "! class=$tag |" . wfMsg( "exif-$tag" ) . "\n";
@@ -159,7 +159,7 @@ class ImagePage extends Article {
 				# image
 
 				# "Download high res version" link below the image
-				$msg = wfMsg('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
+				$msg = wfMsgHtml('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
 				if ( $width > $maxWidth ) {
 					$height = floor( $height * $maxWidth / $width );
 					$width  = $maxWidth;
@@ -237,20 +237,29 @@ END
 			}
 		} else {
 			# Image does not exist
-			$wgOut->addWikiText( wfMsg( 'noimage', $this->getUploadUrl() ) );
+
+			$title = Title::makeTitle( NS_SPECIAL, 'Upload' );
+			$link = $sk->makeKnownLinkObj($title, wfMsgHtml('noimage-linktext'),
+				'wpDestFile=' . urlencode( $this->img->getName() ) );
+			$wgOut->addHTML( wfMsgWikiHtml( 'noimage', $link ) );
 		}
 	}
 
 	function printSharedImageText() {
-		global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut;
+		global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut, $wgUser;
 
 		$url = $wgRepositoryBaseUrl . urlencode($this->mTitle->getDBkey());
 		$sharedtext = "<div class='sharedUploadNotice'>" . wfMsg("sharedupload");
 		if ($wgRepositoryBaseUrl && !$wgFetchCommonsDescriptions) {
-			$sharedtext .= " " . wfMsg("shareduploadwiki", $url);
+
+			$sk = $wgUser->getSkin();
+			$title = Title::makeTitle( NS_SPECIAL, 'Upload' );
+			$link = $sk->makeKnownLinkObj($title, wfMsgHtml('shareduploadwiki-linktext'),
+			array( 'wpDestFile' => urlencode( $this->img->getName() )));
+			$sharedtext .= " " . wfMsgHtml('shareduploadwiki', $link);
 		}
 		$sharedtext .= "</div>";
-		$wgOut->addWikiText($sharedtext);
+		$wgOut->addHTML($sharedtext);
 
 		if ($wgRepositoryBaseUrl && $wgFetchCommonsDescriptions) {
 			require_once("HttpFunctions.php");
diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 8d7c3bb617..0e43897e98 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -50,19 +50,19 @@ class IPBlockForm {
 		global $wgOut, $wgUser, $wgLang;
 		global $wgRequest, $wgSysopUserBans;
 
-		$wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) );
+		$wgOut->setPagetitle( wfMsg( 'blockip' ) );
 		$wgOut->addWikiText( wfMsg( 'blockiptext' ) );
 
 		if($wgSysopUserBans) {
-			$mIpaddress = htmlspecialchars( wfMsg( 'ipadressorusername' ) );
+			$mIpaddress = wfMsgHtml( 'ipadressorusername' );
 		} else {
-			$mIpaddress = htmlspecialchars( wfMsg( 'ipaddress' ) );
+			$mIpaddress = wfMsgHtml( 'ipaddress' );
 		}
-		$mIpbexpiry = htmlspecialchars( wfMsg( 'ipbexpiry' ) );
-		$mIpbother = htmlspecialchars( wfMsg( 'ipbother' ) );
-		$mIpbothertime = htmlspecialchars( wfMsg( 'ipbotheroption' ) );
-		$mIpbreason = htmlspecialchars( wfMsg( 'ipbreason' ) );
-		$mIpbsubmit = htmlspecialchars( wfMsg( 'ipbsubmit' ) );
+		$mIpbexpiry = wfMsgHtml( 'ipbexpiry' );
+		$mIpbother = wfMsgHtml( 'ipbother' );
+		$mIpbothertime = wfMsgHtml( 'ipbotheroption' );
+		$mIpbreason = wfMsgHtml( 'ipbreason' );
+		$mIpbsubmit = wfMsgHtml( 'ipbsubmit' );
 		$titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' );
 		$action = $titleObj->escapeLocalURL( "action=submit" );
 
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index 5a04b59b7a..93ff7b18f3 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -84,7 +84,7 @@ class contribs_finder {
 		$sql =	"SELECT rev_timestamp FROM $page, $revision $use_index " .
 			"WHERE page_id = rev_page AND rev_timestamp > '" . $this->offset . "' AND " .
 			"rev_user_text = " . $this->dbr->addQuotes($this->username)
-			. $nscond
+			. $nscond;
 		$sql .=	" ORDER BY rev_timestamp ASC";
 		$sql = $this->dbr->limitResult($sql, $this->limit, 0);
 		$res = $this->dbr->query($sql);
@@ -103,7 +103,7 @@ class contribs_finder {
 		$sql =	"SELECT rev_timestamp FROM $page, $revision $use_index " .
 			"WHERE page_id = rev_page AND " .
 			"rev_user_text = " . $this->dbr->addQuotes($this->username)
-			. $nscond
+			. $nscond;
 		$sql .=	" ORDER BY rev_timestamp ASC";
 		$sql = $this->dbr->limitResult($sql, $this->limit + 1, 0);
 		$res = $this->dbr->query($sql);
diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index b747ad8553..86008b2ad8 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" ) );
+		$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();
@@ -150,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 );
@@ -161,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 1b597b7462..effb1a0ebc 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/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 2cbaa5ac1e..15175d1d97 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -144,7 +144,8 @@ class UploadForm {
 		 * If there was no filename or a zero size given, give up quick.
 		 */
 		if( trim( $this->mOname ) == '' || empty( $this->mUploadSize ) ) {
-			return $this->mainUploadForm('<li>'.wfMsg( 'emptyfile' ).'</li>');
+			$this->mainUploadForm( wfMsgHtml( 'emptyfile' ) );
+			return;
 		}
 
 		# Chop off any directories in the given filename
@@ -167,7 +168,7 @@ class UploadForm {
 		$fullExt = implode( '.', $ext );
 		
 		if ( strlen( $partname ) < 3 ) {
-			$this->mainUploadForm( wfMsg( 'minlength' ) );
+			$this->mainUploadForm( wfMsgHtml( 'minlength' ) );
 			return;
 		}
 
@@ -178,7 +179,8 @@ class UploadForm {
 		$filtered = preg_replace ( "/[^".Title::legalChars()."]|:/", '-', $basename );
 		$nt = Title::newFromText( $filtered );
 		if( is_null( $nt ) ) {
-			return $this->uploadError( wfMsg( 'illegalfilename', htmlspecialchars( $filtered ) ) );
+			$this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) );
+			return;
 		}
 		$nt =& Title::makeTitle( NS_IMAGE, $nt->getDBkey() );
 		$this->mUploadSaveName = $nt->getDBkey();
@@ -188,7 +190,7 @@ class UploadForm {
 		 * to modify it by uploading a new revision.
 		 */
 		if( !$nt->userCanEdit() ) {
-			return $this->uploadError( wfMsg( 'protectedpage' ) );
+			return $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) );
 		}
 		
 		/* Don't allow users to override the blacklist (check file extension) */
@@ -197,7 +199,7 @@ class UploadForm {
 		if( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) ||
 			($wgStrictFileExtensions &&
 				!$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) {
-			return $this->uploadError( wfMsg( 'badfiletype', htmlspecialchars( $fullExt ) ) );
+			return $this->uploadError( wfMsgHtml( 'badfiletype', htmlspecialchars( $fullExt ) ) );
 		}
 		
 		/**
@@ -218,15 +220,15 @@ class UploadForm {
 		 * Check for non-fatal conditions
 		 */
 		if ( ! $this->mIgnoreWarning ) {
-			$warning = '';
+			$warning = '<ul>';
 			if( $this->mUploadSaveName != ucfirst( $filtered ) ) {
-				$warning .=  '<li>'.wfMsg( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
+				$warning .=  '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
 			}
 	
 			global $wgCheckFileExtensions;
 			if ( $wgCheckFileExtensions ) {
 				if ( ! $this->checkFileExtension( $finalExt, $wgFileExtensions ) ) {
-					$warning .= '<li>'.wfMsg( 'badfiletype', htmlspecialchars( $fullExt ) ).'</li>';
+					$warning .= '<li>'.wfMsgHtml( 'badfiletype', htmlspecialchars( $fullExt ) ).'</li>';
 				}
 			}
 	
@@ -234,17 +236,17 @@ class UploadForm {
 			if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) {
 				# TODO: Format $wgUploadSizeWarning to something that looks better than the raw byte
 				# value, perhaps add GB,MB and KB suffixes?
-				$warning .= '<li>'.wfMsg( 'largefile', $wgUploadSizeWarning, $this->mUploadSize ).'</li>';
+				$warning .= '<li>'.wfMsgHtml( 'largefile', $wgUploadSizeWarning, $this->mUploadSize ).'</li>';
 			}
 			if ( $this->mUploadSize == 0 ) {
-				$warning .= '<li>'.wfMsg( 'emptyfile' ).'</li>';
+				$warning .= '<li>'.wfMsgHtml( 'emptyfile' ).'</li>';
 			}
 			
 			if( $nt->getArticleID() ) {
 				global $wgUser;
 				$sk = $wgUser->getSkin();
 				$dlink = $sk->makeKnownLinkObj( $nt );
-				$warning .= '<li>'.wfMsg( 'fileexists', $dlink ).'</li>';
+				$warning .= '<li>'.wfMsgHtml( 'fileexists', $dlink ).'</li>';
 			}
 			
 			if( $warning != '' ) {
@@ -252,7 +254,7 @@ class UploadForm {
 				 * Stash the file in a temporary location; the user can choose
 				 * to let it through and we'll complete the upload then.
 				 */
-				return $this->uploadWarning($warning);
+				return $this->uploadWarning($warning . "</ul>");
 			}
 		}
 		
@@ -376,7 +378,7 @@ class UploadForm {
 	 * @return int
 	 * @access private
 	 */
-	function stashSession() {		
+	function stashSession() {
 		$stash = $this->saveTempUploadedFile(
 			$this->mUploadSaveName, $this->mUploadTempName );
 
@@ -398,6 +400,7 @@ class UploadForm {
 	 * @access private
 	 */
 	function unsaveUploadedFile() {
+		global $wgOut;
 		wfSuppressWarnings();
 		$success = unlink( $this->mUploadTempName );
 		wfRestoreWarnings();
@@ -420,8 +423,8 @@ class UploadForm {
 		$dname = $wgContLang->getNsText( NS_IMAGE ) . ':'.$this->mUploadSaveName;
 		$dlink = $sk->makeKnownLink( $dname, $dname );
 
-		$wgOut->addHTML( '<h2>' . wfMsg( 'successfulupload' ) . "</h2>\n" );
-		$text = wfMsg( 'fileuploaded', $ilink, $dlink );
+		$wgOut->addHTML( '<h2>' . wfMsgHtml( 'successfulupload' ) . "</h2>\n" );
+		$text = wfMsgWikiHtml( 'fileuploaded', $ilink, $dlink );
 		$wgOut->addHTML( $text );
 		$wgOut->returnToMain( false );
 	}
@@ -432,9 +435,8 @@ class UploadForm {
 	 */
 	function uploadError( $error ) {
 		global $wgOut;
-		$sub = wfMsg( 'uploadwarning' );
-		$wgOut->addHTML( "<h2>{$sub}</h2>\n" );
-		$wgOut->addHTML( "<h4 class='error'>{$error}</h4>\n" );
+		$wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
+		$wgOut->addHTML( "<span class='error'>{$error}</span>\n" );
 	}
 
 	/**
@@ -455,14 +457,13 @@ class UploadForm {
 			return;
 		}
 
-		$sub = wfMsg( 'uploadwarning' );
-		$wgOut->addHTML( "<h2>{$sub}</h2>\n" );
+		$wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
 		$wgOut->addHTML( "<ul class='warning'>{$warning}</ul><br />\n" );
 
-		$save = wfMsg( 'savefile' );
-		$reupload = wfMsg( 'reupload' );
-		$iw = wfMsg( 'ignorewarning' );
-		$reup = wfMsg( 'reuploaddesc' );
+		$save = wfMsgHtml( 'savefile' );
+		$reupload = wfMsgHtml( 'reupload' );
+		$iw = wfMsgWikiHtml( 'ignorewarning' );
+		$reup = wfMsgWikiHtml( 'reuploaddesc' );
 		$titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' );
 		$action = $titleObj->escapeLocalURL( 'action=submit' );
 
@@ -518,21 +519,20 @@ class UploadForm {
 		else $ew = '';
 
 		if ( '' != $msg ) {
-			$sub = wfMsg( 'uploaderror' );
+			$sub = wfMsgHtml( 'uploaderror' );
 			$wgOut->addHTML( "<h2>{$sub}</h2>\n" .
-			  "<h4 class='error'>{$msg}</h4>\n" );
+			  "<span class='error'>{$msg}</span>\n" );
 		}
 		$wgOut->addWikiText( wfMsg( 'uploadtext' ) );
 		$sk = $wgUser->getSkin();
 
 
-		$sourcefilename = wfMsg( 'sourcefilename' );
-		$destfilename = wfMsg( 'destfilename' );
+		$sourcefilename = wfMsgHtml( 'sourcefilename' );
+		$destfilename = wfMsgHtml( 'destfilename' );
 		
-		$fd = wfMsg( 'filedesc' );
-		$ulb = wfMsg( 'uploadbtn' );
+		$fd = wfMsgHtml( 'filedesc' );
+		$ulb = wfMsgHtml( 'uploadbtn' );
 
-		$iw = wfMsg( 'ignorewarning' );
 
 		$titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' );
 		$action = $titleObj->escapeLocalURL();
@@ -704,7 +704,7 @@ class UploadForm {
 		}
 	}
 	
-	/** Heuristig for detecting files that *could* contain JavaScript instructions or 
+	/** Heuristig for detecting files that *could* contain JavaScript instructions or
 	* things that may look like HTML to a browser and are thus
 	* potentially harmful. The present implementation will produce false positives in some situations.
 	*
diff --git a/languages/Language.php b/languages/Language.php
index 85145b6b46..7c69da8f62 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -408,6 +408,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f
 'go'		=> 'Go',
 "history"		=> 'Page history',
 'history_short' => 'History',
+'updatedmarker' => 'updated since my last visit',
 'info_short'	=> 'Information',
 'printableversion' => 'Printable version',
 'print' => 'Print',
@@ -1068,9 +1069,11 @@ this old version, (rev) = revert to this old version.
 'linkstoimage'	=> 'The following pages link to this file:',
 'nolinkstoimage' => 'There are no pages that link to this file.',
 '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.',
+'shareduploadwiki' => 'Please see the $1for further information.',
+'shareduploadwiki-linktext' => 'file description page',
 'shareddescriptionfollows' => '-',
-'noimage'       => 'No file by this name exists, you can [$1 upload it]',
+'noimage'       => 'No file by this name exists, you can $1.',
+'noimage-linktext'       => 'upload it',
 'uploadnewversion' => '[$1 Upload a new version of this file]',
 
 # Statistics
@@ -1408,6 +1411,9 @@ 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',
@@ -1632,7 +1638,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
@@ -1763,7 +1769,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',
@@ -2140,6 +2146,7 @@ Please confirm that really want to recreate this article.',
 'recreate' => 'Recreate',
 'tooltip-recreate' => '',
 
+'unit-pixel' => 'px',
 
 );
 
diff --git a/languages/LanguageAf.php b/languages/LanguageAf.php
index 0de0cbc52e..c03384547e 100644
--- a/languages/LanguageAf.php
+++ b/languages/LanguageAf.php
@@ -735,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 789929d321..64108d8698 100644
--- a/languages/LanguageBg.php
+++ b/languages/LanguageBg.php
@@ -1106,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 4c9d423a90..a5d7759995 100644
--- a/languages/LanguageCa.php
+++ b/languages/LanguageCa.php
@@ -778,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 d9807a5c36..9c842e0cd9 100644
--- a/languages/LanguageCs.php
+++ b/languages/LanguageCs.php
@@ -893,8 +893,10 @@ váš uživatelský účet zablokován.",
 'linkstoimage'  => 'Na soubor odkazují tyto stránky:',
 'nolinkstoimage' => 'Na tento soubor neodkazuje žádná stránka.',
 'sharedupload' => 'Tento soubor je sdílený a může být používán ostatními projekty.',
-'shareduploadwiki' => 'Více informací najdete na [$1 stránce s popisem].',
-'noimage'       => 'Soubor s tímto jménem neexistuje, můžete ho [$1 načíst]',
+'shareduploadwiki' => 'Více informací najdete na $1.',
+'shareduploadwiki-linktext' => 'stránce s popisem',
+'noimage'       => 'Soubor s tímto jménem neexistuje, můžete ho $1',
+'noimage-linxtext' => 'načíst',
 'uploadnewversion' => '[$1 Načíst novou verzi tohoto souboru]',
 
 # User list
@@ -1192,7 +1194,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/LanguageCy.php b/languages/LanguageCy.php
index e2e03daaf3..98921e20b7 100644
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -881,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 3a2770c988..e433c2f8cf 100644
--- a/languages/LanguageDa.php
+++ b/languages/LanguageDa.php
@@ -908,8 +908,10 @@ og af hvem, og andre ting du ved om filen.",
 "linkstoimage"	=> "De følgende sider henviser til dette billede:",
 "nolinkstoimage" => "Der er ingen sider der henviser til dette billede.",
 'sharedupload' => '<br clear=all> {| border="0" cellpadding="5" style="font-weight:normal; float:center; border:solid #008 1px;margin-left:5px;margin-bottom:5px" |- |[[Billede:CommonsLogo.png|50px|none|Commons|<nowiki></nowiki>]] |Denne fil er fra [[Commons:Forside|Wikimedia Commons]], en samling af [[åbent indhold]] som [[Wikimedia Foundation]] er vært for.<br />Se venligst siden med [[Commons:Image:{{PAGENAME}}|beskrivelse af billedet]] for information om ophavsret. |} <br clear=all>.',
-'shareduploadwiki' => 'Se venligst [$1 siden med billedbeskrivelsen] for yderligere information.',
-'noimage'       => 'Der eksisterer ingen fil med dette navn, du kan [$1 lægge den op]',
+'shareduploadwiki' => 'Se venligst $1 for yderligere information.',
+'shareduploadwiki-linktext' => 'siden med billedbeskrivelsen',
+'noimage'       => 'Der eksisterer ingen fil med dette navn, du kan $1',
+'noimage-linktext' => 'lægge den op',
 'uploadnewversion' => '[$1 Læg en ny version af denne fil op]',
 
 # Statistics
@@ -1249,7 +1251,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 8dbd72dedf..d3611e360c 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -1005,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 8ac7072da2..0155172467 100644
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -873,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 585e46d517..131a58b675 100644
--- a/languages/LanguageEs.php
+++ b/languages/LanguageEs.php
@@ -872,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 42a4dfdb98..80a7d1103b 100644
--- a/languages/LanguageEt.php
+++ b/languages/LanguageEt.php
@@ -961,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 b4aefdcd72..d3bea03c80 100644
--- a/languages/LanguageFa.php
+++ b/languages/LanguageFa.php
@@ -980,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 143bbe2a4f..0eba13f07f 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',
@@ -553,7 +555,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ä viimeisimmissä muutoksissa',
 'savedprefs'          => 'Asetuksesi tallennettiin.',
 'timezonelegend'      => 'Aikavyöhyke',
 'timezonetext'        => 'Paikallisen ajan ja palvelimen ajan (UTC) välinen aikaero tunteina.',
@@ -570,10 +572,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: ',
@@ -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',
@@ -699,8 +701,10 @@ Huomaa, että {{GRAMMAR:inessive|{{SITENAME}}}} muut voivat muokata tai poistaa
 'linkstoimage'        => 'Seuraavilta sivuilta on linkki tähän tiedostoon:',
 'nolinkstoimage'      => 'Tähän tiedostoon ei ole linkkejä miltään sivulta.',
 'sharedupload'        => 'Tämä tiedosto on jaettu ja muut projektit saattavat käyttää sitä.',
-'shareduploadwiki'    => 'Katso [$1 kuvaussivulta] lisätietoja.',
-'noimage'             => 'Tämän nimistä tiedostoa ei ole olemassa. Voit [$1 tallentaa tiedoston] {{GRAMMAR:genitive|{{SITENAME}}}}',
+'shareduploadwiki'    => 'Katso $1 lisätietoja.',
+'shareduploadwiki-linktext' => 'kuvaussivulta',
+'noimage'             => 'Tämän nimistä tiedostoa ei ole olemassa. Voit $1 {{GRAMMAR:genitive|{{SITENAME}}}}',
+'noimage-linktext'    => 'tallentaa tiedoston',
 'uploadnewversion'    => '[$1 Tallenna] uusi versio tästä tiedostosta',
 
 # Statistics
@@ -801,7 +805,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 +959,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 +973,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 +1255,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 +1264,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 +1308,8 @@ Jos tämä tunnus ei ole sinun, ÄLÄ seuraa linkkiä. Varmennuskoodi vanhenee $
 'searchfulltext'      => 'Etsi koko tekstiä',
 'createarticle'       => 'Luo sivu',
 
+'unit-pixel' => ' px',
+
 );
 
 
@@ -1446,6 +1454,7 @@ class LanguageFi extends LanguageUtf8 {
     }
     return $word;
   }
+
 }
 
 ?>
diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index ced2ceab14..e1c04ae3bc 100644
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -1011,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 72ec5b7eb9..307ac63f05 100644
--- a/languages/LanguageFy.php
+++ b/languages/LanguageFy.php
@@ -902,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 a0ef21cd4c..0507043db2 100755
--- a/languages/LanguageGa.php
+++ b/languages/LanguageGa.php
@@ -1109,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 8d1674b24e..46a271594f 100644
--- a/languages/LanguageHe.php
+++ b/languages/LanguageHe.php
@@ -732,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 baa7533981..32b6fa84f9 100644
--- a/languages/LanguageHu.php
+++ b/languages/LanguageHu.php
@@ -962,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 2c32d52dd9..9f20750d5f 100644
--- a/languages/LanguageIa.php
+++ b/languages/LanguageIa.php
@@ -822,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 76ef1f5939..584b77bb72 100644
--- a/languages/LanguageId.php
+++ b/languages/LanguageId.php
@@ -926,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 411a308086..d340b107cd 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 f57a60525c..c9227bc463 100644
--- a/languages/LanguageIt.php
+++ b/languages/LanguageIt.php
@@ -705,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 126edfd1f7..68052cad18 100644
--- a/languages/LanguageJa.php
+++ b/languages/LanguageJa.php
@@ -844,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 695e63f038..2c238f1616 100644
--- a/languages/LanguageKu.php
+++ b/languages/LanguageKu.php
@@ -145,7 +145,7 @@ 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
@@ -1038,7 +1038,6 @@ or has chosen not to receive e-mail from other users.', */
 
 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.',
@@ -1357,7 +1356,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).',
diff --git a/languages/LanguageLi.php b/languages/LanguageLi.php
index ae2e890356..4da7af5ad6 100644
--- a/languages/LanguageLi.php
+++ b/languages/LanguageLi.php
@@ -645,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",
diff --git a/languages/LanguageMk.php b/languages/LanguageMk.php
index 03439521dc..c2ba4d77fe 100644
--- a/languages/LanguageMk.php
+++ b/languages/LanguageMk.php
@@ -738,8 +738,10 @@ global $wgRightsText;
 	"linkstoimage"			=>	"Следните страници покажуваат кон оваа слика:",
 	"nolinkstoimage"		=>	"Нема страници кои покажуваат кон оваа слика.",
 	'sharedupload'			=>	'Оваа датотека е заедничка и може да се користи од други проекти.',
-	'shareduploadwiki'		=>	'Ве молиме видете го [описот на датотеката $1] за понатамошна информација.',
-	'noimage'			=>	'Не постои датотека со тоа име, можете [$1 да го подигнете]',
+	'shareduploadwiki'		=>	'Ве молиме видете го $1 за понатамошна информација.',
+	'shareduploadwiki-linktext'		=>	'описот на датотеката',
+	'noimage'			=>	'Не постои датотека со тоа име, можете $1',
+	'noimage-linktext'			=>	'да го подигнете',
 	'uploadnewversion'		=>	'[$1 Подигни нова верзија на оваа датотека]',
 
 	"statistics"			=>	"Статистики",
@@ -960,7 +962,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 b28c0e351d..507c508959 100644
--- a/languages/LanguageMs.php
+++ b/languages/LanguageMs.php
@@ -840,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 a39867f4c2..5a7c14dce9 100644
--- a/languages/LanguageNds.php
+++ b/languages/LanguageNds.php
@@ -996,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 33fd6f8d6b..a88c365dcb 100644
--- a/languages/LanguageNl.php
+++ b/languages/LanguageNl.php
@@ -778,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 6328124e6a..1487eb9b3d 100644
--- a/languages/LanguageNn.php
+++ b/languages/LanguageNn.php
@@ -790,8 +790,10 @@ For å laste opp ei fil bruker du «Bla gjennom...» eller «Browse...»-knappen
 'linkstoimage'	        => 'Dei følgjande sidene har lenkjer til denne fila:',
 'nolinkstoimage'        => 'Det finst ikkje noka side med lenkje til denne fila.',
 'sharedupload'          => 'Denne fila er ei delt opplasting og kan brukast av andre prosjekt.',
-'shareduploadwiki'      => 'Sjå [$1 filskildringssida] for meir informasjon.',
-'noimage'               => 'Det finst ikkje noka fil med dette namnet, men du kan [$1 laste ho opp]',
+'shareduploadwiki'      => 'Sjå $1 for meir informasjon.',
+'shareduploadwiki-linktext' => 'filskildringssida',
+'noimage'               => 'Det finst ikkje noka fil med dette namnet, men du kan $1',
+'noimage-linktext'      => 'laste ho opp',
 'uploadnewversion'      => '[$1 Last opp ny versjon av denne fila]',
 
 # Statistics
@@ -1074,7 +1076,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 c53faea544..9cc89e0029 100644
--- a/languages/LanguageNo.php
+++ b/languages/LanguageNo.php
@@ -921,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 072f9e8e5a..560db9fcf5 100644
--- a/languages/LanguageOc.php
+++ b/languages/LanguageOc.php
@@ -820,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 952db6fbd7..d6ecb20138 100644
--- a/languages/LanguagePl.php
+++ b/languages/LanguagePl.php
@@ -923,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 3c319ec6ac..4fad2a1caf 100644
--- a/languages/LanguagePt.php
+++ b/languages/LanguagePt.php
@@ -849,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 9da015b991..bfb7dc3b17 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.
diff --git a/languages/LanguageRu.php b/languages/LanguageRu.php
index 4869a95c88..06a939c182 100644
--- a/languages/LanguageRu.php
+++ b/languages/LanguageRu.php
@@ -927,9 +927,11 @@ Cм. [[{{ns:project}}:Справка по настройкам]], чтобы р
 'linkstoimage'  => 'Следующие страницы ссылаются на данный файл:',
 'nolinkstoimage' => 'Нет страниц, ссылающихся на данный файл.',
 'sharedupload' => 'Этот файл взят из [[Commons:Заглавная_страница|WikiCommons]], репозитория изображений и других свободно распространяемых файлов, общего для всех проектов [[Фонд Викимедиа|Фонда Викимедиа]].',
-'shareduploadwiki' => 'Смотри [$1 страницу описания файла] для объяснений.',
+'shareduploadwiki' => 'Смотри $1 для объяснений.',
+'shareduploadwiki-linktext' => 'страницу описания файла',
 'shareddescriptionfollows' => '-',
-'noimage'       => "Файла с таким именем не существует. вы можете [$1 загрузить его].",
+'noimage'       => "Файла с таким именем не существует. вы можете $1.",
+'noimage-linktext'       => "загрузить его",
 'uploadnewversion' => "[$1 Загрузить новую версию этого изображения]",
 
 # Statistics
@@ -1252,7 +1254,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 bd0dca2d34..46812d97af 100644
--- a/languages/LanguageSc.php
+++ b/languages/LanguageSc.php
@@ -700,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 15802be7af..4511a260a4 100644
--- a/languages/LanguageSk.php
+++ b/languages/LanguageSk.php
@@ -903,8 +903,10 @@ túto starú verziu, (pôvodná) = vráť sa k tejto starej verzii.
 | [[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-->.
 |}",
-'shareduploadwiki' => "Ďalšie informácie pozrite na [stránka opisu súboru $1].",
-'noimage' => 'Súbor s takým menom neexistuje, môžete ho [$1 nahrať]',
+'shareduploadwiki' => "Ďalšie informácie pozrite na $1.",
+'shareduploadwiki-linktext' => "stránka opisu súboru",
+'noimage' => 'Súbor s takým menom neexistuje, môžete ho $1',
+'noimage-linktext' => 'nahrať',
 'uploadnewversion' => '[$1 Nahrajte novú verziu tohto súboru.]',
 
 # Statistics
@@ -1235,7 +1237,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 7ceba41d5f..1f43b99efc 100644
--- a/languages/LanguageSl.php
+++ b/languages/LanguageSl.php
@@ -767,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 9071aecc6b..f225025852 100644
--- a/languages/LanguageSq.php
+++ b/languages/LanguageSq.php
@@ -909,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 c4724e1d6e..8f43b58755 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -928,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 31c8e1cff8..6f917a9de5 100644
--- a/languages/LanguageSv.php
+++ b/languages/LanguageSv.php
@@ -828,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 91c242cd48..9b18b36a50 100644
--- a/languages/LanguageTa.php
+++ b/languages/LanguageTa.php
@@ -809,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 a40ff338f2..24d490424f 100755
--- a/languages/LanguageUk.php
+++ b/languages/LanguageUk.php
@@ -830,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 d7ebdb513d..6049cda039 100644
--- a/languages/LanguageWa.php
+++ b/languages/LanguageWa.php
@@ -1017,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 89a6ea9470..eedeef1a8f 100644
--- a/languages/LanguageZh_cn.php
+++ b/languages/LanguageZh_cn.php
@@ -848,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 cef4d55935..805c22e833 100644
--- a/languages/LanguageZh_tw.php
+++ b/languages/LanguageZh_tw.php
@@ -852,7 +852,7 @@ alt=\"Google\" align=\"middle\"></a>
 "ipusubmit"		=> "解除禁封",
 "ipusuccess"	=> "網址”$1”已經被解除禁封",
 "ipblocklist"	=> "被封網址列表",
-"blocklistline"	=> "$1，$2禁封$3",
+"blocklistline"	=> "$1，$2禁封$3 ($4)",
 "blocklink"		=> "禁封",
 "unblocklink"	=> "解除禁封",
 "contribslink"	=> "貢獻",
-- 
2.20.1