r10461 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r10460‎ | r10461 | r10462 >
Date:18:32, 12 August 2005
Author:nikerabbit
Status:old
Tags:
Comment:
* (bug 1487) invalid html on empty list in banlist (hack)
* (bug 3017) Hotkey conflict for delete and show changes
* made pixel unit translateable and blocklistline now eats infiniteblock and expiringblock
* removed some obsolote messages
Modified paths:
  • /branches/REL1_5/phase3/RELEASE-NOTES (modified) (history)
  • /branches/REL1_5/phase3/includes/SpecialIpblocklist.php (modified) (history)
  • /branches/REL1_5/phase3/includes/SpecialPreferences.php (modified) (history)
  • /branches/REL1_5/phase3/languages/Language.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageAf.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageBg.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageCa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageCs.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageCsb.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageCy.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageDa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageDe.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageEo.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageEs.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageEt.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageFa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageFi.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageFr.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageFy.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageGa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageHe.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageHu.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageIa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageId.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageIs.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageIt.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageJa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageKu.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageLi.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageLt.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageMk.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageMs.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageNds.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageNl.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageNn.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageNo.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageOc.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguagePl.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguagePt.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageRo.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageRu.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageSc.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageSk.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageSl.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageSq.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageSr.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageSv.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageTa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageUk.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageWa.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageZh_cn.php (modified) (history)
  • /branches/REL1_5/phase3/languages/LanguageZh_tw.php (modified) (history)

Diff [purge]

Index: branches/REL1_5/phase3/languages/LanguageZh_tw.php
@@ -694,8 +694,6 @@
695695 "listusers" => "用戶列表",
696696 "specialpages" => "特殊頁面",
697697 "spheading" => "特殊頁面",
698 -"sysopspheading" => "管理員特殊頁面",
699 -"developerspheading" => "發展者特殊頁面",
700698 "protectpage" => "保護頁面",
701699 "recentchangeslinked" => "鏈出更改",
702700 "rclsub" => "(從 \"$1\"鏈出的頁面)",
@@ -854,7 +852,7 @@
855853 "ipusubmit" => "解除禁封",
856854 "ipusuccess" => "網址”$1”已經被解除禁封",
857855 "ipblocklist" => "被封網址列表",
858 -"blocklistline" => "$1,$2禁封$3",
 856+"blocklistline" => "$1,$2禁封$3 ($4)",
859857 "blocklink" => "禁封",
860858 "unblocklink" => "解除禁封",
861859 "contribslink" => "貢獻",
Index: branches/REL1_5/phase3/languages/LanguageOc.php
@@ -655,8 +655,6 @@
656656 "listusers" => "Liste des participants",
657657 "specialpages" => "Pages spéciales",
658658 "spheading" => "Pages spéciales",
659 -"sysopspheading" => "Pages spéciales à l'usage des administrateurs",
660 -"developerspheading" => "Pages spéciales à l'usage des développeurs",
661659 "protectpage" => "Protéger la page",
662660 "recentchangeslinked" => "Suivi des liens",
663661 "rclsub" => "(des pages liées à \"$1\")",
@@ -822,7 +820,7 @@
823821 "ipusubmit" => "Débloquer cette adresse",
824822 "ipusuccess" => "Adresse IP \"$1\" débloquée",
825823 "ipblocklist" => "Liste des adresses IP bloquées",
826 -"blocklistline" => "$1, $2 a bloqué $3",
 824+"blocklistline" => "$1, $2 a bloqué $3 ($4)",
827825 "blocklink" => "bloquer",
828826 "unblocklink" => "débloquer",
829827 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguageSc.php
@@ -565,8 +565,6 @@
566566 "listusers" => "Elenco degli Utenti",
567567 "specialpages" => "Pagine speciali",
568568 "spheading" => "Pagine speciali",
569 -"sysopspheading" => "Pagine speciali riservate ai sysop",
570 -"developerspheading" => " Pagine speciali riservate ai developer",
571569 "protectpage" => "Proteggi questa pagina ",
572570 "recentchangeslinked" => "Modifiche correlate",
573571 "rclsub" => "(alle pagine linkate da \"$1\")",
@@ -702,7 +700,7 @@
703701 "ipusubmit" => "Sblocca questo indirizzo IP",
704702 "ipusuccess" => "Indirizzo IP \"$1\" sbloccato",
705703 "ipblocklist" => "Lista degli indirizzi IP bloccati",
706 -"blocklistline" => "$1, $2 ha bloccato $3",
 704+"blocklistline" => "$1, $2 ha bloccato $3 ($4)",
707705 "blocklink" => "blocca",
708706 "unblocklink" => "sblocca",
709707 "contribslink" => "contributi",
Index: branches/REL1_5/phase3/languages/LanguageCs.php
@@ -960,9 +960,6 @@
961961 'specialpages' => 'Speciální stránky',
962962 'spheading' => 'Speciální stránky pro všechny uživatele',
963963 'restrictedpheading' => 'Speciální stránky s omezeným přístupem',
964 -/** obsoletes
965 -'sysopspheading' => 'Speciální stránky pro správce',
966 -'developerspheading' => 'Speciální stránky pro vývojáře',*/
967964 'protectpage' => 'Zamčení stránky',
968965 'recentchangeslinked' => 'Související změny',
969966 'rclsub' => '(stránek odkazovaných z „$1“)',
@@ -986,13 +983,6 @@
987984 'pubmedurl' => 'http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&list_uids=$1',
988985 'alphaindexline' => 'od $1 do $2',
989986 'version' => 'Verze',
990 -'asksqlpheading' => 'Úroveň pro přímé dotazy',
991 -'blockpheading' => 'Úroveň pro blokování',
992 -'createaccountpheading' => 'Úroveň pro tvorbu účtů',
993 -'deletepheading' => 'Úroveň pro mazání',
994 -'userrightspheading' => 'Úroveň pro přidělování uživatelských práv',
995 -'grouprightspheading' => 'Úroveň pro přidělování práv skupinám',
996 -'siteadminpheading' => 'Úroveň správce serveru',
997987 'log' => 'Protokolovací záznamy',
998988 'alllogstext' => 'Společné zobrazení knihy nahrávek, smazání, zamčení, zablokování a uživatelských práv.
999989 Zobrazení můžete zůžit výběrem typu záznamu, uživatelského jména nebo dotčené stránky.',
@@ -1202,7 +1192,9 @@
12031193 'ipusubmit' => 'Odblokovat',
12041194 'ipusuccess' => 'IP adresa „[[$1]]“ byla úspěšně odblokována',
12051195 'ipblocklist' => 'Seznam blokovaných IP adres',
1206 -'blocklistline' => '$1 $2 zablokoval $3 (čas vypršení: $4)',
 1196+'blocklistline' => '$1 $2 zablokoval $3 ($4)',
 1197+'infiniteblock' => 'čas vypršení: infinite', //fixme
 1198+'expiringblock' => 'čas vypršení: $1',
12071199 'blocklink' => 'zablokovat',
12081200 'unblocklink' => 'uvolnit',
12091201 'contribslink' => 'příspěvky',
Index: branches/REL1_5/phase3/languages/LanguageWa.php
@@ -818,8 +818,6 @@
819819 "listusers" => "Djivêye des uzeus",
820820 "specialpages" => "Pådjes sipeciåles",
821821 "spheading" => "Pådjes sipeciåles po tos ls uzeus",
822 -"sysopspheading" => "Pådjes sipeciåles po les manaedjeus",
823 -"developerspheading" => "Pådjes sipeciåles po les diswalpeus",
824822 "protectpage" => "Protedjî l' pådje",
825823 "recentchangeslinked" => "Candjmints aloyîs",
826824 "rclsub" => "(ezès pådjes ki «$1» a-st on loyén dzeu)",
@@ -1019,7 +1017,7 @@
10201018 "ipusubmit" => "Unblock this address", # co a fé
10211019 "ipusuccess" => "«%s» a stî disbloké",
10221020 "ipblocklist" => "Djivêye d' adresses IP et di nos d' uzeus ki sont blokés",
1023 -"blocklistline" => "$1, $2 a bloké $3",
 1021+"blocklistline" => "$1, $2 a bloké $3 ($4)",
10241022 "blocklink" => "bloker",
10251023 "unblocklink" => "disbloker",
10261024 "contribslink" => "contribs", # co a fé
Index: branches/REL1_5/phase3/languages/LanguageCy.php
@@ -712,8 +712,6 @@
713713 "listusers" => "Rhestr defnyddwyr",
714714 "specialpages" => "Erthyglau arbennig",
715715 "spheading" => "Erthyglau arbennig",
716 -"sysopspheading" => "Erthyglau arbennig am defnyddiad y sysop",
717 -"developerspheading" => "Erthyglau arbennig am defnyddiad y datblygydd",
718716 "protectpage" => "Sicrhau erthygl",
719717 "recentchangeslinked" => "Newidiadau perthnasol",
720718 "rclsub" => "(i erthyglau cysyllt oddiwrth \"$1\")",
@@ -883,7 +881,7 @@
884882 "ipusubmit" => "Di-blociwch y cyfeiriad hwn",
885883 "ipusuccess" => "Cyfeiriad IP \"$1\" wedi di-blocio",
886884 "ipblocklist" => "Rhestr cyfeiriadau IP wedi blocio",
887 -"blocklistline" => "$1, $2 wedi blocio $3",
 885+"blocklistline" => "$1, $2 wedi blocio $3 ($4)",
888886 "blocklink" => "bloc",
889887 "unblocklink" => "di-bloc",
890888 "contribslink" => "cyfraniadau",
Index: branches/REL1_5/phase3/languages/LanguageSk.php
@@ -968,13 +968,6 @@
969969 'specialpages' => 'Špeciálne stránky',
970970 'spheading' => 'Špeciálne stránky pre všetkých redaktorov',
971971 'restrictedpheading' => 'Obmedzené špeciálne stránky',
972 -'asksqlpheading' => 'úroveň sql príkazov',
973 -'blockpheading' => 'úroveň blokovania',
974 -'createaccountpheading' => 'úroveň vytvorenia účtu',
975 -'deletepheading' => 'úroveň vymazávania',
976 -'userrightspheading' => 'úroveň redaktorských práv',
977 -'grouprightspheading' => 'úroveň skupinových práv',
978 -'siteadminpheading' => 'úroveň administrátorov stránok',
979972 'protectpage' => 'Zamknúť stránku',
980973 'recentchangeslinked' => 'Súvisiace úpravy',
981974 'rclsub' => "(na články, na ktoré odkazuje \"$1\")",
@@ -1242,7 +1235,9 @@
12431236 'ipusubmit' => 'Odblokovať túto adresu',
12441237 'ipusuccess' => "\"[[$1]]\" odblokovaný/á",
12451238 'ipblocklist' => 'Zablokovaní/é redaktori/IP adresy',
1246 -'blocklistline' => "$1, $2 zablokoval $3 (ukončenie $4)",
 1239+'blocklistline' => "$1, $2 zablokoval $3 ($4)",
 1240+'infiniteblock' => 'ukončenie infinite', //fixme
 1241+'expiringblock' => 'ukončenie $1',
12471242 'blocklink' => 'zablokovať',
12481243 'unblocklink' => 'odblokuj',
12491244 'contribslink' => 'príspevky',
Index: branches/REL1_5/phase3/languages/LanguageSl.php
@@ -624,8 +624,6 @@
625625 "listusers" => "Seznam uporabnikov",
626626 "specialpages" => "Posebne strani",
627627 "spheading" => "Posebne strani za vse uporabnike",
628 -"sysopspheading" => "Posebne strani za vzdrževalce",
629 -"developerspheading" => "Posebne strani za razvijalce",
630628 "protectpage" => "Zaščiti stran",
631629 "recentchangeslinked" => "Povezane strani",
632630 "rclsub" => "(na strani povezano od \"$1\")",
@@ -769,7 +767,7 @@
770768 "ipusubmit" => "Poveži ta naslov",
771769 "ipusuccess" => "IP naslov \"$1\" je povezan",
772770 "ipblocklist" => "Seznam prekinjenih IP naslovov",
773 -"blocklistline" => "$1, $2 je prekinil $3",
 771+"blocklistline" => "$1, $2 je prekinil $3 ($4)",
774772 "blocklink" => "prekini",
775773 "unblocklink" => "poveži",
776774 "contribslink" => "prispevki",
Index: branches/REL1_5/phase3/languages/LanguageKu.php
@@ -145,13 +145,12 @@
146146 Fill in a specific reason below (for example, citing particular
147147 pages that were vandalized).', */
148148 'blocklink' => 'asteng bike',
149 -'blocklistline' => '$1, $2 $3 bloke kir',
 149+'blocklistline' => '$1, $2 $3 bloke kir ($4)',
150150 'blocklogentry' => '"$1" bloke kir',
151151 #'blocklogpage' => 'Block_log',
152152 /* 'blocklogtext' => 'This is a log of user blocking and unblocking actions. Automatically
153153 blocked IP addresses are not listed. See the [[Special:Ipblocklist|IP block list]] for
154154 the list of currently operational bans and blocks.', */
155 -#'blockpheading' => 'block level',
156155 'bold_sample' => 'Nivîsa qalind',
157156 'bold_tip' => 'Nivîsa qalind',
158157 'booksources' => 'Çavkaniyên pirtûkan',
@@ -267,7 +266,6 @@
268267 #'couldntremove' => 'Couldn\'t remove item \'$1\'...',
269268 'createaccount' => 'Hesabê nû çêke',
270269 'createaccountmail' => 'bi e-name',
271 -#'createaccountpheading' => 'createaccount level',
272270 #'createarticle' => 'Create article',
273271 #'created' => 'created',
274272 #'creditspage' => 'Page credits',
@@ -312,7 +310,6 @@
313311 'deleteimg' => 'jêbibe',
314312 #'deleteimgcompletely' => 'Delete all revisions',
315313 'deletepage' => 'Rûpelê jê bibe',
316 -#'deletepheading' => 'delete level',
317314 #'deletesub' => '(Deleting "$1")',
318315 'deletethispage' => 'Vê rûpelê jê bibe',
319316 #'deletionlog' => 'deletion log',
@@ -729,7 +726,6 @@
730727 #'group-loggedin-name' => 'User',
731728 #'group-steward-desc' => 'Full access',
732729 #'group-steward-name' => 'Steward',
733 -#'grouprightspheading' => 'grouprights level',
734730 #'groups' => 'User groups',
735731 #'groups-addgroup' => 'Add group',
736732 #'groups-already-exists' => 'A group of that name already exists',
@@ -1300,7 +1296,6 @@
13011297 #'renamegrouplogentry' => 'Renamed group $2 to $3',
13021298 #'resetprefs' => 'Reset',
13031299 #'restorelink' => '$1 deleted edits',
1304 -#'restrictedpheading' => 'Restricted special pages',
13051300 #'resultsperpage' => 'Hits per page',
13061301 'retrievedfrom' => 'Ji "$1" hatiye standin.',
13071302 'returnto' => 'Bizivire $1.',
@@ -1373,18 +1368,7 @@
13741369 'showlast' => '$1 wêneyên dawî bi rêz kirî $2 nîşan bide.',
13751370 'showpreview' => 'Pêşdîtin',
13761371 'showtoc' => 'nîşan bide',
1377 -'sidebar' => '
1378 -* navigation
1379 -** mainpage|mainpage
1380 -** portal-url|portal
1381 -** currentevents-url|currentevents
1382 -** recentchanges-url|recentchanges
1383 -** randompage-url|randompage
1384 -** helppage|help
1385 -** sitesupport-url|sitesupport',
13861372 'sig_tip' => 'Îmze û demxeya wext ya te',
1387 -#'siteadminpheading' => 'siteadmin level',
1388 -#'sitenotice' => '-',
13891373 'sitestats' => 'Statîstîkên sîteyê',
13901374 'sitestatstext' => 'Di \'\'database\'\' de <b>$1</b> rûpel hene. Tê de rûpelên nîqaşê, rûpelên der barê Wîkîpediyayê, rûpelên pir kurt (stub), rûpelên ragihandinê (redirect) û rûpelên din ku qey ne gotar in hene.
13911375
@@ -1582,7 +1566,6 @@
15831567 #'userrights-logcomment' => 'Changed group membership from $1 to $2',
15841568 #'userrights-lookup-user' => 'Manage user groups',
15851569 'userrights-user-editname' => 'Enter a username:',
1586 -#'userrightspheading' => 'userrights level',
15871570 'userstats' => 'Statistîkên bikarhêneran',
15881571 'userstatstext' => '<b>$1</b> bikarhênerên qeydkirî hene. Ji wan <b>$2</b> administrator/koordînator in. (Binêre $3).
15891572 <br><br>
Index: branches/REL1_5/phase3/languages/LanguageSq.php
@@ -720,8 +720,6 @@
721721 "listusers" => "Lista e përdoruesve",
722722 "specialpages" => "Faqe speciale",
723723 "spheading" => "Faqe speciale për të gjithë përdoruesit",
724 -"sysopspheading" => "Vetëm për ato me titull sysop",
725 -"developerspheading" => "Vetëm për zhvilluesit",
726724 "protectpage" => "Mbroje faqen",
727725 "recentchangeslinked" => "Ndryshime të përafërta",
728726 "rclsub" => "(për faqet e lidhura nga \"$1\")",
@@ -911,7 +909,7 @@
912910 "ipusubmit" => "Ç'blloko këtë adresë",
913911 "ipusuccess" => "\"$1\" u ç'bllokua",
914912 "ipblocklist" => "Lista e përdoruesve dhe e IP adresave të bllokuara",
915 -"blocklistline" => "$1, $2 bllokoi $3",
 913+"blocklistline" => "$1, $2 bllokoi $3 ($4)",
916914 "blocklink" => "blloko",
917915 "unblocklink" => "ç'blloko",
918916 "contribslink" => "kontribute",
Index: branches/REL1_5/phase3/languages/LanguageDa.php
@@ -993,17 +993,6 @@
994994 "specialpages" => "Specielle sider",
995995 "spheading" => "Specielle sider for alle brugere",
996996 'restrictedpheading' => 'Specielle sider med begrænset adgang',
997 -'blockpheading' => 'Blokeringsniveau',
998 -'createaccountpheading' => 'Opret konto-niveau',
999 -'deletepheading' => 'Sletteniveau',
1000 -'userrightspheading' => 'Brugerrettighedsniveau',
1001 -'grouprightspheading' => 'Grupperettighedsniveau',
1002 -'siteadminpheading' => 'Webstedsadministratorniveau',
1003 -
1004 -/** obsoletes
1005 -"sysopspheading" => "Specielle sider til sysop-brug",
1006 -"developerspheading" => "Specielle sider til developer-brug",
1007 -*/
1008997 "protectpage" => "Beskyt side",
1009998 "recentchangeslinked" => "Relaterede ændringer",
1010999 "rclsub" => "(til sider henvist fra \"$1\")",
@@ -1260,7 +1249,9 @@
12611250 "ipusubmit" => "Ophæv blokeringen af denne adresse",
12621251 "ipusuccess" => "\"$1\" har fået ophævet blokeringen",
12631252 "ipblocklist" => "Liste over blokerede IP-adresser og brugernavne",
1264 -"blocklistline" => "$1, $2 blokerede $3 (udløber $4)",
 1253+'blocklistline' => '$1, $2 blokerede $3 ($4)',
 1254+'infiniteblock' => 'udløber infinite', //fixme
 1255+'expiringblock' => 'udløber $1',
12651256 "blocklink" => "bloker",
12661257 "unblocklink" => "ophæv blokering",
12671258 "contribslink" => "bidrag",
Index: branches/REL1_5/phase3/languages/LanguageSr.php
@@ -740,8 +740,6 @@
741741 "listusers" => "Листа корисника",
742742 "specialpages" => "Посебне странице",
743743 "spheading" => "Посебне странице за све кориснике",
744 -"sysopspheading" => "Само за сисопе",
745 -"developerspheading" => "Само за девелопере",
746744 "protectpage" => "Заштити страницу",
747745 "recentchangeslinked" => "Сродне промене",
748746 "rclsub" => "(на странице повезане од \"$1\")",
@@ -930,7 +928,7 @@
931929 "ipusubmit" => "Отпусти ову адресу",
932930 "ipusuccess" => "\"$1\" отпуштен",
933931 "ipblocklist" => "Списак обузданих ИП адреса и корисника",
934 -"blocklistline" => "$1, $2 је обуздао $3",
 932+"blocklistline" => "$1, $2 је обуздао $3 ($4)",
935933 "blocklink" => "блокирај",
936934 "unblocklink" => "деблокирај",
937935 "contribslink" => "прилози",
Index: branches/REL1_5/phase3/languages/LanguageDe.php
@@ -804,8 +804,6 @@
805805 "listusers" => "Benutzerverzeichnis",
806806 "specialpages" => "Spezialseiten",
807807 "spheading" => "Spezialseiten",
808 -"sysopspheading" => "Spezialseiten für Sysops",
809 -"developerspheading" => "Spezialseiten für Entwickler",
810808 "protectpage" => "Artikel schützen",
811809 "recentchangeslinked" => "Verlinkte Seiten",
812810 "rclsub" => "(auf Artikel von \"$1\")",
@@ -1007,7 +1005,7 @@
10081006 "ipusubmit" => "Diese Adresse freigeben",
10091007 "ipusuccess" => "IP-Adresse \"$1\" wurde freigegeben",
10101008 "ipblocklist" => "Liste blockierter IP-Adressen",
1011 -"blocklistline" => "$1, $2 blockierte $3",
 1009+"blocklistline" => "$1, $2 blockierte $3 ($4)",
10121010 "blocklink" => "blockieren",
10131011 "unblocklink" => "freigeben",
10141012 "contribslink" => "Beiträge",
Index: branches/REL1_5/phase3/languages/LanguageSv.php
@@ -675,8 +675,6 @@
676676 "listusers" => "Användarlista",
677677 "specialpages" => "Speciella sidor",
678678 "spheading" => "Speciella sidor",
679 -"sysopspheading" => "Speciella sidor för sysop",
680 -"developerspheading" => "Speciella sidor för utvecklare",
681679 "protectpage" => "Skydda sida",
682680 "recentchangeslinked" => "Relaterade ändringar",
683681 "rclsub" => "(till sidor som är länkade från \"$1\")",
@@ -830,7 +828,7 @@
831829 "ipusuccess" => "Blockeringen för IP-adressen \"$1\" har tagits bort",
832830
833831 "ipblocklist" => "Lista över blockerade IP-adresser",
834 -"blocklistline" => "$1, $2 blockerade $3",
 832+"blocklistline" => "$1, $2 blockerade $3 ($4)",
835833 "blocklink" => "blockera",
836834 "unblocklink" => "ta bort blockering",
837835 "contribslink" => "bidrag",
Index: branches/REL1_5/phase3/languages/LanguageHe.php
@@ -602,8 +602,6 @@
603603 "listusers" => "רשימת משתמשים",
604604 "specialpages" => "דפים מיוחדים",
605605 "spheading" => "דפים מיוחדים",
606 -"sysopspheading" => "דפים מיוחדים למפעילי מערכת",
607 -"developerspheading" => "דפים מיוחדים למפתחים",
608606 "protectpage" => "הפוך דף למוגן",
609607 "recentchangeslinked" => "שינויים בדפים המקושרים",
610608 "rclsub" => "(לדפים המקושרים מ-\"$1\")",
@@ -734,7 +732,7 @@
735733 "ipusubmit" => "שחרר כתובת זו",
736734 "ipusuccess" => "הכתובת \"$1\" שוחררה",
737735 "ipblocklist" => "רשימת כתובות IP חסומות",
738 -"blocklistline" => "$1, $2 חסם את $3",
 736+"blocklistline" => "$1, $2 חסם את $3 ($4)",
739737 "blocklink" => "חסום",
740738 "unblocklink" => "שחרר חסימה",
741739 "contribslink" => "תרומות המשתמש",
Index: branches/REL1_5/phase3/languages/LanguageLi.php
@@ -525,8 +525,6 @@
526526 "listusers" => "liest van gebroekers",
527527 "specialpages" => "Speciale pagina's",
528528 "spheading" => "Speciale pagina's",
529 -"sysopspheading" => "Speciale pagina's voor systeembeheerders",
530 -"developerspheading" => "Speciale pagina's voor systeemontwikkelaars",
531529 "protectpage" => "Beveilig pagina",
532530 "recentchangeslinked" => "Volg links",
533531 "rclsub" => "(van pagina's waarnaar \"$1\" verwijst)",
@@ -647,7 +645,7 @@
648646 "ipusubmit" => "De-Blokkier dit IP-adres.",
649647 "ipusuccess" => "Het IP-adres \"$1\" is gedeBlokkierd.",
650648 "ipblocklist" => "Liest van geblokkierde IP-adressen.",
651 -"blocklistline" => "Op $1 blokkierde $2 ut adres $3",
 649+"blocklistline" => "Op $1 blokkierde $2 ut adres $3 ($4)",
652650 "blocklink" => "Blokkier",
653651 "unblocklink" => "de-Blokkier",
654652 "contribslink" => "bijdragen",
@@ -730,7 +728,6 @@
731729 'blocklogentry' => "\"$1\" geblokkierd veur de tied van $2",
732730 'blocklogpage' => "Blokkier log",
733731 'blocklogtext' => "Dit is 'n log van 't blokkieringe van gebroekers. Automatisch geblokkierde IP adresse sjtón hie neet bie. Zuug de [[Special:Ipblocklist|IP blokkier liest]] vuur de liest van op dit mement akteve blokkieringe.",
734 -'blockpheading' => "Blokkieringe",
735732 'bold_sample' => "Vètte tèks",
736733 'bold_tip' => "Vètte tèks",
737734 'bureaucratlogentry' => "Rechte vuur gebroeker \"$1\" op \"$2\" gesjtèld",
@@ -773,7 +770,6 @@
774771 'delete' => "Wisse",
775772 'deletedrevision' => "Aw versie $1 gewist.",
776773 'deleteimgcompletely' => "Wis al versies",
777 -'deletepheading' => "Verwiederinge",
778774 'edit' => "Bewirk",
779775 'editcomment' => "'t Edit commentaor waor: \"<i>$1</i>\".",
780776 'editingcomment' => "Bewirk $1 (commentaar)",
Index: branches/REL1_5/phase3/languages/LanguageTa.php
@@ -666,8 +666,6 @@
667667 "listusers" => "பயனர் அட்டவணை",
668668 "specialpages" => "விசேட பக்கங்கள்",
669669 "spheading" => "எல்லாப் பயனர்களுக்குமான விசேட பக்கங்கள்",
670 -"sysopspheading" => "sysop பயன்பாட்டுக்கு மட்டும்",
671 -"developerspheading" => "உருவாக்குபவர் பயன்பாட்டுக்கு மட்டும்",
672670 "protectpage" => "பக்கத்தைக் காப்புச் செய்",
673671 "recentchangeslinked" => "தொடர்பான மாற்றங்கள்",
674672 "rclsub" => "(\"$1\" இலிருந்து இணைக்கப்பட்ட பக்கங்களுக்கு)",
@@ -811,7 +809,7 @@
812810 "ipusubmit" => "இம் முகவரியைத் தடை நீக்கு",
813811 "ipusuccess" => "\"$1\" தடை நீக்கப்பட்டது",
814812 "ipblocklist" => "தடுக்கப்பட்ட ஐபி முகவரிகளினதும், பயனர் பெயர்களினதும் பட்டியல்",
815 -"blocklistline" => "$1, $2 blocked $3",
 813+"blocklistline" => "$1, $2 blocked $3 ($4)",
816814 "blocklink" => "தடு",
817815 "unblocklink" => "தடை நீக்கு",
818816 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguagePl.php
@@ -731,8 +731,6 @@
732732 "listusers" => "Lista użytkowników",
733733 "specialpages" => "Strony specjalne",
734734 "spheading" => "Strony specjalne",
735 -"sysopspheading" => "Strony specjalne tylko dla użytkowników z prawami Administratora",
736 -"developerspheading" => "Strony specjalne tylko dla użytkowników z prawami Programisty",
737735 "protectpage" => "Zabezpiecz stronę",
738736 "recentchangeslinked" => "Zmiany w dolinkowanych",
739737 "rclsub" => "(dla stron dolinkowanych do \"$1\")",
@@ -925,7 +923,7 @@
926924 "ipusubmit" => "Odblokuj ten adres",
927925 "ipusuccess" => "Adress IP \"$1\" został odblokowany",
928926 "ipblocklist" => "Lista zablokowanych adresów IP",
929 -"blocklistline" => "$1, $2 zablokował $3",
 927+"blocklistline" => "$1, $2 zablokował $3 ($4)",
930928 "blocklink" => "zablokuj",
931929 "unblocklink" => "odblokuj",
932930 "contribslink" => "wkład",
Index: branches/REL1_5/phase3/languages/LanguageHu.php
@@ -775,8 +775,6 @@
776776 "listusers" => "Felhasználók",
777777 "specialpages" => "Speciális lapok",
778778 "spheading" => "Speciális lapok",
779 -"sysopspheading" => "Special pages for sysop use",
780 -"developerspheading" => "Special pages for developer use",
781779 "protectpage" => "Protect page",
782780 "recentchangeslinked" => "Kapcsolódó változtatások",
783781 # FIXME: possible context?
@@ -964,7 +962,7 @@
965963 "ipusubmit" => "Unblock this address",
966964 "ipusuccess" => "IP address \"$1\" unblocked",
967965 "ipblocklist" => "List of blocked IP addresses",
968 -"blocklistline" => "$1, $2 blocked $3",
 966+"blocklistline" => "$1, $2 blocked $3 ($4)",
969967 "blocklink" => "block",
970968 "unblocklink" => "unblock",
971969 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguageLt.php
@@ -367,7 +367,6 @@
368368 'statistics' => "Statistika",
369369 'subcategorycount' => "Kategorijoje esančių kategorijų - $1",
370370 'summary' => "Komentaras",
371 -'sysopspheading' => "Administratoriams skirti puslapiai",
372371 'talk' => "Diskusijos",
373372 'talkpage' => "Aptarti straipsnį",
374373 'toc' => "Turinys",
Index: branches/REL1_5/phase3/languages/LanguagePt.php
@@ -687,8 +687,6 @@
688688 "listusers" => "Lista de Usuários",
689689 "specialpages" => "Páginas especiais",
690690 "spheading" => "Páginas especiais para todos os usuários",
691 -"sysopspheading" => "Somente para uso dos SYSOP",
692 -"developerspheading" => "Somente para uso dos desenvolvedores",
693691 "protectpage" => "Páginas Protegidas",
694692 "recentchangeslinked" => "Páginas relacionadas",
695693 "rclsub" => "(para páginas linkadas de \"$1\")",
@@ -851,7 +849,7 @@
852850 "ipusubmit" => "Desbloquear este endereço",
853851 "ipusuccess" => "Endereço de IP \"$1\" foi desbloqueado",
854852 "ipblocklist" => "Lista de IP's bloqueados",
855 -"blocklistline" => "$1, $2 bloqueado $3",
 853+"blocklistline" => "$1, $2 bloqueado $3 ($4)",
856854 "blocklink" => "block",
857855 "unblocklink" => "unblock",
858856 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguageAf.php
@@ -603,8 +603,6 @@
604604 "listusers" => "Gebruikerslys",
605605 "specialpages" => "Spesiale bladsye",
606606 "spheading" => "Spesiale bladsye",
607 -"sysopspheading" => "Spesiale bladsye vir die sisop se gebruik",
608 -"developerspheading" => "Spesiale bladsye vir programmeerders se gebruik",
609607 "protectpage" => "Beskerm bladsy",
610608 "recentchangeslinked" => "Verwante veranderings",
611609 "rclsub" => "(na bladsye waarna \"$1\" skakel)",
@@ -737,7 +735,7 @@
738736 "ipusubmit" => "Maak hierdie adres oop",
739737 "ipusuccess" => "IP-adres \"$1\" is oopgemaak",
740738 "ipblocklist" => "Lys van geblokkeerde IP-adresse",
741 -"blocklistline" => "$1, $2 het $3 geblok",
 739+'blocklistline' => '$1, $2 het $3 geblok ($4)',
742740 "blocklink" => "blok",
743741 "unblocklink" => "maak oop",
744742 "contribslink" => "bydraes",
Index: branches/REL1_5/phase3/languages/LanguageIa.php
@@ -668,8 +668,6 @@
669669 "listusers" => "Lista de usatores",
670670 "specialpages" => "Paginas special",
671671 "spheading" => "Paginas special",
672 -"sysopspheading" => "Paginas special pro uso del operatores del systema",
673 -"developerspheading" => "Pagians special pro uso del disveloppatores",
674672 "protectpage" => "Proteger pagina",
675673 "recentchangeslinked" => "Modificationes correlate",
676674 "rclsub" => "(a paginas ligate a partir de \"$1\")",
@@ -824,7 +822,7 @@
825823 "ipusubmit" => "Disbloca iste adresse",
826824 "ipusuccess" => "Adresse IP \"$1\" disblocate",
827825 "ipblocklist" => "Lista de adresses IP blocate",
828 -"blocklistline" => "$1, $2 ha blockate $3",
 826+"blocklistline" => "$1, $2 ha blockate $3 ($4)",
829827 "blocklink" => "blocar",
830828 "unblocklink" => "disblocar",
831829 "contribslink" => "contributiones",
Index: branches/REL1_5/phase3/languages/LanguageId.php
@@ -747,17 +747,6 @@
748748 "listusers" => "Daftar Pengguna",
749749 "specialpages" => "Halaman Istimewa",
750750 "spheading" => "Halaman Istimewa untuk Semua Pengguna",
751 -'asksqlpheading' => 'Tingkat asksql',
752 -'blockpheading' => 'Tingkat block',
753 -'createaccountpheading' => 'Tingkat createaccount',
754 -'deletepheading' => 'Tingkat delete',
755 -'userrightspheading' => 'Tingkat userrights',
756 -'siteadminpheading' => 'Tingkat siteadmin',
757 -
758 -/** obsoletes
759 -"sysopspheading" => "Hanya untuk Sysop",
760 -"developerspheading" => "Hanya untuk Pengembang",
761 -*/
762751 "protectpage" => "Lindungi halaman",
763752 "recentchangeslinked" => "Perubahan terkait",
764753 "rclsub" => "(untuk halaman yang berpaut dari \"$1\")",
@@ -937,7 +926,7 @@
938927 "ipusubmit" => "Hilangkan blokir terhadap alamat ini",
939928 "ipusuccess" => "Blokir terhadap alamat IP atau pengguna \"$1\" telah dihilangkan",
940929 "ipblocklist" => "Daftar Alamat IP dan Pengguna yang Diblokir",
941 -"blocklistline" => "$1, $2 memblokir $3",
 930+"blocklistline" => "$1, $2 memblokir $3 ($4)",
942931 "blocklink" => "blokir",
943932 "unblocklink" => "hilangkan blokir",
944933 "contribslink" => "sumbangan",
Index: branches/REL1_5/phase3/languages/LanguageZh_cn.php
@@ -690,8 +690,6 @@
691691 "listusers" => "用户列表",
692692 "specialpages" => "特殊页面",
693693 "spheading" => "特殊页面",
694 -"sysopspheading" => "管理员特殊页面",
695 -"developerspheading" => "发展者特殊页面",
696694 "protectpage" => "保护页面",
697695 "recentchangeslinked" => "链出更改",
698696 "rclsub" => "(从 \"$1\"链出的页面)",
@@ -850,7 +848,7 @@
851849 "ipusubmit" => "解除禁封",
852850 "ipusuccess" => "IP地址“$1”已经被解除禁封",
853851 "ipblocklist" => "被封IP地址列表",
854 -"blocklistline" => "$1,$2禁封$3",
 852+"blocklistline" => "$1,$2禁封$3 ($4)",
855853 "blocklink" => "禁封",
856854 "unblocklink" => "解除禁封",
857855 "contribslink" => "贡献",
Index: branches/REL1_5/phase3/languages/LanguageEo.php
@@ -696,8 +696,6 @@
697697 'listusers' => 'Uzularo',
698698 'specialpages' => 'Specialaj paĝoj',
699699 'spheading' => 'Specialaj paĝoj',
700 -'sysopspheading' => 'Specialaj paĝoj por uzado de administrantoj',
701 -'developerspheading' => 'Specialaj paĝoj nur por uzado de programistoj',
702700 'protectpage' => 'Protektu paĝon',
703701 'recentchangeslinked' => 'Rilataj paĝoj',
704702 'rclsub' => '(al paĝoj ligitaj de "$1")',
@@ -875,7 +873,7 @@
876874 'ipusubmit' => 'Malforbaru la adreson',
877875 'ipusuccess' => '"$1" estas malforbarita',
878876 'ipblocklist' => 'Listo de forbaritaj IP-adresoj/nomoj',
879 -'blocklistline' => 'Je $1, $2 forbaris $3',
 877+'blocklistline' => 'Je $1, $2 forbaris $3 ($4)',
880878 'blocklink' => 'forbaru',
881879 'unblocklink' => 'malforbaru',
882880 'contribslink' => 'kontribuoj',
Index: branches/REL1_5/phase3/languages/LanguageEs.php
@@ -698,8 +698,6 @@
699699 "listusers" => "Lista de usuarios",
700700 "specialpages" => "Páginas especiales",
701701 "spheading" => "Páginas especiales",
702 -"sysopspheading" => "Páginas especiales para uso de sysops",
703 -"developerspheading" => "Páginas especiales para uso de developers",
704702 "protectpage" => "Páginas protegidas",
705703 "recentchangeslinked" => "Seguimiento de enlaces",
706704 "rclsub" => "(a páginas enlazadas desde \"$1\")",
@@ -874,7 +872,7 @@
875873 "ipusubmit" => "Desbloquea esta dirección",
876874 "ipusuccess" => "Dirección IP \"$1\" desbloqueada",
877875 "ipblocklist" => "Lista de direcciones IP bloqueadas",
878 -"blocklistline" => "$1, $2 bloquea $3",
 876+"blocklistline" => "$1, $2 bloquea $3 ($4)",
879877 "blocklink" => "bloquear",
880878 "unblocklink" => "desbloquear",
881879 "contribslink" => "contribuciones",
Index: branches/REL1_5/phase3/languages/LanguageMk.php
@@ -1,4 +1,4 @@
2 -<?php
 2+<?php
33 /** Macedonian (Македонски)
44 * @package MediaWiki
55 * @subpackage Language
@@ -788,13 +788,6 @@
789789 "specialpages" => "Специјални страници",
790790 "spheading" => "Специјални страници за сите корисници",
791791 'restrictedpheading' => 'Специјални страници со ограничен пристап',
792 - 'asksqlpheading' => 'Ниво "прашалници до SQL"',
793 - 'blockpheading' => 'Ниво "блокирање"',
794 - 'createaccountpheading' => 'Ниво "регистрација"',
795 - 'deletepheading' => 'Ниво "бришење"',
796 - 'userrightspheading' => 'Ниво "кориснички права"',
797 - 'grouprightspheading' => 'Ниво "групни права"',
798 - 'siteadminpheading' => ' Ниво "администратор на сајтот"',
799792 "protectpage" => "Заштитени страници",
800793 "recentchangeslinked" => "Поврзани промени",
801794 "rclsub" => "(до страници поврзани од \"$1\")",
@@ -967,7 +960,9 @@
968961 'ipusubmit' => 'Деблокирај ја оваа адреса',
969962 'ipusuccess' => "\"[[$1]]\" деблокиран",
970963 'ipblocklist' => 'Листа на блокирани IP адреси и кориснички имиња',
971 - 'blocklistline' => "$1, $2 го блокираше $3 (истекува на $4)",
 964+ 'blocklistline' => "$1, $2 го блокираше $3 ($4)",
 965+ 'infiniteblock' => 'истекува на infinite', //fixme
 966+ 'expiringblock' => 'истекува на $1',
972967 'blocklink' => 'блокирај',
973968 'unblocklink' => 'деблокирај',
974969 'contribslink' => 'придонеси',
Index: branches/REL1_5/phase3/languages/LanguageEt.php
@@ -808,10 +808,6 @@
809809 "listusers" => "Kasutajad",
810810 "specialpages" => "Erileheküljed",
811811 "spheading" => "Erileheküljed",
812 -/* aegunud
813 -"sysopspheading" => "Administraatori erileheküljed",
814 -"developerspheading" => "Arendaja erileheküljed",
815 -*/
816812 "protectpage" => "Kaitse lehekülge",
817813 "recentchangeslinked" => "Seotud muudatused",
818814 "rclsub" => "(lehekülgedel, millele \"$1\" viitab)", #
@@ -965,7 +961,7 @@
966962 "ipusubmit" => "Unblock this address",
967963 "ipusuccess" => "IP address \"$1\" unblocked",
968964 "ipblocklist" => "Blokeeritud IP-aadresside loend",
969 -"blocklistline" => "$1, $2 blocked $3",
 965+"blocklistline" => "$1, $2 blocked $3 ($4)",
970966 "blocklink" => "blokeeri",
971967 "unblocklink" => "unblock",
972968 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguageIs.php
@@ -177,7 +177,9 @@
178178
179179 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.",
180180 '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',
182184 'blocklogpage' => "Bönnunarskrá",
183185 'blocklogtext' => "This is a log of user blocking and unblocking actions. Automatically
184186 blocked IP addresses are not be listed. See the [[Special:Ipblocklist|IP block list]] for
Index: branches/REL1_5/phase3/languages/LanguageIt.php
@@ -572,8 +572,6 @@
573573 "listusers" => "Elenco degli Utenti",
574574 "specialpages" => "Pagine speciali",
575575 "spheading" => "Pagine speciali",
576 -"sysopspheading" => "Pagine speciali riservate ai sysop",
577 -"developerspheading" => " Pagine speciali riservate ai developer",
578576 "protectpage" => "Proteggi questa pagina ",
579577 "recentchangeslinked" => "Modifiche correlate",
580578 "rclsub" => "(alle pagine linkate da \"$1\")",
@@ -707,7 +705,7 @@
708706 "ipusubmit" => "Sblocca questo indirizzo IP",
709707 "ipusuccess" => "Indirizzo IP \"$1\" sbloccato",
710708 "ipblocklist" => "Lista degli indirizzi IP bloccati",
711 -"blocklistline" => "$1, $2 ha bloccato $3",
 709+"blocklistline" => "$1, $2 ha bloccato $3 ($4)",
712710 "blocklink" => "blocca",
713711 "unblocklink" => "sblocca",
714712 "contribslink" => "contributi",
Index: branches/REL1_5/phase3/languages/LanguageUk.php
@@ -657,8 +657,6 @@
658658 "listusers" => "Список користувачів",
659659 "specialpages" => "Спеціальні сторінки",
660660 "spheading" => "Спеціальні сторінки",
661 -"sysopspheading" => "Спеціальні сторінки для використання адміністраторами",
662 -"developerspheading" => "Спеціальні сторінки для використання розробниками",
663661 "protectpage" => "Захищена стаття",
664662 "recentchangeslinked" => "Пов'язані редагування",
665663 "rclsub" => "(на статті, посилання на які є на \"$1\")",
@@ -832,7 +830,7 @@
833831 "ipusubmit" => "Розблокувати цю адресу",
834832 "ipusuccess" => "\"$1\" розблоковано",
835833 "ipblocklist" => "Список заблокованих IP-адрес й користувачів",
836 -"blocklistline" => "$1, $2 заблоковано $3",
 834+"blocklistline" => "$1, $2 заблоковано $3 ($4)",
837835 "blocklink" => "заблокувати",
838836 "unblocklink" => "розблокувати",
839837 "contribslink" => "вклад",
Index: branches/REL1_5/phase3/languages/LanguageMs.php
@@ -669,8 +669,6 @@
670670 "listusers" => "Senarai Pengguna",
671671 "specialpages" => "Halaman Istimewa",
672672 "spheading" => "Halaman Istimewa", #"Special pages",
673 -"sysopspheading" => "Halaman Istimewa Admin",
674 -"developerspheading" => "",
675673 "protectpage" => "Halaman dilindungi",
676674 "recentchangeslinked" => "Pautan pilihan",
677675 "rclsub" => "(Untuk halaman yang berpaut dari \"$1\")", #"(to pages linked from \"$1\")",
@@ -842,7 +840,7 @@
843841 "ipusubmit" => "Lepaskan semula alamat ini dari diblok", #"Unblock this address",
844842 "ipusuccess" => "Alamat IP atau pengguna \"$1\" dilepaskan dari diblok", #"IP address or user \"$1\" unblocked",
845843 "ipblocklist" => "Senarai alamat IP dan pengguna yang diblok", #"List of blocked IP addresses and users",
846 -"blocklistline" => "$1, $2 blok $3", #"$1, $2 blocked $3",
 844+"blocklistline" => "$1, $2 blok $3 ($4)",
847845 "blocklink" => "blok", #"block",
848846 "unblocklink" => "lepaskan dari diblok", #"unblock",
849847 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguageNds.php
@@ -816,12 +816,6 @@
817817 'listusers' => 'Brukerlist',
818818 'specialpages' => 'Spezialsieten',
819819 'spheading' => 'Spezialsieten för alle Bruker',
820 -'asksqlpheading' => 'SQL-Affraag-Evene',
821 -'blockpheading' => 'Block-Evene',
822 -'createaccountpheading' => 'Kontoanlegg-Evene',
823 -'deletepheading' => 'Lösch-Evene',
824 -'userrightspheading' => 'Brukerrecht-Evene',
825 -'siteadminpheading' => 'Sietenadmininstrater-Evene',
826820 'protectpage' => 'Siet schulen',
827821 'recentchangeslinked' => 'Verlinkte Sieten',
828822 'rclsub' => '(op Artikel vun „$1“)',
@@ -1002,7 +996,7 @@
1003997 'ipusubmit' => 'Disse Adress freegeven',
1004998 'ipusuccess' => 'IP-Adress „$1“ is freegeven',
1005999 'ipblocklist' => 'List vun blockte IP-Adressen',
1006 -'blocklistline' => '$1, $2 hett $3 blockt',
 1000+'blocklistline' => '$1, $2 hett $3 blockt ($4)',
10071001 'blocklink' => 'blocken',
10081002 'unblocklink' => 'freegeven',
10091003 'contribslink' => 'Bidreeg',
Index: branches/REL1_5/phase3/languages/LanguageFa.php
@@ -793,8 +793,6 @@
794794 "listusers" => "فهرست کاربران",
795795 "specialpages" => "صفحات ویژه",
796796 "spheading" => "صفحات ویژه‌ی همه‌ی کاربران",
797 -"sysopspheading" => "فقط برای استفاده‌ی اپراتور سیستم",
798 -"developerspheading" => "فقط برای استفاده‌ی برنامه‌نویس",
799797 "protectpage" => "محافظت از صفحه",
800798 "recentchangeslinked" => "تغییرات مرتبط",
801799 "rclsub" => "(به صفحات پیونددار از «$1»)",
@@ -982,7 +980,7 @@
983981 "ipusubmit" => "باز کردن این نشانی",
984982 "ipusuccess" => "«$1» باز شد",
985983 "ipblocklist" => "فهرست نشانی‌های IP و نام‌های کاربری بسته‌شده",
986 -"blocklistline" => "$1، $2 بست $3 را",
 984+"blocklistline" => "$1، $2 بست $3 را ($4)",
987985 "blocklink" => "بسته شود",
988986 "unblocklink" => "باز شود",
989987 "contribslink" => "مشارکت‌ها",
Index: branches/REL1_5/phase3/languages/LanguageBg.php
@@ -907,8 +907,6 @@
908908 'listusers' => 'Списък на потребителите',
909909 'specialpages' => 'Специални страници',
910910 'spheading' => 'За всички потребители',
911 -'sysopspheading' => 'Само за администратори',
912 -'developerspheading' => 'Само за разработчици',
913911 'protectpage' => 'Защитена страница',
914912 'recentchangeslinked' => 'Сродни промени',
915913 'rclsub' => "(на страници, сочени от \"$1\")",
@@ -1108,7 +1106,9 @@
11091107 'ipusubmit' => 'Отблокиране на адреса',
11101108 'ipusuccess' => "\"$1\" бе отблокиран",
11111109 'ipblocklist' => 'Списък на блокирани IP-адреси и потребители',
1112 -'blocklistline' => "$1, $2 е блокирал $3 (изтича на $4)",
 1110+'blocklistline' => "$1, $2 е блокирал $3 ($4)",
 1111+'infiniteblock' => 'изтича на infinite', //fixme
 1112+'expiringblock' => 'изтича на $1',
11131113 'blocklink' => 'блокиране',
11141114 'unblocklink' => 'отблокиране',
11151115 'contribslink' => 'приноси',
Index: branches/REL1_5/phase3/languages/LanguageJa.php
@@ -677,8 +677,6 @@
678678 "listusers" => "登録ユーザー一覧",
679679 "specialpages" => "特別ページ",
680680 "spheading" => "特別ページ",
681 -"sysopspheading" => "シスオペ用特別ページ (pages for sysop)",
682 -"developerspheading" => "開発者用特別ページ (pages for developper)",
683681 "protectpage" => "Protect page",
684682 "recentchangeslinked" => "リンクを見張る",
685683 "rclsub" => "(to pages linked from \"$1\")",
@@ -846,7 +844,7 @@
847845 "ipusubmit" => "Unblock this address",
848846 "ipusuccess" => "IP address \"$1\" unblocked",
849847 "ipblocklist" => "List of blocked IP addresses",
850 -"blocklistline" => "$1, $2 blocked $3",
 848+"blocklistline" => "$1, $2 blocked $3 ($4)",
851849 "blocklink" => "block",
852850 "unblocklink" => "unblock",
853851 "contribslink" => "contribs",
Index: branches/REL1_5/phase3/languages/LanguageFi.php
@@ -64,7 +64,7 @@
6565
6666 # User preference toggles
6767 '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>).',
6969 'tog-justify' => 'Tasaa kappaleet',
7070 'tog-hideminor' => 'Piilota pienet muutokset tuoreet muutokset -listasta',
7171 'tog-usenewrc' => 'Kehittynyt tuoreet muutokset -listaus (JavaScript)',
@@ -94,6 +94,8 @@
9595 'underline-never' => 'Ei koskaan',
9696 'underline-default' => 'Selaimen oletustapa',
9797
 98+'skinpreview' => '(Esikatsele...)',
 99+
98100 # dates
99101 'sunday' => 'sunnuntai',
100102 'monday' => 'maanantai',
@@ -473,7 +475,7 @@
474476 'next' => 'seur.',
475477 'last' => 'edell.',
476478 '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
478480 'history_copyright' => '-',
479481 'histfirst' => 'Ensimmäiset',
480482 'histlast' => 'Viimeisimmät',
@@ -662,15 +664,15 @@
663665 'illegalfilename' => 'Tiedoston nimessä \'\'\'$1\'\'\' on merkkejä, joita ei sallita sivujen nimissä. Vaihda tiedoston nimeä, ja yritä tallentamista uudelleen.',
664666 'badfilename' => 'Tiedoston nimi vaihdettiin: $1.',
665667 '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ä.',
669671 'successfulupload' => 'Tallennus onnistui',
670672 '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>\'\'\'',
671673 'uploadwarning' => 'Tallennusvaroitus',
672674 'savefile' => 'Tallenna',
673675 'uploadedimage' => 'tallensi tiedoston [[$1]]',
674 -'uploaddisabled' => 'Tiedostojen lähettäminen on poissa käytöstä.',
 676+'uploaddisabled' => 'Tiedostojen tallentaminen ei ole käytöstä.',
675677 'uploadscripted' => 'Tämä tiedosto sisältää HTML-koodia tai skriptejä, jotka selain saattaa virheellisesti suorittaa.',
676678 'uploadcorrupt' => 'Tiedosto on vioittunut tai sillä on väärä tiedostopääte. Tarkista tiedosto ja lähetä se uudelleen.',
677679 'uploadvirus' => 'Tiedosto sisältää viruksen. Tarkemmat tiedot: $1',
@@ -801,7 +803,7 @@
802804 'emailpage' => 'Lähetä sähköpostia käyttäjälle',
803805 '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.',
804806 'usermailererror' => 'Postitus palautti virheen: ',
805 -'defemailsubject' => '{{SITENAME}} e-mail',
 807+'defemailsubject' => '{{SITENAME}}-sähköposti',
806808 'noemailtitle' => 'Ei sähköpostiosoitetta',
807809 'noemailtext' => 'Tämä käyttäjä ei ole määritellyt kelpoa sähköpostiosoitetta tai ei halua postia muilta käyttäjiltä.',
808810 'emailfrom' => 'Lähettäjä',
@@ -955,7 +957,7 @@
956958 #
957959 'whatlinkshere' => 'Tänne viittaavat sivut',
958960 'notargettitle' => 'Ei kohdetta',
959 -'notargettext' => 'Et ole määritellyt kohdesivua tai -käyttäjää johon toiminto kohdustuu.',
 961+'notargettext' => 'Et ole määritellyt kohdesivua tai -käyttäjää johon toiminto kohdistuu.',
960962 'linklistsub' => 'Lista linkeistä',
961963 'linkshere' => 'Seuraavilta sivuilta on linkki tälle sivulle:',
962964 'nolinkshere' => 'Tänne ei ole linkkejä.',
@@ -969,25 +971,27 @@
970972 'ipadressorusername' => 'IP-osoite tai käyttäjätunnus',
971973 'ipbexpiry' => 'Umpeutuu',
972974 'ipbreason' => 'Syy',
973 -'ipbsubmit' => 'Estä tämä osoite',
 975+'ipbsubmit' => 'Estä',
974976 'ipbother' => 'Vapaamuotoinen kesto',
975977 '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',
976978 'ipbotheroption' => 'Muu kesto',
977979 'badipaddress' => 'IP-osoite on väärin muotoiltu.',
978980 'blockipsuccesssub' => 'Esto onnistui',
979981 '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',
 982+'unblockip' => 'Muokkauseston poisto',
 983+'unblockiptext' => 'Tällä lomakkeella voit poistaa käyttäjän tai IP-osoitteen muokkauseston.',
 984+'ipusubmit' => 'Poista esto',
 985+'ipusuccess' => 'IP-osoitteen tai käyttäjän <b>$1<b> esto poistettu', // TODO NOWIKIMARKUP
984986 'ipblocklist' => 'Lista estetyistä IP-osoitteista',
985 -'blocklistline' => '$1 — $2 on estänyt käyttäjän $3 (vanhenee $4)',
 987+'blocklistline' => '$1 — $2 on estänyt käyttäjän $3 ($4)',
 988+'infiniteblock' => 'ikuisesti',
 989+'expiringblock' => 'vanhenee $1',
986990 'blocklink' => 'esto',
987991 'unblocklink' => 'poista esto',
988992 'contribslink' => 'muokkaukset',
989993 'autoblocker' => 'Olet automaattisesti estetty, koska jaat IP-osoitteen käyttäjän $1 kanssa. Eston syy: $2.', // TODO: IS WIKIMARKUP?
990994 'blocklogpage' => 'Estoloki',
991 -'blocklogentry' => 'esti käyttäjän $1. Vanhenee: $2',
 995+'blocklogentry' => 'esti käyttäjän tai IP-osoitteen $1. Eston kesto: $2',
992996 '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.',
993997 'unblocklogentry' => 'poisti käyttäjältä $1 muokkauseston',
994998 'range_block_disabled'=> 'Ylläpitäjän oikeis luoda alue-estoja ei ole käytöstä.',
@@ -1249,8 +1253,8 @@
12501254 'previousdiff' => '← Edellinen muutos',
12511255 'nextdiff' => 'Seuraava muutos →',
12521256
1253 -'imagemaxsize' => 'Rajoita kuvien koko kuvien kuvaussivuilla arvoon: ',
1254 -'thumbsize' => 'Pikkukuvien koko : ',
 1257+'imagemaxsize' => 'Rajoita kuvien koko kuvien kuvaussivuilla arvoon ',
 1258+'thumbsize' => 'Pikkukuvien koko: ',
12551259 'showbigimage' => 'Lataa korkeatarkkuuksinen versio ($1×$2, $3 KiB)',
12561260
12571261 'newimages' => 'Uudet kuvat',
@@ -1258,12 +1262,12 @@
12591263
12601264 # labels for User: and Title: on Special:Log pages
12611265 'specialloguserlabel' => 'Käyttäjä: ',
1262 -'speciallogtitlelabel'=> 'Otsikko: ',
 1266+'speciallogtitlelabel'=> 'Kohde: ',
12631267
12641268 'passwordtooshort' => 'Salasanasi on liian lyhyt. Salasanan pitää olla vähintään $1 merkkiä pitkä.',
12651269
12661270 # 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.
 1271+'mediawarning' => '\'\'\'Varoitus\'\'\': Tämä tiedosto saattaa sisältää vahingollista koodia, ja suorittamalla sen järjestelmäsi voi muuttua epäluotettavaksi.
12681272 <hr>',
12691273
12701274 'fileinfo' => '$1 KiB, MIME-tyyppi: <code>$2</code>',
@@ -1302,6 +1306,8 @@
13031307 'searchfulltext' => 'Etsi koko tekstiä',
13041308 'createarticle' => 'Luo sivu',
13051309
 1310+'unit-pixel' => ' px',
 1311+
13061312 );
13071313
13081314
Index: branches/REL1_5/phase3/languages/LanguageCsb.php
@@ -91,7 +91,6 @@
9292 'delete' => 'Rëmôj',
9393 'deletionlog' => 'register rëmaniów',
9494 'dellogpage' => 'Rëmóné',
95 -'developerspheading' => 'Specjalné starnë blós dlô brëkòwników z prawama Programistë',
9695 'developertext' => 'Ną òperacëjã mòże wëkònac blós brëkòwnik z prawama\n"Programista".\nZdrzë $1.',
9796 'difference' => '(różnice midzë wersëjama)',
9897 'disambiguationspage' => '{{ns:4}}:Starnë_ùjednoznacznieniô',
@@ -300,7 +299,6 @@
301300 'spheading' => 'Specjalné nôpisma',
302301 'sqlquery' => 'Pòdôj zapëtanié',
303302 'successfulupload' => 'Wladënk darzëł sã',
304 -'sysopspheading' => 'Specjalné starnë blós dlô brëkòwników z prawama Administratorë',
305303 'talk' => 'Diskùsëjô',
306304 'timezonelegend' => 'Czasowô cona',
307305 'toc' => 'Spisënk zamkłoscë',
Index: branches/REL1_5/phase3/languages/LanguageFr.php
@@ -808,11 +808,6 @@
809809 'listusers' => 'Liste des participants',
810810 'specialpages' => 'Pages spéciales',
811811 'spheading' => 'Pages spéciales',
812 -'sysopspheading' => "Pages spéciales à l'usage des administrateurs",
813 -'developerspheading' => "Pages spéciales à l'usage des développeurs",
814 -'blockpheading' => 'Onglet blocage',
815 -'deletepheading' => 'Onglet suppression',
816 -'siteadminpheading' => 'niveau administrateur du site',
817812 'protectpage' => 'Protéger la page',
818813 'recentchangeslinked' => 'Suivi des liens',
819814 'rclsub' => "(des pages liées à \"$1\")",
@@ -1016,7 +1011,7 @@
10171012 'ipusubmit' => 'Débloquer cette adresse',
10181013 'ipusuccess' => 'Adresse IP « $1 » débloquée',
10191014 'ipblocklist' => 'Liste des adresses IP bloquées',
1020 -'blocklistline' => '$1, $2 a bloqué $3',
 1015+'blocklistline' => '$1, $2 a bloqué $3 ($4)',
10211016 'blocklink' => 'bloquer',
10221017 'unblocklink' => 'débloquer',
10231018 'contribslink' => 'contribs',
Index: branches/REL1_5/phase3/languages/LanguageNl.php
@@ -631,8 +631,6 @@
632632 "listusers" => "Lijst van gebruikers",
633633 "specialpages" => "Speciale pagina's",
634634 "spheading" => "",
635 -"sysopspheading" => "Alleen voor systeembeheerders",
636 -"developerspheading" => "Alleen voor systeemontwikkelaars",
637635 "protectpage" => "Beveilig pagina",
638636 "recentchangeslinked" => "Volg links",
639637 "rclsub" => "(van pagina's waarnaar \"$1\" verwijst)",
@@ -780,7 +778,7 @@
781779 "ipusubmit" => "De-blokkeer deze gebruiker.",
782780 "ipusuccess" => "\"$1\" is gedeblokkeerd.",
783781 "ipblocklist" => "Lijst van geblokkeerde gebruikers en IP-adressen.",
784 -"blocklistline" => "Op $1 blokkeerde $2: $3",
 782+"blocklistline" => "Op $1 blokkeerde $2: $3 ($4)",
785783 "blocklink" => "blokkeer",
786784 "unblocklink" => "de-blokkeer",
787785 "contribslink" => "bijdragen",
Index: branches/REL1_5/phase3/languages/LanguageNn.php
@@ -849,18 +849,6 @@
850850 'specialpages' => 'Spesialsider',
851851 'spheading' => 'Spesialsider for alle brukarar',
852852 'restrictedpheading' => 'Spesialsider med avgrensa tilgang',
853 -'blockpheading' => 'Blokkering',
854 -'createaccountpheading' => 'Lag konto',
855 -'deletepheading' => 'Slett',
856 -'userrightspheading' => 'Brukartilgang',
857 -'grouprightspheading' => 'gruppetilgangsnivå',
858 -'siteadminpheading' => 'Administrasjon av wikinettstaden',
859 -
860 -/** obsoletes
861 -'sysopspheading' => 'Berre for administrator-bruk',
862 -'developerspheading' => 'Berre for utviklar-bruk',
863 -*/
864 -
865853 'protectpage' => 'Vern side',
866854 'recentchangeslinked' => 'Relaterte endringar',
867855 'rclsub' => '(til sider med lenkje frå «$1»)',
@@ -1086,7 +1074,9 @@
10871075 'ipusubmit' => 'Opphev blokkering',
10881076 'ipusuccess' => '«[[$1]]» har fått oppheva blokkeringa',
10891077 'ipblocklist' => 'Blokkerte IP-adresser og brukarnamn',
1090 -'blocklistline' => '$1, $2 blokkerte $3 (opphørstid $4)',
 1078+'blocklistline' => '$1, $2 blokkerte $3 ($4)',
 1079+'infiniteblock' => 'opphørstid infinite', //fixme
 1080+'expiringblock' => 'opphørstid $1',
10911081 'blocklink' => 'blokker',
10921082 'unblocklink' => 'opphev blokkering',
10931083 'contribslink' => 'bidrag',
Index: branches/REL1_5/phase3/languages/LanguageNo.php
@@ -721,8 +721,6 @@
722722 "listusers" => "Brukerliste",
723723 "specialpages" => "Spesialsider",
724724 "spheading" => "Spesialsider for alle brukere",
725 -"sysopspheading" => "Kun for sysop-bruk",
726 -"developerspheading" => "Kun for utvikler-bruk",
727725 "protectpage" => "Beskytt side",
728726 "recentchangeslinked" => "Relaterte endringer",
729727 "rclsub" => "(til sider med lenke fra \"$1\")",
@@ -923,7 +921,7 @@
924922 "ipusubmit" => "Opphev blokkeringen av denne adresse",
925923 "ipusuccess" => "IP-adressen \"$1\" har fått opphevet blokkeringen",
926924 "ipblocklist" => "Liste over blokkerte IP-adresser",
927 -"blocklistline" => "$1, $2 blokkerte $3",
 925+"blocklistline" => "$1, $2 blokkerte $3 ($4)",
928926 "blocklink" => "blokker",
929927 "unblocklink" => "opphev blokkering",
930928 "contribslink" => "bidrag",
Index: branches/REL1_5/phase3/languages/LanguageFy.php
@@ -724,8 +724,6 @@
725725 "listusers" => "Brûkerlist",
726726 "specialpages" => "Bysûndere siden",
727727 "spheading" => "Bysûndere siden foar all brûkers",
728 -"sysopspheading" => "Allinich foar behearders",
729 -"developerspheading" => "Allinich foar untwiklers",
730728 "protectpage" => "Beskerm side",
731729 "recentchangeslinked" => "Folgje keppelings",
732730 "rclsub" => "(nei siden dêr't \"$1\" keppelings nei hat)",
@@ -904,7 +902,7 @@
905903 "ipusubmit" => "Lit dizze brûker der wer yn",
906904 "ipusuccess" => "Brûker \"$1\" ynlitten",
907905 "ipblocklist" => "List fan útsletten Ynternet-adressen en brûkersnammen",
908 -"blocklistline" => "$\"3\", troch \"$2\" op $1",
 906+"blocklistline" => '"$3", troch "$2" op $1 ($4)',
909907 "blocklink" => "slut út",
910908 "unblocklink" => "lit yn",
911909 "contribslink" => "bydragen",
Index: branches/REL1_5/phase3/languages/Language.php
@@ -1134,17 +1134,6 @@
11351135 'specialpages' => 'Special pages',
11361136 'spheading' => 'Special pages for all users',
11371137 'restrictedpheading' => 'Restricted special pages',
1138 -'blockpheading' => 'block level',
1139 -'createaccountpheading' => 'createaccount level',
1140 -'deletepheading' => 'delete level',
1141 -'userrightspheading' => 'userrights level',
1142 -'grouprightspheading' => 'grouprights level',
1143 -'siteadminpheading' => 'siteadmin level',
1144 -
1145 -/** obsoletes
1146 -'sysopspheading' => 'For sysop use only',
1147 -'developerspheading' => 'For developer use only',
1148 -*/
11491138 'protectpage' => 'Protect page',
11501139 'recentchangeslinked' => 'Related changes',
11511140 'rclsub' => "(to pages linked from \"$1\")",
@@ -1416,6 +1405,10 @@
14171406 'ipusubmit' => 'Unblock this address',
14181407 'ipusuccess' => "\"[[$1]]\" unblocked",
14191408 'ipblocklist' => 'List of blocked IP addresses and usernames',
 1409+'blocklistline' => "$1, $2 blocked $3 ($4)",
 1410+'infiniteblock' => 'infinite',
 1411+'expiringblock' => 'expires $1',
 1412+'ipblocklistempty' => 'The blocklist is empty.',
14201413 'blocklistline' => "$1, $2 blocked $3 (expires $4)",
14211414 'blocklink' => 'block',
14221415 'unblocklink' => 'unblock',
@@ -1639,7 +1632,7 @@
16401633 'accesskey-minoredit' => 'i',
16411634 'accesskey-save' => 's',
16421635 'accesskey-preview' => 'p',
1643 -'accesskey-diff' => 'd',
 1636+'accesskey-diff' => 'v',
16441637 'accesskey-compareselectedversions' => 'v',
16451638
16461639 # tooltip help for some actions, most are in Monobook.js
@@ -1770,7 +1763,7 @@
17711764 'nextdiff' => 'Next diff &rarr;',
17721765
17731766 'imagemaxsize' => 'Limit images on image description pages to: ',
1774 -'thumbsize' => 'Thumbnail size :',
 1767+'thumbsize' => 'Thumbnail size: ',
17751768 'showbigimage' => 'Download high resolution version ($1x$2, $3 KB)',
17761769
17771770 'newimages' => 'Gallery of new files',
@@ -2136,6 +2129,8 @@
21372130 'trackbackremove' => ' ([$1 Delete])',
21382131 'trackbacklink' => 'Trackback',
21392132 'trackbackdeleteok' => 'The trackback was successfully deleted.',
 2133+
 2134+'unit-pixel' => 'px',
21402135 );
21412136
21422137 /* a fake language converter */
Index: branches/REL1_5/phase3/languages/LanguageRo.php
@@ -397,7 +397,7 @@
398398 Include un motiv specific mai jos (de exemplu citează paginile care
399399 au fost vandalizate de acest utilizator).",
400400 'blocklink' => "blochează",
401 -'blocklistline' => "$1, $2 a blocat $3",
 401+'blocklistline' => "$1, $2 a blocat $3 ($4)",
402402 'blocklogentry' => "blocat \"$1\"",
403403 'blocklogpage' => "Jurnal_blocări",
404404 'blocklogtext' => "Acesta este un jurnal al acţiunilor de blocare şi deblocare.
@@ -501,7 +501,6 @@
502502 <ul>
503503 </ul>
504504 ",
505 -'developerspheading' => "Pagini speciale pentru dezvoltatori",
506505 'developertext' => "Acţiunea pe care ai încercat-o necesită drepturi de dezvoltator.
507506 Vezi $1.",
508507 'developertitle' => "Ai nevoie de acces ca dezvoltator",
@@ -1074,7 +1073,6 @@
10751074 </div>
10761075
10771076 Sumar",
1078 -'sysopspheading' => "Pagini speciale pentru operatori",
10791077 'sysoptext' => "Acţiunea pe care ai încercat-o necesită drepturi de operator.
10801078 Vezi $1.",
10811079 'sysoptitle' => "Ai nevoie de acces ca operator",
Index: branches/REL1_5/phase3/languages/LanguageCa.php
@@ -624,8 +624,6 @@
625625 "listusers" => "Llistat d'usuaris",
626626 "specialpages" => "Pàgines especials",
627627 "spheading" => "Pàgines especials",
628 -"sysopspheading" => "Pàgines especials per ús de sysops",
629 -"developerspheading" => "Pàgines especials per a l'ús dels desenvolupadors",
630628 "protectpage" => "Pàgines protegides",
631629 "recentchangeslinked" => "Seguiment d'enllaços",
632630 "rclsub" => "(a pàgines enllaçades des de \"$1\")",
@@ -780,7 +778,7 @@
781779 "ipusubmit" => "Desbloqueja aquesta direcció",
782780 "ipusuccess" => "Direcció IP \"$1\" desbloquejada",
783781 "ipblocklist" => "Llistat de direccions IP bloquejades",
784 -"blocklistline" => "$1, $2 bloqueja $3",
 782+"blocklistline" => "$1, $2 bloqueja $3 ($4)",
785783 "blocklink" => "bloqueja",
786784 "unblocklink" => "desbloqueja",
787785 "contribslink" => "contribucions",
Index: branches/REL1_5/phase3/languages/LanguageRu.php
@@ -987,17 +987,6 @@
988988 'specialpages' => 'Служебные страницы',
989989 'spheading' => 'Служебные страницы',
990990 'restrictedpheading' => 'Служебные страницы с ограниченным доступом',
991 -'blockpheading' => 'Блокировка',
992 -'createaccountpheading' => 'Уровень создания пользователей',
993 -'deletepheading' => 'Уровень удаления',
994 -'userrightspheading' => 'Уровень прав участников',
995 -'grouprightspheading' => 'Уровень прав групп',
996 -'siteadminpheading' => 'Уровень сисадмина',
997 -
998 -/** obsoletes
999 -'sysopspheading' => 'Служебные страницы для операторов',
1000 -'developerspheading' => 'Служебные страницы для разработчиков',
1001 -*/
1002991 'protectpage' => 'Защищённая страница',
1003992 'recentchangeslinked' => 'Связанные правки',
1004993 'rclsub' => "(на статьи, ссылки на которые есть на $1)",
@@ -1258,7 +1247,9 @@
12591248 'ipusubmit' => 'Разблокировать этот адрес',
12601249 'ipusuccess' => "IP-адрес [[$1|«$1»]] разблокирован",
12611250 'ipblocklist' => 'Список заблокированных IP-адресов и пользователей',
1262 -'blocklistline' => "$1, $2 заблокировал $3 (блокировка завершится $4)",
 1251+'blocklistline' => "$1, $2 заблокировал $3 ($4)",
 1252+'infiniteblock' => 'блокировка завершится infinite', //fixme
 1253+'expiringblock' => 'блокировка завершится $1',
12631254 'blocklink' => 'заблокировать',
12641255 'unblocklink' => 'разблокировать',
12651256 'contribslink' => 'вклад',
Index: branches/REL1_5/phase3/languages/LanguageGa.php
@@ -900,8 +900,6 @@
901901 "listusers" => "Liosta úsáideoirí­",
902902 "specialpages" => "Lgh speisialta",
903903 "spheading" => "Lgh speisialta do gach úsáideoir",
904 -"sysopspheading" => "Ach amháin do ceannasaithe",
905 -"developerspheading" => "Ach amháin do cumadoirí­",
906904 "protectpage" => "Cuir glas ar leathanach",
907905 "recentchangeslinked" => "Athruithe gaolmhara",
908906 "rclsub" => "(go leathanaigh nasctha ó \"$1\")",
@@ -1111,7 +1109,9 @@
11121110 "ipusubmit" => "Bain an cosc den seoladh seo",
11131111 "ipusuccess" => "\"$1\" gan cosc",
11141112 "ipblocklist" => "Liosta seoltaí­ IP agus ainmneacha úsáideoirí­ coiscthe",
1115 -"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',
11161116 "blocklink" => "Coisceadh",
11171117 "unblocklink" => "bain an cosc den",
11181118 "contribslink" => "dréachtaí­",
Index: branches/REL1_5/phase3/RELEASE-NOTES
@@ -642,6 +642,9 @@
643643 * PHP 4.1 compatibility fix: don't use new_link parameter to mysql_connect
644644 if running prior to 4.2.0 as it causes the call to fail
645645 * (bug 3117) Fix display of upload size and type with tidy on
 646+* (bug 1487) invalid html on empty list in banlist
 647+* (bug 3017) Hotkey conflict for delete and show changes
 648+* made pixel unit translateable and blocklistline now eats infiniteblock and expiringblock
646649
647650
648651 === Caveats ===
Index: branches/REL1_5/phase3/includes/SpecialIpblocklist.php
@@ -49,20 +49,20 @@
5050
5151 function showForm( $err )
5252 {
53 - global $wgOut, $wgUser, $wgLang;
 53+ global $wgOut, $wgUser, $wgLang, $wgSysopUserBans;
5454
5555 $wgOut->setPagetitle( wfMsg( "unblockip" ) );
5656 $wgOut->addWikiText( wfMsg( "unblockiptext" ) );
5757
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' );
6161 $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
6262 $action = $titleObj->escapeLocalURL( "action=submit" );
6363
6464 if ( "" != $err ) {
6565 $wgOut->setSubtitle( wfMsg( "formerror" ) );
66 - $wgOut->addHTML( "<p class='error'>{$err}</p>\n" );
 66+ $wgOut->addWikitext( "<span class='error'>{$err}</span>\n" );
6767 }
6868 $token = htmlspecialchars( $wgUser->editToken() );
6969
@@ -104,7 +104,7 @@
105105 } else {
106106 $block->mAddress = $this->ip;
107107 }
108 -
 108+
109109 # Delete block (if it exists)
110110 # We should probably check for errors rather than just declaring success
111111 $block->delete();
@@ -127,7 +127,9 @@
128128 $wgOut->setSubtitle( $msg );
129129 }
130130 $wgOut->addHTML( "<ul>" );
131 - Block::enumBlocks( "wfAddRow", 0 );
 131+ // FIXME hack to solve #bug 1487
 132+ if(!Block::enumBlocks( "wfAddRow", 0 ))
 133+ $wgOut->addHTML( '<li>'.wfMsg( 'ipblocklistempty' ).'</li>' );
132134 $wgOut->addHTML( "</ul>\n" );
133135 }
134136 }
@@ -148,9 +150,9 @@
149151 $formattedTime = $wgLang->timeanddate( $block->mTimestamp, true );
150152
151153 if ( $block->mExpiry === "" ) {
152 - $formattedExpiry = "indefinite";
 154+ $formattedExpiry = wfMsgHtml('infiniteblock');
153155 } else {
154 - $formattedExpiry = $wgLang->timeanddate( $block->mExpiry, true );
 156+ $formattedExpiry = wfMsgHtml('expiringblock', $wgLang->timeanddate( $block->mExpiry, true ) );
155157 }
156158
157159 $line = wfMsg( "blocklistline", $formattedTime, $ulink, $addr, $formattedExpiry );
@@ -159,17 +161,12 @@
160162
161163 if ( !$block->mAuto ) {
162164 $titleObj = Title::makeTitle( NS_SPECIAL, "Contributions" );
163 - $clink = "<a href=\"" . $titleObj->escapeLocalURL( "target={$block->mAddress}" ) . "\">" .
164 - wfMsg( "contribslink" ) . "</a>";
165 - $wgOut->addHTML( " ({$clink})" );
 165+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'contribslink' ), "target={$block->mAddress}") . ')' );
166166 }
167167
168168 if ( $wgUser->isAllowed('block') ) {
169169 $titleObj = Title::makeTitle( NS_SPECIAL, "Ipblocklist" );
170 - $ublink = "<a href=\"" .
171 - $titleObj->escapeLocalURL( "action=unblock&ip=" . urlencode( $addr ) ) . "\">" .
172 - wfMsg( "unblocklink" ) . "</a>";
173 - $wgOut->addHTML( " ({$ublink})" );
 170+ $wgOut->addHTML( ' (' . $sk->makeKnownLinkObj($titleObj, wfMsgHtml( 'unblocklink' ), 'action=unblock&ip=' . urlencode( $addr ) ) . ')' );
174171 }
175172 $wgOut->addHTML( $sk->commentBlock( $block->mReason ) );
176173 $wgOut->addHTML( "</li>\n" );
Index: branches/REL1_5/phase3/includes/SpecialPreferences.php
@@ -661,7 +661,7 @@
662662 $imageLimitOptions = null;
663663 foreach ( $wgImageLimits as $index => $limits ) {
664664 $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";
666666 }
667667
668668 $imageThumbOptions = null;
@@ -669,7 +669,7 @@
670670 <div><label>" . wfMsg('thumbsize') . "<select name=\"wpThumbSize\">");
671671 foreach ( $wgThumbLimits as $index => $size ) {
672672 $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";
674674 }
675675 $wgOut->addHTML( "{$imageThumbOptions}</select></label></div></fieldset>\n\n");
676676

Status & tagging log