r10460 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r10459‎ \| r10460 \| r10461 >
Date:	17:18, 12 August 2005
Author:	nikerabbit
Status:	old
Tags:
Comment:	html-safety fixes made some things localizable or better localizable
Modified paths:	/trunk/phase3/includes/ChangesList.php (modified) (history) /trunk/phase3/includes/ImagePage.php (modified) (history) /trunk/phase3/includes/SpecialBlockip.php (modified) (history) /trunk/phase3/includes/SpecialContributions.php (modified) (history) /trunk/phase3/includes/SpecialIpblocklist.php (modified) (history) /trunk/phase3/includes/SpecialPreferences.php (modified) (history) /trunk/phase3/includes/SpecialUpload.php (modified) (history) /trunk/phase3/languages/Language.php (modified) (history) /trunk/phase3/languages/LanguageAf.php (modified) (history) /trunk/phase3/languages/LanguageBg.php (modified) (history) /trunk/phase3/languages/LanguageCa.php (modified) (history) /trunk/phase3/languages/LanguageCs.php (modified) (history) /trunk/phase3/languages/LanguageCy.php (modified) (history) /trunk/phase3/languages/LanguageDa.php (modified) (history) /trunk/phase3/languages/LanguageDe.php (modified) (history) /trunk/phase3/languages/LanguageEo.php (modified) (history) /trunk/phase3/languages/LanguageEs.php (modified) (history) /trunk/phase3/languages/LanguageEt.php (modified) (history) /trunk/phase3/languages/LanguageFa.php (modified) (history) /trunk/phase3/languages/LanguageFi.php (modified) (history) /trunk/phase3/languages/LanguageFr.php (modified) (history) /trunk/phase3/languages/LanguageFy.php (modified) (history) /trunk/phase3/languages/LanguageGa.php (modified) (history) /trunk/phase3/languages/LanguageHe.php (modified) (history) /trunk/phase3/languages/LanguageHu.php (modified) (history) /trunk/phase3/languages/LanguageIa.php (modified) (history) /trunk/phase3/languages/LanguageId.php (modified) (history) /trunk/phase3/languages/LanguageIs.php (modified) (history) /trunk/phase3/languages/LanguageIt.php (modified) (history) /trunk/phase3/languages/LanguageJa.php (modified) (history) /trunk/phase3/languages/LanguageKu.php (modified) (history) /trunk/phase3/languages/LanguageLi.php (modified) (history) /trunk/phase3/languages/LanguageMk.php (modified) (history) /trunk/phase3/languages/LanguageMs.php (modified) (history) /trunk/phase3/languages/LanguageNds.php (modified) (history) /trunk/phase3/languages/LanguageNl.php (modified) (history) /trunk/phase3/languages/LanguageNn.php (modified) (history) /trunk/phase3/languages/LanguageNo.php (modified) (history) /trunk/phase3/languages/LanguageOc.php (modified) (history) /trunk/phase3/languages/LanguagePl.php (modified) (history) /trunk/phase3/languages/LanguagePt.php (modified) (history) /trunk/phase3/languages/LanguageRo.php (modified) (history) /trunk/phase3/languages/LanguageRu.php (modified) (history) /trunk/phase3/languages/LanguageSc.php (modified) (history) /trunk/phase3/languages/LanguageSk.php (modified) (history) /trunk/phase3/languages/LanguageSl.php (modified) (history) /trunk/phase3/languages/LanguageSq.php (modified) (history) /trunk/phase3/languages/LanguageSr.php (modified) (history) /trunk/phase3/languages/LanguageSv.php (modified) (history) /trunk/phase3/languages/LanguageTa.php (modified) (history) /trunk/phase3/languages/LanguageUk.php (modified) (history) /trunk/phase3/languages/LanguageWa.php (modified) (history) /trunk/phase3/languages/LanguageZh_cn.php (modified) (history) /trunk/phase3/languages/LanguageZh_tw.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/SpecialIpblocklist.php
—	—	@@ -49,20 +49,20 @@
50	50
51	51	function showForm( $err )
52	52	{
53		~~- global $wgOut, $wgUser, $wgLang;~~
	53	+ global $wgOut, $wgUser, $wgLang, $wgSysopUserBans;
54	54
55		~~- $wgOut->setPagetitle( wfMsg( "unblockip" ) );~~
56		~~- $wgOut->addWikiText( wfMsg( "unblockiptext" ) );~~
	55	+ $wgOut->setPagetitle( wfMsg( 'unblockip' ) );
	56	+ $wgOut->addWikiText( wfMsg( 'unblockiptext' ) );
57	57
58		~~- $ipa = wfMsg( "ipaddress" );~~
59		~~- $ipr = wfMsg( "ipbreason" );~~
60		~~- $ipus = htmlspecialchars( wfMsg( "ipusubmit" ) );~~
	58	+ $ipa = wfMsgHtml( $wgSysopUserBans ? 'ipadressorusername' : 'ipaddress' );
	59	+ $ipr = wfMsgHtml( 'ipbreason' );
	60	+ $ipus = wfMsgHtml( 'ipusubmit' );
61	61	$titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
62	62	$action = $titleObj->escapeLocalURL( "action=submit" );
63	63
64	64	if ( "" != $err ) {
65	65	$wgOut->setSubtitle( wfMsg( "formerror" ) );
66		~~- $wgOut->addHTML( "<p class='error'>{$err}</p>\n" );~~
	66	+ $wgOut->addWikitext( "<span class='error'>{$err}</span>\n" );
67	67	}
68	68	$token = htmlspecialchars( $wgUser->editToken() );
69	69
—	—	@@ -104,7 +104,7 @@
105	105	} else {
106	106	$block->mAddress = $this->ip;
107	107	}
108		-
	108	+
109	109	# Delete block (if it exists)
110	110	# We should probably check for errors rather than just declaring success
111	111	$block->delete();
—	—	@@ -150,9 +150,9 @@
151	151	$formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
152	152
153	153	if ( $block->mExpiry === "" ) {
154		~~- $formattedExpiry = "indefinite";~~
	154	+ $formattedExpiry = wfMsgHtml('infiniteblock');
155	155	} else {
156		~~- $formattedExpiry = $wgLang->timeanddate( $block->mExpiry, true );~~
	156	+ $formattedExpiry = wfMsgHtml('expiringblock', $wgLang->timeanddate( $block->mExpiry, true ) );
157	157	}
158	158
159	159	$line = wfMsg( "blocklistline", $formattedTime, $ulink, $addr, $formattedExpiry );
—	—	@@ -161,17 +161,12 @@
162	162
163	163	if ( !$block->mAuto ) {
164	164	$titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
165		~~- $clink = "<a href=\"" . $titleObj->escapeLocalURL( "target={$block->mAddress}" ) . "\">" .~~
166		~~- wfMsg( "contribslink" ) . "</a>";~~
167		~~- $wgOut->addHTML( " ({$clink})" );~~
	165	+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'contribslink' ), "target={$block->mAddress}") . ')' );
168	166	}
169	167
170	168	if ( $wgUser->isAllowed('block') ) {
171	169	$titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
172		~~- $ublink = "<a href=\"" .~~
173		~~- $titleObj->escapeLocalURL( "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .~~
174		~~- wfMsg( "unblocklink" ) . "</a>";~~
175		~~- $wgOut->addHTML( " ({$ublink})" );~~
	170	+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'unblocklink' ), 'action=unblock&ip=' . urlencode( $addr ) ) . ')' );
176	171	}
177	172	$wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
178	173	$wgOut->addHTML( "</li>\n" );
Index: trunk/phase3/includes/SpecialPreferences.php
—	—	@@ -661,7 +661,7 @@
662	662	$imageLimitOptions = null;
663	663	foreach ( $wgImageLimits as $index => $limits ) {
664	664	$selected = ($index == $this->mImageSize) ? 'selected="selected"' : '';
665		~~- $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}x{$limits[1]}</option>\n";~~
	665	+ $imageLimitOptions .= "<option value=\"{$index}\" {$selected}>{$limits[0]}×{$limits[1]}". wfMsgHtml('unit-pixel') ."</option>\n";
666	666	}
667	667
668	668	$imageThumbOptions = null;
—	—	@@ -669,7 +669,7 @@
670	670	<div><label>" . wfMsg('thumbsize') . "<select name=\"wpThumbSize\">");
671	671	foreach ( $wgThumbLimits as $index => $size ) {
672	672	$selected = ($index == $this->mThumbSize) ? 'selected="selected"' : '';
673		~~- $imageThumbOptions .= "<option value=\"{$index}\" {$selected}>{$size}px</option>\n";~~
	673	+ $imageThumbOptions .= "<option value=\"{$index}\" {$selected}>{$size}". wfMsgHtml('unit-pixel') ."</option>\n";
674	674	}
675	675	$wgOut->addHTML( "{$imageThumbOptions}</select></label></div></fieldset>\n\n");
676	676
Index: trunk/phase3/includes/ImagePage.php
—	—	@@ -86,9 +86,9 @@
87	87	global $wgLang;
88	88	$r = '<ul id="filetoc">
89	89	<li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>' .
90		~~- ($metadata ? '<li><a href="#metadata">' . wfMsg( 'metadata' ) . '</a></li>' : '') . '~~
91		~~- <li><a href="#filehistory">' . wfMsg( 'imghistory' ) . '</a></li>~~
92		~~- <li><a href="#filelinks">' . wfMsg( 'imagelinks' ) . '</a></li>~~
	90	+ ($metadata ? '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
	91	+ <li><a href="#filehistory">' . wfMsgHtml( 'imghistory' ) . '</a></li>
	92	+ <li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>
93	93	</ul>';
94	94	return $r;
95	95	}
—	—	@@ -103,7 +103,7 @@
104	104	*/
105	105	function makeMetadataTable( $exif ) {
106	106	$r = "{\| class=metadata align=right width=250px\n";
107		~~- $r .= '\|+ id=metadata \| '. htmlspecialchars( wfMsg( 'metadata' ) ) . "\n";~~
	107	+ $r .= '\|+ id=metadata \| '. htmlspecialchars( wfMsgHtml( 'metadata' ) ) . "\n";
108	108	foreach( $exif as $k => $v ) {
109	109	$tag = strtolower( $k );
110	110	$r .= "! class=$tag \|" . wfMsg( "exif-$tag" ) . "\n";
—	—	@@ -159,7 +159,7 @@
160	160	# image
161	161
162	162	# "Download high res version" link below the image
163		~~- $msg = wfMsg('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );~~
	163	+ $msg = wfMsgHtml('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
164	164	if ( $width > $maxWidth ) {
165	165	$height = floor( $height * $maxWidth / $width );
166	166	$width = $maxWidth;
—	—	@@ -237,20 +237,29 @@
238	238	}
239	239	} else {
240	240	# Image does not exist
241		~~- $wgOut->addWikiText( wfMsg( 'noimage', $this->getUploadUrl() ) );~~
	241	+
	242	+ $title = Title::makeTitle( NS_SPECIAL, 'Upload' );
	243	+ $link = $sk->makeKnownLinkObj($title, wfMsgHtml('noimage-linktext'),
	244	+ 'wpDestFile=' . urlencode( $this->img->getName() ) );
	245	+ $wgOut->addHTML( wfMsgWikiHtml( 'noimage', $link ) );
242	246	}
243	247	}
244	248
245	249	function printSharedImageText() {
246		~~- global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut;~~
	250	+ global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut, $wgUser;
247	251
248	252	$url = $wgRepositoryBaseUrl . urlencode($this->mTitle->getDBkey());
249	253	$sharedtext = "<div class='sharedUploadNotice'>" . wfMsg("sharedupload");
250	254	if ($wgRepositoryBaseUrl && !$wgFetchCommonsDescriptions) {
251		~~- $sharedtext .= " " . wfMsg("shareduploadwiki", $url);~~
	255	+
	256	+ $sk = $wgUser->getSkin();
	257	+ $title = Title::makeTitle( NS_SPECIAL, 'Upload' );
	258	+ $link = $sk->makeKnownLinkObj($title, wfMsgHtml('shareduploadwiki-linktext'),
	259	+ array( 'wpDestFile' => urlencode( $this->img->getName() )));
	260	+ $sharedtext .= " " . wfMsgHtml('shareduploadwiki', $link);
252	261	}
253	262	$sharedtext .= "</div>";
254		~~- $wgOut->addWikiText($sharedtext);~~
	263	+ $wgOut->addHTML($sharedtext);
255	264
256	265	if ($wgRepositoryBaseUrl && $wgFetchCommonsDescriptions) {
257	266	require_once("HttpFunctions.php");
Index: trunk/phase3/includes/SpecialUpload.php
—	—	@@ -144,7 +144,8 @@
145	145	* If there was no filename or a zero size given, give up quick.
146	146	*/
147	147	if( trim( $this->mOname ) == '' \|\| empty( $this->mUploadSize ) ) {
148		~~- return $this->mainUploadForm('<li>'.wfMsg( 'emptyfile' ).'</li>');~~
	148	+ $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) );
	149	+ return;
149	150	}
150	151
151	152	# Chop off any directories in the given filename
—	—	@@ -167,7 +168,7 @@
168	169	$fullExt = implode( '.', $ext );
169	170
170	171	if ( strlen( $partname ) < 3 ) {
171		~~- $this->mainUploadForm( wfMsg( 'minlength' ) );~~
	172	+ $this->mainUploadForm( wfMsgHtml( 'minlength' ) );
172	173	return;
173	174	}
174	175
—	—	@@ -178,7 +179,8 @@
179	180	$filtered = preg_replace ( "/[^".Title::legalChars()."]\|:/", '-', $basename );
180	181	$nt = Title::newFromText( $filtered );
181	182	if( is_null( $nt ) ) {
182		~~- return $this->uploadError( wfMsg( 'illegalfilename', htmlspecialchars( $filtered ) ) );~~
	183	+ $this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) );
	184	+ return;
183	185	}
184	186	$nt =& Title::makeTitle( NS_IMAGE, $nt->getDBkey() );
185	187	$this->mUploadSaveName = $nt->getDBkey();
—	—	@@ -188,7 +190,7 @@
189	191	* to modify it by uploading a new revision.
190	192	*/
191	193	if( !$nt->userCanEdit() ) {
192		~~- return $this->uploadError( wfMsg( 'protectedpage' ) );~~
	194	+ return $this->uploadError( wfMsgWikiHtml( 'protectedpage' ) );
193	195	}
194	196
195	197	/* Don't allow users to override the blacklist (check file extension) */
—	—	@@ -197,7 +199,7 @@
198	200	if( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) \|\|
199	201	($wgStrictFileExtensions &&
200	202	!$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) {
201		~~- return $this->uploadError( wfMsg( 'badfiletype', htmlspecialchars( $fullExt ) ) );~~
	203	+ return $this->uploadError( wfMsgHtml( 'badfiletype', htmlspecialchars( $fullExt ) ) );
202	204	}
203	205
204	206	/**
—	—	@@ -218,15 +220,15 @@
219	221	* Check for non-fatal conditions
220	222	*/
221	223	if ( ! $this->mIgnoreWarning ) {
222		~~- $warning = '';~~
	224	+ $warning = '<ul>';
223	225	if( $this->mUploadSaveName != ucfirst( $filtered ) ) {
224		~~- $warning .= '<li>'.wfMsg( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';~~
	226	+ $warning .= '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
225	227	}
226	228
227	229	global $wgCheckFileExtensions;
228	230	if ( $wgCheckFileExtensions ) {
229	231	if ( ! $this->checkFileExtension( $finalExt, $wgFileExtensions ) ) {
230		~~- $warning .= '<li>'.wfMsg( 'badfiletype', htmlspecialchars( $fullExt ) ).'</li>';~~
	232	+ $warning .= '<li>'.wfMsgHtml( 'badfiletype', htmlspecialchars( $fullExt ) ).'</li>';
231	233	}
232	234	}
233	235
—	—	@@ -234,17 +236,17 @@
235	237	if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) {
236	238	# TODO: Format $wgUploadSizeWarning to something that looks better than the raw byte
237	239	# value, perhaps add GB,MB and KB suffixes?
238		~~- $warning .= '<li>'.wfMsg( 'largefile', $wgUploadSizeWarning, $this->mUploadSize ).'</li>';~~
	240	+ $warning .= '<li>'.wfMsgHtml( 'largefile', $wgUploadSizeWarning, $this->mUploadSize ).'</li>';
239	241	}
240	242	if ( $this->mUploadSize == 0 ) {
241		~~- $warning .= '<li>'.wfMsg( 'emptyfile' ).'</li>';~~
	243	+ $warning .= '<li>'.wfMsgHtml( 'emptyfile' ).'</li>';
242	244	}
243	245
244	246	if( $nt->getArticleID() ) {
245	247	global $wgUser;
246	248	$sk = $wgUser->getSkin();
247	249	$dlink = $sk->makeKnownLinkObj( $nt );
248		~~- $warning .= '<li>'.wfMsg( 'fileexists', $dlink ).'</li>';~~
	250	+ $warning .= '<li>'.wfMsgHtml( 'fileexists', $dlink ).'</li>';
249	251	}
250	252
251	253	if( $warning != '' ) {
—	—	@@ -252,7 +254,7 @@
253	255	* Stash the file in a temporary location; the user can choose
254	256	* to let it through and we'll complete the upload then.
255	257	*/
256		~~- return $this->uploadWarning($warning);~~
	258	+ return $this->uploadWarning($warning . "</ul>");
257	259	}
258	260	}
259	261
—	—	@@ -376,7 +378,7 @@
377	379	* @return int
378	380	* @access private
379	381	*/
380		~~- function stashSession() {~~
	382	+ function stashSession() {
381	383	$stash = $this->saveTempUploadedFile(
382	384	$this->mUploadSaveName, $this->mUploadTempName );
383	385
—	—	@@ -398,6 +400,7 @@
399	401	* @access private
400	402	*/
401	403	function unsaveUploadedFile() {
	404	+ global $wgOut;
402	405	wfSuppressWarnings();
403	406	$success = unlink( $this->mUploadTempName );
404	407	wfRestoreWarnings();
—	—	@@ -420,8 +423,8 @@
421	424	$dname = $wgContLang->getNsText( NS_IMAGE ) . ':'.$this->mUploadSaveName;
422	425	$dlink = $sk->makeKnownLink( $dname, $dname );
423	426
424		~~- $wgOut->addHTML( '<h2>' . wfMsg( 'successfulupload' ) . "</h2>\n" );~~
425		~~- $text = wfMsg( 'fileuploaded', $ilink, $dlink );~~
	427	+ $wgOut->addHTML( '<h2>' . wfMsgHtml( 'successfulupload' ) . "</h2>\n" );
	428	+ $text = wfMsgWikiHtml( 'fileuploaded', $ilink, $dlink );
426	429	$wgOut->addHTML( $text );
427	430	$wgOut->returnToMain( false );
428	431	}
—	—	@@ -432,9 +435,8 @@
433	436	*/
434	437	function uploadError( $error ) {
435	438	global $wgOut;
436		~~- $sub = wfMsg( 'uploadwarning' );~~
437		~~- $wgOut->addHTML( "<h2>{$sub}</h2>\n" );~~
438		~~- $wgOut->addHTML( "<h4 class='error'>{$error}</h4>\n" );~~
	439	+ $wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
	440	+ $wgOut->addHTML( "<span class='error'>{$error}</span>\n" );
439	441	}
440	442
441	443	/**
—	—	@@ -455,14 +457,13 @@
456	458	return;
457	459	}
458	460
459		~~- $sub = wfMsg( 'uploadwarning' );~~
460		~~- $wgOut->addHTML( "<h2>{$sub}</h2>\n" );~~
	461	+ $wgOut->addHTML( "<h2>" . wfMsgHtml( 'uploadwarning' ) . "</h2>\n" );
461	462	$wgOut->addHTML( "<ul class='warning'>{$warning}</ul><br />\n" );
462	463
463		~~- $save = wfMsg( 'savefile' );~~
464		~~- $reupload = wfMsg( 'reupload' );~~
465		~~- $iw = wfMsg( 'ignorewarning' );~~
466		~~- $reup = wfMsg( 'reuploaddesc' );~~
	464	+ $save = wfMsgHtml( 'savefile' );
	465	+ $reupload = wfMsgHtml( 'reupload' );
	466	+ $iw = wfMsgWikiHtml( 'ignorewarning' );
	467	+ $reup = wfMsgWikiHtml( 'reuploaddesc' );
467	468	$titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' );
468	469	$action = $titleObj->escapeLocalURL( 'action=submit' );
469	470
—	—	@@ -518,21 +519,20 @@
519	520	else $ew = '';
520	521
521	522	if ( '' != $msg ) {
522		~~- $sub = wfMsg( 'uploaderror' );~~
	523	+ $sub = wfMsgHtml( 'uploaderror' );
523	524	$wgOut->addHTML( "<h2>{$sub}</h2>\n" .
524		~~- "<h4 class='error'>{$msg}</h4>\n" );~~
	525	+ "<span class='error'>{$msg}</span>\n" );
525	526	}
526	527	$wgOut->addWikiText( wfMsg( 'uploadtext' ) );
527	528	$sk = $wgUser->getSkin();
528	529
529	530
530		~~- $sourcefilename = wfMsg( 'sourcefilename' );~~
531		~~- $destfilename = wfMsg( 'destfilename' );~~
	531	+ $sourcefilename = wfMsgHtml( 'sourcefilename' );
	532	+ $destfilename = wfMsgHtml( 'destfilename' );
532	533
533		~~- $fd = wfMsg( 'filedesc' );~~
534		~~- $ulb = wfMsg( 'uploadbtn' );~~
	534	+ $fd = wfMsgHtml( 'filedesc' );
	535	+ $ulb = wfMsgHtml( 'uploadbtn' );
535	536
536		~~- $iw = wfMsg( 'ignorewarning' );~~
537	537
538	538	$titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' );
539	539	$action = $titleObj->escapeLocalURL();
—	—	@@ -704,7 +704,7 @@
705	705	}
706	706	}
707	707
708		~~- /** Heuristig for detecting files that could contain JavaScript instructions or~~
	708	+ /** Heuristig for detecting files that could contain JavaScript instructions or
709	709	* things that may look like HTML to a browser and are thus
710	710	* potentially harmful. The present implementation will produce false positives in some situations.
711	711	*
Index: trunk/phase3/includes/ChangesList.php
—	—	@@ -19,9 +19,9 @@
20	20	* Returns the appropiate flags for new page, minor change and patrolling
21	21	*/
22	22	function recentChangesFlags( $new, $minor, $patrolled, $nothing = ' ' ) {
23		~~- $f = $new ? '<span class="newpage">' . htmlspecialchars( wfMsg( 'newpageletter' ) ) . '</span>'~~
	23	+ $f = $new ? '<span class="newpage">' . wfMsgHtml( 'newpageletter' ) . '</span>'
24	24	: $nothing;
25		~~- $f .= $minor ? '<span class="minor">' . htmlspecialchars( wfMsg( 'minoreditletter' ) ) . '</span>'~~
	25	+ $f .= $minor ? '<span class="minor">' . wfMsgHtml( 'minoreditletter' ) . '</span>'
26	26	: $nothing;
27	27	$f .= $patrolled ? '<span class="unpatrolled">!</span>' : $nothing;
28	28	return $f;
Index: trunk/phase3/includes/SpecialContributions.php
—	—	@@ -84,7 +84,7 @@
85	85	$sql = "SELECT rev_timestamp FROM $page, $revision $use_index " .
86	86	"WHERE page_id = rev_page AND rev_timestamp > '" . $this->offset . "' AND " .
87	87	"rev_user_text = " . $this->dbr->addQuotes($this->username)
88		~~- . $nscond~~
	88	+ . $nscond;
89	89	$sql .= " ORDER BY rev_timestamp ASC";
90	90	$sql = $this->dbr->limitResult($sql, $this->limit, 0);
91	91	$res = $this->dbr->query($sql);
—	—	@@ -103,7 +103,7 @@
104	104	$sql = "SELECT rev_timestamp FROM $page, $revision $use_index " .
105	105	"WHERE page_id = rev_page AND " .
106	106	"rev_user_text = " . $this->dbr->addQuotes($this->username)
107		~~- . $nscond~~
	107	+ . $nscond;
108	108	$sql .= " ORDER BY rev_timestamp ASC";
109	109	$sql = $this->dbr->limitResult($sql, $this->limit + 1, 0);
110	110	$res = $this->dbr->query($sql);
Index: trunk/phase3/includes/SpecialBlockip.php
—	—	@@ -50,19 +50,19 @@
51	51	global $wgOut, $wgUser, $wgLang;
52	52	global $wgRequest, $wgSysopUserBans;
53	53
54		~~- $wgOut->setPagetitle( htmlspecialchars( wfMsg( 'blockip' ) ) );~~
	54	+ $wgOut->setPagetitle( wfMsg( 'blockip' ) );
55	55	$wgOut->addWikiText( wfMsg( 'blockiptext' ) );
56	56
57	57	if($wgSysopUserBans) {
58		~~- $mIpaddress = htmlspecialchars( wfMsg( 'ipadressorusername' ) );~~
	58	+ $mIpaddress = wfMsgHtml( 'ipadressorusername' );
59	59	} else {
60		~~- $mIpaddress = htmlspecialchars( wfMsg( 'ipaddress' ) );~~
	60	+ $mIpaddress = wfMsgHtml( 'ipaddress' );
61	61	}
62		~~- $mIpbexpiry = htmlspecialchars( wfMsg( 'ipbexpiry' ) );~~
63		~~- $mIpbother = htmlspecialchars( wfMsg( 'ipbother' ) );~~
64		~~- $mIpbothertime = htmlspecialchars( wfMsg( 'ipbotheroption' ) );~~
65		~~- $mIpbreason = htmlspecialchars( wfMsg( 'ipbreason' ) );~~
66		~~- $mIpbsubmit = htmlspecialchars( wfMsg( 'ipbsubmit' ) );~~
	62	+ $mIpbexpiry = wfMsgHtml( 'ipbexpiry' );
	63	+ $mIpbother = wfMsgHtml( 'ipbother' );
	64	+ $mIpbothertime = wfMsgHtml( 'ipbotheroption' );
	65	+ $mIpbreason = wfMsgHtml( 'ipbreason' );
	66	+ $mIpbsubmit = wfMsgHtml( 'ipbsubmit' );
67	67	$titleObj = Title::makeTitle( NS_SPECIAL, 'Blockip' );
68	68	$action = $titleObj->escapeLocalURL( "action=submit" );
69	69
Index: trunk/phase3/languages/LanguageHe.php
—	—	@@ -732,7 +732,7 @@
733	733	"ipusubmit" => "שחרר כתובת זו",
734	734	"ipusuccess" => "הכתובת \"$1\" שוחררה",
735	735	"ipblocklist" => "רשימת כתובות IP חסומות",
736		~~-"blocklistline" => "$1, $2 חסם את $3",~~
	736	+"blocklistline" => "$1, $2 חסם את $3 ($4)",
737	737	"blocklink" => "חסום",
738	738	"unblocklink" => "שחרר חסימה",
739	739	"contribslink" => "תרומות המשתמש",
Index: trunk/phase3/languages/LanguageZh_cn.php
—	—	@@ -848,7 +848,7 @@
849	849	"ipusubmit" => "解除禁封",
850	850	"ipusuccess" => "IP地址“$1”已经被解除禁封",
851	851	"ipblocklist" => "被封IP地址列表",
852		~~-"blocklistline" => "$1，$2禁封$3",~~
	852	+"blocklistline" => "$1，$2禁封$3 ($4)",
853	853	"blocklink" => "禁封",
854	854	"unblocklink" => "解除禁封",
855	855	"contribslink" => "贡献",
Index: trunk/phase3/languages/LanguageLi.php
—	—	@@ -645,7 +645,7 @@
646	646	"ipusubmit" => "De-Blokkier dit IP-adres.",
647	647	"ipusuccess" => "Het IP-adres \"$1\" is gedeBlokkierd.",
648	648	"ipblocklist" => "Liest van geblokkierde IP-adressen.",
649		~~-"blocklistline" => "Op $1 blokkierde $2 ut adres $3",~~
	649	+"blocklistline" => "Op $1 blokkierde $2 ut adres $3 ($4)",
650	650	"blocklink" => "Blokkier",
651	651	"unblocklink" => "de-Blokkier",
652	652	"contribslink" => "bijdragen",
Index: trunk/phase3/languages/LanguageTa.php
—	—	@@ -809,7 +809,7 @@
810	810	"ipusubmit" => "இம் முகவரியைத் தடை நீக்கு",
811	811	"ipusuccess" => "\"$1\" தடை நீக்கப்பட்டது",
812	812	"ipblocklist" => "தடுக்கப்பட்ட ஐபி முகவரிகளினதும், பயனர் பெயர்களினதும் பட்டியல்",
813		~~-"blocklistline" => "$1, $2 blocked $3",~~
	813	+"blocklistline" => "$1, $2 blocked $3 ($4)",
814	814	"blocklink" => "தடு",
815	815	"unblocklink" => "தடை நீக்கு",
816	816	"contribslink" => "contribs",
Index: trunk/phase3/languages/LanguagePl.php
—	—	@@ -923,7 +923,7 @@
924	924	"ipusubmit" => "Odblokuj ten adres",
925	925	"ipusuccess" => "Adress IP \"$1\" został odblokowany",
926	926	"ipblocklist" => "Lista zablokowanych adresów IP",
927		~~-"blocklistline" => "$1, $2 zablokował $3",~~
	927	+"blocklistline" => "$1, $2 zablokował $3 ($4)",
928	928	"blocklink" => "zablokuj",
929	929	"unblocklink" => "odblokuj",
930	930	"contribslink" => "wkład",
Index: trunk/phase3/languages/LanguageHu.php
—	—	@@ -962,7 +962,7 @@
963	963	"ipusubmit" => "Unblock this address",
964	964	"ipusuccess" => "IP address \"$1\" unblocked",
965	965	"ipblocklist" => "List of blocked IP addresses",
966		~~-"blocklistline" => "$1, $2 blocked $3",~~
	966	+"blocklistline" => "$1, $2 blocked $3 ($4)",
967	967	"blocklink" => "block",
968	968	"unblocklink" => "unblock",
969	969	"contribslink" => "contribs",
Index: trunk/phase3/languages/Language.php
—	—	@@ -408,6 +408,7 @@
409	409	'go' => 'Go',
410	410	"history" => 'Page history',
411	411	'history_short' => 'History',
	412	+'updatedmarker' => 'updated since my last visit',
412	413	'info_short' => 'Information',
413	414	'printableversion' => 'Printable version',
414	415	'print' => 'Print',
—	—	@@ -1068,9 +1069,11 @@
1069	1070	'linkstoimage' => 'The following pages link to this file:',
1070	1071	'nolinkstoimage' => 'There are no pages that link to this file.',
1071	1072	'sharedupload' => 'This file is a shared upload and may be used by other projects.',
1072		~~-'shareduploadwiki' => 'Please see the [$1 file description page] for further information.',~~
	1073	+'shareduploadwiki' => 'Please see the $1for further information.',
	1074	+'shareduploadwiki-linktext' => 'file description page',
1073	1075	'shareddescriptionfollows' => '-',
1074		~~-'noimage' => 'No file by this name exists, you can [$1 upload it]',~~
	1076	+'noimage' => 'No file by this name exists, you can $1.',
	1077	+'noimage-linktext' => 'upload it',
1075	1078	'uploadnewversion' => '[$1 Upload a new version of this file]',
1076	1079
1077	1080	# Statistics
—	—	@@ -1408,6 +1411,9 @@
1409	1412	'ipusubmit' => 'Unblock this address',
1410	1413	'ipusuccess' => "\"[[$1]]\" unblocked",
1411	1414	'ipblocklist' => 'List of blocked IP addresses and usernames',
	1415	+'blocklistline' => "$1, $2 blocked $3 ($4)",
	1416	+'infiniteblock' => 'infinite',
	1417	+'expiringblock' => 'expires $1',
1412	1418	'ipblocklistempty' => 'The blocklist is empty.',
1413	1419	'blocklistline' => "$1, $2 blocked $3 (expires $4)",
1414	1420	'blocklink' => 'block',
—	—	@@ -1632,7 +1638,7 @@
1633	1639	'accesskey-minoredit' => 'i',
1634	1640	'accesskey-save' => 's',
1635	1641	'accesskey-preview' => 'p',
1636		~~-'accesskey-diff' => 'd',~~
	1642	+'accesskey-diff' => 'v',
1637	1643	'accesskey-compareselectedversions' => 'v',
1638	1644
1639	1645	# tooltip help for some actions, most are in Monobook.js
—	—	@@ -1763,7 +1769,7 @@
1764	1770	'nextdiff' => 'Next diff →',
1765	1771
1766	1772	'imagemaxsize' => 'Limit images on image description pages to: ',
1767		~~-'thumbsize' => 'Thumbnail size :',~~
	1773	+'thumbsize' => 'Thumbnail size: ',
1768	1774	'showbigimage' => 'Download high resolution version ($1x$2, $3 KB)',
1769	1775
1770	1776	'newimages' => 'Gallery of new files',
—	—	@@ -2140,6 +2146,7 @@
2141	2147	'recreate' => 'Recreate',
2142	2148	'tooltip-recreate' => '',
2143	2149
	2150	+'unit-pixel' => 'px',
2144	2151
2145	2152	);
2146	2153
Index: trunk/phase3/languages/LanguagePt.php
—	—	@@ -849,7 +849,7 @@
850	850	"ipusubmit" => "Desbloquear este endereço",
851	851	"ipusuccess" => "Endereço de IP \"$1\" foi desbloqueado",
852	852	"ipblocklist" => "Lista de IP's bloqueados",
853		~~-"blocklistline" => "$1, $2 bloqueado $3",~~
	853	+"blocklistline" => "$1, $2 bloqueado $3 ($4)",
854	854	"blocklink" => "block",
855	855	"unblocklink" => "unblock",
856	856	"contribslink" => "contribs",
Index: trunk/phase3/languages/LanguageAf.php
—	—	@@ -735,7 +735,7 @@
736	736	"ipusubmit" => "Maak hierdie adres oop",
737	737	"ipusuccess" => "IP-adres \"$1\" is oopgemaak",
738	738	"ipblocklist" => "Lys van geblokkeerde IP-adresse",
739		~~-"blocklistline" => "$1, $2 het $3 geblok",~~
	739	+'blocklistline' => '$1, $2 het $3 geblok ($4)',
740	740	"blocklink" => "blok",
741	741	"unblocklink" => "maak oop",
742	742	"contribslink" => "bydraes",
Index: trunk/phase3/languages/LanguageIa.php
—	—	@@ -822,7 +822,7 @@
823	823	"ipusubmit" => "Disbloca iste adresse",
824	824	"ipusuccess" => "Adresse IP \"$1\" disblocate",
825	825	"ipblocklist" => "Lista de adresses IP blocate",
826		~~-"blocklistline" => "$1, $2 ha blockate $3",~~
	826	+"blocklistline" => "$1, $2 ha blockate $3 ($4)",
827	827	"blocklink" => "blocar",
828	828	"unblocklink" => "disblocar",
829	829	"contribslink" => "contributiones",
Index: trunk/phase3/languages/LanguageId.php
—	—	@@ -926,7 +926,7 @@
927	927	"ipusubmit" => "Hilangkan blokir terhadap alamat ini",
928	928	"ipusuccess" => "Blokir terhadap alamat IP atau pengguna \"$1\" telah dihilangkan",
929	929	"ipblocklist" => "Daftar Alamat IP dan Pengguna yang Diblokir",
930		~~-"blocklistline" => "$1, $2 memblokir $3",~~
	930	+"blocklistline" => "$1, $2 memblokir $3 ($4)",
931	931	"blocklink" => "blokir",
932	932	"unblocklink" => "hilangkan blokir",
933	933	"contribslink" => "sumbangan",
Index: trunk/phase3/languages/LanguageEo.php
—	—	@@ -873,7 +873,7 @@
874	874	'ipusubmit' => 'Malforbaru la adreson',
875	875	'ipusuccess' => '"$1" estas malforbarita',
876	876	'ipblocklist' => 'Listo de forbaritaj IP-adresoj/nomoj',
877		~~-'blocklistline' => 'Je $1, $2 forbaris $3',~~
	877	+'blocklistline' => 'Je $1, $2 forbaris $3 ($4)',
878	878	'blocklink' => 'forbaru',
879	879	'unblocklink' => 'malforbaru',
880	880	'contribslink' => 'kontribuoj',
Index: trunk/phase3/languages/LanguageMk.php
—	—	@@ -738,8 +738,10 @@
739	739	"linkstoimage" => "Следните страници покажуваат кон оваа слика:",
740	740	"nolinkstoimage" => "Нема страници кои покажуваат кон оваа слика.",
741	741	'sharedupload' => 'Оваа датотека е заедничка и може да се користи од други проекти.',
742		~~- 'shareduploadwiki' => 'Ве молиме видете го [описот на датотеката $1] за понатамошна информација.',~~
743		~~- 'noimage' => 'Не постои датотека со тоа име, можете [$1 да го подигнете]',~~
	742	+ 'shareduploadwiki' => 'Ве молиме видете го $1 за понатамошна информација.',
	743	+ 'shareduploadwiki-linktext' => 'описот на датотеката',
	744	+ 'noimage' => 'Не постои датотека со тоа име, можете $1',
	745	+ 'noimage-linktext' => 'да го подигнете',
744	746	'uploadnewversion' => '[$1 Подигни нова верзија на оваа датотека]',
745	747
746	748	"statistics" => "Статистики",
—	—	@@ -960,7 +962,9 @@
961	963	'ipusubmit' => 'Деблокирај ја оваа адреса',
962	964	'ipusuccess' => "\"[[$1]]\" деблокиран",
963	965	'ipblocklist' => 'Листа на блокирани IP адреси и кориснички имиња',
964		~~- 'blocklistline' => "$1, $2 го блокираше $3 (истекува на $4)",~~
	966	+ 'blocklistline' => "$1, $2 го блокираше $3 ($4)",
	967	+ 'infiniteblock' => 'истекува на infinite', //fixme
	968	+ 'expiringblock' => 'истекува на $1',
965	969	'blocklink' => 'блокирај',
966	970	'unblocklink' => 'деблокирај',
967	971	'contribslink' => 'придонеси',
Index: trunk/phase3/languages/LanguageEs.php
—	—	@@ -872,7 +872,7 @@
873	873	"ipusubmit" => "Desbloquea esta dirección",
874	874	"ipusuccess" => "Dirección IP \"$1\" desbloqueada",
875	875	"ipblocklist" => "Lista de direcciones IP bloqueadas",
876		~~-"blocklistline" => "$1, $2 bloquea $3",~~
	876	+"blocklistline" => "$1, $2 bloquea $3 ($4)",
877	877	"blocklink" => "bloquear",
878	878	"unblocklink" => "desbloquear",
879	879	"contribslink" => "contribuciones",
Index: trunk/phase3/languages/LanguageEt.php
—	—	@@ -961,7 +961,7 @@
962	962	"ipusubmit" => "Unblock this address",
963	963	"ipusuccess" => "IP address \"$1\" unblocked",
964	964	"ipblocklist" => "Blokeeritud IP-aadresside loend",
965		~~-"blocklistline" => "$1, $2 blocked $3",~~
	965	+"blocklistline" => "$1, $2 blocked $3 ($4)",
966	966	"blocklink" => "blokeeri",
967	967	"unblocklink" => "unblock",
968	968	"contribslink" => "contribs",
Index: trunk/phase3/languages/LanguageIs.php
—	—	@@ -177,7 +177,9 @@
178	178
179	179	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.",
180	180	'blocklink' => "banna",
181		~~-'blocklistline' => "$1, $2 bannaði $3 (rennur út $4)",~~
	181	+'blocklistline' => "$1, $2 bannaði $3 ($4)",
	182	+'infiniteblock' => 'rennur út infinite', //fixme
	183	+'expiringblock' => 'rennur út $1',
182	184	'blocklogpage' => "Bönnunarskrá",
183	185	'blocklogtext' => "This is a log of user blocking and unblocking actions. Automatically
184	186	blocked IP addresses are not be listed. See the [[Special:Ipblocklist\|IP block list]] for
Index: trunk/phase3/languages/LanguageIt.php
—	—	@@ -705,7 +705,7 @@
706	706	"ipusubmit" => "Sblocca questo indirizzo IP",
707	707	"ipusuccess" => "Indirizzo IP \"$1\" sbloccato",
708	708	"ipblocklist" => "Lista degli indirizzi IP bloccati",
709		~~-"blocklistline" => "$1, $2 ha bloccato $3",~~
	709	+"blocklistline" => "$1, $2 ha bloccato $3 ($4)",
710	710	"blocklink" => "blocca",
711	711	"unblocklink" => "sblocca",
712	712	"contribslink" => "contributi",
Index: trunk/phase3/languages/LanguageUk.php
—	—	@@ -830,7 +830,7 @@
831	831	"ipusubmit" => "Розблокувати цю адресу",
832	832	"ipusuccess" => "\"$1\" розблоковано",
833	833	"ipblocklist" => "Список заблокованих IP-адрес й користувачів",
834		~~-"blocklistline" => "$1, $2 заблоковано $3",~~
	834	+"blocklistline" => "$1, $2 заблоковано $3 ($4)",
835	835	"blocklink" => "заблокувати",
836	836	"unblocklink" => "розблокувати",
837	837	"contribslink" => "вклад",
Index: trunk/phase3/languages/LanguageMs.php
—	—	@@ -840,7 +840,7 @@
841	841	"ipusubmit" => "Lepaskan semula alamat ini dari diblok", #"Unblock this address",
842	842	"ipusuccess" => "Alamat IP atau pengguna \"$1\" dilepaskan dari diblok", #"IP address or user \"$1\" unblocked",
843	843	"ipblocklist" => "Senarai alamat IP dan pengguna yang diblok", #"List of blocked IP addresses and users",
844		~~-"blocklistline" => "$1, $2 blok $3", #"$1, $2 blocked $3",~~
	844	+"blocklistline" => "$1, $2 blok $3 ($4)",
845	845	"blocklink" => "blok", #"block",
846	846	"unblocklink" => "lepaskan dari diblok", #"unblock",
847	847	"contribslink" => "contribs",
Index: trunk/phase3/languages/LanguageFa.php
—	—	@@ -980,7 +980,7 @@
981	981	"ipusubmit" => "باز کردن این نشانی",
982	982	"ipusuccess" => "«$1» باز شد",
983	983	"ipblocklist" => "فهرست نشانی‌های IP و نام‌های کاربری بسته‌شده",
984		~~-"blocklistline" => "$1، $2 بست $3 را",~~
	984	+"blocklistline" => "$1، $2 بست $3 را ($4)",
985	985	"blocklink" => "بسته شود",
986	986	"unblocklink" => "باز شود",
987	987	"contribslink" => "مشارکت‌ها",
Index: trunk/phase3/languages/LanguageBg.php
—	—	@@ -1106,7 +1106,9 @@
1107	1107	'ipusubmit' => 'Отблокиране на адреса',
1108	1108	'ipusuccess' => "\"$1\" бе отблокиран",
1109	1109	'ipblocklist' => 'Списък на блокирани IP-адреси и потребители',
1110		~~-'blocklistline' => "$1, $2 е блокирал $3 (изтича на $4)",~~
	1110	+'blocklistline' => "$1, $2 е блокирал $3 ($4)",
	1111	+'infiniteblock' => 'изтича на infinite', //fixme
	1112	+'expiringblock' => 'изтича на $1',
1111	1113	'blocklink' => 'блокиране',
1112	1114	'unblocklink' => 'отблокиране',
1113	1115	'contribslink' => 'приноси',
Index: trunk/phase3/languages/LanguageJa.php
—	—	@@ -844,7 +844,7 @@
845	845	"ipusubmit" => "Unblock this address",
846	846	"ipusuccess" => "IP address \"$1\" unblocked",
847	847	"ipblocklist" => "List of blocked IP addresses",
848		~~-"blocklistline" => "$1, $2 blocked $3",~~
	848	+"blocklistline" => "$1, $2 blocked $3 ($4)",
849	849	"blocklink" => "block",
850	850	"unblocklink" => "unblock",
851	851	"contribslink" => "contribs",
Index: trunk/phase3/languages/LanguageZh_tw.php
—	—	@@ -852,7 +852,7 @@
853	853	"ipusubmit" => "解除禁封",
854	854	"ipusuccess" => "網址”$1”已經被解除禁封",
855	855	"ipblocklist" => "被封網址列表",
856		~~-"blocklistline" => "$1，$2禁封$3",~~
	856	+"blocklistline" => "$1，$2禁封$3 ($4)",
857	857	"blocklink" => "禁封",
858	858	"unblocklink" => "解除禁封",
859	859	"contribslink" => "貢獻",
Index: trunk/phase3/languages/LanguageFi.php
—	—	@@ -64,7 +64,7 @@
65	65
66	66	# User preference toggles
67	67	'tog-underline' => 'Alleviivaa linkit',
68		~~-'tog-highlightbroken' => 'Näytä linkit puuttuville sivuille <a href="" class="new">näin </a> (vaihtoehtoisesti näin: <a href="" class="internal">?</a>).',~~
	68	+'tog-highlightbroken' => 'Näytä linkit puuttuville sivuille <a href="" class="new">näin</a> (vaihtoehtoisesti näin: <a href="" class="internal">?</a>).',
69	69	'tog-justify' => 'Tasaa kappaleet',
70	70	'tog-hideminor' => 'Piilota pienet muutokset tuoreet muutokset -listasta',
71	71	'tog-usenewrc' => 'Kehittynyt tuoreet muutokset -listaus (JavaScript)',
—	—	@@ -94,6 +94,8 @@
95	95	'underline-never' => 'Ei koskaan',
96	96	'underline-default' => 'Selaimen oletustapa',
97	97
	98	+'skinpreview' => '(Esikatsele...)',
	99	+
98	100	# dates
99	101	'sunday' => 'sunnuntai',
100	102	'monday' => 'maanantai',
—	—	@@ -473,7 +475,7 @@
474	476	'next' => 'seur.',
475	477	'last' => 'edell.',
476	478	'orig' => 'alkup.',
477		~~-'histlegend' => 'Merkinnät: (nyk.) = eroavaisuudet nykyiseen versioon, (edell.) = eroavaisuudet edelliseen versioon, <b>p</b> = pieni muutos', // TODO NO WIKIMARKUP~~
	479	+'histlegend' => 'Merkinnät: (nyk.) = eroavaisuudet nykyiseen versioon, (edell.) = eroavaisuudet edelliseen versioon, <span class="minor">p</span> = pieni muutos', // TODO NO WIKIMARKUP
478	480	'history_copyright' => '-',
479	481	'histfirst' => 'Ensimmäiset',
480	482	'histlast' => 'Viimeisimmät',
—	—	@@ -553,7 +555,7 @@
554	556	'contextlines' => 'Rivien määrä tulosta kohti',
555	557	'contextchars' => 'Sisällön merkkien määrä riviä kohden',
556	558	'stubthreshold' => 'Tynkäsivun osoituskynnys',
557		~~-'recentchangescount' => 'Otsikoiden määrä viimeisimmissä muutoksissa',~~
	559	+'recentchangescount' => 'Sivujen määrä viimeisimmissä muutoksissa',
558	560	'savedprefs' => 'Asetuksesi tallennettiin.',
559	561	'timezonelegend' => 'Aikavyöhyke',
560	562	'timezonetext' => 'Paikallisen ajan ja palvelimen ajan (UTC) välinen aikaero tunteina.',
—	—	@@ -570,10 +572,10 @@
571	573	#
572	574
573	575	# switching pan
574		~~-'groups-lookup-group' => 'Manage group rights',~~
	576	+/*'groups-lookup-group' => 'Manage group rights',
575	577	'groups-group-edit' => 'Existing groups: ',
576	578	'editgroup' => 'Edit Group',
577		~~-'addgroup' => 'Add Group',~~
	579	+'addgroup' => 'Add Group',*/
578	580
579	581	'userrights-lookup-user' => 'Käyttöoikeuksien hallinta',
580	582	'userrights-user-editname' => 'Käyttäjätunnus: ',
—	—	@@ -662,15 +664,15 @@
663	665	'illegalfilename' => 'Tiedoston nimessä \'\'\'$1\'\'\' on merkkejä, joita ei sallita sivujen nimissä. Vaihda tiedoston nimeä, ja yritä tallentamista uudelleen.',
664	666	'badfilename' => 'Tiedoston nimi vaihdettiin: $1.',
665	667	'badfiletype' => '".$1" ei ole suositeltava tiedostomuoto.',
666		~~-'largefile' => 'Tiedostojen ei tulisi olla yli 100 kilotavun kokoisia.',~~
667		~~-'emptyfile' => 'Tiedosto, jota yritit tallentaa näyttäisi olevan tyhjä. Tarkista, että kirjoitit polun ja nimen oikein.',~~
668		~~-'fileexists' => 'Tämän niminen tiedosto on jo olemassa. Tarkista $1, ellet ole varma, että haluat muuttaa sitä.',~~
	668	+'largefile' => 'Tiedostojen ei tulisi olla yli $1 kilotavun kokoisia. Tiedoston, jonka yritit tallentaa, koko on $2.',
	669	+'emptyfile' => 'Tiedosto, jonka yritit tallentaa näyttää olevan tyhjä. Tarkista, että kirjoitit polun ja nimen oikein ja että se ei ole liian suuri kohdepalvelimelle.',
	670	+'fileexists' => 'Samanniminen tiedosto on jo olemassa. Katso tiedoston sivu $1, jos et ole varma, haluatko muuttaa sitä.',
669	671	'successfulupload' => 'Tallennus onnistui',
670	672	'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>\'\'\'',
671	673	'uploadwarning' => 'Tallennusvaroitus',
672	674	'savefile' => 'Tallenna',
673	675	'uploadedimage' => 'tallensi tiedoston [[$1]]',
674		~~-'uploaddisabled' => 'Tiedostojen lähettäminen on poissa käytöstä.',~~
	676	+'uploaddisabled' => 'Tiedostojen tallentaminen ei ole käytöstä.',
675	677	'uploadscripted' => 'Tämä tiedosto sisältää HTML-koodia tai skriptejä, jotka selain saattaa virheellisesti suorittaa.',
676	678	'uploadcorrupt' => 'Tiedosto on vioittunut tai sillä on väärä tiedostopääte. Tarkista tiedosto ja lähetä se uudelleen.',
677	679	'uploadvirus' => 'Tiedosto sisältää viruksen. Tarkemmat tiedot: $1',
—	—	@@ -699,8 +701,10 @@
700	702	'linkstoimage' => 'Seuraavilta sivuilta on linkki tähän tiedostoon:',
701	703	'nolinkstoimage' => 'Tähän tiedostoon ei ole linkkejä miltään sivulta.',
702	704	'sharedupload' => 'Tämä tiedosto on jaettu ja muut projektit saattavat käyttää sitä.',
703		~~-'shareduploadwiki' => 'Katso [$1 kuvaussivulta] lisätietoja.',~~
704		~~-'noimage' => 'Tämän nimistä tiedostoa ei ole olemassa. Voit [$1 tallentaa tiedoston] {{GRAMMAR:genitive\|{{SITENAME}}}}',~~
	705	+'shareduploadwiki' => 'Katso $1 lisätietoja.',
	706	+'shareduploadwiki-linktext' => 'kuvaussivulta',
	707	+'noimage' => 'Tämän nimistä tiedostoa ei ole olemassa. Voit $1 {{GRAMMAR:genitive\|{{SITENAME}}}}',
	708	+'noimage-linktext' => 'tallentaa tiedoston',
705	709	'uploadnewversion' => '[$1 Tallenna] uusi versio tästä tiedostosta',
706	710
707	711	# Statistics
—	—	@@ -801,7 +805,7 @@
802	806	'emailpage' => 'Lähetä sähköpostia käyttäjälle',
803	807	'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.',
804	808	'usermailererror' => 'Postitus palautti virheen: ',
805		~~-'defemailsubject' => '{{SITENAME}} e-mail',~~
	809	+'defemailsubject' => '{{SITENAME}}-sähköposti',
806	810	'noemailtitle' => 'Ei sähköpostiosoitetta',
807	811	'noemailtext' => 'Tämä käyttäjä ei ole määritellyt kelpoa sähköpostiosoitetta tai ei halua postia muilta käyttäjiltä.',
808	812	'emailfrom' => 'Lähettäjä',
—	—	@@ -955,7 +959,7 @@
956	960	#
957	961	'whatlinkshere' => 'Tänne viittaavat sivut',
958	962	'notargettitle' => 'Ei kohdetta',
959		~~-'notargettext' => 'Et ole määritellyt kohdesivua tai -käyttäjää johon toiminto kohdustuu.',~~
	963	+'notargettext' => 'Et ole määritellyt kohdesivua tai -käyttäjää johon toiminto kohdistuu.',
960	964	'linklistsub' => 'Lista linkeistä',
961	965	'linkshere' => 'Seuraavilta sivuilta on linkki tälle sivulle:',
962	966	'nolinkshere' => 'Tänne ei ole linkkejä.',
—	—	@@ -969,25 +973,27 @@
970	974	'ipadressorusername' => 'IP-osoite tai käyttäjätunnus',
971	975	'ipbexpiry' => 'Umpeutuu',
972	976	'ipbreason' => 'Syy',
973		~~-'ipbsubmit' => 'Estä tämä osoite',~~
	977	+'ipbsubmit' => 'Estä',
974	978	'ipbother' => 'Vapaamuotoinen kesto',
975	979	'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',
976	980	'ipbotheroption' => 'Muu kesto',
977	981	'badipaddress' => 'IP-osoite on väärin muotoiltu.',
978	982	'blockipsuccesssub' => 'Esto onnistui',
979	983	'blockipsuccesstext' => 'Käyttäjä tai IP-osoite \'\'\'$1\'\'\' on estetty.<br />Nykyiset estot löytyvät [[Special:Ipblocklist\|estolistalta]].',
980		~~-'unblockip' => 'Poista IP-osoitteen muokkausesto',~~
981		~~-'unblockiptext' => 'Käytä alla olevaa lomaketta poistaaksesi kirjoitusesto aikaisemmin estetyltä IP-osoitteelta.',~~
982		~~-'ipusubmit' => 'Poista tämän osoitteen esto',~~
983		~~-'ipusuccess' => 'IP-osoitteen \'\'\'$1\'\'\' esto poistettu',~~
	984	+'unblockip' => 'Muokkauseston poisto',
	985	+'unblockiptext' => 'Tällä lomakkeella voit poistaa käyttäjän tai IP-osoitteen muokkauseston.',
	986	+'ipusubmit' => 'Poista esto',
	987	+'ipusuccess' => 'IP-osoitteen tai käyttäjän <b>$1<b> esto poistettu', // TODO NOWIKIMARKUP
984	988	'ipblocklist' => 'Lista estetyistä IP-osoitteista',
985		~~-'blocklistline' => '$1 — $2 on estänyt käyttäjän $3 (vanhenee $4)',~~
	989	+'blocklistline' => '$1 — $2 on estänyt käyttäjän $3 ($4)',
	990	+'infiniteblock' => 'ikuisesti',
	991	+'expiringblock' => 'vanhenee $1',
986	992	'blocklink' => 'esto',
987	993	'unblocklink' => 'poista esto',
988	994	'contribslink' => 'muokkaukset',
989	995	'autoblocker' => 'Olet automaattisesti estetty, koska jaat IP-osoitteen käyttäjän $1 kanssa. Eston syy: $2.', // TODO: IS WIKIMARKUP?
990	996	'blocklogpage' => 'Estoloki',
991		~~-'blocklogentry' => 'esti käyttäjän $1. Vanhenee: $2',~~
	997	+'blocklogentry' => 'esti käyttäjän tai IP-osoitteen $1. Eston kesto: $2',
992	998	'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.',
993	999	'unblocklogentry' => 'poisti käyttäjältä $1 muokkauseston',
994	1000	'range_block_disabled'=> 'Ylläpitäjän oikeis luoda alue-estoja ei ole käytöstä.',
—	—	@@ -1249,8 +1255,8 @@
1250	1256	'previousdiff' => '← Edellinen muutos',
1251	1257	'nextdiff' => 'Seuraava muutos →',
1252	1258
1253		~~-'imagemaxsize' => 'Rajoita kuvien koko kuvien kuvaussivuilla arvoon: ',~~
1254		~~-'thumbsize' => 'Pikkukuvien koko : ',~~
	1259	+'imagemaxsize' => 'Rajoita kuvien koko kuvien kuvaussivuilla arvoon ',
	1260	+'thumbsize' => 'Pikkukuvien koko: ',
1255	1261	'showbigimage' => 'Lataa korkeatarkkuuksinen versio ($1×$2, $3 KiB)',
1256	1262
1257	1263	'newimages' => 'Uudet kuvat',
—	—	@@ -1258,12 +1264,12 @@
1259	1265
1260	1266	# labels for User: and Title: on Special:Log pages
1261	1267	'specialloguserlabel' => 'Käyttäjä: ',
1262		~~-'speciallogtitlelabel'=> 'Otsikko: ',~~
	1268	+'speciallogtitlelabel'=> 'Kohde: ',
1263	1269
1264	1270	'passwordtooshort' => 'Salasanasi on liian lyhyt. Salasanan pitää olla vähintään $1 merkkiä pitkä.',
1265	1271
1266	1272	# Media Warning
1267		~~-'mediawarning' => '\'\'\'Varoitus\'\'\': Tämä tiedosto saattaa sisältää This file may contain vahingollista koodia, ja suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.~~
	1273	+'mediawarning' => '\'\'\'Varoitus\'\'\': Tämä tiedosto saattaa sisältää vahingollista koodia, ja suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.
1268	1274	<hr>',
1269	1275
1270	1276	'fileinfo' => '$1 KiB, MIME-tyyppi: <code>$2</code>',
—	—	@@ -1302,6 +1308,8 @@
1303	1309	'searchfulltext' => 'Etsi koko tekstiä',
1304	1310	'createarticle' => 'Luo sivu',
1305	1311
	1312	+'unit-pixel' => ' px',
	1313	+
1306	1314	);
1307	1315
1308	1316
—	—	@@ -1446,6 +1454,7 @@
1447	1455	}
1448	1456	return $word;
1449	1457	}
	1458	+
1450	1459	}
1451	1460
1452	1461	?>
Index: trunk/phase3/languages/LanguageFr.php
—	—	@@ -1011,7 +1011,7 @@
1012	1012	'ipusubmit' => 'Débloquer cette adresse',
1013	1013	'ipusuccess' => 'Adresse IP « $1 » débloquée',
1014	1014	'ipblocklist' => 'Liste des adresses IP bloquées',
1015		~~-'blocklistline' => '$1, $2 a bloqué $3',~~
	1015	+'blocklistline' => '$1, $2 a bloqué $3 ($4)',
1016	1016	'blocklink' => 'bloquer',
1017	1017	'unblocklink' => 'débloquer',
1018	1018	'contribslink' => 'contribs',
Index: trunk/phase3/languages/LanguageNl.php
—	—	@@ -778,7 +778,7 @@
779	779	"ipusubmit" => "De-blokkeer deze gebruiker.",
780	780	"ipusuccess" => "\"$1\" is gedeblokkeerd.",
781	781	"ipblocklist" => "Lijst van geblokkeerde gebruikers en IP-adressen.",
782		~~-"blocklistline" => "Op $1 blokkeerde $2: $3",~~
	782	+"blocklistline" => "Op $1 blokkeerde $2: $3 ($4)",
783	783	"blocklink" => "blokkeer",
784	784	"unblocklink" => "de-blokkeer",
785	785	"contribslink" => "bijdragen",
Index: trunk/phase3/languages/LanguageNn.php
—	—	@@ -790,8 +790,10 @@
791	791	'linkstoimage' => 'Dei følgjande sidene har lenkjer til denne fila:',
792	792	'nolinkstoimage' => 'Det finst ikkje noka side med lenkje til denne fila.',
793	793	'sharedupload' => 'Denne fila er ei delt opplasting og kan brukast av andre prosjekt.',
794		~~-'shareduploadwiki' => 'Sjå [$1 filskildringssida] for meir informasjon.',~~
795		~~-'noimage' => 'Det finst ikkje noka fil med dette namnet, men du kan [$1 laste ho opp]',~~
	794	+'shareduploadwiki' => 'Sjå $1 for meir informasjon.',
	795	+'shareduploadwiki-linktext' => 'filskildringssida',
	796	+'noimage' => 'Det finst ikkje noka fil med dette namnet, men du kan $1',
	797	+'noimage-linktext' => 'laste ho opp',
796	798	'uploadnewversion' => '[$1 Last opp ny versjon av denne fila]',
797	799
798	800	# Statistics
—	—	@@ -1074,7 +1076,9 @@
1075	1077	'ipusubmit' => 'Opphev blokkering',
1076	1078	'ipusuccess' => '«[[$1]]» har fått oppheva blokkeringa',
1077	1079	'ipblocklist' => 'Blokkerte IP-adresser og brukarnamn',
1078		~~-'blocklistline' => '$1, $2 blokkerte $3 (opphørstid $4)',~~
	1080	+'blocklistline' => '$1, $2 blokkerte $3 ($4)',
	1081	+'infiniteblock' => 'opphørstid infinite', //fixme
	1082	+'expiringblock' => 'opphørstid $1',
1079	1083	'blocklink' => 'blokker',
1080	1084	'unblocklink' => 'opphev blokkering',
1081	1085	'contribslink' => 'bidrag',
Index: trunk/phase3/languages/LanguageNo.php
—	—	@@ -921,7 +921,7 @@
922	922	"ipusubmit" => "Opphev blokkeringen av denne adresse",
923	923	"ipusuccess" => "IP-adressen \"$1\" har fått opphevet blokkeringen",
924	924	"ipblocklist" => "Liste over blokkerte IP-adresser",
925		~~-"blocklistline" => "$1, $2 blokkerte $3",~~
	925	+"blocklistline" => "$1, $2 blokkerte $3 ($4)",
926	926	"blocklink" => "blokker",
927	927	"unblocklink" => "opphev blokkering",
928	928	"contribslink" => "bidrag",
Index: trunk/phase3/languages/LanguageFy.php
—	—	@@ -902,7 +902,7 @@
903	903	"ipusubmit" => "Lit dizze brûker der wer yn",
904	904	"ipusuccess" => "Brûker \"$1\" ynlitten",
905	905	"ipblocklist" => "List fan útsletten Ynternet-adressen en brûkersnammen",
906		~~-"blocklistline" => "$\"3\", troch \"$2\" op $1",~~
	906	+"blocklistline" => '"$3", troch "$2" op $1 ($4)',
907	907	"blocklink" => "slut út",
908	908	"unblocklink" => "lit yn",
909	909	"contribslink" => "bydragen",
Index: trunk/phase3/languages/LanguageRo.php
—	—	@@ -397,7 +397,7 @@
398	398	Include un motiv specific mai jos (de exemplu citează paginile care
399	399	au fost vandalizate de acest utilizator).",
400	400	'blocklink' => "blochează",
401		~~-'blocklistline' => "$1, $2 a blocat $3",~~
	401	+'blocklistline' => "$1, $2 a blocat $3 ($4)",
402	402	'blocklogentry' => "blocat \"$1\"",
403	403	'blocklogpage' => "Jurnal_blocări",
404	404	'blocklogtext' => "Acesta este un jurnal al acţiunilor de blocare şi deblocare.
Index: trunk/phase3/languages/LanguageCa.php
—	—	@@ -778,7 +778,7 @@
779	779	"ipusubmit" => "Desbloqueja aquesta direcció",
780	780	"ipusuccess" => "Direcció IP \"$1\" desbloquejada",
781	781	"ipblocklist" => "Llistat de direccions IP bloquejades",
782		~~-"blocklistline" => "$1, $2 bloqueja $3",~~
	782	+"blocklistline" => "$1, $2 bloqueja $3 ($4)",
783	783	"blocklink" => "bloqueja",
784	784	"unblocklink" => "desbloqueja",
785	785	"contribslink" => "contribucions",
Index: trunk/phase3/languages/LanguageNds.php
—	—	@@ -996,7 +996,7 @@
997	997	'ipusubmit' => 'Disse Adress freegeven',
998	998	'ipusuccess' => 'IP-Adress „$1“ is freegeven',
999	999	'ipblocklist' => 'List vun blockte IP-Adressen',
1000		~~-'blocklistline' => '$1, $2 hett $3 blockt',~~
	1000	+'blocklistline' => '$1, $2 hett $3 blockt ($4)',
1001	1001	'blocklink' => 'blocken',
1002	1002	'unblocklink' => 'freegeven',
1003	1003	'contribslink' => 'Bidreeg',
Index: trunk/phase3/languages/LanguageRu.php
—	—	@@ -927,9 +927,11 @@
928	928	'linkstoimage' => 'Следующие страницы ссылаются на данный файл:',
929	929	'nolinkstoimage' => 'Нет страниц, ссылающихся на данный файл.',
930	930	'sharedupload' => 'Этот файл взят из [[Commons:Заглавная_страница\|WikiCommons]], репозитория изображений и других свободно распространяемых файлов, общего для всех проектов [[Фонд Викимедиа\|Фонда Викимедиа]].',
931		~~-'shareduploadwiki' => 'Смотри [$1 страницу описания файла] для объяснений.',~~
	931	+'shareduploadwiki' => 'Смотри $1 для объяснений.',
	932	+'shareduploadwiki-linktext' => 'страницу описания файла',
932	933	'shareddescriptionfollows' => '-',
933		~~-'noimage' => "Файла с таким именем не существует. вы можете [$1 загрузить его].",~~
	934	+'noimage' => "Файла с таким именем не существует. вы можете $1.",
	935	+'noimage-linktext' => "загрузить его",
934	936	'uploadnewversion' => "[$1 Загрузить новую версию этого изображения]",
935	937
936	938	# Statistics
—	—	@@ -1252,7 +1254,9 @@
1253	1255	'ipusubmit' => 'Разблокировать этот адрес',
1254	1256	'ipusuccess' => "IP-адрес [[$1\|«$1»]] разблокирован",
1255	1257	'ipblocklist' => 'Список заблокированных IP-адресов и пользователей',
1256		~~-'blocklistline' => "$1, $2 заблокировал $3 (блокировка завершится $4)",~~
	1258	+'blocklistline' => "$1, $2 заблокировал $3 ($4)",
	1259	+'infiniteblock' => 'блокировка завершится infinite', //fixme
	1260	+'expiringblock' => 'блокировка завершится $1',
1257	1261	'blocklink' => 'заблокировать',
1258	1262	'unblocklink' => 'разблокировать',
1259	1263	'contribslink' => 'вклад',
Index: trunk/phase3/languages/LanguageGa.php
—	—	@@ -1109,7 +1109,9 @@
1110	1110	"ipusubmit" => "Bain an cosc den seoladh seo",
1111	1111	"ipusuccess" => "\"$1\" gan cosc",
1112	1112	"ipblocklist" => "Liosta seoltaí IP agus ainmneacha úsáideoirí coiscthe",
1113		~~-"blocklistline" => "$1, $2 a choisc $3 (am éaga $4)",~~
	1113	+"blocklistline" => "$1, $2 a choisc $3 ($4)",
	1114	+'infiniteblock' => 'am éaga infinite', //fixme
	1115	+'expiringblock' => 'am éaga $1',
1114	1116	"blocklink" => "Coisceadh",
1115	1117	"unblocklink" => "bain an cosc den",
1116	1118	"contribslink" => "dréachtaí",
Index: trunk/phase3/languages/LanguageOc.php
—	—	@@ -820,7 +820,7 @@
821	821	"ipusubmit" => "Débloquer cette adresse",
822	822	"ipusuccess" => "Adresse IP \"$1\" débloquée",
823	823	"ipblocklist" => "Liste des adresses IP bloquées",
824		~~-"blocklistline" => "$1, $2 a bloqué $3",~~
	824	+"blocklistline" => "$1, $2 a bloqué $3 ($4)",
825	825	"blocklink" => "bloquer",
826	826	"unblocklink" => "débloquer",
827	827	"contribslink" => "contribs",
Index: trunk/phase3/languages/LanguageCs.php
—	—	@@ -893,8 +893,10 @@
894	894	'linkstoimage' => 'Na soubor odkazují tyto stránky:',
895	895	'nolinkstoimage' => 'Na tento soubor neodkazuje žádná stránka.',
896	896	'sharedupload' => 'Tento soubor je sdílený a může být používán ostatními projekty.',
897		~~-'shareduploadwiki' => 'Více informací najdete na [$1 stránce s popisem].',~~
898		~~-'noimage' => 'Soubor s tímto jménem neexistuje, můžete ho [$1 načíst]',~~
	897	+'shareduploadwiki' => 'Více informací najdete na $1.',
	898	+'shareduploadwiki-linktext' => 'stránce s popisem',
	899	+'noimage' => 'Soubor s tímto jménem neexistuje, můžete ho $1',
	900	+'noimage-linxtext' => 'načíst',
899	901	'uploadnewversion' => '[$1 Načíst novou verzi tohoto souboru]',
900	902
901	903	# User list
—	—	@@ -1192,7 +1194,9 @@
1193	1195	'ipusubmit' => 'Odblokovat',
1194	1196	'ipusuccess' => 'IP adresa „[[$1]]“ byla úspěšně odblokována',
1195	1197	'ipblocklist' => 'Seznam blokovaných IP adres',
1196		~~-'blocklistline' => '$1 $2 zablokoval $3 (čas vypršení: $4)',~~
	1198	+'blocklistline' => '$1 $2 zablokoval $3 ($4)',
	1199	+'infiniteblock' => 'čas vypršení: infinite', //fixme
	1200	+'expiringblock' => 'čas vypršení: $1',
1197	1201	'blocklink' => 'zablokovat',
1198	1202	'unblocklink' => 'uvolnit',
1199	1203	'contribslink' => 'příspěvky',
Index: trunk/phase3/languages/LanguageSc.php
—	—	@@ -700,7 +700,7 @@
701	701	"ipusubmit" => "Sblocca questo indirizzo IP",
702	702	"ipusuccess" => "Indirizzo IP \"$1\" sbloccato",
703	703	"ipblocklist" => "Lista degli indirizzi IP bloccati",
704		~~-"blocklistline" => "$1, $2 ha bloccato $3",~~
	704	+"blocklistline" => "$1, $2 ha bloccato $3 ($4)",
705	705	"blocklink" => "blocca",
706	706	"unblocklink" => "sblocca",
707	707	"contribslink" => "contributi",
Index: trunk/phase3/languages/LanguageWa.php
—	—	@@ -1017,7 +1017,7 @@
1018	1018	"ipusubmit" => "Unblock this address", # co a fé
1019	1019	"ipusuccess" => "«%s» a stî disbloké",
1020	1020	"ipblocklist" => "Djivêye d' adresses IP et di nos d' uzeus ki sont blokés",
1021		~~-"blocklistline" => "$1, $2 a bloké $3",~~
	1021	+"blocklistline" => "$1, $2 a bloké $3 ($4)",
1022	1022	"blocklink" => "bloker",
1023	1023	"unblocklink" => "disbloker",
1024	1024	"contribslink" => "contribs", # co a fé
Index: trunk/phase3/languages/LanguageCy.php
—	—	@@ -881,7 +881,7 @@
882	882	"ipusubmit" => "Di-blociwch y cyfeiriad hwn",
883	883	"ipusuccess" => "Cyfeiriad IP \"$1\" wedi di-blocio",
884	884	"ipblocklist" => "Rhestr cyfeiriadau IP wedi blocio",
885		~~-"blocklistline" => "$1, $2 wedi blocio $3",~~
	885	+"blocklistline" => "$1, $2 wedi blocio $3 ($4)",
886	886	"blocklink" => "bloc",
887	887	"unblocklink" => "di-bloc",
888	888	"contribslink" => "cyfraniadau",
Index: trunk/phase3/languages/LanguageSk.php
—	—	@@ -903,8 +903,10 @@
904	904	\| [[Image:Commons without text.png\|20px\|Wikimedia Commons Logo]]
905	905	\|Toto je súbor z [[Commons:Main Page\|Wikimedia Commons]]. Prosíme pozrite si jeho '''[[Commons:Image:{{PAGENAME}}\|popisnú stránku ]]''' <!--on the Commons-->.
906	906	\|}",
907		~~-'shareduploadwiki' => "Ďalšie informácie pozrite na [stránka opisu súboru $1].",~~
908		~~-'noimage' => 'Súbor s takým menom neexistuje, môžete ho [$1 nahrať]',~~
	907	+'shareduploadwiki' => "Ďalšie informácie pozrite na $1.",
	908	+'shareduploadwiki-linktext' => "stránka opisu súboru",
	909	+'noimage' => 'Súbor s takým menom neexistuje, môžete ho $1',
	910	+'noimage-linktext' => 'nahrať',
909	911	'uploadnewversion' => '[$1 Nahrajte novú verziu tohto súboru.]',
910	912
911	913	# Statistics
—	—	@@ -1235,7 +1237,9 @@
1236	1238	'ipusubmit' => 'Odblokovať túto adresu',
1237	1239	'ipusuccess' => "\"[[$1]]\" odblokovaný/á",
1238	1240	'ipblocklist' => 'Zablokovaní/é redaktori/IP adresy',
1239		~~-'blocklistline' => "$1, $2 zablokoval $3 (ukončenie $4)",~~
	1241	+'blocklistline' => "$1, $2 zablokoval $3 ($4)",
	1242	+'infiniteblock' => 'ukončenie infinite', //fixme
	1243	+'expiringblock' => 'ukončenie $1',
1240	1244	'blocklink' => 'zablokovať',
1241	1245	'unblocklink' => 'odblokuj',
1242	1246	'contribslink' => 'príspevky',
Index: trunk/phase3/languages/LanguageSl.php
—	—	@@ -767,7 +767,7 @@
768	768	"ipusubmit" => "Poveži ta naslov",
769	769	"ipusuccess" => "IP naslov \"$1\" je povezan",
770	770	"ipblocklist" => "Seznam prekinjenih IP naslovov",
771		~~-"blocklistline" => "$1, $2 je prekinil $3",~~
	771	+"blocklistline" => "$1, $2 je prekinil $3 ($4)",
772	772	"blocklink" => "prekini",
773	773	"unblocklink" => "poveži",
774	774	"contribslink" => "prispevki",
Index: trunk/phase3/languages/LanguageKu.php
—	—	@@ -145,7 +145,7 @@
146	146	Fill in a specific reason below (for example, citing particular
147	147	pages that were vandalized).', */
148	148	'blocklink' => 'asteng bike',
149		~~-'blocklistline' => '$1, $2 $3 bloke kir',~~
	149	+'blocklistline' => '$1, $2 $3 bloke kir ($4)',
150	150	'blocklogentry' => '"$1" bloke kir',
151	151	#'blocklogpage' => 'Block_log',
152	152	/* 'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically
—	—	@@ -1038,7 +1038,6 @@
1039	1039
1040	1040	Tu dixwazî <b><a href="$1" class="new">vê gotarê binivîsî</a></b> ?',
1041	1041	#'nohistory' => 'There is no edit history for this page.',
1042		~~-#'noimage' => 'No file by this name exists, you can [$1 upload it]',~~
1043	1042	#'noimages' => 'Nothing to see.',
1044	1043	'nolinkshere' => 'Ji hîç rûpel ji vê re lînk tune.',
1045	1044	'nolinkstoimage' => 'Rûpeleke ku ji vê wêneyê re lînk dike tune.',
—	—	@@ -1357,7 +1356,6 @@
1358	1357	#'setstewardflag' => 'Set steward flag',
1359	1358	#'shareddescriptionfollows' => '-',
1360	1359	#'sharedupload' => 'This file is a shared upload and may be used by other projects.',
1361		~~-#'shareduploadwiki' => 'Please see the [$1 file description page] for further information.',~~
1362	1360	'shortpages' => 'Rûpelên kurt',
1363	1361	'show' => 'nîşan bide',
1364	1362	'showbigimage' => 'Versyona mezin bibîne an daxe ($1x$2, $3 KB).',
Index: trunk/phase3/languages/LanguageSq.php
—	—	@@ -909,7 +909,7 @@
910	910	"ipusubmit" => "Ç'blloko këtë adresë",
911	911	"ipusuccess" => "\"$1\" u ç'bllokua",
912	912	"ipblocklist" => "Lista e përdoruesve dhe e IP adresave të bllokuara",
913		~~-"blocklistline" => "$1, $2 bllokoi $3",~~
	913	+"blocklistline" => "$1, $2 bllokoi $3 ($4)",
914	914	"blocklink" => "blloko",
915	915	"unblocklink" => "ç'blloko",
916	916	"contribslink" => "kontribute",
Index: trunk/phase3/languages/LanguageDa.php
—	—	@@ -908,8 +908,10 @@
909	909	"linkstoimage" => "De følgende sider henviser til dette billede:",
910	910	"nolinkstoimage" => "Der er ingen sider der henviser til dette billede.",
911	911	'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>.',
912		~~-'shareduploadwiki' => 'Se venligst [$1 siden med billedbeskrivelsen] for yderligere information.',~~
913		~~-'noimage' => 'Der eksisterer ingen fil med dette navn, du kan [$1 lægge den op]',~~
	912	+'shareduploadwiki' => 'Se venligst $1 for yderligere information.',
	913	+'shareduploadwiki-linktext' => 'siden med billedbeskrivelsen',
	914	+'noimage' => 'Der eksisterer ingen fil med dette navn, du kan $1',
	915	+'noimage-linktext' => 'lægge den op',
914	916	'uploadnewversion' => '[$1 Læg en ny version af denne fil op]',
915	917
916	918	# Statistics
—	—	@@ -1249,7 +1251,9 @@
1250	1252	"ipusubmit" => "Ophæv blokeringen af denne adresse",
1251	1253	"ipusuccess" => "\"$1\" har fået ophævet blokeringen",
1252	1254	"ipblocklist" => "Liste over blokerede IP-adresser og brugernavne",
1253		~~-"blocklistline" => "$1, $2 blokerede $3 (udløber $4)",~~
	1255	+'blocklistline' => '$1, $2 blokerede $3 ($4)',
	1256	+'infiniteblock' => 'udløber infinite', //fixme
	1257	+'expiringblock' => 'udløber $1',
1254	1258	"blocklink" => "bloker",
1255	1259	"unblocklink" => "ophæv blokering",
1256	1260	"contribslink" => "bidrag",
Index: trunk/phase3/languages/LanguageSr.php
—	—	@@ -928,7 +928,7 @@
929	929	"ipusubmit" => "Отпусти ову адресу",
930	930	"ipusuccess" => "\"$1\" отпуштен",
931	931	"ipblocklist" => "Списак обузданих ИП адреса и корисника",
932		~~-"blocklistline" => "$1, $2 је обуздао $3",~~
	932	+"blocklistline" => "$1, $2 је обуздао $3 ($4)",
933	933	"blocklink" => "блокирај",
934	934	"unblocklink" => "деблокирај",
935	935	"contribslink" => "прилози",
Index: trunk/phase3/languages/LanguageDe.php
—	—	@@ -1005,7 +1005,7 @@
1006	1006	"ipusubmit" => "Diese Adresse freigeben",
1007	1007	"ipusuccess" => "IP-Adresse \"$1\" wurde freigegeben",
1008	1008	"ipblocklist" => "Liste blockierter IP-Adressen",
1009		~~-"blocklistline" => "$1, $2 blockierte $3",~~
	1009	+"blocklistline" => "$1, $2 blockierte $3 ($4)",
1010	1010	"blocklink" => "blockieren",
1011	1011	"unblocklink" => "freigeben",
1012	1012	"contribslink" => "Beiträge",
Index: trunk/phase3/languages/LanguageSv.php
—	—	@@ -828,7 +828,7 @@
829	829	"ipusuccess" => "Blockeringen för IP-adressen \"$1\" har tagits bort",
830	830
831	831	"ipblocklist" => "Lista över blockerade IP-adresser",
832		~~-"blocklistline" => "$1, $2 blockerade $3",~~
	832	+"blocklistline" => "$1, $2 blockerade $3 ($4)",
833	833	"blocklink" => "blockera",
834	834	"unblocklink" => "ta bort blockering",
835	835	"contribslink" => "bidrag",

Status & tagging log

01:58, 13 October 2010 😂 (talk | contribs) changed the status of r10460 [removed: new added: old]