r113940 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r113939‎ \| r113940 \| r113941 >
Date:	17:51, 15 March 2012
Author:	reedy
Status:	ok
Tags:
Comment:	MFT r112586, r112930, r113352, r113926
Modified paths:	/branches/wmf/1.19wmf1/extensions (modified) (history) /branches/wmf/1.19wmf1/extensions/CentralAuth (modified) (history) /branches/wmf/1.19wmf1/extensions/CentralAuth/CentralAuth.php (modified) (history) /branches/wmf/1.19wmf1/extensions/CentralAuth/modules/ext.centralauth.css (modified) (history) /branches/wmf/1.19wmf1/extensions/CentralAuth/modules/ext.centralauth.js (modified) (history) /branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php (modified) (history) /branches/wmf/1.19wmf1/extensions/CheckUser/CheckUser.i18n.php (modified) (history) /branches/wmf/1.19wmf1/extensions/CheckUser/CheckUser_body.php (modified) (history) /branches/wmf/1.19wmf1/extensions/CheckUser/SpecialCheckUserLog.php (modified) (history) /branches/wmf/1.19wmf1/extensions/NewUserMessage/NewUserMessage.class.php (modified) (history) /branches/wmf/1.19wmf1/extensions/wikihiero/modules/ext.wikihiero.css (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/extensions/CheckUser/CheckUser_body.php
—	—	@@ -96,17 +96,17 @@
97	97	/**
98	98	* @return Title
99	99	*/
100		~~- public function getLogTitle() {~~
101		~~- if ( !isset( $this->logSubpageTitle ) ) {~~
102		~~- $this->logTitle = Title::makeTitle( NS_SPECIAL, 'CheckUserLog' );~~
	100	+ public function getCheckUserLogTitle() {
	101	+ if ( !isset( $this->checkUserLogTitle ) ) {
	102	+ $this->checkUserLogTitle = SpecialPage::getTitleFor( 'CheckUserLog' );
103	103	}
104		~~- return $this->logTitle;~~
	104	+ return $this->checkUserLogTitle;
105	105	}
106	106
107	107	protected function showGuide() {
108	108	global $wgOut;
109	109	$wgOut->addWikiText( wfMsg( 'checkuser-summary' ) .
110		~~- "\n\n[[" . $this->getLogTitle()->getPrefixedText() .~~
	110	+ "\n\n[[" . $this->getCheckUserLogTitle()->getPrefixedText() .
111	111	'\|' . wfMsg( 'checkuser-showlog' ) . ']]'
112	112	);
113	113	}
Index: branches/wmf/1.19wmf1/extensions/CheckUser/CheckUser.i18n.php
—	—	@@ -78,8 +78,7 @@
79	79	'checkuser-search-initiator' => 'initiator',
80	80	'checkuser-search-target' => 'target',
81	81	'checkuser-ipeditcount' => '~$1 from all users',
82		~~- 'checkuser-log-subpage' => 'Log',~~
83		~~- 'checkuser-log-return' => 'Return to CheckUser main form',~~
	82	+ 'checkuser-log-return' => 'Switch to CheckUser main form',
84	83
85	84	'checkuser-limited' => '\'\'\'These results have been truncated for performance reasons.\'\'\'',
86	85
—	—	@@ -311,7 +310,6 @@
312	311	'checkuser-search-initiator' => 'aanvraer',
313	312	'checkuser-search-target' => 'teiken',
314	313	'checkuser-ipeditcount' => '~$1 van alle gebruikers',
315		~~- 'checkuser-log-subpage' => 'Logboek',~~
316	314	'checkuser-log-return' => 'Terug na Check User belangrikste vorm',
317	315	'checkuser-limited' => "'''Hierdie resultate is vir prestasieredes afgekap.'''",
318	316	'checkuser-log-userips' => '$1 het die IP-adresse deur $2 opgevra',
—	—	@@ -373,7 +371,6 @@
374	372	'checkuser-search-initiator' => "o encetador d'a consulta",
375	373	'checkuser-search-target' => 'obchectivo',
376	374	'checkuser-ipeditcount' => '~$1 de totz os usuarios',
377		~~- 'checkuser-log-subpage' => 'Rechistro',~~
378	375	'checkuser-log-return' => "Tornar ta o formulario prencipal de CheckUser (Comprebación d'usuarios)",
379	376	'checkuser-log-userips' => '$1 ha consultato as adrezas IP de $2',
380	377	'checkuser-log-ipedits' => '$1 ha consultato as edicions de $2',
—	—	@@ -458,7 +455,6 @@
459	456	'checkuser-search-initiator' => 'بادىء',
460	457	'checkuser-search-target' => 'هدف',
461	458	'checkuser-ipeditcount' => '~$1 من كل المستخدمين',
462		~~- 'checkuser-log-subpage' => 'سجل',~~
463	459	'checkuser-log-return' => 'ارجع إلى استمارة تدقيق المستخدم الرئيسية',
464	460	'checkuser-limited' => "'''هذه النتائج تم اختصارها لأسباب تتعلق بالأداء.'''",
465	461	'checkuser-log-userips' => '$1 حصل على آيبيهات $2',
—	—	@@ -556,7 +552,6 @@
557	553	'checkuser-search-initiator' => 'البادي',
558	554	'checkuser-search-target' => 'هدف',
559	555	'checkuser-ipeditcount' => '~$1 من كل اليوزرز',
560		~~- 'checkuser-log-subpage' => 'سجل',~~
561	556	'checkuser-log-return' => 'ارجع للاستمارة الرئيسية بتاعة تشييك اليوزرز',
562	557	'checkuser-limited' => "''' النتايج دى اتعملها اختصار لأسباب متعلقة بالأداء.'''",
563	558	'checkuser-log-userips' => '$1 جاب الاى بى بتوع $2',
—	—	@@ -648,7 +643,6 @@
649	644	'checkuser-search-initiator' => 'aniciador',
650	645	'checkuser-search-target' => 'oxetivu',
651	646	'checkuser-ipeditcount' => '~$1 de tolos usuarios',
652		~~- 'checkuser-log-subpage' => 'Rexistru',~~
653	647	'checkuser-log-return' => "Volver al formulariu principal de comprobador d'usuariu",
654	648	'checkuser-limited' => "'''Estos resultaos fueron truncaos por motivos de rendimientu.'''",
655	649	'checkuser-log-userips' => '$1 obtuvo les IP pa $2',
—	—	@@ -779,7 +773,6 @@
780	774	'checkuser-search-initiator' => 'башлаусы',
781	775	'checkuser-search-target' => 'маҡсат',
782	776	'checkuser-ipeditcount' => 'бөтә ҡатнашыусыларҙан ~$1',
783		~~- 'checkuser-log-subpage' => 'Журнал',~~
784	777	'checkuser-log-return' => 'Ҡатнашыусыларҙы тикшереү битенә кире ҡайтырға',
785	778	'checkuser-limited' => "'''Һөҙөмтәләр етештереүсәнлек маҡсаттарында киҫелде.'''",
786	779	'checkuser-log-userips' => '$1 $2 өсөн IP адрестар алған',
—	—	@@ -827,7 +820,6 @@
828	821	'checkuser-search-initiator' => 'شروع کنوک',
829	822	'checkuser-search-target' => 'هدف',
830	823	'checkuser-ipeditcount' => '~$1 چه کلی کابران',
831		~~- 'checkuser-log-subpage' => 'آمار',~~
832	824	'checkuser-log-return' => 'په فرم اصلی کنترل کاربر تر',
833	825	'checkuser-log-userips' => '$1 گریت آی پی په $2',
834	826	'checkuser-log-ipedits' => '$1 گریت اصلاح په $2',
—	—	@@ -927,7 +919,6 @@
928	920	'checkuser-search-initiator' => 'ініцыятар',
929	921	'checkuser-search-target' => 'мэта',
930	922	'checkuser-ipeditcount' => '~$1 ад усіх удзельнікаў',
931		~~- 'checkuser-log-subpage' => 'Журнал',~~
932	923	'checkuser-log-return' => 'Вярнуцца да галоўнай формы праверкі ўдзельнікаў',
933	924	'checkuser-limited' => "'''Гэты вынік быў скарочаны, з прычыны прадукцыйнасьці сыстэмы.'''",
934	925	'checkuser-log-userips' => '$1 атрымаў IP-адрасы для $2',
—	—	@@ -1005,7 +996,6 @@
1006	997	'checkuser-search-initiator' => 'инициатор',
1007	998	'checkuser-search-target' => 'цел',
1008	999	'checkuser-ipeditcount' => '~$1 от всички потребители',
1009		~~- 'checkuser-log-subpage' => 'Дневник',~~
1010	1000	'checkuser-log-return' => 'Връщане към основния формуляр за проверка',
1011	1001	'checkuser-limited' => "'''Резултатите бяха съкратени от съображения, свързани с производителността на системата.'''",
1012	1002	'checkuser-log-userips' => '$1 е получил айпи адреси за $2',
—	—	@@ -1074,7 +1064,6 @@
1075	1065	'checkuser-search-initiator' => 'আরম্ভকারী',
1076	1066	'checkuser-search-target' => 'লক্ষ্য',
1077	1067	'checkuser-ipeditcount' => '~$1 সমস্ত ব্যবহাকারী থেকে',
1078		~~- 'checkuser-log-subpage' => 'লগ',~~
1079	1068	'checkuser-log-return' => 'CheckUser মূল ফর্মে ফেরত যান',
1080	1069	'checkuser-log-userips' => '$2 এর জন্য $1 আইপি সমূহ পেয়েছে',
1081	1070	'checkuser-log-ipedits' => '$2 এর জন্য $1 সম্পাদনাসমূহ পেয়েছে',
—	—	@@ -1153,7 +1142,6 @@
1154	1143	'checkuser-search-initiator' => 'deraouer',
1155	1144	'checkuser-search-target' => 'pal',
1156	1145	'checkuser-ipeditcount' => '~$1 gant an holl implijerien',
1157		~~- 'checkuser-log-subpage' => 'Marilh',~~
1158	1146	'checkuser-log-return' => "Distreiñ da furmskrid pennañ ar c'hontrolliñ implijerien",
1159	1147	'checkuser-limited' => "'''Krennet eo bet an disoc'hoù-mañ evit abegoù efeduster.'''",
1160	1148	'checkuser-log-userips' => '$1 en deus kavet IPoù evit $2',
—	—	@@ -1233,7 +1221,6 @@
1234	1222	'checkuser-search-initiator' => 'pokretač',
1235	1223	'checkuser-search-target' => 'cilj',
1236	1224	'checkuser-ipeditcount' => '~$1 od svih korisnika',
1237		~~- 'checkuser-log-subpage' => 'Zapisnik',~~
1238	1225	'checkuser-log-return' => 'Povratak na glavni obrazac provjere korisnika',
1239	1226	'checkuser-limited' => "'''Ovi rezultati su skraćeni iz razloga bolje performanse.'''",
1240	1227	'checkuser-log-userips' => 'Korisnik $1 je našao IP adrese za $2',
—	—	@@ -1320,7 +1307,6 @@
1321	1308	'checkuser-search-initiator' => "l'iniciador",
1322	1309	'checkuser-search-target' => 'el consultat',
1323	1310	'checkuser-ipeditcount' => '~$1 de tots els usuaris',
1324		~~- 'checkuser-log-subpage' => 'Registre',~~
1325	1311	'checkuser-log-return' => 'Retorna al formulari de CheckUser',
1326	1312	'checkuser-limited' => "'''Els resultats s'han trucat per raons de rendiment.'''",
1327	1313	'checkuser-log-userips' => '$1 consulta les IP de $2',
—	—	@@ -1439,7 +1425,6 @@
1440	1426	'checkuser-search-initiator' => 'kontrolující',
1441	1427	'checkuser-search-target' => 'kontrolováno',
1442	1428	'checkuser-ipeditcount' => 'asi $1 od všech uživatelů',
1443		~~- 'checkuser-log-subpage' => 'Záznamy',~~
1444	1429	'checkuser-log-return' => 'Návrat na hlavní formulář Kontroly uživatele',
1445	1430	'checkuser-limited' => "'''Výsledky byly z výkonnostních důvodů zkráceny.'''",
1446	1431	'checkuser-log-userips' => '$1 zjišťuje IP adresy uživatele $2',
—	—	@@ -1538,7 +1523,6 @@
1539	1524	'checkuser-search-initiator' => 'archwiliwr',
1540	1525	'checkuser-search-target' => 'y targed',
1541	1526	'checkuser-ipeditcount' => '~$1 gan holl ddefnyddwyr y cyfeiriad IP',
1542		~~- 'checkuser-log-subpage' => 'Lòg',~~
1543	1527	'checkuser-log-return' => 'Dychwelyd at brif ffurflen Archwilio Defnyddwyr',
1544	1528	'checkuser-limited' => "'''Cwtogwyd ar y canlyniadau hyn er mwyn gallu perfformio'r dasg.'''",
1545	1529	'checkuser-log-userips' => '$1 wedi nôl y cyfeiriadau IP ynghlwm wrth $2',
—	—	@@ -1625,7 +1609,6 @@
1626	1610	'checkuser-search-initiator' => 'initiativtager',
1627	1611	'checkuser-search-target' => 'mål',
1628	1612	'checkuser-ipeditcount' => '~$1 fra alle brugere',
1629		~~- 'checkuser-log-subpage' => 'Log',~~
1630	1613	'checkuser-log-return' => 'Gå tilbage til hovedformularen for checkbruger',
1631	1614	'checkuser-limited' => "'''Disse resultater er blevet afkortet af hensyn til ydeevnen.'''",
1632	1615	'checkuser-log-userips' => "$1 fik IP'er for $2",
—	—	@@ -1709,8 +1692,7 @@
1710	1693	'checkuser-search-initiator' => 'CheckUser-Berechtigter',
1711	1694	'checkuser-search-target' => 'Abfrageziel (Benutzerkonto/IP-Adresse)',
1712	1695	'checkuser-ipeditcount' => '~ $1 von allen Benutzern',
1713		~~- 'checkuser-log-subpage' => 'Logbuch',~~
1714		~~- 'checkuser-log-return' => 'Zurück zum CheckUser-Hauptformular',~~
	1696	+ 'checkuser-log-return' => 'Zum CheckUser-Hauptformular wechseln',
1715	1697	'checkuser-limited' => "'''Die Ergebnisliste wurde aus Performancegründen gekürzt.'''",
1716	1698	'checkuser-log-userips' => '$1 holte IP-Adressen für $2',
1717	1699	'checkuser-log-ipedits' => '$1 holte Bearbeitungen für $2',
—	—	@@ -1801,7 +1783,6 @@
1802	1784	'checkuser-search-initiator' => 'başlî kerdoğ',
1803	1785	'checkuser-search-target' => 'hedef',
1804	1786	'checkuser-ipeditcount' => '~$1 karberanê hemî ra',
1805		~~- 'checkuser-log-subpage' => 'Log',~~
1806	1787	'checkuser-log-return' => 'Farmê serî CheckUser rê reyna şî',
1807	1788	'checkuser-limited' => "'''Ena neticeyan qe sebabanê performansî ra kilm kerd.'''",
1808	1789	'checkuser-log-userips' => 'Qe $2, $1adresanê IPyan girewt',
—	—	@@ -1881,7 +1862,6 @@
1882	1863	'checkuser-search-initiator' => 'iniciator',
1883	1864	'checkuser-search-target' => 'cel',
1884	1865	'checkuser-ipeditcount' => '~$1 ze wšych wužywarjow',
1885		~~- 'checkuser-log-subpage' => 'Protokol',~~
1886	1866	'checkuser-log-return' => 'Slědk ku głownemu formularoju CheckUser',
1887	1867	'checkuser-limited' => "'''Toś te wuslědki su se z pśicynow wugbałosći wobrězali.'''",
1888	1868	'checkuser-log-userips' => '$1 jo IP-adrese za $2 wobstarał',
—	—	@@ -1978,7 +1958,6 @@
1979	1959	'checkuser-search-initiator' => 'ελεγκτής',
1980	1960	'checkuser-search-target' => 'στόχος',
1981	1961	'checkuser-ipeditcount' => '~$1 από όλους τους χρήστες',
1982		~~- 'checkuser-log-subpage' => 'Αρχείο',~~
1983	1962	'checkuser-log-return' => 'Επιστροφή στην κύρια φόρμα ελέγχου χρήστη',
1984	1963	'checkuser-limited' => "'''Αυτά τα αποτελέσματα περικόπησαν για λόγους απόδοσης.'''",
1985	1964	'checkuser-log-userips' => 'Ο $1 πήρε τις IP διευθύνσεις για τον $2',
—	—	@@ -2063,7 +2042,6 @@
2064	2043	'checkuser-search-initiator' => 'inicianto',
2065	2044	'checkuser-search-target' => 'celo',
2066	2045	'checkuser-ipeditcount' => '~$1 de ĉiuj uzantoj',
2067		~~- 'checkuser-log-subpage' => 'Protokolo',~~
2068	2046	'checkuser-log-return' => 'Reiru al ĉefa kamparo por kontroli uzantojn',
2069	2047	'checkuser-limited' => "'''Ĉi tiuj rezultoj estis stumpigitaj pro laborecaj kialoj.",
2070	2048	'checkuser-log-userips' => '$1 akiris IP-adresojn por $2',
—	—	@@ -2164,7 +2142,6 @@
2165	2143	'checkuser-search-initiator' => 'verificador',
2166	2144	'checkuser-search-target' => 'usuario verificado',
2167	2145	'checkuser-ipeditcount' => '~$1 de todos los usuarios',
2168		~~- 'checkuser-log-subpage' => 'Registro',~~
2169	2146	'checkuser-log-return' => 'Volver al formulario principal de CheckUser',
2170	2147	'checkuser-limited' => "'''Estos resultados han sido truncados por motivos de rendimiento.'''",
2171	2148	'checkuser-log-userips' => '$1 obtuvo las direcciones IP de $2',
—	—	@@ -2240,7 +2217,6 @@
2241	2218	'checkuser-search-initiator' => 'kontrollija',
2242	2219	'checkuser-search-target' => 'kontrollitav',
2243	2220	'checkuser-ipeditcount' => '~$1 kõigilt kasutajatelt',
2244		~~- 'checkuser-log-subpage' => 'Logi',~~
2245	2221	'checkuser-log-return' => 'Naase kasutajakontrolli peavormi juurde',
2246	2222	'checkuser-log-userips' => '$1 hankis kasutaja $2 IP-aadressid',
2247	2223	'checkuser-log-ipedits' => '$1 hankis IP-aadressi $2 tehtud muudatused',
—	—	@@ -2287,7 +2263,6 @@
2288	2264	'checkuser-block-limit' => 'Lankide gehiegi hautatu duzu.',
2289	2265	'checkuser-search-submit' => 'Bilatu',
2290	2266	'checkuser-search-target' => 'helburua',
2291		~~- 'checkuser-log-subpage' => 'Erregistroa',~~
2292	2267	'checkuser-autocreate-action' => 'automatikoki sortua izan da',
2293	2268	'checkuser-email-action' => '"$1" lankideari posta elektroniko bat bidali',
2294	2269	'checkuser-reset-action' => '"$1" lankideari pasahitza berrezarri',
—	—	@@ -2373,7 +2348,6 @@
2374	2349	'checkuser-search-initiator' => 'آغازگر',
2375	2350	'checkuser-search-target' => 'هدف',
2376	2351	'checkuser-ipeditcount' => '~$1 از همهٔ کاربران',
2377		~~- 'checkuser-log-subpage' => 'سیاهه',~~
2378	2352	'checkuser-log-return' => 'بازگشت به فرم اصلی بازرسی کاربر',
2379	2353	'checkuser-limited' => "'''این نتایج برای کارآیی سامانه کوتاه شده‌اند.'''",
2380	2354	'checkuser-log-userips' => '$1 نشانی‌های آی‌پی $2 را گرفت',
—	—	@@ -2463,7 +2437,6 @@
2464	2438	'checkuser-search-initiator' => 'alullepanija',
2465	2439	'checkuser-search-target' => 'kohde',
2466	2440	'checkuser-ipeditcount' => 'noin $1 muokkausta kaikilta käyttäjiltä',
2467		~~- 'checkuser-log-subpage' => 'Loki',~~
2468	2441	'checkuser-log-return' => 'Palaa osoitepaljastimen päälomakkeeseen',
2469	2442	'checkuser-limited' => "'''Nämä tulokset on lyhennetty suorituskykysyistä.'''",
2470	2443	'checkuser-log-userips' => '$1 haki käyttäjän $2 IP-osoitteet',
—	—	@@ -2566,7 +2539,6 @@
2567	2540	'checkuser-search-initiator' => 'l’initiateur',
2568	2541	'checkuser-search-target' => 'la cible',
2569	2542	'checkuser-ipeditcount' => '~$1 par tous les utilisateurs',
2570		~~- 'checkuser-log-subpage' => 'Journal',~~
2571	2543	'checkuser-log-return' => 'Retourner au formulaire principal du vérificateur d’utilisateur',
2572	2544	'checkuser-limited' => "'''Ces résultats ont été tronqués pour des raisons liées à la performance.'''",
2573	2545	'checkuser-log-userips' => '$1 a obtenu des IP utilisées par « $2 »',
—	—	@@ -2678,7 +2650,6 @@
2679	2651	'checkuser-search-initiator' => 'l’iniciator',
2680	2652	'checkuser-search-target' => 'la ciba',
2681	2653	'checkuser-ipeditcount' => '~$1 per tôs los usanciérs',
2682		~~- 'checkuser-log-subpage' => 'Jornal',~~
2683	2654	'checkuser-log-return' => 'Tornar u formulèro principâl du contrôlo d’usanciér',
2684	2655	'checkuser-limited' => "'''Cetos rèsultats ont étâ tronchiês por des rêsons liyês a la pèrformence.'''",
2685	2656	'checkuser-log-userips' => '$1 at obtegnu des IP por $2',
—	—	@@ -2746,7 +2717,6 @@
2747	2718	'checkuser-search-initiator' => 'tionscnóir',
2748	2719	'checkuser-search-target' => 'targaid',
2749	2720	'checkuser-ipeditcount' => '~$1 as na n-úsáideoir go léir',
2750		~~- 'checkuser-log-subpage' => 'Log',~~
2751	2721	'checkuser-log-userips' => 'Fuair $1 seolaidh IP le $2',
2752	2722	'checkuser-log-ipedits' => 'Fuair $1 athruithe le $2',
2753	2723	'checkuser-log-ipusers' => 'Fuair $1 úsáideoirí le $2',
—	—	@@ -2842,7 +2812,6 @@
2843	2813	'checkuser-search-initiator' => 'iniciador',
2844	2814	'checkuser-search-target' => 'destino',
2845	2815	'checkuser-ipeditcount' => '~$1 de todos os usuarios',
2846		~~- 'checkuser-log-subpage' => 'Rexistro',~~
2847	2816	'checkuser-log-return' => 'Volver ao formulario principal de verificador de usuarios',
2848	2817	'checkuser-limited' => "'''Estes resultados foron truncados por motivos de rendemento.'''",
2849	2818	'checkuser-log-userips' => '$1 obteu os enderezos IP de "$2"',
—	—	@@ -2878,7 +2847,6 @@
2879	2848	'checkuser-search-submit' => 'Ζητεῖν',
2880	2849	'checkuser-search-initiator' => 'ἐγκαινιαστής',
2881	2850	'checkuser-search-target' => 'στόχος',
2882		~~- 'checkuser-log-subpage' => 'Κατάλογος',~~
2883	2851	);
2884	2852
2885	2853	/** Swiss German (Alemannisch)
—	—	@@ -2944,7 +2912,6 @@
2945	2913	'checkuser-search-initiator' => 'CheckUser-Berächtigter',
2946	2914	'checkuser-search-target' => 'Abfrogziil (Benutzerkonto/IP)',
2947	2915	'checkuser-ipeditcount' => '~$1 vu allene Benutzer',
2948		~~- 'checkuser-log-subpage' => 'Logbuech',~~
2949	2916	'checkuser-log-return' => 'Zruck zum CheckUser-Hauptformular',
2950	2917	'checkuser-limited' => "'''D Ergebnislischt isch us Performancegrind gchirzt wore.'''",
2951	2918	'checkuser-log-userips' => '$1 het IP-Adrässe fir $2 gholt',
—	—	@@ -3072,7 +3039,6 @@
3073	3040	'checkuser-search-initiator' => 'בודק',
3074	3041	'checkuser-search-target' => 'נבדק',
3075	3042	'checkuser-ipeditcount' => 'בערך $1 מכל המשתמשים',
3076		~~- 'checkuser-log-subpage' => 'יומן',~~
3077	3043	'checkuser-log-return' => 'חזרה לטופס הבדיקה הכללי',
3078	3044	'checkuser-limited' => "'''הדף נקטע כדי לחסוך במשאבים.'''",
3079	3045	'checkuser-log-userips' => '$1 בדק את כתובות ה־IP של $2',
—	—	@@ -3152,7 +3118,6 @@
3153	3119	'checkuser-search-initiator' => 'चालक',
3154	3120	'checkuser-search-target' => 'लक्ष्य',
3155	3121	'checkuser-ipeditcount' => '~$1 सभी सदस्योंसे',
3156		~~- 'checkuser-log-subpage' => 'लॉग',~~
3157	3122	'checkuser-log-return' => 'सदस्यजाँच मुखपृष्ठपर वापस जायें',
3158	3123	'checkuser-log-userips' => '$1 के पास $2 के लिये आईपी हैं',
3159	3124	'checkuser-log-ipedits' => '$1 के पास $2 के लिये बदलाव हैं',
—	—	@@ -3240,7 +3205,6 @@
3241	3206	'checkuser-search-initiator' => 'provjeritelj',
3242	3207	'checkuser-search-target' => 'cilj (traženi pojam)',
3243	3208	'checkuser-ipeditcount' => '~$1 od svih suradnika',
3244		~~- 'checkuser-log-subpage' => 'Evidencija',~~
3245	3209	'checkuser-log-return' => 'Vrati se na stranicu za provjeru',
3246	3210	'checkuser-limited' => "'''Ovi rezultati su skraćeni zbog veće učinkovitosti izvođenja.'''",
3247	3211	'checkuser-log-userips' => '$1 tražio je IP adrese suradnika $2',
—	—	@@ -3320,7 +3284,6 @@
3321	3285	'checkuser-search-initiator' => 'iniciator',
3322	3286	'checkuser-search-target' => 'cil',
3323	3287	'checkuser-ipeditcount' => '~$1 wot wšěch wužiwarjow',
3324		~~- 'checkuser-log-subpage' => 'Protokol',~~
3325	3288	'checkuser-log-return' => 'Wróćo k hłownemu formularej CheckUser',
3326	3289	'checkuser-limited' => "'''Tute wuslědki buchu z wukonowych přičinow wobrězane.'''",
3327	3290	'checkuser-log-userips' => '$1 dósta IP za $2',
—	—	@@ -3411,7 +3374,6 @@
3412	3375	'checkuser-search-initiator' => 'kezdeményező',
3413	3376	'checkuser-search-target' => 'Cél',
3414	3377	'checkuser-ipeditcount' => '~$1 az összes szerkesztő által',
3415		~~- 'checkuser-log-subpage' => 'Lista',~~
3416	3378	'checkuser-log-return' => 'Vissza az IP-ellenőri oldalra',
3417	3379	'checkuser-limited' => "'''Teljesítményi okok miatt nem az összes találat lett megjelenítve.'''",
3418	3380	'checkuser-log-userips' => '$1 lekérte $2 IP-címeit',
—	—	@@ -3503,7 +3465,6 @@
3504	3466	'checkuser-search-initiator' => 'initiator',
3505	3467	'checkuser-search-target' => 'objectivo',
3506	3468	'checkuser-ipeditcount' => '~$1 de tote le usatores',
3507		~~- 'checkuser-log-subpage' => 'Registro',~~
3508	3469	'checkuser-log-return' => 'Retornar al formulario principal del verification de usatores',
3509	3470	'checkuser-limited' => "'''Iste resultatos ha essite truncate pro motivos de prestationes.'''",
3510	3471	'checkuser-log-userips' => '$1 obteneva IPs pro $2',
—	—	@@ -3590,7 +3551,6 @@
3591	3552	'checkuser-search-initiator' => 'pemeriksa',
3592	3553	'checkuser-search-target' => 'target',
3593	3554	'checkuser-ipeditcount' => '~$1 dari seluruh pengguna',
3594		~~- 'checkuser-log-subpage' => 'Log',~~
3595	3555	'checkuser-log-return' => 'Kembali ke halaman utama Pemeriksa',
3596	3556	'checkuser-limited' => "'''Hasil berikut telah dipotong agar tidak menurunkan kinerja.'''",
3597	3557	'checkuser-log-userips' => '$1 melihat IP dari $2',
—	—	@@ -3628,7 +3588,6 @@
3629	3589	'checkuser-search-submit' => 'Chọwa',
3630	3590	'checkuser-search-initiator' => 'onyé bịdòrò',
3631	3591	'checkuser-search-target' => 'nkèọnejé',
3632		~~- 'checkuser-log-subpage' => 'Ndetu-nchétá',~~
3633	3592	'checkuser-log-useredits' => '$1 nwèrè orü màkà $2',
3634	3593	);
3635	3594
—	—	@@ -3699,7 +3658,6 @@
3700	3659	'checkuser-search-initiator' => 'nangrugi',
3701	3660	'checkuser-search-target' => 'puntaan',
3702	3661	'checkuser-ipeditcount' => '~$1 manipud kadagiti agar-aramat',
3703		~~- 'checkuser-log-subpage' => 'Listaan',~~
3704	3662	'checkuser-log-return' => 'Agsubli idiay umuna a nakabuklan ti CheckUser',
3705	3663	'checkuser-limited' => "'''Dagitoy a nagbanagan ket napasardeng para iti pannaka-aramid a rason.'''",
3706	3664	'checkuser-log-userips' => '$1 ket nakaala ti IP a pagtaengan para iti $2',
—	—	@@ -3756,7 +3714,6 @@
3757	3715	'checkuser-locked' => 'Læstur',
3758	3716	'checkuser-accounts' => '$1 {{PLURAL:$1\|nýr aðgangur\|nýir aðgangar}}',
3759	3717	'checkuser-search-submit' => 'Leita',
3760		~~- 'checkuser-log-subpage' => 'Skrá',~~
3761	3718	);
3762	3719
3763	3720	/** Italian (Italiano)
—	—	@@ -3834,7 +3791,6 @@
3835	3792	'checkuser-search-initiator' => 'iniziatore',
3836	3793	'checkuser-search-target' => 'obiettivo',
3837	3794	'checkuser-ipeditcount' => '~$1 complessivamente',
3838		~~- 'checkuser-log-subpage' => 'Log',~~
3839	3795	'checkuser-log-return' => 'Torna al modulo principale di Controllo utenze',
3840	3796	'checkuser-limited' => "'''I risultati sono stati troncati per motivi di prestazioni.'''",
3841	3797	'checkuser-log-userips' => '$1 ha ottenuto gli indirizzi IP di $2',
—	—	@@ -3925,7 +3881,6 @@
3926	3882	'checkuser-search-initiator' => '調査実行者',
3927	3883	'checkuser-search-target' => '調査対象者',
3928	3884	'checkuser-ipeditcount' => '全利用者からの編集回数～$1',
3929		~~- 'checkuser-log-subpage' => 'ログ',~~
3930	3885	'checkuser-log-return' => '利用者調査のメインフォームへ戻る',
3931	3886	'checkuser-limited' => "'''パフォーマンスの都合から結果は省略されています。'''",
3932	3887	'checkuser-log-userips' => '$1 は $2 が使用したIPアドレスを取得',
—	—	@@ -3974,7 +3929,6 @@
3975	3930	'checkuser-search-submit' => 'Søg',
3976	3931	'checkuser-search-initiator' => 'initiatår',
3977	3932	'checkuser-search-target' => 'mål',
3978		~~- 'checkuser-log-subpage' => 'Log',~~
3979	3933	'checkuser-log-return' => 'Gå tilbage til hovedformularen for checkbruger',
3980	3934	'checkuser-log-userips' => "$1 fik IP'er for $2",
3981	3935	'checkuser-log-ipedits' => '$1 fik redigeringer for $2',
—	—	@@ -4043,7 +3997,6 @@
4044	3998	'checkuser-search-initiator' => 'pamriksa',
4045	3999	'checkuser-search-target' => 'tujuan',
4046	4000	'checkuser-ipeditcount' => '~$1 saka kabèh panganggo',
4047		~~- 'checkuser-log-subpage' => 'Log',~~
4048	4001	'checkuser-log-return' => 'Bali menyang kaca utama pamriksa',
4049	4002	'checkuser-limited' => "'''Kasil iki wis dicekak amarga alesan kinerja.'''",
4050	4003	'checkuser-log-userips' => '$1 ndeleng IP saka $2',
—	—	@@ -4120,7 +4073,6 @@
4121	4074	'checkuser-search-initiator' => 'ინიციატორი',
4122	4075	'checkuser-search-target' => 'მიზანი',
4123	4076	'checkuser-ipeditcount' => '~$1 ყველა მომხმარებლისგან',
4124		~~- 'checkuser-log-subpage' => 'ჟურნალი',~~
4125	4077	'checkuser-log-return' => 'მომხმარებელთა შემოწმების გვერდზე დაბრუნება',
4126	4078	'checkuser-limited' => "'''რეზულტატები შეიკუმშა სერვერზე დამატებითი დატვირთვის არ შექმნის მიზნით.'''",
4127	4079	'checkuser-log-userips' => '$1 მიიღო IP $2-თვის',
—	—	@@ -4166,7 +4118,6 @@
4167	4119	'checkuser-search-submit' => 'ىزدەۋ',
4168	4120	'checkuser-search-initiator' => 'باستاماشى',
4169	4121	'checkuser-search-target' => 'نىسانا',
4170		~~- 'checkuser-log-subpage' => 'جۋرنال',~~
4171	4122	'checkuser-log-return' => 'CheckUser باسقى پىشىنىنە ورالۋ',
4172	4123	'checkuser-log-userips' => '$2 ٴۇشىن $1 IP جاي الىندى',
4173	4124	'checkuser-log-ipedits' => '$2 ٴۇشىن $1 تۇزەتۋ الىندى',
—	—	@@ -4206,7 +4157,6 @@
4207	4158	'checkuser-search-submit' => 'Іздеу',
4208	4159	'checkuser-search-initiator' => 'бастамашы',
4209	4160	'checkuser-search-target' => 'нысана',
4210		~~- 'checkuser-log-subpage' => 'Журнал',~~
4211	4161	'checkuser-log-return' => 'CheckUser басқы пішініне оралу',
4212	4162	'checkuser-log-userips' => '$2 үшін $1 IP жай алынды',
4213	4163	'checkuser-log-ipedits' => '$2 үшін $1 түзету алынды',
—	—	@@ -4246,7 +4196,6 @@
4247	4197	'checkuser-search-submit' => 'İzdew',
4248	4198	'checkuser-search-initiator' => 'bastamaşı',
4249	4199	'checkuser-search-target' => 'nısana',
4250		~~- 'checkuser-log-subpage' => 'Jwrnal',~~
4251	4200	'checkuser-log-return' => 'CheckUser basqı pişinine oralw',
4252	4201	'checkuser-log-userips' => '$2 üşin $1 IP jaý alındı',
4253	4202	'checkuser-log-ipedits' => '$2 üşin $1 tüzetw alındı',
—	—	@@ -4322,7 +4271,6 @@
4323	4272	'checkuser-search-initiator' => 'អ្នកផ្ដួចផ្ដើម',
4324	4273	'checkuser-search-target' => 'គោលដៅ',
4325	4274	'checkuser-ipeditcount' => '~$1 ពីគ្រប់អ្នកប្រើប្រាស់ទាំងអស់',
4326		~~- 'checkuser-log-subpage' => 'កំណត់ហេតុ',~~
4327	4275	'checkuser-log-return' => 'ត្រឡប់ទៅកាន់បែបបទដើមនៃការត្រួតពិនិត្យអ្នកប្រើប្រាស់',
4328	4276	'checkuser-log-userips' => '$1បានទទួល IPs ដែល$2បានប្រើប្រាស់',
4329	4277	'checkuser-log-ipedits' => '$1បានទទួលចំនួនកំណែប្រែពី$2',
—	—	@@ -4417,7 +4365,6 @@
4418	4366	'checkuser-search-initiator' => '체크유저',
4419	4367	'checkuser-search-target' => '대상',
4420	4368	'checkuser-ipeditcount' => '모든 사용자로부터 $1개의 편집',
4421		~~- 'checkuser-log-subpage' => '기록',~~
4422	4369	'checkuser-log-return' => '체크유저 양식으로 돌아가기',
4423	4370	'checkuser-limited' => "'''성능상의 이유로 결과 중 일부만 보여줍니다.'''",
4424	4371	'checkuser-log-userips' => '$1 사용자는 $2 사용자가 사용한 IP 주소를 열람했습니다.',
—	—	@@ -4523,7 +4470,6 @@
4524	4471	'checkuser-search-initiator' => 'Metmaacher-Pröfer',
4525	4472	'checkuser-search-target' => 'Wat eß jefrooch? (Metmaacher-Name udder IP-Address)',
4526	4473	'checkuser-ipeditcount' => '~$1 Änderonge fun alle Metmaacher',
4527		~~- 'checkuser-log-subpage' => 'Logboch',~~
4528	4474	'checkuser-log-return' => 'Zerök zor Sigg „Metmaacher Pröfe“',
4529	4475	'checkuser-limited' => "'''De Leß es affjeschnedde, öm nit der Server unnüdesch ze belaste.'''",
4530	4476	'checkuser-log-userips' => '$1 hät IP-Adresse jehollt för $2',
—	—	@@ -4626,7 +4572,6 @@
4627	4573	'checkuser-search-initiator' => 'Initiator',
4628	4574	'checkuser-search-target' => 'Zil',
4629	4575	'checkuser-ipeditcount' => '~$1 vun alle Benotzer',
4630		~~- 'checkuser-log-subpage' => 'Lëscht',~~
4631	4576	'checkuser-log-return' => 'Zréck op den Haaptformulaire vun der Benotzerkontroll',
4632	4577	'checkuser-limited' => "'''Dës Lëscht gouf aus Grënn vun der performance vun de Servere gekierzt.'''",
4633	4578	'checkuser-log-userips' => '$1 krut IPen fir $2',
—	—	@@ -4718,7 +4663,6 @@
4719	4664	'checkuser-search-initiator' => 'aanvraoger',
4720	4665	'checkuser-search-target' => 'óngerwèrp',
4721	4666	'checkuser-ipeditcount' => '~$1 van alle gebroekers',
4722		~~- 'checkuser-log-subpage' => 'Logbook',~~
4723	4667	'checkuser-log-return' => "Nao 't huidformeleer van KonterleerGebroeker trökgaon",
4724	4668	'checkuser-limited' => "'''Dees rizzeltaote zeen neet gans óm perstaasjereeje.'''",
4725	4669	'checkuser-log-userips' => '$1 haet IP-adresse veur $2',
—	—	@@ -4790,7 +4734,6 @@
4791	4735	'checkuser-search-submit' => 'Ieškoti',
4792	4736	'checkuser-search-target' => 'taikinys',
4793	4737	'checkuser-ipeditcount' => '~$1 iš visų vartotojų',
4794		~~- 'checkuser-log-subpage' => 'Sąrašas',~~
4795	4738	'checkuser-log-userips' => '$1 gavo IP adresų $2',
4796	4739	'checkuser-autocreate-action' => 'buvo automatiškai sukurtas',
4797	4740	'checkuser-create-action' => 'buvo sukurta',
—	—	@@ -4933,7 +4876,6 @@
4934	4877	'checkuser-search-initiator' => 'иницијатор',
4935	4878	'checkuser-search-target' => 'цел',
4936	4879	'checkuser-ipeditcount' => '~$1 од сите корисници',
4937		~~- 'checkuser-log-subpage' => 'Дневник',~~
4938	4880	'checkuser-log-return' => 'Назад на главниот образец за проверување корисници',
4939	4881	'checkuser-limited' => "'''Резултатите се скратени од функционални причини.'''",
4940	4882	'checkuser-log-userips' => '$1 добил(а) IP-адреси за $2',
—	—	@@ -5017,7 +4959,6 @@
5018	4960	'checkuser-search-initiator' => 'മുൻകൈ എടുക്കുന്ന ആൾ',
5019	4961	'checkuser-search-target' => 'ലക്ഷ്യം',
5020	4962	'checkuser-ipeditcount' => '~$1എല്ലാ ഉപയോക്താക്കളിൽ നിന്നും',
5021		~~- 'checkuser-log-subpage' => 'പ്രവർത്തനരേഖ',~~
5022	4963	'checkuser-log-return' => 'ചെക്ക് യൂസറിന്റെ പ്രധാന ഫോമിലേക്ക് തിരിച്ചു പോവുക',
5023	4964	'checkuser-limited' => "'''പ്രവർത്തന മികവു സംബന്ധിച്ച പ്രശ്നങ്ങളാൽ ഫലങ്ങൾ വെട്ടിച്ചുരുക്കിയിരിക്കുന്നു.'''",
5024	4965	'checkuser-log-userips' => '$1നു $2ൽ ഐ.പി.കൾ ഉണ്ട്',
—	—	@@ -5088,7 +5029,6 @@
5089	5030	'checkuser-search-initiator' => 'चालक (चालना देणारा)',
5090	5031	'checkuser-search-target' => 'लक्ष्य',
5091	5032	'checkuser-ipeditcount' => '~$1 सर्व सदस्यांकडून',
5092		~~- 'checkuser-log-subpage' => 'नोंदी',~~
5093	5033	'checkuser-log-return' => 'CheckUser मुख्य अर्जाकडे परत जा',
5094	5034	'checkuser-log-userips' => '$1 कडे $2 साठीचे अंकपत्ते आहेत',
5095	5035	'checkuser-log-ipedits' => '$1 कडे $2 साठीची संपादने आहेत',
—	—	@@ -5164,7 +5104,6 @@
5165	5105	'checkuser-search-initiator' => 'pengasal',
5166	5106	'checkuser-search-target' => 'sasaran',
5167	5107	'checkuser-ipeditcount' => '~$1 daripada semua pengguna',
5168		~~- 'checkuser-log-subpage' => 'Log',~~
5169	5108	'checkuser-log-return' => 'Kembali ke borang utama Pemeriksa',
5170	5109	'checkuser-limited' => 'Hasil-hasil berikut telah dipendekkan atas sebab-sebab prestasi.',
5171	5110	'checkuser-log-userips' => '$1 mendapatkan senarai IP bagi $2',
—	—	@@ -5295,7 +5234,6 @@
5296	5235	'checkuser-search-initiator' => 'IP-kontrolløren',
5297	5236	'checkuser-search-target' => 'målet',
5298	5237	'checkuser-ipeditcount' => '~$1 fra alle brukere',
5299		~~- 'checkuser-log-subpage' => 'Logg',~~
5300	5238	'checkuser-log-return' => 'Tilbake til hovedskjema for brukersjekking',
5301	5239	'checkuser-limited' => "'''Disse resultatene har blitt avkortet av ytelsesgrunner.'''",
5302	5240	'checkuser-log-userips' => '$1 fikk IP-adressene til $2',
—	—	@@ -5373,7 +5311,6 @@
5374	5312	'checkuser-search-initiator' => 'Initiater',
5375	5313	'checkuser-search-target' => 'Ziel',
5376	5314	'checkuser-ipeditcount' => '~$1 vun all Brukers',
5377		~~- 'checkuser-log-subpage' => 'Logbook',~~
5378	5315	'checkuser-log-return' => 'Trüch na dat CheckUser-Hööftformular',
5379	5316	'checkuser-limited' => "'''De List mit Resultaten is to lang wesen un körter maakt worrn.'''",
5380	5317	'checkuser-log-userips' => '$1 hett IP-Adressen för $2 rutsöcht',
—	—	@@ -5502,7 +5439,6 @@
5503	5440	'checkuser-search-initiator' => 'aanvrager',
5504	5441	'checkuser-search-target' => 'onderwerp',
5505	5442	'checkuser-ipeditcount' => '~$1 van alle gebruikers',
5506		~~- 'checkuser-log-subpage' => 'Logboek',~~
5507	5443	'checkuser-log-return' => 'Naar het hoofdformulier van GebruikerControleren terugkeren',
5508	5444	'checkuser-limited' => "'''Deze resultaten zijn niet volledig om prestatieredenen.'''",
5509	5445	'checkuser-log-userips' => '$1 heeft de IP-adressen door $2 opgevraagd',
—	—	@@ -5586,7 +5522,6 @@
5587	5523	'checkuser-search-initiator' => 'igangsetjar',
5588	5524	'checkuser-search-target' => 'mål',
5589	5525	'checkuser-ipeditcount' => '~$1 frå alle brukarar',
5590		~~- 'checkuser-log-subpage' => 'Logg',~~
5591	5526	'checkuser-log-return' => 'Attende til hovudskjema for brukarsjekking',
5592	5527	'checkuser-limited' => "'''Desse resultata har vortne avkorta av ytegrunnar.'''",
5593	5528	'checkuser-log-userips' => '$1 fekk IP-adressene til $2',
—	—	@@ -5694,7 +5629,6 @@
5695	5630	'checkuser-search-initiator' => 'l’iniciaire',
5696	5631	'checkuser-search-target' => 'la cibla',
5697	5632	'checkuser-ipeditcount' => '~$1 per totes los utilizaires',
5698		~~- 'checkuser-log-subpage' => 'Jornal',~~
5699	5633	'checkuser-log-return' => "Tornar al formulari principal de la verificacion d'utilizaire",
5700	5634	'checkuser-limited' => "'''Aquestes resultats son estats troncats per de rasons ligadas a la performància.'''",
5701	5635	'checkuser-log-userips' => "$1 a obtengut d'IP per $2",
—	—	@@ -5770,7 +5704,6 @@
5771	5705	'checkuser-search-initiator' => 'ଆରମ୍ଭକାରୀ',
5772	5706	'checkuser-search-target' => 'ଲକ୍ଷ',
5773	5707	'checkuser-ipeditcount' => 'ସବୁ ବ୍ୟବହରକାରୀଙ୍କ ଠାରୁ ~$1',
5774		~~- 'checkuser-log-subpage' => 'ଲଗ୍',~~
5775	5708	'checkuser-log-return' => 'CheckUser ମୂଳ ଆବେଦନ ପତ୍ରକୁ ଫେରିଯାନ୍ତୁ',
5776	5709	'checkuser-log-userips' => '$1ଙ୍କ ପାଖରେ $2 ପାଇଁ IP ଠିକଣା ରହିଛି',
5777	5710	'checkuser-log-ipedits' => '$1, $2ଙ୍କ ପାଇଁ ସମ୍ପାଦନା କରିଛନ୍ତି',
—	—	@@ -5896,8 +5829,7 @@
5897	5830	'checkuser-search-initiator' => 'sprawdzającym',
5898	5831	'checkuser-search-target' => 'sprawdzanym',
5899	5832	'checkuser-ipeditcount' => '~$1 od wszystkich użytkowników',
5900		~~- 'checkuser-log-subpage' => 'Rejestr',~~
5901		~~- 'checkuser-log-return' => 'Powrót do głównego formularza CheckUser',~~
	5833	+ 'checkuser-log-return' => 'Przejście do głównego formularza CheckUser',
5902	5834	'checkuser-limited' => "'''Długość listy wyników została ograniczona ze względu na wydajność.'''",
5903	5835	'checkuser-log-userips' => '$1 otrzymał adresy IP używane przez $2',
5904	5836	'checkuser-log-ipedits' => '$1 otrzymał historię edycji dla $2',
—	—	@@ -5980,7 +5912,6 @@
5981	5913	'checkuser-search-initiator' => 'inissiador',
5982	5914	'checkuser-search-target' => 'obietiv',
5983	5915	'checkuser-ipeditcount' => "~$1 da tùit j'utent",
5984		~~- 'checkuser-log-subpage' => 'Registr',~~
5985	5916	'checkuser-log-return' => "Torna a la forma prinsipal dël Controlor dj'utent",
5986	5917	'checkuser-limited' => "'''Sti arzultà-sì a son ëstàit troncà për rason ëd prestassion.'''",
5987	5918	'checkuser-log-userips' => "$1 a l'ha pijà j'adrësse IP da $2",
—	—	@@ -6030,7 +5961,6 @@
6031	5962	'checkuser-search-initiator' => 'پېلوونکی',
6032	5963	'checkuser-search-target' => 'موخه',
6033	5964	'checkuser-ipeditcount' => '~$1 د ټولو کارنانو نه',
6034		~~- 'checkuser-log-subpage' => 'يادښت',~~
6035	5965	'checkuser-log-userips' => '$1 د $2 آی پي پتې ترلاسه کړې',
6036	5966	'checkuser-autocreate-action' => 'په خپلکاره توګه جوړ شو',
6037	5967	'checkuser-create-action' => 'جوړ شو',
—	—	@@ -6108,7 +6038,6 @@
6109	6039	'checkuser-search-initiator' => 'iniciador',
6110	6040	'checkuser-search-target' => 'alvo',
6111	6041	'checkuser-ipeditcount' => '~$1 de todos os utilizadores',
6112		~~- 'checkuser-log-subpage' => 'Registo',~~
6113	6042	'checkuser-log-return' => 'Retornar ao formulário principal de CheckUser',
6114	6043	'checkuser-limited' => "'''Estes resultados foram removidos por motivos de performance.'''",
6115	6044	'checkuser-log-userips' => '$1 obteve IPs de $2',
—	—	@@ -6195,7 +6124,6 @@
6196	6125	'checkuser-search-initiator' => 'iniciador',
6197	6126	'checkuser-search-target' => 'alvo',
6198	6127	'checkuser-ipeditcount' => '~$1 de todos os usuários',
6199		~~- 'checkuser-log-subpage' => 'Registro',~~
6200	6128	'checkuser-log-return' => 'Retornar ao formulário principal de CheckUser',
6201	6129	'checkuser-limited' => "'''Estes resultados foram removidos por motivos de performance.'''",
6202	6130	'checkuser-log-userips' => '$1 obteve IPs de $2',
—	—	@@ -6252,7 +6180,6 @@
6253	6181	'checkuser-search-submit' => 'Maskay',
6254	6182	'checkuser-search-initiator' => 'qallarichiq',
6255	6183	'checkuser-search-target' => 'taripana',
6256		~~- 'checkuser-log-subpage' => "Hallch'a",~~
6257	6184	);
6258	6185
6259	6186	/** Tarifit (Tarifit)
—	—	@@ -6347,7 +6274,6 @@
6348	6275	'checkuser-search-initiator' => 'inițiator',
6349	6276	'checkuser-search-target' => 'destinație',
6350	6277	'checkuser-ipeditcount' => '~$1 de la toți utilizatorii',
6351		~~- 'checkuser-log-subpage' => 'Jurnal',~~
6352	6278	'checkuser-log-return' => 'Revenire la formularul principal Verifică Utilizatorul',
6353	6279	'checkuser-limited' => "'''Aceste rezultate au fost sortate din motive de performanță.'''",
6354	6280	'checkuser-log-userips' => '$1 a verificat IP-urile lui $2',
—	—	@@ -6431,7 +6357,6 @@
6432	6358	'checkuser-search-initiator' => 'iniziatore',
6433	6359	'checkuser-search-target' => 'destinazione',
6434	6360	'checkuser-ipeditcount' => "~$1 da tutte l'utinde",
6435		~~- 'checkuser-log-subpage' => 'Archivije',~~
6436	6361	'checkuser-log-return' => "Tuèrne a 'u module prengepale de CheckUser",
6437	6362	'checkuser-limited' => "'''Chiste resultate onne state tagghiate pe mutive de performance.'''",
6438	6363	'checkuser-log-userips' => '$1 ha pigghiete le IP pe $2',
—	—	@@ -6525,7 +6450,6 @@
6526	6451	'checkuser-search-initiator' => 'инициатор',
6527	6452	'checkuser-search-target' => 'цель',
6528	6453	'checkuser-ipeditcount' => '~$1 от всех участников',
6529		~~- 'checkuser-log-subpage' => 'Журнал',~~
6530	6454	'checkuser-log-return' => 'Возврат к странице проверки участников',
6531	6455	'checkuser-limited' => "'''Результаты были усечены чтобы не создавать дополнительной нагрузки на сервер.'''",
6532	6456	'checkuser-log-userips' => '$1 получил IP адреса для $2',
—	—	@@ -6603,7 +6527,6 @@
6604	6528	'checkuser-search-initiator' => 'ініціатор',
6605	6529	'checkuser-search-target' => 'ціль',
6606	6530	'checkuser-ipeditcount' => 'асі $1 од вшыткых хоснователїв',
6607		~~- 'checkuser-log-subpage' => 'Лоґ',~~
6608	6531	'checkuser-log-return' => 'Навернутя на головный формуларь Перевіркы хоснователя',
6609	6532	'checkuser-limited' => "'''Резултаты были з выконостных причін скорочены.'''",
6610	6533	'checkuser-log-userips' => '$1 обтримав IP адресы про $2',
—	—	@@ -6700,7 +6623,6 @@
6701	6624	'checkuser-search-initiator' => 'саҕалааччы',
6702	6625	'checkuser-search-target' => 'сыал-сорук',
6703	6626	'checkuser-ipeditcount' => '~$1 бары кыттааччылартан',
6704		~~- 'checkuser-log-subpage' => 'Сурунаал',~~
6705	6627	'checkuser-log-return' => 'Кытааччылары бэрэбиэркэлээһин сүрүн сирэйигэр төнүн',
6706	6628	'checkuser-limited' => "'''Түмүк, сиэрбэри наһаа ноҕуруускалаамаары, сорҕото быһыллыбыт.'''",
6707	6629	'checkuser-log-userips' => '$1 манна анаан $2 IP аадырыстаах',
—	—	@@ -6794,7 +6716,6 @@
6795	6717	'checkuser-search-initiator' => 'Nizziaturi',
6796	6718	'checkuser-search-target' => 'ubbiettivu',
6797	6719	'checkuser-ipeditcount' => "~$1 pi tutti pari l'utenti",
6798		~~- 'checkuser-log-subpage' => 'Log',~~
6799	6720	'checkuser-log-return' => 'Torna ô mòdulu principali di Cuntrollu utenzi',
6800	6721	'checkuser-limited' => "'''Li risurtati foru truncati pi mutivi di pristazzioni.'''",
6801	6722	'checkuser-log-userips' => '$1 uttinìu li nnirizzi IP di $2',
—	—	@@ -6866,7 +6787,6 @@
6867	6788	'checkuser-search-initiator' => 'ආරම්භකය',
6868	6789	'checkuser-search-target' => 'ඉලක්කය',
6869	6790	'checkuser-ipeditcount' => '~$1 සියලුම පරිශිලකයන්ගෙන්',
6870		~~- 'checkuser-log-subpage' => 'ලඝු සටහන',~~
6871	6791	'checkuser-log-return' => 'පරිශීලකපිරික්සුම් ප්‍රධාන ෆෝරමය වෙත නැවත යන්න',
6872	6792	'checkuser-limited' => "'''කාර්ය සාධනය හේතුන් නිසා ප්‍රතිපල ලුප්ත කරන ලදී.'''",
6873	6793	'checkuser-log-userips' => 'සංස්කරණය සඳහා $2 විසින් භාවිත කෙරුණු අන්තර්ජාල ලිපිනයන් $1 විසින් පරික්‍ෂා කොට දැනගෙන ඇත',
—	—	@@ -6946,7 +6866,6 @@
6947	6867	'checkuser-search-initiator' => 'začínajúci',
6948	6868	'checkuser-search-target' => 'cieľ',
6949	6869	'checkuser-ipeditcount' => 'asi $1 zo všetkých používateľov',
6950		~~- 'checkuser-log-subpage' => 'Záznam',~~
6951	6870	'checkuser-log-return' => 'Vrátiť sa na hlavný formulár CheckUser',
6952	6871	'checkuser-limited' => "'''Tieto výsledky boli z výkonnostných dôvodov skrátené.'''",
6953	6872	'checkuser-log-userips' => '$1 má IP adresy $2',
—	—	@@ -7028,7 +6947,6 @@
7029	6948	'checkuser-search-initiator' => 'sprožitelj',
7030	6949	'checkuser-search-target' => 'cilj',
7031	6950	'checkuser-ipeditcount' => '~$1 od vseh uporabnikov',
7032		~~- 'checkuser-log-subpage' => 'Dnevnik',~~
7033	6951	'checkuser-log-return' => 'Vrnitev na glavni obrazec CheckUser',
7034	6952	'checkuser-limited' => "'''Rezultati so bili okrnjeni iz zmogljivostnih razlogov.'''",
7035	6953	'checkuser-log-userips' => '$1 je pridobil(-a) IP-naslove $2',
—	—	@@ -7132,7 +7050,6 @@
7133	7051	'checkuser-search-initiator' => 'покретач',
7134	7052	'checkuser-search-target' => 'циљ',
7135	7053	'checkuser-ipeditcount' => '~$1 од свих корисника',
7136		~~- 'checkuser-log-subpage' => 'Дневник',~~
7137	7054	'checkuser-log-return' => 'Повратак на основну форму чекјузера.',
7138	7055	'checkuser-limited' => "'''Ови резултати су скраћени због перформанси.'''",
7139	7056	'checkuser-log-userips' => '$1 је добио ИП адресе за $2',
—	—	@@ -7213,7 +7130,6 @@
7214	7131	'checkuser-search-initiator' => 'pokretač',
7215	7132	'checkuser-search-target' => 'cilj',
7216	7133	'checkuser-ipeditcount' => '~$1 od svih korisnika',
7217		~~- 'checkuser-log-subpage' => 'log',~~
7218	7134	'checkuser-log-return' => 'Povratak na osnovnu formu čekjuzera.',
7219	7135	'checkuser-limited' => "'''Ovi rezultati su skraćeni zbog performansi.'''",
7220	7136	'checkuser-log-userips' => '$1 je dobio IP adrese za $2',
—	—	@@ -7291,7 +7207,6 @@
7292	7208	'checkuser-search-initiator' => 'Initiator',
7293	7209	'checkuser-search-target' => 'Siel',
7294	7210	'checkuser-ipeditcount' => '~$1 fon aal Benutsere',
7295		~~- 'checkuser-log-subpage' => 'Logbouk',~~
7296	7211	'checkuser-log-return' => 'Tourääch ätter dät CheckUser-Haudformular',
7297	7212	'checkuser-limited' => "'''Ju Resultoatelieste wuud uut Performancegruunden kuuted.'''",
7298	7213	'checkuser-log-userips' => '$1 hoalde IP-Adressen foar $2',
—	—	@@ -7338,7 +7253,6 @@
7339	7254	'checkuser-search-initiator' => 'inisiator',
7340	7255	'checkuser-search-target' => 'tujul',
7341	7256	'checkuser-ipeditcount' => '~$1 ti sakumna pamaké',
7342		~~- 'checkuser-log-subpage' => 'Log',~~
7343	7257	'checkuser-log-return' => 'Balik ka formulir utama PamakéPamariksa',
7344	7258	'checkuser-log-userips' => '$1 manggih IP ti $2',
7345	7259	'checkuser-log-ipedits' => '$1 manggih éditan ti $2',
—	—	@@ -7419,7 +7333,6 @@
7420	7334	'checkuser-search-initiator' => 'kontrollanten',
7421	7335	'checkuser-search-target' => 'kontrollmålet',
7422	7336	'checkuser-ipeditcount' => '~$1 från alla användare',
7423		~~- 'checkuser-log-subpage' => 'Logg',~~
7424	7337	'checkuser-log-return' => 'Gå tillbaka till formuläret för användarkontroll',
7425	7338	'checkuser-limited' => "'''Dessa resultat har av prestandaskäl blivit avkortade.'''",
7426	7339	'checkuser-log-userips' => '$1 hämtade IP-adresser för $2',
—	—	@@ -7463,7 +7376,6 @@
7464	7377	'checkuser-empty' => 'Kumbukumbu haina kitu.',
7465	7378	'checkuser-check' => 'Chagua',
7466	7379	'checkuser-search-submit' => 'Tafuta',
7467		~~- 'checkuser-log-subpage' => 'Kumbukumbu',~~
7468	7380	);
7469	7381
7470	7382	/** Silesian (Ślůnski)
—	—	@@ -7527,7 +7439,6 @@
7528	7440	'checkuser-search-submit' => 'தேடுக',
7529	7441	'checkuser-search-initiator' => 'தொடக்கக்காரர்',
7530	7442	'checkuser-search-target' => 'இலக்கு',
7531		~~- 'checkuser-log-subpage' => 'பதிகை (உள்நுழைவு)',~~
7532	7443	'checkuser-autocreate-action' => 'தானகவே உருவாக்கப்பட்டது',
7533	7444	);
7534	7445
—	—	@@ -7586,7 +7497,6 @@
7587	7498	'checkuser-search-initiator' => 'ఆరంభకుడు',
7588	7499	'checkuser-search-target' => 'లక్ష్యం',
7589	7500	'checkuser-ipeditcount' => 'వాడుకరులందరి నుండి ~$1',
7590		~~- 'checkuser-log-subpage' => 'చిట్టా',~~
7591	7501	'checkuser-log-return' => 'CheckUser ముఖ్య ఫారముకు వెళ్ళు',
7592	7502	'checkuser-log-userips' => '$2 కోసం $1 ఐపీలను తెచ్చింది',
7593	7503	'checkuser-log-ipedits' => '$2 కోసం $1 దిద్దుబాట్లను తెచ్చింది',
—	—	@@ -7673,7 +7583,6 @@
7674	7584	'checkuser-search-submit' => 'Ҷустуҷӯ',
7675	7585	'checkuser-search-initiator' => 'оғозгар',
7676	7586	'checkuser-search-target' => 'ҳадаф',
7677		~~- 'checkuser-log-subpage' => 'Гузориш',~~
7678	7587	'checkuser-log-return' => 'Бозгашт ба форми аслии бозрасии корбар',
7679	7588	'checkuser-log-userips' => '$1 нишонаҳои интернетии IP-ҳои $2ро гирифт',
7680	7589	'checkuser-log-ipedits' => '$1 вироишҳои $2ро гирифт',
—	—	@@ -7731,7 +7640,6 @@
7732	7641	'checkuser-search-submit' => 'Çustuçū',
7733	7642	'checkuser-search-initiator' => 'oƣozgar',
7734	7643	'checkuser-search-target' => 'hadaf',
7735		~~- 'checkuser-log-subpage' => 'Guzoriş',~~
7736	7644	'checkuser-log-return' => 'Bozgaşt ba formi asliji bozrasiji korbar',
7737	7645	'checkuser-log-userips' => '$1 nişonahoi internetiji IP-hoi $2ro girift',
7738	7646	'checkuser-log-ipedits' => '$1 viroişhoi $2ro girift',
—	—	@@ -7839,7 +7747,6 @@
7840	7748	'checkuser-search-initiator' => 'başladan',
7841	7749	'checkuser-search-target' => 'niýetlenilýän',
7842	7750	'checkuser-ipeditcount' => 'ähli ulanyjylardan ~$1',
7843		~~- 'checkuser-log-subpage' => 'Gündelik',~~
7844	7751	'checkuser-log-userips' => '$1, $2 üçin IP adresleri aldy',
7845	7752	'checkuser-log-ipedits' => '$1, $2 üçin özgerdişleri aldy',
7846	7753	'checkuser-log-ipusers' => '$1, $2 üçin ulanyjylary aldy',
—	—	@@ -7917,7 +7824,6 @@
7918	7825	'checkuser-search-initiator' => 'tagapagsimula',
7919	7826	'checkuser-search-target' => 'puntirya',
7920	7827	'checkuser-ipeditcount' => '~$1 mula sa lahat ng mga tagagamit',
7921		~~- 'checkuser-log-subpage' => 'Itala',~~
7922	7828	'checkuser-log-return' => 'Bumalik sa pangunahing pormularyong SuriinTagagamit<!--CheckUser-->',
7923	7829	'checkuser-limited' => "'''Pinutol o pinungusan ang mga resulta dahil sa mga kadahilanang panggawain (pagsasagawa).'''",
7924	7830	'checkuser-log-userips' => 'Nakakuha si $1 ng mga IP para kay $2',
—	—	@@ -8017,7 +7923,6 @@
8018	7924	'checkuser-search-initiator' => 'Başlatan',
8019	7925	'checkuser-search-target' => 'Hedef',
8020	7926	'checkuser-ipeditcount' => 'tüm kullanıcılardan ~$1',
8021		~~- 'checkuser-log-subpage' => 'Kayıt',~~
8022	7927	'checkuser-log-return' => 'KullancıDenetle ana formuna geri dön',
8023	7928	'checkuser-limited' => "'''Performans nedeniyle sonuçlar kırpıldı.'''",
8024	7929	'checkuser-log-userips' => '$1, $2 için IPleri aldı',
—	—	@@ -8114,7 +8019,6 @@
8115	8020	'checkuser-search-initiator' => 'ініціатор',
8116	8021	'checkuser-search-target' => 'ціль',
8117	8022	'checkuser-ipeditcount' => '~$1 від усіх користувачів',
8118		~~- 'checkuser-log-subpage' => 'Журнал',~~
8119	8023	'checkuser-log-return' => 'Повернення до головної форми перевірки користувачів',
8120	8024	'checkuser-limited' => "'''Результати урізано, щоб не обтяжувати сервер.'''",
8121	8025	'checkuser-log-userips' => '$1 отримав IP-адреси для $2',
—	—	@@ -8196,7 +8100,6 @@
8197	8101	'checkuser-search-initiator' => 'iniziator',
8198	8102	'checkuser-search-target' => 'obietivo',
8199	8103	'checkuser-ipeditcount' => '~$1 par tuti i utenti',
8200		~~- 'checkuser-log-subpage' => 'Registro',~~
8201	8104	'checkuser-log-return' => 'Torna al modulo prinçipal de Controlo utenze',
8202	8105	'checkuser-limited' => "'''Sti risultati i xe stà tajà a metà par motivi de prestazion.'''",
8203	8106	'checkuser-log-userips' => '$1 el gà otegnù i indirizi IP de $2',
—	—	@@ -8296,7 +8199,6 @@
8297	8200	'checkuser-search-initiator' => 'người khởi đầu',
8298	8201	'checkuser-search-target' => 'mục tiêu',
8299	8202	'checkuser-ipeditcount' => '~$1 khỏi tất cả các thành viên',
8300		~~- 'checkuser-log-subpage' => 'Nhật trình',~~
8301	8203	'checkuser-log-return' => 'Quay lại mẫu CheckUser chính',
8302	8204	'checkuser-limited' => "'''Các kết quả đã được lược bớt để tăng hiệu suất hoạt động.'''",
8303	8205	'checkuser-log-userips' => '$1 lấy địa chỉ IP của $2',
—	—	@@ -8369,7 +8271,6 @@
8370	8272	'checkuser-search-initiator' => 'flagan',
8371	8273	'checkuser-search-target' => 'zeil',
8372	8274	'checkuser-ipeditcount' => '~$1 de gebans valik',
8373		~~- 'checkuser-log-subpage' => 'Jenotalised',~~
8374	8275	'checkuser-log-return' => 'Geikön lü cifafomet',
8375	8276	'checkuser-log-userips' => '$1 labon ladetis-IP ela $2',
8376	8277	'checkuser-log-ipedits' => '$1 labon redakamis ela $2',
—	—	@@ -8448,7 +8349,6 @@
8449	8350	'checkuser-search-initiator' => 'בודק',
8450	8351	'checkuser-search-target' => 'ציל',
8451	8352	'checkuser-ipeditcount' => '~$1 פון אלע באניצער',
8452		~~- 'checkuser-log-subpage' => 'לאגבוך',~~
8453	8353	'checkuser-create-action' => 'איז געווארן געשאפן',
8454	8354	'checkuser-email-action' => 'געשיקט א בליצבריוו צו באניצער "$1"',
8455	8355	'checkuser-reset-action' => 'צוריקשטעלן פאסווארט פאר באניצער "$1"',
—	—	@@ -8489,7 +8389,6 @@
8490	8390	'checkuser-search-initiator' => '創始者',
8491	8391	'checkuser-search-target' => '目標',
8492	8392	'checkuser-ipeditcount' => '~響全部用戶度搵$1',
8493		~~- 'checkuser-log-subpage' => '日誌',~~
8494	8393	'checkuser-log-return' => '返去核對用戶主要表格',
8495	8394	'checkuser-log-userips' => '$1 拎到 $2 嘅 IP',
8496	8395	'checkuser-log-ipedits' => '$1 拎到 $2 嘅編輯',
—	—	@@ -8570,7 +8469,6 @@
8571	8470	'checkuser-search-initiator' => '操作者',
8572	8471	'checkuser-search-target' => '目标',
8573	8472	'checkuser-ipeditcount' => '~在全部用户中$1',
8574		~~- 'checkuser-log-subpage' => '日志',~~
8575	8473	'checkuser-log-return' => '回到查核主表单',
8576	8474	'checkuser-limited' => "'''结果已因效率原因而被删减。'''",
8577	8475	'checkuser-log-userips' => '$1取得$2的IP信息',
—	—	@@ -8654,7 +8552,6 @@
8655	8553	'checkuser-search-initiator' => '創始者',
8656	8554	'checkuser-search-target' => '目標',
8657	8555	'checkuser-ipeditcount' => '~在全部用戶中$1',
8658		~~- 'checkuser-log-subpage' => '日誌',~~
8659	8556	'checkuser-log-return' => '回到主表單',
8660	8557	'checkuser-limited' => "'''結果已因效率原因而被刪減。'''",
8661	8558	'checkuser-log-userips' => '$1取得$2的IP訊息',
Index: branches/wmf/1.19wmf1/extensions/CheckUser/SpecialCheckUserLog.php
—	—	@@ -5,6 +5,13 @@
6	6	parent::__construct( 'CheckUserLog', 'checkuser-log' );
7	7	}
8	8
	9	+ function getCheckUserFormTitle() {
	10	+ if ( !isset( $this->checkUserFormTitle ) ) {
	11	+ $this->checkUserFormTitle = SpecialPage::getTitleFor('CheckUser');
	12	+ }
	13	+ return $this->checkUserFormTitle;
	14	+ }
	15	+
9	16	function execute( $par ) {
10	17	$this->checkPermissions();
11	18
—	—	@@ -61,9 +68,9 @@
62	69	}
63	70	}
64	71
65		~~- $out->addHTML( $this->getSkin()->makeKnownLinkObj(~~
66		~~- Title::makeTitle( NS_SPECIAL, 'CheckUser' ),~~
67		~~- wfMsgHtml( 'checkuser-log-return' ) ) );~~
	72	+ $out->addHTML( Linker::linkKnown(
	73	+ $this->getCheckUserFormTitle(),
	74	+ $this->msg( 'checkuser-log-return' ) ) );
68	75
69	76	$searchTypes = array( 'initiator', 'target' );
70	77	$select = "<select name=\"cuSearchType\" style='margin-top:.2em;'>\n";
Index: branches/wmf/1.19wmf1/extensions/wikihiero/modules/ext.wikihiero.css
—	—	@@ -9,7 +9,7 @@
10	10
11	11	.mw-hiero-table td {
12	12	padding: 0;
13		~~- align: center;~~
	13	+ text-align: center;
14	14	vertical-align: middle;
15	15	}
16	16
Index: branches/wmf/1.19wmf1/extensions/NewUserMessage/NewUserMessage.class.php
—	—	@@ -153,6 +153,7 @@
154	154	static function createNewUserMessage( $user ) {
155	155	$talk = $user->getTalkPage();
156	156
	157	+ // Only leave message if user doesn't have a talk page yet
157	158	if ( !$talk->exists() ) {
158	159	$article = new Article( $talk );
159	160	$subject = self::fetchSubject();
—	—	@@ -223,7 +224,7 @@
224	225	$flags = $article->checkFlags( $flags );
225	226
226	227	if ( $flags & EDIT_UPDATE ) {
227		~~- $text = $article->getRawText() . $text;~~
	228	+ $text = $article->getRawText() . "\n" . $text;
228	229	}
229	230
230	231	$dbw = wfGetDB( DB_MASTER );
—	—	@@ -255,13 +256,13 @@
256	257	* @param $signature String the signature, if provided.
257	258	*/
258	259	static protected function formatUserMessage( $subject, $text, $signature ) {
259		~~- $contents = "\n";~~
	260	+ $contents = "";
260	261	$signature = empty( $signature ) ? "~~~~" : "{$signature} ~~~~~";
261	262
262	263	if ( $subject ) {
263		~~- $contents .= "== $subject ==\n";~~
	264	+ $contents .= "== $subject ==\n\n";
264	265	}
265		~~- $contents .= "\n$text\n\n-- $signature\n";~~
	266	+ $contents .= "$text\n\n-- $signature\n";
266	267
267	268	return $contents;
268	269	}
Index: branches/wmf/1.19wmf1/extensions/CentralAuth/CentralAuth.php
—	—	@@ -260,6 +260,22 @@
261	261	$wgResourceModules['ext.centralauth'] = array(
262	262	'scripts' => 'ext.centralauth.js',
263	263	'styles' => 'ext.centralauth.css',
	264	+ 'messages' => array(
	265	+ 'centralauth-merge-method-primary',
	266	+ 'centralauth-merge-method-primary-desc',
	267	+ 'centralauth-merge-method-new',
	268	+ 'centralauth-merge-method-new-desc',
	269	+ 'centralauth-merge-method-empty',
	270	+ 'centralauth-merge-method-empty-desc',
	271	+ 'centralauth-merge-method-password',
	272	+ 'centralauth-merge-method-password-desc',
	273	+ 'centralauth-merge-method-mail',
	274	+ 'centralauth-merge-method-mail-desc',
	275	+ 'centralauth-merge-method-admin',
	276	+ 'centralauth-merge-method-admin-desc',
	277	+ 'centralauth-merge-method-login',
	278	+ 'centralauth-merge-method-login-desc',
	279	+ ),
264	280	) + $commonModuleInfo;
265	281
266	282	$wgResourceModules['ext.centralauth.noflash'] = array(
Index: branches/wmf/1.19wmf1/extensions/CentralAuth/specials/SpecialCentralAuth.php
—	—	@@ -416,11 +416,26 @@
417	417	*/
418	418	function formatMergeMethod( $method ) {
419	419	global $wgExtensionAssetsPath;
	420	+
	421	+ $brief = wfMessage( 'centralauth-merge-method-{$method}' )->text();
	422	+ $html =
	423	+ Html::element(
	424	+ 'img', array(
	425	+ 'src' => "{$wgExtensionAssetsPath}/CentralAuth/icons/merged-{$method}.png",
	426	+ 'alt' => $brief,
	427	+ 'title' => $brief,
	428	+ )
	429	+ )
	430	+ . Html::element(
	431	+ 'span', array(
	432	+ 'class' => 'merge-method-help',
	433	+ 'title' => $brief,
	434	+ 'data-centralauth-mergemethod' => $method
	435	+ ),
	436	+ '(?)'
	437	+ );
420	438
421		~~- $img = htmlspecialchars( "{$wgExtensionAssetsPath}/CentralAuth/icons/merged-{$method}.png" );~~
422		~~- $brief = wfMsgHtml( "centralauth-merge-method-{$method}" );~~
423		~~- return "<img src=\"{$img}\" alt=\"{$brief}\" title=\"{$brief}\"/>" .~~
424		~~- "<span class=\"merge-method-help\" title=\"{$brief}\" onclick=\"showMethodHint('{$method}')\">(?)</span>";~~
	439	+ return $html;
425	440	}
426	441
427	442	/**
Index: branches/wmf/1.19wmf1/extensions/CentralAuth/modules/ext.centralauth.css
—	—	@@ -12,3 +12,8 @@
13	13	.merge-method-help-name {
14	14	font-weight: bold;
15	15	}
	16	+
	17	+/* Hide them when javascript fails or isn't enabled */
	18	+.client-nojs .mw-centralauth-wikislist .merge-method-help {
	19	+ display: none;
	20	+}
Index: branches/wmf/1.19wmf1/extensions/CentralAuth/modules/ext.centralauth.js
—	—	@@ -1,34 +1,57 @@
2		~~-wgCursorPosition = { x : 0, y : 0 };~~
3		~~-function updateCursorPosition( e ) {~~
4		~~- e = e \|\| window.event;~~
5		~~- wgCursorPosition.x = e.clientX + ( document.documentElement.scrollLeft \|\| document.body.scrollLeft )~~
6		~~- - document.documentElement.clientLeft;~~
7		~~- wgCursorPosition.y = e.clientY + ( document.documentElement.scrollTop \|\| document.body.scrollTop )~~
8		~~- - document.documentElement.clientTop;~~
9		-}
10		~~-document.onmousemove = updateCursorPosition;~~
	2	+( function ( mw, $, undefined ) {
	3	+ var cursorPosition, $methodHint;
11	4
12		~~-methodHint = null;~~
13		~~-function showMethodHint( methodName ) {~~
14		~~- hideMethodHint();~~
	5	+ cursorPosition = {
	6	+ x : 0,
	7	+ y : 0
	8	+ };
15	9
16		~~- method = wgMergeMethodDescriptions[methodName];~~
17		~~- helpHtml = "<p class='merge-method-help-name'>" + method.short + "</p>" + method.desc;~~
	10	+ $(document).on( 'mousemove', function updateCursorPosition( e ) {
	11	+ cursorPosition.x =
	12	+ e.clientX
	13	+ + ( document.documentElement.scrollLeft \|\| document.body.scrollLeft )
	14	+ - document.documentElement.clientLeft;
18	15
19		~~- methodHint = document.createElement( 'div' );~~
20		~~- methodHint.innerHTML = helpHtml;~~
21		~~- methodHint.setAttribute( 'class', 'merge-method-help-div' );~~
22		~~- methodHint.style.left = wgCursorPosition.x + 'px';~~
23		~~- methodHint.style.top = wgCursorPosition.y + 'px';~~
24		~~- methodHint.setAttribute( 'onclick', 'hideMethodHint()' );~~
	16	+ cursorPosition.y =
	17	+ e.clientY
	18	+ + ( document.documentElement.scrollTop \|\| document.body.scrollTop )
	19	+ - document.documentElement.clientTop;
	20	+ } );
25	21
26		~~- var content = document.getElementById('content') \|\| document.getElementById('mw_content') \|\| document.body;~~
27		~~- content.appendChild( methodHint );~~
28		-}
	22	+ function showMethodHint( methodName ) {
	23	+ var content, hintHtml;
29	24
30		~~-function hideMethodHint() {~~
31		~~- if( methodHint ) {~~
32		~~- methodHint.parentNode.removeChild( methodHint );~~
33		~~- methodHint = null;~~
	25	+ if ( !$methodHint ) {
	26	+ $methodHint = $( '<div>' )
	27	+ .addClass( 'merge-method-help-div' )
	28	+ .hide()
	29	+ .click( function () {
	30	+ $(this).fadeOut();
	31	+ } );
	32	+
	33	+ content = document.getElementById( 'content' ) \|\| document.getElementById( 'mw_content' ) \|\| document.body;
	34	+ $(content).append( $methodHint );
	35	+ }
	36	+
	37	+ hintHtml = mw.html.element( 'p', {
	38	+ 'class': 'merge-method-help-name'
	39	+ }, mw.msg( 'centralauth-merge-method-' + methodName ) ) + mw.message( 'centralauth-merge-method-' + methodName + '-desc' ).escaped();
	40	+
	41	+ $methodHint
	42	+ .html( hintHtml )
	43	+ .css({
	44	+ left: cursorPosition.x + 'px',
	45	+ top: cursorPosition.y + 'px'
	46	+ });
	47	+
	48	+ $methodHint.fadeIn();
34	49	}
35		-}
	50	+
	51	+ $( document ).ready( function () {
	52	+ // Bind an event listener to the common parent of all (?) elements
	53	+ $( '.mw-centralauth-wikislist' ).on( 'click', '.merge-method-help', function () {
	54	+ showMethodHint( $(this).data( 'centralauth-mergemethod' ) );
	55	+ } );
	56	+ } );
	57	+
	58	+}( mediaWiki, jQuery ) );
Property changes on: branches/wmf/1.19wmf1/extensions/CentralAuth
___________________________________________________________________
Modified: svn:mergeinfo
36	59	Merged /trunk/extensions/CentralAuth:r112930,113352,113926
Property changes on: branches/wmf/1.19wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
37	60	Merged /trunk/extensions:r112586,112930,113352,113926

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r112586	Followup-to: r100506: Improve linking between Special:CheckUser and Special:C...	saper	11:23, 28 February 2012
r112930	[CentralAuth] Refactor JS...	krinkle	00:50, 3 March 2012
r113352	[NewUserMessage] Don't prepend 2 empty lines before the Welcome template...	krinkle	09:46, 8 March 2012
r113926	Bug 35242 - invalid CSS in ext.wikihiero.css. Haven't used the patch from tha...	maxsem	15:52, 15 March 2012

Status & tagging log

23:14, 15 March 2012 MaxSem (talk | contribs) changed the status of r113940 [removed: new added: ok]