r107541 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r107540‎ \| r107541 \| r107542 >
Date:	22:50, 28 December 2011
Author:	catrope
Status:	ok
Tags:
Comment:	1.18wmf1: Update MarkAsHelpful and MoodBar to trunk state
Modified paths:	/branches/wmf/1.18wmf1/extensions/MarkAsHelpful (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/MarkAsHelpful.i18n.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/MarkAsHelpful.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/api/ApiGetMarkAsHelpfulItem.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/api/ApiMarkAsHelpful.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/includes/MarkAsHelpfulItem.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/includes/MarkAsHelpfulUtil.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MarkAsHelpful/modules/ext.markAsHelpful/ext.markAsHelpful.js (modified) (history) /branches/wmf/1.18wmf1/extensions/MoodBar (modified) (history) /branches/wmf/1.18wmf1/extensions/MoodBar/ApiFeedbackDashboardResponse.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MoodBar/MoodBar.hooks.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MoodBar/MoodBar.i18n.php (modified) (history) /branches/wmf/1.18wmf1/extensions/MoodBar/include/MoodBarHTMLMailerJob.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.18wmf1/extensions/MoodBar/include/MoodBarHTMLMailerJob.php
—	—	@@ -13,9 +13,13 @@
14	14	$editor = User::newFromId( $this->params['editorID'] );
15	15	// B/C, only the name might be given.
16	16	} else {
17		~~- # FIXME: newFromName could return false on a badly configured wiki.~~
18	17	$editor = User::newFromName( $this->params['editor'], false );
	18	+ if ( !$editor ) {
	19	+ $this->setLastError( $this->params['editor'] . ' is not a valid user' );
	20	+ return false;
	21	+ }
19	22	}
	23	+
20	24	$enotif->actuallyNotifyOnRespond(
21	25	$editor,
22	26	$this->title,
Index: branches/wmf/1.18wmf1/extensions/MoodBar/MoodBar.i18n.php
—	—	@@ -549,6 +549,7 @@
550	550	/** Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
551	551	* @author EugeneZelenko
552	552	* @author Jim-by
	553	+ * @author Тест
553	554	*/
554	555	$messages['be-tarask'] = array(
555	556	'moodbar-desc' => 'Дазваляе вызначаным удзельнікам дасылаць іх водгук пра вопыт у рэдагаваньні',
—	—	@@ -607,7 +608,7 @@
608	609	'moodbar-feedback-filters-type-happy' => 'Пахвала',
609	610	'moodbar-feedback-filters-type-confused' => 'Блытаніна',
610	611	'moodbar-feedback-filters-type-sad' => 'Праблемы',
611		~~- 'moodbar-feedback-filters-username' => 'Імя ўдзельніка',~~
	612	+ 'moodbar-feedback-filters-username' => 'Імя ўдзельніка:',
612	613	'moodbar-feedback-filters-button' => 'Наладзіць фільтры',
613	614	'moodbar-feedback-whatis' => 'Што гэта за магчымасьць?',
614	615	'moodbar-feedback-permalink' => 'спасылка сюды',
—	—	@@ -918,7 +919,7 @@
919	920	'moodbar-feedback-filters-type-happy' => 'Glücklich',
920	921	'moodbar-feedback-filters-type-confused' => 'Verwirrt',
921	922	'moodbar-feedback-filters-type-sad' => 'Traurig',
922		~~- 'moodbar-feedback-filters-username' => 'Benutzername',~~
	923	+ 'moodbar-feedback-filters-username' => 'Benutzername:',
923	924	'moodbar-feedback-filters-my-response' => 'Nur meine Antworten:',
924	925	'moodbar-feedback-filters-button' => 'Filter setzen',
925	926	'moodbar-feedback-whatis' => 'Über dieses Feature',
—	—	@@ -1464,7 +1465,7 @@
1465	1466	'moodbar-feedback-filters-type-happy' => 'Iloinen',
1466	1467	'moodbar-feedback-filters-type-confused' => 'Hämmentynyt',
1467	1468	'moodbar-feedback-filters-type-sad' => 'Surullinen',
1468		~~- 'moodbar-feedback-filters-username' => 'Käyttäjätunnus',~~
	1469	+ 'moodbar-feedback-filters-username' => 'Käyttäjätunnus:',
1469	1470	'moodbar-feedback-filters-my-response' => 'Vain omat vastaukset:',
1470	1471	'moodbar-feedback-filters-button' => 'Aseta suodattimet',
1471	1472	'moodbar-feedback-whatis' => 'Mikä tämä ominaisuus on?',
—	—	@@ -1624,7 +1625,7 @@
1625	1626	'moodbar-feedback-filters-type-happy' => 'Heureux',
1626	1627	'moodbar-feedback-filters-type-confused' => 'Confus',
1627	1628	'moodbar-feedback-filters-type-sad' => 'Triste',
1628		~~- 'moodbar-feedback-filters-username' => "Nom d'utilisateur",~~
	1629	+ 'moodbar-feedback-filters-username' => "Nom d'utilisateur:",
1629	1630	'moodbar-feedback-filters-my-response' => 'Mes réponses uniquement:',
1630	1631	'moodbar-feedback-filters-button' => 'Positionner les filtres',
1631	1632	'moodbar-feedback-whatis' => "Qu'est-ce que cette fonctionnalité?",
—	—	@@ -1860,7 +1861,7 @@
1861	1862	'moodbar-feedback-filters-type-happy' => 'Contento',
1862	1863	'moodbar-feedback-filters-type-confused' => 'Confuso',
1863	1864	'moodbar-feedback-filters-type-sad' => 'Triste',
1864		~~- 'moodbar-feedback-filters-username' => 'Nome de usuario',~~
	1865	+ 'moodbar-feedback-filters-username' => 'Nome de usuario:',
1865	1866	'moodbar-feedback-filters-my-response' => 'As miñas respostas unicamente:',
1866	1867	'moodbar-feedback-filters-button' => 'Establecer os filtros',
1867	1868	'moodbar-feedback-whatis' => 'Que é isto?',
—	—	@@ -1975,6 +1976,7 @@
1976	1977
1977	1978	/** Hebrew (עברית)
1978	1979	* @author Amire80
	1980	+ * @author Ofrahod
1979	1981	*/
1980	1982	$messages['he'] = array(
1981	1983	'moodbar-desc' => 'מתן אפשרות למשתמשים מסוימים לשלוח משוב על חוויות העריכה שלהם',
—	—	@@ -2055,7 +2057,7 @@
2056	2058	'moodbar-feedback-filters-type-happy' => 'שמחה',
2057	2059	'moodbar-feedback-filters-type-confused' => 'בלבול',
2058	2060	'moodbar-feedback-filters-type-sad' => 'עצב',
2059		~~- 'moodbar-feedback-filters-username' => 'שם משתמש',~~
	2061	+ 'moodbar-feedback-filters-username' => 'שם משתמש:',
2060	2062	'moodbar-feedback-filters-my-response' => 'רק תשובות שלי:',
2061	2063	'moodbar-feedback-filters-button' => 'הגדרת מסננים',
2062	2064	'moodbar-feedback-whatis' => 'מהי התכונה הזו?',
—	—	@@ -2125,19 +2127,121 @@
2126	2128	-- {{SITENAME}}',
2127	2129	);
2128	2130
	2131	+/** Hindi (हिन्दी)
	2132	+ * @author Ansumang
	2133	+ */
	2134	+$messages['hi'] = array(
	2135	+ 'moodbar-close' => '(बंद)',
	2136	+ 'moodbar-type-happy-title' => 'ख़ुश',
	2137	+ 'moodbar-type-sad-title' => 'उदास',
	2138	+ 'moodbar-type-confused-title' => 'उलझन में',
	2139	+ 'moodbar-what-label' => 'यह क्या है?',
	2140	+ 'moodbar-privacy-link-title' => 'उपयोग की शर्तें',
	2141	+ 'moodbar-form-title' => 'क्योंकि...',
	2142	+ 'moodbar-success-title' => 'धन्यवाद!',
	2143	+ 'moodbar-email-title' => 'ई-मेल जोड़ें',
	2144	+ 'moodbar-email-optout' => 'नहीं धन्यवाद',
	2145	+ 'moodbar-admin-empty' => 'कोई परिणाम नहीं',
	2146	+ 'moodbar-header-timestamp' => 'टाइम मोहर',
	2147	+ 'moodbar-header-type' => 'प्रकार',
	2148	+ 'moodbar-header-page' => 'पृष्ठ',
	2149	+ 'moodbar-header-usertype' => 'सदस्य प्रकार',
	2150	+ 'moodbar-header-user' => 'सदस्य',
	2151	+ 'moodbar-header-editmode' => 'संपादन मोड',
	2152	+ 'moodbar-header-system' => 'सिस्टम प्रकार',
	2153	+ 'moodbar-header-comment' => 'टिप्पणियाँ',
	2154	+ 'moodbar-header-namespace' => 'नामस्थान',
	2155	+ 'moodbar-header-own-talk' => 'अपनी वार्ता पॄष्ठ',
	2156	+ 'moodbar-feedback-view-link' => '(प्रतिक्रिया देखें)',
	2157	+ 'moodbar-feedback-filters' => 'छन्ने',
	2158	+ 'moodbar-feedback-filters-type' => 'मनोदशा:',
	2159	+ 'moodbar-feedback-filters-type-happy' => 'ख़ुश',
	2160	+ 'moodbar-feedback-filters-type-confused' => 'उलझन में',
	2161	+ 'moodbar-feedback-filters-type-sad' => 'उदास',
	2162	+ 'moodbar-feedback-filters-username' => 'सदस्यनाम:',
	2163	+ 'moodbar-feedback-more' => 'अधिक',
	2164	+ 'moodbar-feedback-newer' => 'नए',
	2165	+ 'moodbar-feedback-older' => 'पुराने',
	2166	+ 'moodbar-feedback-action-confirm' => 'निश्चित करें',
	2167	+ 'moodbar-feedback-action-cancel' => 'रद्द करें',
	2168	+ 'moodbar-action-reason' => 'कारण:',
	2169	+ 'moodbar-type-happy' => '{{GENDER:$1\|खुश}}',
	2170	+ 'moodbar-type-sad' => '{{GENDER:$1\|दु:खी}}',
	2171	+ 'moodbar-type-confused' => '{{GENDER:$1\|उलझन में}}',
	2172	+ 'moodbar-user-user' => 'पंजीकृत सदस्य',
	2173	+ 'moodbar-log-name' => 'सुझाव लॉग',
	2174	+ 'response-preview-text' => 'पूर्वावलोकन',
	2175	+ 'response-ajax-success-head' => 'धन्यवाद!',
	2176	+);
	2177	+
2129	2178	/** Upper Sorbian (Hornjoserbsce)
2130	2179	* @author Michawiki
2131	2180	*/
2132	2181	$messages['hsb'] = array(
	2182	+ 'moodbar-trigger-editing' => '$1 so wobdźěłuje...',
2133	2183	'moodbar-close' => '(začinić)',
	2184	+ 'moodbar-type-happy-title' => 'Zbožowny',
	2185	+ 'moodbar-type-sad-title' => 'Zrudny',
	2186	+ 'moodbar-type-confused-title' => 'Konfuzny',
2134	2187	'moodbar-what-label' => 'Što to je?',
	2188	+ 'moodbar-respond-text' => 'Na to wotmołwić',
	2189	+ 'moodbar-response-add' => 'Wotmołwu přidać',
	2190	+ 'moodbar-response-btn' => 'Wotmołwu pósłać',
	2191	+ 'moodbar-privacy-link' => 'wuměnjenja',
	2192	+ 'moodbar-privacy-link-title' => 'Wužiwarske wuměnjenja',
	2193	+ 'moodbar-form-title' => 'Dokelž...',
	2194	+ 'moodbar-form-note' => 'Maksimalnje 140 znamješkow',
	2195	+ 'moodbar-success-title' => 'Wulki dźak!',
	2196	+ 'moodbar-error-title' => 'Hopla!',
	2197	+ 'moodbar-blocked-title' => 'Hopla!',
	2198	+ 'moodbar-email-title' => 'E-mejl přidać',
	2199	+ 'moodbar-email-input' => 'Twoja e-mejlowa adresa',
	2200	+ 'moodbar-email-submit' => 'Wotpósłać',
	2201	+ 'moodbar-updating-title' => 'Aktualizuje so...',
	2202	+ 'moodbar-email-confirm-title' => 'E-mejl wobkrućić',
	2203	+ 'moodbar-email-optout' => 'Ně, dźakuju so',
	2204	+ 'moodbar-admin-empty' => 'Žane wuslědki',
	2205	+ 'moodbar-header-id' => 'Komentarowy ID',
	2206	+ 'moodbar-header-timestamp' => 'Časowy kołk',
2135	2207	'moodbar-header-type' => 'Typ',
2136	2208	'moodbar-header-page' => 'Strona',
	2209	+ 'moodbar-header-usertype' => 'Wužiwarski typ',
2137	2210	'moodbar-header-user' => 'Wužiwar',
	2211	+ 'moodbar-header-system' => 'Systemowy typ',
	2212	+ 'moodbar-header-locale' => 'Lokala',
2138	2213	'moodbar-header-comment' => 'Komentary',
2139	2214	'moodbar-header-namespace' => 'Mjenowy rum',
	2215	+ 'moodbar-header-own-talk' => 'Swójska diskusijna strona',
2140	2216	'moodbar-feedback-filters' => 'Filtry',
2141		~~- 'moodbar-feedback-filters-username' => 'Wužiwarske mjeno',~~
	2217	+ 'moodbar-feedback-filters-type' => 'Nalada:',
	2218	+ 'moodbar-feedback-filters-type-happy' => 'Zbožowny',
	2219	+ 'moodbar-feedback-filters-type-confused' => 'Konfuzny',
	2220	+ 'moodbar-feedback-filters-type-sad' => 'Zrudny',
	2221	+ 'moodbar-feedback-filters-username' => 'Wužiwarske mjeno:',
	2222	+ 'moodbar-feedback-filters-my-response' => 'Jenož moje wotmołwy:',
	2223	+ 'moodbar-user-hidden' => '(Wužiwar schowany)',
	2224	+ 'moodbar-feedback-show' => 'schowany komentar pokazać',
	2225	+ 'moodbar-feedback-hide' => 'komentar schować',
	2226	+ 'moodbar-feedback-action-confirm' => 'Wobkrućić',
	2227	+ 'moodbar-feedback-action-cancel' => 'Přetorhnyć',
	2228	+ 'moodbar-action-reason' => 'Přičina:',
	2229	+ 'moodbar-action-reason-required' => 'Prošu podaj přičinu.',
	2230	+ 'moodbar-type-happy' => '{{GENDER:$1\|Zbožowny\|Zbožowna}}',
	2231	+ 'moodbar-type-sad' => '{{GENDER:$1\|Zrudny\|Zrudna}}',
	2232	+ 'moodbar-type-confused' => '{{GENDER:$1\|Konfuzny\|Konfuzna}}',
	2233	+ 'moodbar-user-anonymized' => 'Anonymizowany',
	2234	+ 'moodbar-user-ip' => 'IP-adresa',
	2235	+ 'moodbar-user-user' => 'Zregistrowany wužiwar',
	2236	+ 'moodbar-log-hide' => 'je [[$1]] schował',
	2237	+ 'moodbar-response-link' => 'wuměnjenja',
	2238	+ 'response-back-text' => 'Wróćo',
	2239	+ 'response-preview-text' => 'Přehlad',
	2240	+ 'response-ajax-action-head' => 'Wotmołwja so...',
	2241	+ 'response-ajax-action-body' => 'Twoja wotmołwa so přidawa.',
	2242	+ 'response-ajax-success-head' => 'Wulki dźak!',
	2243	+ 'response-ajax-success-body' => 'Twoja wotmołwa je so přidała.',
	2244	+ 'response-ajax-error-head' => 'Hopla!',
	2245	+ 'moodbar-enotif-subject' => '$1 je na twój komentar wotmołwił',
2142	2246	);
2143	2247
2144	2248	/** Hungarian (Magyar)
—	—	@@ -2148,8 +2252,11 @@
2149	2253	'moodbar-type-sad-title' => 'Szomorú',
2150	2254	'moodbar-type-confused-title' => 'Zavarodott',
2151	2255	'moodbar-what-label' => 'Mi az?',
	2256	+ 'moodbar-privacy-link-title' => 'Felhasználási feltételek',
	2257	+ 'moodbar-form-title' => 'Mivel...',
2152	2258	'moodbar-success-title' => 'Köszönjük!',
2153	2259	'moodbar-error-title' => 'Hupsz!',
	2260	+ 'moodbar-blocked-title' => 'Hupsz!',
2154	2261	'moodbar-header-timestamp' => 'Időbélyeg',
2155	2262	'moodbar-header-type' => 'Típus',
2156	2263	'moodbar-header-page' => 'Lap',
—	—	@@ -2159,7 +2266,10 @@
2160	2267	'moodbar-feedback-filters-type' => 'Hangulat:',
2161	2268	'moodbar-feedback-filters-type-happy' => 'Boldog',
2162	2269	'moodbar-feedback-filters-type-sad' => 'Szomorú',
2163		~~- 'moodbar-feedback-filters-username' => 'Felhasználónév',~~
	2270	+ 'moodbar-feedback-filters-username' => 'Felhasználónév:',
	2271	+ 'moodbar-type-happy' => '{{GENDER:$1\|Boldog}}',
	2272	+ 'moodbar-type-sad' => '{{GENDER:$1\|Szomorú}}',
	2273	+ 'moodbar-type-confused' => '{{GENDER:$1\|Zavarodott}}',
2164	2274	);
2165	2275
2166	2276	/** Interlingua (Interlingua)
—	—	@@ -2244,7 +2354,7 @@
2245	2355	'moodbar-feedback-filters-type-happy' => 'Felice',
2246	2356	'moodbar-feedback-filters-type-confused' => 'Confuse',
2247	2357	'moodbar-feedback-filters-type-sad' => 'Triste',
2248		~~- 'moodbar-feedback-filters-username' => 'Nomine de usator',~~
	2358	+ 'moodbar-feedback-filters-username' => 'Nomine de usator:',
2249	2359	'moodbar-feedback-filters-my-response' => 'Mi responsas solmente:',
2250	2360	'moodbar-feedback-filters-button' => 'Definir filtros',
2251	2361	'moodbar-feedback-whatis' => 'Que es isto?',
—	—	@@ -2319,10 +2429,13 @@
2320	2430	*/
2321	2431	$messages['it'] = array(
2322	2432	'moodbar-desc' => 'Consente agli utenti specificati di fornire un feedback sulla loro esperienza di modifica',
	2433	+ 'moodbar-trigger-feedback' => 'Lascia un feedback',
2323	2434	'moodbar-trigger-share' => 'Condividi la tua esperienza',
2324	2435	'moodbar-trigger-editing' => 'In modifica $1...',
2325	2436	'moodbar-close' => '(chiudi)',
	2437	+ 'moodbar-intro-feedback' => 'Modificare $1 mi ha fatto...',
2326	2438	'moodbar-intro-share' => 'La mia esperienza su $1 mi ha reso...',
	2439	+ 'moodbar-intro-editing' => 'Modificare $1 mi ha fatto...',
2327	2440	'moodbar-type-happy-title' => 'Felice',
2328	2441	'moodbar-type-sad-title' => 'Triste',
2329	2442	'moodbar-type-confused-title' => 'Confuso',
—	—	@@ -2330,9 +2443,12 @@
2331	2444	'moodbar-what-label' => "Cos'è questo?",
2332	2445	'moodbar-respond-text' => 'Rispondi',
2333	2446	'moodbar-response-add' => 'Inserisci una risposta',
	2447	+ 'moodbar-response-desc' => 'La risposta farà riferimento al commento originale, la firma non è richiesta.',
2334	2448	'moodbar-response-btn' => 'Invia risposta',
2335	2449	'moodbar-what-content' => "Questa funzionalità è stata progettata per aiutare la comunità a capire l'esperienza delle persone durante la modifica del sito. Per ulteriori informazioni, si può consultare la $1.",
2336		~~- 'moodbar-privacy-link' => 'termini',~~
	2450	+ 'moodbar-what-link' => 'pagina dedicata',
	2451	+ 'moodbar-privacy' => "Con l'invio, accetti $1 di trasparenza per i dati indicate.",
	2452	+ 'moodbar-privacy-link' => 'le condizioni',
2337	2453	'moodbar-privacy-link-title' => "Condizioni d'uso",
2338	2454	'moodbar-disable-link' => 'Non sono interessato, disabilita questa funzionalità.',
2339	2455	'moodbar-form-title' => 'Perché...',
—	—	@@ -2358,6 +2474,7 @@
2359	2475	'moodbar-email-resend-confirmation' => 'Rispedisci conferma',
2360	2476	'moodbar-email-optout' => 'No, grazie',
2361	2477	'right-moodbar-view' => 'Visualizza ed esporta feedback di MoodBar',
	2478	+ 'moodbar-admin-title' => 'Feedback di MoodBar',
2362	2479	'moodbar-admin-intro' => 'Questa pagina consente di visualizzare i feedback inviati con MoodBar.',
2363	2480	'moodbar-admin-empty' => 'Nessun risultato',
2364	2481	'moodbar-header-id' => 'ID feedback',
—	—	@@ -2375,12 +2492,17 @@
2376	2493	'moodbar-feedback-response-title' => '== In risposta al tuo [[$1\|feedback]] ==',
2377	2494	'moodbar-feedback-view-link' => '(Vedi il feedback)',
2378	2495	'moodbar-feedback-filters' => 'Filtri',
	2496	+ 'moodbar-feedback-filters-type' => 'Umore:',
2379	2497	'moodbar-feedback-filters-type-happy' => 'Felice',
2380	2498	'moodbar-feedback-filters-type-confused' => 'Confuso',
2381	2499	'moodbar-feedback-filters-type-sad' => 'Triste',
2382		~~- 'moodbar-feedback-filters-username' => 'Nome utente',~~
	2500	+ 'moodbar-feedback-filters-username' => 'Nome utente:',
	2501	+ 'moodbar-feedback-filters-my-response' => 'Solo le mie risposte:',
2383	2502	'moodbar-feedback-filters-button' => 'Imposta filtri',
2384		~~- 'moodbar-feedback-more' => 'Altro',~~
	2503	+ 'moodbar-feedback-whatis' => "Cos'è questa funzionalità?",
	2504	+ 'moodbar-feedback-permalink' => 'link di riferimento',
	2505	+ 'moodbar-feedback-noresults' => 'Non sono presenti commenti che corrispondono ai filtri impostati.',
	2506	+ 'moodbar-feedback-more' => 'Ancora',
2385	2507	'moodbar-feedback-nomore' => 'Non ci sono ulteriori risultati da mostrare.',
2386	2508	'moodbar-feedback-newer' => 'Più recenti',
2387	2509	'moodbar-feedback-older' => 'Meno recenti',
—	—	@@ -2399,21 +2521,39 @@
2400	2522	'moodbar-action-reason-required' => 'È necessario indicare un motivo.',
2401	2523	'moodbar-restore-header' => 'Ripristina la visibilità di questo elemento',
2402	2524	'moodbar-feedback-action-error' => "Si è verificato un errore nell'eseguire questa azione.",
	2525	+ 'moodbar-feedback-response-summary' => '[[$1\|$2]] [[$3\|ha risposto]] $4 fa',
2403	2526	'moodbar-type-happy' => '{{GENDER:$1\|Felice}}',
2404	2527	'moodbar-type-sad' => '{{GENDER:$1\|Triste}}',
2405	2528	'moodbar-type-confused' => '{{GENDER:$1\|Confuso}}',
	2529	+ 'moodbar-type-stats' => 'Feedback di Moodbar nelle ultime 24 ore: felici $1, tristi $2, confusi $3',
2406	2530	'moodbar-user-ip' => 'Indirizzo IP',
2407	2531	'moodbar-user-user' => 'Utente registrato',
	2532	+ 'moodbar-log-hide' => 'nascosto [[$1]]',
2408	2533	'moodbar-log-restore' => 'ripristina la visibilità di [[$1]]',
	2534	+ 'moodbar-response-terms' => "Con l'invio, accetti $1 di trasparenza per i dati indicate.",
2409	2535	'moodbar-response-link' => 'condizioni',
2410	2536	'response-back-text' => 'Indietro',
2411	2537	'response-preview-text' => 'Anteprima',
	2538	+ 'response-ajax-action-head' => 'Stai rispondendo...',
2412	2539	'response-ajax-action-body' => 'La tua risposta è stata aggiunta.',
2413	2540	'response-ajax-success-head' => 'Grazie!',
2414	2541	'response-ajax-success-body' => 'La tua risposta è stata aggiunta.',
2415	2542	'response-ajax-error-head' => 'Oops!',
2416	2543	'response-ajax-error-body' => "Si è verificato un errore nell'aggiungere la tua risposta. <br />Per favore prova più tardi.",
2417	2544	'moodbar-enotif-subject' => '$1 ha risposto al tuo feedback',
	2545	+ 'moodbar-enotif-body' => 'Benvenuto/a $1 a {{SITENAME}} e grazie per il tuo [[$2\|feedback]]. Un altro utente di {{SITENAME}}, [[$3\|$6]], ti ha scritto la risposta seguente:
	2546	+
	2547	+ $4
	2548	+
	2549	+Puoi vedere questo messaggio sulla tua [$5 pagina di discussione]
	2550	+
	2551	+Che cos\'è la pagina di discussione?
	2552	+Si tratta di una pagina che altri collaboratori di {{SITENAME}} possono usare per comunicare con te. Si può rispondere cliccando su "Modifica", portando il cursore sotto il commento presente e digitando la tua risposta seguita da quattro tilde (~~~~) per aggiungere una firma, infine salvare. Tutte le pagine in {{SITENAME}} possono avere pagine di discussione utilizzate per diversi scopi. Tutto questo prende qualche minuto per essere appreso, ma diviene immediato non appena si prende dimestichezza.
	2553	+
	2554	+Ancora perplesso? [http://en.wikipedia.org/wiki/File:Wikipedia_basics_-_Talk_pages.ogv Questo video] (visibile su [http://www.youtube.com/watch?v=JdeDLRsB2Es YouTube]) ti offre una guida passo passo, oppure puoi dare una occhiata a [http://it.wikipedia.org/wiki/Aiuto:Pagina_di_discussione questa pagina] d\'aiuto.
	2555	+
	2556	+Buona giornata,
	2557	+-- {{SITENAME}}',
2418	2558	);
2419	2559
2420	2560	/** Japanese (日本語)
—	—	@@ -2498,7 +2638,7 @@
2499	2639	'moodbar-feedback-filters-type-happy' => 'Glécklech',
2500	2640	'moodbar-feedback-filters-type-confused' => 'Duercherneen',
2501	2641	'moodbar-feedback-filters-type-sad' => 'Traureg',
2502		~~- 'moodbar-feedback-filters-username' => 'Benotzernumm',~~
	2642	+ 'moodbar-feedback-filters-username' => 'Benotzernumm:',
2503	2643	'moodbar-feedback-filters-my-response' => 'Nëmme meng Äntwerten:',
2504	2644	'moodbar-feedback-filters-button' => 'Filtere setzen',
2505	2645	'moodbar-feedback-whatis' => 'Wéi dës Fonctioun fonctionnéiert.',
—	—	@@ -2681,7 +2821,7 @@
2682	2822	'moodbar-feedback-filters-type-happy' => 'Среќни',
2683	2823	'moodbar-feedback-filters-type-confused' => 'Збунети',
2684	2824	'moodbar-feedback-filters-type-sad' => 'Тажни',
2685		~~- 'moodbar-feedback-filters-username' => 'Корисничко име',~~
	2825	+ 'moodbar-feedback-filters-username' => 'Корисничко име:',
2686	2826	'moodbar-feedback-filters-my-response' => 'Само мои одговори:',
2687	2827	'moodbar-feedback-filters-button' => 'Задај филтри',
2688	2828	'moodbar-feedback-whatis' => 'Што прави оваа функција?',
—	—	@@ -2924,7 +3064,7 @@
2925	3065	'moodbar-feedback-filters-type-happy' => 'Gembira',
2926	3066	'moodbar-feedback-filters-type-confused' => 'Keliru',
2927	3067	'moodbar-feedback-filters-type-sad' => 'Sedih',
2928		~~- 'moodbar-feedback-filters-username' => 'Nama pengguna',~~
	3068	+ 'moodbar-feedback-filters-username' => 'Nama pengguna:',
2929	3069	'moodbar-feedback-filters-my-response' => 'Balasan saya sahaja:',
2930	3070	'moodbar-feedback-filters-button' => 'Tetapkan penapis',
2931	3071	'moodbar-feedback-whatis' => 'Ciri ini apa?',
—	—	@@ -3113,7 +3253,7 @@
3114	3254	'moodbar-feedback-filters-type-happy' => 'Blij',
3115	3255	'moodbar-feedback-filters-type-confused' => 'Verward',
3116	3256	'moodbar-feedback-filters-type-sad' => 'Somber',
3117		~~- 'moodbar-feedback-filters-username' => 'Gebruikersnaam',~~
	3257	+ 'moodbar-feedback-filters-username' => 'Gebruikersnaam:',
3118	3258	'moodbar-feedback-filters-my-response' => 'Alleen mijn reacties:',
3119	3259	'moodbar-feedback-filters-button' => 'Filters instellen',
3120	3260	'moodbar-feedback-whatis' => 'Wat doet deze functie?',
—	—	@@ -3230,8 +3370,18 @@
3231	3371	'moodbar-feedback-filters-type-happy' => 'ଖୁସି',
3232	3372	'moodbar-feedback-filters-type-confused' => 'ଦ୍ଵନ୍ଦରେ ରହିବା',
3233	3373	'moodbar-feedback-filters-type-sad' => 'ଦୁଖି',
3234		~~- 'moodbar-feedback-filters-username' => 'ବ୍ୟବହାରକାରୀଙ୍କର ନାମ',~~
	3374	+ 'moodbar-feedback-filters-username' => 'ବ୍ୟବହାରକାରୀଙ୍କ ନାମ:',
	3375	+ 'moodbar-feedback-filters-my-response' => 'କେବଳ ମୋ ଉତ୍ତରଗୁଡିକ',
	3376	+ 'moodbar-feedback-filters-button' => 'ଛଣାଗୁଡିକୁ ସ୍ଥାପନ କରିବେ',
	3377	+ 'moodbar-feedback-whatis' => 'ଏହି ବିଶେଷତ୍ଵ କଣ ଅଟେ ?',
	3378	+ 'moodbar-feedback-permalink' => 'ଏଠାକୁ ଲିଙ୍କ',
	3379	+ 'moodbar-feedback-noresults' => 'ଆପଣଙ୍କ ଛଣାଗୁଡିକ ସହ ମିଶୁଥିବା ଭଳି କୌଣସି ମନ୍ତବ୍ୟ ନାହିଁ ।',
3235	3380	'moodbar-feedback-more' => 'ଅଧିକ',
	3381	+ 'moodbar-feedback-nomore' => 'ଏଠି ଦେଖାଇବା ପାଇଁ ଆଉ କୌଣସି ଶେଷଫଳ ନାହିଁ',
	3382	+ 'moodbar-feedback-newer' => 'ନୂତନ',
	3383	+ 'moodbar-feedback-older' => 'ପୁରାତନ',
	3384	+ 'moodbar-feedback-ajaxerror' => 'ଅଧିକ ଫଳଗୁଡିକୁ ଖୋଜୁଥିବା ବେଳେ କିଛିଗୋଟେ ଅସୁବିଧା ହେଲା ।',
	3385	+ 'moodbar-user-hidden' => '(ବ୍ୟବହାରକାରୀ ଲୁକାୟିତ)',
3236	3386	'moodbar-feedback-action-confirm' => 'ଥୟ କରିବେ',
3237	3387	'moodbar-feedback-action-cancel' => 'ବାତିଲ',
3238	3388	'moodbar-action-reason' => 'କାରଣ:',
—	—	@@ -3305,6 +3455,7 @@
3306	3456	'moodbar-email-confirm-desc' => 'Musisz potwierdzić swój adres e-mail, aby otrzymywać powiadomienia. Aby odpowiedzieć na potwierdzenie adresu e-mail, wybierz "Prześlij potwierdzenie".',
3307	3457	'moodbar-email-resend-confirmation' => 'Prześlij potwierdzenie',
3308	3458	'moodbar-email-optout' => 'Nie, dzięki',
	3459	+ 'moodbar-tooltip-title' => 'Przekaż nam swoje odczucia na temat edycji {{SITENAME}}',
3309	3460	'right-moodbar-view' => 'Widok i eksport opinii MoodBar',
3310	3461	'right-moodbar-admin' => 'Zmiana widoczności elementów na tablicy otrzymanych opinii',
3311	3462	'moodbar-admin-title' => 'Opinie MoodBar',
—	—	@@ -3334,7 +3485,7 @@
3335	3486	'moodbar-feedback-filters-type-happy' => 'Bez problemu',
3336	3487	'moodbar-feedback-filters-type-confused' => 'Z kłopotami',
3337	3488	'moodbar-feedback-filters-type-sad' => 'Koszmar',
3338		~~- 'moodbar-feedback-filters-username' => 'Nazwa użytkownika',~~
	3489	+ 'moodbar-feedback-filters-username' => 'Nazwa użytkownika:',
3339	3490	'moodbar-feedback-filters-my-response' => 'Tylko moje odpowiedzi:',
3340	3491	'moodbar-feedback-filters-button' => 'Filtruj',
3341	3492	'moodbar-feedback-whatis' => 'Jak działa to narzędzie?',
—	—	@@ -3363,12 +3514,44 @@
3364	3515	'moodbar-invalid-item' => 'System nie może znaleźć poprawnego elementu opinii.',
3365	3516	'moodbar-feedback-action-error' => 'Wystąpił błąd podczas próby wykonania tej czynności.',
3366	3517	'moodbar-feedback-response-summary' => '[[$1\|$2]] [[$3\|odpowiedział]] $4 temu',
3367		~~- 'moodbar-type-happy' => 'Bez problemu',~~
3368		~~- 'moodbar-type-sad' => 'Koszmar',~~
3369		~~- 'moodbar-type-confused' => 'Z kłopotami',~~
	3518	+ 'moodbar-feedback-edit-summary' => 'Odpowiedzi na [[Special:FeedbackDashboard/$1\|opinię użytkownika]]: $2',
	3519	+ 'moodbar-type-happy' => '{{GENDER:$1\|Szczęśliwy\|Szczęśliwa}}',
	3520	+ 'moodbar-type-sad' => '{{GENDER:$1\|Smutny\|Smutna}}',
	3521	+ 'moodbar-type-confused' => '{{GENDER:$1\|Zmieszany\|Zmieszana}}',
	3522	+ 'moodbar-type-stats' => 'Wykres opinii w przeciągu ostatnich 24h : Szczęśliwych: $1, Smutnych: $2, Zmieszanych: $3',
3370	3523	'moodbar-user-anonymized' => 'Anonimowo',
3371	3524	'moodbar-user-ip' => 'Adres IP',
3372	3525	'moodbar-user-user' => 'Zarejestrowany użytkownik',
	3526	+ 'moodbar-log-name' => 'Dziennik opinii',
	3527	+ 'moodbar-log-header' => 'To jest dziennik akcji podjętych w związku z opiniami, zdarzenie są wypisane w [[Special:FeedbackDashboard\|Panelu Opinii]].',
	3528	+ 'moodbar-log-hide' => 'Ukryj [[$1]]',
	3529	+ 'moodbar-log-restore' => 'Przywróć widzialność dla [[$1]]',
	3530	+ 'moodbar-response-terms' => 'Klikając przycisk "Wyślij", zgadzasz się na opublikowanie Twojej opinii pod adresem $1.',
	3531	+ 'moodbar-response-link' => 'warunki',
	3532	+ 'response-back-text' => 'Wstecz',
	3533	+ 'response-preview-text' => 'Podgląd',
	3534	+ 'response-ajax-action-head' => 'Proszę czekać...',
	3535	+ 'response-ajax-action-body' => 'Twoja odpowiedz jest dodawana.',
	3536	+ 'response-ajax-success-head' => 'Dzięki!',
	3537	+ 'response-ajax-success-body' => 'Twoja odpowiedź została dodana.',
	3538	+ 'response-ajax-error-head' => 'Ups!',
	3539	+ 'response-ajax-error-body' => 'Wystąpił błąd podczas dodawania Twojej odpowiedzi.<br />Prosimy, spróbuj ponownie później.',
	3540	+ 'moodbar-enotif-subject' => '$1odpowiedzi na Twoją opinię',
	3541	+ 'moodbar-enotif-body' => 'Witaj $1!
	3542	+Witamy na {{SITENAME}}, i dziękujemy za Twoją [[$2\|opinię]]. Inny użytkownik {{SITENAME}}, [[$3\|$6]], napisał następująca odpowiedź:
	3543	+
	3544	+ $4
	3545	+
	3546	+Zobacz ta wiadomość na swojej [$5 talk page]
	3547	+
	3548	+Co to talk page?
	3549	+Twoja strona talk page to strona, na której inny redaktorzy {{SITENAME}} używają do komunikacji z Tobą. Możesz odpowiedzieć za pomocą "Edytuj", ustawiając kursor poniżej komentarza, pisząc swój komentarz i dodając cztery tyldy (~~~~), a następnie zapisując.
	3550	+Wszystkie strony na {{SITENAME}}, mają talk pages, i są używane do wielu różnych zastosowań. Nauczenie się tego zajmuje trochę czasu, ale staje się proste gdy użyjesz tego parę razy.
	3551	+
	3552	+Potrzebujesz więcej informacji? Obejrzyj [http://en.wikipedia.org/wiki/File:Wikipedia_basics_-_Talk_pages.ogv Te video] (zobacz na [http://www.youtube.com/watch?v=JdeDLRsB2Es YouTube]). Jest to przewodnik krok-po-kroku.
	3553	+
	3554	+Miłego dnia,
	3555	+-- {{SITENAME}}',
3373	3556	);
3374	3557
3375	3558	/** Piedmontese (Piemontèis)
—	—	@@ -3389,10 +3572,10 @@
3390	3573	'moodbar-type-confused-title' => 'Confus',
3391	3574	'tooltip-moodbar-what' => 'Amprende ëd pi su sta funsionalità',
3392	3575	'moodbar-what-label' => "Lòn ch'a l'é sossì?",
3393		~~- 'moodbar-respond-text' => 'Arspond a sòn-sì',~~
	3576	+ 'moodbar-respond-text' => 'Rësponde a sòn',
3394	3577	'moodbar-response-add' => "Gionta n'arspòsta",
3395		~~- 'moodbar-response-desc' => "L'arspòsta a referensierà ël coment original. Firma pa ciamà.",~~
3396		~~- 'moodbar-response-btn' => 'Manda arspòsta',~~
	3578	+ 'moodbar-response-desc' => 'La rispòsta a farà arferiment al coment original. Nen damanca dla signadura.',
	3579	+ 'moodbar-response-btn' => 'Mandé la rispòsta',
3397	3580	'moodbar-what-content' => "Sta funsionalità a l'é progetà për giuté la comunità a capì l'esperiensa ëd përson-e ch'a modifico ël sit.
3398	3581	Për savèjne ëd pi, për piasì vìsita ël $1.",
3399	3582	'moodbar-what-link' => 'pàgina ëd funsionalità',
—	—	@@ -3413,19 +3596,19 @@
3414	3597	'moodbar-error-subtitle' => "Quaicòs a l'é andàit mal! Për piasì, ch'a preuva a partagé ij tò coment torna pi tard.",
3415	3598	'moodbar-blocked-title' => 'Contacc!',
3416	3599	'moodbar-blocked-subtitle' => 'It ses stàit blocà, gnente modìfiche.',
3417		~~- 'moodbar-email-title' => 'Gionta e-mail',~~
	3600	+ 'moodbar-email-title' => "Gionté n'adrëssa ëd pòsta eletrònica",
3418	3601	'moodbar-email-input' => 'Soa adrëssa ëd pòsta eletrònica',
3419		~~- 'moodbar-email-desc' => 'It mandroma un corel se quaidun a respond a tò artorn',~~
	3602	+ 'moodbar-email-desc' => 'I-j mandroma un mëssagi se quaidun a rëspond a sò coment.',
3420	3603	'moodbar-email-submit' => 'Spediss',
3421	3604	'moodbar-updating-title' => 'Modìfica...',
3422		~~- 'moodbar-updating-subtitle' => 'I stoma modificand toe ampostassion ëd corel.',~~
	3605	+ 'moodbar-updating-subtitle' => "I soma an camin ch'i agiornoma soe ampostassion ëd pòsta eletrònica.",
3423	3606	'moodbar-email-confirm-title' => "Confirmé l'adrëssa ëd pòsta eletrònica",
3424		~~- 'moodbar-email-confirm-desc' => 'It deuve confirmé toa adrëssa e-mail për arseive notificassion. Për rispedì ëd corel ëd conferma, sgnaca "Rispedì Confirma".',~~
3425		~~- 'moodbar-email-resend-confirmation' => 'Rispedì confirma',~~
	3607	+ 'moodbar-email-confirm-desc' => "A dev confirmé soa adrëssa ëd pòsta eletrònica për arsèive dle notìfiche. Për rispedì ël mëssage ëd conferma, ch'a sgnaca «Confirmassion dla rispedission».",
	3608	+ 'moodbar-email-resend-confirmation' => 'Confirmassion dla rispedission',
3426	3609	'moodbar-email-optout' => 'Nò mersì',
3427	3610	'moodbar-tooltip-title' => 'Fane savèj a propòsit ëd toa esperiensa an modificand {{SITENAME}}.',
3428	3611	'right-moodbar-view' => "Smon-e e esporté lòn ch'a pensa ëd MoodBar",
3429		~~- 'right-moodbar-admin' => "Modìfica visibilità dzora a cruscòt dj'artorn",~~
	3612	+ 'right-moodbar-admin' => 'Modifiché la visibilità an sël cruscòt dij coment',
3430	3613	'moodbar-admin-title' => 'Opinion MoodBar',
3431	3614	'moodbar-admin-intro' => "Costa pàgina a-j përmët ëd vëdde j'opinion mandà con ël MoodBar.",
3432	3615	'moodbar-admin-empty' => 'Gnun arzultà',
—	—	@@ -3444,7 +3627,31 @@
3445	3628	'moodbar-header-user-editcount' => "Conteur ëd le modìfiche dl'utent",
3446	3629	'moodbar-header-namespace' => 'Spassi nominal',
3447	3630	'moodbar-header-own-talk' => 'Pàgina ëd discussion përsonal',
3448		~~- 'moodbar-feedback-title' => "Cruscòt dj'artorn",~~
	3631	+ 'moodbar-feedback-title' => 'Cruscòt dij coment',
	3632	+ 'moodbar-feedback-description' => "Sto cruscòt a mosta ij coment da j'editor neuv a propòsit ëd soa esperiensa an modificand $1.
	3633	+[http://en.wikipedia.org/wiki/Wikipedia:New_editor_feedback Për savèjne ëd pi]",
	3634	+ 'moodbar-feedback-response-title' => '==An arspòsta a tò [[$1\|artorn]]==',
	3635	+ 'moodbar-feedback-view-link' => "(Varda l'artorn)",
	3636	+ 'moodbar-feedback-filters' => 'Filtr',
	3637	+ 'moodbar-feedback-filters-type' => 'Sentiment:',
	3638	+ 'moodbar-feedback-filters-type-happy' => 'Content',
	3639	+ 'moodbar-feedback-filters-type-confused' => 'Confus',
	3640	+ 'moodbar-feedback-filters-type-sad' => 'Scontent',
	3641	+ 'moodbar-feedback-filters-username' => 'Nòm utent:',
	3642	+ 'moodbar-feedback-filters-my-response' => 'Mie arspòste a son:',
	3643	+ 'moodbar-feedback-filters-button' => 'Ampòsta filtr',
	3644	+ 'moodbar-feedback-whatis' => "Lòn ch'a l'é sta funsion?",
	3645	+ 'moodbar-feedback-permalink' => 'colega ambelessì',
	3646	+ 'moodbar-feedback-noresults' => "A-i son pa dij coment ch'a cobio ij tò filtr.",
	3647	+ 'moodbar-feedback-more' => 'Pi',
	3648	+ 'moodbar-feedback-nomore' => 'A-i son pa autr arzultà da mosté.',
	3649	+ 'moodbar-feedback-newer' => 'Pi neuv',
	3650	+ 'moodbar-feedback-older' => 'Pi vej',
	3651	+ 'moodbar-feedback-ajaxerror' => "A l'é capitaje n'eror an recuperand pi arzultà.",
	3652	+ 'moodbar-feedback-load-record-error' => "A l'é capitaje n'eror an cariand un record.",
	3653	+ 'moodbar-user-hidden' => '(Utent stërmà)',
	3654	+ 'moodbar-comment-hidden' => '(Artorn stërmà da assion aministrativa)',
	3655	+ 'moodbar-feedback-show' => 'mosta artorn stërmà',
3449	3656	'moodbar-type-happy' => 'Content',
3450	3657	'moodbar-type-sad' => 'Scontent',
3451	3658	'moodbar-type-confused' => 'Confus',
—	—	@@ -3671,7 +3878,7 @@
3672	3879	'moodbar-feedback-filters-type-happy' => 'Fericit',
3673	3880	'moodbar-feedback-filters-type-confused' => 'Confuz',
3674	3881	'moodbar-feedback-filters-type-sad' => 'Trist',
3675		~~- 'moodbar-feedback-filters-username' => 'Nume de utilizator',~~
	3882	+ 'moodbar-feedback-filters-username' => 'Nume de utilizator:',
3676	3883	'moodbar-feedback-filters-button' => 'Setați filtrele',
3677	3884	'moodbar-feedback-whatis' => 'Ce este această funcție?',
3678	3885	'moodbar-feedback-more' => 'Mai multe',
—	—	@@ -3714,8 +3921,16 @@
3715	3922	'moodbar-type-sad-title' => 'Triste',
3716	3923	'moodbar-type-confused-title' => 'Confuse',
3717	3924	'moodbar-what-label' => 'Ce jè quiste?',
	3925	+ 'moodbar-what-collapsed' => '▶',
	3926	+ 'moodbar-respond-collapsed' => '▶',
	3927	+ 'moodbar-respond-expanded' => '▼',
	3928	+ 'moodbar-respond-text' => 'Respunne a quiste',
	3929	+ 'moodbar-response-add' => "Aggiunge 'na resposte",
	3930	+ 'moodbar-response-btn' => "Manne 'a resposte",
3718	3931	'moodbar-what-link' => 'pàgene de dettaglie',
3719	3932	'moodbar-privacy-link' => 'termine',
	3933	+ 'moodbar-privacy-link-title' => 'Termine de Ause',
	3934	+ 'moodbar-disable-link' => 'Non ge sonde inderessate. Pe piacere disabbilite sta funzionalità.',
3720	3935	'moodbar-form-title' => 'Purcé...',
3721	3936	'moodbar-form-note' => '140 carattere massime',
3722	3937	'moodbar-form-note-dynamic' => '$1 carattere rumaste',
—	—	@@ -3725,6 +3940,10 @@
3726	3941	'moodbar-loading-title' => 'Stoche a condivide...',
3727	3942	'moodbar-success-title' => 'Grazie!',
3728	3943	'moodbar-error-title' => "Ohhhhh! C'è scritte!",
	3944	+ 'moodbar-blocked-title' => 'Ohhhhh!',
	3945	+ 'moodbar-updating-title' => 'Stoche a careche…',
	3946	+ 'moodbar-email-confirm-title' => "Conferme l'e-mail",
	3947	+ 'moodbar-email-optout' => 'None, grazie',
3729	3948	'right-moodbar-view' => "Vide e esporte 'u feedbacl de MoodBar",
3730	3949	'moodbar-admin-title' => 'Feedback de MoodBar',
3731	3950	'moodbar-admin-intro' => "Sta pàgene te face vedè le feedback tune confermate cu 'a MoodBar.",
—	—	@@ -3744,11 +3963,21 @@
3745	3964	'moodbar-header-user-editcount' => "Condatore de le cangiaminde de l'utende",
3746	3965	'moodbar-header-namespace' => 'Namespace',
3747	3966	'moodbar-header-own-talk' => "Pàgene de le 'ngazzaminde meje",
3748		~~- 'moodbar-feedback-filters-username' => "Nome de l'utende",~~
	3967	+ 'moodbar-feedback-response-title' => "== In resposte d'a [[$1\|segnalaziona]] toje ==",
	3968	+ 'moodbar-feedback-filters' => 'Filtre',
	3969	+ 'moodbar-feedback-filters-type' => 'Umore:',
	3970	+ 'moodbar-feedback-filters-type-happy' => 'Felice',
	3971	+ 'moodbar-feedback-filters-type-confused' => 'Confuse',
	3972	+ 'moodbar-feedback-filters-type-sad' => 'Triste',
	3973	+ 'moodbar-feedback-filters-username' => "Nome de l'utende:",
	3974	+ 'moodbar-feedback-whatis' => 'Ce jè sta funzione?',
3749	3975	'moodbar-feedback-more' => 'De cchiù',
	3976	+ 'moodbar-feedback-newer' => 'Cchiù nuève',
	3977	+ 'moodbar-feedback-older' => 'Cchiù vicchie',
3750	3978	'moodbar-feedback-action-confirm' => 'Conferme',
3751	3979	'moodbar-feedback-action-cancel' => 'Annulle',
3752	3980	'moodbar-action-reason' => 'Mutive:',
	3981	+ 'moodbar-action-reason-required' => "Pe piacere mitte 'nu mutive.",
3753	3982	'moodbar-type-happy' => '{{GENDER:$1\|Felice}}',
3754	3983	'moodbar-type-sad' => '{{GENDER:$1\|Triste}}',
3755	3984	'moodbar-type-confused' => '{{GENDER:$1\|Confuse}}',
—	—	@@ -3759,7 +3988,10 @@
3760	3989	'moodbar-response-link' => 'termine',
3761	3990	'response-back-text' => 'Rrete',
3762	3991	'response-preview-text' => 'Andeprime',
	3992	+ 'response-ajax-action-head' => 'Stoche a responne...',
	3993	+ 'response-ajax-action-body' => "'A resposta toje ste avène aggiunde.",
3763	3994	'response-ajax-success-head' => 'Grazie!',
	3995	+ 'response-ajax-success-body' => "'A resposta toje ha state aggiunde.",
3764	3996	'response-ajax-error-head' => 'Ohhhhh!',
3765	3997	);
3766	3998
—	—	@@ -4009,11 +4241,17 @@
4010	4242	'moodbar-what-link' => 'විශේෂාංග පිටුව',
4011	4243	'moodbar-privacy-link' => 'කොන්දේසි',
4012	4244	'moodbar-privacy-link-title' => 'භාවිතයේ කොන්දේසි',
	4245	+ 'moodbar-form-title' => 'මන්ද...',
	4246	+ 'moodbar-form-note' => 'අකුරු 140 උපරිම',
	4247	+ 'moodbar-form-note-dynamic' => 'අකුරු $1 ක් ඉතිරියි',
	4248	+ 'moodbar-form-submit' => 'ප්‍රතිචාරය හුවමාරු කරන්න',
4013	4249	'moodbar-form-policy-label' => 'අපගේ ප්‍රතිපත්තිය',
	4250	+ 'moodbar-loading-title' => 'හුවමාරු කරමින්...',
4014	4251	'moodbar-success-title' => 'පිං !',
4015	4252	'moodbar-error-title' => 'අයියෝ !',
4016	4253	'moodbar-blocked-title' => 'අයියෝ !',
4017	4254	'moodbar-blocked-subtitle' => 'ඔබව සංස්කරණ කිරීමෙන් වළක්වල.',
	4255	+ 'moodbar-email-title' => 'ඊ-තැපෑල එක් කරන්න',
4018	4256	'moodbar-email-input' => 'ඔබේ විද්‍යුත්-තැපැල් ලිපිනය',
4019	4257	'moodbar-email-submit' => 'යොමන්න',
4020	4258	'moodbar-updating-title' => 'යාවත්කාලීන කරමින්...',
—	—	@@ -4028,17 +4266,24 @@
4029	4267	'moodbar-header-usertype' => 'පරිශීලක වර්ගය',
4030	4268	'moodbar-header-user' => 'පරිශීලක',
4031	4269	'moodbar-header-editmode' => 'සංස්කරණ ක්‍රමය',
	4270	+ 'moodbar-header-system' => 'පද්ධති වර්ගය',
4032	4271	'moodbar-header-comment' => 'පරිකථන',
4033	4272	'moodbar-header-user-editcount' => 'පරිශීලක සංස්කරණ ගණන',
4034	4273	'moodbar-header-namespace' => 'නාමඅවකාශය',
	4274	+ 'moodbar-header-own-talk' => 'තමාගේම සාකච්ඡා පිටුව',
	4275	+ 'moodbar-feedback-title' => 'ප්‍රතිචාර උපකරණ පුවරුව',
4035	4276	'moodbar-feedback-view-link' => '(ප්‍රතිචාරය නරඹන්න)',
4036	4277	'moodbar-feedback-filters' => 'පෙරහන්',
	4278	+ 'moodbar-feedback-filters-type' => 'මනෝභාවය:',
4037	4279	'moodbar-feedback-filters-type-happy' => 'සතුටින්',
4038	4280	'moodbar-feedback-filters-type-sad' => 'දුකින්',
4039		~~- 'moodbar-feedback-filters-username' => 'පරිශීලක නාමය',~~
	4281	+ 'moodbar-feedback-filters-username' => 'පරිශීලක නාමය:',
4040	4282	'moodbar-feedback-filters-button' => 'පෙරහන් සකසන්න',
4041	4283	'moodbar-feedback-whatis' => 'මෙම ගුණාංගය මොකක්ද?',
4042	4284	'moodbar-feedback-more' => 'තවත්',
	4285	+ 'moodbar-feedback-newer' => 'නවතම',
	4286	+ 'moodbar-feedback-older' => 'පැරණිතම',
	4287	+ 'moodbar-feedback-show' => 'සැඟවුණු ප්‍රතිචාරය පෙන්වන්න',
4043	4288	'moodbar-feedback-hide' => 'ප්‍රතිචාරය සඟවන්න',
4044	4289	'moodbar-feedback-action-confirm' => 'තහවුරු කරන්න',
4045	4290	'moodbar-feedback-action-cancel' => 'එපා',
—	—	@@ -4050,6 +4295,7 @@
4051	4296	'moodbar-response-link' => 'කොන්දේසි',
4052	4297	'response-back-text' => 'ආපසු',
4053	4298	'response-preview-text' => 'පෙරදසුන',
	4299	+ 'response-ajax-success-head' => 'ස්තුතියි!',
4054	4300	'response-ajax-error-head' => 'අයියෝ !',
4055	4301	);
4056	4302
—	—	@@ -4209,10 +4455,117 @@
4210	4456	* @author Rancher
4211	4457	*/
4212	4458	$messages['sr-ec'] = array(
	4459	+ 'moodbar-trigger-feedback' => 'Повратне информације о уређивању',
	4460	+ 'moodbar-trigger-share' => 'Делите своје искуство',
	4461	+ 'moodbar-intro-editing' => 'Уређивање викија $1 ме је…',
	4462	+ 'moodbar-type-happy-title' => 'усрећило',
	4463	+ 'moodbar-type-sad-title' => 'растужило',
	4464	+ 'moodbar-type-confused-title' => 'збунило',
	4465	+ 'tooltip-moodbar-what' => 'Сазнајте више о овој могућности',
	4466	+ 'moodbar-what-label' => 'Шта је ово?',
4213	4467	'moodbar-what-collapsed' => '▶',
4214	4468	'moodbar-respond-collapsed' => '▶',
4215	4469	'moodbar-respond-expanded' => '▼',
	4470	+ 'moodbar-respond-text' => 'Одговори на ово',
	4471	+ 'moodbar-response-add' => 'Додајте одговор',
	4472	+ 'moodbar-form-submit' => 'Дели повратне информације',
	4473	+ 'moodbar-form-policy-text' => 'Слањем овога, $1',
	4474	+ 'moodbar-form-policy-label' => 'наша правила',
	4475	+ 'moodbar-loading-title' => 'Делим…',
	4476	+ 'moodbar-success-title' => 'Хвала!',
	4477	+ 'moodbar-error-title' => 'Упс!',
	4478	+ 'moodbar-success-subtitle' => 'Дељење ваших уређивачких искустава нам помаже да побољшамо $1.',
	4479	+ 'moodbar-error-subtitle' => 'Нешто није у реду. Покушајте поново.',
	4480	+ 'moodbar-blocked-title' => 'Упс!',
	4481	+ 'moodbar-blocked-subtitle' => 'Блокирани сте од уређивања.',
	4482	+ 'moodbar-email-title' => 'Додај е-адресу',
	4483	+ 'moodbar-email-input' => 'Е-адреса',
	4484	+ 'moodbar-email-desc' => 'Послаћемо вам поруку ако неко одговори на вашу повратну информацију.',
	4485	+ 'moodbar-email-submit' => 'Пошаљи',
	4486	+ 'moodbar-updating-title' => 'Ажурирам…',
	4487	+ 'moodbar-updating-subtitle' => 'Ажурирамо ваше поставке е-поште.',
	4488	+ 'moodbar-email-confirm-title' => 'Потврда е-адресе',
	4489	+ 'moodbar-email-resend-confirmation' => 'Пошаљи потврду',
	4490	+ 'moodbar-email-optout' => 'Не, хвала',
	4491	+ 'moodbar-tooltip-title' => 'Саопштите нам како ви доживљавате уређивање на викију {{SITENAME}}.',
	4492	+ 'right-moodbar-view' => 'преглед и извоз повратних информација Траке за расположења',
	4493	+ 'right-moodbar-admin' => 'мењање видљивости на табели за повратне информације',
	4494	+ 'moodbar-admin-title' => 'Повратне информације',
	4495	+ 'moodbar-admin-intro' => 'Ова страница служи за преглед повратних информација које сте послали преко Траке за расположења.',
	4496	+ 'moodbar-admin-empty' => 'Нема резултата',
	4497	+ 'moodbar-header-id' => 'Назнака повратне информације',
	4498	+ 'moodbar-header-timestamp' => 'Време и датум',
	4499	+ 'moodbar-header-type' => 'Врста',
	4500	+ 'moodbar-header-page' => 'Страница',
	4501	+ 'moodbar-header-usertype' => 'Врста корисника',
	4502	+ 'moodbar-header-user' => 'Корисник',
	4503	+ 'moodbar-header-editmode' => 'Уреднички режим',
	4504	+ 'moodbar-header-bucket' => 'Испробавање',
	4505	+ 'moodbar-header-system' => 'Врста система',
	4506	+ 'moodbar-header-locale' => 'Место',
	4507	+ 'moodbar-header-useragent' => 'Кориснички агент',
	4508	+ 'moodbar-header-comment' => 'Коментари',
	4509	+ 'moodbar-header-user-editcount' => 'Број корисничких измена',
	4510	+ 'moodbar-header-namespace' => 'Именски простор',
	4511	+ 'moodbar-header-own-talk' => 'Сопствена страница за разговор',
	4512	+ 'moodbar-feedback-title' => 'Табела за повратне информације',
	4513	+ 'moodbar-feedback-response-title' => '== Одговор на ваше [[$1\|повратне информације]] ==',
	4514	+ 'moodbar-feedback-view-link' => '(Погледај повратну информацију)',
	4515	+ 'moodbar-feedback-filters' => 'Филтери',
	4516	+ 'moodbar-feedback-filters-type' => 'Расположење:',
	4517	+ 'moodbar-feedback-filters-type-happy' => 'Срећан',
	4518	+ 'moodbar-feedback-filters-type-confused' => 'Збуњен',
	4519	+ 'moodbar-feedback-filters-type-sad' => 'Тужан',
	4520	+ 'moodbar-feedback-filters-username' => 'Корисничко име:',
	4521	+ 'moodbar-feedback-filters-my-response' => 'Само моји одговори:',
	4522	+ 'moodbar-feedback-filters-button' => 'Постави филтере',
	4523	+ 'moodbar-feedback-whatis' => 'Шта ради ова могућност?',
	4524	+ 'moodbar-feedback-permalink' => 'веза до странице',
	4525	+ 'moodbar-feedback-noresults' => 'Нема коментара који се поклапају с вашим филтерима.',
	4526	+ 'moodbar-feedback-more' => 'Више',
	4527	+ 'moodbar-feedback-nomore' => 'Нема више резултата за приказ.',
	4528	+ 'moodbar-feedback-newer' => 'Новије',
	4529	+ 'moodbar-feedback-older' => 'Старије',
	4530	+ 'moodbar-feedback-ajaxerror' => 'Дошло је до грешке при добављању више резултата.',
	4531	+ 'moodbar-feedback-load-record-error' => 'Дошло је до грешке при учитавању записа.',
	4532	+ 'moodbar-user-hidden' => '(Корисник је сакривен)',
	4533	+ 'moodbar-comment-hidden' => '(Повратну информацију је сакрио администратор)',
	4534	+ 'moodbar-feedback-show' => 'прикажи сакривену повратну информацију',
	4535	+ 'moodbar-feedback-hide' => 'сакриј повратну информацију',
	4536	+ 'moodbar-feedback-action-confirm' => 'Потврди',
	4537	+ 'moodbar-feedback-action-cancel' => 'Откажи',
	4538	+ 'moodbar-hidden-footer' => 'Сакривена повратна информација од $1, $2 $3, разлог: $4 $5',
	4539	+ 'moodbar-hidden-footer-without-log' => 'Сакривена повратна информација $1',
	4540	+ 'moodbar-feedback-restore' => 'врати сакривену повратну информацију',
	4541	+ 'moodbar-action-item' => 'Повратна информација:',
	4542	+ 'moodbar-action-reason' => 'Разлог:',
	4543	+ 'moodbar-action-reason-required' => 'Наведите разлог.',
	4544	+ 'moodbar-hide-header' => 'Сакриј повратну информацију',
	4545	+ 'moodbar-restore-header' => 'Врати видљивост повратне информације',
	4546	+ 'moodbar-invalid-item' => 'Систем не може да пронађе повратну информацију',
	4547	+ 'moodbar-feedback-action-error' => 'Дошло је до грешке при извршавању радње.',
	4548	+ 'moodbar-feedback-response-summary' => '[[$1\|$2]] [[$3\|одговори]] пре $4',
	4549	+ 'moodbar-feedback-edit-summary' => 'Одговор на [[Special:FeedbackDashboard/$1\|повратну информацију]]: $2',
	4550	+ 'moodbar-type-happy' => '{{GENDER:$1\|Срећан\|Срећна\|Срећан}}',
	4551	+ 'moodbar-type-sad' => '{{GENDER:$1\|Тужан\|Тужна\|Тужан}}',
	4552	+ 'moodbar-type-confused' => '{{GENDER:$1\|Збуњен\|Збуњена\|Збуњен}}',
	4553	+ 'moodbar-type-stats' => 'Исказано расположење у последња 24 часа. Срећни: $1, тужни: $2, збуњени: $3',
	4554	+ 'moodbar-user-anonymized' => 'Анонимизирано',
	4555	+ 'moodbar-user-ip' => 'ИП адреса',
	4556	+ 'moodbar-user-user' => 'Регистрован корисник',
	4557	+ 'moodbar-log-name' => 'Историја повратних информација',
	4558	+ 'moodbar-log-hide' => 'сакри [[$1]]',
	4559	+ 'moodbar-log-restore' => 'врати видљивост за [[$1]]',
	4560	+ 'moodbar-response-terms' => 'Слањем овога, прихватате транспарентност под следећим $1.',
	4561	+ 'moodbar-response-link' => 'условима',
4216	4562	'moodbar-response-url' => '//wikimediafoundation.org/wiki/Feedback_privacy_statement?uselang=sr-ec',
	4563	+ 'response-back-text' => 'Назад',
	4564	+ 'response-preview-text' => 'Преглед',
	4565	+ 'response-ajax-action-head' => 'Одговарам…',
	4566	+ 'response-ajax-action-body' => 'Ваш одговор се додаје.',
	4567	+ 'response-ajax-success-head' => 'Хвала!',
	4568	+ 'response-ajax-success-body' => 'Ваш одговор је додат.',
	4569	+ 'response-ajax-error-head' => 'Упс!',
4217	4570	);
4218	4571
4219	4572	/** Serbian (Latin script) (‪Srpski (latinica)‬) */
—	—	@@ -4249,6 +4602,7 @@
4250	4603	'moodbar-what-link' => 'funktionssidan',
4251	4604	'moodbar-privacy' => 'Genom att skicka samtycker du till insyn under dessa $1.',
4252	4605	'moodbar-privacy-link' => 'termer',
	4606	+ 'moodbar-privacy-link-title' => 'Användarvillkor',
4253	4607	'moodbar-disable-link' => 'Jag är inte intresserad. Inaktivera den här funktionen.',
4254	4608	'moodbar-form-title' => 'Därför att...',
4255	4609	'moodbar-form-note' => 'maximalt 140 tecken',
—	—	@@ -4261,8 +4615,17 @@
4262	4616	'moodbar-error-title' => 'Hoppsan!',
4263	4617	'moodbar-success-subtitle' => 'Dela din redigeringsupplevelse så hjälper du oss att förbättra $1 .',
4264	4618	'moodbar-error-subtitle' => 'Något gick fel! Prova att ge din feedback senare.',
4265		~~- 'moodbar-blocked-title' => 'Blockerad!',~~
	4619	+ 'moodbar-blocked-title' => 'Hoppsan!',
4266	4620	'moodbar-blocked-subtitle' => 'Du har blockerats från att redigera.',
	4621	+ 'moodbar-email-title' => 'Lägg till e-post',
	4622	+ 'moodbar-email-input' => 'Din e-postadress',
	4623	+ 'moodbar-email-desc' => 'Vi kommer att skicka dig ett e-postmeddelande om någon svarar din feedback.',
	4624	+ 'moodbar-email-submit' => 'Skicka',
	4625	+ 'moodbar-updating-title' => 'Uppdaterar...',
	4626	+ 'moodbar-updating-subtitle' => 'Vi uppdaterar dina e-postinställningar.',
	4627	+ 'moodbar-email-confirm-title' => 'Bekräfta e-post',
	4628	+ 'moodbar-email-resend-confirmation' => 'Skicka bekräftelse',
	4629	+ 'moodbar-email-optout' => 'Nej tack',
4267	4630	'right-moodbar-view' => 'Visa och exportera MoodBar feedback',
4268	4631	'right-moodbar-admin' => 'Ändra synlighet på feedback instrumentpanelen',
4269	4632	'moodbar-admin-title' => 'MoodBar feedback',
—	—	@@ -4291,7 +4654,8 @@
4292	4655	'moodbar-feedback-filters-type-happy' => 'Glad',
4293	4656	'moodbar-feedback-filters-type-confused' => 'Förvirrad',
4294	4657	'moodbar-feedback-filters-type-sad' => 'Ledsen',
4295		~~- 'moodbar-feedback-filters-username' => 'Användarnamn',~~
	4658	+ 'moodbar-feedback-filters-username' => 'Användarnamn:',
	4659	+ 'moodbar-feedback-filters-my-response' => 'Endast mina svar:',
4296	4660	'moodbar-feedback-filters-button' => 'Filtrera',
4297	4661	'moodbar-feedback-whatis' => 'Vad är det här för funktion?',
4298	4662	'moodbar-feedback-permalink' => 'Länka hit',
—	—	@@ -4318,10 +4682,12 @@
4319	4683	'moodbar-restore-header' => 'Återställa detta objekts synlighet',
4320	4684	'moodbar-invalid-item' => 'Systemet kunde inte hitta korrekt feedbackobjekt.',
4321	4685	'moodbar-feedback-action-error' => 'Ett fel inträffade när åtgärden utfördes.',
4322		~~- 'moodbar-feedback-response-summary' => '[[$1\|$2]] [[$3\|svarade]] på denna kommentar $4 sedan',~~
4323		~~- 'moodbar-type-happy' => 'Glad',~~
4324		~~- 'moodbar-type-sad' => 'Ledsen',~~
4325		~~- 'moodbar-type-confused' => 'Förvirrad',~~
	4686	+ 'moodbar-feedback-response-summary' => '[[$1\|$2]] [[$3\|svarade]] $4 sedan',
	4687	+ 'moodbar-feedback-edit-summary' => 'Svar på [[Special:FeedbackDashboard/$1\|användarfeedback]]: $2',
	4688	+ 'moodbar-type-happy' => '{{GENDER:$1\|Glad}}',
	4689	+ 'moodbar-type-sad' => '{{GENDER:$1\|Ledsen}}',
	4690	+ 'moodbar-type-confused' => '{{GENDER:$1\|Förvirrad}}',
	4691	+ 'moodbar-type-stats' => 'Feedback för humörfältet i de senaste 24 timmarna: Glad: $1, Ledsen: $2, Förvirrad: $3',
4326	4692	'moodbar-user-anonymized' => 'Anonymiserad',
4327	4693	'moodbar-user-ip' => 'IP-adress',
4328	4694	'moodbar-user-user' => 'Registrerad användare',
—	—	@@ -4339,6 +4705,22 @@
4340	4706	'response-ajax-success-body' => 'Ditt svar har lagts till.',
4341	4707	'response-ajax-error-head' => 'Hoppsan!',
4342	4708	'response-ajax-error-body' => 'Det gick inte att lägga till ditt svar. <br />Försök igen senare.',
	4709	+ 'moodbar-enotif-subject' => '$1 svarade på din feedback',
	4710	+ 'moodbar-enotif-body' => 'Hej $1!
	4711	+
	4712	+Välkommen till {{SITENAME}}, och tack för din [[$2\|feedback]]. En annan användare på {{SITENAME}}, [[$3\|$6]], skrev följande svar:
	4713	+
	4714	+ $4
	4715	+
	4716	+Visa meddelandet på din [$5 diskussionssida]
	4717	+
	4718	+Vad är en diskussionssida?
	4719	+Din diskussionssida är den sida som andra användare redigerare på {{SITENAME}} använder för att kommunicera med dig. Du kan svara genom att klicka på “Redigera”, flytta markören nedanför kommentaren, skriva in ditt svar och fyra tilde (~~~~) för att signera, och spara. Alla sidor på {{SITENAME}} har diskussionssidor, och de har många olika syften. Det tar ett tag att komma igång med det, men det är ganska enkelt när du väl blivit van med det.
	4720	+
	4721	+Är du fortfarande förvirrad? [http://en.wikipedia.org/wiki/File:Wikipedia_basics_-_Talk_pages.ogv Denna video] (titta på [http://www.youtube.com/watch?v=JdeDLRsB2Es YouTube]) ger dig en översikt steg-försteg.
	4722	+
	4723	+Ha en bra dag,
	4724	+-- {{SITENAME}}',
4343	4725	);
4344	4726
4345	4727	/** Telugu (తెలుగు)
—	—	@@ -4355,7 +4737,7 @@
4356	4738	'moodbar-header-usertype' => 'వాడుకరి రకం',
4357	4739	'moodbar-header-user' => 'వాడుకరి',
4358	4740	'moodbar-header-comment' => 'వ్యాఖ్యలు',
4359		~~- 'moodbar-feedback-filters-username' => 'వాడుకరి పేరు',~~
	4741	+ 'moodbar-feedback-filters-username' => 'వాడుకరి పేరు:',
4360	4742	'moodbar-feedback-more' => 'మరిన్ని',
4361	4743	'moodbar-feedback-action-cancel' => 'రద్దుచేయి',
4362	4744	'moodbar-action-reason' => 'కారణం:',
—	—	@@ -4443,13 +4825,17 @@
4444	4826	'moodbar-header-user-editcount' => 'Кількість правок користувача',
4445	4827	'moodbar-header-namespace' => 'Простір імен',
4446	4828	'moodbar-header-own-talk' => 'Власна сторінка обговорення',
	4829	+ 'moodbar-feedback-view-link' => '(Переглянути відгук)',
4447	4830	'moodbar-feedback-filters' => 'Фільтри',
4448		~~- 'moodbar-feedback-filters-username' => "Ім'я користувача",~~
	4831	+ 'moodbar-feedback-filters-username' => "Ім'я користувача:",
4449	4832	'moodbar-feedback-more' => 'Більше',
4450	4833	'moodbar-feedback-newer' => 'Нові',
4451	4834	'moodbar-feedback-older' => 'Старі',
	4835	+ 'moodbar-user-hidden' => '(Користувача приховано)',
	4836	+ 'moodbar-feedback-hide' => 'приховати відгук',
4452	4837	'moodbar-feedback-action-confirm' => 'Підтвердити',
4453	4838	'moodbar-feedback-action-cancel' => 'Скасувати',
	4839	+ 'moodbar-feedback-restore' => 'відновити прихований відгук',
4454	4840	'moodbar-action-reason' => 'Причина:',
4455	4841	'moodbar-action-reason-required' => 'Будь ласка, зазначте причину.',
4456	4842	'moodbar-feedback-action-error' => 'Сталася помилка при спробі виконати цю дію.',
—	—	@@ -4460,7 +4846,8 @@
4461	4847	'moodbar-user-ip' => 'IP-адреса',
4462	4848	'moodbar-user-user' => 'Зареєстрований користувач',
4463	4849	'moodbar-log-name' => "Журнал зворотнього зв'язку",
4464		~~- 'moodbar-response-link' => 'умови',~~
	4850	+ 'moodbar-response-terms' => 'Надсилаючи, ви погоджуєтесь з публічністю даних на таких $1.',
	4851	+ 'moodbar-response-link' => 'умовах',
4465	4852	'response-back-text' => 'Назад',
4466	4853	'response-preview-text' => 'Попередній перегляд',
4467	4854	'response-ajax-action-body' => 'Ваша відповідь додається.',
—	—	@@ -4552,7 +4939,7 @@
4553	4940	'moodbar-feedback-filters-type-happy' => 'Hài lòng',
4554	4941	'moodbar-feedback-filters-type-confused' => 'Bối rối',
4555	4942	'moodbar-feedback-filters-type-sad' => 'Bực mình',
4556		~~- 'moodbar-feedback-filters-username' => 'Tên người dùng',~~
	4943	+ 'moodbar-feedback-filters-username' => 'Tên người dùng:',
4557	4944	'moodbar-feedback-filters-my-response' => 'Chỉ hồi đáp của tôi:',
4558	4945	'moodbar-feedback-filters-button' => 'Áp dụng bộ lọc',
4559	4946	'moodbar-feedback-whatis' => 'Tính năng này làm gì?',
—	—	@@ -4716,7 +5103,7 @@
4717	5104	'moodbar-feedback-filters-type-happy' => '开心',
4718	5105	'moodbar-feedback-filters-type-confused' => '困惑',
4719	5106	'moodbar-feedback-filters-type-sad' => '不快',
4720		~~- 'moodbar-feedback-filters-username' => '用户名',~~
	5107	+ 'moodbar-feedback-filters-username' => '用户名：',
4721	5108	'moodbar-feedback-filters-my-response' => '仅显示我的回复：',
4722	5109	'moodbar-feedback-filters-button' => '设置过滤器',
4723	5110	'moodbar-feedback-whatis' => '这是什么功能？',
Index: branches/wmf/1.18wmf1/extensions/MoodBar/ApiFeedbackDashboardResponse.php
—	—	@@ -54,7 +54,7 @@
55	55	$feedback_link . "\n" .
56	56	'<span id="feedback-dashboard-response-' . $id . '"></span>' . "\n\n" .
57	57	$response . "\n\n~~~~\n\n" .
58		~~- '<span class="markashelpful-item" data-markashelpful-item="' . $id . '" data-markashelpful-type="mbresponse"> </span>',~~
	58	+ '<span class="markashelpful-mbresponse-' . $id . '"> </span>',
59	59	'token' => $params['token'],
60	60	'summary' => $summary,
61	61	'notminor' => true,
Index: branches/wmf/1.18wmf1/extensions/MoodBar/MoodBar.hooks.php
—	—	@@ -124,7 +124,7 @@
125	125	/**
126	126	* Runs MoodBar schema updates#
127	127	*
128		~~- * @param $updater DatabasEUpdater~~
	128	+ * @param $updater DatabaseUpdater
129	129	*/
130	130	public static function onLoadExtensionSchemaUpdates( $updater = null ) {
131	131	$dir = dirname(__FILE__) . '/sql/';
Property changes on: branches/wmf/1.18wmf1/extensions/MoodBar
___________________________________________________________________
Modified: svn:mergeinfo
132	132	Merged /trunk/extensions/MoodBar:r107531-107540
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/MarkAsHelpful.i18n.php
—	—	@@ -49,7 +49,7 @@
50	50	* @author Kghbln
51	51	*/
52	52	$messages['de'] = array(
53		~~- 'markashelpful-desc' => 'Ermöglicht eine Benutzeroberfläche mit der Kommentare als hilfreich markiert werden können',~~
	53	+ 'markashelpful-desc' => 'Ermöglicht eine Benutzeroberfläche, mit der Kommentare als hilfreich markiert werden können',
54	54	'mah-mark-text' => 'Als hilfreich markieren',
55	55	'mah-you-marked-text' => 'Du meinst, dass dieser Kommentar hilfreich ist.',
56	56	'mah-someone-marked-text' => '{{GENDER:$1\|$1}} meint, dass dieser Kommentar hilfreich ist.',
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/MarkAsHelpful.php
—	—	@@ -25,16 +25,23 @@
26	26	$dir = dirname( __FILE__ ) . '/';
27	27	// Object model
28	28	$wgAutoloadClasses['MarkAsHelpfulItem'] = $dir . 'includes/MarkAsHelpfulItem.php';
	29	+$wgAutoloadClasses['MWMarkAsHelpFulItemPropertyException'] = $dir . 'includes/MarkAsHelpfulItem.php';
	30	+$wgAutoloadClasses['MWMarkAsHelpFulItemSearchKeyException'] = $dir . 'includes/MarkAsHelpfulItem.php';
	31	+
29	32	$wgAutoloadClasses['MarkAsHelpfulUtil'] = $dir . 'includes/MarkAsHelpfulUtil.php';
30	33
31	34	// API
32	35	$wgAutoloadClasses['ApiMarkAsHelpful'] = $dir . 'api/ApiMarkAsHelpful.php';
	36	+$wgAutoloadClasses['MWApiGetMarkAsHelpfulItemInvalidActionException'] = $dir . 'api/ApiMarkAsHelpful.php';
33	37	$wgAPIModules['markashelpful'] = 'ApiMarkAsHelpful';
	38	+
34	39	$wgAutoloadClasses['ApiGetMarkAsHelpfulItem'] = $dir . 'api/ApiGetMarkAsHelpfulItem.php';
	40	+$wgAutoloadClasses['MWApiMarkAsHelpfulInvalidActionException'] = $dir . 'api/ApiGetMarkAsHelpfulItem.php';
35	41	$wgAPIModules['getmarkashelpfulitem'] = 'ApiGetMarkAsHelpfulItem';
36	42
37	43	// Hooks
38	44	$wgAutoloadClasses['MarkAsHelpfulHooks'] = $dir . 'MarkAsHelpful.hooks.php';
	45	+
39	46	$wgHooks['BeforePageDisplay'][] = 'MarkAsHelpfulHooks::onPageDisplay';
40	47	$wgHooks['LoadExtensionSchemaUpdates'][] = 'MarkAsHelpfulHooks::onLoadExtensionSchemaUpdates';
41	48	$wgHooks['MakeGlobalVariablesScript'][] = 'MarkAsHelpfulHooks::makeGlobalVariablesScript';
—	—	@@ -63,4 +70,5 @@
64	71	'dependencies' => array(
65	72	'mediawiki.util'
66	73	),
67		~~-);~~
\ No newline at end of file
	74	+);
	75	+
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/includes/MarkAsHelpfulUtil.php
—	—	@@ -26,16 +26,13 @@
27	27	} else {
28	28	if ( $isAbleToMark ) {
29	29	$html = self::requestToMarkTemplate();
30		~~- }~~
31		~~- else {~~
	30	+ } else {
32	31	$html = self::otherMarkedTemplate( $helpfulUserList );
33	32	}
34	33
35	34	}
36	35	}
37		-
38	36	return $html;
39		-
40	37	}
41	38
42	39	/**
—	—	@@ -44,7 +41,6 @@
45	42	* @return string html \| empty text
46	43	*/
47	44	private static function otherMarkedTemplate( $helpfulUserList ) {
48		-
49	45	if ( count( $helpfulUserList ) == 0 ) {
50	46	return '';
51	47	}
—	—	@@ -66,7 +62,7 @@
67	63	</div>
68	64	HTML;
69	65	}
70		-
	66	+
71	67	/**
72	68	* The template to display in this format: You think this is helpful
73	69	* @Todo future enhancement: We may pass the list of other users as well
—	—	@@ -101,5 +97,5 @@
102	98	</div>
103	99	HTML;
104	100	}
105		-
106	101	}
	102	+
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/includes/MarkAsHelpfulItem.php
—	—	@@ -57,6 +57,7 @@
58	58
59	59	/**
60	60	* get the owner of the 'mark as helpful' item
	61	+ * @return User
61	62	*/
62	63	public function getUser() {
63	64	if ( !$this->user ) {
—	—	@@ -196,7 +197,6 @@
197	198	* @param $currentUser User - the current user who is browsing the site
198	199	*/
199	200	public function unmark( $currentUser ) {
200		-
201	201	if ( $currentUser->isAnon() ) {
202	202	return;
203	203	}
—	—	@@ -207,32 +207,24 @@
208	208	if ( !$this->loadedFromDatabase ) {
209	209	if ( !$this->loadFromDatabase( array( 'mah_id' => $this->getProperty( 'mah_id' ) ) ) ) {
210	210	return;
211		~~- }~~
	211	+ }
212	212	}
213	213
214	214	$user = $this->getUser();
215	215
216		~~- if ( $user ) {~~
	216	+ if ( !$user \|\| $user->isAnon() ) {
	217	+ return;
	218	+ }
	219	+ if ( $currentUser->getId() == $user->getId() ) {
	220	+ $dbw = wfGetDB( DB_MASTER );
217	221
218		~~- if ( !$user->isAnon() ) {~~
219		-
220		~~- if ( $currentUser->getId() == $user->getId() ) {~~
221		-
222		~~- $dbw = wfGetDB( DB_MASTER );~~
223		-
224		~~- $dbw->delete(~~
225		~~- 'mark_as_helpful',~~
226		~~- array( 'mah_id' => $this->getProperty( 'mah_id' ) ),~~
227		~~- __METHOD__~~
228		~~- );~~
229		-
230		~~- }~~
231		-
232		~~- }~~
233		-
	222	+ $dbw->delete(
	223	+ 'mark_as_helpful',
	224	+ array( 'mah_id' => $this->getProperty( 'mah_id' ) ),
	225	+ __METHOD__
	226	+ );
234	227	}
235	228	}
236		-
237	229	}
238	230
239	231	/**
—	—	@@ -264,7 +256,7 @@
265	257
266	258	foreach ( $res as $val ) {
267	259	$list[$val->user_id] = array( 'user_name' => $val->user_name,
268		~~- 'user_id' => $val->user_id );~~
	260	+ 'user_id' => $val->user_id );
269	261	}
270	262
271	263	return $list;
—	—	@@ -273,3 +265,4 @@
274	266
275	267	class MWMarkAsHelpFulItemPropertyException extends MWException {}
276	268	class MWMarkAsHelpFulItemSearchKeyException extends MWException {}
	269	+
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/modules/ext.markAsHelpful/ext.markAsHelpful.js
—	—	@@ -8,7 +8,7 @@
9	9
10	10	var mah = mw.mah = {
11	11	loadedItems: [],
12		~~- selector: '.markashelpful-item', //class of element(s) to apply MarkAsHelpful to.~~
	12	+ selector: '[class^=markashelpful]', //class of element(s) to apply MarkAsHelpful to.
13	13
14	14	init: function() {
15	15	var props, thisItem;
—	—	@@ -28,10 +28,13 @@
29	29	* Return object of item properties
30	30	*/
31	31	getItemProperties: function( $item ) {
32		~~- var properties = {~~
33		~~- 'item': $item.data('markashelpful-item'), // item id~~
34		~~- 'type': $item.data('markashelpful-type') // item type (eg, mbresponse)~~
35		~~- };~~
	32	+ var tag = $item.attr( 'class' ),
	33	+ //item properties are stored in classname to prevent parser from stripping out non html 5 objects.
	34	+ //(eg data-markashelpful-item)
	35	+ properties = {
	36	+ 'item': tag.split( '-' )[2], // item id
	37	+ 'type': tag.split( '-' )[1] // item type (eg, mbresponse)
	38	+ };
36	39	return properties;
37	40	},
38	41
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/api/ApiGetMarkAsHelpfulItem.php
—	—	@@ -9,7 +9,7 @@
10	10
11	11	// check if current user has permission to mark this item,
12	12	$isAbleToMark = true;
13		-
	13	+
14	14	wfRunHooks( 'onMarkItemAsHelpful', array( 'mark', $params['type'], $params['item'], $wgUser, &$isAbleToMark ) );
15	15
16	16	$HelpfulUserList = MarkAsHelpfulItem::getMarkAsHelpfulList( $params['type'], $params['item'] );
—	—	@@ -31,7 +31,7 @@
32	32
33	33	public function getAllowedParams() {
34	34	global $wgMarkAsHelpfulType;
35		-
	35	+
36	36	return array(
37	37	'type' => array(
38	38	ApiBase::PARAM_REQUIRED => true,
—	—	@@ -65,4 +65,5 @@
66	66
67	67	}
68	68
69		~~-class MWApiGetMarkAsHelpfulItemInvalidActionException extends MWException {}~~
\ No newline at end of file
	69	+class MWApiGetMarkAsHelpfulItemInvalidActionException extends MWException {}
	70	+
Index: branches/wmf/1.18wmf1/extensions/MarkAsHelpful/api/ApiMarkAsHelpful.php
—	—	@@ -32,7 +32,7 @@
33	33	$item = new MarkAsHelpfulItem();
34	34	$item->loadFromRequest( $params );
35	35	$item->mark();
36		~~- break;~~
	36	+ break;
37	37
38	38	case 'unmark':
39	39	$item = new MarkAsHelpfulItem();
—	—	@@ -45,15 +45,13 @@
46	46
47	47	if ( $status ) {
48	48	$item->unmark( $wgUser );
	49	+ } else {
	50	+ $error = true;
49	51	}
50		~~- else {~~
51		~~- $error = true;~~
52		~~- }~~
53		~~- break;~~
	52	+ break;
54	53
55	54	default:
56	55	throw new MWApiMarkAsHelpfulInvalidActionException( "Action {$params['mbaction']} not implemented" );
57		~~- break;~~
58	56	}
59	57
60	58	if ( $error === false ) {
—	—	@@ -134,3 +132,4 @@
135	133	}
136	134
137	135	class MWApiMarkAsHelpfulInvalidActionException extends MWException {}
	136	+
Property changes on: branches/wmf/1.18wmf1/extensions/MarkAsHelpful
___________________________________________________________________
Added: svn:mergeinfo
138	137	Merged /trunk/extensions/MarkAsHelpful:r99592,99653,100092,100419,100686,100692,100699,103669,104337,104736,104863,107515-107540
139	138	Merged /branches/sqlite/extensions/MarkAsHelpful:r58211-58321
140	139	Merged /trunk/phase3/extensions/MarkAsHelpful:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
141	140	Merged /branches/new-installer/phase3/extensions/MarkAsHelpful:r43664-66004
142	141	Merged /branches/REL1_15/phase3/extensions/MarkAsHelpful:r51646
143	142	Merged /branches/REL1_18/extensions/MarkAsHelpful:r101758,103190
144	143	Merged /branches/REL1_17/phase3/extensions/MarkAsHelpful:r81445,81448

Status & tagging log

17:24, 6 January 2012 😂 (talk | contribs) changed the status of r107541 [removed: new added: ok]