r67075 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r67074‎ \| r67075 \| r67076 >
Date:	15:08, 30 May 2010
Author:	catrope
Status:	deferred
Tags:
Comment:	1.16wmf4: Update ContactPage to trunk state
Modified paths:	/branches/wmf/1.16wmf4/extensions/ContactPage (modified) (history) /branches/wmf/1.16wmf4/extensions/ContactPage/ContactPage.alias.php (modified) (history) /branches/wmf/1.16wmf4/extensions/ContactPage/ContactPage.i18n.php (modified) (history) /branches/wmf/1.16wmf4/extensions/ContactPage/ContactPage.php (modified) (history) /branches/wmf/1.16wmf4/extensions/ContactPage/SpecialContact.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/ContactPage/SpecialContact.php
—	—	@@ -108,6 +108,7 @@
109	109	$this->text = $wgRequest->getText( 'wpText' );
110	110	$this->subject = $wgRequest->getText( 'wpSubject' );
111	111	$this->cc_me = $wgRequest->getBool( 'wpCCMe' );
	112	+ $this->includeIP = $wgRequest->getBool( 'wpIncludeIP' );
112	113
113	114	$this->fromname = $wgRequest->getText( 'wpFromName' );
114	115	$this->fromaddress = $wgRequest->getText( 'wpFromAddress' );
—	—	@@ -165,7 +166,7 @@
166	167	}
167	168
168	169	function showForm() {
169		~~- global $wgOut, $wgUser, $wgContactRequireAll;~~
	170	+ global $wgOut, $wgUser, $wgContactRequireAll, $wgContactIncludeIP;
170	171
171	172	#TODO: show captcha
172	173
—	—	@@ -228,8 +229,17 @@
229	230	<td class="mw-input">' .
230	231	Xml::textarea( 'wpText', $this->text, 80, 20, array( 'id' => 'wpText' ) ) .
231	232	'</td>
232		~~- </tr>~~
233		~~- <tr>~~
	233	+ </tr>';
	234	+ if ( $wgContactIncludeIP ) {
	235	+ $form .= '<tr>
	236	+ <td></td>
	237	+ <td class="mw-input">' .
	238	+ Xml::checkLabel( wfMsg( 'contactpage-includeip' ), 'wpIncludeIP', 'wpIncludeIP', $wgUser->isAnon() ) .
	239	+ '</td>
	240	+ </tr>';
	241	+ }
	242	+
	243	+ $form .= '<tr>
234	244	<td></td>
235	245	<td class="mw-input">' .
236	246	Xml::checkLabel( wfMsg( 'emailccme' ), 'wpCCMe', 'wpCCMe', $wgUser->getBoolOption( 'ccmeonemails' ) ) .
—	—	@@ -292,10 +302,11 @@
293	303	function doSubmit() {
294	304	global $wgOut;
295	305	global $wgEnableEmail, $wgUserEmailUseReplyTo, $wgEmergencyContact;
296		~~- global $wgContactUser, $wgContactSender, $wgContactSenderName;~~
	306	+ global $wgContactUser, $wgContactSender, $wgContactSenderName, $wgContactIncludeIP;
297	307
298	308	$csender = $wgContactSender ? $wgContactSender : $wgEmergencyContact;
299	309	$cname = $wgContactSenderName;
	310	+ $senderIP = wfGetIP();
300	311
301	312	wfDebug( __METHOD__ . ": start\n" );
302	313
—	—	@@ -318,10 +329,21 @@
319	330	$subject = wfMsgForContent( 'contactpage-defsubject' );
320	331	}
321	332
	333	+ $includeIP = $wgContactIncludeIP && $this->includeIP;
322	334	if ( $this->fromname !== '' ) {
323		~~- $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $this->fromname );~~
	335	+ if ( $includeIP ) {
	336	+ $subject = wfMsgForContent( 'contactpage-subject-and-sender-withip', $subject, $this->fromname, $senderIP );
	337	+ } else {
	338	+ $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $this->fromname );
	339	+ }
324	340	} elseif ( $this->fromaddress !== '' ) {
325		~~- $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $this->fromaddress );~~
	341	+ if ( $includeIP ) {
	342	+ $subject = wfMsgForContent( 'contactpage-subject-and-sender-withip', $subject, $this->fromaddress, $senderIP );
	343	+ } else {
	344	+ $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $this->fromaddress );
	345	+ }
	346	+ } else if ( $includeIP ) {
	347	+ $subject = wfMsgForContent( 'contactpage-subject-and-sender', $subject, $senderIP );
326	348	}
327	349
328	350	if( !wfRunHooks( 'ContactForm', array( &$targetAddress, &$replyto, &$subject, &$this->text ) ) ) {
Index: branches/wmf/1.16wmf4/extensions/ContactPage/ContactPage.alias.php
—	—	@@ -62,7 +62,7 @@
63	63
64	64	/** Spanish (Español) */
65	65	$aliases['es'] = array(
66		~~- 'Contact' => array( 'Contactar' ),~~
	66	+ 'Contact' => array( 'Contactar', 'Contacto' ),
67	67	);
68	68
69	69	/** Finnish (Suomi) */
—	—	@@ -145,7 +145,7 @@
146	146	'Contact' => array( '문의' ),
147	147	);
148	148
149		~~-/** Ripoarisch (Ripoarisch) */~~
	149	+/** Colognian (Ripoarisch) */
150	150	$aliases['ksh'] = array(
151	151	'Contact' => array( 'Kuntak', 'Kumtak', 'Kontak' ),
152	152	);
—	—	@@ -197,7 +197,7 @@
198	198
199	199	/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
200	200	$aliases['no'] = array(
201		~~- 'Contact' => array( 'Kontakt', 'Kontaktside' ),~~
	201	+ 'Contact' => array( 'Kontakt' ),
202	202	);
203	203
204	204	/** Occitan (Occitan) */
Index: branches/wmf/1.16wmf4/extensions/ContactPage/ContactPage.i18n.php
—	—	@@ -23,6 +23,7 @@
24	24	'contactpage-legend' => 'Send e-mail',
25	25	'contactpage-defsubject' => 'Contact message',
26	26	'contactpage-subject-and-sender' => '$1 (from $2)',
	27	+ 'contactpage-subject-and-sender-withip' => '$1 (from $2 at $3)',
27	28	'contactpage-fromname' => 'Your name: *',
28	29	'contactpage-fromaddress' => 'Your e-mail: **',
29	30	'contactpage-formfootnotes' => '* optional<br />
—	—	@@ -32,6 +33,7 @@
33	34	'contactpage-formfootnotes-required' => 'All fields are required.',
34	35	'contactpage-captcha' => 'To send the message, please solve the captcha ([[Special:Captcha/help\|more info]])',
35	36	'contactpage-captcha-failed' => 'Captcha test failed! ([[Special:Captcha/help\|more info]])',
	37	+ 'contactpage-includeip' => 'Include my IP address in this message.',
36	38	);
37	39
38	40	/** Message documentation (Message documentation)
—	—	@@ -48,7 +50,9 @@
49	51	'contactpage-desc' => 'Extension description displayed on [[Special:Version]].',
50	52	'contactpage-title' => '{{Identical\|Contact}}',
51	53	'contactpage-legend' => '{{Identical\|E-mail}}',
52		~~- 'contactpage-defsubject' => '{{Identical\|Contact}}',~~
	54	+ 'contactpage-defsubject' => 'Default subject for sent e-mail. {{Identical\|Contact}}',
	55	+ 'contactpage-subject-and-sender' => 'Subject with sender included. $1 is the original subject, $2 is a user name, e-mail address or IP address.',
	56	+ 'contactpage-subject-and-sender-withip' => 'Subject with sender and IP included. $1 is the original subject, $2 is a user name or e-mail address, $3 is an IP address.',
53	57	'contactpage-fromaddress' => '{{Identical\|E-mail}}',
54	58	'contactpage-fromaddress-required' => '{{Identical\|E-mail}}',
55	59	);
—	—	@@ -60,16 +64,6 @@
61	65	'contact' => 'Gondagd',
62	66	);
63	67
64		~~-/** Laz (Laz)~~
65		~~- * @author Bombola~~
66		~~- */~~
67		~~-$messages['lzz'] = array(~~
68		~~- 'contactpage-fromname' => 'Skani coxo: *',~~
69		~~- 'contactpage-fromaddress' => 'Skani e-mail: **',~~
70		~~- 'contactpage-fromname-required' => 'Skani coxo:',~~
71		~~- 'contactpage-fromaddress-required' => 'Skani e-mail:',~~
72		~~-);~~
73		-
74	68	/** Afrikaans (Afrikaans)
75	69	* @author Arnobarnard
76	70	* @author Naudefj
—	—	@@ -94,6 +88,27 @@
95	89	'contactpage-captcha-failed' => 'Die captcha-toets het gefaal! ([[Special:Captcha/help\|meer inligting]])',
96	90	);
97	91
	92	+/** Gheg Albanian (Gegë)
	93	+ * @author Mdupont
	94	+ */
	95	+$messages['aln'] = array(
	96	+ 'contactpage-title' => 'Kontakt',
	97	+ 'contactpage-pagetext' => 'Ju lutem përdorni formularin e mëposhtëm për të na kontaktoni.',
	98	+ 'contactpage-legend' => 'Dergo e-mail',
	99	+ 'contactpage-defsubject' => 'mesazh Kontakt',
	100	+ 'contactpage-subject-and-sender' => '$1 (nga $2)',
	101	+ 'contactpage-subject-and-sender-withip' => '$1 (prej $2 në $3)',
	102	+ 'contactpage-fromname' => 'Emri juaj: *',
	103	+ 'contactpage-fromaddress' => 'Your e-mail: **',
	104	+ 'contactpage-formfootnotes' => '* Opcionale <br /> ** Dëshirë por e nevojshme qoftë se dëshironi një përgjigje',
	105	+ 'contactpage-fromname-required' => 'Emri juaj:',
	106	+ 'contactpage-fromaddress-required' => 'Your e-mail:',
	107	+ 'contactpage-formfootnotes-required' => 'Të gjitha fushat janë të kërkuara.',
	108	+ 'contactpage-captcha' => 'Për të dërguar mesazh, ju lutem zgjidh captcha ([[Special:Captcha/help\|më shumë informacion]])',
	109	+ 'contactpage-captcha-failed' => 'Captcha test i dështuar! ([[Special:Captcha/help\|më shumë informacion]])',
	110	+ 'contactpage-includeip' => 'Përfshini IP adresa ime ne kete mesazh.',
	111	+);
	112	+
98	113	/** Arabic (العربية)
99	114	* @author Meno25
100	115	* @author OsamaK
—	—	@@ -156,6 +171,7 @@
157	172	* @author EugeneZelenko
158	173	* @author Jim-by
159	174	* @author Red Winged Duck
	175	+ * @author Wizardist
160	176	*/
161	177	$messages['be-tarask'] = array(
162	178	'contact' => 'Старонка кантакту',
—	—	@@ -166,6 +182,7 @@
167	183	'contactpage-legend' => 'Даслаць ліст па электроннай пошце',
168	184	'contactpage-defsubject' => 'Паведамленьне',
169	185	'contactpage-subject-and-sender' => '$1 (ад $2)',
	186	+ 'contactpage-subject-and-sender-withip' => '$1 (ад $2 з $3)',
170	187	'contactpage-fromname' => 'Ваша імя: *',
171	188	'contactpage-fromaddress' => 'Ваш адрас электроннай пошты: **',
172	189	'contactpage-formfootnotes' => '* неабавязкова<br />
—	—	@@ -175,6 +192,7 @@
176	193	'contactpage-formfootnotes-required' => 'Усе палі павінны быць запоўнены.',
177	194	'contactpage-captcha' => 'Каб даслаць паведамленьне, калі ласка, прайдзіце праверку CAPTCHA ([[Special:Captcha/help\|падрабязьней]])',
178	195	'contactpage-captcha-failed' => 'Праверка CAPTCHA ня пройдзена! ([[Special:Captcha/help\|падрабязьней]])',
	196	+ 'contactpage-includeip' => 'Дадаць мой IP-адрас у гэтае паведамленьне.',
179	197	);
180	198
181	199	/** Bulgarian (Български)
—	—	@@ -222,14 +240,15 @@
223	241	* @author Y-M D
224	242	*/
225	243	$messages['br'] = array(
226		~~- 'contact' => 'Darempred',~~
227		~~- 'contactpage' => 'Darempred',~~
	244	+ 'contact' => 'Mont e darempred',
	245	+ 'contactpage' => 'Pajenn daremprediñ',
228	246	'contactpage-desc' => '[[Special:Contact\|Furmskrid mont e darempred evit ar weladennerien]]',
229	247	'contactpage-title' => 'Darempred',
230	248	'contactpage-pagetext' => 'Mar plij implijit ar furmskrid da-heul evit mont e darempred ganeomp.',
231	249	'contactpage-legend' => 'Kas ur postel',
232		~~- 'contactpage-defsubject' => 'Kemenadenn',~~
	250	+ 'contactpage-defsubject' => 'Kemennadenn daremprediñ',
233	251	'contactpage-subject-and-sender' => '$1 (eus $2)',
	252	+ 'contactpage-subject-and-sender-withip' => '$1 (eus $2 da $3)',
234	253	'contactpage-fromname' => "Hoc'h anv : *",
235	254	'contactpage-fromaddress' => "Ho chomlec'h postel : **",
236	255	'contactpage-formfootnotes' => "* diret<br />
—	—	@@ -239,6 +258,7 @@
240	259	'contactpage-formfootnotes-required' => 'Rekis eo an holl vaeziennoù.',
241	260	'contactpage-captcha' => 'Evit kas ar gemenadenn, diskoulmit ar kaptcha ([[Special:Captcha/help\|titouroù, sikour]])',
242	261	'contactpage-captcha-failed' => "N'ho peus ket diskoulmet ar kaptcha ! ([[Special:Captcha/help\|titouroù, sikour]])",
	262	+ 'contactpage-includeip' => "Merkañ ma chomlec'h IP er postel-mañ.",
243	263	);
244	264
245	265	/** Bosnian (Bosanski)
—	—	@@ -253,6 +273,7 @@
254	274	'contactpage-legend' => 'Pošalji e-mail',
255	275	'contactpage-defsubject' => 'Poruka kontakta',
256	276	'contactpage-subject-and-sender' => '$1 (od $2)',
	277	+ 'contactpage-subject-and-sender-withip' => '$1 (od $2 sa $3)',
257	278	'contactpage-fromname' => 'Vaše ime: *',
258	279	'contactpage-fromaddress' => 'Vaš e-mail: **',
259	280	'contactpage-formfootnotes' => '* opcionalno<br />
—	—	@@ -302,6 +323,7 @@
303	324	'contactpage-legend' => 'Poslat e-mail',
304	325	'contactpage-defsubject' => 'Zpráva',
305	326	'contactpage-subject-and-sender' => '$1 (od $2)',
	327	+ 'contactpage-subject-and-sender-withip' => '$1 (od $2 z $3)',
306	328	'contactpage-fromname' => 'Vaše jméno: *',
307	329	'contactpage-fromaddress' => 'Váš e-mail: **',
308	330	'contactpage-formfootnotes' => '* volitelné<br />
—	—	@@ -311,6 +333,7 @@
312	334	'contactpage-formfootnotes-required' => 'Všechna pole musí být vyplněna.',
313	335	'contactpage-captcha' => 'Abyste mohli odeslat zprávu, musíte vyřešit CAPTCHA ([[Special:Captcha/help\|vysvětlení]])',
314	336	'contactpage-captcha-failed' => '{{GENDER:Neuspěl\|Neuspěla\|Neuspěli}} jste v testu CAPTCHA! ([[Special:Captcha/help\|vysvětlení]])',
	337	+ 'contactpage-includeip' => 'Přiložit ke zprávě mou IP adresu.',
315	338	);
316	339
317	340	/** Welsh (Cymraeg)
—	—	@@ -325,6 +348,7 @@
326	349	'contactpage-legend' => 'Anfon e-bost',
327	350	'contactpage-defsubject' => 'Neges',
328	351	'contactpage-subject-and-sender' => '$1 (oddi wrth $2)',
	352	+ 'contactpage-subject-and-sender-withip' => '$1 (oddi wrth $2 ar $3)',
329	353	'contactpage-fromname' => 'Eich enw: *',
330	354	'contactpage-fromaddress' => 'Eich cyfeiriad e-bost: **',
331	355	'contactpage-formfootnotes' => '* dewisol<br />
—	—	@@ -334,6 +358,7 @@
335	359	'contactpage-formfootnotes-required' => 'Rhaid llanw pob maes.',
336	360	'contactpage-captcha' => 'Er mwyn anfon y neges, byddwch gystal â datrys y pos gwrth-sbam ([[Special:Captcha/help\|mwy o wybodaeth]])',
337	361	'contactpage-captcha-failed' => 'Ni lwyddodd y prawf gwrth-sbam! ([[Special:Captcha/help\|mwy o wybodaeth]])',
	362	+ 'contactpage-includeip' => 'Cynnwys fy nghyfeiriad IP yn y neges hon.',
338	363	);
339	364
340	365	/** Danish (Dansk)
—	—	@@ -360,6 +385,7 @@
361	386	);
362	387
363	388	/** German (Deutsch)
	389	+ * @author LWChris
364	390	* @author Raimond Spekking
365	391	* @author Umherirrender
366	392	*/
—	—	@@ -372,6 +398,7 @@
373	399	'contactpage-legend' => 'E-Mail absenden',
374	400	'contactpage-defsubject' => 'Kontaktnachricht',
375	401	'contactpage-subject-and-sender' => '$1 (von $2)',
	402	+ 'contactpage-subject-and-sender-withip' => '$1 (von $2 mit der IP-Adresse $3)',
376	403	'contactpage-fromname' => 'Dein Name: *',
377	404	'contactpage-fromaddress' => 'Deine E-Mail-Adresse: **',
378	405	'contactpage-formfootnotes' => '* optional<br />
—	—	@@ -381,6 +408,7 @@
382	409	'contactpage-formfootnotes-required' => 'Alle Felder müssen ausgefüllt sein.',
383	410	'contactpage-captcha' => 'Um die Nachricht senden zu können, löse bitte das Captcha ([[Special:Captcha/help\|weitere Informationen]])',
384	411	'contactpage-captcha-failed' => 'Captcha-Test nicht bestanden! ([[Special:Captcha/help\|weitere Informationen]])',
	412	+ 'contactpage-includeip' => 'Meine IP-Adresse in diese Nachricht einfügen.',
385	413	);
386	414
387	415	/** German (formal address) (Deutsch (Sie-Form))
—	—	@@ -432,6 +460,7 @@
433	461	'contactpage-legend' => 'E-mail pósłaś',
434	462	'contactpage-defsubject' => 'Kontaktowa powěźenka',
435	463	'contactpage-subject-and-sender' => '$1 (z $2)',
	464	+ 'contactpage-subject-and-sender-withip' => '$1 (wót $2 na $3)',
436	465	'contactpage-fromname' => 'Twójo mě: *',
437	466	'contactpage-fromaddress' => 'Twója e-mailowa adresa: **',
438	467	'contactpage-formfootnotes' => '* opcionalny<br />
—	—	@@ -441,12 +470,15 @@
442	471	'contactpage-formfootnotes-required' => 'Wšykne póla muse wupołnjone byś.',
443	472	'contactpage-captcha' => 'Aby powěźenku pósłał, rozwěž pšosym toś te captcha ([[Special:Captcha/help\|dalšne informacije]])',
444	473	'contactpage-captcha-failed' => 'Test captcha njebu wobstaty! ([[Special:Captcha/help\|dalšne informacije]])',
	474	+ 'contactpage-includeip' => 'Móju IP-adresu w toś tej powěźeńce zapśěgnuś.',
445	475	);
446	476
447	477	/** Greek (Ελληνικά)
448	478	* @author Consta
	479	+ * @author Dada
449	480	* @author Omnipaedista
450	481	* @author ZaDiak
	482	+ * @author Περίεργος
451	483	*/
452	484	$messages['el'] = array(
453	485	'contact' => 'Σελίδα επαφών',
—	—	@@ -457,6 +489,7 @@
458	490	'contactpage-legend' => 'Αποστολή e-mail',
459	491	'contactpage-defsubject' => 'Μήνυμα επαφής',
460	492	'contactpage-subject-and-sender' => '$1 (από $2)',
	493	+ 'contactpage-subject-and-sender-withip' => '$1 (από $2 σε $3)',
461	494	'contactpage-fromname' => 'Το όνομά σας: *',
462	495	'contactpage-fromaddress' => 'Το ηλεκτρονικό ταχυδρομείο σας: **',
463	496	'contactpage-formfootnotes' => '* προαιρετικό<br />
—	—	@@ -466,6 +499,7 @@
467	500	'contactpage-formfootnotes-required' => 'Όλα τα πεδία είναι υποχρεωτικά.',
468	501	'contactpage-captcha' => 'Για να αποστείλετε αυτό το μήνυμα, παρακαλώ επιλύστε το captcha ([[Special:Captcha/help\|βοήθεια]])',
469	502	'contactpage-captcha-failed' => 'Το τεστ Captcha απέτυχε! ([[Special:Captcha/help\|περισσότερες πληροφορίες]])',
	503	+ 'contactpage-includeip' => 'Συμπεριλάβετε τη διεύθυνση IP μου σε αυτό το μήνυμα',
470	504	);
471	505
472	506	/** Esperanto (Esperanto)
—	—	@@ -480,6 +514,7 @@
481	515	'contactpage-legend' => 'Sendi retpoŝton',
482	516	'contactpage-defsubject' => 'Kontakta Mesaĝo',
483	517	'contactpage-subject-and-sender' => '$1 (de $2)',
	518	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2 ĉe $3)',
484	519	'contactpage-fromname' => 'Via nomo: *',
485	520	'contactpage-fromaddress' => 'Via retadreso: **',
486	521	'contactpage-formfootnotes' => '* nedeviga<br />
—	—	@@ -489,12 +524,14 @@
490	525	'contactpage-formfootnotes-required' => 'Ĉiuj kampoj estas devigaj.',
491	526	'contactpage-captcha' => "Sendi la mesaĝon, bonvolu solvi la enigmon de ''captcha'' ([[Special:Captcha/help\|plua informo]])",
492	527	'contactpage-captcha-failed' => 'Malsukcesis Captcha-testo! ([[Special:Captcha/help\|plua informo]])',
	528	+ 'contactpage-includeip' => 'Inkluzivi mian IP-adreson en ĉi tiu mesaĝo',
493	529	);
494	530
495	531	/** Spanish (Español)
496	532	* @author Crazymadlover
497	533	* @author Imre
498	534	* @author Locos epraix
	535	+ * @author Peter17
499	536	* @author Sanbec
500	537	* @author לערי ריינהארט
501	538	*/
—	—	@@ -507,6 +544,7 @@
508	545	'contactpage-legend' => 'Enviar correo electrónico',
509	546	'contactpage-defsubject' => 'Mensaje de contacto',
510	547	'contactpage-subject-and-sender' => '$1 (de $2)',
	548	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2 en $3)',
511	549	'contactpage-fromname' => 'Su nombre: *',
512	550	'contactpage-fromaddress' => 'Su correo electrónico: **',
513	551	'contactpage-formfootnotes' => '* opcional<br />
—	—	@@ -516,6 +554,7 @@
517	555	'contactpage-formfootnotes-required' => 'Todos los campos son requeridos.',
518	556	'contactpage-captcha' => 'Para enviar el mensaje, por favor resuelve el captcha ([[Special:Captcha/help\|más información]])',
519	557	'contactpage-captcha-failed' => '¡Prueba de captcha fallida! ([[Special:Captcha/help\|más información]])',
	558	+ 'contactpage-includeip' => 'Incluir mi dirección IP en este mensaje',
520	559	);
521	560
522	561	/** Estonian (Eesti)
—	—	@@ -542,6 +581,7 @@
543	582	);
544	583
545	584	/** Basque (Euskara)
	585	+ * @author An13sa
546	586	* @author Theklan
547	587	*/
548	588	$messages['eu'] = array(
—	—	@@ -553,6 +593,7 @@
554	594	'contactpage-legend' => 'E-posta bidali',
555	595	'contactpage-defsubject' => 'Kontaktu mezua',
556	596	'contactpage-subject-and-sender' => '$1 ($2(e)k bidalia)',
	597	+ 'contactpage-subject-and-sender-withip' => '$1 ($2-k bidalia, $3-(r)ekin)',
557	598	'contactpage-fromname' => 'Zure izena: *',
558	599	'contactpage-fromaddress' => 'Zure e-posta: **',
559	600	'contactpage-formfootnotes' => ' * ez da beharrezkoa<br />
—	—	@@ -562,6 +603,7 @@
563	604	'contactpage-formfootnotes-required' => 'Esparru guztiak betetzea beharrezkoa da.',
564	605	'contactpage-captcha' => 'Mezua bidaltzeko captcha jarri behar duzu ([[Special:Captcha/help\|info gehiago]])',
565	606	'contactpage-captcha-failed' => 'Captcha testak huts egin du! ([[Special:Captcha/help\|info gehiago]])',
	607	+ 'contactpage-includeip' => 'Nire IP helbidea mezu honetan sartu.',
566	608	);
567	609
568	610	/** Extremaduran (Estremeñu)
—	—	@@ -602,6 +644,8 @@
603	645
604	646	/** French (Français)
605	647	* @author Grondin
	648	+ * @author IAlex
	649	+ * @author Peter17
606	650	* @author Sherbrooke
607	651	* @author Urhixidur
608	652	* @author לערי ריינהארט
—	—	@@ -615,6 +659,7 @@
616	660	'contactpage-legend' => 'Envoyer un courriel',
617	661	'contactpage-defsubject' => 'Message',
618	662	'contactpage-subject-and-sender' => '$1 (de $2)',
	663	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2 à $3)',
619	664	'contactpage-fromname' => 'Votre nom : *',
620	665	'contactpage-fromaddress' => 'Votre adresse courriel : **',
621	666	'contactpage-formfootnotes' => '* optionnel<br />
—	—	@@ -624,6 +669,7 @@
625	670	'contactpage-formfootnotes-required' => 'Tous les champs sont requis.',
626	671	'contactpage-captcha' => 'Pour envoyer le message, prière de résoudre le captcha ([[Special:Captcha/help\|aide]])',
627	672	'contactpage-captcha-failed' => "Vous n'avez pas décodé le captcha ! ([[Special:Captcha/help\|aide]])",
	673	+ 'contactpage-includeip' => 'Inclure mon adresse IP dans ce message.',
628	674	);
629	675
630	676	/** Franco-Provençal (Arpetan)
—	—	@@ -662,7 +708,8 @@
663	709	'contactpage-pagetext' => 'Use o formulario de embaixo para contactar con nós.',
664	710	'contactpage-legend' => 'Enviar un correo electrónico',
665	711	'contactpage-defsubject' => 'Mensaxe de contacto',
666		~~- 'contactpage-subject-and-sender' => '$1 (desde $2)',~~
	712	+ 'contactpage-subject-and-sender' => '$1 (de $2)',
	713	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2 a $3)',
667	714	'contactpage-fromname' => 'O seu nome: *',
668	715	'contactpage-fromaddress' => 'O seu correo electrónico: **',
669	716	'contactpage-formfootnotes' => '* opcional<br />
—	—	@@ -672,6 +719,7 @@
673	720	'contactpage-formfootnotes-required' => 'Requírense todos os campos.',
674	721	'contactpage-captcha' => 'Para enviar unha mensaxe, resolva o captcha ([[Special:Captcha/help\|máis información]])',
675	722	'contactpage-captcha-failed' => 'Fallou a proba captcha! ([[Special:Captcha/help\|máis información]])',
	723	+ 'contactpage-includeip' => 'Incluír o meu enderezo IP nesta mensaxe.',
676	724	);
677	725
678	726	/** Ancient Greek (Ἀρχαία ἑλληνικὴ)
—	—	@@ -696,6 +744,7 @@
697	745	'contactpage-legend' => 'E-Mail abschicke',
698	746	'contactpage-defsubject' => 'Kontaktnochricht',
699	747	'contactpage-subject-and-sender' => '$1 (vu $2)',
	748	+ 'contactpage-subject-and-sender-withip' => '$1 (vu $2 uf $3)',
700	749	'contactpage-fromname' => 'Dy Name: *',
701	750	'contactpage-fromaddress' => 'Dyy E-Mail-Adräss: **',
702	751	'contactpage-formfootnotes' => '* optional<br />
—	—	@@ -705,6 +754,7 @@
706	755	'contactpage-formfootnotes-required' => 'Alli Fälder mien uusgfillt syy.',
707	756	'contactpage-captcha' => 'Zum d Nochricht schicke z chenne, les bitte s Captcha ([[Special:Captcha/help\|meh Informatione]])',
708	757	'contactpage-captcha-failed' => 'Captcha-Tescht nit bstande! ([[Special:Captcha/help\|meh Informatione]])',
	758	+ 'contactpage-includeip' => 'Myy IP-Adräss in die Nochricht yysetze.',
709	759	);
710	760
711	761	/** Manx (Gaelg)
—	—	@@ -795,6 +845,7 @@
796	846	'contactpage-legend' => 'E-mejl pósłać',
797	847	'contactpage-defsubject' => 'Kontaktna zdźělenka',
798	848	'contactpage-subject-and-sender' => '$1 (z $2)',
	849	+ 'contactpage-subject-and-sender-withip' => '$1 (wot $2 na $3)',
799	850	'contactpage-fromname' => 'Twoje mjeno: *',
800	851	'contactpage-fromaddress' => 'Twoja e-mejlowa adresa: **',
801	852	'contactpage-formfootnotes' => '* opcionalny<br />
—	—	@@ -804,10 +855,12 @@
805	856	'contactpage-formfootnotes-required' => 'Wšě poła dyrbja wupjelnjene być.',
806	857	'contactpage-captcha' => 'Zo by powěsć pósłać móhł, rozrisaj prošu captchu ([[Special:Captcha/help\|dalše informacije]])',
807	858	'contactpage-captcha-failed' => 'Njejsy captchowy test wobstał! ([[Special:Captcha/help\|dalše informacije]])',
	859	+ 'contactpage-includeip' => 'Moju IP-adresu w tutej powěsći zapřijeć.',
808	860	);
809	861
810	862	/** Hungarian (Magyar)
811	863	* @author Dani
	864	+ * @author Glanthor Reviol
812	865	*/
813	866	$messages['hu'] = array(
814	867	'contact' => 'Kapcsolatfelvétel',
—	—	@@ -818,6 +871,7 @@
819	872	'contactpage-legend' => 'E-mail küldése',
820	873	'contactpage-defsubject' => 'Üzenet',
821	874	'contactpage-subject-and-sender' => '$1 (küldte: $2)',
	875	+ 'contactpage-subject-and-sender-withip' => '$1 (feladó: $2, $3)',
822	876	'contactpage-fromname' => 'Neved: *',
823	877	'contactpage-fromaddress' => 'E-mail címed: **',
824	878	'contactpage-formfootnotes' => '* nem kötelező<br />
—	—	@@ -827,6 +881,7 @@
828	882	'contactpage-formfootnotes-required' => 'Az összes mező kitöltése kötelező.',
829	883	'contactpage-captcha' => 'Az üzenet elküldéséhez írd be a képen megjelent szót ([[Special:Captcha/help\|további segítség]])',
830	884	'contactpage-captcha-failed' => 'Captcha teszt nem sikerült! ([[Special:Captcha/help\|további segítség]])',
	885	+ 'contactpage-includeip' => 'Tüntesd fel az IP-címemet az üzenetben.',
831	886	);
832	887
833	888	/** Interlingua (Interlingua)
—	—	@@ -841,6 +896,7 @@
842	897	'contactpage-legend' => 'Inviar e-mail',
843	898	'contactpage-defsubject' => 'Message de contacto',
844	899	'contactpage-subject-and-sender' => '$1 (de $2)',
	900	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2 a $3)',
845	901	'contactpage-fromname' => 'Tu nomine: *',
846	902	'contactpage-fromaddress' => 'Tu e-mail: **',
847	903	'contactpage-formfootnotes' => '* optional<br />
—	—	@@ -850,10 +906,12 @@
851	907	'contactpage-formfootnotes-required' => 'Tote le campos es obligatori.',
852	908	'contactpage-captcha' => 'Pro inviar le message, per favor resolve le captcha ([[Special:Captcha/help\|plus info]])',
853	909	'contactpage-captcha-failed' => 'Le test captcha falleva! ([[Special:Captcha/help\|plus info]])',
	910	+ 'contactpage-includeip' => 'Includer mi adresse IP in iste message.',
854	911	);
855	912
856	913	/** Indonesian (Bahasa Indonesia)
857	914	* @author Bennylin
	915	+ * @author Iwan Novirion
858	916	*/
859	917	$messages['id'] = array(
860	918	'contact' => 'Hubungi kami',
—	—	@@ -864,6 +922,7 @@
865	923	'contactpage-legend' => 'Kirim surel',
866	924	'contactpage-defsubject' => 'Pesan',
867	925	'contactpage-subject-and-sender' => '$1 (dari $2)',
	926	+ 'contactpage-subject-and-sender-withip' => '$1 (dari $2 pada $3)',
868	927	'contactpage-fromname' => 'Nama Anda: *',
869	928	'contactpage-fromaddress' => 'Surel Anda: **',
870	929	'contactpage-formfootnotes' => '* opsional<br />
—	—	@@ -873,6 +932,7 @@
874	933	'contactpage-formfootnotes-required' => 'Semua harus diisi.',
875	934	'contactpage-captcha' => 'Untuk mengirim pesan, silakan mengisi Captcha ([[Special:Captcha/help\|info]])',
876	935	'contactpage-captcha-failed' => 'Tes Captcha gagal! ([[Special:Captcha/help\|info]])',
	936	+ 'contactpage-includeip' => 'Sertakan alamat IP saya di pesan ini.',
877	937	);
878	938
879	939	/** Ido (Ido)
—	—	@@ -898,6 +958,7 @@
899	959	);
900	960
901	961	/** Italian (Italiano)
	962	+ * @author Civvì
902	963	* @author Darth Kule
903	964	*/
904	965	$messages['it'] = array(
—	—	@@ -909,6 +970,7 @@
910	971	'contactpage-legend' => 'Invia e-mail',
911	972	'contactpage-defsubject' => 'Messaggio',
912	973	'contactpage-subject-and-sender' => '$1 (da $2)',
	974	+ 'contactpage-subject-and-sender-withip' => "$1 (da $2 all'indirizzo $3)",
913	975	'contactpage-fromname' => 'Nome: *',
914	976	'contactpage-fromaddress' => 'Indirizzo e-mail: **',
915	977	'contactpage-formfootnotes' => '* campo non obbligatorio<br />
—	—	@@ -918,12 +980,14 @@
919	981	'contactpage-formfootnotes-required' => 'Tutti i campi sono obbligatori.',
920	982	'contactpage-captcha' => 'Per inviare il messaggio, risolvi il captcha ([[Special:Captcha/help\|maggiori informazioni]])',
921	983	'contactpage-captcha-failed' => 'Test captcha fallito! ([[Special:Captcha/help\|maggiori informazioni]])',
	984	+ 'contactpage-includeip' => 'Includi il mio indirizzo IP in questo messaggio.',
922	985	);
923	986
924	987	/** Japanese (日本語)
925	988	* @author Aotake
926	989	* @author Fryed-peach
927	990	* @author JtFuruhata
	991	+ * @author Naohiro19
928	992	* @author לערי ריינהארט
929	993	*/
930	994	$messages['ja'] = array(
—	—	@@ -935,6 +999,7 @@
936	1000	'contactpage-legend' => '電子メールを送る',
937	1001	'contactpage-defsubject' => '連絡事項',
938	1002	'contactpage-subject-and-sender' => '$1($2 より)',
	1003	+ 'contactpage-subject-and-sender-withip' => '$1 ($2 が $3 から送信)',
939	1004	'contactpage-fromname' => 'あなたのお名前: *',
940	1005	'contactpage-fromaddress' => 'あなたの電子メールアドレス: **',
941	1006	'contactpage-formfootnotes' => '* 任意記入<br />
—	—	@@ -944,6 +1009,7 @@
945	1010	'contactpage-formfootnotes-required' => 'すべての欄が必須です。',
946	1011	'contactpage-captcha' => 'メッセージを送信するには、以下のCAPTCHA画像認証が必要です([[Special:Captcha/help\|詳細はこちら]])',
947	1012	'contactpage-captcha-failed' => 'CAPTCHA画像認証に失敗しました！([[Special:Captcha/help\|詳細はこちら]])',
	1013	+ 'contactpage-includeip' => 'このメッセージに自分のIPアドレスを含める',
948	1014	);
949	1015
950	1016	/** Javanese (Basa Jawa)
—	—	@@ -980,6 +1046,7 @@
981	1047	'contactpage-formfootnotes-required' => 'ყველა ველი სავალდებულოა.',
982	1048	'contactpage-captcha' => 'ამ შეტყობინების გასაგზავნად, გთოვთ გაიარეთ captcha- შემოწმება ([[Special:Captcha/help\|რა არის ეს?]])',
983	1049	'contactpage-captcha-failed' => 'Captcha-ს შემოწმება ჩავარდა! ([[Special:Captcha/help\|რა არის ეს?]])',
	1050	+ 'contactpage-includeip' => 'მიამაგრე ჩემი IP მისამართი ამ შეტყობინებაში.',
984	1051	);
985	1052
986	1053	/** Khmer (ភាសាខ្មែរ)
—	—	@@ -1028,6 +1095,7 @@
1029	1096	'contactpage-legend' => '이메일 보내기',
1030	1097	'contactpage-defsubject' => '연락 메시지',
1031	1098	'contactpage-subject-and-sender' => '$1 ($2이(가) 보냄)',
	1099	+ 'contactpage-subject-and-sender-withip' => '$1 ($2가 $3에서 보냄)',
1032	1100	'contactpage-fromname' => '당신의 이름: *',
1033	1101	'contactpage-fromaddress' => '당신의 이메일 주소 : **',
1034	1102	'contactpage-formfootnotes' => '* 선택 사항<br />
—	—	@@ -1037,9 +1105,10 @@
1038	1106	'contactpage-formfootnotes-required' => '모든 칸이 필수입력사항입니다.',
1039	1107	'contactpage-captcha' => '메시지를 보내려면 이 캡차를 풀어 주세요 ([[Special:Captcha/help\|자세한 정보]])',
1040	1108	'contactpage-captcha-failed' => '캡차 검사 실패! ([[Special:Captcha/help\|자세한 정보]])',
	1109	+ 'contactpage-includeip' => '이 메시지에 내 IP 주소를 포함하기',
1041	1110	);
1042	1111
1043		~~-/** Ripoarisch (Ripoarisch)~~
	1112	+/** Colognian (Ripoarisch)
1044	1113	* @author Purodha
1045	1114	*/
1046	1115	$messages['ksh'] = array(
—	—	@@ -1067,7 +1136,7 @@
1068	1137	([[Special:Captcha/help\|Mieh Enfommazjuhne]])',
1069	1138	);
1070	1139
1071		~~-/** Cornish (Kernowek)~~
	1140	+/** Cornish (Kernewek)
1072	1141	* @author Kernoweger
1073	1142	* @author Kw-Moon
1074	1143	*/
—	—	@@ -1099,6 +1168,7 @@
1100	1169	'contactpage-legend' => 'E-Mail schécken',
1101	1170	'contactpage-defsubject' => 'Kontakt Message',
1102	1171	'contactpage-subject-and-sender' => '$1 (vum $2)',
	1172	+ 'contactpage-subject-and-sender-withip' => '$1 (vum $2 iwwer $3)',
1103	1173	'contactpage-fromname' => 'Ären Numm: *',
1104	1174	'contactpage-fromaddress' => 'Är E-mail-Adress: **',
1105	1175	'contactpage-formfootnotes' => '* optional<br />
—	—	@@ -1108,6 +1178,7 @@
1109	1179	'contactpage-formfootnotes-required' => 'All Felder mussen ausgefëllt ginn.',
1110	1180	'contactpage-captcha' => 'Fir e Message ze schécke, léisst w.e.g. dëse Captcha ([[Special:Captcha/help\|méi Informatiounen]])',
1111	1181	'contactpage-captcha-failed' => 'Captcha-Test nicht bestan! ([[Special:Captcha/help\|méi Informatiounen]])',
	1182	+ 'contactpage-includeip' => 'Meng IP-Adress an dëse Message drasetzen',
1112	1183	);
1113	1184
1114	1185	/** Limburgish (Limburgs)
—	—	@@ -1148,6 +1219,16 @@
1149	1220	'contactpage-captcha-failed' => 'Captcha testas nepavyko! ([[Special:Captcha/help\|daugiau informacijos]])',
1150	1221	);
1151	1222
	1223	+/** Lazuri (Lazuri)
	1224	+ * @author Bombola
	1225	+ */
	1226	+$messages['lzz'] = array(
	1227	+ 'contactpage-fromname' => 'Skani coxo: *',
	1228	+ 'contactpage-fromaddress' => 'Skani e-mail: **',
	1229	+ 'contactpage-fromname-required' => 'Skani coxo:',
	1230	+ 'contactpage-fromaddress-required' => 'Skani e-mail:',
	1231	+);
	1232	+
1152	1233	/** Malagasy (Malagasy)
1153	1234	* @author Jagwar
1154	1235	*/
—	—	@@ -1169,6 +1250,7 @@
1170	1251	'contactpage-legend' => 'Испрати е-пошта',
1171	1252	'contactpage-defsubject' => 'Контактна порака',
1172	1253	'contactpage-subject-and-sender' => '$1 (од $2)',
	1254	+ 'contactpage-subject-and-sender-withip' => '$1 (од $2 од адресата $3)',
1173	1255	'contactpage-fromname' => 'Вашето име: *',
1174	1256	'contactpage-fromaddress' => 'Вашата е-пошта: **',
1175	1257	'contactpage-formfootnotes' => '* по избор<br />
—	—	@@ -1178,6 +1260,7 @@
1179	1261	'contactpage-formfootnotes-required' => 'Се бараат сите полиња.',
1180	1262	'contactpage-captcha' => 'За да испратите порака, решете ја задачата ([[Special:Captcha/help\|повеќе инфо]])',
1181	1263	'contactpage-captcha-failed' => 'Контролната задача е неуспешно решена! ([[Special:Captcha/help\|повеќе инфо]])',
	1264	+ 'contactpage-includeip' => 'Вклучи ја мојата IP-адреса во оваа порака.',
1182	1265	);
1183	1266
1184	1267	/** Malayalam (മലയാളം)
—	—	@@ -1192,16 +1275,18 @@
1193	1276	'contactpage-pagetext' => 'ഞങ്ങളെ ബന്ധപ്പെടാൻ ദയവായി താഴെ കൊടുത്തിരിക്കുന്ന ഫോം ഉപയോഗിക്കുക.',
1194	1277	'contactpage-legend' => 'ഇമെയിൽ അയയ്ക്കുക',
1195	1278	'contactpage-defsubject' => 'ബന്ധപ്പെടാനുള്ള സന്ദേശം',
1196		~~- 'contactpage-subject-and-sender' => '$1 ($2 ല്‍ നിന്ന്)',~~
	1279	+ 'contactpage-subject-and-sender' => '$1 (അയച്ചത് $2)',
	1280	+ 'contactpage-subject-and-sender-withip' => '$1 ($3 എന്ന വിലാസത്തിൽനിന്നുള്ള $2)',
1197	1281	'contactpage-fromname' => 'താങ്കളുടെ പേര്‌: *',
1198		~~- 'contactpage-fromaddress' => 'താങ്കളുടെ ഇമെയില്‍ വിലാസം: **',~~
1199		~~- 'contactpage-formfootnotes' => '* നിര്‍‌ബന്ധമില്ല<br />~~
1200		-** നിര്‍‌ബന്ധമില്ല, പക്ഷെ താങ്കള്‍ക്ക് മറുപടി വേണമെങ്കില്‍ ഇതു ആവശ്യമാണ്‌',
	1282	+ 'contactpage-fromaddress' => 'താങ്കളുടെ ഇമെയിൽ വിലാസം: **',
	1283	+ 'contactpage-formfootnotes' => '* നിർ‌ബന്ധമില്ല<br />
	1284	+** നിർ‌ബന്ധമില്ല, പക്ഷെ താങ്കൾക്ക് മറുപടി വേണമെങ്കിൽ ഇതു ആവശ്യമാണ്‌',
1201	1285	'contactpage-fromname-required' => 'താങ്കളുടെ പേര്:',
1202	1286	'contactpage-fromaddress-required' => 'താങ്കളുടെ ഇമെയിൽ:',
1203	1287	'contactpage-formfootnotes-required' => 'എല്ലാ ഫീൽഡുകളും പൂരിപ്പിച്ചിരിക്കണം.',
1204		- 'contactpage-captcha' => 'സന്ദേശം അയക്കാന്‍, ദയവായി Captcha നിര്‍ദ്ധാരണം ചെയ്യുക. [[Special:Captcha/help\|കൂടുതല്‍ വിവരം]]',
1205		~~- 'contactpage-captcha-failed' => 'Captcha പരീക്ഷണം പരാജയപ്പെട്ടു! ([[Special:Captcha/help\|കൂടുതല്‍ വിവരം]])',~~
	1288	+ 'contactpage-captcha' => 'സന്ദേശം അയക്കാൻ, ദയവായി Captcha നിർദ്ധാരണം ചെയ്യുക. [[Special:Captcha/help\|കൂടുതൽ വിവരം]]',
	1289	+ 'contactpage-captcha-failed' => 'Captcha പരീക്ഷണം പരാജയപ്പെട്ടു! ([[Special:Captcha/help\|കൂടുതൽ വിവരം]])',
	1290	+ 'contactpage-includeip' => 'ഈ സന്ദേശത്തിൽ എന്റെ ഐ.പി. വിലാസവും ചേർക്കുക.',
1206	1291	);
1207	1292
1208	1293	/** Marathi (मराठी)
—	—	@@ -1311,6 +1396,7 @@
1312	1397	'contactpage-legend' => 'E-mail versturen',
1313	1398	'contactpage-defsubject' => 'Contactbericht',
1314	1399	'contactpage-subject-and-sender' => '$1 (van $2)',
	1400	+ 'contactpage-subject-and-sender-withip' => '$1 (van $2 op $3)',
1315	1401	'contactpage-fromname' => 'Uw naam:*',
1316	1402	'contactpage-fromaddress' => 'Uw e-mailadres:**',
1317	1403	'contactpage-formfootnotes' => '* optioneel<br />
—	—	@@ -1320,6 +1406,7 @@
1321	1407	'contactpage-formfootnotes-required' => 'Alle velden zijn verplicht.',
1322	1408	'contactpage-captcha' => 'Om het bericht te versturen, moet u eerst de captcha oplossen ([[Special:Captcha/help\|meer informatie]])',
1323	1409	'contactpage-captcha-failed' => 'De captcha-test is mislukt! ([[Special:Captcha/help\|meer informatie]])',
	1410	+ 'contactpage-includeip' => 'Stuur mijn IP-adres mee met dit bericht.',
1324	1411	);
1325	1412
1326	1413	/** Norwegian Nynorsk (‪Norsk (nynorsk)‬)
—	—	@@ -1358,6 +1445,7 @@
1359	1446	'contactpage-legend' => 'Send e-post',
1360	1447	'contactpage-defsubject' => 'Beskjed',
1361	1448	'contactpage-subject-and-sender' => '$1 (fra $2)',
	1449	+ 'contactpage-subject-and-sender-withip' => '$1 (fra $2 på $3)',
1362	1450	'contactpage-fromname' => 'Ditt navn: *',
1363	1451	'contactpage-fromaddress' => 'Din e-postadresse: **',
1364	1452	'contactpage-formfootnotes' => '* valgfri<br />
—	—	@@ -1367,6 +1455,7 @@
1368	1456	'contactpage-formfootnotes-required' => 'Alle felt er obligatoriske.',
1369	1457	'contactpage-captcha' => 'Løs captcha-oppgaven for å sende beskjeden ([[Special:Captcha/help\|mer informasjon]])',
1370	1458	'contactpage-captcha-failed' => 'Captcha-test mislyktes! ([[Special:Captcha/help\|mer informasjon]])',
	1459	+ 'contactpage-includeip' => 'Inkluder IP-adressen min i denne meldingen.',
1371	1460	);
1372	1461
1373	1462	/** Northern Sotho (Sesotho sa Leboa)
—	—	@@ -1389,6 +1478,7 @@
1390	1479	'contactpage-legend' => 'Mandar un corrièr electronic',
1391	1480	'contactpage-defsubject' => 'Messatge',
1392	1481	'contactpage-subject-and-sender' => '$1 (de $2)',
	1482	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2 a $3)',
1393	1483	'contactpage-fromname' => 'Vòstre nom : *',
1394	1484	'contactpage-fromaddress' => 'Vòstra adreça electronica : **',
1395	1485	'contactpage-formfootnotes' => '* opcional<br /> ** opcional mas requerit se desiratz una responsa',
—	—	@@ -1397,6 +1487,7 @@
1398	1488	'contactpage-formfootnotes-required' => 'Totes los camps son requesits.',
1399	1489	'contactpage-captcha' => 'Per mandar lo messatge, mercés de resoudre lo captcha ([[Special:Captcha/help\|ajuda]])',
1400	1490	'contactpage-captcha-failed' => 'Avètz pas desencodat lo captcha ! ([[Special:Captcha/help\|ajuda]])',
	1491	+ 'contactpage-includeip' => 'Inclure mon adreça IP dins aquel messatge.',
1401	1492	);
1402	1493
1403	1494	/** Deitsch (Deitsch)
—	—	@@ -1424,6 +1515,7 @@
1425	1516	'contactpage-legend' => 'Wyślij e‐mail',
1426	1517	'contactpage-defsubject' => 'Wiadomość',
1427	1518	'contactpage-subject-and-sender' => '$1 (z $2)',
	1519	+ 'contactpage-subject-and-sender-withip' => '$1 (od $2 z $3)',
1428	1520	'contactpage-fromname' => 'Imię: *',
1429	1521	'contactpage-fromaddress' => 'Twój e‐mail: **',
1430	1522	'contactpage-formfootnotes' => '* opcjonalne<br /> ** opcjonalne, ale wymagane, jeśli chcesz otrzymać odpowiedź',
—	—	@@ -1432,6 +1524,7 @@
1433	1525	'contactpage-formfootnotes-required' => 'Wypełnienie wszystkich pól jest obowiązkowe.',
1434	1526	'contactpage-captcha' => 'Aby wysłać wiadomosć wypełnij podane tu zadanie ([[Special:Captcha/help\|wyjaśnienie]])',
1435	1527	'contactpage-captcha-failed' => 'Aby wysłać tę wiadomość, prosimy rozwiązać to zadanie ([[Special:Captcha/help\|objaśnienie]])',
	1528	+ 'contactpage-includeip' => 'Dodaj do tej wiadomości informację o moim adresie IP.',
1436	1529	);
1437	1530
1438	1531	/** Piedmontese (Piemontèis)
—	—	@@ -1447,6 +1540,7 @@
1448	1541	'contactpage-legend' => 'Manda e-mail',
1449	1542	'contactpage-defsubject' => 'Messagi',
1450	1543	'contactpage-subject-and-sender' => '$1 (da $2)',
	1544	+ 'contactpage-subject-and-sender-withip' => '$1 (da $2 a $3)',
1451	1545	'contactpage-fromname' => 'Tò nòm: *',
1452	1546	'contactpage-fromaddress' => 'Toa e-mail: **',
1453	1547	'contactpage-formfootnotes' => "* opsional<br /> ** opsional, ma për podej avej d'arspòsta a venta butelo",
—	—	@@ -1455,6 +1549,7 @@
1456	1550	'contactpage-formfootnotes-required' => 'Tùit ij camp a son obligatòri.',
1457	1551	'contactpage-captcha' => "Për mandé via ël messagi, për piasì ch'arzòlva ël test antirumenta ([[Special:Captcha/help\|pì d'anformassion]])",
1458	1552	'contactpage-captcha-failed' => "Test antirumenta falì! ([[Special:Captcha/help\|pì d'anformassion]])",
	1553	+ 'contactpage-includeip' => 'Anclud mia adrëssa IP an sto mëssagi-sì',
1459	1554	);
1460	1555
1461	1556	/** Pashto (پښتو)
—	—	@@ -1491,6 +1586,7 @@
1492	1587	'contactpage-legend' => 'Enviar correio electrónico',
1493	1588	'contactpage-defsubject' => 'Mensagem de Contacto',
1494	1589	'contactpage-subject-and-sender' => '$1 (de $2)',
	1590	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2, endereço $3)',
1495	1591	'contactpage-fromname' => 'O seu nome: *',
1496	1592	'contactpage-fromaddress' => 'O seu correio electrónico: **',
1497	1593	'contactpage-formfootnotes' => '* opcional<br />
—	—	@@ -1500,11 +1596,13 @@
1501	1597	'contactpage-formfootnotes-required' => 'Todos os campos são obrigatórios.',
1502	1598	'contactpage-captcha' => "Para enviar a mensagem, por favor, resolva o ''captcha'' ([[Special:Captcha/help\|mais informações]])",
1503	1599	'contactpage-captcha-failed' => "O teste ''captcha'' falhou! ([[Special:Captcha/help\|mais informações]])",
	1600	+ 'contactpage-includeip' => 'Incluir o meu endereço IP nesta mensagem.',
1504	1601	);
1505	1602
1506	1603	/** Brazilian Portuguese (Português do Brasil)
1507	1604	* @author Carla404
1508	1605	* @author Eduardo.mps
	1606	+ * @author Giro720
1509	1607	*/
1510	1608	$messages['pt-br'] = array(
1511	1609	'contact' => 'Página de contato',
—	—	@@ -1515,6 +1613,7 @@
1516	1614	'contactpage-legend' => 'Enviar e-mail',
1517	1615	'contactpage-defsubject' => 'Mensagem de Contato',
1518	1616	'contactpage-subject-and-sender' => '$1 (de $2)',
	1617	+ 'contactpage-subject-and-sender-withip' => '$1 (de $2, endereço $3)',
1519	1618	'contactpage-fromname' => 'O seu nome: *',
1520	1619	'contactpage-fromaddress' => 'O seu email: **',
1521	1620	'contactpage-formfootnotes' => '* opcional<br />
—	—	@@ -1524,6 +1623,7 @@
1525	1624	'contactpage-formfootnotes-required' => 'Todos os campos são obrigatórios.',
1526	1625	'contactpage-captcha' => "Para enviar a mensagem, por favor, resolva o ''captcha'' ([[Special:Captcha/help\|mais informação]])",
1527	1626	'contactpage-captcha-failed' => 'Teste captcha falhou! ([[Special:Captcha/help\|mais informação]])',
	1627	+ 'contactpage-includeip' => 'Incluir o meu endereço IP nesta mensagem.',
1528	1628	);
1529	1629
1530	1630	/** Romani (Romani)
—	—	@@ -1542,19 +1642,19 @@
1543	1643	'contactpage' => 'Pagină de contact',
1544	1644	'contactpage-desc' => '[[Special:Contact\|Formular de contact pentru vizitatori]]',
1545	1645	'contactpage-title' => 'Contact',
1546		~~- 'contactpage-pagetext' => 'Foloseşte formularul de mai jos pentru a ne contacta.',~~
	1646	+ 'contactpage-pagetext' => 'Folosește formularul de mai jos pentru a ne contacta.',
1547	1647	'contactpage-legend' => 'Trimite e-mail',
1548	1648	'contactpage-defsubject' => 'Mesaj de contact',
1549	1649	'contactpage-subject-and-sender' => '$1 (de la $2)',
1550	1650	'contactpage-fromname' => 'Numele dumneavoastră: *',
1551	1651	'contactpage-fromaddress' => 'Adresa dumneavoastră de e-mail: **',
1552		~~- 'contactpage-formfootnotes' => '* opţional<br />~~
1553		~~-** opţională, dar necesară dacă doriţi un răspuns',~~
	1652	+ 'contactpage-formfootnotes' => '* opțional<br />
	1653	+** opțională, dar necesară dacă doriți un răspuns',
1554	1654	'contactpage-fromname-required' => 'Numele dumneavoastră:',
1555	1655	'contactpage-fromaddress-required' => 'Adresa dumneavoastră de e-mail:',
1556	1656	'contactpage-formfootnotes-required' => 'Toate câmpurile sunt obligatorii.',
1557	1657	'contactpage-captcha' => 'Pentru a trimite mesajul, rezolvă captcha ([[Special:Captcha/help\|mai multe detalii]])',
1558		~~- 'contactpage-captcha-failed' => 'Testul captcha a eşuat! ([[Special:Captcha/help\|mai multe informaţii]])',~~
	1658	+ 'contactpage-captcha-failed' => 'Testul captcha a eșuat! ([[Special:Captcha/help\|mai multe informații]])',
1559	1659	);
1560	1660
1561	1661	/** Tarandíne (Tarandíne)
—	—	@@ -1593,6 +1693,7 @@
1594	1694	'contactpage-legend' => 'Отправить письмо',
1595	1695	'contactpage-defsubject' => 'Сообщение',
1596	1696	'contactpage-subject-and-sender' => '$1 (от $2)',
	1697	+ 'contactpage-subject-and-sender-withip' => '$1 (от $2 с адреса $3)',
1597	1698	'contactpage-fromname' => 'Ваше имя: *',
1598	1699	'contactpage-fromaddress' => 'Ваш адрес эл. почты: **',
1599	1700	'contactpage-formfootnotes' => '* необязательно<br />
—	—	@@ -1602,6 +1703,7 @@
1603	1704	'contactpage-formfootnotes-required' => 'Все поля обязательно должны быть заполнены.',
1604	1705	'contactpage-captcha' => 'Чтобы отправить сообщение, пожалуйста, пройдите проверку CAPTCHA ([[Special:Captcha/help\|что это?]])',
1605	1706	'contactpage-captcha-failed' => 'Проверка CAPTCHA не пройдена! ([[Special:Captcha/help\|что это?]])',
	1707	+ 'contactpage-includeip' => 'Включить мой IP-адрес в это сообщение.',
1606	1708	);
1607	1709
1608	1710	/** Yakut (Саха тыла)
—	—	@@ -1651,6 +1753,31 @@
1652	1754	'contactpage-captcha-failed' => 'Test captcha bol neúspešný! ([[Special:Captcha/help\|podrobnosti]])',
1653	1755	);
1654	1756
	1757	+/** Slovenian (Slovenščina)
	1758	+ * @author Dbc334
	1759	+ */
	1760	+$messages['sl'] = array(
	1761	+ 'contact' => 'Stik z nami',
	1762	+ 'contactpage' => 'Stik z nami',
	1763	+ 'contactpage-desc' => '[[Special:Contact\|Kontaktni obrazec za obiskovalce]]',
	1764	+ 'contactpage-title' => 'Kontakt',
	1765	+ 'contactpage-pagetext' => 'Prosimo, uporabite spodnji obrazec za stik z nami.',
	1766	+ 'contactpage-legend' => 'Pošljite e-pošto',
	1767	+ 'contactpage-defsubject' => 'Kontaktno sporočilo',
	1768	+ 'contactpage-subject-and-sender' => '$1 (od $2)',
	1769	+ 'contactpage-subject-and-sender-withip' => '$1 (od $2 iz $3)',
	1770	+ 'contactpage-fromname' => 'Vaše ime: *',
	1771	+ 'contactpage-fromaddress' => 'Vaš e-poštni naslov: **',
	1772	+ 'contactpage-formfootnotes' => '* izbirno<br />
	1773	+** izbirno, vendar potrebno, če želite odgovor',
	1774	+ 'contactpage-fromname-required' => 'Vaše ime:',
	1775	+ 'contactpage-fromaddress-required' => 'Vaš e-poštni naslov:',
	1776	+ 'contactpage-formfootnotes-required' => 'Potrebno je izpolniti vsa polja.',
	1777	+ 'contactpage-captcha' => 'Za pošiljanje sporočila prosimo razrešite captcha ([[Special:Captcha/help\|več informacij]])',
	1778	+ 'contactpage-captcha-failed' => 'Preizkus captcha je spodletel! ([[Special:Captcha/help\|več informacij]])',
	1779	+ 'contactpage-includeip' => 'Vključi moj IP-naslov v tem sporočilu.',
	1780	+);
	1781	+
1655	1782	/** Albanian (Shqip)
1656	1783	* @author Dori
1657	1784	*/
—	—	@@ -1728,7 +1855,9 @@
1729	1856	);
1730	1857
1731	1858	/** Swedish (Svenska)
	1859	+ * @author Ainali
1732	1860	* @author Boivie
	1861	+ * @author Dafer45
1733	1862	* @author Lejonel
1734	1863	* @author M.M.S.
1735	1864	* @author Najami
—	—	@@ -1743,6 +1872,7 @@
1744	1873	'contactpage-legend' => 'Skicka e-post',
1745	1874	'contactpage-defsubject' => 'Kontaktmeddelande',
1746	1875	'contactpage-subject-and-sender' => '$1 (från $2)',
	1876	+ 'contactpage-subject-and-sender-withip' => ' $1 (från $2 till $3)',
1747	1877	'contactpage-fromname' => 'Ditt namn: *',
1748	1878	'contactpage-fromaddress' => 'Din e-postadress: **',
1749	1879	'contactpage-formfootnotes' => '* kan utelämnas<br />
—	—	@@ -1752,6 +1882,7 @@
1753	1883	'contactpage-formfootnotes-required' => 'Alla fält är obligatoriska.',
1754	1884	'contactpage-captcha' => 'För att få skicka meddelandet måste du först lösa följande captcha-test ([[Special:Captcha/help\|mer information]])',
1755	1885	'contactpage-captcha-failed' => 'Captcha-testet misslyckades! ([[Special:Captcha/help\|mer information]])',
	1886	+ 'contactpage-includeip' => 'Inkludera min IP-adress i detta meddelande.',
1756	1887	);
1757	1888
1758	1889	/** Telugu (తెలుగు)
—	—	@@ -1862,6 +1993,7 @@
1863	1994	'contactpage-legend' => 'Magpadala ng e-liham',
1864	1995	'contactpage-defsubject' => 'Mensahe ng pakikipag-ugnayan',
1865	1996	'contactpage-subject-and-sender' => '$1 (mula sa $2)',
	1997	+ 'contactpage-subject-and-sender-withip' => '$1 (mula sa $2 na nasa $3)',
1866	1998	'contactpage-fromname' => 'Pangalan mo: *',
1867	1999	'contactpage-fromaddress' => 'E-liham mo: **',
1868	2000	'contactpage-formfootnotes' => '* maaaring wala nito<br />
—	—	@@ -1871,9 +2003,11 @@
1872	2004	'contactpage-formfootnotes-required' => 'Kailangan ang lahat ng mga hanay.',
1873	2005	'contactpage-captcha' => "Upang makapagpadala ng mensahe, pakilutas ang \"hulihin ka\" o ''captcha'' ([[Special:Captcha/help\|mas marami pang kabatiran]])",
1874	2006	'contactpage-captcha-failed' => 'Nabigo ang captcha! ([[Special:Captcha/help\|mas marami pang kabatiran]])',
	2007	+ 'contactpage-includeip' => 'Isama ang aking adres ng IP sa mensaheng ito.',
1875	2008	);
1876	2009
1877	2010	/** Turkish (Türkçe)
	2011	+ * @author Homonihilis
1878	2012	* @author Joseph
1879	2013	* @author Karduelis
1880	2014	* @author Mach
—	—	@@ -1896,11 +2030,20 @@
1897	2031	'contactpage-formfootnotes-required' => 'Bütün alanlar gereklidir.',
1898	2032	'contactpage-captcha' => "Mesajı göndermek için, lütfen captcha'yı çözün ([[Special:Captcha/help\|daha fazla bilgi]])",
1899	2033	'contactpage-captcha-failed' => 'Captcha testi başarısız oldu! ([[Special:Captcha/help\|daha fazla bilgi]])',
	2034	+ 'contactpage-includeip' => 'Mesaja IP adresimi ekle.',
1900	2035	);
1901	2036
	2037	+/** Udmurt (Удмурт)
	2038	+ * @author Kaganer
	2039	+ */
	2040	+$messages['udm'] = array(
	2041	+ 'contactpage-defsubject' => 'Ивортон',
	2042	+);
	2043	+
1902	2044	/** Ukrainian (Українська)
1903	2045	* @author NickK
1904	2046	* @author Prima klasy4na
	2047	+ * @author Тест
1905	2048	*/
1906	2049	$messages['uk'] = array(
1907	2050	'contact' => "Сторінка зв'язку",
—	—	@@ -1911,6 +2054,7 @@
1912	2055	'contactpage-legend' => 'Надіслати листа електронною поштою',
1913	2056	'contactpage-defsubject' => 'Повідомлення',
1914	2057	'contactpage-subject-and-sender' => '$1 (з $2)',
	2058	+ 'contactpage-subject-and-sender-withip' => '$1 (від $2 з $3)',
1915	2059	'contactpage-fromname' => "Ваше ім'я: *",
1916	2060	'contactpage-fromaddress' => 'Ваша адреса електронної пошти: **',
1917	2061	'contactpage-formfootnotes' => "* необов'язково<br />
—	—	@@ -1920,6 +2064,7 @@
1921	2065	'contactpage-formfootnotes-required' => "Усі поля є обов'язковими.",
1922	2066	'contactpage-captcha' => "Щоб відправити повідомлення, будь ласка, розв'яжіть captcha ([[Special:Captcha/help\|докладніше]])",
1923	2067	'contactpage-captcha-failed' => "Captcha розв'язана неправильно! ([[Special:Captcha/help\|докладніше]])",
	2068	+ 'contactpage-includeip' => 'Додати мою IP-адресу до цього повідомлення.',
1924	2069	);
1925	2070
1926	2071	/** Urdu (اردو)
—	—	@@ -1986,6 +2131,7 @@
1987	2132	'contactpage-legend' => 'Gửi thư điện tử',
1988	2133	'contactpage-defsubject' => 'Tin nhắn liên hệ',
1989	2134	'contactpage-subject-and-sender' => '$1 (gửi từ $2)',
	2135	+ 'contactpage-subject-and-sender-withip' => '$1 (từ $2 lúc $3)',
1990	2136	'contactpage-fromname' => 'Tên của bạn: *',
1991	2137	'contactpage-fromaddress' => 'Thư điện tử của bạn: **',
1992	2138	'contactpage-formfootnotes' => '* tùy chọn<br />
—	—	@@ -1995,6 +2141,7 @@
1996	2142	'contactpage-formfootnotes-required' => 'Bạn phải điền tất cả các mục.',
1997	2143	'contactpage-captcha' => 'Để gửi tin nhắn, xin hãy ghi lại captcha ([[Special:Captcha/help\|thông tin thêm]])',
1998	2144	'contactpage-captcha-failed' => 'Kiểm tra captcha thất bại! ([[Special:Captcha/help\|thông tin thêm]])',
	2145	+ 'contactpage-includeip' => 'Bao gồm địa chỉ IP của tôi trong thư này.',
1999	2146	);
2000	2147
2001	2148	/** Volapük (Volapük)
—	—	@@ -2034,7 +2181,7 @@
2035	2182	'contactpage-fromaddress-required' => 'אייער ע-פאסט:',
2036	2183	);
2037	2184
2038		~~-/** Yue (粵語)~~
	2185	+/** Cantonese (粵語)
2039	2186	* @author Shinjiman
2040	2187	*/
2041	2188	$messages['yue'] = array(
—	—	@@ -2094,6 +2241,7 @@
2095	2242
2096	2243	/** Traditional Chinese (‪中文(繁體)‬)
2097	2244	* @author Gzdavidwong
	2245	+ * @author Horacewai2
2098	2246	* @author Liangent
2099	2247	* @author Shinjiman
2100	2248	* @author Wrightbus
—	—	@@ -2107,6 +2255,7 @@
2108	2256	'contactpage-legend' => '傳送電郵',
2109	2257	'contactpage-defsubject' => '聯絡訊息',
2110	2258	'contactpage-subject-and-sender' => '$1 （自$2）',
	2259	+ 'contactpage-subject-and-sender-withip' => '$1 (由$2在$3)',
2111	2260	'contactpage-fromname' => '您的名字： *',
2112	2261	'contactpage-fromaddress' => '您的郵箱：**',
2113	2262	'contactpage-formfootnotes' => '* 可選<br />
—	—	@@ -2116,5 +2265,6 @@
2117	2266	'contactpage-formfootnotes-required' => '所有字段都是必需的。',
2118	2267	'contactpage-captcha' => '要傳送這個訊息，請先解決這個 captcha （[[Special:Captcha/help\|更多資訊]]）',
2119	2268	'contactpage-captcha-failed' => 'Captcha 測試失敗! （[[Special:Captcha/help\|更多資訊]]）',
	2269	+ 'contactpage-includeip' => '在此郵件中包含我的IP位置資料。',
2120	2270	);
2121	2271
Index: branches/wmf/1.16wmf4/extensions/ContactPage/ContactPage.php
—	—	@@ -21,7 +21,6 @@
22	22	'name' => 'ContactPage',
23	23	'author' => 'Daniel Kinzler',
24	24	'url' => 'http://www.mediawiki.org/wiki/Extension:ContactPage',
25		~~- 'description' => 'Contact form for visitors',~~
26	25	'descriptionmsg' => 'contactpage-desc',
27	26	);
28	27
—	—	@@ -47,3 +46,6 @@
48	47	// If true, users will be required to supply a name and an e-mail address
49	48	// on Special:Contact.
50	49	$wgContactRequireAll = false;
	50	+
	51	+// If true, the form will include a checkbox offering to put the IP address of the submitter in the subject line
	52	+$wgContactIncludeIP = false;
Property changes on: branches/wmf/1.16wmf4/extensions/ContactPage
___________________________________________________________________
Name: svn:mergeinfo
51	53	+ /branches/wmf-deployment/extensions/ContactPage:60970
/trunk/extensions/ContactPage:62820-67074
/trunk/phase3/extensions/ContactPage:63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816

Status & tagging log

19:30, 21 November 2010 Reedy (talk | contribs) changed the status of r67075 [removed: new added: deferred]