Update to MediaWiki 1.18.3

author: Pierre Schmitz <pierre@archlinux.de> 2012-04-26 18:23:31 +0200
committer: Pierre Schmitz <pierre@archlinux.de> 2012-04-26 18:23:31 +0200
commit: c4372dd38a4d109b4f3881ea63b667e33adbe503 (patch)
tree: e8e6dae1229a68c26b7a348c73dc0c8c77da97e5
parent: cf566324cfb218f0c7323d97d2a103bbb8d60ba4 (diff)
180 files changed, 9529 insertions, 4512 deletions
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 00000000..9041fd0b
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/core.git
+defaultbranch=REL1_18
diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 9af5a1a5..bec12bf6 100644
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -3,13 +3,23 @@
 Security reminder: MediaWiki does not require PHP's register_globals
 setting since version 1.2.0. If you have it on, turn it '''off''' if you can.
 
+=== Changes since 1.18.2 ===
+2012-04-25
+
+* (bug 35446) Using "{{nse:}}" with an invalid namespace name no longer throws
+  a PHP warning.
+* (bug 35567) The whole password reminder e-mail is now sent in the same language.
+* (bug 35961) Hash comparison should always be strict.
+* (bug 35671) PHP Notice: Undefined index: gettoken in includes/api/ApiMain.php
+  on line 598.
+* Fix broken email confirmation expiration caused by MWCryptRand changes.
+
 == MediaWiki 1.18.2 ==
 2012-03-21
 
 This is a maintenance and security release of the MediaWiki 1.18 branch.
 
-== Changes since 1.18.1 ==
-
+=== Changes since 1.18.1 ===
 * (bug 33686) could not get a list of contributor for an article when using
  a SQLite database.
 * (Bug 33865) Exception thrown in action=parse when attempting to use the title
@@ -28,8 +38,12 @@ This is a maintenance and security release of the MediaWiki 1.18 branch.
   CSRF attacks.
 * (bug 35317) CSRF in Special:Upload.
 
-=== Changes since 1.18.0 ===
+== MediaWiki 1.18.1 ==
+2012-01-11
+
+This a maintenance and security release of the MediaWiki 1.18 branch.
 
+=== Changes since 1.18.0 ===
 * (bug 32712) Fix for search indexing of pages with certain unicode chars following URL.
 * (bug 3901) Lang, hreflang attribs added to sidebar interlanguage links for screen readers.
 * (bug 30774) mediawiki.html: Add support for numbers and booleans in the
@@ -57,7 +71,7 @@ This is a maintenance and security release of the MediaWiki 1.18 branch.
   for Oracle DB.
 * (bug 33117) prop=revisions allows deleted text to be exposed through cache pollution.
 
-== MediaWiki 1.18 ==
+== MediaWiki 1.18.0 ==
 2011-11-24
 
 This is the first stable release of the MediaWiki 1.18 branch.
diff --git a/extensions/ConfirmEdit/Asirra.class.php b/extensions/ConfirmEdit/Asirra.class.php
new file mode 100644
index 00000000..1f31d089
--- /dev/null
+++ b/extensions/ConfirmEdit/Asirra.class.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Bachsau
+ * @author Niklas Laxström
+ */
+
+class Asirra extends SimpleCaptcha {
+	public $asirra_clientscript = 'http://challenge.asirra.com/js/AsirraClientSide.js';
+
+	// As we don't have to store anything but some other things to do,
+	// we're going to replace that constructor completely.
+	function __construct() {
+		global $wgExtensionAssetsPath, $wgAsirraScriptPath;
+		$this->asirra_localpath = "$wgExtensionAssetsPath/ConfirmEdit";
+	}
+
+	function getForm() {
+		global $wgAsirraEnlargedPosition, $wgAsirraCellsPerRow, $wgOut, $wgLang;
+
+		$wgOut->addModules( 'ext.confirmedit.asirra' );
+		$js = Html::linkedScript( $this->asirra_clientscript );
+
+		$message = Xml::encodeJsVar( wfMessage( 'asirra-createaccount-fail' )->plain() );
+		$js .= Html::inlineScript( <<<JAVASCRIPT
+var asirra_js_failed = '$message';
+JAVASCRIPT
+		);
+		$js .=  '<noscript>' . wfMessage( 'asirra-nojs' )->parse() . '</noscript>';
+		return $js;
+	}
+
+	function passCaptcha() {
+		global $wgRequest;
+
+		$ticket = $wgRequest->getVal( 'Asirra_Ticket' );
+		$api = 'http://challenge.asirra.com/cgi/Asirra?';
+		$params = array(
+			'action' => 'ValidateTicket',
+			'ticket' => $ticket,
+		);
+
+		$response = Http::get( $api . wfArrayToCgi( $params ) );
+		$xml = simplexml_load_string( $response );
+		$result = $xml->xpath( '/AsirraValidation/Result' );
+		return strval( $result[0] ) === 'Pass';
+	}
+}
diff --git a/extensions/ConfirmEdit/Asirra.i18n.php b/extensions/ConfirmEdit/Asirra.i18n.php
new file mode 100644
index 00000000..98ab918b
--- /dev/null
+++ b/extensions/ConfirmEdit/Asirra.i18n.php
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Internationalisation file for the Asirra module of the ConfirmEdit
+ * extension.
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$messages = array();
+
+/* English */
+$messages['en'] = array(
+	'asirra-desc' => 'Asirra module for ConfirmEdit',
+	'asirra-edit' => 'To help protect against automated edit spam, please select just the cat photos in the box below:', 
+	'asirra-addurl' => 'Your edit includes new external links. To help protect against automated spam, please select just the cat photos in the box below:',
+	'asirra-badpass' => 'To help protect against automated password cracking, please select just the cat photos in the box below:',
+	'asirra-createaccount' => 'To help protect against automated account creation, please select just the cat photos in the box below:',
+	'asirra-createaccount-fail' => "Please correctly identify the cats.",
+	'asirra-create' => 'To help protect against automated page creation, please select just the cat photos in the box below:', 
+	'asirra-nojs' => '\'\'\'Please enable JavaScript and resubmit the page.\'\'\'',
+	'asirra-failed' => 'Please identify all cat images',
+);
+
+/** Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
+ * @author EugeneZelenko
+ * @author Jim-by
+ * @author Wizardist
+ */
+$messages['be-tarask'] = array(
+	'asirra-desc' => 'Модуль Asirra для ConfirmEdit',
+	'asirra-edit' => 'Для абароны супраць спаму, калі ласка, выберыце толькі фота з катом ў полі ніжэй:',
+	'asirra-addurl' => 'Вашае рэдагаваньне ўтрымлівае новыя вонкавыя спасылкі. Для абароны супраць спаму, калі ласка, выберыце толькі фота з катом ў полі ніжэй:',
+	'asirra-badpass' => 'Для абароны супраць аўтаматычнага падбору паролю, калі ласка, выберыце толькі фота з катом ў полі ніжэй:',
+	'asirra-createaccount' => 'Для абароны супраць аўтаматычнага стварэньня рахункаў, калі ласка, выберыце толькі фота з катом ў полі ніжэй:',
+	'asirra-createaccount-fail' => 'Калі ласка, слушна выберыце катоў.',
+	'asirra-create' => 'Для абароны супраць аўтаматычнага стварэньня старонак, калі ласка, выберыце толькі фота з катом ў полі ніжэй:',
+	'asirra-nojs' => "'''Калі ласка, дазвольце JavaScript і дашліце старонку зноў.'''",
+	'asirra-failed' => 'Калі ласка, вызначце ўсе выявы з катамі',
+);
+
+/** German (Deutsch)
+ * @author Kghbln
+ */
+$messages['de'] = array(
+	'asirra-desc' => 'Ermöglicht die Nutzung des Anti-Spam-Moduls Asirra',
+	'asirra-edit' => 'Zum Schutz vor automatisiertem Spam bitten wir dich, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-addurl' => 'Deine Bearbeitung enthält neue externe Links. Zum Schutz vor automatisiertem Spam bitten wir dich, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-badpass' => 'Zum Schutz gegen automatisiertes Knacken von Passwörtern bitten wir dich, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-createaccount' => 'Zum Schutz gegen automatisiertes Erstellen von Benutzerkonten bitten wir dich, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-createaccount-fail' => 'Bitte wähle nur die Fotos mit Katzen aus.',
+	'asirra-create' => 'Zum Schutz gegen automatisiertes Erstellen von Seiten bitten wir dich, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-nojs' => "'''Bitte JavaScript aktivieren und die Seiten nochmals Speichern.'''",
+	'asirra-failed' => 'Bitte wähle nur die Fotos mit Katzen aus.',
+);
+
+/** German (formal address) (‪Deutsch (Sie-Form)‬)
+ * @author Kghbln
+ */
+$messages['de-formal'] = array(
+	'asirra-addurl' => 'Ihre Bearbeitung enthält neue externe Links. Zum Schutz vor automatisiertem Spam bitten wir Sie, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-badpass' => 'Zum Schutz gegen automatisiertes Knacken von Passwörtern bitten wir Sie, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-createaccount' => 'Zum Schutz gegen automatisiertes Erstellen von Benutzerkonten bitten wir Sie, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-createaccount-fail' => 'Bitte wählen Sie nur die Fotos mit Katzen aus.',
+	'asirra-create' => 'Zum Schutz gegen automatisiertes Erstellen von Seiten bitten wir Sie, nur die Fotos mit Katzen im untenstehenden Feld auszuwählen:',
+	'asirra-failed' => 'Bitte wählen Sie nur die Fotos mit Katzen aus.',
+);
+
+/** French (Français)
+ * @author Seb35
+ */
+$messages['fr'] = array(
+	'asirra-desc' => 'Module Asirra pour ConfirmEdit',
+	'asirra-edit' => 'Pour aider à nous protéger contre le spam d’édition automatique, veuillez sélectionner uniquement les photos de chats dans la boîte ci-dessous :',
+	'asirra-addurl' => 'Votre édition contient des liens externes. Pour nous aider à nous protéger contre le spam automatique, veuillez sélectionner uniquement les photos de chats dans la boîte ci-dessous :',
+	'asirra-badpass' => 'Pour nous aider à nous protéger des essais automatiques de cassage de mot de passe, veuillez sélectionner uniquement les photos de chats dans la boîte ci-dessous :',
+	'asirra-createaccount' => 'Pour nous aider à nous protéger contre la création automatique de comptes, veuillez sélectionner uniquement les photos de chats dans la boîte ci-dessous :',
+	'asirra-createaccount-fail' => 'Veuillez identifier correctement les chats.',
+	'asirra-create' => 'Pour nous aider à nous protéger contre la création automatique de pages, veuillez sélectionner uniquement les photos de chats dans la boîte ci-dessous :',
+	'asirra-nojs' => "'''Veuillez activer le JavaScript et re-soumettre la page.'''",
+);
+
+/** Galician (Galego)
+ * @author Toliño
+ */
+$messages['gl'] = array(
+	'asirra-desc' => 'Módulo Asirra para ConfirmEdit',
+	'asirra-edit' => 'Para axudarnos á protección contra o spam, seleccione só as fotos de gatos na caixa:',
+	'asirra-addurl' => 'A súa edición inclúe novas ligazóns externas. Para axudar na protección contra o spam automático, seleccione só as fotos de gatos na caixa:',
+	'asirra-badpass' => 'Para axudarnos á protección contra o roubo de contrasinais, seleccione só as fotos de gatos na caixa:',
+	'asirra-createaccount' => 'Para axudarnos á protección contra a creación automática de contas, seleccione só as fotos de gatos na caixa:',
+	'asirra-createaccount-fail' => 'Identifique correctamente os gatos.',
+	'asirra-create' => 'Para axudarnos á protección contra a creación automática de páxinas, seleccione só as fotos de gatos na caixa:',
+	'asirra-nojs' => "'''Active o JavaScript e volva enviar a páxina.'''",
+	'asirra-failed' => 'Identifique todas as fotos de gatos',
+);
+
+/** Upper Sorbian (Hornjoserbsce)
+ * @author Michawiki
+ */
+$messages['hsb'] = array(
+	'asirra-desc' => 'Modul Asirra za ConfirmEdit',
+	'asirra-edit' => 'Za škit přećiwo awtomatizowanemu spamej, prošu wubjer jenož fota kóčkow w slědowacym polu:',
+	'asirra-addurl' => 'Twoja změna wobsahuje nowe eksterne wotkazy. Za škit přećiwo awtomatizowanemu spamej, prošu wubjer jenož fota kóčkow w slědowacym polu:',
+	'asirra-badpass' => 'Za škit přećiwo awtomatizowanemu złamanju hesłow, prošu wubjer jenož fota kóčkow w slědowacym polu:',
+	'asirra-createaccount' => 'Za škit přećiwo awtomatiskemu wutworjenju konta, prošu wubjer jenož fota kóčkow w slědowacym polu:',
+	'asirra-createaccount-fail' => 'Prošu identifikuj kóčki.',
+	'asirra-create' => 'Za škit přećiwo awtomatiskemu wutworjenju strony, prošu wubjer jenož fota kóčkow w slědowacym polu:',
+	'asirra-nojs' => "'''Prošu zmóžń JavaScript a składuj stronu hišće raz.'''",
+	'asirra-failed' => 'Prošu identifikuj wšě wobrazy z kóčkami',
+);
+
+/** Interlingua (Interlingua)
+ * @author McDutchie
+ */
+$messages['ia'] = array(
+	'asirra-desc' => 'Modulo de Asirra pro ConfirmEdit',
+	'asirra-edit' => 'Pro adjutar a proteger nos contra le spam automatisate, per favor selige solmente le photos de cattos in le quadro sequente:',
+	'asirra-addurl' => 'Iste modification include nove ligamines externe. Pro adjutar a proteger nos contra le spam automatisate, per favor selige solmente le photos de cattos in le quadro sequente:',
+	'asirra-badpass' => 'Pro adjutar a proteger nos contra le furto automatisate de contrasignos, per favor selige solmente le photos de catto in le quadro sequente:',
+	'asirra-createaccount' => 'Pro adjutar a proteger nos contra le creation automatisate de contos, per favor selige solmente le photos de cattos in le quadro sequente:',
+	'asirra-createaccount-fail' => 'Per favor identifica correctemente le cattos.',
+	'asirra-create' => 'Pro adjutar a proteger nos contra le creation automatisate de paginas, per favor selige solmente le photos de cattos in le quadro sequente:',
+	'asirra-nojs' => "'''Per favor activa JavaScript e resubmitte le pagina.'''",
+	'asirra-failed' => 'Per favor identifica tote le imagines de cattos',
+);
+
+/** Luxembourgish (Lëtzebuergesch)
+ * @author Robby
+ */
+$messages['lb'] = array(
+	'asirra-desc' => 'Asirra-Modul fir ConfirmEdit',
+	'asirra-addurl' => "An Ärer Ännerung sinn nei extern Linken. Fir ze hëllefe géint automatiséierte Spam virzegoen, sicht w.e.g. d'Kategorie vun de Fotoen an der Këscht ënnendrënner eraus:",
+	'asirra-createaccount-fail' => "Identifizéiert d'Kaze w.e.g. richteg.",
+	'asirra-nojs' => "'''Aktivéiert w.e.g. JavaScript a schéckt d'Säit nachemol.'''",
+	'asirra-failed' => 'Identifizéiert w.e.g. all Biller wou Kazen drop sinn',
+);
+
+/** Macedonian (Македонски)
+ * @author Bjankuloski06
+ */
+$messages['mk'] = array(
+	'asirra-desc' => 'Asirra-модул за ПотврдиУредување',
+	'asirra-edit' => 'Како заштитна мерка против автоматизиран спам, изберете ги само сликите со мачка прикажани во полето:',
+	'asirra-addurl' => 'Во вашите измени има нови надворешни врски. Како заштитна мерка против автоматизиран спам, изберете ги само сликите со мачка прикажани во полето:',
+	'asirra-badpass' => 'Како заштитна мерка против автоматизирано провалување на лозинки, изберете ги само сликите со мачка прикажани во полето:',
+	'asirra-createaccount' => 'Како заштитна мерка против автоматизирано создавање на сметки, изберете ги само сликите со мачка прикажани во полето:',
+	'asirra-createaccount-fail' => 'Посочете кои од следниве се мачки.',
+	'asirra-create' => 'Како заштитна мерка против автоматизирано создавање на страници, изберете ги само сликите со мачка прикажани во полето:',
+	'asirra-nojs' => "'''Овозможете JavaScript и поднесете ја страницата повторно.'''",
+	'asirra-failed' => 'Изберете ги сликите што имаат мачка',
+);
+
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Event
+ */
+$messages['nb'] = array(
+	'asirra-desc' => 'Assirra-modulen for ConfirmEdit',
+	'asirra-edit' => 'Som beskyttelse mot automatisk redigert spam, vennligst velg kun kattebildene i boksen under:',
+	'asirra-addurl' => 'Din redigering inneholder nye eksterne lenker. Som beskyttelse mot automatisk redigert spam, vennligst velg kun kattebildene i boksen under:',
+	'asirra-badpass' => 'Som beskyttelse mot automatisk passordknekking, vennligst velg kun kattebildene i boksen under:',
+	'asirra-createaccount' => 'Som beskyttelse mot automatisk opprettelse av brukerkonto, vennligst velg kun kattebildene i boksen under:',
+	'asirra-createaccount-fail' => 'Vennligst angi hva som er katter.',
+	'asirra-create' => 'Som beskyttelse mot automatisk opprettelse av sider, vennligst velg kun kattebildene i boksen under:',
+	'asirra-nojs' => "'''Vennligst åpne for JavaScript og lagre siden en gang til.'''",
+);
+
+/** Dutch (Nederlands)
+ * @author SPQRobin
+ * @author Siebrand
+ */
+$messages['nl'] = array(
+	'asirra-desc' => 'Asirra-module voor ConfirmEdit',
+	'asirra-edit' => 'Kies ter bescherming tegen geautomatiseerde spam de afbeeldingen met een poes in het onderstaande venster:',
+	'asirra-addurl' => "Uw bewerking bevat nieuwe externe verwijzingen. Om te helpen beschermen tegen geautomatiseerde spam, selecteer de foto's van katten in het vak hieronder:",
+	'asirra-badpass' => 'Kies ter bescherming tegen het automatisch kraken van wachtwoorden de afbeeldingen met een poes in het onderstaande venster:',
+	'asirra-createaccount' => 'Kies om het automatisch aanmaken van gebruikers tegen te gaan de afbeeldingen met een poes in het onderstaande venster:',
+	'asirra-createaccount-fail' => 'Identificeer de katten juist.',
+	'asirra-create' => "Kies om het automatisch aanmaken van pagina's tegen te gaan de afbeeldingen met een poes in het onderstaande venster:",
+	'asirra-nojs' => "'''Schakel JavaScript in en probeer de pagina opnieuw op te slaan.'''",
+	'asirra-failed' => 'Identificeer alle afbeeldingen van katten.',
+);
+
+/** Piedmontese (Piemontèis)
+ * @author Borichèt
+ * @author Dragonòt
+ */
+$messages['pms'] = array(
+	'asirra-desc' => 'Mòdul Asirra për ConfirmEdit',
+	'asirra-edit' => "Për giuté a protege contra la rumenta dle modìfiche automàtiche, për piasì ch'a selession-a mach le fòto ëd gat ant ël quàder sì-sota:",
+	'asirra-addurl' => "Soa modìfica a conten dle liure esterne neuve. Për giuté a protege contra la rumenta dle modìfiche automàtiche, për piasì ch'a selession-a mach le fòto ëd gat ant ël quàder sì-sota:",
+	'asirra-badpass' => "Për giuté a protege contra la forsadura automatisà ëd le ciav, për piasì ch'a selession-a mach la fòto dël gat ant ël quàder sì-sota:",
+	'asirra-createaccount' => "Për giuté a protege contra la creassion automatisà ëd cont, për piasì ch'a selession-a mach la fòto dël gat ant ël quàder sì-sota:",
+	'asirra-createaccount-fail' => 'Për piasì identifica coretament ij gat.',
+	'asirra-create' => "Për giuté a protege contra la creassion automatisà ëd pàgine, për piasì ch'a selession-a mach le fòto ëd gat ant ël quàder sì-sota:",
+	'asirra-nojs' => "'''Për piasì, ch'a abìlita JavaScript e ch'a spedissa torna la pàgina.'''",
+	'asirra-failed' => 'Për piasì identìfica tute le figure ëd gat',
+);
+
+/** Portuguese (Português)
+ * @author Hamilton Abreu
+ */
+$messages['pt'] = array(
+	'asirra-desc' => 'Módulo Asirra para o ConfirmEdit',
+	'asirra-edit' => "Como prevenção contra sistemas automatizados de inserção de ''spam'', seleccione só as fotografias de gatos na caixa abaixo:",
+	'asirra-addurl' => "A sua edição contém links externos novos. Como prevenção contra sistemas automatizados de inserção de ''spam'', seleccione só as fotografias de gatos na caixa abaixo:",
+	'asirra-badpass' => 'Como prevenção com sistemas automatizados de descoberta de palavras-chave, seleccione só as fotografias de gatos na caixa abaixo:',
+	'asirra-createaccount' => 'Como prevenção contra sistemas automatizados de criação de contas, seleccione só as fotografias de gatos na caixa abaixo:',
+	'asirra-createaccount-fail' => 'Identifique correctamente os gatos, por favor.',
+	'asirra-create' => 'Como prevenção contra sistemas automatizados de criação de páginas, seleccione só as fotografias de gatos na caixa abaixo:',
+	'asirra-nojs' => "'''Possibilite o uso de JavaScript e reenvie a página, por favor.'''",
+);
+
+/** Simplified Chinese (‪中文(简体)‬)
+ * @author Hzy980512
+ */
+$messages['zh-hans'] = array(
+	'asirra-desc' => 'ConfirmEdit的Asirra模块',
+	'asirra-edit' => '为了防止垃圾编辑攻击，请在下面的方框中选出猫的图片：',
+	'asirra-addurl' => '您的编辑包含新的外部链接。为了帮助防止自动垃圾邮件，请在下面的方框中选出猫的图片：',
+	'asirra-badpass' => '为防止自动程序破解密码，请在下面的方框中选出猫的图片：',
+	'asirra-createaccount' => '为了防止自动程序创建帐户，请在下面的方框中选出猫的图片：',
+	'asirra-createaccount-fail' => '请正确辨认出猫的图片。',
+	'asirra-create' => '为了防止自动程序创建页面，请在下面的方框中选出猫的图片：',
+	'asirra-nojs' => "'''请启动JavaScript后再提交页面。'''",
+	'asirra-failed' => '请选出所有猫的图片',
+);
+
diff --git a/extensions/ConfirmEdit/Asirra.php b/extensions/ConfirmEdit/Asirra.php
new file mode 100644
index 00000000..21dd37a4
--- /dev/null
+++ b/extensions/ConfirmEdit/Asirra.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Asirra CAPTCHA module for the ConfirmEdit MediaWiki extension.
+ * @author Bachsau
+ * @author Niklas Laxström
+ *
+ * Makes use of the Asirra (Animal Species Image Recognition for
+ * Restricting Access) CAPTCHA service, developed by John Douceur, Jeremy
+ * Elson and Jon Howell at Microsoft Research.
+ *
+ * Asirra uses a large set of images from http://petfinder.com.
+ *
+ * For more information about Asirra, see:
+ * http://research.microsoft.com/en-us/um/redmond/projects/asirra/
+ *
+ * This MediaWiki code is released into the public domain, without any
+ * warranty. YOU CAN DO WITH IT WHATEVER YOU LIKE!
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+	exit;
+}
+
+$dir = dirname( __FILE__ ) . '/';
+require_once( "$dir/ConfirmEdit.php" );
+$dir = dirname( __FILE__ ) . '/';
+
+$wgCaptchaClass = 'Asirra';
+$wgExtensionMessagesFiles['Asirra'] = "$dir/Asirra.i18n.php";
+$wgAutoloadClasses['Asirra'] = "$dir/Asirra.class.php";
+
+$wgResourceModules['ext.confirmedit.asirra'] = array(
+	'localBasePath' => $dir,
+	'remoteExtPath' => 'ConfirmEdit',
+	'scripts' => 'ext.confirmedit.asirra.js',
+	'messages' => array(
+		'asirra-failed',
+	),
+);
+
diff --git a/extensions/ConfirmEdit/Captcha.php b/extensions/ConfirmEdit/Captcha.php
index 1d781ae8..ef039462 100644
--- a/extensions/ConfirmEdit/Captcha.php
+++ b/extensions/ConfirmEdit/Captcha.php
@@ -1,221 +1,5 @@
 <?php
 
-/**
- * Object encapsulating a captcha process.  The captcha has two elements: it must be able
- * to generate a frontend HTML representation of itself which can be presented to the user,
- * which provides inputs for users to provide their interpretation of the captcha; and it
- * must be able to retrieve that data from a subsequently-submitted request and validate
- * whether the user got the data correct.
- */
-abstract class Captcha {
-
-	/**
-	 * @var String
-	 */
-	protected $id;
-
-	/**
-	 * Information about the captcha, in array form
-	 * @var $info Array
-	 */
-	protected $info;
-
-	/**
-	 * Whether this captcha exists in the storage
-	 * @var Bool
-	 */
-	protected $exists;
-
-	/**
-	 * Generate a new empty Captcha.  This is guaranteed to return a Captcha object if it
-	 * does not throw an exception
-	 *
-	 * @return Captcha subclass
-	 */
-	public final static function factory() {
-		global $wgCaptchaClass;
-		$obj = new $wgCaptchaClass;
-		if ( $obj instanceof Captcha ) {
-			return $obj;
-		} else {
-			throw new MWException( "Invalid Captcha class $wgCaptchaClass, must extend Captcha" );
-		}
-	}
-
-	/**
-	 * Instantiate a new Captcha object for a given Id
-	 * 
-	 * @param  $id Int
-	 * @return Captcha
-	 */
-	public final static function newFromId( $id ){
-		$obj = self::factory();
-		$obj->setId( $id );
-		return $obj->exists()
-			? $obj
-			: null;
-	}
-
-	/**
-	 * Instantiate a brand new captcha, never seen before.
-	 *
-	 * @return Captcha
-	 */
-	public final static function newRandom(){
-		$obj = self::factory();
-		$obj->generateNew();
-		return $obj;
-	}
-
-	/**
-	 * Protected constructor - use only the factory methods above to instantiate captchas,
-	 * or you may end up with the wrong type of object
-	 */
-	protected function __construct(){}
-
-	/**
-	 * Get the captcha Id
-	 *
-	 * @return String
-	 */
-	public function getId(){
-		return $this->id;
-	}
-
-	/**
-	 * Set the Id internally.  Don't include wierd things like entities or characters that
-	 * need to be HTML-escaped, you'll just be creating more work and pain for yourself...
-	 *
-	 * @param  $id String
-	 */
-	protected function setId( $id ){
-		$this->id = $id;
-	}
-
-	/**
-	 * Initialise $this->info etc with information needed to make this object a new,
-	 * (ideally) never-seen-before captcha.  Implementations should not save the data in
-	 * the store in this function, as the captcha may not ever be used.
-	 *
-	 * @return Array of captcha info
-	 */
-	# FIXME: detail
-	protected abstract function generateNew();
-
-	/**
-	 * Save a generated captcha in storage somewhere where it won't be lost between
-	 * requests. A random ID is used so legit users can make edits in multiple tabs
-	 * or windows without being unnecessarily hobbled by a serial order requirement.
-	 */
-	protected function store() {
-		// Assign random index if we're not udpating
-		if ( !isset( $this->info['index'] ) ) {
-			if( !$this->getId() ){
-				$this->setId( strval( mt_rand() ) );
-			}
-			$this->info['index'] = $this->getId();
-		}
-		CaptchaStore::get()->store( $this->info['index'], $this->info );
-	}
-
-	/**
-	 * Fetch the data for this captcha from the CaptchaStore.  This requires $this->id
-	 * to be set.
-	 *
-	 * @return Array|Bool: Array of info, or false if missing
-	 */
-	protected function retrieve() {
-		if( $this->getId() === null ){
-			return null;
-		}
-		if( $this->info === null ){
-			$this->info = CaptchaStore::get()->retrieve( $this->getId() );
-			$this->exists = $this->info !== false;
-		}
-		return $this->info;
-	}
-
-	/**
-	 * Clear the information about this captcha from the CaptchaStore, so it cannot
-	 * be reused at a later date.
-	 */
-	protected function delete() {
-		if( $this->getId() !== null ){
-			CaptchaStore::get()->clear( $this->getId() );
-		}
-	}
-
-	/**
-	 * Whether this captcha exists.  $this->setId() must have been called from some context
-	 *
-	 * @return Bool
-	 */
-	public function exists(){
-		if( $this->exists === null ){
-			$this->retrieve();
-		}
-		return $this->exists;
-	}
-
-	/**
-	 * Load some data from a WebRequest.  Implementations must load all data they need
-	 * from the request in this function, they must not use the global $wgRequest, as
-	 * in the post-1.18 environment they may not necessarily be the same.
-	 *
-	 * @param $request WebRequest
-	 * @param $field HTMLCaptchaField will be passed if the captcha is part of an HTMLForm
-	 */
-	public abstract function loadFromRequest( WebRequest $request, HTMLCaptchaField $field = null );
-
-	/**
-	 * Return the data that would be needed to pass the captcha challenge through the API.
-	 * Implementations must return an array with at least the following parameters:
-	 *     'type' - a unique description of the type of challenge.  This could be
-	 *         the class name
-	 *     'mime' - the MIME type of the challenge
-	 *     'id' - the captcha Id produced by getId()
-	 * Implementations should document how the user should use the provided data to answer
-	 * the captcha.
-	 *
-	 * Implementations may return False to indicate that it is not possible to represent
-	 * the challenge via the API.  API actions protected by such a captcha will be disabled.
-	 *
-	 * @return Array|Bool
-	 */
-	public abstract function getApiParams();
-
-	/**
-	 * Return the HTML which will be placed in the 'input' table cell of an HTMLForm.
-	 * Implementations must include input fields which will perpetuate the captcha Id and
-	 * any special data, as well as providing a means for the user to answer the captcha.
-	 * Implementations should not include any help or label text, as these will be set in
-	 * the label-message and help-message attributes of the HTMLCaptchafield.
-	 * Implementations should honour the options set in the HTMLFormField such as
-	 * $field->mName and $field->mReadonly.
-	 *
-	 * @param $field HTMLCaptchaField
-	 * @return String raw HTML
-	 */
-	public abstract function getFormHTML( HTMLCaptchaField $field );
-
-	/**
-	 * Return the HTML which will be used in legacy forms which do not implement HTMLForm
-	 * Implementations must include input fields which will perpetuate the captcha Id and
-	 * any other necessary data, as well as providing a means for the user to answer the
-	 * captcha, and any relevant descriptions and instructions.
-	 *
-	 * @return String raw HTML
-	 */
-	public abstract function getFreeflowHTML();
-
-	/**
-	 * Using the parameters loaded from the web request, check the captcha, maybe delete
-	 * it if that's desirable, do any other necessary cleanup, and return Bool
-	 * @return Bool whether the captcha was successfully answered
-	 */
-	public abstract function checkCaptcha();
-}
-
 class SimpleCaptcha {
 
 	function getCaptcha() {
@@ -226,7 +10,9 @@ class SimpleCaptcha {
 		   since the api uses text/plain, not text/html */
 		$op = mt_rand( 0, 1 ) ? '+' : '−';
 
-		$test = "$a $op $b";
+		// No space before and after $op, to ensure correct
+		// directionality.
+		$test = "$a$op$b";
 		$answer = ( $op == '+' ) ? ( $a + $b ) : ( $a - $b );
 		return array( 'question' => $test, 'answer' => $answer );
 	}
@@ -303,7 +89,7 @@ class SimpleCaptcha {
 				wfDebug( "ConfirmEdit: user group allows skipping captcha on email sending\n" );
 				return true;
 			}
-			$form->addFooterText( 
+			$form->addFooterText(
 				"<div class='captcha'>" .
 				$wgOut->parse( $this->getMessage( 'sendemail' ) ) .
 				$this->getForm() .
@@ -382,8 +168,8 @@ class SimpleCaptcha {
 	 * @access private
 	 */
 	function isBadLoginTriggered() {
-		global $wgMemc, $wgCaptchaBadLoginAttempts;
-		return intval( $wgMemc->get( $this->badLoginKey() ) ) >= $wgCaptchaBadLoginAttempts;
+		global $wgMemc, $wgCaptchaTriggers, $wgCaptchaBadLoginAttempts;
+		return $wgCaptchaTriggers['badlogin'] && intval( $wgMemc->get( $this->badLoginKey() ) ) >= $wgCaptchaBadLoginAttempts;
 	}
 
 	/**
@@ -391,8 +177,12 @@ class SimpleCaptcha {
 	 */
 	function isIPWhitelisted() {
 		global $wgCaptchaWhitelistIP;
+
 		if ( $wgCaptchaWhitelistIP ) {
-			$ip = wfGetIp();
+			global $wgRequest;
+
+			$ip = $wgRequest->getIP();
+
 			foreach ( $wgCaptchaWhitelistIP as $range ) {
 				if ( IP::isInRange( $ip, $range ) ) {
 					return true;
@@ -408,7 +198,8 @@ class SimpleCaptcha {
 	 * @access private
 	 */
 	function badLoginKey() {
-		return wfMemcKey( 'captcha', 'badlogin', 'ip', wfGetIP() );
+		global $wgRequest;
+		return wfMemcKey( 'captcha', 'badlogin', 'ip', $wgRequest->getIP() );
 	}
 
 	/**
@@ -642,12 +433,15 @@ class SimpleCaptcha {
 	 * @return bool false if the CAPTCHA is rejected, true otherwise
 	 */
 	private function doConfirmEdit( $editPage, $newtext, $section, $merged = false ) {
+		global $wgRequest;
+		if ( $wgRequest->getVal( 'captchaid' ) ) {
+			$wgRequest->setVal( 'wpCaptchaId', $wgRequest->getVal( 'captchaid' ) );
+		}
+		if ( $wgRequest->getVal( 'captchaword' ) ) {
+			$wgRequest->setVal( 'wpCaptchaWord', $wgRequest->getVal( 'captchaword' ) );
+		}
 		if ( $this->shouldCheck( $editPage, $newtext, $section, $merged ) ) {
-			if ( $this->passCaptcha() ) {
-				return true;
-			} else {
-				return false;
-			}
+			return $this->passCaptcha();
 		} else {
 			wfDebug( "ConfirmEdit: no need to show captcha.\n" );
 			return true;
@@ -684,12 +478,12 @@ class SimpleCaptcha {
 		return $this->confirmEdit( $editPage, $newtext, false, true );
 	}
 
-
 	function confirmEditAPI( $editPage, $newtext, &$resultArr ) {
 		if ( !$this->doConfirmEdit( $editPage, $newtext, false, false ) ) {
 			$this->addCaptchaAPI( $resultArr );
 			return false;
 		}
+
 		return true;
 	}
 
@@ -740,7 +534,7 @@ class SimpleCaptcha {
 	}
 
 	/**
-	 * Check the captcha on Special:EmailUser 
+	 * Check the captcha on Special:EmailUser
 	 * @param $from MailAddress
 	 * @param $to MailAddress
 	 * @param $subject String
@@ -757,7 +551,7 @@ class SimpleCaptcha {
 			}
 			if ( $this->isIPWhitelisted() )
 				return true;
-		
+
 			if ( defined( 'MW_API' ) ) {
 				# API mode
 				# Asking for captchas in the API is really silly
@@ -774,6 +568,36 @@ class SimpleCaptcha {
 	}
 
 	/**
+	 * @param $module ApiBase
+	 * @param $params array
+	 * @return bool
+	 */
+	public function APIGetAllowedParams( &$module, &$params ) {
+		if ( !$module instanceof ApiEditPage ) {
+			return true;
+		}
+		$params['captchaword'] = null;
+		$params['captchaid'] = null;
+
+		return true;
+	}
+
+	/**
+	 * @param $module ApiBae
+	 * @param $desc array
+	 * @return bool
+	 */
+	public function APIGetParamDescription( &$module, &$desc ) {
+		if ( !$module instanceof ApiEditPage ) {
+			return true;
+		}
+		$desc['captchaid'] = 'CAPTCHA ID from previous request';
+		$desc['captchaword'] = 'Answer to the CAPTCHA';
+
+		return true;
+	}
+
+	/**
 	 * Given a required captcha run, test form input for correct
 	 * input on the open session.
 	 * @return bool if passed, false if failed or new session
diff --git a/extensions/ConfirmEdit/CaptchaStore.php b/extensions/ConfirmEdit/CaptchaStore.php
index 7b29e448..3ab00b38 100644
--- a/extensions/ConfirmEdit/CaptchaStore.php
+++ b/extensions/ConfirmEdit/CaptchaStore.php
@@ -40,9 +40,9 @@ abstract class CaptchaStore {
 	 * @return CaptchaStore
 	 */
 	public final static function get() {
-		if( !self::$instance instanceof self ){
+		if ( !self::$instance instanceof self ) {
 			global $wgCaptchaStorageClass;
-			if( in_array( 'CaptchaStore', class_parents( $wgCaptchaStorageClass ) ) ) {
+			if ( in_array( 'CaptchaStore', class_parents( $wgCaptchaStorageClass ) ) ) {
 				self::$instance = new $wgCaptchaStorageClass;
 			} else {
 				throw new MWException( "Invalid CaptchaStore class $wgCaptchaStorageClass" );
@@ -54,7 +54,7 @@ abstract class CaptchaStore {
 	/**
 	 * Protected constructor: no creating instances except through the factory method above
 	 */
-	protected function __construct(){}
+	protected function __construct() {}
 }
 
 class CaptchaSessionStore extends CaptchaStore {
diff --git a/extensions/ConfirmEdit/ConfirmEdit.alias.php b/extensions/ConfirmEdit/ConfirmEdit.alias.php
index debbfeaa..41649e84 100644
--- a/extensions/ConfirmEdit/ConfirmEdit.alias.php
+++ b/extensions/ConfirmEdit/ConfirmEdit.alias.php
@@ -43,6 +43,11 @@ $specialPageAliases['fi'] = array(
 	'Captcha' => array( 'Ihmiskäyttäjävarmistus' ),
 );
 
+/** Galician (Galego) */
+$specialPageAliases['gl'] = array(
+	'Captcha' => array( 'Captcha' ),
+);
+
 /** Japanese (日本語) */
 $specialPageAliases['ja'] = array(
 	'Captcha' => array( 'キャプチャ' ),
@@ -63,11 +68,16 @@ $specialPageAliases['ml'] = array(
 	'Captcha' => array( 'ക്യാപ്ച' ),
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬) */
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬) */
 $specialPageAliases['sr-ec'] = array(
 	'Captcha' => array( 'Потврдни_код' ),
 );
 
+/** Cantonese (粵語) */
+$specialPageAliases['yue'] = array(
+	'Captcha' => array( '驗證碼' ),
+);
+
 /** Simplified Chinese (‪中文(简体)‬) */
 $specialPageAliases['zh-hans'] = array(
 	'Captcha' => array( '验证码' ),
@@ -76,9 +86,4 @@ $specialPageAliases['zh-hans'] = array(
 /** Traditional Chinese (‪中文(繁體)‬) */
 $specialPageAliases['zh-hant'] = array(
 	'Captcha' => array( '驗證碼' ),
-);
-
-/**
- * For backwards compatibility with MediaWiki 1.15 and earlier.
- */
-$aliases =& $specialPageAliases;
-\ No newline at end of file
+);
+\ No newline at end of file
diff --git a/extensions/ConfirmEdit/ConfirmEdit.i18n.php b/extensions/ConfirmEdit/ConfirmEdit.i18n.php
index ada84a43..6188a46d 100644
--- a/extensions/ConfirmEdit/ConfirmEdit.i18n.php
+++ b/extensions/ConfirmEdit/ConfirmEdit.i18n.php
@@ -52,6 +52,7 @@ Hit the 'back' button in your browser to return to the page editor.",
  * @author Siebrand
  * @author The Evil IP address
  * @author Toliño
+ * @author Umherirrender
  */
 $messages['qqq'] = array(
 	'captcha-edit' => 'This message will be shown when editing if the wiki requires solving a captcha for editing.
@@ -78,12 +79,13 @@ See also
 	'captchahelp-title' => 'The page title of [[Special:Captcha/help]]',
 	'captchahelp-text' => 'This is the help text shown on [[Special:Captcha/help]].',
 	'captcha-addurl-whitelist' => "See also: [[MediaWiki:Spam-blacklist]] and [[MediaWiki:Spam-whitelist]]. Leave all the wiki markup, including the spaces, as is. You can translate the text, including 'Leave this line exactly as it is'. The first line of this messages has one (1) leading space.",
-	'right-skipcaptcha' => '{{doc-right}}',
+	'right-skipcaptcha' => '{{doc-right|skipcaptcha}}',
 );
 
 /** Afrikaans (Afrikaans)
  * @author BrokenArrow
  * @author Naudefj
+ * @author පසිඳු කාවින්ද
  */
 $messages['af'] = array(
 	'captcha-edit' => 'U wysiging bevat nuwe webskakels. Neem kennis dat blote reklame van u werf, produk of besigheid as vandalisme beskou kan word. As beskerming teen outomatiese gemorsbydraes, sal u die woorde wat onder verskyn in die prentjie moet intik: <br />([[Special:Captcha/help|Wat is hierdie?]])',
@@ -94,6 +96,8 @@ As beskerming teen outomatiese gemorsbydraes, sal u die woorde wat onder verskyn
 	'captcha-createaccount' => "As 'n beskerming teen geoutomatiseerde gemors, tik asseblief die woorde wat in die beeld verskyn in om 'n rekening te skep: <br />([[Special:Captcha/help|Wat is hierdie?]])",
 	'captcha-createaccount-fail' => 'Verkeerde of geen bevestigingkode.',
 	'captcha-create' => 'U wysiging bevat nuwe webskakels. Neem kennis dat blote reklame van u werf, produk of besigheid as vandalisme beskou kan word. As beskerming teen outomatiese gemorsbydraes, sal u die woorde wat onder verskyn in die prentjie moet intik: <br />([[Special:Captcha/help|Wat is hierdie?]])',
+	'captcha-sendemail-fail' => 'Verkeerde of ontbrekende bevestigingskode.',
+	'captcha-disabledinapi' => "Hierdie aksie vereis dat 'n captcha, so dit kan nie uitgevoer word deur die API nie.",
 	'captchahelp-title' => 'Captcha-hulp',
 	'captchahelp-cookies-needed' => 'U moet koekies in u webblaaier aanskakel hê om dit te laat werk.',
 	'captchahelp-text' => "Webwerwe wat bydraes van die publiek aanvaar (soos hierdie wiki) word soms lastig geval deur kwaaddoeners met programme wat outomaties skakels in 'n klomp werwe plaas. Alhoewel hierdie gemors verwyder kan word, is dit lastig.
@@ -152,12 +156,15 @@ $messages['am'] = array(
  */
 $messages['an'] = array(
 	'captcha-edit' => 'Ta editar ista pachina, faiga por favor a suma simpla que apareixe contino y escriba a solución en a caixa ([[Special:Captcha/help|más información]]):',
-	'captcha-desc' => 'Implementación simpla de captcha',
+	'captcha-desc' => 'Implementación de CAPTCHA ta protecher contra o spam y dovinación de contrasenyas.',
 	'captcha-addurl' => "A suya edición encluye vinclos esternos. Ta aduyar-nos en a proteción contra o spam automatizato, por favor, faiga a suma simpla que s'amuestra contino y escriba a respuesta en a caixa ([[Special:Captcha/help|más información]]):",
 	'captcha-badlogin' => 'Ta aduyar en a protección contra a obtención automatizata de parolas de paso, por favor faiga a suma simpla que amaneixe contino y escriba a respuesta en a caixa ([[Special:Captcha/help|más información]]):',
 	'captcha-createaccount' => "Ta aduyar-nos en a proteción contra a creyación automatica de cuentas, por favor faiga a suma simpla que s'amuestra contino y escriba a respuesta en a caixa ([[Special:Captcha/help|más información]]):",
 	'captcha-createaccount-fail' => 'No ha escrito o codigo de confirmación, u iste ye incorreuto.',
 	'captcha-create' => "Ta creyar a pachina, por favor faiga a suma simpla que s'amuestra contino y escriba a respuesta en a caixa ([[Special:Captcha/help|más información]]):",
+	'captcha-sendemail' => 'Ta protecher-nos contra o spam automatizau, resuelva a suma facil que se presienta contino y escriba a respuesta en o quadro de texto ([[Special:Captcha/help|mas información]]):',
+	'captcha-sendemail-fail' => 'O codigo de confirmación falta u ye incorrecto.',
+	'captcha-disabledinapi' => "Ista acción requiere un captcha, asinas que no puede estar executada a traviés d'un API.",
 	'captchahelp-title' => 'Aduya sobre o "captcha"',
 	'captchahelp-cookies-needed' => 'Ta que o sistema funcione le cal tener as cookies activatas en o navegador.',
 	'captchahelp-text' => "Os sitios web que acceptan mensaches d'o publico, como iste wiki, son a ormino obchecto d'abusos por spammers que fan servir ferramientas automatizatas ta encluyir-ie vinclos ta a-saber-los sitios. Encara que istos vinclos se pueden sacar, son un gran estorbo.
@@ -299,7 +306,7 @@ $messages['ast'] = array(
 	'captcha-sendemail' => "P'aidar a protexese escontra la puxarra automatizada, por favor resuelvi la suma cenciella d'embaxo y pon la rempuesta na caxella ([[Special:Captcha/help|más información]]):",
 	'captcha-sendemail-fail' => 'Códigu de confirmación incorreutu o ausente.',
 	'captcha-disabledinapi' => 'Esta aición requier un captcha y, poro, nun pue facese pel API',
-	'captchahelp-title' => 'Aida tocante al captcha',
+	'captchahelp-title' => 'Ayuda tocante al CAPTCHA',
 	'captchahelp-cookies-needed' => "Has tener les cookies habilitaes nel to navegador pa que'l sistema funcione.",
 	'captchahelp-text' => "Los sitios web qu'aceuten mensaxes del publicu, como esta wiki, davezu son oxetu d'abusu por spammers qu'usen programes pa incluyir los sos enllaces automáticamente.
 Mientres qu'estos enllaces de puxarra puen desaniciase, son enforma cafiantes.
@@ -307,7 +314,7 @@ Mientres qu'estos enllaces de puxarra puen desaniciase, son enforma cafiantes.
 Dacuando, especialmente al amestar nuevos enllaces web nuna páxina, la wiki pue amosate una imaxe de testu coloreáu o distorsionáu y va pidite qu'escribas les pallabres que s'amuesen.
 Yá qu'esti ye un llabor difícil d'automatizar, permitirá a les más de les persones reales unviar los sos testos, al empar que llenden los más de los spammers y otros atacantes automáticos.
 
-Por desgracia, esto pue ser un inconveniente pa los usuarios con visión llimitada o qu'usen navegadores de testu o voz. De momentu nun tenemos disponible una alternativa de soníu. Por favor, ponte'n contautu colos [[{{MediaWiki:Grouppage-sysop}}|alministradores del sitiu]] pa pidir aida si esto te torgare facer ediciones llexítimes.
+Por desgracia, esto pue ser un inconveniente pa los usuarios con visión llimitada o qu'usen navegadores de testu o voz. De momentu nun tenemos disponible una alternativa de soníu. Por favor, ponte'n contautu colos [[{{MediaWiki:Grouppage-sysop}}|alministradores del sitiu]] pa pidir ayuda si esto te torgare facer ediciones llexítimes.
 
 Calca nel botón 'atrás' del to navegador pa volver a la páxina d'edición.",
 	'captcha-addurl-whitelist' => ' #<!-- dexa esta llinia exautamente como ta --> <pre>
@@ -463,6 +470,7 @@ $messages['bg'] = array(
 	'captcha-createaccount-fail' => 'Грешен или липсващ код за потвърждение.',
 	'captcha-create' => 'За създаване на страницата е необходимо да се реши задачата и да се въведе отговорът в кутията ([[Special:Captcha/help|повече информация]]):',
 	'captcha-sendemail-fail' => 'Грешен или липсващ код за потвърждение.',
+	'captcha-disabledinapi' => 'Това действие изисква капча, следователно не може да бъде извършено през приложния програмен интерфейс.',
 	'captchahelp-title' => 'Помощ за сaptcha',
 	'captchahelp-cookies-needed' => 'За да работи това, необходимо е бисквитките на вашия браузър да са включени.',
 	'captchahelp-text' => "Уеб сайтовете, които позволяват свободно да се редактира и добавя ново съдържание (като това уики), често са обект на атаки от страна на спамъри, които използват средства за автоматизирано редактиране за публикуване на препратки към много сайтове. Въпреки че тези препратки могат да бъдат премахнати, те са особено неприятни за потребителите.
@@ -709,10 +717,11 @@ Gwasgwch botwm 'nôl' eich porwr er mwyn dychwelyd at y dudalen golygu.",
 /** Danish (Dansk)
  * @author Aputtu
  * @author Byrial
+ * @author Peter Alberti
  */
 $messages['da'] = array(
-	'captcha-edit' => 'For at redigere denne side, skal du give svaret på regnestyket nedenfor, og angive resultatet i feltet under det. ([[Special:Captcha/help|mere information]]):',
-	'captcha-desc' => 'Enkel captcha-implementering',
+	'captcha-edit' => 'For at redigere denne side, skal du give svaret på regnestykket nedenfor, og angive resultatet i feltet under det. ([[Special:Captcha/help|mere information]]):',
+	'captcha-desc' => 'Giver CAPTCHA-teknikker til at beskytte mod spam og gætning af adgangskoder',
 	'captcha-addurl' => 'Din redigering tilføjer nye eksterne henvisninger til artiklen. Som beskyttelse mod automatiseret spam, skal du give svaret på regnestyket nedenfor, og angive resultatet i feltet under det. ([[Special:Captcha/help|mere information]]):',
 	'captcha-badlogin' => 'For at beskytte mod automatiserede gæt på kodeord, skal du give svaret på regnestyket nedenfor, og angive resultatet i feltet under det. ([[Special:Captcha/help|mere information]]):',
 	'captcha-createaccount' => 'For at beskytte mod automatisk oprettelse af brugernavne, skal du give svaret på regnestyket nedenfor, og angive resultatet i feltet under det. ([[Special:Captcha/help|mere information]]):',
@@ -749,7 +758,7 @@ Tryk på 'tilbage'-knappen i din browser for at returnere til redigeringssiden."
  */
 $messages['de'] = array(
 	'captcha-edit' => 'Zur Bearbeitung der Seite löse die nachfolgende Rechenaufgabe und trage das Ergebnis in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]].',
-	'captcha-desc' => 'Stellt CAPTCHA-Techniken zum Schutz vor Spam und dem Erraten von Passwörtern bereit',
+	'captcha-desc' => 'Ermöglicht verschiedene CAPTCHA-Techniken zum Schutz vor Spam und dem Erraten von Passwörtern',
 	'captcha-addurl' => 'Deine Bearbeitung enthält neue externe Links.
 Zum Schutz vor automatisiertem Spamming löse die nachfolgende Rechenaufgabe und trage das Ergebnis in das Feld unten ein. Klicke dann erneut auf „Seite speichern“ [[Special:Captcha/help|(Fragen oder Probleme?)]].',
 	'captcha-badlogin' => 'Zum Schutz vor einer Kompromittierung deines Benutzerkontos löse die nachfolgende Rechenaufgabe und trage das Ergebnis in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]]:',
@@ -792,6 +801,7 @@ Klicken Sie dann erneut auf „Seite speichern“ [[Special:Captcha/help|(Fragen
 	'captcha-badlogin' => 'Zum Schutz vor einer Kompromittierung Ihres Benutzerkontos lösen Sie die nachfolgende Rechenaufgabe und tragen Sie das Ergebnis in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]]:',
 	'captcha-createaccount' => 'Zum Schutz vor automatisierter Anlage von Benutzerkonten lösen Sie die nachfolgende Rechenaufgabe und tragen Sie das Ergebnis in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]].',
 	'captcha-create' => 'Zur Erstellung der Seite lösen Sie die nachfolgende Rechenaufgabe und tragen Sie das Ergebnis in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]].',
+	'captcha-sendemail' => 'Um gegen automatischen Spam vorzugehen, lösen Sie bitte die einfache Rechenaufgabe und geben Sie die Antwort unten in das Feld ein ([[Special:Captcha/help|mehr Informationen]]):',
 	'captchahelp-text' => 'Internetangebote, die für Beiträge von praktisch jedem offen sind — so wie dieses Wiki — werden oft von Spammern missbraucht, die ihre Links automatisch auf vielen Webseiten platzieren. Diese Spam-Links können wieder entfernt werden, sie sind aber ein erhebliches Ärgernis.
 
 In manchen Fällen, insbesondere beim Hinzufügen von neuen Weblinks zu einer Seite, kann es vorkommen, dass dieses Wiki ein Bild mit einem farbigen und verzerrten Text anzeigt und dazu auffordert, die angezeigten Wörter einzutippen.
@@ -926,6 +936,23 @@ $messages['el'] = array(
 	'right-skipcaptcha' => 'Πραγματοποίηση ενεργειών που ενεργοποιούν captcha χωρίς να χρειάζεται πέρασμα από το captcha',
 );
 
+/** Canadian English (Canadian English)
+ * @author Techman224
+ */
+$messages['en-ca'] = array(
+	'captchahelp-text' => "Web sites that accept postings from the public, like this wiki, are often abused by spammers who use automated tools to post their links to many sites.
+While these spam links can be removed, they are a significant nuisance.
+
+Sometimes, especially when adding new web links to a page, the wiki may show you an image of coloured or distorted text and ask you to type the words shown.
+Since this is a task that's hard to automate, it will allow most real humans to make their posts while stopping most spammers and other robotic attackers.
+
+Unfortunately this may inconvenience users with limited vision or using text-based or speech-based browsers.
+At the moment we do not have an audio alternative available.
+Please contact the  [[{{MediaWiki:Grouppage-sysop}}|site administrators]] for assistance if this is unexpectedly preventing you from making legitimate posts.
+
+Hit the 'back' button in your browser to return to the page editor.",
+);
+
 /** British English (British English)
  * @author Lcawte
  */
@@ -1033,24 +1060,25 @@ $messages['et'] = array(
 	'captcha-edit' => 'Selle lehekülje muutmiseks lahenda palun lihtne tehe ja sisesta vastus kasti ([[Special:Captcha/help|lisateave]]).',
 	'captcha-desc' => 'Pakub robotilõksu abil kaitset rämpspostituste ja paroolide äraarvamise vastu.',
 	'captcha-addurl' => 'Sinu muudatus sisaldab uusi välislinke.
-Palun lahenda allpool lihtne tehe ja sisesta vastus kasti. Abinõu on kaitseks automaadistatud rämpsmuudatuste vastu ([[Special:Captcha/help|lisateave]]):',
-	'captcha-badlogin' => 'Kaitseks automaatsete parooliäraarvajate vastu, palun lahenda see lihtne tehe ja sisesta vastus kasti ([[Special:Captcha/help|täpsem teave]]):',
-	'captcha-createaccount' => 'Palun lahenda lihtne tehe ja sisesta vastus kasti. Abinõu on kaitseks kontode automaatse loomise vastu ([[Special:Captcha/help|lisateave]]):',
+Palun lahenda allpool lihtne tehe ja sisesta vastus kasti. Abinõu on kaitseks automaadistatud rämpsmuudatuste eest ([[Special:Captcha/help|lisateave]]):',
+	'captcha-badlogin' => 'Palun lahenda allpool lihtne tehe ja sisesta vastus kasti. Abinõu on kaitseks automaatsete parooliäraarvajate eest ([[Special:Captcha/help|lisateave]]):',
+	'captcha-createaccount' => 'Palun lahenda lihtne tehe ja sisesta vastus kasti. Abinõu on kaitseks kontode automaatse loomise eest ([[Special:Captcha/help|lisateave]]):',
 	'captcha-createaccount-fail' => 'Puuduv või valesti sisestatud kinnituskood.',
 	'captcha-create' => 'Lehekülje loomiseks lahenda palun lihtne tehe ja sisesta vastus kasti
-([[Special:Captcha/help|täpsem teave]]):',
+([[Special:Captcha/help|lisateave]]):',
 	'captcha-sendemail' => 'Palun lahenda allpool lihtne tehe ja sisesta vastus kasti. Abinõu on kaitseks automaadistatud rämpsmuudatuste vastu ([[Special:Captcha/help|lisateave]]):',
 	'captcha-sendemail-fail' => 'Vigane või puuduv kinnituskood.',
+	'captcha-disabledinapi' => 'Ühes selle toiminguga tuleb läbida robotilõks ja seetõttu ei saa seda API kaudu sooritada.',
 	'captchahelp-title' => 'Mis on robotilõks?',
 	'captchahelp-cookies-needed' => 'Selle toimimiseks peab veebilehitseja lubama küpsiseid.',
 	'captchahelp-text' => 'Võrgukohti, mis lubavad külastajatel sisu muuta, nagu ka see viki, kasutavad sageli rämpsposti levitajad, lisades näiteks lehekülgedele reklaamilinke. Kuigi neid linke saab eemaldada, on nad siiski tülikad.
 
-Omale kasutajakontot registreerides või mõnele lehele uusi internetiaadresse postitades näidatakse teile moonutatud tekstiga pilti ning palutakse teil sisestada seal kuvatud sõnad. Kuna selliselt pildilt on arvutil raske teksti välja lugeda, on see efektiivseks kaitseks rämpspostirobotite vastu ja lubab samas tavakasutajatel rahus muudatusi teha.
+Kasutajakontot registreerides või mõnele lehele uusi internetiaadresse postitades näidatakse moonutatud tekstiga pilti ja palutakse sisestada seal kuvatud sõnad. Kuna selliselt pildilt on arvutil raske teksti välja lugeda, on see efektiivseks kaitseks rämpspostirobotite vastu ja lubab samas tavakasutajatel rahus muudatusi teha.
 
 Kahjuks võib see tekitada ebamugavusi nägemisraskustega inimestele või neile, kes kasutavad tehiskõneseadet või tekstipõhist veebilehitsejat. Hetkel pole meil helipõhist alternatiivi.
-Kui teil tekib raskusi muudatuste tegemisel, võtke palun ühendust selle võrgukoha [[{{MediaWiki:Grouppage-sysop}}|ülematega]].
+Kui sul tekib raskusi muudatuste tegemisel, võta palun ühendust selle võrgukoha [[{{MediaWiki:Grouppage-sysop}}|administraatoritega]].
 
-Konto registreerimise lehele või lehe redigeerimisele tagasi jõudmiseks klõpsake oma veebilehitseja tagasi-nuppu.',
+Konto registreerimise lehele või redigeerimisaknasse tagasi jõudmiseks klõpsa veebilehitseja tagasi-nuppu.',
 	'captcha-addurl-whitelist' => '  #<!-- Jäta see rida muutmata kujule. --> <pre>
 # Süntaks:
 #  * Kõik alates märgist "#" kuni rea lõpuni on kommentaar
@@ -1087,6 +1115,7 @@ Zure nabigatzaileko 'atzera' lotura erabili aldaketen orrialdera itzultzeko.",
 /** Persian (فارسی)
  * @author Ebraminio
  * @author Huji
+ * @author Mjbmr
  * @author Wayiran
  */
 $messages['fa'] = array(
@@ -1097,19 +1126,19 @@ $messages['fa'] = array(
 	'captcha-createaccount' => 'برای جلوگیری از ایجاد خودکار حساب کاربری، لطفاً حاصل جمع زیر را حساب کنید و نتیجه را در جعبه وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
 	'captcha-createaccount-fail' => 'کد تأییدی وجود ندارد یا نادرست است.',
 	'captcha-create' => 'برای ایجاد صفحه لطفاً حاصل جمع زیر را حساب کنید و نتیجه را در جعبه وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
-	'captcha-sendemail' => 'برای کمک به حفاظت در برابر هرزنامه‌های خودکار، لطفاً جمع سادهٔ زیر را حل کنید و جواب را در جعبه وارد کنید ([[Special:Captcha/help|اطلاعات بیش‌تر]]):',
+	'captcha-sendemail' => 'برای کمک به حفاظت در برابر هرزنامه‌های خودکار، لطفاً جمع سادهٔ زیر را حل کنید و جواب را در جعبه وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
 	'captcha-sendemail-fail' => 'کد تأییدی وجود ندارد یا نادرست است.',
 	'captcha-disabledinapi' => 'این اقدام به کپچا نیاز دارد، بنابراین نمی‌تواند از طریق API انجام شود.',
 	'captchahelp-title' => 'راهنمای Captcha',
 	'captchahelp-cookies-needed' => 'برای کار کردن آن، شما باید کوکی‌های مرورگرتان را فعال کنید.',
-	'captchahelp-text' => 'وبگاه‌هایی مثل این ویکی که به عموم اجازهٔ نوشتن مطلب می‌دهند، غالباً مورد سوءاستفادهٔ هرزفرستندگانی می‌شوند که با ابزارهای خودکار پیوندهای بیرونی به وبگاه‌های موردنظرشان وارد می‌کنند.
+	'captchahelp-text' => 'تارنماهایی مثل این ویکی که به عموم اجازهٔ نوشتن مطلب می‌دهند، غالباً مورد سوءاستفادهٔ هرزفرستندگانی می‌شوند که با ابزارهای خودکار پیوندهای بیرونی به تارنماهای موردنظرشان وارد می‌کنند.
 اگر چه این پیوندهای هرز و تبلیغاتی را می‌توان دستی حذف کرد، ولی به هر حال باعث اعصاب‌خردی زیادی می‌شوند.
 
 گاهی اوقات، خصوصاً هنگامی که پیوندهای بیرونی جدیدی به صفحه اضافه می‌شود، ویکی ممکن است به شما تصویری رنگی و کج‌وکوله از متنی نشان بدهد و از شما بخواهد که کلمه‌های نشان‌داده‌شده را تایپ کنید.
 از آنجا که خودکارسازی این کار دشوار است، انسانهای واقعی می‌توانند پیوندهاشان را وارد کنند ولی برنامه‌های خودکار تبلیغاتی از خرابکاری باز خواهند ماند.
 
 متأسفانه این امر ممکن است باعث مزاحمت برای کاربرانی شود که چشمشان ضعیف است یا از مرورگرهای متنی یا گفتاری استفاده می‌کنند.
-در حال حاضر ما جایگزین صوتی‌ای برای این کار نداریم. لطفاً اگر برای واردساختن پیوندهای مشروع دچار مشکل شده‌اید با [[{{MediaWiki:Grouppage-sysop}}|مدیران این وبگاه]] تماس بگیرید.
+در حال حاضر ما جایگزین صوتی‌ای برای این کار نداریم. لطفاً اگر برای واردساختن پیوندهای مشروع دچار مشکل شده‌اید با [[{{MediaWiki:Grouppage-sysop}}|مدیران این تارنما]] تماس بگیرید.
 
 دکمهٔ «بازگشت» را در مرورگر خود فشار دهید تا به صفحهٔ ویرایش بازگردید.',
 	'captcha-addurl-whitelist' => ' #<!-- این سطر را همان‌گونه که هست رها کنید --> <pre>
@@ -1129,7 +1158,7 @@ $messages['fa'] = array(
  */
 $messages['fi'] = array(
 	'captcha-edit' => 'Ratkaise alla oleva summa jatkaaksesi ([[Special:Captcha/help|lisätietoja]]):',
-	'captcha-desc' => 'Yksinkertainen ihmisvarmennustoteutus.',
+	'captcha-desc' => 'Tarjoaa CAPTCHA-tekniikoita suojaamaan mainoslinkkejä ja salasana-arvailua vastaan.',
 	'captcha-addurl' => 'Muokkauksesi sisältää uusia linkkejä muille sivuille. Ratkaise alla oleva summa jatkaaksesi ([[Special:Captcha/help|lisätietoja]]):',
 	'captcha-badlogin' => 'Salasananmurtajasovellusten takia, ratkaise alla oleva summa jatkaaksesi ([[Special:Captcha/help|lisätietoja]]):',
 	'captcha-createaccount' => 'Ratkaise alla oleva summa jatkaaksesi ([[Special:Captcha/help|lisätietoja]]):',
@@ -1158,11 +1187,18 @@ Voit palata muokkaustilaan selaimen paluutoiminnolla.',
 );
 
 /** Faroese (Føroyskt)
+ * @author EileenSanda
  * @author Spacebirdy
  */
 $messages['fo'] = array(
 	'captcha-createaccount' => 'Sum ein vernd ímóti sjálvvirknum spam, er neyðugt hjá tær at skriva inn tey orð, sum koma fyri á myndini fyri at stovna eina kontu: <br />([[Special:Captcha/help|Hvat er hetta?]])',
+	'captcha-createaccount-fail' => 'Skeiv ella manglandi váttanar loyniorð.',
+	'captcha-create' => 'Fyri at upprætta síðuna, vinarliga loys tað einfalda roknistykki niðanfyri og skriva svarið í teigin ([[Special:Captcha/help|meira kunning]]):',
+	'captcha-sendemail' => 'Fyri at hjálpa okkum at sleppa undan sjálvvirkandi upprættan av brúkaranavni (spamm), so verður tú vinarliga biðin um at loysa tað einfalda roknistykki og skriva svarið í teigin ([[Special:Captcha/help|meira kunning]]):',
+	'captcha-sendemail-fail' => 'Skeiv ella manglandi váttanar loyniorð.',
+	'captcha-disabledinapi' => "Henda handling krevur ein captcha, so tað kann ikki verða framt við API'inum.",
 	'captchahelp-title' => 'Captcha hjálp',
+	'captchahelp-cookies-needed' => 'Tín kagi (brovsari) má góðtaka cookies, fyri at hetta kann virka.',
 );
 
 /** French (Français)
@@ -1189,7 +1225,7 @@ Pour nous aider dans la protection contre le pourriel automatisé, veuillez calc
 	'captcha-create' => 'Pour créer la page, veuillez calculer l’opération simple ci-dessous et en inscrire le résultat dans le champ ([[Special:Captcha/help|plus d’informations]]) :',
 	'captcha-sendemail' => 'Afin de nous aider à prévenir le spam automatique, veuillez calculer l’opération simple ci-dessous et en inscrire le résultat dans le champ ([[Special:Captcha/help|plus d’informations]]) :',
 	'captcha-sendemail-fail' => 'Code de confirmation incorrect ou manquant.',
-	'captcha-disabledinapi' => "Cette action requiert un captcha, donc elle ne peut pas être effectuée via l'API.",
+	'captcha-disabledinapi' => 'Cette action requiert un captcha, donc elle ne peut pas être effectuée via l’IPA.',
 	'captchahelp-title' => 'Aide sur le captcha',
 	'captchahelp-cookies-needed' => "Il vous faudra autoriser les témoins (''cookies'') de votre navigateur pour que cela fonctionne.",
 	'captchahelp-text' => 'Les sites web qui acceptent des contributions du public, tels que ce wiki, sont souvent victimes de spammeurs qui utilisent des outils automatisés pour placer de nombreux liens vers leurs sites.
@@ -1215,13 +1251,16 @@ Cliquez sur le bouton « Précédent » de votre navigateur pour revenir à la p
  */
 $messages['frp'] = array(
 	'captcha-edit' => 'Por changiér ceta pâge, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
-	'captcha-desc' => 'Semond des tècniques CAPTCHA por protègiér contre lo spame et la dècuvèrta des mots de pâssa per un mouél de tentatives.',
+	'captcha-desc' => 'Semond des tècniques CAPTCHA por protègiér contre lo spame et la dècuvèrta des contresegnos per un mouél de tentatives.',
 	'captcha-addurl' => 'Voutron changement encllut de lims de defôr novéls.
 Por nos édiér a combatre contre lo spame ôtomatisâ, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
-	'captcha-badlogin' => 'Por nos édiér a combatre contre lo piratâjo ôtomatisâ de mots de pâssa, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
-	'captcha-createaccount' => 'Por nos édiér a combatre contre les crèacions ôtomatisâs de comptos, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
+	'captcha-badlogin' => 'Por nos édiér a combatre contre lo cassâjo ôtomatisâ de contresegnos, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dedens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
+	'captcha-createaccount' => 'Por nos édiér a combatre contre les crèacions ôtomatisâs de comptos, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dedens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
 	'captcha-createaccount-fail' => 'Code de confirmacion fôx ou ben manquent.',
 	'captcha-create' => 'Por fâre ceta pâge, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
+	'captcha-sendemail' => 'Por nos édiér a combatre contre lo spame ôtomatisâ, volyéd calcular l’opèracion simpla ce-desot et pués nen buchiér lo rèsultat dedens la bouèta ([[Special:Captcha/help|més d’enformacions]]) :',
+	'captcha-sendemail-fail' => 'Code de confirmacion fôx ou ben manquent.',
+	'captcha-disabledinapi' => 'Ceta accion at fôta d’un captch·a, donc pôt pas étre fêta per l’API.',
 	'captchahelp-title' => 'Éde sur lo captch·a',
 	'captchahelp-cookies-needed' => "Vos fôdrat ôtorisar los tèmouens (''cookies'') de voutron navigator por que cen fonccione.",
 	'captchahelp-text' => 'Los setos vouèbe qu’accèptont des contribucions du publico, coment ceti vouiqui, sont sovent victimos de spamors qu’utilisont des outils ôtomatisâs por betar tot plen de lims de vers lors setos.
@@ -1304,19 +1343,17 @@ Para contribuír na protección contra as ferramentas de publicación automátic
 	'captcha-disabledinapi' => 'Esta acción necesita o captcha, polo que non se pode realizar a través da API.',
 	'captchahelp-title' => 'Axuda acerca do captcha',
 	'captchahelp-cookies-needed' => 'Necesita ter as cookies habilitadas no seu navegador para que funcione.',
-	'captchahelp-text' => "'''CAPTCHA''' (acrónimo de \"'''C'''ompletely '''A'''utomated '''P'''ublic '''T'''uring test to tell '''C'''omputers and '''H'''umans '''A'''part\") é unha proba de autenticación do tipo desafío-resposta usado nos contornos informáticos para distinguir usuarios humanos de máquinas.
-
-Os sitios web que aceptan publicar as contribucións dos usuarios, coma este wiki, sofren, con frecuencia, o abuso por parte de ''spammers'' que usan ferramentas que automatizan a inclusión de lixo en forma de ligazóns publicitarias, nunha chea de páxinas, en pouco tempo.
+	'captchahelp-text' => 'Os sitios web que aceptan publicar as contribucións dos usuarios, coma este wiki, sofren, con frecuencia, o abuso por parte de spammers que usan ferramentas que automatizan a inclusión de lixo en forma de ligazóns publicitarias, nunha chea de páxinas, en pouco tempo.
 Mentres as devanditas ligazóns non son eliminadas supoñen unha molestia e unha perda de tempo.
 
-En ocasións, en particular cando engada algunha nova ligazón externa, o wiki pode amosar unha imaxe dun texto coloreado e distorsionado e pedirlle que introduza as palabras amosadas.
-Como esta tarefa é difícil de automatizar, permite distinguir entre persoas e robots e dificulta os ataques automatizados dos ''spammers''.
+En ocasións, en particular cando engada algunha nova ligazón externa, o wiki pode mostrar unha imaxe dun texto coloreado e distorsionado e pedirlle que introduza as palabras que se vexa.
+Como esta tarefa é difícil de automatizar, permite distinguir entre persoas e robots e dificulta os ataques automatizados dos spammers.
 
 Por desgraza, isto é un inconveniente para aqueles usuarios con dificultades de visión ou que utilicen navegadores de texto ou navegadores baseados en sistemas de voz.
 Polo de agora non dispoñemos dunha alternativa de son.
-Por favor, contacte cun [[{{MediaWiki:Grouppage-sysop}}|administrador do sitio]] para solicitar axuda se o sistema lle impide rexistrarse para facer contribucións lexítimas.
+Por favor, póñase en contacto cun [[{{MediaWiki:Grouppage-sysop}}|administrador do sitio]] para solicitar axuda se o sistema lle impide rexistrarse para facer contribucións lexítimas.
 
-Prema no botón \"atrás\" do seu navegador para volver á páxina de edición.",
+Prema no botón "Atrás" do seu navegador para volver á páxina de edición.',
 	'captcha-addurl-whitelist' => ' #<!-- Deixe esta liña tal e como está --> <pre>
 # A sintaxe é a seguinte:
 #   * Todo o que vaia despois dun carácter "#" ata o final da liña é un comentario
@@ -1371,23 +1408,25 @@ Ins Bearbeitigsfänschter chunnt mer derno eifach wider mit em „Zruck“-Chnop
 /** Gujarati (ગુજરાતી)
  * @author Ashok modhvadia
  * @author Dsvyas
+ * @author KartikMistry
  */
 $messages['gu'] = array(
 	'captcha-edit' => 'આ લેખમાં ફેરફાર કરવા માટે નીચે આપેલા સરળ દાખલાનો જવાબ તેની બાજુના ખાનામાં લખો ([[Special:Captcha/help|more info]]):',
-	'captcha-desc' => 'સાદું કૈપ્ચા અમલીકરણ',
+	'captcha-desc' => '',
 	'captcha-addurl' => 'તમે કરેલા ફેરફારોમાં નવી બાહ્ય કડીઓ સામેલ છે. સ્વચાલિત સ્પેમ/સ્પામ(spam) થી બચવા માટે નીચે આપેલા સરળ દાખલાનો જવાબ તેની બાજુના ખાનામાં લખો
 ([[Special:Captcha/help|more info]]):',
 	'captcha-badlogin' => 'આપોઆપ થતી ગુપ્તસંજ્ઞાની ચોરી (password cracking)થી બચાવવા માટે નીચે આપેલા સરળ દાખલાનો જવાબ તેની બાજુના ખાનામાં લખો ([[Special:Captcha/help|more info]]):',
 	'captcha-createaccount' => 'આપોઆપ નવા ખાતા ખુલતા રોકવા માટે નીચે આપેલા સરળ દાખલાનો જવાબ તેની બાજુના ખાનામાં લખો',
-	'captcha-createaccount-fail' => 'ખોટી અથવા ખૂટતી પુષ્ટિ સંજ્ઞા',
+	'captcha-createaccount-fail' => 'ખોટી અથવા ખૂટતી ખાતરી સંજ્ઞા.',
 	'captcha-create' => 'નવું પાનું બનાવવા માટે નીચે આપેલા સરળ દાખલાનો જવાબ તેની બાજુના ખાનામાં લખો  ([[Special:Captcha/help|more info]]):',
+	'captcha-sendemail-fail' => 'ખોટી અથવા ખૂટતી ખાતરી સંજ્ઞા.',
 	'captchahelp-title' => 'કેપ્ટ્ચા/કેપ્ચા (Captcha) મદદ',
 	'captchahelp-cookies-needed' => 'આ વ્યવસ્થિત રીતે જોઇ શકાય તે માટે તમારા બ્રાઉઝરમાં કુકીઝ એનેબલ કરેલી હોવી જોઇશે.',
 	'captchahelp-text' => "આપણી વિકિ જેવી વૅબ સાઇટો કે જે લોકોને યોગદાન કરવાની પરવાનગી આપે છે, તેમનો સ્પામરો દ્વારા દુરૂપયોગ થતો આવ્યો છે. આવા સ્પામરો તેમની કડીઓ એક સાથે અનેક વૅબ સાઇટો પર મુકવા માટે સ્વચાલિત સાધનો વાપરે છે. આવી કડીઓ ખરેખર એક દૂષણ છે અને તેને દૂર કરવાના ઉપાય કરવા જોઇએ.
 
 ક્યારેક, ખાસ કરીને જ્યારે તમે તમારા લેખમાં બાહ્ય કડી ઉમેરતા હોવ ત્યારે, વિકિ તમને એક રંગીન કે તુટેલા-ફુટેલા અક્ષરો કે શબ્દોનું ચિત્ર બતાવે અને તેમા વંચાતા શબ્દો બાજુનાં ખાનામાં લખવા માટે પુછે એવું બને. આનું કારણ એ છે કે આ એક એવી પદ્ધતિ છે જે સ્વચાલિત રીતે કરવી લગભગ અશક્ય છે, અને ફક્ત વ્યક્તિગત રીતે જ થઇ શકે છે, જે સ્પામરો અને અન્ય ઘુસણખોરો ના હુમલાને ખાળે છે.
 
-કમભાગ્યે આ પદ્ધતિ, એવા લોકોને તકલિફ આપે તેમ છે જેઓની દૃષ્ટિ નબળી છે અથવાતો જેઓ વાચા આધારીત કે સાદા બ્રાઉઝરનો ઉપયોગ કરે છે. હાલમા અમારી પાસે આવા ચિત્રોની વાચા આધારિત વ્યવસ્થા નથી. જો આ કારણે આપ કોઇ લેખમાં પ્રદાન ન કરી શકતા હોવ તો વધુ સહાય માટે કૃપા કરી પ્રબંધકનો સંપર્ક સાધો.
+કમભાગ્યે આ પદ્ધતિ, એવા લોકોને તકલિફ આપે તેમ છે જેઓની દૃષ્ટિ નબળી છે અથવાતો જેઓ વાચા આધારીત કે સાદા બ્રાઉઝરનો ઉપયોગ કરે છે. હાલમા અમારી પાસે આવા ચિત્રોની વાચા આધારિત વ્યવસ્થા નથી. જો આ કારણે આપ કોઇ લેખમાં પ્રદાન ન કરી શકતા હોવ તો વધુ સહાય માટે કૃપા કરી [[{{MediaWiki:Grouppage-sysop}}|site administrators]] નો સંપર્ક સાધો.
 
 લેખમા ફેરફાર કરવાના પાના ઉપર પાછા ફરવા માટે આપના બ્રાઉઝરના 'બેક' બટન ઉપર ક્લિક કરો.",
 	'captcha-addurl-whitelist' => ' #<!-- આ લીટીને જેમ છે તેમ જ રહેવા દો --> <pre>
@@ -1437,6 +1476,7 @@ $messages['he'] = array(
 );
 
 /** Hindi (हिन्दी)
+ * @author Ansumang
  * @author Kaustubh
  * @author Shyam
  * @author आलोक
@@ -1449,6 +1489,7 @@ $messages['hi'] = array(
 	'captcha-createaccount' => 'अपने आप होने वाले सदस्य पंजीकरण से बचने के लिये, नीचे दिये हुए आसान राशि का जवाब दिये हुए टेक्स्टबॉक्समें लिखें ([[Special:Captcha/help|अधिक ज़ानकारी]]):',
 	'captcha-createaccount-fail' => 'गलत या खाली सहमती कोड।',
 	'captcha-create' => 'यह पन्ना बनाने के लिये, नीचे दिये हुए आसान राशि का जवाब दिये हुए टेक्स्टबॉक्समें लिखें ([[Special:Captcha/help|अधिक ज़ानकारी]]):',
+	'captcha-sendemail-fail' => 'गलत या लापता पुष्टिकरण कोड ।',
 	'captchahelp-title' => 'कॅप्टचा सहायता',
 	'captchahelp-cookies-needed' => 'यह कार्य करने के लिये आपने कूकीज (cookies) एनेबल किया होना आवश्यक हैं।',
 	'captchahelp-text' => "इस विकि जैसे जालस्थल, जो जनता जनार्दन से लेख स्वीकार करते हैं, अक्सर रद्दी काम करने वालों के फंदे में आ जाते हैं, जो स्वचालित यंत्रों से कई स्थलों पर अपनी कड़ियाँ छापने की कोशिश करते हैं।
@@ -1515,16 +1556,15 @@ Pritisnite u svom pregledniku 'nazad' kako bi se vratili na uređivač stranice.
 $messages['hsb'] = array(
 	'captcha-edit' => 'Zo by stronu wobdźěłał, rozrisaj prošu slědowacy ličenski nadawk a zapodaj wuslědk do kašćika ([[Special:Captcha/help|Dalše informacije]]):',
 	'captcha-desc' => 'Staja CAPTCHA-techniki za škit přećiwo spamej a zhódowanju hesłow k dispoziciji',
-	'captcha-addurl' => 'W twojej změnje su nowe eksterne wotkazy. Jako škitna naprawa přećiwo spamej dyrbiš slědowacy nadawk wuličeć a wuslědk do kašćika zapisować. Klikń potom znowa na „Składować”.<br />
-[[Special:Captcha/help|(Čehodla?)]]',
-	'captcha-badlogin' => 'Zo by so awtomatiskemu zadobywanju do hesłow zadźěwało, dyrbiš slědowacy nadawk wuličeć a wuslědk do kašćika zapisować. [[Special:Captcha/help|(Prašenja abo problemy?)]]',
-	'captcha-createaccount' => 'Jako škitna naprawa přećiwo awtomatiskemu wutworjenju wužiwarskich kontow dyrbiš slědowacy nadawk wuličeć. [[Special:Captcha/help|(Prašenja abo problemy?)]]',
-	'captcha-createaccount-fail' => 'Wopačny abo pobrachowacy wuslědk.',
+	'captcha-addurl' => 'W twojej změnje su nowe eksterne wotkazy. Jako škitna naprawa přećiwo awtomatizowanemu spamej dyrbiš slědowacy nadawk wuličić a wuslědk do kašćika [[Special:Captcha/help|(dalše informacije)]] zapisować.',
+	'captcha-badlogin' => 'Zo by so awtomatiskemu zadobywanju do hesłow zadźěwało, dyrbiš slědowacy nadawk wuličeć a wuslědk do kašćika zapisować. ([[Special:Captcha/help|dalše informacije]])',
+	'captcha-createaccount' => 'Jako škitna naprawa přećiwo awtomatiskemu wutworjenju wužiwarskich kontow dyrbiš slědowacy nadawk wuličeć a wuslědk do kašćika zapisować  ([[Special:Captcha/help|dalše informacije]]):',
+	'captcha-createaccount-fail' => 'Wopačny abo pobrachowacy wobkrućenski kod.',
 	'captcha-create' => 'Zo by stronu wutworił, rozrisaj prošu slědowacy ličenski nadawk a zapodaj wuslědk do kašćika ([[Special:Captcha/help|Dalše informacije]]):',
 	'captcha-sendemail' => 'Za škit přećiwo awtomatiskemu spamowanju, rozrisaj prošu jednory ličenski nadawk a zapodaj wotmołwu do kašćika ([[Special:Captcha/help|dalše informacije]]):',
 	'captcha-sendemail-fail' => 'Wopačny abo falowacy wobkrućenski kod.',
 	'captcha-disabledinapi' => 'Tuta akcija wužaduje sej captcha, tohodla njeda so přez API wuwjesć.',
-	'captchahelp-title' => 'Pomoc z captcha',
+	'captchahelp-title' => 'Pomoc za CAPTCHA',
 	'captchahelp-cookies-needed' => 'Dyrbiš placki (cookies) w swojim wobhladowaku zmóžnić.',
 	'captchahelp-text' => 'Websydła, kotrež powěsće wot kóždeho akceptuja, so často wot spamarjow znjewužiwaja, kotřiž swoje wotkazy awtomatisce na wjele sydłach rozdźěleja. Hačrunjež so tute spamwotkazy hodźa wotstronić, su wone njesnadne mjerzanje.
 
@@ -1537,10 +1577,9 @@ Prošu staj so z [[{{MediaWiki:Grouppage-sysop}}|administratorami sydła]] z pro
 
 Klikń na tłócatko "Wróćo" w swojim wobhladowaku, zo by so k editorej wróćił.',
 	'captcha-addurl-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
-# Syntaks je slědowaca:
+# Syntaksa je slědowaca:
 # * Wšo wot znamješka "#" hač do kónca linky je komentar
 # * Kóžda popisana linka je fragment regex (regularneho wuraza) kotryž so z mjenom hosta wěsteje URL přirunuje
-
  #</pre> <!-- leave this line exactly as it is -->',
 	'right-skipcaptcha' => 'Captcha přeskočić',
 );
@@ -1666,6 +1705,42 @@ Tekan tombol 'back' di penjelajah web Anda untuk kembali ke halaman penyuntingan
 	'right-skipcaptcha' => 'Melakukan tindakan pemicu captcha tanpa melalui Captcha',
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'captcha-edit' => 'Tapno maurnos daytoy a panid, pangaasim a sulbaren ti nalaka a dagup dita baba ken ikabil ti sungbat mo dita kahon ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'captcha-desc' => 'Ikkan na kadagiti CAPTCHA a pamay-ay tapno masalakniban kadagiti spam ken agpugpugto ti kontrasenias',
+	'captcha-addurl' => 'Ti inurnos mo ket adda nagyan na a panilpo iti ruar.
+Tapno  maasalakniban kadagiti automatiko a spam, pangaasim na sulbaren ti nalaka a dagup dita baba ken ikabil ti sungbat mo dita kahon ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'captcha-badlogin' => 'Tapno  makasalaknib kadagiti automatiko a pinagsulbar ti kontrasenias, pangaasim a sulbaren ti nalaka a dagup dita baba ken ikabil ti sungbat mo dita kahon ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'captcha-createaccount' => 'Tapno  masalakniban kadagiti automatiko a pinagaramid ti pakabilangan, pangaasim a sulbaren ti nalaka a dagup dita baba ken ikabil ti sungbat mo dita kahon ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'captcha-createaccount-fail' => 'Saan a husto wenno awan ti pasingkedan a kodigo.',
+	'captcha-create' => 'Tapno maramid ti panid, pangaasim a sulbaren ti nalaka a dagup dita baba ken ikabil ti sungbat mo dita kahon ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'captcha-sendemail' => 'Tapno  makasalaknib kadagiti automatiko a pinagspam, pangaasim a sulbaren ti nalaka a dagup dita baba ken ikabil ti sungbat mo dita kahon ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'captcha-sendemail-fail' => 'Saan a husto wenno awan ti pasingkedan a kodigo.',
+	'captcha-disabledinapi' => 'Daytoy nga aramid ket masapul na ti captcha, saan a mabalin a maaramid idiay API.',
+	'captchahelp-title' => 'Tulong ti CAPTCHA',
+	'captchahelp-cookies-needed' => 'Masapul nga adda galietas ti pagbasabasam tapno mabalin daytoy.',
+	'captchahelp-text' => "Dagiti sapot a pagsaadan nga agaw-awat kadagiti maipablaak iti publiko, kasla daytoy a wiki, ket kanayon nga inabuso dagiti spammers nga agus-usar ti automatiko a ramramit ti pinagipablaak da kadagiti kukua da a panilpo ti adu a pagsasaadan.
+Maikkat met dagitoy a panilpo, mgen makariri da unay.
+
+No sagpaminsan pay, nangruna no agikabil kadagiti baro a panilpo ti sapot iti panid, ti wiki ket baka agiparang ti imahen a nakoloran wenno bakkaweng a teksto ken agdamag kenka nga agmakinilya kadagiti balikas a naiparang.
+Yantangay daytoy ket obra a narigat a ma-automatiko, agpalubos kadagiti agpayso a tattao ti agipablaak  bayat nga agpasardeng ti kaaduan a spammers ken dagiti robot nga agraraut.
+
+Daksangasat a padaksan na dagiti agar-aramat a marigatan nga agkita wenno agus-usar ti naibasta ti teksto wenno naibasta ti bitla a pagbasabasa.
+Awan pay tatta ti mangeg a pagpilian a mabalin a gun-oden.
+Pangngaasi a kontaken ti [[{{MediaWiki:Grouppage-sysop}}|administrador ti pagsaadan]] para iti pannulong no daytoy ket saan a napadpadaanan a pawilan na ti agpayso a pinagbaplaak mo.
+
+Peslen ti 'agsubli' a buton dita pagbasabasam (browser) ti agsubli idiay panid ti pinagurnos.",
+	'captcha-addurl-whitelist' => ' #<!-- baybayam nga kasta daytoy nga linia --> <pre>
+# Dagiti sumaganad a gramatika:
+#   * Amin-amin a naggapu iti "#" a kabalinan inggana ti kalpasan ti linia ket komentario
+#   * Amin a saan a blanko a linia ket regex fragment a mangipada laeng ti naggapuan a nagsangailian iti uneg ti URLs
+ #</pre> <!-- baybay-am a kasta daytoy a linia -->',
+	'right-skipcaptcha' => 'Pakabaelan ti agkalbit ti CAPTCHA kadagiti aramid a saan a mapan ti CAPTCHA.',
+);
+
 /** Icelandic (Íslenska)
  * @author S.Örvarr.S
  */
@@ -1865,7 +1940,7 @@ $messages['kk-arab'] = array(
 بەت ٶڭدەۋٸنە قايتۋ بارۋ ٷشٸن «ارتقا» دەگەن تٷيمەسٸن باسىڭىز.',
 );
 
-/** Kazakh (Cyrillic) (Қазақша (Cyrillic)) */
+/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬) */
 $messages['kk-cyrl'] = array(
 	'captcha-edit' => 'Бұл бетті өңдеу үшін, төмендегі қосындылауды шешіңіз де, нәтижесін
 аумаққа енгізіңіз ([[{{ns:special}}:Captcha/help|көбірек ақпарат]]):',
@@ -1891,7 +1966,7 @@ $messages['kk-cyrl'] = array(
 Бет өңдеуіне қайту бару үшін «Артқа» деген түймесін басыңыз.',
 );
 
-/** Kazakh (Latin) (Қазақша (Latin)) */
+/** Kazakh (Latin script) (‪Qazaqşa (latın)‬) */
 $messages['kk-latn'] = array(
 	'captcha-edit' => 'Bul betti öñdew üşin, tömendegi qosındılawdı şeşiñiz de, nätïjesin
 awmaqqa engiziñiz ([[{{ns:special}}:Captcha/help|köbirek aqparat]]):',
@@ -2069,12 +2144,15 @@ Dréckt op den 'Zréck' Knäppche vun ärem Browser fir an d'Beaarbechtungsfëns
  */
 $messages['li'] = array(
 	'captcha-edit' => "Geer wil dees pazjena bewerke. Veur estebleef 't antjwaord op de óngerstäönde einvawdife som in 't inveurvenster in ([[Special:Captcha/help|mieë informatie]]):",
-	'captcha-desc' => 'Einvawdige implementatie van captcha',
+	'captcha-desc' => "Bied CAPTCHA-technieke óm besjörming te beje taenge spam en 't raoje van wachweurd.",
 	'captcha-addurl' => "Uw bewerking bevat nieuwe externe links (URL's). Voer ter bescherming tegen geautomatiseerde spam alstublieft het antwoord op de onderstaande eenvoudige som in in het invoerveld ([[Special:Captcha/help|meer informatie]]):",
 	'captcha-badlogin' => 'Los alstublieft de onderstaande eenvoudige som op en voer het antwoord in het invoervenster in ter bescherming tegen het automatisch kraken van wachtwoorden ([[Special:Captcha/help|meer informatie]]):',
 	'captcha-createaccount' => 'Voer ter bescherming tegen geautomatiseerde spam het antwoord op de onderstaande eenvoudige som in het invoervenster in ([[Special:Captcha/help|meer informatie]]):',
 	'captcha-createaccount-fail' => 'De bevestigingscode ontbreekt of is onjuist.',
 	'captcha-create' => 'U wilt een nieuwe pagina aanmaken. Voer alstublieft het antwoord op de onderstaande eenvoudige som in het invoervenster in ([[Special:Captcha/help|meer informatie]]):',
+	'captcha-sendemail' => "Veur ter besjerming taege geautomatiseerde spam 't antjwaord op de ongerstaonde einvawdige som in 't inveurvinster in ([[Special:Captcha/help|mier informatie]]):",
+	'captcha-sendemail-fail' => 'De bevestigingscode ontbrèk of is ónjuus.',
+	'captcha-disabledinapi' => "Veur dees actie is 'n captcha neudig die neet aafgehanjeldj kin waere via de API.",
 	'captchahelp-title' => 'Captcha-hölp',
 	'captchahelp-cookies-needed' => 'Ge dient in uw browser cookies ingeschakeld te hebbe om dit te laote werke.',
 	'captchahelp-text' => "Websites die vrie te bewèrke zeen, wie deze wiki, waere döks misbroek door spammers die d'r met hun programma's automatisch links op zetten naar vele websites. Hoewel deze externe links weer verwijderd kunnen worden, leveren ze wel veel hinder en administratief werk op.
@@ -2102,6 +2180,7 @@ $messages['lo'] = array(
 );
 
 /** Lithuanian (Lietuvių)
+ * @author Eitvys200
  * @author Garas
  * @author Homo
  * @author Matasg
@@ -2109,6 +2188,8 @@ $messages['lo'] = array(
 $messages['lt'] = array(
 	'captcha-edit' => 'Kad redaguotumėte šį straipsnį, apskaičiuokite šią paprastą sumą ir įveskite atsakymą į laukelį ([[Special:Captcha/help|daugiau informacijos]]):',
 	'captcha-createaccount-fail' => 'Blogas arba nerastas patvirtinimo kodas.',
+	'captchahelp-title' => 'CAPTCHA pagalba',
+	'captchahelp-cookies-needed' => 'Jums reikia būti įjungus sausainėlius savo naršyklėje kad tai veiktu',
 );
 
 /** Latvian (Latviešu)
@@ -2240,19 +2321,23 @@ $messages['mn'] = array(
 
 /** Marathi (मराठी)
  * @author Kaustubh
+ * @author Mahitgar
+ * @author V.narsikar
  */
 $messages['mr'] = array(
 	'captcha-edit' => 'हे पान संपादित करण्यासाठी, खाली दिलेले सोपे गणित सोडवून त्याचे उत्तर दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
-	'captcha-desc' => 'सोप्या कॅप्टचाचा वापर',
+	'captcha-desc' => 'उत्पात आणि परवलीच्या शब्दांच्या चोरी पासून सूरक्षीत ठेवणाऱ्या ओळखपटवा-पद्धती CAPTCHA techniques पुरवते.',
 	'captcha-addurl' => 'तुमच्या संपादनात नवीन बाह्यदुवे आहेत. आपोआप होणार्‍या स्पॅम पासून वाचण्यासाठी, खाली दिलेले सोपे गणित सोडवून त्याचे उत्तर दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 	'captcha-badlogin' => 'आपोआप होणार्‍या परवलीच्या शब्दाच्या चोरीपासून वाचण्यासाठी, खाली दिलेले सोपे गणित सोडवून त्याचे उत्तर दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 	'captcha-createaccount' => 'आपोआप होणार्‍या सदस्य नोंदणीपासून वाचण्यासाठी, खाली दिलेले सोपे गणित सोडवून त्याचे उत्तर दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 	'captcha-createaccount-fail' => 'चुकीचा अथवा रिकामा सहमती कोड',
 	'captcha-create' => 'हे पान तयार करण्यासाठी, खाली दिलेले सोपे गणित सोडवून त्याचे उत्तर दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
+	'captcha-sendemail' => 'आपोआप होणार्‍या उत्पातापासून वाचण्यासाठी, खाली दिलेले सोपे गणित सोडवून त्याचे उत्तर दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 	'captcha-sendemail-fail' => 'चुकीचा अथवा रिकामा सहमती कोड',
+	'captcha-disabledinapi' => 'या क्रियेसाठी कॅप्चा हवी.API मार्फत हे शक्य नाही.',
 	'captchahelp-title' => 'कॅप्टचा साहाय्य',
 	'captchahelp-cookies-needed' => 'हे काम करण्यासाठी तुम्ही कूकीज (cookies) एनेबल केलेल्या असणे गरजेचे आहे.',
-	'captchahelp-text' => "ज्या संकेतस्थळांवर जसे की हा विकि, सर्वसामान्य लोकांकडून संपादने करण्याची परवानगी असते, तिथे आपोआप होणारी स्वत:च्या संकेतस्थळांचे दुवे देणारी संपादने (Spam) कायम होत असतात.
+	'captchahelp-text' => "ज्या संकेतस्थळांवर जसे की हा विकि, सर्वसामान्य लोकांकडून संपादने करण्याची परवानगी असते, तिथे आपोआप होणारी स्वत:च्या संकेतस्थळांचे दुवे देणारी उत्पात संपादने (Spam) कायम होत असतात.
 अशी संपादने जरी काढता आली तरी ती एक डोकेदुखी होऊ शकते.
 
 काहीवेळा, जेव्हा एखाद्या पानावर नवीन बाह्यदुवा देताना, विकि तुम्हाला एक चित्र दाखवून त्यांतील शब्द भरण्यास सांगू शकतो.
@@ -2260,7 +2345,7 @@ $messages['mr'] = array(
 
 पण खेदाची गोष्ट अशी की ह्यामुळे अर्धांध व्यक्ती तसेच ज्या व्यक्ती फक्त मजकूर दाखविणारा न्याहाळक वापरतात, अशांना असुविधा होऊ शकते.
 सध्या आमच्याकडे आवाज ऐकण्याची सुविधा नाही.
-कृपया विकिवरील प्रबंधकांशी या बाबतीत संपर्क करावा.
+कृपया [[{{MediaWiki:Grouppage-sysop}}|संस्थळ प्रचालकांशी]]  या बाबतीत संपर्क करावा.
 
 पृष्ठ संपादनाकडे परत जाण्यासाठी आपल्या ब्राउझरची ’Back' ही कळ दाबा.",
 	'captcha-addurl-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
@@ -2322,6 +2407,40 @@ $messages['nan'] = array(
 	'captcha-createaccount-fail' => 'Khak-jīn-bé chhò-gō· iah-sī làu-kau.',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Audun
+ * @author Jon Harald Søby
+ * @author Laaknor
+ * @author Nghtwlkr
+ */
+$messages['nb'] = array(
+	'captcha-edit' => 'Skriv inn summen nedenfor i boksen for å kunne redigere denne siden ([[Special:Captcha/help|mer informasjon]]):',
+	'captcha-desc' => 'Gir tilgang til CAPTCHA-teknikker for å beskytte mot søppl og passordgjetting',
+	'captcha-addurl' => 'Din redigering inneholder nye eksterne lenker. Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk spam ([[Special:Captcha/help|mer informasjon]]):',
+	'captcha-badlogin' => 'Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk passordtyveri ([[Special:Captcha/help|mer informasjon]]):',
+	'captcha-createaccount' => 'Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk kontoopprettelse ([[Special:Captcha/help|mer informasjon]]):',
+	'captcha-createaccount-fail' => 'Ukorrekt eller manglende bekreftelseskode.',
+	'captcha-create' => 'Løs det enkle regnestykket i boksen nedenfor for å opprette siden ([[Special:Captcha/help|mer informasjon]]):',
+	'captcha-sendemail' => 'Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk spamming ([[Special:Captcha/help|mer informasjon]]):',
+	'captcha-sendemail-fail' => 'Ukorrekt eller manglende bekreftelseskode.',
+	'captcha-disabledinapi' => 'Denne handlinger krever en captcha, så den kan ikke bli gjort gjennom APIet.',
+	'captchahelp-title' => 'Hjelp med Captcha',
+	'captchahelp-cookies-needed' => 'Du må slå på informasjonskapsler for at dette skal fungere.',
+	'captchahelp-text' => "Internettsider som kan redigeres av alle, som denne wikien, blir ofte misbrukt av spammere som bruker roboter for å poste massive antall lenker. Selv om slike spamlenker kan fjernes er de til stor irritasjon.
+
+Noen ganger, særlig hvis du vil legge til nye internettlenker til en side, kan wikien vise deg et bilde av en farge eller ujevn tekst og be deg skrive inn ordene som vises. Siden det er vanskelig å automatisere denne oppgaven, vil funksjonen slippe de fleste virkelige mennesker igjennom, men stoppe spammere.
+
+Dessverre finnes det i øyeblikket ikke noe audioalternativ for brukere med begrenset syn som som bruker tekst- eller talebaserte nettlesere. Vennligst kontakt [[{{MediaWiki:Grouppage-sysop}}|administratorene]] hvis denne funksjonen forhindrer deg i å foreta legitime endringer.
+
+Trykk på 'tilbake'-knappen for å komme tilbake til redigeringssiden.",
+	'captcha-addurl-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
+# Syntaksen er som følger:
+#  * Alle linjer som begynner med «#» er kommentarer
+#  * Alle linjer som ikke er blanke er fragmenter av regulære uttrykk som sjekker verter i URL-er
+  #</pre> <!-- leave this line exactly as it is -->',
+	'right-skipcaptcha' => 'Utføre handlinger som normalt krever «captcha»-bekreftelse uten å bruke «captcha»',
+);
+
 /** Low German (Plattdüütsch)
  * @author Slomox
  */
@@ -2364,29 +2483,29 @@ Mit den „Trüch“-Knopp vun dien Browser kummst du trüch na dat Ännerfinste
  * @author Servien
  */
 $messages['nds-nl'] = array(
-	'captcha-edit' => "Um disse pagina te bewarken, mu-j eers 't antwoord op disse eenvoudige somme invullen ([[Special:Captcha/help|meer infermasie]]):",
+	'captcha-edit' => "Um disse pagina te bewarken, mö'j eers t antwoord op disse eenvoudige somme invullen ([[Special:Captcha/help|meer informasie]]):",
 	'captcha-desc' => 'Eenvoudige invoering van captcha',
 	'captcha-addurl' => 'Joew bewarking bevat nieje uutgaonde verwiezingen.
-Voer ter de bescharming tegen ongewunste reclame de somme in dee hieronder steet:<br />
+Voer ter de bescharming tegen ongewunste reklame de somme in die hieronder steet:<br />
 ([[Special:Captcha/help|Hulpe?]])',
-	'captcha-badlogin' => "Los disse eenvoudige rekensomme op en voer 't antwoord in bie 't invoervienster in ter bescharming tegen 't autematisch kraken van wachwoorden ([[Special:Captcha/help|meer infermasie]]):",
-	'captcha-createaccount' => "Voer ter bescharming tegen autematische ongewunste reclame 't antwoord op disse eenvoudige rekensomme in bie invoervienster ([[Special:Captcha/help|meer informatie]]):",
-	'captcha-createaccount-fail' => 'Verkeerde of ontbrekende bevestigingscode.',
-	'captcha-create' => "Je bin een nieje pagina an 't maken.
-Voer 't antwoord van disse eenvoudige rekensomme in bie 't invoervienster
-([[Special:Captcha/help|meer infermasie]]).",
+	'captcha-badlogin' => 'Los disse eenvoudige rekensomme op en voer t antwoord in bie t invoervienster in ter bescharming tegen t automaties kraken van wachtwoorden ([[Special:Captcha/help|meer informasie]]):',
+	'captcha-createaccount' => 'Voer ter bescharming tegen automatiese ongewunste reklame t antwoord op disse eenvoudige rekensomme in bie invoervienster ([[Special:Captcha/help|meer informatie]]):',
+	'captcha-createaccount-fail' => 'Verkeerde of ontbrekende bevestigingskode.',
+	'captcha-create' => 'Je bin n nieje pagina an t maken.
+Voer t antwoord van disse eenvoudige rekensomme in bie t invoervienster
+([[Special:Captcha/help|meer informasie]]).',
 	'captchahelp-title' => 'Lettertoetshulpe',
-	'captchahelp-cookies-needed' => 'Je mutten cookies an hemmen staon um disse functie te gebruken.',
-	'captchahelp-text' => "Websteeën waor iederene an kan biedragen, zoas disse {{SITENAME}}-wiki, wonnen vake misbruuk deurdat der ongewunste verwiezingen op ezet wonnen. Op disse wiki kunnen zokken bewarkingen makkelijk weerummezet wonnen, mar 't nimp wel tied in beslag dee aanders gebruuk kan wonnen.
+	'captchahelp-cookies-needed' => 'Je mutten scheumbestaanden (cookies) an hebben staon um disse funksie te gebruken.',
+	'captchahelp-text' => "Websteeën waor iederene an kan biedragen, zo as disse {{SITENAME}}-wiki, wörden vake misbruukt deurdat der ongewunste verwiezingen op ezet wörden. Op disse wiki kunnen zokken bewarkingen makkelik weerummezet wörden, mer t nimp wel tied in beslag die aanders gebruukt kan wörden.
 
-Soms a-j nieje verwiezingen bie een pagina derop zetten, wo-j evreugen um iets over te typen of in te vullen. Dit zörg derveur dat der gien ongewunste verwiezingen eplaos wonnen, umdat dit allinnig deur meensen edaon kan wonnen en neet deur botgebrukers.
+Soms a'j nieje verwiezingen bie n pagina derop zetten, wö'j evreugen um iets over te tikken of in te vullen. Dit zörgt derveur dat der gien ongewunste verwiezingen eplaotst wörden, umdat dit allenig deur meensen edaon kan wörden en niet deur botgebrukers.
 
-(Klik op de knoppe 'terug' in joew webkieker, um weerumme te gaon naor 't teksbewarkingscharm.)",
-	'captcha-addurl-whitelist' => ' #<!-- laot disse regel zoas e is --> <pre>
-# De syntaxis is as volg:
-#  * Alle tekse vanof \'t kerakter "#" tot \'t einde van de regels wonnen ezien as opmarking
-#  * Alle regels dee neet leeg bin, wonnen ezien as een regeliere uutdrokking dee veur delen van de domein staon.
-  #</pre> <!-- laot disse regel zoas e is -->',
+(Klik op de knoppe 'terug' in joew webkieker, um weerumme te gaon naor t tekstbewarkingscharm.)",
+	'captcha-addurl-whitelist' => ' #<!-- laot disse regel zo as t is --> <pre>
+# De syntaxis is as volgt:
+#  * Alle tekste vanaof t karakter "#" tot t einde van de regels wörden ezien as opmarking
+#  * Alle regels die niet leeg bin, wörden ezien as n reguliere uutdrokking die veur delen van de domein staon.
+  #</pre> <!-- laot disse regel zo as t is -->',
 );
 
 /** Dutch (Nederlands)
@@ -2461,40 +2580,6 @@ Trykk på «attende»-knappen for å kome tilbake til endringssida.',
 	'right-skipcaptcha' => 'Utføre handlingar som normalt krever «captcha»-stadfesting utan å bruke «captcha»',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Audun
- * @author Jon Harald Søby
- * @author Laaknor
- * @author Nghtwlkr
- */
-$messages['no'] = array(
-	'captcha-edit' => 'Skriv inn summen nedenfor i boksen for å kunne redigere denne siden ([[Special:Captcha/help|mer informasjon]]):',
-	'captcha-desc' => 'Gir tilgang til CAPTCHA-teknikker for å beskytte mot søppl og passordgjetting',
-	'captcha-addurl' => 'Din redigering inneholder nye eksterne lenker. Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk spam ([[Special:Captcha/help|mer informasjon]]):',
-	'captcha-badlogin' => 'Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk passordtyveri ([[Special:Captcha/help|mer informasjon]]):',
-	'captcha-createaccount' => 'Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk kontoopprettelse ([[Special:Captcha/help|mer informasjon]]):',
-	'captcha-createaccount-fail' => 'Ukorrekt eller manglende bekreftelseskode.',
-	'captcha-create' => 'Løs det enkle regnestykket i boksen nedenfor for å opprette siden ([[Special:Captcha/help|mer informasjon]]):',
-	'captcha-sendemail' => 'Løs det enkle regnestykket i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk spamming ([[Special:Captcha/help|mer informasjon]]):',
-	'captcha-sendemail-fail' => 'Ukorrekt eller manglende bekreftelseskode.',
-	'captcha-disabledinapi' => 'Denne handlinger krever en captcha, så den kan ikke bli gjort gjennom APIet.',
-	'captchahelp-title' => 'Hjelp med Captcha',
-	'captchahelp-cookies-needed' => 'Du må slå på informasjonskapsler for at dette skal fungere.',
-	'captchahelp-text' => "Internettsider som kan redigeres av alle, som denne wikien, blir ofte misbrukt av spammere som bruker roboter for å poste massive antall lenker. Selv om slike spamlenker kan fjernes er de til stor irritasjon.
-
-Noen ganger, særlig hvis du vil legge til nye internettlenker til en side, kan wikien vise deg et bilde av en farge eller ujevn tekst og be deg skrive inn ordene som vises. Siden det er vanskelig å automatisere denne oppgaven, vil funksjonen slippe de fleste virkelige mennesker igjennom, men stoppe spammere.
-
-Dessverre finnes det i øyeblikket ikke noe audioalternativ for brukere med begrenset syn som som bruker tekst- eller talebaserte nettlesere. Vennligst kontakt [[{{MediaWiki:Grouppage-sysop}}|administratorene]] hvis denne funksjonen forhindrer deg i å foreta legitime endringer.
-
-Trykk på 'tilbake'-knappen for å komme tilbake til redigeringssiden.",
-	'captcha-addurl-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
-# Syntaksen er som følger:
-#  * Alle linjer som begynner med «#» er kommentarer
-#  * Alle linjer som ikke er blanke er fragmenter av regulære uttrykk som sjekker verter i URL-er
-  #</pre> <!-- leave this line exactly as it is -->',
-	'right-skipcaptcha' => 'Utføre handlinger som normalt krever «captcha»-bekreftelse uten å bruke «captcha»',
-);
-
 /** Occitan (Occitan)
  * @author Cedric31
  */
@@ -2524,6 +2609,42 @@ Clicatz sul boton « Precedent » de vòstre navigador per tornar a la pagina de
 	'right-skipcaptcha' => "Acomplís lo desenclavament de las accions de captcha sens dever passar per l'intermediari aqueste darrièr",
 );
 
+/** Oriya (ଓଡ଼ିଆ)
+ * @author Psubhashish
+ */
+$messages['or'] = array(
+	'captcha-edit' => 'ଏହି ପୃଷ୍ଠାଟିକୁ ବଦଳାଇବା ନିମନ୍ତେ, ତଳେ ଥିବା ସହଜ ଅଙ୍କଟିର ସମାଧାନ କରନ୍ତୁ ଓ ଘରଟିରେ ଫଳାଫଳ ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ଜାଣନ୍ତୁ]]):',
+	'captcha-desc' => 'CAPTCHA କାରିଗରି ଉପାୟରେ ସ୍ପାମ ଓ ପାସବାର୍ଡ଼ ରକ୍ଷା କରିଥାଏ ।',
+	'captcha-addurl' => 'ଆପଣଙ୍କ ସମ୍ପାଦନାରେ ନୂଆ ବାହାର ଲିଙ୍କ ରହିଛି ।
+ଆପେଆପେ ହେଉଥିବା ସ୍ପାମର ପ୍ରତିରୋଧ କରିବା ନିମନ୍ତେ ତଳେ ଥିବା ଗଣିତର ସମାଧାନ କରନ୍ତୁ ଓ ତଳେ ଥିବା ଘରେ ଉତ୍ତର ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ବିବରଣୀ]]):',
+	'captcha-badlogin' => 'ଆପେଆପେ ହେଉଥିବା ପାସବାର୍ଡ଼ ଚୋରାଇବାକୁ ପ୍ରତିରୋଧ କରିବା ନିମନ୍ତେ ତଳେ ଥିବା ସରଳ ଗଣିତର ସମାଧାନ କରନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ସୂଚନା]]):',
+	'captcha-createaccount' => 'ଆପେଆପେ ହେଉଥିବା ଖାତା ଖୋଲିବାକୁ ପ୍ରତିରୋଧ କରିବା ନିମନ୍ତେ ତଳେ ଥିବା ସରଳ ଗଣିତର ସମାଧାନ କରି ଉତ୍ତର ଘରେ ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ସୂଚନା]]):',
+	'captcha-createaccount-fail' => 'ନିଶ୍ଚିତ କରିବା କୋଡ଼ଟି ଭୁଲ ଅଛି ବା ମୂଳରୁ ନାହିଁ ।',
+	'captcha-create' => 'ଏହି ପୃଷ୍ଠାଟିକୁ ତିଆରିବା ନିମନ୍ତେ, ତଳେ ଥିବା ସହଜ ଅଙ୍କଟିର ସମାଧାନ କରନ୍ତୁ ଓ ଘରଟିରେ ଫଳାଫଳ ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ଜାଣନ୍ତୁ]]):',
+	'captcha-sendemail' => 'ଆପେଆପେ ହେଉଥିବା ସ୍ପାମକୁ ପ୍ରତିରୋଧ କରିବା ନିମନ୍ତେ ତଳେ ଥିବା ସରଳ ଗଣିତର ସମାଧାନ କରି ତଳେ ଥିବା ଉତ୍ତର ବାକ୍ସରେ ଉତ୍ତର ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ସୂଚନା]]):',
+	'captcha-sendemail-fail' => 'ନିଶ୍ଚିତ କରିବା କୋଡ଼ଟି ଭୁଲ ଅଛି ବା ମୂଳରୁ ନାହିଁ ।',
+	'captcha-disabledinapi' => 'ଏହି କାମଟି ପାଇଁ ଏକ କ୍ୟାପଚା ଦରକାର, ଏହା API ଦେଇ କେଭେହେଁ ହୋଇପାରିବ ନାହିଁ ।',
+	'captchahelp-title' => 'CAPTCHA ସହଯୋଗ',
+	'captchahelp-cookies-needed' => 'ଏହି କାମତି କରିବା ପାଇଁ ଆପଣଙ୍କ ବ୍ରାଉଜରରେ କୁକି ସଚଳ କରିବାକୁ ପଡ଼ିବ ।',
+	'captchahelp-text' => "ଏହି ଉଇକି ପରି ଜନସାଧାରଣଙ୍କ ଠାରୁ ଲେଖା ଗ୍ରହଣ କରୁଥିବା ସାଇଟ ସବୁରେ ବହୁବାର ସ୍ପାମମାନେ ଆପେଆପେ ନିଜ ନିଜର ଉପକରଣ ମାଧ୍ୟମରେ ଅଦରକାରୀ ଲିଙ୍କମାନ ଦେଇଥାନ୍ତି ।
+ଯଦିଓ ସ୍ପାମ ଲିଙ୍କ ସବୁ ହଟାଇଦିଆଯାଇ ପାରିବ ସେସବୁ ବହୁ ଅସୁବିଧା ତିଆରି କରିଥାଏ ।
+
+ବେଳେବେଳେ, ବିଶେଷ କରି ଏକ ପୃଷ୍ଠାରେ ନୂଆ ୱେବ ଲିଙ୍କ ଦେଲାବେଳେ ଉଇକିଟି ଆପଣଙ୍କୁ ଏକ ରଙ୍ଗିନ ବା ଭଙ୍ଗାରୁଜା ଲେଖା ଦେଖାଇ ଆପଣଙ୍କୁ ତାହାକୁ ଟାଇପ କରିବାକୁ କହିଥାଏ ।
+ଯେହେତୁ ଏହି କାମକୁ ମଣିଷ ବିନା ଆପେଆପେ କରିବା ସମ୍ଭବପର ନୁହେଁ, ଏହି ବାସ୍ତବ ମଣିଷମାନଙ୍କୁ ଲେଖିବାରେ ସହଯୋଗ କରିଥାଏ ଓ ସ୍ପାମର ଓ ବାକି ରୋବଟ ଆକ୍ରମଣକୁ ପ୍ରତିହତ କରିପାରେ ।
+
+ଅପରାପକ୍ଷେ ଏହା ସୀମିତ ଦୃଷ୍ଟିଥିବା ବା ଲେଖା କିମ୍ବା କଥା କୁହ ବ୍ରାଉଜର ବ୍ୟବହାର କରୁଥିବା ସଭ୍ୟମାନଙ୍କୁ ଅସୁବିଧାରେ ପକାଇଥାଏ ।
+ଅଧୁନା ଏଠାରେ ଧ୍ୱନିଚଳିତ ବିକଳ୍ପଟିଏ ଦେଇନାହୁଁ ।
+ଆପଣଙ୍କୁ ଉପଯୁକ୍ତ ଲେଖା ଦେବାରେ ସହଯୋଗ କରିବା ନିମନ୍ତେ ଦୟାକରି [[{{MediaWiki:Grouppage-sysop}}|ସାଇଟ ପରିଛା]]ମାନଙ୍କୁ ଯୋହଗାଯୋଗ କରନ୍ତୁ ।
+
+ଆପଣଙ୍କ ବ୍ରାଉଜରରେ ଥିବା  'back' ଚିପି ପୃଷ୍ଠା ସମ୍ପାଦକକୁ ଲେଉଟିଯାନ୍ତୁ ।",
+	'captcha-addurl-whitelist' => ' #<!—ଏହି ଧାଡ଼ିଟି ଯେମିତି ଅଛି ସେମିତି ଛାଡ଼ି ଦିଅନ୍ତୁ --> <pre>
+# ତଳେ ସିଣ୍ଟାକ୍ସଟି ଦିଆଗଲା:
+#   * ଧାଡ଼ିର ଶେଷରେ "#" ଚିହ୍ନ ଦିଆଥିବା ସବୁକିଛି ଏକ ମତାମତ
+#   * ପ୍ରତିଟି ଅଣ-ଖାଲି ଧାଡ଼ି ଏକ regex ଖଣ୍ଡ ଯାହା କେବଳ URL ବାହାରେ ଥିବା ହୋଷ୍ଟ ମାନଙ୍କ ସଙ୍ଗେ ମେଲ ଖାଇଥାଏ
+ #</pre> <!-- ଏହି ଧାଡ଼ିଟି ଯେମିତି ଅଛି ସେମିତି ଛାଡ଼ି ଦିଅନ୍ତୁ -->',
+	'right-skipcaptcha' => 'CAPTCHA ଭିତରେ ନଯାଇ CAPTCHA ଦେଇ ସଞ୍ଚାଳିତ କାମ କରିବେ',
+);
+
 /** Pampanga (Kapampangan) */
 $messages['pam'] = array(
 	'captcha-createaccount' => 'Bang ala na kabud laltong account, pakipakibatan me ing papacuenta ra king lalam at ibili me ing pakibat ketang cahun ([[Special:Captcha/help|more info]]):',
@@ -2619,11 +2740,45 @@ Ch'a-i bata ansima al boton 'andré' ant sò navigator për torné andré a l'ed
 	'right-skipcaptcha' => "A fà j'assion che a ativo la captcha sensa avèj da passé da la captcha",
 );
 
+/** Western Punjabi (پنجابی)
+ * @author Khalid Mahmood
+ */
+$messages['pnb'] = array(
+	'captcha-edit' => 'اس صفحے نوں تبدیل کرن واسطے، مہربانی کر کے اے سادہ جۓ سوال نوں حل کر کے ڈبے چ جواب لکھ دیو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'captcha-desc' => 'کیپچا ول سپام تے کنجی اندازے توں بچن لئی دیندا اے۔',
+	'captcha-addurl' => 'تواڈی تبدیلی چ نویں بارلے جوڑ نیں۔
+اس صفحے نوں تبدیل کرن واسطے، مہربانی کر کے اے سادہ جۓ سوال نوں حل کر کے ڈبے چ جواب لکھ دیو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'captcha-badlogin' => 'اپنے آپ کنجی توڑن دے خلاف مدد واسطے، مہربانی کر کے اے سادہ جۓ سوال نوں حل کر کے ڈبے چ جواب لکھ دیو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'captcha-createaccount' => 'اپنے آپ غلط نویں کھاتے بنان نوں روکن واسطے، مہربانی کر کے اے سادہ جۓ سوال نوں حل کر کے ڈبے چ جواب لکھ دیو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'captcha-createaccount-fail' => 'غلط کنفرمیشن کوڈ۔',
+	'captcha-create' => 'اس صفحے نوں بنان واسطے، مہربانی کر کے اے سادہ جۓ سوال نوں حل کر کے ڈبے چ جواب لکھ دیو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'captcha-sendemail' => 'اپنے آپ غلط مال آن نوں روکن واسطے، مہربانی کر کے اے سادہ جۓ سوال نوں حل کر کے ڈبے چ جواب لکھ دیو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'captcha-sendemail-fail' => 'غلط یا  چھوٹے کنفرمیشن کوڈ',
+	'captcha-disabledinapi' => 'ایس کم لئی کیپچا چائیدا اے، ایس لئی ایہ اے پی آئی نال نئیں چل سکدا۔',
+	'captchahelp-title' => 'کیپچا مدد',
+	'captchahelp-cookies-needed' => 'توانوں اپنے براؤزر چ ککیاں چلانیاں پین گیاں ایس نوں چلان لئی۔',
+	'captchahelp-text' => 'ویب سائیٹاں  جیہڑیاں لوکاں کولوں ڈاک لیندیاں نیں  جیویں ایہ وکی، ایناں تے خراب ڈاک پیجن والے ہلے بولدے ریندے نیں تے کئی سائیٹاں دے جوڑ جوڑدے ریندے نیں۔ ایہ سپام جوڑ ہٹاۓ جاسکدے نیں پر ایہ اک رپھڑ تے ہے نیں۔
+
+کدے کدے، خاص طور تے کسے صفے نال نویں ویب جوڑ جوڑدیاں ہویاں، وکی توانوں اک رنگ والی یا خراب لکھت دسدا اے  تے توانوں پچھدا اے جے ٹائپ ہویا بول لکھو۔
+اے کم ایسا اے جیہڑا چلانا اوکھا اے، اے چوکھے سارے لوکاں نوں اپنی ڈاک پیجن دیوے گا تے سپامراں نوں روک دیوے گا،
+
+بدقسمستی نال اے تھوڑی سوچ رکھن والے ورتنوالیاں  یا لکھت ورتن والے یا گل بات والے براؤزر نوں چنگا ناں لگے۔
+ایس ویلے ساڈے کول ایدے تھاں تے ورتیا جان والا آڈیو نئیں۔ مہربانی کرکے  [[{{MediaWiki:Grouppage-sysop}}|site administrators]] نال ملو مدد لئی اگ ایہ اچانک تواڈی ٹھیک ڈاک نوں روکدا اے۔
+بیک بٹن نوں دباؤ اپنے براؤزر چ صفہ لکھاری تک اپڑن لئی۔',
+	'captcha-addurl-whitelist' => ' #<!-- leave this line exactly as it is --> <pre>
+# Syntax is as follows:
+#   * Everything from a "#" character to the end of the line is a comment
+#   * Every non-blank line is a regex fragment which will only match hosts inside URLs
+ #</pre> <!-- leave this line exactly as it is -->',
+	'right-skipcaptcha' => 'کیپچا ٹورن والے کم کیپچا چوں گۓ بنا کرو۔',
+);
+
 /** Pashto (پښتو)
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
 $messages['ps'] = array(
 	'captcha-create' => 'ددې لپاره چې نوی ليکنه ترسره کړی، لطفاً د همدغه ساده شمېرو ځواب په ورکړ شوي چوکاټ کې وليکی ([[Special:Captcha/help|نور مالومات]]):',
+	'captchahelp-title' => 'CAPTCHA لارښود',
 	'captchahelp-cookies-needed' => 'ددې کړنې د ترسره کېدلو لپاره تاسو ته پکار ده چې د خپل کتنمل (browser) کوکيز (cookies) چارن کړی.',
 );
 
@@ -2725,17 +2880,25 @@ $messages['ro'] = array(
 	'captcha-createaccount' => 'Pentru a evita crearea automată de conturi, vă rugăm să rezolvați adunarea de mai jos și introduceți rezultatul în căsuță ([[Special:Captcha/help|detalii]]):',
 	'captcha-createaccount-fail' => 'Cod de confirmare incorect sau lipsă.',
 	'captcha-create' => 'Editarea include legături externe noi. Pentru a evita spam-ul automat, vă rugăm să rezolvați adunarea de mai jos și introduceți rezultatul în căsuță ([[Special:Captcha/help|detalii]]):',
+	'captcha-sendemail' => 'Pentru a împiedica roboții de spam, vă rugăm să rezolvați operația simplă de mai jos și să introduceți răspunsul în căsuță ([[Special:Captcha/help|mai multe detalii]]):',
 	'captcha-sendemail-fail' => 'Codul de confirmare lipsește sau este incorect.',
+	'captcha-disabledinapi' => 'Această acțiune necesită rezolvarea unui captcha, deci nu poate fi efectuată prin API.',
 	'captchahelp-title' => 'Despre „Captcha”',
 	'captchahelp-cookies-needed' => 'Trebuie ca browserul dumneavoastră să accepte cookie-uri pentru ca aceasta să funcționeze.',
-	'captchahelp-text' => "Siturile Web care acceptă postări din partea publicului, precum acest wiki, sunt de obicei abuzate de persoane care folosesc unelte automate pentru a introduce legături către multe situri. Deși aceste legături de spam pot fi scoase, acest lucru reprezintă o muncă inconvenientă.
+	'captchahelp-text' => 'Siturile web care acceptă postări din partea publicului, precum acest wiki, sunt de obicei abuzate de persoane care folosesc unelte automate pentru a introduce legături către multe alte situri. Deși aceste legături de spam pot fi îndepărtate, acest lucru reprezintă o muncă inconvenientă.
 
 Uneori, mai ales la adăugarea de legături web noi într-o pagină, situl wiki vă poate arăta o imagine cu un text colorat sau distorsionat și veți fi rugat să introduceți cuvintele indicate. Deoarece aceasta este o sarcină greu de automatizat, ea permite majorității persoanelor reale să posteze și va opri majoritatea atacatorilor.
 
 Din nefericire, această metodă îi poate deranja pe utilizatorii cu probleme vizuale sau care folosesc browsere bazate pe text sau sunet. În acest moment nu avem o alternativă audio disponibilă.
 Vă rugăm, contactați [[{{MediaWiki:Grouppage-sysop}}|administratorii sitului]] pentru asistență dacă metoda vă oprește de la a face postări legitime.
 
-Apasă butonul 'Înapoi' al browserului pentru a te reîntoarce la pagina de editare.",
+Apasă butonul „Înapoi” al browserului pentru a te reîntoarce la pagina de editare.',
+	'captcha-addurl-whitelist' => ' #<!-- lăsați această linie așa cum este --> <pre>
+# Sintaxa este așa cum urmează:
+#   * Toate liniile care încep cu „#” sunt considerate comentarii
+#   * Toate liniile care nu sunt goale sunt fragmente RegEx care vor găsi doar gazda din interiorul URL-urilor
+ #</pre> <!-- lăsați această linie așa cum este -->',
+	'right-skipcaptcha' => 'Efectuează acțiuni care necesită completarea unui cod CAPTCHA fără a fi nevoie să facă acest lucru',
 );
 
 /** Tarandíne (Tarandíne)
@@ -2807,7 +2970,7 @@ $messages['ru'] = array(
  */
 $messages['rue'] = array(
 	'captcha-edit' => 'Жебысьте могли едітовати тоту сторінку, мусите вырїшыти наступну просту суму і написати резултат. ([[Special:Captcha/help|Што тото значіть?]])',
-	'captcha-desc' => 'Проста імплементація овірёвачого коду (captcha)',
+	'captcha-desc' => 'Забезпечує техніку CAPTCHA про охрану перед спамом і гаданём гесел',
 	'captcha-addurl' => 'Ваше едітованя обсягує новы одказы формов URL; про охорону перед автоматічным спамом мусите вырїшыти наступну просту суму і написати резултат. ([[Special:Captcha/help|Што тото значіть?]])',
 	'captcha-badlogin' => 'В рамках охороны перед автоматічныма пробами угаднути гесло мусите вырїшыти наступну просту суму і написати резултат. ([[Special:Captcha/help|Што тото значіть?]]):',
 	'captcha-createaccount' => 'В рамках охороны перед автоматічныма створёванями конт мусите про выконаня реґістрації вырїшыти наступну просту суму і написати резултат. ([[Special:Captcha/help|Што тото значіть?]]):',
@@ -2833,7 +2996,7 @@ $messages['rue'] = array(
 	'right-skipcaptcha' => 'Выконованя дїй споєных з CAPTCHA без потребы їх рїшіня',
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -3048,35 +3211,38 @@ Shtypni butonin "prapa" ("back") të shfletuesit tuaj për tu kthyer tek faqja e
 	'right-skipcaptcha' => 'Kryen veprime CAPTCHA-triggering pa pasur nevojë të shkojë nëpërmjet CAPTCHA',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Millosh
  * @author Rancher
  */
 $messages['sr-ec'] = array(
 	'captcha-edit' => 'За измену ове стране, реши једноставан збри испод и унеси одговор у кутију ([[Special:Captcha/help|детаљније]]):',
 	'captcha-desc' => 'Пружа заштиту против непожељних порука у виду потврдног кода',
-	'captcha-addurl' => 'Твоја измена укључује нове спољашње везе. У циљу заштите против аутоматског спама, реши једноставан збир испод и упиши одговор у кутију ([[Special:Captcha/help|детаљније]]):',
-	'captcha-badlogin' => 'У циљу заштите од аутоматске провале у лозинку, реши једноставан збир испод и унеси одговор у кутију ([[Special:Captcha/help|детаљније]]):',
-	'captcha-createaccount' => 'У циљу заштите од аутоматског стварања налога, реши једноставан збир доле и унеси га у кутију ([[Special:Captcha/help|детаљније]]):',
+	'captcha-addurl' => 'Ваша измена садржи нове спољашње везе.
+У циљу заштите од непожељних порука, решите просту рачуницу испод и унесите одговор у поље ([[Special:Captcha/help|више информација]]):',
+	'captcha-badlogin' => 'У циљу заштите од пробијања лозинки, решите просту рачуницу испод и унесите одговор у поље ([[Special:Captcha/help|више информација]]):',
+	'captcha-createaccount' => 'У циљу заштите од самоотварања налога, решите просту рачуницу испод и унесите одговор у поље ([[Special:Captcha/help|више информација]]):',
 	'captcha-createaccount-fail' => 'Неправилан или непостојећи код за потврду.',
-	'captcha-create' => 'За стварање стране реши једноставан збир доле и унеси га у кутију ([[Special:Captcha/help|детаљније]]):',
+	'captcha-create' => 'Да бисте направили страницу, решите просту рачуницу испод и унесите одговор у поље ([[Special:Captcha/help|више информација]]):',
+	'captcha-sendemail' => 'У циљу заштите од слања непожељних порука, решите просту рачуницу испод и унесите одговор у поље ([[Special:Captcha/help|више информација]]):',
 	'captcha-sendemail-fail' => 'Неправилан или непостојећи код за потврду.',
 	'captchahelp-title' => 'Помоћ око потврдног кôда',
 	'captchahelp-cookies-needed' => 'Потребно је да омогућите колачиће да би ово радило.',
 	'right-skipcaptcha' => 'прескакање радњи које захтевају унос потврдног кода',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Michaello
  */
 $messages['sr-el'] = array(
 	'captcha-edit' => 'Za izmenu ove strane, reši jednostavan zbri ispod i unesi odgovor u kutiju ([[Special:Captcha/help|detaljnije]]):',
-	'captcha-desc' => 'jednostavna kapča implementacija',
+	'captcha-desc' => 'Pruža zaštitu protiv nepoželjnih poruka u vidu potvrdnog koda',
 	'captcha-addurl' => 'Tvoja izmena uključuje nove spoljašnje veze. U cilju zaštite protiv automatskog spama, reši jednostavan zbir ispod i upiši odgovor u kutiju ([[Special:Captcha/help|detaljnije]]):',
 	'captcha-badlogin' => 'U cilju zaštite od automatske provale u lozinku, reši jednostavan zbir ispod i unesi odgovor u kutiju ([[Special:Captcha/help|detaljnije]]):',
 	'captcha-createaccount' => 'U cilju zaštite od automatskog stvaranja naloga, reši jednostavan zbir dole i unesi ga u kutiju ([[Special:Captcha/help|detaljnije]]):',
 	'captcha-createaccount-fail' => 'Nepravilan ili nepostojeći kod za potvrdu.',
 	'captcha-create' => 'Za stvaranje strane reši jednostavan zbir dole i unesi ga u kutiju ([[Special:Captcha/help|detaljnije]]):',
+	'captcha-sendemail-fail' => 'Nepravilan ili nepostojeći kod za potvrdu.',
 	'captchahelp-title' => 'pomoć za kapču',
 	'captchahelp-cookies-needed' => 'Da bi ovo uradio, neophodno je da su ti kolačići omogućeni u brauzeru.',
 	'right-skipcaptcha' => 'Izvedi akcije kapče bez potrebe da se prođe kroz kapču.',
@@ -3089,12 +3255,12 @@ $messages['stq'] = array(
 	'captcha-edit' => 'Tou Beoarbaidenge fon ju Siede löös ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]]:',
 	'captcha-desc' => 'Eenfache Captcha-Implementierenge',
 	'captcha-addurl' => 'Dien Beoarbaidenge änthaalt näie externe Ferbiendengen.
-Toun Schuts foar automatisierde Spammenge löös ju ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien.
+Toun Skuts foar automatisierde Spammenge löös ju ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien.
 Klik dan fonnäien ap „Siede spiekerje“ [[Special:Captcha/help|(Froagen of Probleme?)]].',
-	'captcha-badlogin' => 'Toun Schuts foar ne Kompromittierenge fon dien Benutserkonto löös ju ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
-	'captcha-createaccount' => 'Toun Schuts foar automatisierden Anloage fon Benutserkonten löös ju ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
+	'captcha-badlogin' => 'Toun Skuts foar ne Kompromittierenge fon dien Benutserkonto löös ju ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
+	'captcha-createaccount' => 'Toun Skuts foar automatisierden Anloage fon Benutserkonten löös ju ätterfoulgjende Reekenapgoawe un dräch dät Resultoat in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
 	'captcha-createaccount-fail' => 'Falske of failjende Bestäätigengscode.',
-	'captcha-create' => 'Uum disse Siede tou moakjen, löös juu ätterfoulgjende Reekenapgoawe ap un dräch dät Resultoat in dät Fäild hier unner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
+	'captcha-create' => 'Uum disse Siede tou moakjen, löös ju ätterfoulgjende Reekenapgoawe ap un dräch dät Resultoat in dät Fäild hier unner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
 	'captchahelp-title' => 'Captcha-Hälpe',
 	'captchahelp-cookies-needed' => "'''Wichtige Waiwiesenge:''' Der mouten Cookies in dän Browser ferlööwed weese.",
 	'captchahelp-text' => "Internetsteeden, do der foar Biedraage fon praktisk älkuneen eepen sunt - so as dät {{SITENAME}}-Wiki — wäide oafte fon Spammere misbruukt, do hiere Ferbiendengen automatisk ap fuul Websieden platzierje. Disse Spam-Ferbiendengen konnen wier wächhoald wäide, man jo sunt n groot Ferträit.
@@ -3184,6 +3350,13 @@ Tryck på bakåtknappen i din webbläsare för att gå tillbaks till sidredigeri
 	'right-skipcaptcha' => 'Utföra handlingar som normalt kräver "captcha"-bekräftning utan att använda "captcha"',
 );
 
+/** Tamil (தமிழ்)
+ * @author Shanmugamp7
+ */
+$messages['ta'] = array(
+	'captchahelp-title' => 'CAPTCHA உதவி',
+);
+
 /** Telugu (తెలుగు)
  * @author Chaduvari
  * @author Kiranmayee
@@ -3216,7 +3389,7 @@ $messages['te'] = array(
 	'right-skipcaptcha' => 'ఆమకవేప ద్వారా పోకుండానే దాని ట్రిగ్గరు చర్యలను అమలు చెయ్యి',
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (Тоҷикӣ)
  * @author Ibrahim
  */
 $messages['tg-cyrl'] = array(
@@ -3243,7 +3416,7 @@ $messages['tg-cyrl'] = array(
   #</pre> <!-- ин сатрро ҳамон гуна, ки ҳаст раҳо кунед-->',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -3527,9 +3700,12 @@ Clitchîz sol boton «En erî» di vosse betchteu waibe po rivni al pådje di dv
  * @author פוילישער
  */
 $messages['yi'] = array(
+	'captcha-addurl' => 'אײַער רעדאַקטירונג אַנטהאַלט נײַע דרויסנדיקע לינקען.
+כדי צו העלפֿן שיצן קעגן אויטאמזירטן ספאַם, זײַט אַזוי גוט און לייזט דאָס פשוטע רעטעניש אונטן און קלאַפט אײַן דעם ענטפֿער אינעם קעסטל ([[Special:Captcha/help|נאך אינפֿארמאַציע]]):',
 	'captcha-badlogin' => 'כדי צו העלפֿן קעגן אויטאמאַטישער ברעכן פאַסווערטער, אנא פתרו את תרגיל החיבור הפשוט שלהלן והקלידו את התשובה בתיבה ([[Special:Captcha/help|מידע נוסף]]):',
 	'captcha-createaccount' => 'כדי צו העלפֿן קעגן אויטאמאַטישע שאַפֿן קאנטעס, אנא פתרו את תרגיל החיבור הפשוט שלהלן והקלידו את התשובה בתיבה ([[Special:Captcha/help|מידע נוסף]]):',
 	'captcha-createaccount-fail' => 'גרײַזיקער אָדער פֿעלנדיקער באַשטעטיק־קאָד',
+	'captchahelp-title' => 'CAPTCHA הילף',
 );
 
 /** Yoruba (Yorùbá)
@@ -3568,6 +3744,7 @@ $messages['yue'] = array(
 
 /** Simplified Chinese (‪中文(简体)‬)
  * @author Bencmq
+ * @author Hzy980512
  * @author Liangent
  * @author PhiLiP
  */
@@ -3581,8 +3758,8 @@ $messages['zh-hans'] = array(
 	'captcha-create' => '要创建页面，请答出一个简单的加法，然後在框内输入 （[[Special:Captcha/help|更多资料]]）:',
 	'captcha-sendemail' => '为了防止程式进行破坏，请答出一个简单的计算，然后在框内输入 （[[Special:Captcha/help|更多资料]]）:',
 	'captcha-sendemail-fail' => '验证码错误或丢失。',
-	'captcha-disabledinapi' => '这个要求需要经过Captcha验证，故无法透过API使用。',
-	'captchahelp-title' => 'Captcha 说明',
+	'captcha-disabledinapi' => '这个要求需要经过验证码验证，故无法透过API使用。',
+	'captchahelp-title' => '验证码说明',
 	'captchahelp-cookies-needed' => '您需要开启浏览器上的cookies方可使用这个工具。',
 	'captchahelp-text' => '像本站一样，对公众开放编辑的网站经常被垃圾连结骚扰。那些人使用自动化垃圾程序将他们的连结张贴到很多网站。虽然这些连结可以被清除，但是这些东西确实令人十分讨厌。
 
@@ -3596,7 +3773,7 @@ $messages['zh-hans'] = array(
 #   * 所有在 "#" 字符后的内容全部是注释
 #   * 所有非空白行是一个正则表达式，只会对URL中的内容进行匹配
  #</pre> <!-- leave this line exactly as it is -->',
-	'right-skipcaptcha' => '执行captcha引发的动作时不需要经过captcha',
+	'right-skipcaptcha' => '绕过验证码的验证',
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
diff --git a/extensions/ConfirmEdit/ConfirmEdit.php b/extensions/ConfirmEdit/ConfirmEdit.php
index 0255a3ab..79bbd59f 100644
--- a/extensions/ConfirmEdit/ConfirmEdit.php
+++ b/extensions/ConfirmEdit/ConfirmEdit.php
@@ -34,15 +34,13 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
-global $wgExtensionFunctions, $wgGroupPermissions;
-
 $wgExtensionFunctions[] = 'confirmEditSetup';
 $wgExtensionCredits['other'][] = array(
 	'path' => __FILE__,
 	'name' => 'ConfirmEdit',
 	'author' => array( 'Brion Vibber', '...' ),
-	'url' => 'http://www.mediawiki.org/wiki/Extension:ConfirmEdit',
-	'version' => '1.0',
+	'url' => 'https://www.mediawiki.org/wiki/Extension:ConfirmEdit',
+	'version' => '1.1',
 	'descriptionmsg' => 'captcha-desc',
 );
 
@@ -71,7 +69,6 @@ $wgAvailableRights[] = 'skipcaptcha';
  */
 $wgCaptchaWhitelistIP = false;
 
-global $wgCaptcha, $wgCaptchaClass, $wgCaptchaTriggers;
 $wgCaptcha = null;
 $wgCaptchaClass = 'SimpleCaptcha';
 
@@ -91,7 +88,7 @@ $wgCaptchaClass = 'SimpleCaptcha';
  */
 $wgCaptchaTriggers = array();
 $wgCaptchaTriggers['edit']          = false; // Would check on every edit
-$wgCaptchaTriggers['create']		= false; // Check on page creation.
+$wgCaptchaTriggers['create']        = false; // Check on page creation.
 $wgCaptchaTriggers['sendemail']     = false; // Special:Emailuser
 $wgCaptchaTriggers['addurl']        = true;  // Check on edits that add URLs
 $wgCaptchaTriggers['createaccount'] = true;  // Special:Userlogin&type=signup
@@ -121,7 +118,6 @@ $wgCaptchaTriggersOnNamespace = array();
  * 'CaptchaCacheStore' uses $wgMemc, which avoids the cookie dependency
  * but may be fragile depending on cache configuration.
  */
-global $wgCaptchaStorageClass;
 $wgCaptchaStorageClass = 'CaptchaSessionStore';
 
 /**
@@ -130,7 +126,6 @@ $wgCaptchaStorageClass = 'CaptchaSessionStore';
  *
  * Default is a half hour.
  */
-global $wgCaptchaSessionExpiration;
 $wgCaptchaSessionExpiration = 30 * 60;
 
 /**
@@ -142,21 +137,18 @@ $wgCaptchaSessionExpiration = 30 * 60;
  *
  * Default is five minutes.
  */
-global $wgCaptchaBadLoginExpiration;
 $wgCaptchaBadLoginExpiration = 5 * 60;
 
 /**
  * Allow users who have confirmed their e-mail addresses to post
  * URL links without being harassed by the captcha.
  */
-global $ceAllowConfirmedEmail;
 $ceAllowConfirmedEmail = false;
 
 /**
  * Number of bad login attempts before triggering the captcha.  0 means the
  * captcha is presented on the first login.
  */
-global $wgCaptchaBadLoginAttempts;
 $wgCaptchaBadLoginAttempts = 3;
 
 /**
@@ -183,13 +175,9 @@ $wgSpecialPages['Captcha'] = 'CaptchaSpecialPage';
 
 $wgConfirmEditIP = dirname( __FILE__ );
 $wgExtensionMessagesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.i18n.php";
-$wgExtensionAliasesFiles['ConfirmEdit'] = "$wgConfirmEditIP/ConfirmEdit.alias.php";
+$wgExtensionMessagesFiles['ConfirmEditAlias'] = "$wgConfirmEditIP/ConfirmEdit.alias.php";
 
-if ( defined( 'MW_SUPPORTS_EDITFILTERMERGED' ) ) {
-	$wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged';
-} else {
-	$wgHooks['EditFilter'][] = 'ConfirmEditHooks::confirmEdit';
-}
+$wgHooks['EditFilterMerged'][] = 'ConfirmEditHooks::confirmEditMerged';
 $wgHooks['UserCreateForm'][] = 'ConfirmEditHooks::injectUserCreate';
 $wgHooks['AbortNewAccount'][] = 'ConfirmEditHooks::confirmUserCreate';
 $wgHooks['LoginAuthenticateAudit'][] = 'ConfirmEditHooks::triggerUserLogin';
@@ -199,15 +187,16 @@ $wgHooks['EmailUserForm'][] = 'ConfirmEditHooks::injectEmailUser';
 $wgHooks['EmailUser'][] = 'ConfirmEditHooks::confirmEmailUser';
 # Register API hook
 $wgHooks['APIEditBeforeSave'][] = 'ConfirmEditHooks::confirmEditAPI';
+$wgHooks['APIGetAllowedParams'][] = 'ConfirmEditHooks::APIGetAllowedParams';
+$wgHooks['APIGetParamDescription'][] = 'ConfirmEditHooks::APIGetParamDescription';
 
 $wgAutoloadClasses['ConfirmEditHooks'] = "$wgConfirmEditIP/ConfirmEditHooks.php";
-$wgAutoloadClasses['Captcha']= "$wgConfirmEditIP/Captcha.php";
-$wgAutoloadClasses['SimpleCaptcha']= "$wgConfirmEditIP/Captcha.php";
-$wgAutoloadClasses['CaptchaStore']= "$wgConfirmEditIP/CaptchaStore.php";
-$wgAutoloadClasses['CaptchaSessionStore']= "$wgConfirmEditIP/CaptchaStore.php";
-$wgAutoloadClasses['CaptchaCacheStore']= "$wgConfirmEditIP/CaptchaStore.php";
+$wgAutoloadClasses['SimpleCaptcha'] = "$wgConfirmEditIP/Captcha.php";
+$wgAutoloadClasses['CaptchaStore'] = "$wgConfirmEditIP/CaptchaStore.php";
+$wgAutoloadClasses['CaptchaSessionStore'] = "$wgConfirmEditIP/CaptchaStore.php";
+$wgAutoloadClasses['CaptchaCacheStore'] = "$wgConfirmEditIP/CaptchaStore.php";
 $wgAutoloadClasses['CaptchaSpecialPage'] = "$wgConfirmEditIP/ConfirmEditHooks.php";
-$wgAutoloadClasses['HTMLCaptchaField']= "$wgConfirmEditIP/HTMLCaptchaField.php";
+$wgAutoloadClasses['HTMLCaptchaField'] = "$wgConfirmEditIP/HTMLCaptchaField.php";
 
 /**
  * Set up $wgWhitelistRead
diff --git a/extensions/ConfirmEdit/ConfirmEditHooks.php b/extensions/ConfirmEdit/ConfirmEditHooks.php
index dcdf49f7..66e51991 100644
--- a/extensions/ConfirmEdit/ConfirmEditHooks.php
+++ b/extensions/ConfirmEdit/ConfirmEditHooks.php
@@ -1,24 +1,22 @@
 <?php
 
 class ConfirmEditHooks {
-
 	/**
 	 * Get the global Captcha instance
 	 *
-	 * @return Captcha
+	 * @return Captcha|SimpleCaptcha
 	 */
 	static function getInstance() {
 		global $wgCaptcha, $wgCaptchaClass;
+
 		static $done = false;
+
 		if ( !$done ) {
 			$done = true;
 			$wgCaptcha = new $wgCaptchaClass;
 		}
-		return $wgCaptcha;
-	}
 
-	static function confirmEdit( $editPage, $newtext, $section ) {
-		return self::getInstance()->confirmEdit( $editPage, $newtext, $section );
+		return $wgCaptcha;
 	}
 
 	static function confirmEditMerged( $editPage, $newtext ) {
@@ -56,23 +54,34 @@ class ConfirmEditHooks {
 	static function confirmEmailUser( $from, $to, $subject, $text, &$error ) {
 		return self::getInstance()->confirmEmailUser( $from, $to, $subject, $text, $error );
 	}
+
+	public static function APIGetAllowedParams( &$module, &$params ) {
+		return self::getInstance()->APIGetAllowedParams( $module, $params );
+	}
+
+	public static function APIGetParamDescription( &$module, &$desc ) {
+		return self::getInstance()->APIGetParamDescription( $module, $desc );
+	}
 }
 
 class CaptchaSpecialPage extends UnlistedSpecialPage {
-	public function __construct(){
+	public function __construct() {
 		parent::__construct( 'Captcha' );
 	}
+
 	function execute( $par ) {
 		$this->setHeaders();
+
 		$instance = ConfirmEditHooks::getInstance();
+
 		switch( $par ) {
-		case "image":
-			if ( method_exists( $instance, 'showImage' ) )
-				return $instance->showImage();
-		case "help":
-		default:
-			return $instance->showHelp();
+			case "image":
+				if ( method_exists( $instance, 'showImage' ) ) {
+					return $instance->showImage();
+				}
+			case "help":
+			default:
+				return $instance->showHelp();
 		}
 	}
 }
-
diff --git a/extensions/ConfirmEdit/FancyCaptcha.class.php b/extensions/ConfirmEdit/FancyCaptcha.class.php
index 61723656..3ce5670e 100644
--- a/extensions/ConfirmEdit/FancyCaptcha.class.php
+++ b/extensions/ConfirmEdit/FancyCaptcha.class.php
@@ -69,7 +69,7 @@ class FancyCaptcha extends SimpleCaptcha {
 				'id'    => 'wpCaptchaId',
 				'value' => $index ) ) .
 			"<p>" .
-			Xml::element( 'input', array(
+			Html::element( 'input', array(
 				'name' => 'wpCaptchaWord',
 				'id'   => 'wpCaptchaWord',
 				'autocorrect' => 'off',
diff --git a/extensions/ConfirmEdit/FancyCaptcha.i18n.php b/extensions/ConfirmEdit/FancyCaptcha.i18n.php
index fe25ccdc..43114d74 100644
--- a/extensions/ConfirmEdit/FancyCaptcha.i18n.php
+++ b/extensions/ConfirmEdit/FancyCaptcha.i18n.php
@@ -68,6 +68,7 @@ $messages['am'] = array(
  * @author Juanpabl
  */
 $messages['an'] = array(
+	'fancycaptcha-desc' => 'Chenerador chocant de CAPTCHAs ta Confirmar Edicions.',
 	'fancycaptcha-addurl' => "Ha encluyito vinclos esternos en a suya edición. Ta aduyar a protecher contra o spam automatico, escriba por favor as parolas que amaneixen en a caixa d'o cobaixo ([[Special:Captcha/help|más información]]):",
 	'fancycaptcha-badlogin' => "Ta aduyar a protecher contra o trenque automatico de parolas de paso, escriba por favor as parolas que amaneixen en a caixa d'o cobaixo ([[Special:Captcha/help|más información]]):",
 	'fancycaptcha-createaccount' => 'Ta aduyar a protecher contra a creyación automatica de cuentas, escriba por favor en o quatrón as parolas que amaneixen debaixo ([[Special:Captcha/help|más información]]):',
@@ -75,6 +76,7 @@ $messages['an'] = array(
 ([[Special:Captcha/help|más información]]):",
 	'fancycaptcha-edit' => "Ta editar ista pachina, escriba por favor as parolas que amaneixen en a caixa d'o cobaixo
 ([[Special:Captcha/help|más información]]):",
+	'fancycaptcha-sendemail' => 'Ta protecher-nos contra o spam automatizau por favor escriba as parolas que amaneixen en o siguient quadro ([[Special:Captcha/help|mas información]]):',
 );
 
 /** Arabic (العربية)
@@ -277,14 +279,15 @@ Er mwyn ceisio rhwystro peiriannau spam, byddwch gystal â theipio'r geiriau a w
 	'fancycaptcha-sendemail' => "Er mwyn cyfrannu at ddiogelu rhag sbamio awtomatig, byddwch gystal â gwneud y swm isod ac ysgrifennu'r ateb yn y blwch ([[Special:Captcha/help|rhagor o wybodaeth]]):",
 );
 
-/** Danish (Dansk) */
+/** Danish (Dansk)
+ * @author Peter Alberti
+ */
 $messages['da'] = array(
 	'fancycaptcha-addurl' => 'Din ændring tilføjer nye eksterne henvisninger. For at beskytte mod automatiseret spam, skal du indtaste ordet som vises nedenfor i feltet under det. ([[Special:Captcha/help|mere information]]):',
 	'fancycaptcha-badlogin' => 'For at beskytte mod automatiske forsøg på at gætte kodeord, skal du indtaste ordet som vises nedenfor i feltet under det. ([[Special:Captcha/help|mere information]]):',
 	'fancycaptcha-createaccount' => 'For at beskytte mod automatisk oprettelse af brugernavne, der bruges til spam, skal du indtaste ordet som vises nedenfor i feltet under det. ([[Special:Captcha/help|mere information]]):',
 	'fancycaptcha-create' => 'For at oprette en ny side, skal du indtaste ordet som vises nedenfor i feltet under det. ([[Special:Captcha/help|mere information]]):',
-	'fancycaptcha-edit' => 'or at redigere denne side
-([[Special:Captcha/help|more info]]):',
+	'fancycaptcha-edit' => 'For at redigere denne side, indtast da venligst ordene, der står i feltet nedenfor ([[Special:Captcha/help|mere information]]):',
 );
 
 /** German (Deutsch)
@@ -293,7 +296,7 @@ $messages['da'] = array(
  * @author Umherirrender
  */
 $messages['de'] = array(
-	'fancycaptcha-desc' => 'CAPTCHA-Generator für die Erweiterung „Confirm Edit“',
+	'fancycaptcha-desc' => 'Fancy-CAPTCHA-Generator für die Erweiterung „Confirm Edit“',
 	'fancycaptcha-addurl' => 'Deine Bearbeitung enthält neue externe Links.
 Zum Schutz vor automatisiertem Spamming gib das folgende Wort in das Feld unten ein. Klicke dann erneut auf „Seite speichern“ ([[Special:Captcha/help|Fragen oder Probleme?]]).',
 	'fancycaptcha-badlogin' => 'Zum Schutz vor einer Kompromittierung deines Benutzerkontos gib das folgende Wort in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]]:',
@@ -315,6 +318,7 @@ Zum Schutz vor automatisiertem Spamming geben Sie das folgende Wort in das Feld
 	'fancycaptcha-createaccount' => 'Zum Schutz vor automatisierter Anlage von Benutzerkonten geben Sie bitte das folgende Wort in das Feld unten ein ([[Special:Captcha/help|Fragen oder Probleme?]]):',
 	'fancycaptcha-create' => 'Zur Erstellung der Seite geben Sie das folgende Wort in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]].',
 	'fancycaptcha-edit' => 'Zur Bearbeitung der Seite geben Sie das folgende Wort in das Feld unten ein [[Special:Captcha/help|(Fragen oder Probleme?)]].',
+	'fancycaptcha-sendemail' => 'Um gegen automatischen Spam vorzugehen, geben Sie bitte die Wörter unten in das Feld ein ([[Special:Captcha/help|mehr Informationen]]):',
 );
 
 /** Zazaki (Zazaki)
@@ -396,11 +400,11 @@ $messages['es'] = array(
 $messages['et'] = array(
 	'fancycaptcha-desc' => 'Kirevate piltidega robotilõks, kinnitamaks muudatuste õigsust.',
 	'fancycaptcha-addurl' => 'Sinu muudatus sisaldab uusi välislinke.
-Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks automaadistatud rämpsmuudatuste vastu ([[Special:Captcha/help|täpsem teave]]):',
-	'fancycaptcha-badlogin' => 'Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks automaatsete parooliäraarvajate vastu ([[Special:Captcha/help|täpsem teave]]):',
-	'fancycaptcha-createaccount' => 'Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks kontode automaatse loomise vastu ([[Special:Captcha/help|täpsem teave]]):',
-	'fancycaptcha-create' => 'Lehekülje loomiseks sisesta palun allpool olevas kastis kuvatud sõnad ([[Special:Captcha/help|täpsem teave]]):',
-	'fancycaptcha-edit' => 'Selle lehekülje muutmiseks sisesta palun allpool olevas kastis kuvatud sõnad ([[Special:Captcha/help|täpsev teave]]):',
+Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks automaadistatud rämpsmuudatuste eest ([[Special:Captcha/help|lisateave]]):',
+	'fancycaptcha-badlogin' => 'Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks automaatsete parooliäraarvajate eest ([[Special:Captcha/help|lisateave]]):',
+	'fancycaptcha-createaccount' => 'Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks kontode automaatse loomise eest ([[Special:Captcha/help|lisateave]]):',
+	'fancycaptcha-create' => 'Lehekülje loomiseks sisesta palun allpool olevas kastis kuvatud sõnad ([[Special:Captcha/help|lisateave]]):',
+	'fancycaptcha-edit' => 'Selle lehekülje muutmiseks sisesta palun allpool olevas kastis kuvatud sõnad ([[Special:Captcha/help|lisateave]]):',
 	'fancycaptcha-sendemail' => 'Palun sisesta allpool olevas kastis kuvatud sõnad. Abinõu on kaitseks automaadistatud rämpsmuudatuste vastu ([[Special:Captcha/help|lisateave]]):',
 );
 
@@ -417,6 +421,7 @@ $messages['eu'] = array(
 );
 
 /** Persian (فارسی)
+ * @author Ebraminio
  * @author Huji
  * @author Ladsgroup
  * @author Meisam
@@ -429,7 +434,7 @@ $messages['fa'] = array(
 	'fancycaptcha-createaccount' => 'برای کمک به جلوگیری از ایجاد خودکار حساب کاربری، لطفاً واژه‌ای را که در تصویر می‌بینید وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
 	'fancycaptcha-create' => 'برای ایجاد این صفحه، لطفاً واژه‌ای را که در تصویر می‌بینید وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
 	'fancycaptcha-edit' => 'برای ویرایش این صفحه، لطفاً واژه‌ای را که در تصویر می‌بینید وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
-	'fancycaptcha-sendemail' => 'برای کمک به محافظت در برابر هرزه‌نگاری خودکار، لطفاً واژه‌هایی را که در جعبهٔ زیر نمایش داده می‌شوند وارد کنید ([[Special:Captcha/help|اطلاعات بیش‌تر]]):',
+	'fancycaptcha-sendemail' => 'برای کمک به محافظت در برابر هرزه‌نگاری خودکار، لطفاً واژه‌هایی را که در جعبهٔ زیر نمایش داده می‌شوند وارد کنید ([[Special:Captcha/help|اطلاعات بیشتر]]):',
 );
 
 /** Finnish (Suomi)
@@ -474,13 +479,14 @@ Pour vérifier qu’il ne s’agit pas de pourriels automatisés, veuillez entre
  * @author ChrisPtDe
  */
 $messages['frp'] = array(
-	'fancycaptcha-desc' => "G·ènèrator d’émâges ''captcha'' anti-robots que demande una confirmacion d’homo des changements.",
+	'fancycaptcha-desc' => "G·ènèrator d’émâges ''captch·a'' anti-robots que demande una confirmacion d’homo des changements.",
 	'fancycaptcha-addurl' => 'Voutron changement encllut de lims de defôr novéls.
 Por nos édiér a combatre contre lo spame ôtomatisâ, volyéd buchiér los mots qu’aparèssont dens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
-	'fancycaptcha-badlogin' => 'Por nos édiér a combatre contre lo piratâjo ôtomatisâ de mots de pâssa, volyéd buchiér los mots qu’aparèssont dens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
+	'fancycaptcha-badlogin' => 'Por nos édiér a combatre contre lo cassâjo ôtomatisâ de contresegnos, volyéd buchiér los mots qu’aparèssont dedens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
 	'fancycaptcha-createaccount' => 'Por nos édiér a combatre contre les crèacions ôtomatisâs de comptos, volyéd buchiér los mots qu’aparèssont dens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
 	'fancycaptcha-create' => 'Por fâre ceta pâge, volyéd buchiér los mots qu’aparèssont dens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
 	'fancycaptcha-edit' => 'Por changiér ceta pâge, volyéd buchiér los mots qu’aparèssont dens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
+	'fancycaptcha-sendemail' => 'Por nos édiér a combatre contre lo spame ôtomatisâ, volyéd buchiér los mots qu’aparèssont dens la bouèta ce-desot ([[Special:Captcha/help|més d’enformacions]]) :',
 );
 
 /** Western Frisian (Frysk)
@@ -619,6 +625,19 @@ $messages['id'] = array(
 	'fancycaptcha-sendemail' => 'Sebagai pelindungan terhadap spam otomatis, silahkan masukkan kata-kata yang muncul di bawah ini ke dalam kotak yang tersedia ([[Special:Captcha/help|info lengkap]]):',
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'fancycaptcha-addurl' => 'Ti inurnos mo ket adda nagyan na a baro a panilpo ti ruar.
+Tapno  masalakniban kadagiti automatiko a spam, pangaasim nga ikabil ti balikas nga agparang dita baba a kahon. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'fancycaptcha-badlogin' => 'Tapno  masalakniban kadagiti automatiko a pinagsulbar ti kontrasenias, pangaasim nga ikabil ti balikas nga agparang dita baba a kahon. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'fancycaptcha-createaccount' => 'Tapno  makasalaknib kadagiti automatiko a pinagaramid ti pakabilangan, pangaasim nga ikabil ti balikas nga agparang dita baba a kahon. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'fancycaptcha-create' => 'Tapno makaaramid ti panid, pangaasim nga ikabil ti balikas nga agparang dita baba a kahon. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'fancycaptcha-edit' => 'Tapno makaurnos daytoy a panid, pangaasim nga ikabil ti balikas nga agparang dita baba a kahon. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'fancycaptcha-sendemail' => 'Tapno  makasalaknib kadagiti automatiko a pinagspam, pangaasim nga ikabil ti balikas nga agparang dita baba a kahon. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+);
+
 /** Italian (Italiano)
  * @author Beta16
  * @author BrokenArrow
@@ -703,7 +722,7 @@ $messages['kk-arab'] = array(
 تٶمەندەگٸ كٶرسەتٸلگەن سٶزدەردٸ اۋماققا ەنگٸزٸڭٸز ([[{{ns:special}}:Captcha/help|كٶبٸرەك اقپارات]]):',
 );
 
-/** Kazakh (Cyrillic) (Қазақша (Cyrillic)) */
+/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬) */
 $messages['kk-cyrl'] = array(
 	'fancycaptcha-addurl' => 'Түзетуіңізде жаңа сыртқы сілтемелер бар екен. Өздік түрде «спам» жасалуынан қорғану үшін,
 төмендегі көрсетілген сөздерді аумаққа енгізіңіз ([[{{ns:special}}:Captcha/help|көбірек ақпарат]]):',
@@ -717,7 +736,7 @@ $messages['kk-cyrl'] = array(
 төмендегі көрсетілген сөздерді аумаққа енгізіңіз ([[{{ns:special}}:Captcha/help|көбірек ақпарат]]):',
 );
 
-/** Kazakh (Latin) (Қазақша (Latin)) */
+/** Kazakh (Latin script) (‪Qazaqşa (latın)‬) */
 $messages['kk-latn'] = array(
 	'fancycaptcha-addurl' => 'Tüzetwiñizde jaña sırtqı siltemeler bar eken. Özdik türde «spam» jasalwınan qorğanw üşin,
 tömendegi körsetilgen sözderdi awmaqqa engiziñiz ([[{{ns:special}}:Captcha/help|köbirek aqparat]]):',
@@ -808,6 +827,7 @@ Fir ze hellëfen, géint automatiséierte Spam virzegoen, gitt w.e.g. déi Wierd
 
 /** Limburgish (Limburgs)
  * @author Matthias
+ * @author Ooswesthoesbes
  */
 $messages['li'] = array(
 	'fancycaptcha-addurl' => 'Uw bewerking bevat nieuwe externe links. Voer alstublieft de woorden die
@@ -819,6 +839,7 @@ ter bescherming tegen het automatisch aanmaken van gebruikers ([[Special:Captcha
 hieronder verschijnen in het invoerveld in als bescherming tegen automatische spam ([[Special:Captcha/help|meer informatie]]):',
 	'fancycaptcha-edit' => 'Uw bewerking bevat nieuwe externe links. Voer alstublieft de woorden die
 hieronder verschijnen in het invoerveld in als bescherming tegen automatische spam ([[Special:Captcha/help|mie informatie]]):',
+	'fancycaptcha-sendemail' => "Veur de weurd die hie onger versjienen in 't inveurvèldj in es besjerming taege geautometiseerde spam ([[Special:Captcha/help|mier info]]):",
 );
 
 /** Lao (ລາວ) */
@@ -860,6 +881,7 @@ $messages['ml'] = array(
 
 /** Marathi (मराठी)
  * @author Kaustubh
+ * @author Mahitgar
  */
 $messages['mr'] = array(
 	'fancycaptcha-addurl' => 'तुमच्या संपादनात नवीन बाह्य दुवे आहेत.
@@ -868,6 +890,7 @@ $messages['mr'] = array(
 	'fancycaptcha-createaccount' => 'आपोआप होणार्‍या सदस्य नोंदणीपासून वाचण्यासाठी, खाली दिसणारे शब्द दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 	'fancycaptcha-create' => 'हे पान तयार करण्यासाठी, खाली दिसणारे शब्द दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 	'fancycaptcha-edit' => 'हे पान संपादित करण्यासाठी, खाली दिसणारे शब्द दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
+	'fancycaptcha-sendemail' => 'आपोआप होणार्‍या उत्पातापासून वाचण्यासाठी, खाली दिसणारे शब्द दिलेल्या पृष्ठपेटी मध्ये लिहा ([[Special:Captcha/help|अधिक माहिती]]):',
 );
 
 /** Malay (Bahasa Melayu)
@@ -883,6 +906,20 @@ $messages['ms'] = array(
 	'fancycaptcha-sendemail' => 'Untuk membanteras kegiatan spam secara automatik, anda diminta mengisi huruf-huruf berikut dalam kotak yang disediakan ([[Special:Captcha/help|maklumat lanjut]]):',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Harald Khan
+ * @author Jon Harald Søby
+ * @author Laaknor
+ */
+$messages['nb'] = array(
+	'fancycaptcha-addurl' => 'Din endring inkluderer nye eksterne lenker. For hjelpe oss å beskytte oss mot automatisk spam, vennligst skriv inn ordene som kommer opp i denne boksen ([[Special:Captcha/help|mer informasjon]]):',
+	'fancycaptcha-badlogin' => 'Skriv inn ordene som dukker opp i boksen nedenfor for å hjelpe oss å beskytte oss mot passordtyveri ([[Special:Captcha/help|mer informasjon]]):',
+	'fancycaptcha-createaccount' => 'Skriv inn ordene som dukker opp i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk kontoopprettelse ([[Special:Captcha/help|mer informasjon]]):',
+	'fancycaptcha-create' => 'Skriv inn ordene som dukker opp i boksen nedenfor for å opprette siden ([[Special:Captcha/help|mer informasjon]]):',
+	'fancycaptcha-edit' => 'For å endre denne siden, vennligst skriv inn ordene som dukker opp i boksen nedenfor ([[Special:Captcha/help|mer informasjon]]):',
+	'fancycaptcha-sendemail' => 'For å beskytte mot automatisert spam så må du skrive ordene under inn i tekstboksen ([[Special:Captcha/help|mer informasjon]]):',
+);
+
 /** Low German (Plattdüütsch)
  * @author Slomox
  */
@@ -900,13 +937,13 @@ As Schutz gegen automaatsch Spam, geev disse Bookstavenreeg in dat Feld ünnen i
  */
 $messages['nds-nl'] = array(
 	'fancycaptcha-addurl' => "Joew bewarking bevat uutgaonde verwiezingen. 
-Um dit prejek te bescharmen tegen spam, mu-j 't woord dat hieronder steet invullen ([[Special:Captcha/help|hulpe]]):",
-	'fancycaptcha-badlogin' => "Um disse webstee te beveiligen tegen 't kraken van wachwoorden, wö-j verzoch um de woorden dee-j hieronder zien in te vullen ([[Special:Captcha/help|hulpe]]):",
-	'fancycaptcha-createaccount' => "Um disse wiki te bescharmen tegen 't autematisch anmaken van gebrukersprefielen mu-j 't woord hieronder invullen ([[Special:Captcha/help|hulpe]]):",
-	'fancycaptcha-create' => "Um een pagina an te maken, mu-j 't woord dat hieronder steet invullen
+Um dit projekt te bescharmen tegen ongewunst reklame, mö'j t woord dat hieronder steet invullen ([[Special:Captcha/help|hulpe]]):",
+	'fancycaptcha-badlogin' => "Um disse webstee te beveiligen tegen t kraken van wachtwoorden, wö'j verzöcht um de woorden die'j hieronder zien in te vullen ([[Special:Captcha/help|hulpe]]):",
+	'fancycaptcha-createaccount' => "Um disse wiki te bescharmen tegen t automaties anmaken van gebrukersprefielen mö'j t woord hieronder invullen ([[Special:Captcha/help|hulpe]]):",
+	'fancycaptcha-create' => "Um n pagina an te maken, mö'j t woord dat hieronder steet invullen
 ([[Special:Captcha/help|hulpe]]):",
-	'fancycaptcha-edit' => 'Joew bewarking bevat nieje uutgaonde verwiezingen. Um disse wiki te bescharmen tegen ongewunste toevoegingen mu-j de woorden hieronder invullen ([[Special:Captcha/help|hulpe]]):',
-	'fancycaptcha-sendemail' => "Voer de woorden dee hieronder staon in 't invoerveld in as bescharming tegen autematische ongewunste reclame ([[Special:Captcha/help|meer infermasie]]):",
+	'fancycaptcha-edit' => "Joew bewarking bevat nieje uutgaonde verwiezingen. Um disse wiki te bescharmen tegen ongewunste reklame mö'j de woorden hieronder invullen ([[Special:Captcha/help|hulpe]]):",
+	'fancycaptcha-sendemail' => 'Voer de woorden die hieronder staon in t invoerveld in as bescharming tegen automatiese ongewunste reklame ([[Special:Captcha/help|meer informasie]]):',
 );
 
 /** Dutch (Nederlands)
@@ -935,20 +972,6 @@ For å hjelpa oss med å unngå automatisert spam, ver venleg og skriv inn orda
 	'fancycaptcha-edit' => 'For å endra denne sida, ver venleg og skriv inn orda som kjem til syne i boksen nedanfor ([[Special:Captcha/help|meir informasjon]]):',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Harald Khan
- * @author Jon Harald Søby
- * @author Laaknor
- */
-$messages['no'] = array(
-	'fancycaptcha-addurl' => 'Din endring inkluderer nye eksterne lenker. For hjelpe oss å beskytte oss mot automatisk spam, vennligst skriv inn ordene som kommer opp i denne boksen ([[Special:Captcha/help|mer informasjon]]):',
-	'fancycaptcha-badlogin' => 'Skriv inn ordene som dukker opp i boksen nedenfor for å hjelpe oss å beskytte oss mot passordtyveri ([[Special:Captcha/help|mer informasjon]]):',
-	'fancycaptcha-createaccount' => 'Skriv inn ordene som dukker opp i boksen nedenfor for å hjelpe oss å beskytte oss mot automatisk kontoopprettelse ([[Special:Captcha/help|mer informasjon]]):',
-	'fancycaptcha-create' => 'Skriv inn ordene som dukker opp i boksen nedenfor for å opprette siden ([[Special:Captcha/help|mer informasjon]]):',
-	'fancycaptcha-edit' => 'For å endre denne siden, vennligst skriv inn ordene som dukker opp i boksen nedenfor ([[Special:Captcha/help|mer informasjon]]):',
-	'fancycaptcha-sendemail' => 'For å beskytte mot automatisert spam så må du skrive ordene under inn i tekstboksen ([[Special:Captcha/help|mer informasjon]]):',
-);
-
 /** Occitan (Occitan)
  * @author Cedric31
  */
@@ -966,7 +989,13 @@ $messages['oc'] = array(
  * @author Psubhashish
  */
 $messages['or'] = array(
-	'fancycaptcha-createaccount' => 'ଆପେଆପେ ଖାତା ଖୋଲିବାକୁ ଅଟକାଇବା ପାଇଁ ଦୟାକରି ଏହି ଘରଭିତରେ ଥିବା ଶବ୍ଦସବୁକୁ ତା ତଳେ ଥିବା ବାକ୍ସରେ ଟାଇପ କରନ୍ତୁ । ([[Special:Captcha/help|ଅଧିକ ଜାଣିବା]]):',
+	'fancycaptcha-addurl' => 'ଆପଣଙ୍କ ସମ୍ପାଦନାରେ ନୂଆ ବାହାର ଲିଙ୍କ ରହିଛି ।
+ଆପେଆପେ ହେଉଥିବା ସ୍ପାମର ପ୍ରତିରୋଧ କରିବା ନିମନ୍ତେ  ଘର ତଳେ ଥିବା ଶବ୍ଦସବୁ ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ବିବରଣୀ]]):',
+	'fancycaptcha-badlogin' => 'ଆପେଆପେ ହେଉଥିବା ପାସବାର୍ଡ଼ ଚୋରାଇବାକୁ ପ୍ରତିରୋଧ କରିବା ନିମନ୍ତେ ଦୟାକରି ଏହି ଘରଭିତରେ ଥିବା ଶବ୍ଦସବୁକୁ ତାହା ତଳେ ଥିବା ବାକ୍ସରେ ଟାଇପ କରନ୍ତୁ । ([[Special:Captcha/help|ଅଧିକ ସୂଚନା]]):',
+	'fancycaptcha-createaccount' => 'ଆପେଆପେ ଖାତା ଖୋଲିବାକୁ ଅଟକାଇବା ପାଇଁ ଦୟାକରି ଏହି ଘରଭିତରେ ଥିବା ଶବ୍ଦସବୁକୁ ତାହା ତଳେ ଥିବା ବାକ୍ସରେ ଟାଇପ କରନ୍ତୁ । ([[Special:Captcha/help|ଅଧିକ ସୂଚନା]]):',
+	'fancycaptcha-create' => 'ଏହି ପୃଷ୍ଠାଟିକୁ ତିଆରିବା ନିମନ୍ତେ, ଘର ତଳେ ଥିବା ଶବ୍ଦଟିକୁ ଏଠାରେ ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ଜାଣନ୍ତୁ]]):',
+	'fancycaptcha-edit' => 'ଏହି ପୃଷ୍ଠାଟିକୁ ବଦଳାଇବା ନିମନ୍ତେ, ଘର ତଳେ ଥିବା ଶବ୍ଦଟିକୁ ଏଠାରେ ଦିଅନ୍ତୁ ([[Special:Captcha/help|ଅଧିକ ଜାଣନ୍ତୁ]]):',
+	'fancycaptcha-sendemail' => 'ଆପେଆପେ ହେଉଥିବା ସ୍ପାମକୁ ରୋକିବା ନିମନ୍ତେ ଦୟାକରି ଏହି ଘରଭିତରେ ଥିବା ଶବ୍ଦସବୁକୁ ତାହା ତଳେ ଥିବା ବାକ୍ସରେ ଟାଇପ କରନ୍ତୁ । ([[Special:Captcha/help|ଅଧିକ ସୂଚନା]]):',
 );
 
 /** Polish (Polski)
@@ -996,6 +1025,19 @@ Për dene na man a vardesse da la reclam aotomatisà, për piasì, ch'a l'arbata
 	'fancycaptcha-sendemail' => "Për giuté a protegi contra la rumenta automàtica, për piasì ch'a anseriss le paròle che as vëddo sota ant la casela ([[Special:Captcha/help|për savèjne ëd pi]]):",
 );
 
+/** Western Punjabi (پنجابی)
+ * @author Khalid Mahmood
+ */
+$messages['pnb'] = array(
+	'fancycaptcha-addurl' => 'تواڈی تبدیلی چ نویں بارلے جوڑ نیں۔
+اس صفحے نوں تبدیل کرن واسطے، مہربانی کر کے ڈبے چ دتے گۓ شبداں نوں لکھو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'fancycaptcha-badlogin' => 'اپنے آپ کنجی توڑن دے خلاف مدد واسطے، مہربانی کر کے ڈبے چ دتے گۓ شبداں نوں لکھو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'fancycaptcha-createaccount' => 'اپنے آپ غلط نویں کھاتے بنان نوں روکن واسطے، مہربانی کر کے ڈبے چ دتے گۓ شبداں نوں لکھو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'fancycaptcha-create' => 'صفحہ بنان واسطے، مہربانی کر کے ڈبے چ دتے گۓ شبداں نوں لکھو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'fancycaptcha-edit' => 'اس صفحے تے تبدیلی کرن واسطے، مہربانی کر کے ڈبے چ دتے گۓ شبداں نوں لکھو ([[Special:Captcha/help|مزید جانکاری]]):',
+	'fancycaptcha-sendemail' => 'اپنے آپ غلط مال آن نوں روکن واسطے، مہربانی کر کے ڈبے چ دتے گۓ شبداں نوں لکھو ([[Special:Captcha/help|مزید جانکاری]]):',
+);
+
 /** Pashto (پښتو)
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
@@ -1040,12 +1082,17 @@ $messages['rm'] = array(
 );
 
 /** Romanian (Română)
+ * @author Firilacroco
  * @author Mihai
  */
 $messages['ro'] = array(
-	'fancycaptcha-createaccount' => 'Pentru a ajuta protecția împotriva creării automate de conturi, te rog să introduci în cutie cuvintele care apar mai jos ([[Special:Captcha/help|mai multe detalii]]):',
+	'fancycaptcha-addurl' => 'Modificarea dumneavoastră include legături externe noi.
+Pentru a împiedica roboții de spam, vă rugăm să introduceți cuvintele care apar mai jos în căsuță ([[Special:Captcha/help|mai multe detalii]]):',
+	'fancycaptcha-badlogin' => 'Pentru a împiedica spargerea automată a parolelor, vă rugăm să introduceți cuvintele care apar mai jos în căsuță ([[Special:Captcha/help|mai multe detalii]]):',
+	'fancycaptcha-createaccount' => 'Pentru a împiedica crearea automată de conturi, vă rugăm să introduceți cuvintele care apar mai jos în căsuță ([[Special:Captcha/help|mai multe detalii]]):',
 	'fancycaptcha-create' => 'Pentru a crea pagina, te rog să introduci în cutie cuvintele care apar mai jos ([[Special:Captcha/help|mai multe detalii]]):',
 	'fancycaptcha-edit' => 'Pentru a modifica această pagină, te rog să introduci în cutie cuvintele care apar mai jos ([[Special:Captcha/help|mai multe detalii]]):',
+	'fancycaptcha-sendemail' => 'Pentru a împiedica roboții de spam, vă rugăm să introduceți cuvintele care apar mai jos în căsuță ([[Special:Captcha/help|mai multe detalii]]):',
 );
 
 /** Tarandíne (Tarandíne)
@@ -1062,10 +1109,12 @@ Pe aiutà a proteggere condre a 'u spam automateche, pe piacere mitte le parole
 );
 
 /** Russian (Русский)
+ * @author Dim Grits
  * @author Lockal
  * @author Александр Сигачёв
  */
 $messages['ru'] = array(
+	'fancycaptcha-desc' => 'Необычный CAPTCHA-генератор для подтверждения редактирования',
 	'fancycaptcha-addurl' => 'Ваша правка содержит новые внешние ссылки. В целях защиты от спама, пожалуйста, введите слова, показанные ниже в рамке ([[Special:Captcha/help|подробнее…]]):',
 	'fancycaptcha-badlogin' => 'В целях защиты от автоматического взлома паролей, пожалуйста, введите в поле ввода буквы с изображения ([[Special:Captcha/help|подробнее]]):',
 	'fancycaptcha-createaccount' => 'Для предотвращения автоматической регистрации учётных записей, пожалуйста, введите изображённые символы в текстовое поле ([[Special:Captcha/help|подробнее]]):',
@@ -1086,7 +1135,7 @@ $messages['rue'] = array(
 	'fancycaptcha-sendemail' => 'В рамках охороны перед автоматічным спамом мусите описати текст з наступного образку. ([[Special:Captcha/help|Што тото значіть?]]):',
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -1150,27 +1199,29 @@ $messages['sq'] = array(
 	'fancycaptcha-sendemail' => "Për t'u mbrojtur nga metoda automatike e gjetjes së fjalëkalimeve ju kërkojmë të vendosni fjalët e figurës në kuti ([[Special:Captcha/help|më shumë informacion]]):",
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Millosh
  * @author Rancher
  * @author Жељко Тодоровић
  * @author Михајло Анђелковић
  */
 $messages['sr-ec'] = array(
-	'fancycaptcha-addurl' => 'Ваша измена садржи нове спољне везе.
-У циљу заштите од злоупотребе, унесите знакове са слике у поље изнад.',
-	'fancycaptcha-badlogin' => 'У циљу спречавања откривања лозинки, унесите знакове са слике у поље изнад.',
-	'fancycaptcha-createaccount' => 'У циљу заштите од злоупотребе, унесите знакове са слике у поље изнад.',
-	'fancycaptcha-create' => 'Да бисте направили страницу, унесите знакове са слике у поље изнад.',
-	'fancycaptcha-edit' => 'Да бисте изменили ову страницу, унесите знакове са слике у поље изнад.',
-	'fancycaptcha-sendemail' => 'У циљу заштите од злоупотребе, унесите знакове са слике у поље изнад.',
+	'fancycaptcha-desc' => 'Обогаћен стварач сликовног кода за потврду уређивања',
+	'fancycaptcha-addurl' => 'Ваша измена садржи нове спољашње везе.
+У циљу заштите од непожељних порука, унесите речи са слике у поље испод ([[Special:Captcha/help|више информација]]):',
+	'fancycaptcha-badlogin' => 'У циљу заштите од пробијања лозинки, унесите речи са слике у поље испод ([[Special:Captcha/help|више информација]]):',
+	'fancycaptcha-createaccount' => 'У циљу заштите од самоотварања налога, унесите речи са слике у поље испод ([[Special:Captcha/help|више информација]]):',
+	'fancycaptcha-create' => 'Да бисте направили страницу, унесите речи са слике у поље испод ([[Special:Captcha/help|више информација]]):',
+	'fancycaptcha-edit' => 'Да бисте уредили ову страницу, унесите речи са слике у поље испод ([[Special:Captcha/help|више информација]]):',
+	'fancycaptcha-sendemail' => 'У циљу заштите од непожељних порука, унесите речи са слике у поље испод ([[Special:Captcha/help|више информација]]):',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Michaello
  * @author Жељко Тодоровић
  */
 $messages['sr-el'] = array(
+	'fancycaptcha-desc' => 'Obogaćen stvarač slikovnog koda za potvrdu uređivanja',
 	'fancycaptcha-addurl' => 'Tvoja izmena uključuje nove spoljne veze. U cilju zaštite od automatskog spama, unesi reči koje se nalaze ispod u kutiju ([[Special:Captcha/help|detaljnije]]):',
 	'fancycaptcha-badlogin' => 'U cilju sprečavanja automatskog otkrivanja lozinki, unesi reči koje se nalaze ispod u kutiju ([[Special:Captcha/help|detaljnije]]):',
 	'fancycaptcha-createaccount' => 'U cilju zaštite od automatskog spama, unesi reči odozdo u kutiju ([[Special:Captcha/help|detaljnije]]):',
@@ -1184,10 +1235,10 @@ $messages['sr-el'] = array(
  */
 $messages['stq'] = array(
 	'fancycaptcha-addurl' => 'Dien Beoarbaidenge änthaalt näie externe Ferbiendengen.
-Tou Schuts foar automatisierde Spamminge reek dät foulgjende Woud in dät Fäild ien.
+Tou Skuts foar automatisierde Spamminge reek dät foulgjende Woud in dät Fäild ien.
 Klik dan fonnäien ap „Siede spiekerje“ [[Special:Captcha/help|(Froagen of Probleme?)]].',
-	'fancycaptcha-badlogin' => 'Toun Schuts foar ne Kompromittierenge fon dien Benutserkonto reek dät foulgjende Woud in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]]:',
-	'fancycaptcha-createaccount' => 'Toun Schuts foar automatisierde Anloage fon Benutserkonten reek dät foulgjende Woud in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
+	'fancycaptcha-badlogin' => 'Toun Skuts foar ne Kompromittierenge fon dien Benutserkonto reek dät foulgjende Woud in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]]:',
+	'fancycaptcha-createaccount' => 'Toun Skuts foar automatisierde Anloage fon Benutserkonten reek dät foulgjende Woud in dät Fäild hierunner ien [[Special:Captcha/help|(Froagen of Probleme?)]].',
 	'fancycaptcha-create' => 'Tou dät Moakjen fon ju Siede reek dät foulgjende Woud in dät Fäild hierunner ien
 [[Special:Captcha/help|(Froagen of Probleme?)]].',
 	'fancycaptcha-edit' => 'Tou Beoarbaidenge fon disse Siede reek dät foulgjende Woud in dät Fäild hierunner ien
@@ -1234,7 +1285,7 @@ $messages['te'] = array(
 ([[Special:Captcha/help|మరింత సమాచారం]]):',
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (Тоҷикӣ)
  * @author Ibrahim
  */
 $messages['tg-cyrl'] = array(
@@ -1245,7 +1296,7 @@ $messages['tg-cyrl'] = array(
 	'fancycaptcha-edit' => 'Барои вироиши ин саҳифа, вожаеро ки дар тасвир мебинед, ворид кунед ([[Special:Captcha/help|иттилооти бештар]]):',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -1306,9 +1357,11 @@ Otomatik spamdan korunmak için, lütfen aşağıdaki sözcükleri kutunun için
 
 /** Ukrainian (Українська)
  * @author Ahonc
+ * @author Dim Grits
  * @author Ytsukeng Fyvaprol
  */
 $messages['uk'] = array(
+	'fancycaptcha-desc' => 'Чудернацький CAPTCHA-генератор для підтвердження редагування',
 	'fancycaptcha-addurl' => 'Ваше редагування містить нові зовнішні посилання.
 Із метою захисту від спаму, будь ласка, введіть у текстове поле слова, зображені на картинці ([[Special:Captcha/help|докладніше]]):',
 	'fancycaptcha-badlogin' => 'Із метою захисту від автоматичного злому пароля, будь ласка, введіть у текстове поле слова, зображені на картинці ([[Special:Captcha/help|докладніше]]):',
diff --git a/extensions/ConfirmEdit/FancyCaptcha.php b/extensions/ConfirmEdit/FancyCaptcha.php
index 4204546b..dbc136b8 100644
--- a/extensions/ConfirmEdit/FancyCaptcha.php
+++ b/extensions/ConfirmEdit/FancyCaptcha.php
@@ -29,6 +29,9 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
+require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$wgCaptchaClass = 'FancyCaptcha';
+
 global $wgCaptchaDirectory;
 $wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
 
@@ -40,8 +43,8 @@ $wgCaptchaSecret = "CHANGE_THIS_SECRET!";
 
 /**
  * By default the FancyCaptcha rotates among all available captchas.
- * Setting $wgCaptchaDeleteOnSolve to true will delete the captcha 
- * files when they are correctly solved. Thus the user will need 
+ * Setting $wgCaptchaDeleteOnSolve to true will delete the captcha
+ * files when they are correctly solved. Thus the user will need
  * something like a cron creating new thumbnails to avoid drying up.
  */
 $wgCaptchaDeleteOnSolve = false;
diff --git a/extensions/ConfirmEdit/HTMLCaptchaField.php b/extensions/ConfirmEdit/HTMLCaptchaField.php
index a458544c..6b1765d0 100644
--- a/extensions/ConfirmEdit/HTMLCaptchaField.php
+++ b/extensions/ConfirmEdit/HTMLCaptchaField.php
@@ -33,11 +33,11 @@ class HTMLCaptchaField extends HTMLFormField {
 	 */
 	private $validationResult;
 
-	public function __construct( $params ){
+	public function __construct( $params ) {
 		parent::__construct( $params );
 
 		// For differentiating the type of form, mainly
-		if( isset( $params['prefix'] ) ){
+		if ( isset( $params['prefix'] ) ) {
 			$this->prefix = $params['prefix'];
 		}
 	}
@@ -48,29 +48,29 @@ class HTMLCaptchaField extends HTMLFormField {
 	 * @param  $value String
 	 * @return String
 	 */
-	public function getInputHTML( $value ){
+	public function getInputHTML( $value ) {
 		# TODO
 	}
 
-	public function validate( $data, $alldata ){
+	public function validate( $data, $alldata ) {
 		// We sent back the exists status of the captcha before.  If it *doesn't* exist
 		// we actually want to validate this as true, because we don't want an angry red
 		// error message, just for the user to put the captcha in again
-		if( $data === false ){
+		if ( $data === false ) {
 			return true;
 		}
 
-		
+
 	}
 
 	/**
 	 * @param  $request WebRequest
 	 * @return void
 	 */
-	public function loadDataFromRequest( $request ){
+	public function loadDataFromRequest( $request ) {
 		$this->captcha = Captcha::factory();
 		$this->captcha->loadFromRequest( $request, $this );
-		if( !$this->captcha->exists() ){
+		if ( !$this->captcha->exists() ) {
 			// The captcha doesn't exist; probably because it's already been used and
 			// then deleted for security.  Load the field up with a new captcha which
 			// will be shown to the user when the validation of said new object fails
diff --git a/extensions/ConfirmEdit/MathCaptcha.class.php b/extensions/ConfirmEdit/MathCaptcha.class.php
index 220df31d..7874991f 100644
--- a/extensions/ConfirmEdit/MathCaptcha.class.php
+++ b/extensions/ConfirmEdit/MathCaptcha.class.php
@@ -22,7 +22,7 @@ class MathCaptcha extends SimpleCaptcha {
 		$index = $this->storeCaptcha( array( 'answer' => $answer ) );
 
 		$form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';
-		$form .= '<td>' . Xml::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';
+		$form .= '<td>' . Html::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1', 'required' ) ) . '</td></tr></table>';
 		$form .= Html::hidden( 'wpCaptchaId', $index );
 		return $form;
 	}
@@ -39,17 +39,11 @@ class MathCaptcha extends SimpleCaptcha {
 
 	/** Fetch the math */
 	function fetchMath( $sum ) {
-		// class_exists() unfortunately doesn't work with HipHop, and
-		// its replacement, MWInit::classExists(), wasn't added until
-		// MW 1.18, and is thus unusable here - so instead, we'll
-		// just duplicate the code of MWInit::classExists().
-		try {
-			$r = new ReflectionClass( 'MathRenderer' );
-		} catch( ReflectionException $r ) {
+		if ( MWInit::classExists( 'MathRenderer' ) ) {
+			$math = new MathRenderer( $sum );
+		} else {
 			throw new MWException( 'MathCaptcha requires the Math extension for MediaWiki versions 1.18 and above.' );
 		}
-
-		$math = new MathRenderer( $sum );
 		$math->setOutputMode( MW_MATH_PNG );
 		$html = $math->render();
 		return preg_replace( '/alt=".*?"/', '', $html );
diff --git a/extensions/ConfirmEdit/MathCaptcha.php b/extensions/ConfirmEdit/MathCaptcha.php
index 297feb5c..8c815bf7 100644
--- a/extensions/ConfirmEdit/MathCaptcha.php
+++ b/extensions/ConfirmEdit/MathCaptcha.php
@@ -12,8 +12,10 @@
  */
 
 if ( !defined( 'MEDIAWIKI' ) ) {
-	echo( "This file is an extension to the MediaWiki software and cannot be used standalone.\n" );
-	die( 1 );
+	exit;
 }
 
+require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$wgCaptchaClass = 'MathCaptcha';
+
 $wgAutoloadClasses['MathCaptcha'] = dirname( __FILE__ ) . '/MathCaptcha.class.php';
diff --git a/extensions/ConfirmEdit/QuestyCaptcha.class.php b/extensions/ConfirmEdit/QuestyCaptcha.class.php
index 90e4b186..8e87db30 100644
--- a/extensions/ConfirmEdit/QuestyCaptcha.class.php
+++ b/extensions/ConfirmEdit/QuestyCaptcha.class.php
@@ -40,9 +40,10 @@ class QuestyCaptcha extends SimpleCaptcha {
 		}
 		$index = $this->storeCaptcha( $captcha );
 		return "<p><label for=\"wpCaptchaWord\">{$captcha['question']}</label> " .
-			Xml::element( 'input', array(
+			Html::element( 'input', array(
 				'name' => 'wpCaptchaWord',
 				'id'   => 'wpCaptchaWord',
+				'required',
 				'tabindex' => 1 ) ) . // tab in before the edit textarea
 			"</p>\n" .
 			Xml::element( 'input', array(
diff --git a/extensions/ConfirmEdit/QuestyCaptcha.i18n.php b/extensions/ConfirmEdit/QuestyCaptcha.i18n.php
index 458343ee..ec76be00 100644
--- a/extensions/ConfirmEdit/QuestyCaptcha.i18n.php
+++ b/extensions/ConfirmEdit/QuestyCaptcha.i18n.php
@@ -68,6 +68,7 @@ $messages['aln'] = array(
 );
 
 /** Arabic (العربية)
+ * @author Ciphers
  * @author Meno25
  * @author OsamaK
  */
@@ -79,6 +80,7 @@ $messages['ar'] = array(
 	'questycaptcha-createaccount' => 'للمساعدة في الحماية من إنشاء الحسابات التلقائي، من فضلك أجب على السؤال الذي يظهر أدناه ([[Special:Captcha/help|مزيد من المعلومات]]):',
 	'questycaptcha-create' => 'لتنشئ الصفحة، من فضلك أجب على السؤال الذي يظهر أدناه ([[Special:Captcha/help|مزيد من المعلومات]]):',
 	'questycaptcha-edit' => 'لتحرّر هذه الصفحة، من فضلك أجب على السؤال الذي يظهر أدناه ([[Special:Captcha/help|مزيد من المعلومات]]):',
+	'questycaptcha-sendemail' => 'للمساعدة في الحماية ضد البريد الإلكتروني الآلي المرغوب فيه، الرجاء الإجابة على السؤال الذي يظهر أدناه ([[Special:Captcha/help|المزيد من المعلومات]]):',
 	'questycaptchahelp-text' => "عادة ما يتم في المواقع التي تقبل الردود والرسائل من العامة، كهذا الويكي، تخريب الموقع عن طريق الأشخاص الذين يستعملون آليات معينة لإرسال وصلاتهم لمواقع متعددة بصورة آلية.
 وعلى الرغم من أن هذا يمكن إزالته ولكنه مزعج للغاية.
 
@@ -217,13 +219,14 @@ Pro návrat na předchozí stránku stiskněte ve svém prohlížeči tlačítko
  * @author Umherirrender
  */
 $messages['de'] = array(
+	'questycaptcha-desc' => 'Questy-CAPTCHA-Generator für die Erweiterung „Confirm Edit“',
 	'questycaptcha-addurl' => 'Deine Bearbeitung enthält neue externe Links.
-Zum Schutz vor automatisiertem Spam beantworte bitte die untenstehende Frage ([[Special:Captcha/help|weitere Informationen]]):',
-	'questycaptcha-badlogin' => 'Zum Schutz vor einer Kompromittierung deines Benutzerkontos beantworte bitte die folgende Frage ([[Special:Captcha/help|weitere Informationen]]):',
+Zum Schutz vor automatisiertem Spam, beantworte bitte die untenstehende Frage, um die Seite speichern zu können ([[Special:Captcha/help|weitere Informationen]]):',
+	'questycaptcha-badlogin' => 'Zum Schutz vor einer Kompromittierung deines Benutzerkontos, beantworte bitte die untenstehende Frage, um dich anmelden zu können ([[Special:Captcha/help|weitere Informationen]]):',
 	'questycaptcha-createaccount' => 'Zum Schutz vor einer automatisierten Anlage von Benutzerkonten ist es erforderlich, die folgende Frage zu beantworten ([[Special:Captcha/help|weitere Informationen]]):',
 	'questycaptcha-create' => 'Bitte beantworte die folgende Frage, um diese Seite erstellen zu können ([[Special:Captcha/help|weitere Informationen]]):',
-	'questycaptcha-edit' => 'Bitte beantworte die folgende Frage, um diese Seite bearbeiten zu können ([[Special:Captcha/help|weitere Informationen]]):',
-	'questycaptcha-sendemail' => 'Zum Schutz vor automatisiertem Spam bitten wir dich, die unten angezeigte Frage zu beantworten ([[Special:Captcha/help|weitere Informationen]]):',
+	'questycaptcha-edit' => 'Bitte beantworte die folgende Frage, um diese Seite speichern zu können ([[Special:Captcha/help|weitere Informationen]]):',
+	'questycaptcha-sendemail' => 'Zum Schutz vor automatisiertem Spam, beantworte bitte die untenstehende Frage, um die E-Mail-Nachricht senden zu können ([[Special:Captcha/help|weitere Informationen]]):',
 	'questycaptchahelp-text' => 'Internetangebote, die — wie dieses Wiki — für Beiträge von praktisch jedem offen sind, werden häufig von Spammern missbraucht, welche versuchen, mithilfe entsprechender Werkzeuge ihre Links automatisch auf vielen Webseiten zu platzieren.
 Zwar können derartige Spam-Links wieder entfernt werden, doch stellen sie trotzdem ein erhebliches Ärgernis dar.
 
@@ -232,7 +235,7 @@ Da es kaum möglich ist, dies zu automatisieren, können hierdurch die meisten S
 
 Sollte dich dieses Verfahren beim Vornehmen erwünschter Bearbeitungen behindern, wende dich bitte an einen [[{{MediaWiki:Grouppage-sysop}}|Administrator]], um Unterstützung zu erhalten.
 
-Der „Zurück“-Knopf des Browsers führt zurück zum Bearbeitungsfenster.',
+Die Schaltfläche „Zurück“ des Browsers führt zurück zum vorherigen Bearbeitungsfenster.',
 );
 
 /** German (formal address) (‪Deutsch (Sie-Form)‬)
@@ -328,6 +331,27 @@ Por favor contacta a los [[{{MediaWiki:Grouppage-sysop}}|administradores del sit
 Haz click en el botón 'atrás' en tu navegador para regresar al editor de página.",
 );
 
+/** Estonian (Eesti)
+ * @author Pikne
+ */
+$messages['et'] = array(
+	'questycaptcha-addurl' => 'Sinu muudatus sisaldab uusi välislinke.
+Palun vasta alljärgnevale küsimusele. Abinõu on kaitseks automaadistatud rämpsmuudatuste eest ([[Special:Captcha/help|lisateave]]):',
+	'questycaptcha-badlogin' => 'Palun vasta alljärgnevale küsimusele. Abinõu on kaitseks automaatsete parooliäraarvajate eest ([[Special:Captcha/help|lisateave]]):',
+	'questycaptcha-createaccount' => 'Palun vasta alljärgnevale küsimusele. Abinõu on kaitseks kontode automaatse loomise eest ([[Special:Captcha/help|lisateave]]):',
+	'questycaptcha-create' => 'Lehekülje loomiseks vasta palun alljärgnevale küsimusele ([[Special:Captcha/help|lisateave]]):',
+	'questycaptcha-edit' => 'Selle lehekülje muutmiseks vasta palun alljärgnevale küsimusele ([[Special:Captcha/help|lisateave]]):',
+	'questycaptcha-sendemail' => 'Palun vasta alljärgnevale küsimusele. Abinõu on kaitseks automaadistatud rämpsmuudatuste eest ([[Special:Captcha/help|lisateave]]):',
+	'questycaptchahelp-text' => "Võrgukohti, mis lubavad külastajatel sisu muuta, nagu ka see viki, kasutavad sageli rämpsposti levitajad, lisades näiteks lehekülgedele reklaamilinke. Kuigi neid linke saab eemaldada, on nad siiski tülikad.
+
+Kasutajakontot registreerides või mõnele lehele uusi internetiaadresse postitades võidakse paluda sul küsimusele vastata.
+Kuna sellist tegevust on raske automaadistada, on see efektiivseks kaitseks rämpspostirobotite vastu ja lubab samas tavakasutajatel rahus muudatusi teha.
+
+Kui sul tekib raskusi muudatuste tegemisel, võta palun ühendust selle võrgukoha [[{{MediaWiki:Grouppage-sysop}}|administraatoritega]].
+
+Redigeerimislehele naasmiseks klõpsa võrgulehitseja ''tagasi''-nuppu.",
+);
+
 /** Basque (Euskara)
  * @author Kobazulo
  */
@@ -544,6 +568,28 @@ Silakan hubungi [[{{MediaWiki:Grouppage-sysop}}|pengurus]] untuk meminta bantuan
 Tekan tombol 'back' di penjelajah web Anda untuk kembali ke halaman penyuntingan.",
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'questycaptcha-addurl' => 'Ti inurnos mo ket adda nagyan na a baro a panilpo ti ruar.
+Tapno  makasalaknib kadagiti automatiko a spam, pangaasim a sungbatan ti saludsud a nagparang dita baba. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'questycaptcha-badlogin' => 'Tapno  makasalaknib kadagiti automatiko a pinagsulbar ti kontrasenias, pangaasim a sungbatan ti saludsud a nagparang dita baba. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'questycaptcha-createaccount' => 'Tapno  makasalaknib kadagiti automatiko a pinagaramid ti pakabilangan, pangaasim a sungbatan ti saludsud a nagparang dita baba. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'questycaptcha-create' => 'Tapno makaaramid ti panid, pangaasim a sungbatan ti saludsud a nagparang dita baba. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'questycaptcha-edit' => 'Tapno makaurnoy ditoya panid, pangaasim a sungbatan ti saludsud a nagparang dita baba. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'questycaptcha-sendemail' => 'Tapno  makasalaknib kadagiti automatiko a pinagspam, pangaasim a sungbatan ti saludsud a nagparang dita baba. ([[Special:Captcha/help|adu pay a pakaammo]]):',
+	'questycaptchahelp-text' => "Dagiti sapot a pagsaadan nga agaw-awat kadagiti maipablaak iti publiko, kasla daytoy a wiki, ket kanayon nga inabuso dagiti spammers nga agus-usar ti automatiko a ramramit ti pinagipablaak da kadagiti kukua da a panilpo ti adu a pagsasaadan. 
+Maikkat met dagitoy a panilpo, mgen makariri da unay.
+
+No sagpaminsan pay, nangruna no agikabil kadagiti baro a panilpo ti sapot iti panid, ti wiki ket agdamag kenka nga agsungbat ti maysa a saludsod. 
+Yantangay daytoy ket obra a narigat a ma-automatiko, agpalubos kadagiti agpayso a tattao ti agipablaak bayat nga agpasardeng ti kaaduan a spammers ken dagiti robot nga agraraut.
+
+Pangngaasi a kontaken ti [[{{MediaWiki:Grouppage-sysop}}|administrador ti pagsaadan ]] para iti pannulong no daytoy ket saan a napadpadaanan a pawilan na ti agpayso a pinagbaplaak mo.
+
+Peslen ti 'agsubli' a buton dita pagbasabasam (browser) ti agsubli idiay panid ti pinagurnos.",
+);
+
 /** Italian (Italiano)
  * @author Beta16
  * @author Darth Kule
@@ -710,6 +756,29 @@ Sila hubungi [[{{MediaWiki:Grouppage-sysop}}|pentadbir laman]] untuk mendapatkan
 Klik butang '←' untuk kembali ke editor laman.",
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Nghtwlkr
+ * @author Simny
+ */
+$messages['nb'] = array(
+	'questycaptcha-addurl' => 'Din endring inneholder nye eksterne lenker.
+For å beskytte mot autmatisert spam, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
+	'questycaptcha-badlogin' => 'For å hindre passordtyveri, vær vennlig og svar på spørsmålet under ([[Special:Captcha/help|mer informasjon]]):',
+	'questycaptcha-createaccount' => 'For å beskytte mot autmatisert spam, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
+	'questycaptcha-create' => 'For å opprette siden, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
+	'questycaptcha-edit' => 'For å endre denne siden, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
+	'questycaptcha-sendemail' => 'For å beskytte mot automatisert søppelpost, svar på spørsmålet som vises nedenfor ([[Special:Captcha/help|mer info]]):',
+	'questycaptchahelp-text' => "Nettsteder som tar imot bidrag fra allmennheten, som denne wikien, er ofte utsatt for angrep fra spammere som bruker automatiserte verktøy for å legge til lenker til mange sider.
+Selv om disse spam-lenkene kan fjernes er de en stor plage.
+
+Iblant, spesielt ved tillegg av nye lenker til en side, kan wikien be deg svare på et spørsmål.
+Siden dette er en oppgave som er vanskelig å automatisere, vil den tillate de fleste virkelige personer å bidra mens den stopper de fleste spammere og andre robotangrep.
+
+Vennligst kontakt [[{{MediaWiki:Grouppage-sysop}}|sideadministratorer]] for hjelp dersom dette er uventet hindrer deg fra å bidra med legitime bidrag.
+
+Klikk på 'tilbake'-knappen i nettleseren din for å gå tilbake til sideeditoren.",
+);
+
 /** Dutch (Nederlands)
  * @author Siebrand
  */
@@ -743,29 +812,6 @@ Som ei hjelp til å unngå automatisert spam, ver venleg og skiv inn spørsmåle
 	'questycaptcha-edit' => 'For å endra sida, ver venleg og svar på spørsmålet som er synt nedanfor ([[Special:Captcha/help|meir informasjon]]):',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Nghtwlkr
- * @author Simny
- */
-$messages['no'] = array(
-	'questycaptcha-addurl' => 'Din endring inneholder nye eksterne lenker.
-For å beskytte mot autmatisert spam, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
-	'questycaptcha-badlogin' => 'For å hindre passordtyveri, vær vennlig og svar på spørsmålet under ([[Special:Captcha/help|mer informasjon]]):',
-	'questycaptcha-createaccount' => 'For å beskytte mot autmatisert spam, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
-	'questycaptcha-create' => 'For å opprette siden, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
-	'questycaptcha-edit' => 'For å endre denne siden, vennligst svar på spørsmålet som vises under ([[Special:Captcha/help|mer informasjon]]):',
-	'questycaptcha-sendemail' => 'For å beskytte mot automatisert søppelpost, svar på spørsmålet som vises nedenfor ([[Special:Captcha/help|mer info]]):',
-	'questycaptchahelp-text' => "Nettsteder som tar imot bidrag fra allmennheten, som denne wikien, er ofte utsatt for angrep fra spammere som bruker automatiserte verktøy for å legge til lenker til mange sider.
-Selv om disse spam-lenkene kan fjernes er de en stor plage.
-
-Iblant, spesielt ved tillegg av nye lenker til en side, kan wikien be deg svare på et spørsmål.
-Siden dette er en oppgave som er vanskelig å automatisere, vil den tillate de fleste virkelige personer å bidra mens den stopper de fleste spammere og andre robotangrep.
-
-Vennligst kontakt [[{{MediaWiki:Grouppage-sysop}}|sideadministratorer]] for hjelp dersom dette er uventet hindrer deg fra å bidra med legitime bidrag.
-
-Klikk på 'tilbake'-knappen i nettleseren din for å gå tilbake til sideeditoren.",
-);
-
 /** Occitan (Occitan)
  * @author Cedric31
  */
@@ -950,6 +996,18 @@ Kontaktujte prosím [[{{MediaWiki:Grouppage-sysop}}|správcov lokality]] ak potr
 Späť na úpravu stránky sa vrátite kliknutím na tlačidlo „Späť“ vo vašom prehliadači.',
 );
 
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
+ * @author Rancher
+ */
+$messages['sr-ec'] = array(
+	'questycaptcha-desc' => 'Стварач сликовног кода за потврду уређивања',
+);
+
+/** Serbian (Latin script) (‪Srpski (latinica)‬) */
+$messages['sr-el'] = array(
+	'questycaptcha-desc' => 'Stvarač slikovnog koda za potvrdu uređivanja',
+);
+
 /** Swedish (Svenska)
  * @author Boivie
  */
diff --git a/extensions/ConfirmEdit/QuestyCaptcha.php b/extensions/ConfirmEdit/QuestyCaptcha.php
index 351c3421..d4c23fd6 100644
--- a/extensions/ConfirmEdit/QuestyCaptcha.php
+++ b/extensions/ConfirmEdit/QuestyCaptcha.php
@@ -28,6 +28,9 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
+require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$wgCaptchaClass = 'QuestyCaptcha';
+
 global $wgCaptchaQuestions;
 $wgCaptchaQuestions = array();
 
diff --git a/extensions/ConfirmEdit/README b/extensions/ConfirmEdit/README
index f23fbb2b..1f6ddb3b 100644
--- a/extensions/ConfirmEdit/README
+++ b/extensions/ConfirmEdit/README
@@ -19,6 +19,8 @@ in a stylized way
 questions defined by the administrator(s)
 * ReCaptcha - users have to identify a series of characters, either
 visually or audially, from a widget provided by the reCAPTCHA service
+* Asirra - users have to identify the cats in a set of photos of cats
+and dogs, from a widget provided by the Microsoft Asirra service
 
 == License ==
 
@@ -35,4 +37,6 @@ The QuestyCaptcha module was written by Benjamin Lees.
 
 The reCAPTCHA module was written by Mike Crawford and Ben Maurer.
 
+The Asirra module was written by Bachsau.
+
 Additional maintenance work was done by Yaron Koren.
diff --git a/extensions/ConfirmEdit/ReCaptcha.class.php b/extensions/ConfirmEdit/ReCaptcha.class.php
new file mode 100644
index 00000000..b0c15fbd
--- /dev/null
+++ b/extensions/ConfirmEdit/ReCaptcha.class.php
@@ -0,0 +1,89 @@
+<?php
+
+class ReCaptcha extends SimpleCaptcha {
+	// reCAPTHCA error code returned from recaptcha_check_answer
+	private $recaptcha_error = null;
+
+	/**
+	 * Displays the reCAPTCHA widget.
+	 * If $this->recaptcha_error is set, it will display an error in the widget.
+	 *
+	 */
+	function getForm() {
+		global $wgReCaptchaPublicKey, $wgReCaptchaTheme;
+
+		$useHttps = ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] == 'on' );
+		$js = 'var RecaptchaOptions = ' . Xml::encodeJsVar( array( 'theme' => $wgReCaptchaTheme, 'tabindex' => 1  ) );
+
+		return Html::inlineScript( $js ) . recaptcha_get_html( $wgReCaptchaPublicKey, $this->recaptcha_error, $useHttps );
+	}
+
+	/**
+	 * Calls the library function recaptcha_check_answer to verify the users input.
+	 * Sets $this->recaptcha_error if the user is incorrect.
+	 * @return boolean
+	 *
+	 */
+	function passCaptcha() {
+		global $wgReCaptchaPrivateKey, $wgRequest;
+
+		// API is hardwired to return wpCaptchaId and wpCaptchaWord, so use that if the standard two are empty
+		$challenge = $wgRequest->getVal( 'recaptcha_challenge_field', $wgRequest->getVal( 'wpCaptchaId' ) );
+		$response = $wgRequest->getVal( 'recaptcha_response_field', $wgRequest->getVal( 'wpCaptchaWord' ) );
+
+		if ( $response === null ) {
+			// new captcha session
+			return false;
+		}
+
+		$recaptcha_response = recaptcha_check_answer(
+			$wgReCaptchaPrivateKey,
+			$wgRequest->getIP(),
+			$challenge,
+			$response
+		);
+
+		if ( !$recaptcha_response->is_valid ) {
+			$this->recaptcha_error = $recaptcha_response->error;
+			return false;
+		}
+
+		$recaptcha_error = null;
+
+		return true;
+
+	}
+
+	function addCaptchaAPI( &$resultArr ) {
+		global $wgReCaptchaPublicKey;
+
+		$resultArr['captcha']['type'] = 'recaptcha';
+		$resultArr['captcha']['mime'] = 'image/png';
+		$resultArr['captcha']['key'] = $wgReCaptchaPublicKey;
+		$resultArr['captcha']['error'] = $this->recaptcha_error;
+	}
+
+	/**
+	 * Show a message asking the user to enter a captcha on edit
+	 * The result will be treated as wiki text
+	 *
+	 * @param $action Action being performed
+	 * @return string
+	 */
+	function getMessage( $action ) {
+		$name = 'recaptcha-' . $action;
+		$text = wfMsg( $name );
+
+		# Obtain a more tailored message, if possible, otherwise, fall back to
+		# the default for edits
+		return wfEmptyMsg( $name, $text ) ? wfMsg( 'recaptcha-edit' ) : $text;
+	}
+
+	public function APIGetAllowedParams( &$module, &$params ) {
+		return true;
+	}
+
+	public function APIGetParamDescription( &$module, &$desc ) {
+		return true;
+	}
+}
diff --git a/extensions/ConfirmEdit/ReCaptcha.i18n.php b/extensions/ConfirmEdit/ReCaptcha.i18n.php
index a2001424..b9d3263a 100644
--- a/extensions/ConfirmEdit/ReCaptcha.i18n.php
+++ b/extensions/ConfirmEdit/ReCaptcha.i18n.php
@@ -19,11 +19,26 @@ $messages['en'] = array(
 	'recaptcha-create' => 'To help protect against automated page creation, please type the two words you see in the box below:', 
 );
 
+/** Message documentation (Message documentation)
+ * @author Umherirrender
+ */
+$messages['qqq'] = array(
+	'recaptcha-desc' => '{{desc}}',
+);
+
 /** Arabic (العربية)
+ * @author Alexknight12
+ * @author Ciphers
  * @author Meno25
  */
 $messages['ar'] = array(
 	'recaptcha-desc' => 'موديل reCAPTCHA لConfirm Edit',
+	'recaptcha-edit' => 'للمساعدة في الحماية ضد التحرير السبام، يرجى كتابة الكلمتين التي تراها في المربع أدناه :',
+	'recaptcha-addurl' => 'إن تعديلك يتضمن وصلات خارجية جديدة. للمساعدة في الحماية ضد السبام، يرجى كتابة الكلمتين التي تراها في المربع أدناه :',
+	'recaptcha-badpass' => 'للمساعدة في الحماية ضد الكسر الآلي لكلمة السر، يرجى كتابة الكلمتين اللتين تراهما في المربع أدناه :',
+	'recaptcha-createaccount' => 'للمساعدة في الحماية ضد الإنشاء الآلي للحسابات، رجاء اكتب الكلمتين اللتين تراهما في المربع أدناه:',
+	'recaptcha-createaccount-fail' => 'جواب reCAPTCHA غير صحيح أو مفقود.',
+	'recaptcha-create' => 'للمساعدة في الحماية ضد الإنشاء الآلي للصفحات، يرجى كتابة الكلمتين اللتين تراهما في المربع أدناه :',
 );
 
 /** Asturian (Asturianu)
@@ -93,24 +108,35 @@ $messages['cs'] = array(
  * @author Lloffiwr
  */
 $messages['cy'] = array(
-	'recaptcha-edit' => "Er mwyn ei gwneud yn annodd i olygyddion awtomatig osod sbam, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
+	'recaptcha-edit' => "Er mwyn ei gwneud yn anodd i olygyddion awtomatig osod sbam, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
 	'recaptcha-addurl' => "Mae'ch golygiad yn cynnwys cysylltiadau allanol newydd. Er mwyn helpu i ddiogelu rhag sbam awtomatig, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
 	'recaptcha-badpass' => "Er mwyn helpu i arbed rhag i'ch cyfrinair gael ei ddatrys gan beiriant, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
-	'recaptcha-createaccount' => "Er mwyn ei gwneud yn annodd i beiriannau i agor cyfrifon yn awtomatig, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
+	'recaptcha-createaccount' => "Er mwyn ei gwneud yn anodd i beiriannau i agor cyfrifon yn awtomatig, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
 	'recaptcha-createaccount-fail' => "Mae'r ateb i'r pos CAPTCHA yn anghywir neu yn eisiau.",
-	'recaptcha-create' => "Er mwyn ei gwneud yn annodd i beiriannau i ddechrau tudalennau yn awtomatig, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
+	'recaptcha-create' => "Er mwyn ei gwneud yn anodd i beiriannau i ddechrau tudalennau yn awtomatig, teipiwch y ddau air sydd i'w gweld yn y blwch isod:",
 );
 
-/** German (Deutsch) */
+/** German (Deutsch)
+ * @author Kghbln
+ * @author Umherirrender
+ */
 $messages['de'] = array(
+	'recaptcha-desc' => 'reCAPTCHA-Module für die Erweiterung „Confirm Edit“',
 	'recaptcha-edit' => 'Zum Schutz vor automatisiertem Spam, gib bitte die beiden folgenden Wörter in das untenstehende Feld ein:',
 	'recaptcha-addurl' => 'Deine Bearbeitung enthält neue externe Links. Zum Schutz vor automatisiertem Spam gib bitte die beiden folgenden Wörter in das folgende Feld ein:',
 	'recaptcha-badpass' => 'Zum Schutz gegen automatisiertes Knacken von Passwörtern, gib bitte die beiden folgenden Wörter in das folgende Feld ein:',
-	'recaptcha-createaccount' => 'Zum Schutz gegen automatisierte Erstellung von Benutzerkonten gib bitte die beiden folgenden Wörter in das folgende Feld ein:',
+	'recaptcha-createaccount' => 'Zum Schutz gegen die automatisierte Erstellung von Benutzerkonten bitten wir dich, die folgenden beiden Wörter in das untenstehende Feld einzugeben:',
 	'recaptcha-createaccount-fail' => 'Fehlerhafte oder fehlende reCAPTCHA Antwort.',
 	'recaptcha-create' => 'Zum Schutz gegen automatisierte Erstellung von Seiten gib bitte die beiden folgenden Wörter in das folgende Feld ein:',
 );
 
+/** German (formal address) (‪Deutsch (Sie-Form)‬)
+ * @author Kghbln
+ */
+$messages['de-formal'] = array(
+	'recaptcha-createaccount' => 'Zum Schutz gegen die automatisierte Erstellung von Benutzerkonten bitten wir Sie, die folgenden beiden Wörter in das untenstehende Feld einzugeben:',
+);
+
 /** Spanish (Español)
  * @author Fitoschido
  */
@@ -204,6 +230,18 @@ $messages['id'] = array(
 	'recaptcha-create' => 'Untuk membantu pelindungan terhadap pembuatan halaman otomatis, silakan ketik dua kata yang Anda lihat dalam kotak di bawah ini:',
 );
 
+/** Italian (Italiano)
+ * @author Nemo bis
+ */
+$messages['it'] = array(
+	'recaptcha-edit' => 'Per aiutarci a proteggerci dalle modifiche automatiche che aggiungono spam, scrivi le due parole mostrate nel riquadro sottostante:',
+	'recaptcha-addurl' => 'La tua modifica aggiunge qualche nuovo collegamento esterno. Per aiutarci a proteggerci dallo spam automatico, scrivi le due parole mostrate nel riquadro sottostante:',
+	'recaptcha-badpass' => 'Per aiutarci a proteggerci dalla forzatura automatica delle password, scrivi le due parole mostrate nel riquadro sottostante:',
+	'recaptcha-createaccount' => 'Per aiutarci a proteggerci dalla creazione automatica di nuovi accessi, scrivi le due parole mostrate nel riquadro sottostante:',
+	'recaptcha-createaccount-fail' => 'Risposta reCAPTCHA mancante o errata.',
+	'recaptcha-create' => 'Per aiutarci a proteggerci dalla creazione automatica di pagine, scrivi le due parole mostrate nel riquadro sottostante:',
+);
+
 /** Japanese (日本語) */
 $messages['ja'] = array(
 	'recaptcha-edit' => '自動編集スパムからの保護のため、下の画像に表示されている２つの言葉を入力 してください。',
@@ -268,6 +306,18 @@ $messages['ms'] = array(
 	'recaptcha-create' => 'Untuk membanteras kegiatan mencipta laman secara automatik, sila taipkan dua perkataan yang anda lihat dalam petak di bawah:',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Event
+ */
+$messages['nb'] = array(
+	'recaptcha-edit' => 'Som beskyttelse mot automatisk redigert spam, vennligst skriv inn de to ordene du ser i boksen under:',
+	'recaptcha-addurl' => 'Din redigering inneholder nye eksterne lenker. Som beskyttelse mot automatisk spam, vennligst skriv inn de to ordene du ser i boksen under:',
+	'recaptcha-badpass' => 'Som beskyttelse mot automatisk passordknekking, vennligst skriv inn de to ordene du ser i boksen under:',
+	'recaptcha-createaccount' => 'Som beskyttelse mot automatisk opprettelse av brukerkonto, vennligst skriv inn de to ordene du ser i boksen under:',
+	'recaptcha-createaccount-fail' => 'Feil eller manglende reCAPTCHA-svar.',
+	'recaptcha-create' => 'Som beskyttelse mot automatisk opprettelse av side, vennligst skriv inn de to ordene du ser i boksen under:',
+);
+
 /** Dutch (Nederlands)
  * @author Siebrand
  */
@@ -337,6 +387,18 @@ $messages['ru'] = array(
 	'recaptcha-create' => 'В целях защиты от автоматического создания страниц, пожалуйста, введите два слова, которые вы видите ниже:',
 );
 
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
+ * @author Rancher
+ */
+$messages['sr-ec'] = array(
+	'recaptcha-desc' => 'Модул reCAPTCHA за потврду уређивања',
+);
+
+/** Serbian (Latin script) (‪Srpski (latinica)‬) */
+$messages['sr-el'] = array(
+	'recaptcha-desc' => 'Modul reCAPTCHA za potvrdu uređivanja',
+);
+
 /** Swedish (Svenska) */
 $messages['sv'] = array(
 	'recaptcha-edit' => 'Den här sidan skyddas mot spam-robotar, bevisa att du är en människa genom att skriva de två orden du ser i boxen nedan:',
@@ -390,13 +452,24 @@ $messages['vi'] = array(
 
 /** Simplified Chinese (‪中文(简体)‬)
  * @author Hydra
+ * @author Hzy980512
  */
 $messages['zh-hans'] = array(
 	'recaptcha-edit' => '要帮助保护免受垃圾邮件自动的编辑，请键入您在下面的框中看到这两个词：',
 	'recaptcha-addurl' => '您的编辑包含新的外部链接。为了帮助防止自动垃圾邮件，请键入您在下面的框中看到这两个词：',
 	'recaptcha-badpass' => '为帮助防止自动密码破解，请键入您看到下面的框中的两个字：',
-	'recaptcha-createaccount' => '为了帮助防止创建自动化的帐户，请键入您在下面的框中看到的这两个字：',
+	'recaptcha-createaccount' => '为了防止自动程序创建账户，请键入您在下面的框中看到的两个词：',
 	'recaptcha-createaccount-fail' => '不正确或缺失的 reCAPTCHA 答案。',
-	'recaptcha-create' => '为了帮助防止自动的页创建，请键入您在下面的框中看到这两个词：',
+	'recaptcha-create' => '为了防止自动程序创建页面，请输入您在下面的框中看到的两个词：',
+);
+
+/** Traditional Chinese (‪中文(繁體)‬) */
+$messages['zh-hant'] = array(
+	'recaptcha-edit' => '要幫助保護免受垃圾郵件自動的編輯，請鍵入您在下面的框中看到這兩個詞：',
+	'recaptcha-addurl' => '您的編輯包含新的外部鏈接。為了幫助防止自動垃圾郵件，請鍵入您在下面的框中看到這兩個詞：',
+	'recaptcha-badpass' => '為幫助防止自動密碼破解，請鍵入您看到下面的框中的兩個字：',
+	'recaptcha-createaccount' => '為了幫助防止創建自動化的帳戶，請鍵入您在下面的框中看到的這兩個字：',
+	'recaptcha-createaccount-fail' => '不正確或缺失的 reCAPTCHA 答案。',
+	'recaptcha-create' => '為了幫助防止自動的頁創建，請鍵入您在下面的框中看到這兩個詞：',
 );
 
diff --git a/extensions/ConfirmEdit/ReCaptcha.php b/extensions/ConfirmEdit/ReCaptcha.php
index b068b86e..cedaae10 100644
--- a/extensions/ConfirmEdit/ReCaptcha.php
+++ b/extensions/ConfirmEdit/ReCaptcha.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * Captcha class using the reCAPTCHA widget. 
- * Stop Spam. Read Books.  
+ * Captcha class using the reCAPTCHA widget.
+ * Stop Spam. Read Books.
  *
  * @addtogroup Extensions
  * @author Mike Crawford <mike.crawford@gmail.com>
@@ -10,11 +10,18 @@
  * @licence MIT/X11
  */
 
-if( !defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
-$wgExtensionMessagesFiles['ReCaptcha'] = dirname( __FILE__ ) . '/ReCaptcha.i18n.php';
+require_once dirname( __FILE__ ) . '/ConfirmEdit.php';
+$wgCaptchaClass = 'ReCaptcha';
+
+$dir = dirname( __FILE__ );
+
+$wgExtensionMessagesFiles['ReCaptcha'] = $dir . '/ReCaptcha.i18n.php';
+
+$wgAutoloadClasses['ReCaptcha'] = $dir . '/ReCaptcha.class.php';
 
 require_once( 'recaptchalib.php' );
 
@@ -25,6 +32,13 @@ $wgReCaptchaPrivateKey = '';
 $recaptcha_public_key = '';
 $recaptcha_private_key = '';
 
+/**
+ * Sets the theme for ReCaptcha
+ *
+ * See http://code.google.com/apis/recaptcha/docs/customization.html
+ */
+$wgReCaptchaTheme = 'red';
+
 $wgExtensionFunctions[] = 'efReCaptcha';
 
 /**
@@ -43,92 +57,9 @@ function efReCaptcha() {
 		$wgReCaptchaPrivateKey = $recaptcha_private_key;
 	}
 
-	if ($wgReCaptchaPublicKey == '' || $wgReCaptchaPrivateKey == '') {
-		die ('You need to set $wgReCaptchaPrivateKey and $wgReCaptchaPublicKey in LocalSettings.php to ' .
-		     "use the reCAPTCHA plugin. You can sign up for a key <a href='" .
-		     htmlentities(recaptcha_get_signup_url ($wgServerName, "mediawiki")) . "'>here</a>.");
-	}	
-}
-
-
-class ReCaptcha extends SimpleCaptcha {
-
-	//reCAPTHCA error code returned from recaptcha_check_answer
-	private $recaptcha_error = null;
-
-	/**
-	 * Displays the reCAPTCHA widget.
-         * If $this->recaptcha_error is set, it will display an error in the widget.
-	 *
-         */
-	function getForm() {
-		global $wgReCaptchaPublicKey;
-		$useHttps = ( isset( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] == 'on' );
-		return "<script>var RecaptchaOptions = { tabindex : 1 }; </script> " .
-			recaptcha_get_html($wgReCaptchaPublicKey, $this->recaptcha_error, $useHttps);
+	if ( $wgReCaptchaPublicKey == '' || $wgReCaptchaPrivateKey == '' ) {
+		die ( 'You need to set $wgReCaptchaPrivateKey and $wgReCaptchaPublicKey in LocalSettings.php to ' .
+				"use the reCAPTCHA plugin. You can sign up for a key <a href='" .
+				htmlentities( recaptcha_get_signup_url ( $wgServerName, "mediawiki" ) ) . "'>here</a>." );
 	}
-
-	/**
-	 * Calls the library function recaptcha_check_answer to verify the users input.
-	 * Sets $this->recaptcha_error if the user is incorrect.
-         * @return boolean
-         *
-         */
-	function passCaptcha() {
-		global $wgReCaptchaPrivateKey;
-		$recaptcha_response = recaptcha_check_answer ($wgReCaptchaPrivateKey,
-							      wfGetIP (),
-							      $_POST['recaptcha_challenge_field'],
-							      $_POST['recaptcha_response_field']);
-                if (!$recaptcha_response->is_valid) {
-			$this->recaptcha_error = $recaptcha_response->error;
-			return false;
-                }
-		$recaptcha_error = null;
-                return true;
-
-	}
-
-	/**
-	 * Called on all edit page saves. (EditFilter events)
-	 * @return boolean - true if page save should continue, false if should display Captcha widget.
-	 */
-	function confirmEdit( $editPage, $newtext, $section, $merged = false ) {
-		if( $this->shouldCheck( $editPage, $newtext, $section ) ) {
-
-			if (!isset($_POST['recaptcha_response_field'])) {
-					//User has not yet been presented with Captcha, show the widget.
-					$editPage->showEditForm( array( &$this, 'editCallback' ) );
-					return false;
-			}
-
-			if( $this->passCaptcha() ) {
-					return true;
-			} else {
-					//Try again - show the widget
-					$editPage->showEditForm( array( &$this, 'editCallback' ) );
-					return false;
-			}
-
-		} else {
-			wfDebug( "ConfirmEdit: no need to show captcha.\n" );
-			return true;
-		}
-	}
-
-	/**
-	 * Show a message asking the user to enter a captcha on edit
-	 * The result will be treated as wiki text
-	 *
-	 * @param $action Action being performed
-	 * @return string
-	 */
-	function getMessage( $action ) {
-		$name = 'recaptcha-' . $action;
-		$text = wfMsg( $name );
-		# Obtain a more tailored message, if possible, otherwise, fall back to
-		# the default for edits
-		return wfEmptyMsg( $name, $text ) ? wfMsg( 'recaptcha-edit' ) : $text;
-	}
-
 }
diff --git a/extensions/ConfirmEdit/ext.confirmedit.asirra.js b/extensions/ConfirmEdit/ext.confirmedit.asirra.js
new file mode 100644
index 00000000..6294b4f1
--- /dev/null
+++ b/extensions/ConfirmEdit/ext.confirmedit.asirra.js
@@ -0,0 +1,55 @@
+/*======================================================================*\
+|| #################################################################### ||
+|| # Asirra module for ConfirmEdit by Bachsau                         # ||
+|| # ---------------------------------------------------------------- # ||
+|| # This code is released into public domain, in the hope that it    # ||
+|| # will be useful, but without any warranty.                        # ||
+|| # ------------ YOU CAN DO WITH IT WHATEVER YOU LIKE! ------------- # ||
+|| #################################################################### ||
+\*======================================================================*/
+
+jQuery( function( $ ) {
+	var asirraform = $( "form#userlogin2" )
+	var submitButtonClicked = document.createElement("input");
+	var passThroughFormSubmit = false;
+
+	function PrepareSubmit() {
+		console.log( 'daa' );
+		submitButtonClicked.type = "hidden";
+		var inputFields = asirraform.find( "input" );
+		for (var i=0; i<inputFields.length; i++) {
+			if (inputFields[i].type === "submit") {
+				inputFields[i].onclick = function(event) {
+					console.log( this );
+					submitButtonClicked.name = this.name;
+					submitButtonClicked.value = this.value;
+				}
+			}
+		}
+
+		asirraform.submit( function() {
+			return MySubmitForm();
+		} );
+	}
+
+	function MySubmitForm() {
+		if (passThroughFormSubmit) {
+			return true;
+		}
+		Asirra_CheckIfHuman(HumanCheckComplete);
+		return false;
+	}
+
+	function HumanCheckComplete(isHuman) {
+		if (!isHuman) {
+			alert( mw.msg( 'asirra-failed' ) );
+		} else {
+			asirraform.append(submitButtonClicked);
+			passThroughFormSubmit = true;
+			asirraform.submit();
+		}
+	}
+	
+	PrepareSubmit();
+	
+} );
diff --git a/extensions/ConfirmEdit/recaptchalib.php b/extensions/ConfirmEdit/recaptchalib.php
index 32c4f4d7..8e2c0c4f 100644
--- a/extensions/ConfirmEdit/recaptchalib.php
+++ b/extensions/ConfirmEdit/recaptchalib.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * This is a PHP library that handles calling reCAPTCHA.
  *    - Documentation and latest version
  *          http://recaptcha.net/plugins/php/
@@ -35,22 +35,22 @@
 /**
  * The reCAPTCHA server URL's
  */
-define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
-define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
-define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
+define( "RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api" );
+define( "RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api" );
+define( "RECAPTCHA_VERIFY_SERVER", "www.google.com" );
 
 /**
  * Encodes the given data into a query string format
  * @param $data - array of string elements to be encoded
  * @return string - encoded request
  */
-function _recaptcha_qsencode ($data) {
+function _recaptcha_qsencode ( $data ) {
         $req = "";
         foreach ( $data as $key => $value )
-                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+                $req .= $key . '=' . urlencode( stripslashes( $value ) ) . '&';
 
         // Cut the last '&'
-        $req=substr($req,0,strlen($req)-1);
+        $req = substr( $req, 0, strlen( $req ) -1 );
         return $req;
 }
 
@@ -64,29 +64,29 @@ function _recaptcha_qsencode ($data) {
  * @param int port
  * @return array response
  */
-function _recaptcha_http_post($host, $path, $data, $port = 80) {
+function _recaptcha_http_post( $host, $path, $data, $port = 80 ) {
 
-        $req = _recaptcha_qsencode ($data);
+        $req = _recaptcha_qsencode ( $data );
 
         $http_request  = "POST $path HTTP/1.0\r\n";
         $http_request .= "Host: $host\r\n";
         $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
-        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "Content-Length: " . strlen( $req ) . "\r\n";
         $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
         $http_request .= "\r\n";
         $http_request .= $req;
 
         $response = '';
-        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
-                die ('Could not open socket');
+        if ( false == ( $fs = @fsockopen( $host, $port, $errno, $errstr, 10 ) ) ) {
+                die ( 'Could not open socket' );
         }
 
-        fwrite($fs, $http_request);
+        fwrite( $fs, $http_request );
 
-        while ( !feof($fs) )
-                $response .= fgets($fs, 1160); // One TCP-IP packet
-        fclose($fs);
-        $response = explode("\r\n\r\n", $response, 2);
+        while ( !feof( $fs ) )
+                $response .= fgets( $fs, 1160 ); // One TCP-IP packet
+        fclose( $fs );
+        $response = explode( "\r\n\r\n", $response, 2 );
 
         return $response;
 }
@@ -103,26 +103,26 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) {
 
  * @return string - The HTML to be embedded in the user's form.
  */
-function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+function recaptcha_get_html ( $pubkey, $error = null, $use_ssl = false )
 {
-	if ($pubkey == null || $pubkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+	if ( $pubkey == null || $pubkey == '' ) {
+		die ( "To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>" );
 	}
-	
-	if ($use_ssl) {
+
+	if ( $use_ssl ) {
                 $server = RECAPTCHA_API_SECURE_SERVER;
         } else {
                 $server = RECAPTCHA_API_SERVER;
         }
 
         $errorpart = "";
-        if ($error) {
+        if ( $error ) {
            $errorpart = "&amp;error=" . $error;
         }
-        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+        return '<script type="text/javascript" src="' . $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
 
 	<noscript>
-  		<iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+  		<iframe src="' . $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
   		<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
   		<input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
 	</noscript>';
@@ -149,27 +149,27 @@ class ReCaptchaResponse {
   * @param array $extra_params an array of extra variables to post to the server
   * @return ReCaptchaResponse
   */
-function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+function recaptcha_check_answer ( $privkey, $remoteip, $challenge, $response, $extra_params = array() )
 {
-	if ($privkey == null || $privkey == '') {
-		die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+	if ( $privkey == null || $privkey == '' ) {
+		die ( "To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>" );
 	}
 
-	if ($remoteip == null || $remoteip == '') {
-		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+	if ( $remoteip == null || $remoteip == '' ) {
+		die ( "For security reasons, you must pass the remote ip to reCAPTCHA" );
 	}
 
-	
-	
-        //discard spam submissions
-        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+
+
+        // discard spam submissions
+        if ( $challenge == null || strlen( $challenge ) == 0 || $response == null || strlen( $response ) == 0 ) {
                 $recaptcha_response = new ReCaptchaResponse();
                 $recaptcha_response->is_valid = false;
                 $recaptcha_response->error = 'incorrect-captcha-sol';
                 return $recaptcha_response;
         }
 
-        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+        $response = _recaptcha_http_post ( RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
                                           array (
                                                  'privatekey' => $privkey,
                                                  'remoteip' => $remoteip,
@@ -178,10 +178,10 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
                                                  ) + $extra_params
                                           );
 
-        $answers = explode ("\n", $response [1]);
+        $answers = explode ( "\n", $response [1] );
         $recaptcha_response = new ReCaptchaResponse();
 
-        if (trim ($answers [0]) == 'true') {
+        if ( trim ( $answers [0] ) == 'true' ) {
                 $recaptcha_response->is_valid = true;
         }
         else {
@@ -199,45 +199,45 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
  * @param string $domain The domain where the page is hosted
  * @param string $appname The name of your application
  */
-function recaptcha_get_signup_url ($domain = null, $appname = null) {
-	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+function recaptcha_get_signup_url ( $domain = null, $appname = null ) {
+	return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode ( array ( 'domains' => $domain, 'app' => $appname ) );
 }
 
-function _recaptcha_aes_pad($val) {
+function _recaptcha_aes_pad( $val ) {
 	$block_size = 16;
-	$numpad = $block_size - (strlen ($val) % $block_size);
-	return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+	$numpad = $block_size - ( strlen ( $val ) % $block_size );
+	return str_pad( $val, strlen ( $val ) + $numpad, chr( $numpad ) );
 }
 
 /* Mailhide related code */
 
-function _recaptcha_aes_encrypt($val,$ky) {
-	if (! function_exists ("mcrypt_encrypt")) {
-		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+function _recaptcha_aes_encrypt( $val, $ky ) {
+	if ( ! function_exists ( "mcrypt_encrypt" ) ) {
+		die ( "To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed." );
 	}
-	$mode=MCRYPT_MODE_CBC;   
-	$enc=MCRYPT_RIJNDAEL_128;
-	$val=_recaptcha_aes_pad($val);
-	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+	$mode = MCRYPT_MODE_CBC;
+	$enc = MCRYPT_RIJNDAEL_128;
+	$val = _recaptcha_aes_pad( $val );
+	return mcrypt_encrypt( $enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" );
 }
 
 
-function _recaptcha_mailhide_urlbase64 ($x) {
-	return strtr(base64_encode ($x), '+/', '-_');
+function _recaptcha_mailhide_urlbase64 ( $x ) {
+	return strtr( base64_encode ( $x ), '+/', '-_' );
 }
 
 /* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
-function recaptcha_mailhide_url($pubkey, $privkey, $email) {
-	if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
-		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
-		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+function recaptcha_mailhide_url( $pubkey, $privkey, $email ) {
+	if ( $pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null ) {
+		die ( "To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>" );
 	}
-	
 
-	$ky = pack('H*', $privkey);
-	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
-	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+
+	$ky = pack( 'H*', $privkey );
+	$cryptmail = _recaptcha_aes_encrypt ( $email, $ky );
+
+	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ( $cryptmail );
 }
 
 /**
@@ -245,15 +245,15 @@ function recaptcha_mailhide_url($pubkey, $privkey, $email) {
  * eg, given johndoe@example,com return ["john", "example.com"].
  * the email is then displayed as john...@example.com
  */
-function _recaptcha_mailhide_email_parts ($email) {
-	$arr = preg_split("/@/", $email );
+function _recaptcha_mailhide_email_parts ( $email ) {
+	$arr = preg_split( "/@/", $email );
 
-	if (strlen ($arr[0]) <= 4) {
-		$arr[0] = substr ($arr[0], 0, 1);
-	} else if (strlen ($arr[0]) <= 6) {
-		$arr[0] = substr ($arr[0], 0, 3);
+	if ( strlen ( $arr[0] ) <= 4 ) {
+		$arr[0] = substr ( $arr[0], 0, 1 );
+	} elseif ( strlen ( $arr[0] ) <= 6 ) {
+		$arr[0] = substr ( $arr[0], 0, 3 );
 	} else {
-		$arr[0] = substr ($arr[0], 0, 4);
+		$arr[0] = substr ( $arr[0], 0, 4 );
 	}
 	return $arr;
 }
@@ -264,12 +264,12 @@ function _recaptcha_mailhide_email_parts ($email) {
  *
  * http://www.google.com/recaptcha/mailhide/apikey
  */
-function recaptcha_mailhide_html($pubkey, $privkey, $email) {
-	$emailparts = _recaptcha_mailhide_email_parts ($email);
-	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
-	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
-		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+function recaptcha_mailhide_html( $pubkey, $privkey, $email ) {
+	$emailparts = _recaptcha_mailhide_email_parts ( $email );
+	$url = recaptcha_mailhide_url ( $pubkey, $privkey, $email );
+
+	return htmlentities( $emailparts[0] ) . "<a href='" . htmlentities ( $url ) .
+		"' onclick=\"window.open('" . htmlentities ( $url ) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ( $emailparts [1] );
 
 }
 
diff --git a/extensions/Gadgets/ApiQueryGadgetCategories.php b/extensions/Gadgets/ApiQueryGadgetCategories.php
index 45468966..f4ad5102 100644
--- a/extensions/Gadgets/ApiQueryGadgetCategories.php
+++ b/extensions/Gadgets/ApiQueryGadgetCategories.php
@@ -50,14 +50,17 @@ class ApiQueryGadgetCategories extends ApiQueryBase {
 				if ( isset( $this->props['name'] ) ) {
 					$row['name'] = $category;
 				}
+
 				if ( $category !== "" ) {
 					if ( isset( $this->props['title'] ) ) {
 						$row['desc'] = wfMessage( "gadget-section-$category" )->parse();
 					}
 				}
+
 				if ( isset( $this->props['members'] ) ) {
 					$row['members'] = count( $list );
 				}
+
 				$data[] = $row;
 			}
 		}
@@ -95,13 +98,14 @@ class ApiQueryGadgetCategories extends ApiQueryBase {
 				' title    - Category title',
 				' members  - Number of gadgets in category',
 			),
-			'names' => 'Name(s) of gadgets to retrieve',
+			'names' => 'Name(s) of categories to retrieve',
 		);
 	}
 
-	protected function getExamples() {
+	public function getExamples() {
 		$params = $this->getAllowedParams();
 		$allProps = implode( '|', $params['prop'][ApiBase::PARAM_TYPE] );
+
 		return array(
 			'Get a list of existing gadget categories:',
 			'    api.php?action=query&list=gadgetcategories',
@@ -111,7 +115,6 @@ class ApiQueryGadgetCategories extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryGadgetCategories.php 96850 2011-09-12 15:10:26Z reedy $';
+		return __CLASS__ . ': $Id: ApiQueryGadgetCategories.php 97890 2011-09-23 06:48:37Z siebrand $';
 	}
-
 }
diff --git a/extensions/Gadgets/ApiQueryGadgets.php b/extensions/Gadgets/ApiQueryGadgets.php
index 46e9eb24..2a0d4645 100644
--- a/extensions/Gadgets/ApiQueryGadgets.php
+++ b/extensions/Gadgets/ApiQueryGadgets.php
@@ -21,7 +21,7 @@
 
 class ApiQueryGadgets extends ApiQueryBase {
 	private $props,
-		$category,
+		$categories,
 		$neededIds,
 		$listAllowed,
 		$listEnabled;
@@ -39,8 +39,8 @@ class ApiQueryGadgets extends ApiQueryBase {
 		$this->neededIds = isset( $params['ids'] )
 			? array_flip( $params['ids'] )
 			: false;
-		$this->listAllowed = isset( $params['allowed'] ) && $params['allowed'];
-		$this->listEnabled = isset( $params['enabled'] ) && $params['enabled'];
+		$this->listAllowed = isset( $params['allowedonly'] ) && $params['allowedonly'];
+		$this->listEnabled = isset( $params['enabledonly'] ) && $params['enabledonly'];
 
 		$this->getMain()->setCacheMode( $this->listAllowed || $this->listEnabled
 			? 'anon-public-user-private' : 'public' );
@@ -48,6 +48,9 @@ class ApiQueryGadgets extends ApiQueryBase {
 		$this->applyList( $this->getList() );
 	}
 
+	/**
+	 * @return array
+	 */
 	private function getList() {
 		$gadgets = Gadget::loadStructuredList();
 
@@ -56,6 +59,7 @@ class ApiQueryGadgets extends ApiQueryBase {
 			if ( $this->categories && !isset( $this->categories[$category] ) ) {
 				continue;
 			}
+
 			foreach ( $list as $g ) {
 				if ( $this->isNeeded( $g ) ) {
 					$result[] = $g;
@@ -65,6 +69,9 @@ class ApiQueryGadgets extends ApiQueryBase {
 		return $result;
 	}
 
+	/**
+	 * @param $gadgets array
+	 */
 	private function applyList( $gadgets ) {
 		$data = array();
 		$result = $this->getResult();
@@ -74,21 +81,27 @@ class ApiQueryGadgets extends ApiQueryBase {
 			if ( isset( $this->props['id'] ) ) {
 				$row['id'] = $g->getName();
 			}
+
 			if ( isset( $this->props['metadata'] ) ) {
 				$row['metadata'] = $this->fakeMetadata( $g );
 				$this->setIndexedTagNameForMetadata( $row['metadata'] );
 			}
+
 			if ( isset( $this->props['desc'] ) ) {
 				$row['desc'] = $g->getDescription();
 			}
+
 			$data[] = $row;
 		}
+
 		$result->setIndexedTagName( $data, 'gadget' );
 		$result->addValue( 'query', $this->getModuleName(), $data );
 	}
 
 	/**
-	 * 
+	 * @param $gadget Gadget
+	 *
+	 * @return bool
 	 */
 	private function isNeeded( Gadget $gadget ) {
 		global $wgUser;
@@ -97,11 +110,16 @@ class ApiQueryGadgets extends ApiQueryBase {
 			&& ( !$this->listAllowed || $gadget->isAllowed( $wgUser ) )
 			&& ( !$this->listEnabled || $gadget->isEnabled( $wgUser ) );
 	}
-	
+
+	/**
+	 * @param $g Gadget
+	 * @return array
+	 */
 	private function fakeMetadata( Gadget $g ) {
 		return array(
 			'settings' => array(
 				'rights' => $g->getRequiredRights(),
+				'skins' => $g->getRequiredSkins(),
 				'default' => $g->isOnByDefault(),
 				'hidden' => false, // Only exists in RL2 branch
 				'shared' => false, // Only exists in RL2 branch
@@ -119,14 +137,15 @@ class ApiQueryGadgets extends ApiQueryBase {
 	private function setIndexedTagNameForMetadata( &$metadata ) {
 		static $tagNames = array(
 			'rights' => 'right',
+			'skins' => 'skin',
 			'scripts' => 'script',
 			'styles' => 'style',
 			'dependencies' => 'dependency',
 			'messages' => 'message',
 		);
-		
+
 		$result = $this->getResult();
-		foreach ( $metadata as $type => &$data ) {
+		foreach ( $metadata as &$data ) {
 			foreach ( $data as $key => &$value ) {
 				if ( is_array( $value ) ) {
 					$tag = isset( $tagNames[$key] ) ? $tagNames[$key] : $key;
@@ -156,8 +175,8 @@ class ApiQueryGadgets extends ApiQueryBase {
 				ApiBase::PARAM_TYPE => 'string',
 				ApiBase::PARAM_ISMULTI => true,
 			),
-			'allowed' => false,
-			'enabled' => false,
+			'allowedonly' => false,
+			'enabledonly' => false,
 		);
 	}
 
@@ -166,7 +185,6 @@ class ApiQueryGadgets extends ApiQueryBase {
 	}
 
 	public function getParamDescription() {
-		$p = $this->getModulePrefix();
 		return array(
 			'prop' => array(
 				'What gadget information to get:',
@@ -176,30 +194,29 @@ class ApiQueryGadgets extends ApiQueryBase {
 			),
 			'categories' => 'Gadgets from what categories to retrieve',
 			'ids' => 'ID(s) of gadgets to retrieve',
-			'allowed' => 'List only gadgets allowed to current user',
-			'enabled' => 'List only gadgets enabled by current user',
+			'allowedonly' => 'List only gadgets allowed to current user',
+			'enabledonly' => 'List only gadgets enabled by current user',
 		);
 	}
 
-	protected function getExamples() {
+	public function getExamples() {
 		$params = $this->getAllowedParams();
 		$allProps = implode( '|', $params['prop'][ApiBase::PARAM_TYPE] );
 		return array(
 			'Get a list of gadgets along with their descriptions:',
 			'    api.php?action=query&list=gadgets&gaprop=id|desc',
-			'Get a list of gadgets with all possble properties:',
+			'Get a list of gadgets with all possible properties:',
 			"    api.php?action=query&list=gadgets&gaprop=$allProps",
 			'Get a list of gadgets belonging to caregory "foo":',
 			'    api.php?action=query&list=gadgets&gacategories=foo',
 			'Get information about gadgets "foo" and "bar":',
 			'    api.php?action=query&list=gadgets&gaids=foo|bar&gaprop=id|desc|metadata',
 			'Get a list of gadgets enabled by current user:',
-			'    api.php?action=query&list=gadgets&gaenabled',
+			'    api.php?action=query&list=gadgets&gaenabledonly',
 		);
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryGadgets.php 97274 2011-09-16 14:24:52Z reedy $';
+		return __CLASS__ . ': $Id: ApiQueryGadgets.php 100509 2011-10-22 19:09:25Z liangent $';
 	}
-
 }
diff --git a/extensions/Gadgets/Gadgets.alias.php b/extensions/Gadgets/Gadgets.alias.php
index 03ccf66b..2f4e55f1 100644
--- a/extensions/Gadgets/Gadgets.alias.php
+++ b/extensions/Gadgets/Gadgets.alias.php
@@ -198,9 +198,14 @@ $specialPageAliases['mt'] = array(
 	'Gadgets' => array( 'Aġġeġġi', 'Aċċessorji' ),
 );
 
+/** Norwegian Bokmål (‪Norsk (bokmål)‬) */
+$specialPageAliases['nb'] = array(
+	'Gadgets' => array( 'Tilleggsfunksjoner' ),
+);
+
 /** Nedersaksisch (Nedersaksisch) */
 $specialPageAliases['nds-nl'] = array(
-	'Gadgets' => array( 'Technisch_spul' ),
+	'Gadgets' => array( 'Technies_spul' ),
 );
 
 /** Dutch (Nederlands) */
@@ -213,11 +218,6 @@ $specialPageAliases['nn'] = array(
 	'Gadgets' => array( 'Tilleggsfunksjonar' ),
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
-$specialPageAliases['no'] = array(
-	'Gadgets' => array( 'Tilleggsfunksjoner' ),
-);
-
 /** Occitan (Occitan) */
 $specialPageAliases['oc'] = array(
 	'Gadgets' => array( 'Gadgèts' ),
@@ -233,7 +233,7 @@ $specialPageAliases['ro'] = array(
 	'Gadgets' => array( 'Gadgeturi' ),
 );
 
-/** Sanskrit (संस्कृत) */
+/** Sanskrit (संस्कृतम्) */
 $specialPageAliases['sa'] = array(
 	'Gadgets' => array( 'सुविधा_(गॅजेट)' ),
 );
@@ -253,7 +253,7 @@ $specialPageAliases['sl'] = array(
 	'Gadgets' => array( 'Vtičniki', 'Vticniki' ),
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬) */
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬) */
 $specialPageAliases['sr-ec'] = array(
 	'Gadgets' => array( 'Гаџети' ),
 );
@@ -278,7 +278,7 @@ $specialPageAliases['tr'] = array(
 	'Gadgets' => array( 'KüçükAraçlar' ),
 );
 
-/** Татарча (Татарча) */
+/** Tatar (Cyrillic script) (Татарча) */
 $specialPageAliases['tt-cyrl'] = array(
 	'Gadgets' => array( 'Гаджетлар' ),
 );
@@ -301,9 +301,4 @@ $specialPageAliases['zh-hans'] = array(
 /** Traditional Chinese (‪中文(繁體)‬) */
 $specialPageAliases['zh-hant'] = array(
 	'Gadgets' => array( '小工具' ),
-);
-
-/**
- * For backwards compatibility with MediaWiki 1.15 and earlier.
- */
-$aliases =& $specialPageAliases;
-\ No newline at end of file
+);
+\ No newline at end of file
diff --git a/extensions/Gadgets/Gadgets.i18n.php b/extensions/Gadgets/Gadgets.i18n.php
index 14162ef5..c18ddb4d 100644
--- a/extensions/Gadgets/Gadgets.i18n.php
+++ b/extensions/Gadgets/Gadgets.i18n.php
@@ -15,10 +15,10 @@ $messages = array();
  * @author Daniel Kinzler, brightbyte.de
  */
 $messages['en'] = array(
-	#for Special:Version
+	# for Special:Version
 	'gadgets-desc'      => 'Lets users select custom [[Special:Gadgets|CSS and JavaScript gadgets]] in their [[Special:Preferences|preferences]]',
 
-	#for Special:Preferences
+	# for Special:Preferences
 	'prefs-gadgets'     => 'Gadgets',
 	'gadgets-prefstext' => 'Below is a list of special gadgets you can enable for your account.
 These gadgets are mostly based on JavaScript, so JavaScript has to be enabled in your browser for them to work.
@@ -27,13 +27,16 @@ Note that these gadgets will have no effect on this preferences page.
 Also note that these special gadgets are not part of the MediaWiki software, and are usually developed and maintained by users on your local wiki.
 Local administrators can edit the [[MediaWiki:Gadgets-definition|definitions]] and [[Special:Gadgets|descriptions]] of available gadgets.',
 
-	#for Special:Gadgets
+	# for Special:Gadgets
 	'gadgets'           => 'Gadgets',
 	'gadgets-title'     => 'Gadgets',
 	'gadgets-pagetext'  => "Below is a list of special gadgets users can enable on their [[Special:Preferences|preferences page]], as defined by the [[MediaWiki:Gadgets-definition|definitions]].
 This overview provides easy access to the system message pages that define each gadget's description and code.",
 	'gadgets-uses'      => 'Uses',
-	'gadgets-required-rights' => 'Requires the {{PLURAL:$2|$1 right|following rights: $1}}.',
+	'gadgets-required-rights' => 'Requires the following {{PLURAL:$2|right|rights}}:
+
+$1',
+	'gadgets-required-skins' => 'Available on the {{PLURAL:$2|$1 skin|following skins: $1}}.',
 	'gadgets-default'   => 'Enabled for everyone by default.',
 	'gadgets-export'    => 'Export',
 	'gadgets-export-title' => 'Gadget export',
@@ -68,7 +71,10 @@ $messages['qqq'] = array(
 
 See [http://meta.wikimedia.org/wiki/Special:Gadgets Gadgets page in meta.wikimedia.org]",
 	'gadgets-required-rights' => 'Parameters:
-* $1 - a list.
+* $1 - a list in wikitext.
+* $2 - the number of items in list $1 for PLURAL use.',
+	'gadgets-required-skins' => 'Parameters:
+* $1 - a comma separated list.
 * $2 - the number of items in list $1 for PLURAL use.',
 	'gadgets-export' => 'Used on [[Special:Gadgets]]. This is a verb, not noun.
 {{Identical|Export}}',
@@ -128,19 +134,33 @@ $messages['an'] = array(
 	'gadgets-prefstext' => "Contino ye una lista de trastes especials que puede fer servir en a suya cuenta.
 Como quasi totz istos trastes son feitos en JavaScript, caldrá que tienga activato JavaScript en o suyo navegador ta que vaigan bien. Pare cuenta que istos trastes no tendrán garra efeuto en ista pachina de preferencias.
 
-Pare cuenta tamién que istos trastes especials no fan parte d'o software MediaWiki, y que gosan estar desenvolicatos y mantenitos por usuarios d'a suya wiki local. 
+Pare cuenta tamién que istos trastes especials no fan parte d'o software MediaWiki, y que gosan estar desenvolicatos y mantenitos por usuarios d'a suya wiki local.
 Os almenistradors locals pueden editar os trastes disponibles en as pachinas de [[MediaWiki:Gadgets-definition|definicions]] y de [[Special:Gadgets|descripcions]].",
 	'gadgets' => 'Trastes',
 	'gadgets-title' => 'Trastes',
 	'gadgets-pagetext' => "Contino ye una lista de trastes especials que os usuarios pueden activar en a suya [[Special:Preferences|pachina de preferencias]], como se define en a pachina de [[MediaWiki:Gadgets-definition|definicions]].
 Ista lista premite ir facilment t'as pachinas de mensaches d'o sistema que definen a descripción y o codigo de cada traste.",
 	'gadgets-uses' => 'Fa servir',
+	'gadgets-required-rights' => 'Requiere {{PLURAL:$2|o siguient dreito|os siguients dreitos}}:
+
+$1',
+	'gadgets-required-skins' => "Disponible {{PLURAL:$2|en l'apariencia $1|en as siguients apariencias: $1}}.",
+	'gadgets-default' => 'Activau ta totz de traza predeterminada.',
+	'gadgets-export' => 'Exportar',
+	'gadgets-export-title' => 'Exportación de gadget',
+	'gadgets-not-found' => 'No s\'ha trobau o gadget "$1".',
+	'gadgets-export-text' => 'Ta exportar o gadget $1, faiga click en o botón "{{int:gadgets-export-download}}", alce o fichero descargau,
+vaiga ta Special:Importar un wiki de destín y puye-lo. Dimpués adhiba lo siguient a MediaWiki:Gadgets-definition page:
+<pre>$2</pre>
+Has de tener permisos apropiaus en o wiki de destín (incluindo o dreito a editar mensaches de sistema) y importación dende fichers puyaus debe estar habilitau.',
+	'gadgets-export-download' => 'Descargar',
 );
 
 /** Arabic (العربية)
  * @author Aiman titi
  * @author Meno25
  * @author OsamaK
+ * @author روخو
  */
 $messages['ar'] = array(
 	'gadgets-desc' => 'يسمح للمستخدمين باختيار [[Special:Gadgets|إضافات سي إس إس وجافاسكريبت]] معدلة في [[Special:Preferences|تفضيلاتهم]]',
@@ -158,6 +178,7 @@ $messages['ar'] = array(
 هذا العرض يوفر دخولا سهلا لصفحات رسائل النظام التي تعرف وصف وكود كل إضافة.',
 	'gadgets-uses' => 'تستخدم',
 	'gadgets-required-rights' => 'يتطلب {{PLURAL:$2|$1 حق|الحقوق التالية: $1}}.',
+	'gadgets-required-skins' => 'متاحة على {{PLURAL:$2|$1 skin|following skins: $1}}.',
 	'gadgets-default' => 'تمكين الجميع بشكل افتراضي.',
 	'gadgets-export' => 'صدّر',
 	'gadgets-export-title' => 'أداة تصدير',
@@ -201,6 +222,7 @@ $messages['arz'] = array(
 
 /** Asturian (Asturianu)
  * @author Esbardu
+ * @author Xuacu
  */
 $messages['ast'] = array(
 	'gadgets-desc' => 'Permite a los usuarios seleicionar al gustu [[Special:Gadgets|accesorios CSS y JavaScript]] nes sos [[Special:Preferences|preferencies]]',
@@ -217,15 +239,35 @@ Los alministradores llocales puen editar los accesorios disponibles usando les [
 	'gadgets-pagetext' => 'Embaxo amuésase una llista de los accesorios especiales que los usuarios puen activar na so [[Special:Preferences|páxina de preferencies]], según queden definíos poles [[MediaWiki:Gadgets-definition|definiciones]].
 Esta visión xeneral proporciona un accesu fácil a les páxines de mensaxes del sistema que definen la descripción y el códigu de cada accesoriu.',
 	'gadgets-uses' => 'Usa',
+	'gadgets-required-rights' => 'Requier {{PLURAL:$2|el siguiente permisu|los siguientes permisos}}:
+
+$1',
+	'gadgets-required-skins' => 'Disponible {{PLURAL:$2|nel aspeutu $1|nos siguientes aspeutos: $1}}.',
+	'gadgets-default' => 'Activáu para toos de mou predetermináu.',
+	'gadgets-export' => 'Esportar',
+	'gadgets-export-title' => "Esportación d'accesorios",
+	'gadgets-not-found' => 'Nun s\'alcontró l\'accesoriu "$1".',
+	'gadgets-export-text' => 'Pa esportar l\'accesoriu $1, calca nel botón "{{int:gadgets-export-download}}", guarda\'l ficheru descargáu,
+vete a Special:Import na wiki de destín y xúbilu. Darréu amiesta lo siguiente na páxina MediaWiki:Gadgets-definition:
+<pre>$2</pre>
+Has de tener los permisos afayadizos na wiki de destín (incluyendo permisu pa editar los mensaxes del sistema) y tien de tar activada la importación dende los ficheros xubíos.',
+	'gadgets-export-download' => 'Descargar',
 );
 
 /** Azerbaijani (Azərbaycanca)
  * @author Cekli829
+ * @author PPerviz
+ * @author Vago
  * @author Vugar 1981
  */
 $messages['az'] = array(
+	'prefs-gadgets' => 'Qadjetlər',
+	'gadgets' => 'Qadjetlər',
+	'gadgets-title' => 'Qadjetlər',
 	'gadgets-uses' => 'İstifadə',
 	'gadgets-export' => 'İxrac',
+	'gadgets-export-title' => 'Qadjet ixracı',
+	'gadgets-not-found' => 'Qadjet "$1" tapılmadı.',
 	'gadgets-export-download' => 'Yüklə',
 );
 
@@ -242,6 +284,15 @@ $messages['ba'] = array(
 	'gadgets-export-download' => 'Күсереп алырға',
 );
 
+/** Bavarian (Boarisch)
+ * @author Mucalexx
+ */
+$messages['bar'] = array(
+	'gadgets' => 'Gadgets (Helferlein)',
+	'gadgets-title' => 'Gadgets (Helferlein)',
+	'gadgets-export-download' => 'Owerloon',
+);
+
 /** Southern Balochi (بلوچی مکرانی)
  * @author Mostafadaneshvar
  */
@@ -275,7 +326,10 @@ $messages['be-tarask'] = array(
 	'gadgets-pagetext' => 'Ніжэй знаходзіцца сьпіс гаджэтаў, якія ўдзельнікі могуць уключыць у [[Special:Preferences|сваіх наладах]], у адпаведнасьці са сьпісам на старонцы [[MediaWiki:Gadgets-definition|вызначэньняў]].
 Гэты сьпіс дазваляе лёгка атрымаць доступ да старонак сыстэмных паведамленьняў, якія вызначаюць апісаньні і крынічныя коды гаджэтаў.',
 	'gadgets-uses' => 'Выкарыстаньне',
-	'gadgets-required-rights' => '{{PLURAL:$2|Патрабуецца права $1|Патрабуюцца наступныя правы: $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Патрабуецца права|Патрабуюцца наступныя правы}}:
+
+$1',
+	'gadgets-required-skins' => 'Даступны ў {{PLURAL:$2|тэме $1|наступных тэмах: $1}}.',
 	'gadgets-default' => 'Дазволеныя для ўсіх па змоўчваньні.',
 	'gadgets-export' => 'Экспартаваць',
 	'gadgets-export-title' => 'Экспарт гаджэта',
@@ -307,6 +361,11 @@ $messages['bg'] = array(
 	'gadgets-uses' => 'Използва',
 	'gadgets-default' => 'Активирана за всички по подразбиране.',
 	'gadgets-export' => 'Изнасяне',
+	'gadgets-export-title' => 'Експорт на джаджи',
+	'gadgets-not-found' => 'Джаджа "$1" не беше намерена.',
+	'gadgets-export-text' => 'За да експортирате джаджата $1, щракнете на бутона "{{int:gadgets-export-download/bg}}", запазете файла на диска си, отидете на страницата Special:Import в целевото уики и го качете там. След това добавете към страницата MediaWiki:Gadgets-definition:
+<pre>$2</pre>
+В целевото уики трябва да се ползвате от съответните права (в това число правото да редактирате системни съобщения) и трябва да са разрешени локалните файлови качвания.',
 	'gadgets-export-download' => 'Изтегляне',
 );
 
@@ -328,6 +387,7 @@ $messages['bn'] = array(
 	'gadgets-pagetext' => 'নিচে বিশেষ গ্যাজেটের একটি তালিকা রয়েছে, যা ব্যবহারকারী তাদের [[Special:Preferences|প্রছন্দের পাতা]] থেকে সক্রিয় করে নিতে পারবেন এবং যা [[MediaWiki:Gadgets-definition|definitions]] পাতায় সংজ্ঞায়িত রয়েছে। পর্যালোচনা সিস্টেম বার্তা পাতায় সহজ প্রবেশাধিকার দিবে, যেখানে গ্যাজেটের বর্ণনা এবং কোড রয়েছে।',
 	'gadgets-uses' => 'ব্যবহারসমূহ',
 	'gadgets-export' => 'রপ্তানি',
+	'gadgets-export-title' => 'গ্যাজেট রফতানী',
 	'gadgets-not-found' => 'গ্যাজেট "$1" খুজে পাওয়া যায়নি।',
 	'gadgets-export-download' => 'ডাউনলোড',
 );
@@ -351,7 +411,9 @@ Gallout a ra ar verourien lec'hel degas cheñchamantoù er bitrakoù en ur ober
 	'gadgets-pagetext' => "A-is ez eus ur roll eus ar bitrakoù a c'hall bezañ gweredekaet gant an implijerien war o fajenn [[Special:Preferences|penndibaboù]], evel m'eo termenet en [[MediaWiki:Gadgets-definition|termenadurioù]].
 Ar sell hollek-mañ a bourchas ur moned aes d'ar pajennoù kemennadennoù reizhiad a dermen deskrivadur ha kod pep bitrak.",
 	'gadgets-uses' => 'A implij',
-	'gadgets-required-rights' => 'Rekis eo kaout an {{PLURAL:$2|aotre $1|aotreoù da-heul : $1}}.',
+	'gadgets-required-rights' => 'Rekis eo kaout an {{PLURAL:$2|aotre|aotreoù}} da-heul : 
+$1',
+	'gadgets-required-skins' => 'Hegerz gant ar {{PLURAL:$2|gwiskadur $1|gwiskadurioù da-heul : $1}}.',
 	'gadgets-default' => 'Gweredekaet dre ziouer evit an holl.',
 	'gadgets-export' => 'Ezporzh',
 	'gadgets-export-title' => 'Ezporzhiañ bitrakoù',
@@ -393,6 +455,7 @@ Morate imati odgovarajuća prava na odredišnoj wiki (uključujući pravo da ure
 
 /** Catalan (Català)
  * @author Aleator
+ * @author Gemmaa
  * @author Paucabot
  * @author SMP
  * @author Toniher
@@ -412,7 +475,11 @@ Els administradors locals poden editar els ginys disponibles fent servir [[Media
 	'gadgets-pagetext' => 'A continuació teniu una llista de ginys especials que els usuaris poden activar a la seva [[Special:Preferences|pàgina de preferències]], segons les [[MediaWiki:Gadgets-definition|seves definicions]].
 Aquesta llista permet un fàcil accés a les pàgines del sistema que defineixen la descripció i el codi de cada giny.',
 	'gadgets-uses' => 'Usa',
-	'gadgets-required-rights' => 'Requereix el {{PLURAL:$2|dret $1|següents drets: $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Es necessita el dret següent|Es necessiten els drets següents}}:
+
+$1',
+	'gadgets-required-skins' => 'Disponible a la  {{PLURAL:$2|   $1  skin|following skins:  $1 }}.',
+	'gadgets-default' => 'Habilitat per a tot el món per defecte.',
 	'gadgets-export' => 'Exporta',
 	'gadgets-export-title' => 'Exportació de ginys',
 	'gadgets-not-found' => "No s'ha trobat el giny «$1».",
@@ -470,7 +537,10 @@ Místní správci mohou upravovat [[MediaWiki:Gadgets-definition|definice]] a&nb
 	'gadgets-pagetext' => 'Níže je přehled speciálních udělátek, která si uživatelé mohou zapnout ve svém [[Special:Preferences|nastavení]]. Jejich seznam lze upravovat na stránce [[MediaWiki:Gadgets-definition]].
 Tento přehled poskytuje jednoduchý přístup k&nbsp;systémovým hlášením, která definují zdrojový kód a&nbsp;popis každého udělátka.',
 	'gadgets-uses' => 'používá',
-	'gadgets-required-rights' => 'Vyžaduje {{PLURAL:$2|oprávnění $1|následující oprávnění: $1}}.',
+	'gadgets-required-rights' => 'Vyžaduje následující {{PLURAL:$2|oprávnění}}:
+
+$1',
+	'gadgets-required-skins' => 'Dostupné {{PLURAL:$2|pro vzhled $1|pro následující vzhledy: $1}}.',
 	'gadgets-default' => 'Implicitně zapnuto všem.',
 	'gadgets-export' => 'Exportovat',
 	'gadgets-export-title' => 'Export udělátka',
@@ -498,7 +568,10 @@ Mae gweinyddwyr y wici hwn yn gallu golygu [[MediaWiki:Gadgets-definition|diffin
 	'gadgets-pagetext' => "Isod mae rhestr o declynnau arbennig y gall defnyddwyr eu galluogi ar eu [[Special:Preferences|tudalennau dewisiadau]], sef rhestr a bennir yn y dudalen [[MediaWiki:Gadgets-definition|diffiniadau]].
 Mae'r trosolwg hwn yn cynnig mynediad rhwydd at y tudalennau negeseuon sustem sy'n diffinio disgrifiad a chod pob teclyn.",
 	'gadgets-uses' => 'Yn defnyddio',
-	'gadgets-required-rights' => 'Mae gofyn cael y {{PLURAL:$2|gallu $1|galluoedd canlynol: $1}}.',
+	'gadgets-required-rights' => 'Mae gofyn cael y {{PLURAL:$2||gallu|galluoedd|galluoedd|galluoedd|galluoedd}}:
+
+$1',
+	'gadgets-required-skins' => 'Ar gael ar y {{PLURAL:$2|wedd $1|gweddau hyn: $1}}.',
 	'gadgets-default' => 'Wedi ei alluogi i bawb yn ddiofyn.',
 	'gadgets-export' => 'Allforio',
 	'gadgets-export-title' => 'Allforio teclyn',
@@ -527,7 +600,10 @@ Lokale administratorer kan redigere tilgængelige gadgets med [[MediaWiki:Gadget
 	'gadgets-pagetext' => 'Nedenstående er en liste med de specielle gadgets som brugere kan aktivere i deres [[Special:Preferences|indstillinger]], som defineret i [[MediaWiki:Gadgets-definition|definitionerne]].
 Denne oversigtsside giver simpel adgang til de beskedsider som definerer hver gadgets beskrivelse og kode.',
 	'gadgets-uses' => 'Bruger',
-	'gadgets-required-rights' => 'Kræver {{PLURAL:$2|rettigheden $1|følgende rettigheder: $1}}.',
+	'gadgets-required-rights' => 'Kræver {{PLURAL:$2|rettigheden|følgende rettigheder}}:
+
+$1',
+	'gadgets-required-skins' => 'Tilgængelig for {{PLURAL:$2|$1-udseendet|de følgende udseender: $1}}.',
 	'gadgets-default' => 'Aktiveret for alle som standard.',
 	'gadgets-export' => 'Eksporter',
 	'gadgets-export-title' => 'Eksporter gadget',
@@ -561,7 +637,10 @@ Lokale Administratoren können die verfügbaren Helferlein bearbeiten. Dafür st
 	'gadgets-pagetext' => 'Liste besonderer, in [[MediaWiki:Gadgets-definition]] festgelegter Helferlein, die für jeden Benutzer in seinen [[Special:Preferences|persönlichen Einstellungen]] verfügbar sind.
 Diese Übersicht bietet direkten Zugang zu den MediaWiki-Systemnachrichten, welche die Beschreibung sowie den Programmcode jedes Helferlein enthalten.',
 	'gadgets-uses' => 'Benutzt',
-	'gadgets-required-rights' => 'Erfordert die {{PLURAL:$2|folgende Berechtigung:|folgenden Berechtigungen:}} $1',
+	'gadgets-required-rights' => 'Erfordert die {{PLURAL:$2|folgende Berechtigung|folgenden Berechtigungen}}:
+
+$1',
+	'gadgets-required-skins' => 'Verfügbar bei {{PLURAL:$2|der folgenden Benutzeroberfläche|den folgenden Benutzeroberflächen}}: $1.',
 	'gadgets-default' => 'Für alle standardmäßig aktiviert.',
 	'gadgets-export' => 'Export',
 	'gadgets-export-title' => 'Export der Helferlein',
@@ -617,6 +696,11 @@ Lokalne administratory mógu k dispoziciji stojece gadgety z pomocu [[MediaWiki:
 	'gadgets-pagetext' => 'Dołojce jo lisćina specialnych gadgetow, kótarež wužywarje mógu w [[Special:Preferences|swójich nastajenjach]] zmóžniś, kaž w [[MediaWiki:Gadgets-definition]] definiěrowane.
 Toś ten pśeglěd bitujo lažki pśistup k bokam systemowych powěsćow, kótarež wopisanje a kod gadgeta definěruju.',
 	'gadgets-uses' => 'Wužywa',
+	'gadgets-required-rights' => 'Pomina se {{PLURAL:$2|slědujuce pšawo|slědujucej pšawje|slědujuce pšawa|slědujuce pšawa}}:
+
+$1',
+	'gadgets-required-skins' => 'Na {{PLURAL:$2|slědujucej drastwje|slědujucyma drastwoma|slědujucych drastwach|slědujucych drastwach}} k dispoziciji: $1',
+	'gadgets-default' => 'Za wšych standardnje zmóžnjony.',
 	'gadgets-export' => 'Eksportěrowaś',
 	'gadgets-export-title' => 'Eksport specialneje funkcije',
 	'gadgets-not-found' => 'Specialna funkcija "$1" njejo se namakała.',
@@ -627,6 +711,7 @@ Musyš trěbne pšawa na celowem wikiju měś (inkluziwnje pšawo za wobźěłow
 );
 
 /** Greek (Ελληνικά)
+ * @author AK
  * @author Badseed
  * @author Consta
  * @author Dead3y3
@@ -648,7 +733,10 @@ $messages['el'] = array(
 	'gadgets-pagetext' => 'Παρακάτω βρίσκεται ένας κατάλογος με τις ειδικές λειτουργίες τις οποίες οι χρήστες μπορούν να ενεργοποιήσουν στη [[Special:Preferences|σελίδα προτιμήσεών]] τους, όπως ορίζεται από τη σελίδα [[MediaWiki:Gadgets-definition|ορισμών]].<br />
 Αυτή η επισκόπηση παρέχει εύκολη πρόσβαση στις σελίδες μηνυμάτων του συστήματος που ορίζουν την περιγραφή και τον κώδικα κάθε λειτουργίας.',
 	'gadgets-uses' => 'Χρήσεις',
-	'gadgets-required-rights' => 'Απαιτεί το {{PLURAL:$2|$1 right|following rights: $1}}.',
+	'gadgets-required-rights' => 'Απαιτεί {{PLURAL:$2|το εξής δικαίωμα|τα εξής δικαιώματα}}:
+
+$1',
+	'gadgets-default' => 'Ενεργοποιήθηκε για τον καθένα από προεπιλογή.',
 	'gadgets-export' => 'Εξαγωγή',
 	'gadgets-export-title' => 'Μικροεφαρμογή εξαγωγής',
 	'gadgets-not-found' => 'Μικροεφαρμογή "$1" δεν βρέθηκε.',
@@ -665,17 +753,20 @@ $messages['eo'] = array(
 	'gadgets-desc' => 'Permesas al uzantoj elekti proprajn [[Special:Gadgets|CSS kaj JavaScript aldonaĵojn]] en ties [[Special:Preferences|preferoj]].',
 	'prefs-gadgets' => 'Aldonaĵoj',
 	'gadgets-prefstext' => 'Jen listo de specialaj aldonaĵoj kiujn vi povas aktivigi por via uzulkonto.
-Plej multaj el ili baziĝas sur Ĵavaskriptoj, sekve Ĵavaskripto nepre estu aktivigita por ke ili funkciu. 
-Notu ke tiuj aldonaĵoj ne efikos sur viaj preferoj. 
+Plej multaj el ili baziĝas sur Ĵavaskriptoj, sekve Ĵavaskripto nepre estu aktivigita por ke ili funkciu.
+Notu ke tiuj aldonaĵoj ne efikos sur viaj preferoj.
 
 Notu ankaŭ ke ili ne estas parto de la programaro MediaWiki, kaj estas kutime evoluigitaj kaj prizorgataj de uzuloj sur via loka vikio.
 Lokaj administrantoj povas redakti liston de haveblaj aldonaĵoj per [[MediaWiki:Gadgets-definition|difinoj]] kaj [[Special:Gadgets|priskriboj]].',
 	'gadgets' => 'Aldonaĵoj',
 	'gadgets-title' => 'Aldonaĵoj',
-	'gadgets-pagetext' => 'Jen listo da specialaj aldonaĵoj kiujn uzuloj povas aktivigi en [[Special:Preferences|siaj preferoj]], kiel difinite en [[MediaWiki:Gadgets-definition|difinoj]]. 
+	'gadgets-pagetext' => 'Jen listo da specialaj aldonaĵoj kiujn uzuloj povas aktivigi en [[Special:Preferences|siaj preferoj]], kiel difinite en [[MediaWiki:Gadgets-definition|difinoj]].
 Ĉi tiu superrigardo provizas facilan aliron al la sistemaj mesaĝoj kiuj difinas la priskribon kaj la kodon de ĉiuj aldonaĵoj.',
 	'gadgets-uses' => 'uzas',
-	'gadgets-required-rights' => 'Bezonas la {{PLURAL:$2|$1 rajton|jenajn rajtojn: $1}}.',
+	'gadgets-required-rights' => 'Bezonas la {{PLURAL:$2|jenan rajton|jenajn rajtojn}}:
+
+$1',
+	'gadgets-required-skins' => 'Dispona kun la {{PLURAL:$2|$1 etoso|jenaj etosoj:$1}}.',
 	'gadgets-default' => 'Ŝaltita por ĉiu defaŭlte.',
 	'gadgets-export' => 'Eksporti',
 	'gadgets-export-title' => 'Aldonaĵo-eksportado',
@@ -689,24 +780,31 @@ Vi nepras la taŭgajn rajtojn ĉe cela vikio (inkluzivante rajton redakti sistem
 
 /** Spanish (Español)
  * @author Crazymadlover
+ * @author Fitoschido
  * @author Muro de Aguas
  * @author Remember the dot
  * @author Sanbec
+ * @author Vivaelcelta
  */
 $messages['es'] = array(
-	'gadgets-desc' => 'Permite a los usuarios seleccionar [[Special:Gadgets|artilugios de CSS y JavaScript]] en sus [[Special:Preferences|preferencias]].',
-	'prefs-gadgets' => 'Artilugios',
-	'gadgets-prefstext' => "Debajo hay una lista de artilugios que puedes activar a tu gusto. Ten en cuenta que la mayoría de ellos utilizan JavaScript para funcionar, así que debes tenerlo activado en tu explorador si quieres que los artilugios que actives funcionen.
+	'gadgets-desc' => 'Permite a los usuarios seleccionar [[Special:Gadgets|accesorios de CSS y JavaScript personailzados]]
+en sus [[Special:Preferences|preferencias]].',
+	'prefs-gadgets' => 'Accesorios',
+	'gadgets-prefstext' => 'Debajo hay una lista de accesorios que puedes activar a tu gusto.
+Ten en cuenta que la mayoría de ellos utilizan JavaScript para funcionar, así que debes tenerlo activado en tu navegador si quieres que los accesorios que actives funcionen.
 
 Ten en cuenta también que estos complementos no forman parte del software MediaWiki, y están desarrollados por usuarios de este wiki.
 
-Los administradores pueden editar los artilugios que están disponibles en las páginas [[MediaWiki:Gadgets-definition]] y [[Special:Gadgets]]. 
-
-'''Los artilugios no tienen efecto en esta página.'''",
-	'gadgets' => 'Artilugios',
-	'gadgets-title' => 'Artilugios',
-	'gadgets-pagetext' => 'Debajo hay una lista de artilugios especiales que los usuarios pueden activar en sus [[Special:Preferences|preferencias]], según la [[MediaWiki:Gadgets-definition|lista de definición de artilugios]]. Esta vista provee un acceso fácil a la páginas de mensajes del sistema que definen la descripción y el código de cada artilugio.',
+Los administradores pueden editar los accesorios que están disponibles en las páginas [[MediaWiki:Gadgets-definition]] y [[Special:Gadgets]].',
+	'gadgets' => 'Accesorios',
+	'gadgets-title' => 'Accesorios',
+	'gadgets-pagetext' => 'Debajo hay una lista de accesorios especiales que los usuarios pueden activar en sus [[Special:Preferences|preferencias]], según la [[MediaWiki:Gadgets-definition|lista de definición de accesorios]]. Esta vista provee un acceso fácil a las páginas de mensajes del sistema que definen la descripción y el código de cada accesorio.',
 	'gadgets-uses' => 'Usos',
+	'gadgets-required-rights' => 'Requiere {{PLURAL:$2|el siguiente derecho|los siguientes derechos}}:
+
+$1',
+	'gadgets-required-skins' => 'Disponible {{PLURAL:$2|en la apariencia $1|en las siguientes apariencias: $1}}.',
+	'gadgets-default' => 'Activado para todos de manera predeterminada.',
 	'gadgets-export' => 'Exportar',
 	'gadgets-export-title' => 'Exportación de gadget',
 	'gadgets-not-found' => 'Gadget "$1" no encontrado.',
@@ -734,7 +832,10 @@ Kohalikud administraatorid saavad olemasolevaid riistu muuta [[MediaWiki:Gadgets
 	'gadgets-title' => 'Tööriistad',
 	'gadgets-pagetext' => 'Allpool on nimekiri eririistadest, mida kasutajad saavad oma [[Special:Preferences|eelistuste leheküljel]] sisse lülitada, nii nagu [[MediaWiki:Gadgets-definition|määratlustes]] määratletud. See ülevaade võimaldab kergesti ligi pääseda süsteemi sõnumilehekülgedele, milles on iga riista kirjeldus ja kood.',
 	'gadgets-uses' => 'Kasutab',
-	'gadgets-required-rights' => 'Tarvis on {{PLURAL:$2|järgmist õigust|järgmisi õigusi}}: $1',
+	'gadgets-required-rights' => 'Tarvis on {{PLURAL:$2|järgmist õigust|järgmisi õigusi}}:
+
+$1',
+	'gadgets-required-skins' => 'Saadaval {{PLURAL:$2|järgmise kujundusega|järgmiste kujundustega}}: $1.',
 	'gadgets-default' => 'Vaikimisi kõigile lubatud.',
 	'gadgets-export' => 'Ekspordi',
 	'gadgets-export-title' => 'Tööriista eksportimine',
@@ -765,6 +866,7 @@ Administratzaileek [[MediaWiki:Gadgets-definition|definizioak]] eta [[Special:Ga
 	'gadgets-pagetext' => 'Erabiltzaile bakoitzak bere [[Special:Preferences|hobespen orrian]] erabili ditzakeen gadgeten zerrenda bat agertzen da behean, [[MediaWiki:Gadgets-definition|definizioek]] zehaztu bezala.
 Ikuspegi orokor honek gadget bakoitza definitzen duen deskribapen eta kode orrietarako lotura errazak eskaintzen ditu.',
 	'gadgets-uses' => 'Erabilerak',
+	'gadgets-export' => 'Esportatu',
 );
 
 /** Extremaduran (Estremeñu)
@@ -780,6 +882,7 @@ $messages['ext'] = array(
  * @author Huji
  * @author Ladsgroup
  * @author Wayiran
+ * @author ZxxZxxZ
  */
 $messages['fa'] = array(
 	'gadgets-desc' => 'به کاربرها امکان انتخاب ابزارهای شخصی CSS و JavaScript را از طریق صفحهٔ [[Special:Preferences|ترجیحات]] می‌دهد',
@@ -795,7 +898,10 @@ $messages['fa'] = array(
 	'gadgets-pagetext' => 'در زیر فهرستی از ابزارهای ویژه‌ای که کاربران می‌توانند از طریق [[Special:Preferences|صفحهٔ ترجیحاتشان]] فعال کنند می‌بینید، که مطابق آن چه است که در صفحهٔ [[MediaWiki:Gadgets-definition|تعاریف]] تعریف شده‌است.
 این خلاصه کمک می‌کند که به صفحه‌های پیغام سیستمی که توضیحات و کد هر ابزار را شامل می‌شوند به راحتی دست پیدا کنید.',
 	'gadgets-uses' => 'برنامه',
-	'gadgets-required-rights' => 'به {{PLURAL:|حق $1|حق‌های روبرو: $2 $1}} نیاز است.',
+	'gadgets-required-rights' => 'به {{PLURAL:$2|دسترسی|دسترسی‌های}} روبرو نیاز است:
+
+$1',
+	'gadgets-required-skins' => 'قابل دسترس در {{PLURAL:$2|پوستهٔ $1|پوسته‌های $1}}.',
 	'gadgets-default' => 'به‌طور پیش‌فرض برای همه فعال است.',
 	'gadgets-export' => 'برون‌بری',
 	'gadgets-export-title' => 'برون‌بری ابزار',
@@ -809,6 +915,7 @@ $messages['fa'] = array(
 /** Finnish (Suomi)
  * @author Crt
  * @author Nike
+ * @author Olli
  */
 $messages['fi'] = array(
 	'gadgets-desc' => 'Tarjoaa mahdollisuuden käyttäjille ottaa käyttöön [[Special:Gadgets|määritettyjä CSS- ja JavaScript-pienoisohjelmia]] omista [[Special:Preferences|asetuksistaan]].',
@@ -822,6 +929,11 @@ Huomio myös, että nämä pienoisohjelmat eivät ole osa MediaWiki-ohjelmistoa
 
 Tämä lista antaa helpon pääsyn järjestelmäviesteihin, jotka sisältävät pienoisohjelmien kuvauksen ja koodin.',
 	'gadgets-uses' => 'Käyttää',
+	'gadgets-required-rights' => 'Edellyttää {{PLURAL:$2|seuraavaa oikeutta|seuraavia oikeuksia}}:
+
+$1',
+	'gadgets-required-skins' => 'Saatavilla {{PLURAL:$2|seuraavaan ulkoasuun|seuraaviin ulkoasuihin}}: $1.',
+	'gadgets-default' => 'Oletusarvoisesti käytössä kaikille.',
 	'gadgets-export' => 'Vie',
 	'gadgets-export-title' => 'Pienoisohjelmien vienti',
 	'gadgets-not-found' => 'Pienoisohjelmaa $1 ei löytynyt.',
@@ -831,6 +943,19 @@ Sinulla pitää olla tarvittavat oikeudet omassa wikissäsi, kuten järjestelmä
 	'gadgets-export-download' => 'Lataa',
 );
 
+/** Faroese (Føroyskt)
+ * @author EileenSanda
+ */
+$messages['fo'] = array(
+	'gadgets-uses' => 'Brúkar',
+	'gadgets-required-rights' => 'Krevur fylgjandi {{PLURAL:$2|rættindi|rættindi}}:
+
+$1',
+	'gadgets-required-skins' => 'Tøk á {{PLURAL:$2|$1 útsjónd|fylgjandi útsjóndum: $1}}.',
+	'gadgets-default' => 'Gjørt virkið fyri øllum sum standard',
+	'gadgets-export' => 'Útflyt',
+);
+
 /** French (Français)
  * @author Delhovlyn
  * @author Dr Brains
@@ -841,23 +966,24 @@ Sinulla pitää olla tarvittavat oikeudet omassa wikissäsi, kuten järjestelmä
  * @author PieRRoMaN
  * @author Sherbrooke
  * @author Urhixidur
+ * @author Zcqsc06
  * @author Zetud
  */
 $messages['fr'] = array(
 	'gadgets-desc' => 'Permet aux utilisateurs de choisir des [[Special:Gadgets|gadgets CSS et Javascripts]] personnalisés dans leurs [[Special:Preferences|préférences]]',
 	'prefs-gadgets' => 'Gadgets',
-	'gadgets-prefstext' => "Voici une liste de gadgets que vous pouvez activer pour votre compte.
-Ils font appel à JavaScript, lequel doit donc être activé sur votre navigateur Web pour qu'ils fonctionnent.
-Notez que ces gadgets n'ont aucun effet sur cette page des préférences.
+	'gadgets-prefstext' => 'Ci-dessous apparaît une liste de gadgets que vous pouvez activer pour votre compte. Ils font appel à JavaScript, lequel doit donc être activé pour votre navigateur Web.
 
-Notez aussi que ces gadgets spéciaux ne font nullement partie du logiciel MediaWiki, et qu'ils sont généralement développés et maintenus par des utilisateurs sur votre wiki local.
-Les administrateurs locaux peuvent modifier les gadgets disponibles en utilisant les [[MediaWiki:Gadgets-definition|définitions]] et les [[Special:Gadgets|descriptions]].",
+Notez aussi que ces gadgets spéciaux ne font nullement partie du logiciel MediaWiki. De plus, ils sont généralement développés et maintenus par les utilisateurs sur votre wiki local. Les administrateurs locaux peuvent modifier les gadgets disponibles en utilisant [[MediaWiki:Gadgets-definition|les définitions]] et les [[Special:Gadgets|descriptions]].',
 	'gadgets' => 'Gadgets',
 	'gadgets-title' => 'Gadgets',
-	'gadgets-pagetext' => "Voici une liste de gadgets que les utilisateurs peuvent activer dans leur [[Special:Preferences|page de préférences]], tel que défini dans les [[MediaWiki:Gadgets-definition|définitions]].
-Cette vue d'ensemble donne un accès rapide aux pages de messages système qui définissent la description et le code de chaque gadget.",
+	'gadgets-pagetext' => 'Voici une liste de gadgets que les utilisateurs peuvent activer dans leur [[Special:Preferences|page de préférences]], tel que défini dans les [[MediaWiki:Gadgets-definition|définitions]].
+Cette vue d’ensemble donne un accès rapide aux pages de messages système qui définissent la description et le code de chaque gadget.',
 	'gadgets-uses' => 'Utilise',
-	'gadgets-required-rights' => 'Requiert {{PLURAL:$2|le droit $1|les droits suivants : $1}}.',
+	'gadgets-required-rights' => 'Requiert {{PLURAL:$2|le droit suivant|les droits suivants}} : 
+
+$1.',
+	'gadgets-required-skins' => 'Disponible sur le  {{PLURAL:$2|   $1  skin|following skins:  $1 }}.',
 	'gadgets-default' => 'Activé pour tout le monde par défaut.',
 	'gadgets-export' => 'Exporter',
 	'gadgets-export-title' => 'Export de gadget',
@@ -885,9 +1011,18 @@ Los administrators locals pôvont changiér los outils disponiblos en utilisent
 	'gadgets-pagetext' => 'Vê-que una lista d’outils que los utilisators pôvont activar dens lor [[Special:Preferences|pâge de prèferences]], coment dèfeni dens les [[MediaWiki:Gadgets-definition|dèfinicions]].
 Ceti apèrçu balye un accès vito fêt a les pâges de mèssâjos sistèmo que dèfenéssont la dèscripcion et lo code de châque outil.',
 	'gadgets-uses' => 'Utilise',
+	'gadgets-required-rights' => 'At fôta de cet{{PLURAL:$2|i drêt|os drêts}} :
+
+$1',
+	'gadgets-required-skins' => 'Disponiblo sur {{PLURAL:$2|l’habelyâjo « $1 »|cetos habelyâjos : « $1 »}}.',
+	'gadgets-default' => 'Activâ por tot lo mondo per dèfôt.',
 	'gadgets-export' => 'Èxportacion',
 	'gadgets-export-title' => 'Èxportacion d’outil',
 	'gadgets-not-found' => 'Outil « $1 » pas trovâ.',
+	'gadgets-export-text' => 'Por èxportar l’outil $1, clicar sur lo boton « {{int:gadgets-export-download}} », encartar lo fichiér tèlèchargiê,
+pués alar sur la pâge « Spèciâl:Importacion du vouiqui de dèstinacion » et pués l’importar. Apondre aprés ceti tèxto dens la pâge « MediaWiki:Gadgets-definition » :
+<pre>$2</pre>
+O est nècèssèro de d’avêr los drêts corrèspondents sur lo vouiqui de dèstinacion (celi de changiér los mèssâjos sistèmo avouéc) et pués l’importacion dês des fichiérs dêt étre activâ.',
 	'gadgets-export-download' => 'Tèlèchargiér',
 );
 
@@ -898,7 +1033,7 @@ Ceti apèrçu balye un accès vito fêt a les pâges de mèssâjos sistèmo que
 $messages['gl'] = array(
 	'gadgets-desc' => 'Deixa que os usuarios seleccionen [[Special:Gadgets|trebellos CSS e JavaScript]] nas súas [[Special:Preferences|preferencias]]',
 	'prefs-gadgets' => 'Trebellos',
-	'gadgets-prefstext' => 'Embaixo hai unha lista de trebellos especiais que pode activar para a súa conta.
+	'gadgets-prefstext' => 'A continuación hai unha lista de trebellos especiais que pode activar para a súa conta.
 A maioría destes trebellos baséanse no JavaScript, así que ten que ter o JavaScript activado no seu navegador para que funcionen.
 Teña en conta que estes trebellos non funcionarán nesta páxina de preferencias.
 
@@ -908,7 +1043,10 @@ Teña tamén en conta que estes trebellos especiais non son parte do software de
 	'gadgets-pagetext' => 'Embaixo hai unha lista dos trebellos especiais que os usuarios poden habilitar na súa páxina de preferencias, tal e como se describe nas [[MediaWiki:Gadgets-definition|definicións]].
 Este panorama xeral é de doado acceso ao sistema das páxinas de mensaxes que define cada descrición e código dos trebellos.',
 	'gadgets-uses' => 'Usa',
-	'gadgets-required-rights' => '{{PLURAL:$2|Cómpre dereitos de $1|Cómpren os seguintes dereitos: $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Cómpre o seguinte dereito|Cómpren os seguintes dereitos}}:
+
+$1',
+	'gadgets-required-skins' => 'Dispoñible {{PLURAL:$2|na aparencia $1|nas seguintes aparencias: $1}}.',
 	'gadgets-default' => 'Activar para todos por defecto.',
 	'gadgets-export' => 'Exportar',
 	'gadgets-export-title' => 'Exportación de trebellos',
@@ -931,6 +1069,7 @@ $messages['grc'] = array(
 );
 
 /** Swiss German (Alemannisch)
+ * @author Als-Chlämens
  * @author Als-Holder
  */
 $messages['gsw'] = array(
@@ -947,7 +1086,9 @@ Benutzer vum lokale Wikis entwicklet un gwartet wäre. Lokali Wiki-Ammanne chenn
 	'gadgets-pagetext' => 'Lischt vu spezielle Gadgets, wu fir jede Benutzer in syyne [[Special:Preferences|persenlige Yystellige]] verfiegbar sin, wie s [[MediaWiki:Gadgets-definition|definiert]] isch.
 Die Ibersicht bietet e direkte Zuegang zue dr Syschtemnochrichte, wu d Bschryybig un dr Programmcode vu jedem Gadget din sin.',
 	'gadgets-uses' => 'Bruucht',
-	'gadgets-required-rights' => 'Brucht {{PLURAL:$2|des Rächt:|die Rächt:}} $1',
+	'gadgets-required-rights' => 'Brucht {{PLURAL:$2|des folgendi Rächt|die folgende Rächt}}:
+$1',
+	'gadgets-required-skins' => 'Verfiegbar uff {{PLURAL:$2|derre Benutzeroberflächi|dänne Benutzeroberflächene}}: $1.',
 	'gadgets-default' => 'Fir alli standardmäßig aktiviert.',
 	'gadgets-export' => 'Exportiere',
 	'gadgets-export-title' => 'Hälferli exportiere',
@@ -960,6 +1101,8 @@ Du muesch iber di notwändige Rächt uf em Wiki verfiege, wu fir dr Import vorgs
 
 /** Gujarati (ગુજરાતી)
  * @author Dsvyas
+ * @author KartikMistry
+ * @author Sushant savla
  */
 $messages['gu'] = array(
 	'prefs-gadgets' => 'યંત્રો/સાધનો',
@@ -974,6 +1117,15 @@ $messages['gu'] = array(
 
 આ નિરિક્ષણથી સહેલાઇથી સિસ્ટમ સંદેશા વાળા પાના ખોલી શકશો જ્યાં દરેક સાધનનું વર્ણન અને તેનો કોડ આપેલો છે.',
 	'gadgets-uses' => 'ઉપયોગો',
+	'gadgets-required-rights' => 'નીચેના {{PLURAL:$2|હક્ક|હક્કો}} જરૂરી:
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1 ત્વચા|નીચેની ત્વચા: $1}} માં મોજૂદ.',
+	'gadgets-default' => 'મૂળ થકી સૌ માટે સક્રીય કરો',
+	'gadgets-export' => 'નિકાસ',
+	'gadgets-export-title' => 'સાધન નિકાસ',
+	'gadgets-not-found' => 'સાધન જૂથ "$1" ન મળ્યું.',
+	'gadgets-export-download' => 'ડાઉનલોડ',
 );
 
 /** Hebrew (עברית)
@@ -995,7 +1147,10 @@ $messages['he'] = array(
 	'gadgets-pagetext' => 'זוהי רשימה של סקריפטים שמשתמשים יכולים להתקין באמצעות [[Special:Preferences|דף ההעדפות]] שלהם, כפי שהוגדרו ב[[MediaWiki:Gadgets-definition|הודעת המערכת המתאימה]].
 מכאן ניתן לגשת בקלות לדפי הודעות המערכת שמגדירים את התיאור והקוד של כל סקריפט.',
 	'gadgets-uses' => 'משתמש בדפים',
-	'gadgets-required-rights' => '{{PLURAL:$2|נדרשת ההרשאה $1|נדרשות ההרשאות $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|נדרשת ההרשאה הבאה|נדרשות ההרשאות הבאות}}:
+
+$1',
+	'gadgets-required-skins' => 'זמין {{PLURAL:$2|בערכות העיצוב הבאות: $1|בערכת העיצוב $1}}',
 	'gadgets-default' => 'מופעל לכולם לפי בררת מחדל.',
 	'gadgets-export' => 'יצוא',
 	'gadgets-export-title' => 'יצוא גאדג׳טים',
@@ -1008,7 +1163,9 @@ $messages['he'] = array(
 );
 
 /** Hindi (हिन्दी)
+ * @author Ansumang
  * @author Kaustubh
+ * @author Mayur
  * @author Shyam
  */
 $messages['hi'] = array(
@@ -1025,6 +1182,15 @@ $messages['hi'] = array(
 	'gadgets-pagetext' => 'नीचे विशेष जुगतों कि सूची दी गई है, जिन्हें सदस्य [[MediaWiki:Gadgets-definition]] की परिभाषा के अनुसार, अपने वरीयता पृष्ठ में सक्षम कर सकते हैं।
 यह समीक्षा तंत्र संदेश पृष्ठों तक पहुँचने का आसान मार्ग प्रदान करती है, जो की प्रत्येक जुगत के वर्णन एवं कूट भाषा को परिभाषित करते हैं।',
 	'gadgets-uses' => 'उपयोग',
+	'gadgets-required-rights' => 'निम्नलिखित की आबश्यकता है {{PLURAL:$2|अधिकार|अधिकार}}:
+
+$1',
+	'gadgets-required-skins' => 'उपलब्ध है {{PLURAL:$2|$1 स्किन|निम्नलिखित स्किन: $1}}.',
+	'gadgets-default' => 'डिफ़ॉल्ट रूप से सभी के लिए सक्षम है।',
+	'gadgets-export' => 'निर्यात',
+	'gadgets-export-title' => 'गैजेट निर्यात',
+	'gadgets-not-found' => 'गैजेट "$1" मिला नहीं ।',
+	'gadgets-export-download' => 'डाउनलोड',
 );
 
 /** Croatian (Hrvatski)
@@ -1051,8 +1217,8 @@ Ovaj pregled omogućava lak pristup porukama sustava koje opisuju dodatke i njih
 	'gadgets-export' => 'Izvezi',
 	'gadgets-export-title' => "Izvoz JS skripti (''gadgets'')",
 	'gadgets-not-found' => "''Gadget'' \"\$1\" nije pronađen.",
-	'gadgets-export-text' => 'Za izvoz $1 JavaScript pomoćne skripte (\'\'gadgeta\'\'), kliknite na "{{int:gadgets-export-download}}" gumb, snimiti preuzetu datoteku, 
-zatim idete na Special:Import na odredišnoj wiki i postavite skriptu tamo. Zatim dodajte sljedeće na "MediaWiki:Gadgets-definition stranici: 
+	'gadgets-export-text' => 'Za izvoz $1 JavaScript pomoćne skripte (\'\'gadgeta\'\'), kliknite na "{{int:gadgets-export-download}}" gumb, snimiti preuzetu datoteku,
+zatim idete na Special:Import na odredišnoj wiki i postavite skriptu tamo. Zatim dodajte sljedeće na "MediaWiki:Gadgets-definition stranici:
 <pre>$2</pre>
 Morate imati odgovarajuća prava na odredišnoj wiki (uključujući i pravo na uređivanje sistemskih poruka) i uvoz iz snimljenih datoteka mora biti omogućen.',
 	'gadgets-export-download' => 'Preuzmi',
@@ -1073,6 +1239,11 @@ Nimo toho wobkedźbuj, zo tute specialne funkcije dźěl softwary MediaWiki njej
 	'gadgets-pagetext' => 'Deleka je lisćina specialnych funkcijow, kotrež wužiwarjo móža na swojej [[Special:Preferences|stronje nastajenjow]] zmóžnić, kaž přez [[MediaWiki:Gadgets-definition|definicije]] definowane.
 Tutón přehlad skići lochki přistup k systemowym zdźělenkam, kotrež wopisanje a kod kóždeje specialneje funkcije definuja.',
 	'gadgets-uses' => 'Wužiwa',
+	'gadgets-required-rights' => 'Wužaduje sej {{PLURAL:$2|slědowace prawo|slědowacej prawje|slědowace prawa|slědowace prawa}}:
+
+$1',
+	'gadgets-required-skins' => 'Na {{PLURAL:$2|slědowacej drasće|slědowacymaj drastomaj|slědowacych drastach|slědowacych drastach}} k dispoziciji: $1',
+	'gadgets-default' => 'Za wšěch standardnje zmóžnjeny.',
 	'gadgets-export' => 'Eksportować',
 	'gadgets-export-title' => 'Specialnu funkciju eksportować',
 	'gadgets-not-found' => 'Specialna funkcija "$1" njeje so namakała.',
@@ -1101,10 +1272,13 @@ Az adminisztrátorok a [[MediaWiki:Gadgets-definition|definíciókat]] és a [[S
 	'gadgets-pagetext' => 'Itt látható azon segédeszközök listája, amiket a felhasználók bekapcsolhatnak a beállításaiknál. A lista a [[MediaWiki:Gadgets-definition|definíciókat]] tartalmazó lapon módosítható.
 Ez az áttekintő lap egyszerű hozzáférést nyúlt az eszközök kódját, illetve leírását tartalmazó rendszerüzenet-lapokhoz.',
 	'gadgets-uses' => 'Kód',
-	'gadgets-required-rights' => 'A következő {{PLURAL:$2|jogosultságra|jogosultságokra}} van szükség: $1.',
+	'gadgets-required-rights' => 'A következő {{PLURAL:$2|jogosultságra|jogosultságokra}} van szükség:
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1 felületen érhető el|Az alábbi felületeken érhető el: $1}}.',
 	'gadgets-default' => 'Mindenki számára engedélyezett alapértelmezettként.',
 	'gadgets-export' => 'Exportálás',
-	'gadgets-export-title' => 'Gadget export',
+	'gadgets-export-title' => 'Segédeszköz exportálás',
 	'gadgets-not-found' => 'A(z) „$1“ segédeszköz nem található.',
 	'gadgets-export-text' => 'A(z) $1 segédeszköz exportálásához kattints a „{{int:gadgets-export-download}}“ gombra, mentsd el a fájlt, majd a célwikiben a Special:Import lapon töltsd fel. Ezután a MediaWiki:Gadgets-definition laphoz add hozzá a következőket:
 <pre>$2</pre>
@@ -1129,7 +1303,10 @@ Le administratores local pote modificar le gadgets disponibile per medio de [[Me
 	'gadgets-pagetext' => 'Infra es un lista de gadgets special que le usatores pote activar in lor [[Special:Preferences|paginas de preferentias]], secundo le [[MediaWiki:Gadgets-definition|definitiones]].
 Iste supervista permitte le accesso commode al paginas de messages de systema que defini le description e codice de cata gadget.',
 	'gadgets-uses' => 'Usa',
-	'gadgets-required-rights' => 'Require le {{PLURAL:$2|derecto de $1|sequente derectos: $1}}.',
+	'gadgets-required-rights' => 'Require le sequente {{PLURAL:$2|derecto|derectos}}:
+
+$1',
+	'gadgets-required-skins' => 'Disponibile con le {{PLURAL:$2|apparentia $1|sequente apparentias: $1}}.',
 	'gadgets-default' => 'Activate pro omnes per predefinition.',
 	'gadgets-export' => 'Exportar',
 	'gadgets-export-title' => 'Exportation de gadget',
@@ -1168,6 +1345,38 @@ Anda harus memeroleh izin pada wiki tujuan (termasuk hak menyunting pesan sistem
 	'gadgets-export-download' => 'Unduh',
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'gadgets-desc' => 'Mabalin dagiti agar-aramat nga agpili iti [[Special:Gadgets|CSS ken JavaScript gadyets]] idiay [[Special:Preferences|kaykayat da]]',
+	'prefs-gadgets' => 'Gadyets',
+	'gadgets-prefstext' => 'Adda dita baba ti listaan ti naipangruna a gadyets nga usaren idiay pakabilangam.
+Dagitoy a gadyets ket naibasta iti JavaScript, masapul a pakabaelan ti  JavaScript idiay  "pagbasabasam" tapno agbalin da.
+Saan a mabalin nga usaren dagitoy a gadyets ditoy kaykayat a panid.
+
+Dagitoy a gadyets ket saan a paset ti MediaWiki software, inaramid ken inayaywanan dagiti agar-aramat ti lokal a wiki.
+Mabaliwan dagita administrador nga urnosen ti  [[MediaWiki:Gadgets-definition|pinakailawag]] ken [[Special:Gadgets|deskripsion]] ti gadyets.',
+	'gadgets' => 'Gadyets',
+	'gadgets-title' => 'Gadyets',
+	'gadgets-pagetext' => 'Dita baba ket adda listaan dagiti naipangruna a gadyets a dagiti agar-aramat ket mapagbalin da idiay [[Special:Preferences|kaykayat da a panid]],  a naipalawag iti [[MediaWiki:Gadgets-definition|dagiti pinakailawag]].
+Daytoy a pinakabuklan ket mangted ti nalaka a pinagserrek kadagit mensahe ti sistema a panid a nagpailawag iti deskripsion ti gadyet ken kodigo.',
+	'gadgets-uses' => 'Usar',
+	'gadgets-required-rights' => 'Masapul dagiti sumaganad {{PLURAL:$2|a karbengan|dagiti karbengan}}:
+
+$1',
+	'gadgets-required-skins' => 'Adda mabalin idiay {{PLURAL:$2|$1 a kudil|dagiti sumaganad a kudil: $1}}.',
+	'gadgets-default' => 'Pabaelan a kinasigud iti amin nga agar-aramat.',
+	'gadgets-export' => 'Agipan',
+	'gadgets-export-title' => 'Agipan ti gadyet',
+	'gadgets-not-found' => 'Saan a nabirukan ti "$1" a gadyet.',
+	'gadgets-export-text' => 'Ti pinag-ipan ti $1 a gadyet, aglatak idiay "{{int:gadgets-export-download}}" a buton, idulin ti inkarga nga agpababa a papeles,
+mapan idiay  Special:Import ti papanan a wiki ken ikarga nga agpangato. Ken inayon dagiti sumaganad idiay MediaWiki:Gadgets-definition page:
+<pre>$2</pre>
+Masapul nga addaan ka ti husto a pammalubos iti papanan a wiki (nairaman ti karbegnan a pinagbaliw dagiti mensahe ti sistema) ken naipabalin ti pinagala kadagiti naggapu a papeles a naikarga nga agpangato.',
+	'gadgets-export-download' => 'Ikarga nga agpababa',
+);
+
 /** Ido (Ido)
  * @author Malafaya
  */
@@ -1177,6 +1386,7 @@ $messages['io'] = array(
 
 /** Icelandic (Íslenska)
  * @author Jóna Þórunn
+ * @author Maxí
  */
 $messages['is'] = array(
 	'gadgets-desc' => 'Gerir notendum kleift að velja [[Special:Gadgets|CSS og JavaScript-forrit]] í [[Special:Preferences|stillingum sínum]]',
@@ -1187,6 +1397,7 @@ Forritin eru ekki hluti af MediaWiki-hugbúnaðinum heldur eru skrifuð og viðh
 	'gadgets' => 'Smáforrit',
 	'gadgets-title' => 'Smáforrit',
 	'gadgets-uses' => 'Notar',
+	'gadgets-export-download' => 'Hlaða niður',
 );
 
 /** Italian (Italiano)
@@ -1207,7 +1418,10 @@ Inoltre, si noti che questi accessori speciali non sono compresi nel software Me
 	'gadgets-title' => 'Accessori',
 	'gadgets-pagetext' => "Di seguito sono elencati gli accessori (''gadget'') che gli utenti possono abilitare sulla propria pagina delle [[Special:Preferences|preferenze]], seguendo le [[MediaWiki:Gadgets-definition|definizioni]]. Questa panoramica fornisce un comodo meccanismo per accedere ai messaggi di sistema nei quali sono definiti la descrizione e il codice di ciascun accessorio.",
 	'gadgets-uses' => 'Utilizza',
-	'gadgets-required-rights' => 'Richiede {{PLURAL:$2|il diritto $1|i seguenti diritti: $1}}.',
+	'gadgets-required-rights' => 'Richiede {{PLURAL:$2|il seguente diritto|i seguenti diritti}}:
+
+$1',
+	'gadgets-required-skins' => 'Disponibile {{PLURAL:$2|per la skin $1|per le seguenti skin: $1}}.',
 	'gadgets-default' => 'Attivato per tutti, per impostazione predefinita.',
 	'gadgets-export' => 'Esporta',
 	'gadgets-export-title' => 'Esporta accessorio',
@@ -1217,6 +1431,7 @@ Inoltre, si noti che questi accessori speciali non sono compresi nel software Me
 
 /** Japanese (日本語)
  * @author Aotake
+ * @author Fryed-peach
  * @author JtFuruhata
  * @author Mzm5zbC3
  * @author Whym
@@ -1232,7 +1447,10 @@ $messages['ja'] = array(
 	'gadgets-title' => 'ガジェット',
 	'gadgets-pagetext' => '以下は、[[MediaWiki:Gadgets-definition]] 上で定義された、利用者が[[Special:Preferences|{{int:preferences}}]]にて利用可能にすることができるガジェットの一覧です。この一覧はガジェットの説明やプログラムコードを定義しているシステムメッセージページへの簡単なアクセスも提供します。',
 	'gadgets-uses' => '利用するファイル',
-	'gadgets-required-rights' => '{{PLURAL:$2|$1の権限|$1の権限}}が必要です。',
+	'gadgets-required-rights' => '以下の{{PLURAL:$2|権限}}が必要です。
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1外装|外装：$1}}で利用てきます。',
 	'gadgets-default' => 'デフォルトで全員に有効です。',
 	'gadgets-export' => 'エクスポート',
 	'gadgets-export-title' => 'ガジェットのエクスポート',
@@ -1265,7 +1483,7 @@ Bemærk også at disse specielle gadgets ikke er en del af MediaWiki-softwaren o
 $messages['jv'] = array(
 	'gadgets-desc' => 'Marengaké para panganggo milih [[Special:Gadgets|gadget CSS lan JavaScript]] ngliwati [[Special:Preferences|préferènsi]] dhéwé-dhéwé.',
 	'prefs-gadgets' => 'Gadget',
-	'gadgets-prefstext' => 'Ing ngisor iki daftar gadget astaméwa sing bisa panjenangan aktifaké kanggo rékening panjenengan. Gadget-gadget iki sabagéyan gedhé adhedhasar JavaScript dadi panjenengan kudu ngaktifaké JavaScript ing panjlajah wèb panjenengan supaya bisa nglakokaké. 
+	'gadgets-prefstext' => 'Ing ngisor iki daftar gadget astaméwa sing bisa panjenangan aktifaké kanggo rékening panjenengan. Gadget-gadget iki sabagéyan gedhé adhedhasar JavaScript dadi panjenengan kudu ngaktifaké JavaScript ing panjlajah wèb panjenengan supaya bisa nglakokaké.
 Mangga diwigatèkaké yèn gadget-gadget iki ora ndarbèni pangaruh marang kaca préferènsi iki.
 
 Uga mangga diwigatèkaké yèn gadget astaméwa iki dudu bagéyan saka piranti empuk MediaWiki lan biasané dikembangaké lan diopèni déning panganggo-panganggo ing wiki lokal panjenengan. Pangurus lokal bisa nyunting gadget sing kasedyakaké nganggo [[MediaWiki:Gadgets-definition|dhéfinisi]] lan [[Special:Gadgets|uraian]].',
@@ -1308,7 +1526,7 @@ $messages['kk-arab'] = array(
 	'gadgets-uses' => 'قولدانۋداعىلار',
 );
 
-/** Kazakh (Cyrillic) (Қазақша (Cyrillic)) */
+/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬) */
 $messages['kk-cyrl'] = array(
 	'prefs-gadgets' => 'Қажет құралдар',
 	'gadgets-prefstext' => 'Төменде өз тіркелгіңізде қоса алатын арнаулы қажет құралдар тізімі беріледі.
@@ -1325,7 +1543,7 @@ $messages['kk-cyrl'] = array(
 	'gadgets-uses' => 'Қолданудағылар',
 );
 
-/** Kazakh (Latin) (Қазақша (Latin)) */
+/** Kazakh (Latin script) (‪Qazaqşa (latın)‬) */
 $messages['kk-latn'] = array(
 	'prefs-gadgets' => 'Qajet quraldar',
 	'gadgets-prefstext' => 'Tömende öz tirkelgiñizde qosa alatın arnawlı qajet quraldar tizimi beriledi.
@@ -1347,12 +1565,14 @@ Bul şolw beti arqılı ärbir qajet quraldıñ sïpattaması men ämirin anıqt
  * @author Lovekhmer
  * @author Thearith
  * @author គីមស៊្រុន
+ * @author វ័ណថារិទ្ធ
  */
 $messages['km'] = array(
 	'prefs-gadgets' => 'គ្រឿងបន្ទាប់បន្សំ',
 	'gadgets' => 'គ្រឿងបន្ទាប់បន្សំ',
 	'gadgets-title' => 'គ្រឿងបន្ទាប់បន្សំ',
 	'gadgets-uses' => 'ប្រើ',
+	'gadgets-export-download' => 'ទាញយក',
 );
 
 /** Korean (한국어)
@@ -1375,7 +1595,10 @@ $messages['ko'] = array(
 	'gadgets-pagetext' => '[[Special:Preferences|사용자 환경 설정]]에서 설정할 수 있는 소도구 목록입니다. 해당 목록은 [[MediaWiki:Gadgets-definition|소도구 정의]]에서 편집할 수 있습니다.
 이 문서에서는 각 소도구의 각 설명 문서/코드의 시스템 메시지 링크를 제공합니다.',
 	'gadgets-uses' => '다음 코드를 이용',
-	'gadgets-required-rights' => '{{PLURAL:$2|$1 권한이 필요합니다.|다음 권한이 필요합니다: $1}}',
+	'gadgets-required-rights' => '다음 {{PLURAL:$2|권한}}이 필요합니다: 
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1 스킨에서 사용 가능합니다.|다음 스킨에서 사용 가능합니다: $1}}',
 	'gadgets-default' => '기본적으로 모든 사람에게 활성화되어 있습니다.',
 	'gadgets-export' => '내보내기',
 	'gadgets-export-title' => '소도구 내보내기',
@@ -1424,7 +1647,10 @@ Die Övverseech hee jit enne direkte Zohjang op di Texte em Wiki,
 wo de Projramme, un de Erklierunge för de <i lang="en">Gadgets</i> dren enthallde
 sin.',
 	'gadgets-uses' => 'Bruch',
-	'gadgets-required-rights' => 'Bruch {{PLURAL:$2|dat Rääsch:|de Rääschde:|kein besönder Rääschde.}} $1',
+	'gadgets-required-rights' => 'Bruch {{PLURAL:$2|dat Rääsch:|de Rääschde:|kein besönder Rääschde.}}
+
+$1',
+	'gadgets-required-skins' => 'Kann jebruch wääde met {{PLURAL:$2|dä Bedeenbovverfläsch:|dä Bedeenbovverfläsche:|keine vun dä Bedeenbovverfläsche.}} $1',
 	'gadgets-default' => 'Shtandattmääßesh för jeeder_ein ennjeschalldt.',
 	'gadgets-export' => 'Expotteere',
 	'gadgets-export-title' => '<i lang="en">Gadgets</i> expotteere',
@@ -1435,7 +1661,7 @@ Do moß en däm Wiki de nüüdijje Rääschde han, och dat Rääsch, aan Täxte
 	'gadgets-export-download' => 'Eronger laade',
 );
 
-/** Kurdish (Latin) (Kurdî (Latin))
+/** Kurdish (Latin script) (‪Kurdî (latînî)‬)
  * @author George Animal
  */
 $messages['ku-latn'] = array(
@@ -1453,14 +1679,15 @@ $messages['lb'] = array(
 D'Gadgete baséiere meeschtens op engem JavaScript, dofir muss JavaScript an Ärem Browser aktivéiert sinn, fir datt se fonctionéieren.
 D'Gadgete fonctionéieren awer net op dëser Säit mat de perséinlechen Astellungen.
 
-Ausserdeem sollt Dir wëssen, datt dës Gadgete generell net Deel vu MediaWiki sinn, a meeschtens vu Benotzer vu lokale Wikien entwéckelt an ënnerhale ginn. 
+Ausserdeem sollt Dir wëssen, datt dës Gadgete generell net Deel vu MediaWiki sinn, a meeschtens vu Benotzer vu lokale Wikien entwéckelt an ënnerhale ginn.
 Lokal Wiki-Administrateure kënnen d'Lëscht von den disponibele Gadgeten op de Säiten [[MediaWiki:Gadgets-definition|Definitioune vun Gadgeten]] a [[Special:Gadgets|Beschreiwunge vu Gadgeten]] änneren.",
 	'gadgets' => 'Gadgeten',
 	'gadgets-title' => 'Gadgeten',
 	'gadgets-pagetext' => "Ënnendrënner ass eng Lëscht vun de spezielle Gadgeten déi d'Benotzer op hire [[Special:Preferences|Benotzer-Astellungen]] aschalte kënnen, esou wéi dat op [[MediaWiki:Gadgets-definition|definéiert]] ass.
 Dës Iwwersiicht gëtt einfachen Zougang zu de Systemmessage-Säiten, déi all Gadget beschreiwen an zum Programméiercode vun dem Gadget.",
 	'gadgets-uses' => 'Benotzt',
-	'gadgets-required-rights' => "Erfuerdert {{PLURAL:$2|d'Recht|d'Rechter}}: $1.",
+	'gadgets-required-rights' => "Erfuerdert {{PLURAL:$2|d'Recht|dës Rechter}}: $1.",
+	'gadgets-required-skins' => "Disponibel fir {{PLURAL:$2|d'Ausgesinn $1|dës $2 Ausgesinn: $1}}.",
 	'gadgets-default' => 'Fir jiddwereen als Standard ageschalt.',
 	'gadgets-export' => 'Export',
 	'gadgets-export-title' => 'Export vu Gadgeten',
@@ -1482,20 +1709,30 @@ $messages['li'] = array(
 De oetbreijinge zeen veurnamelik gebaseerd op JavaScript, dus JavaScript mót veur diene browser ingesjakeld zeen óm die te laote wirke.
 De oetbreijinge höbbe geine invlood op dees pazjena mit veurkäöre.
 
-Dees sjpeciaal oetbreijinge zeen ouch gein óngerdeil van de MediaWiki-software en die mótte meistal óntwikkeld en óngerhauwe waere door gebroekers van diene wiki. 
+Dees sjpeciaal oetbreijinge zeen ouch gein óngerdeil van de MediaWiki-software en die mótte meistal óntwikkeld en óngerhauwe waere door gebroekers van diene wiki.
 Lokaal beheerders kónne de besjikbaar oetbreijinge aangaeve in [[MediaWiki:Gadgets-definition]] en [[Special:Gadgets]].',
 	'gadgets' => 'Oetbreijinger',
 	'gadgets-title' => 'Oetbreijinger',
 	'gadgets-pagetext' => 'Hiej ónger staon de speciaal oetbreijinger die gebroekers kinne insjakele via häöre [[Special:Preferences|veurkeure]] wie ingesteldj is in [[MediaWiki:Gadgets-definition]].
 Dit euverzich bi-jtj uch einvoudige toegank toet de systeemtekspazjena wo de besjrieving en de programmacode van edere oetbreijing steit.',
 	'gadgets-uses' => 'Gebroek',
+	'gadgets-required-rights' => "{{PLURAL:$2|'t Volgend rech is|De volgende rechte zeen}} vereis: $1.",
+	'gadgets-required-skins' => 'Besjikbaar op de {{PLURAL:$2|vormgaeving $1|volgende vormgaevinge: $1}}.',
+	'gadgets-default' => 'Standerd aan veur edert.',
 	'gadgets-export' => 'Veur oet',
 	'gadgets-export-title' => 'Exporteer oetbreijing',
 	'gadgets-not-found' => 'Oetbreiding "$1" neet gevonje.',
+	'gadgets-export-text' => 'Klik óppe knoep "{{int:gadgets-export-download}}" óm de oetbreiding "$1" oet te veure.
+Slaon daonao \'t gedownloadj bestandj óp.
+Gank nao "Special:Import" inne doelwiki en laaj \'t oetgeveurdj bestandj óp.
+Veug daonao \'t vólgendje toe ane pagina "MediaWiki:Gadgets-definition":
+<pre>$2</pre>
+Doe mós de juuste rèchte höbben óppe doelwie, ouch óm bewirkinge aan systeemberichte te make en in te veure oet bestenj.',
 	'gadgets-export-download' => 'Haol óp',
 );
 
 /** Lithuanian (Lietuvių)
+ * @author Eitvys200
  * @author Homo
  * @author Vpovilaitis
  */
@@ -1511,6 +1748,10 @@ Taip pat žinokite, kad šios specialios priemonės nėra MediaWiki programinės
 	'gadgets-title' => 'Priemonės',
 	'gadgets-pagetext' => 'Žemiau yra sąrašas specialių priemonių, kurias naudotojai gali įjungti savo [[Special:Preferences|nustatymų puslapyje]]. Jos apibūdintos [[MediaWiki:Gadgets-definition|priemonių aprašyme]]. Ši apžvalga suteikia lengvą priėjimą prie sisteminių pranešimų puslapių, kuriuose pateiktas kiekvienos priemonės trumpas aprašas ir kodas.',
 	'gadgets-uses' => 'Panaudojimai',
+	'gadgets-export' => 'Eksportas',
+	'gadgets-export-title' => 'Įtaiso eksportas',
+	'gadgets-not-found' => 'Įtaisas " $1 " nerastas.',
+	'gadgets-export-download' => 'Parsisiųsti',
 );
 
 /** Latvian (Latviešu)
@@ -1555,7 +1796,10 @@ $messages['mk'] = array(
 	'gadgets-pagetext' => 'Ова е список на специјални алатки кои корисниците можат да ги активираат на нивната [[Special:Preferences|страница за нагодување]], наведени во [[MediaWiki:Gadgets-definition|определувањата]].
 Овој преглед дава лесен пристап до системските пораки кои го определуваат описот и кодот на секоја алатка.',
 	'gadgets-uses' => 'Користи',
-	'gadgets-required-rights' => 'Треба {{PLURAL:$2|да се има правото на $1|да се имаат следниве права: $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Го бара следново право|Ги бара следниве права}}:
+
+$1',
+	'gadgets-required-skins' => 'Достапно во {{PLURAL:$2|рувото $1|следниве рува: $1}}.',
 	'gadgets-default' => 'Достапно за сите по основно',
 	'gadgets-export' => 'Извези',
 	'gadgets-export-title' => 'Извоз на алатка',
@@ -1585,7 +1829,10 @@ $messages['ml'] = array(
 	'gadgets-pagetext' => 'ഉപയോക്താക്കൾക്ക് അവരുടെ [[Special:Preferences|ക്രമീകരണങ്ങൾ താളിൽ]] നിന്നും സജ്ജമാക്കാവുന്ന ഗാഡ്ജറ്റുകളുടെ പട്ടിക [[MediaWiki:Gadgets-definition|അവ നിർവ്വചിക്കപ്പെട്ട പ്രകാരം]] താഴെ കൊടുത്തിരിക്കുന്നു.
 ഓരോ ഗാഡ്ജറ്റിന്റേയും വിവരണവും കോഡും ഉള്ള സന്ദേശ താളുകളിലേക്കു പോകാനുള്ള എളുപ്പവഴി ഈ പട്ടിക നൽകുന്നു.',
 	'gadgets-uses' => 'ഉപയോഗങ്ങൾ',
-	'gadgets-required-rights' => '{{PLURAL:$2|$1 അവകാശം|$1 എന്നീ അവകാശങ്ങൾ}} ആവശ്യമാണ്.',
+	'gadgets-required-rights' => 'താഴെപ്പറയുന്ന {{PLURAL:$2|അവകാശം|അവകാശങ്ങൾ}} ആവശ്യമാണ്:
+
+$1',
+	'gadgets-required-skins' => 'ലഭ്യമായ {{PLURAL:$2|ദൃശ്യരൂപം: $1|ദൃശ്യരൂപങ്ങൾ: $1}}.',
 	'gadgets-default' => 'എല്ലാവർക്കും സ്വതേ പ്രവർത്തനസജ്ജമായിരിക്കും.',
 	'gadgets-export' => 'കയറ്റുമതി ചെയ്യുക',
 	'gadgets-export-title' => 'ഗാഡ്ജറ്റ് കയറ്റുമതി ചെയ്യുക',
@@ -1599,17 +1846,34 @@ $messages['ml'] = array(
 /** Marathi (मराठी)
  * @author Kaustubh
  * @author Mahitgar
+ * @author Rahuldeshmukh101
+ * @author V.narsikar
  */
 $messages['mr'] = array(
 	'gadgets-desc' => 'सदस्यांना त्यांच्या [[Special:Preferences|पसंतीची]] [[Special:Gadgets|CSS व जावास्क्रीप्ट गॅजेट्स]] निवडण्याची परवानगी देते.',
 	'prefs-gadgets' => 'उपकरण(गॅजेट)',
-	'gadgets-prefstext' => 'खाली तुम्ही तुमच्या सदस्यत्वासाठी वापरू शकत असलेल्या गॅजेट्सची यादी दिलेली आहे. ही गॅजेट्स मुख्यत्वे जावास्क्रीप्टवर अवलंबून असल्यामुळे तुमच्या ब्राउझर मध्ये जावास्क्रीप्ट एनेबल असणे आवश्यक आहे. या गॅजेट्समुळे या पसंतीच्या पानावर कुठलेही परिणाम होणार नाहीत याची कृपया नोंद घ्यावी.
+	'gadgets-prefstext' => 'खाली तुम्ही तुमच्या सदस्यखात्यासाठी वापरू शकत असलेल्या गॅजेट्सची यादी दिलेली आहे. ही गॅजेट्स मुख्यत्वे जावास्क्रीप्टवर अवलंबून असल्यामुळे तुमच्या ब्राउझर मध्ये जावास्क्रीप्ट एनेबल असणे आवश्यक आहे. या गॅजेट्समुळे या पसंतीच्या पानावर कुठलेही परिणाम होणार नाहीत याची कृपया नोंद घ्यावी.
+
+तसेच ही गॅजेट्स मीडियाविकी प्रणालीचा हिस्सा नाहीत, व ही मुख्यत्वे स्थानिक विकिवर सदस्यांद्वारे उपलब्ध केली जातात. 
 
-तसेच ही गॅजेट्स मीडियाविकी प्रणालीचा हिस्सा नाहीत, व ही मुख्यत्वे स्थानिक विकिवर सदस्यांद्वारे उपलब्ध केली जातात. स्थानिक प्रबंधक उपलब्ध गॅजेट्स [[MediaWiki:Gadgets-definition]] व [[Special:Gadgets]] वापरून बदलू शकतात.',
+स्थानिक प्रचालक उपलब्ध गॅजेट्स [[MediaWiki:Gadgets-definition|व्याख्या]] व [[Special:Gadgets|वर्णने]] वापरून बदलू शकतात.',
 	'gadgets' => 'सुविधा (गॅजेट)',
 	'gadgets-title' => 'गॅजेट',
-	'gadgets-pagetext' => 'खाली तुम्ही तुमच्या सदस्यत्वासाठी वापरू शकत असलेल्या [[MediaWiki:Gadgets-definition]]ने सांगितलेल्या गॅजेट्सची यादी दिलेली आहे. हे पान तुम्हाला प्रत्येक गॅजेट्सचा कोड व व्याख्या देणार्‍या पानासाठी सोपी संपर्क सुविधा पुरविते.',
+	'gadgets-pagetext' => 'खाली तुम्ही तुमच्या सदस्यत्वासाठी [[Special:Preferences|माझ्या पसंती]] पानावर वापरू शकत असलेल्या [[MediaWiki:Gadgets-definition|व्याख्या]]ने सांगितलेल्या गॅजेट्सची यादी दिलेली आहे. हे पान तुम्हाला प्रत्येक गॅजेट्सचा कोड व व्याख्या देणार्‍या पानासाठी सोपी संपर्क सुविधा पुरविते.',
 	'gadgets-uses' => 'उपयोग',
+	'gadgets-required-rights' => 'खलील गोष्ठी साठी विनंती     {{PLURAL:$2|right|rights}}:
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1 skin|खालील देखाव्यांवर  : $1}} उपलब्ध आहेत',
+	'gadgets-default' => 'सर्वांसाठी डिफॉल्ट उपलब्ध केले आहे',
+	'gadgets-export' => 'निर्यात करा',
+	'gadgets-export-title' => 'उपकरण निर्यात',
+	'gadgets-not-found' => 'उपकरण "$1" सापडत नाही.',
+	'gadgets-export-text' => '$1 उपकरण-सुविधा निर्यातकरण्या करिता, "{{int:gadgets-export-download}}" कलीवर टिचकी मारा, उतरवलेली संचिका-फाईल जतन करा
+डेस्टिनेशन विकिच्या विशेष:आयात पानावर जाऊन संचिका-फाईल चढवावी.नंतर खालील MediaWiki:Gadgets-definition पान चढवावे :
+<pre>$2</pre>
+तुमच्याकडे डेस्टिनेशन विकिवर (सिस्टीम मेसेजेस सुद्धा संपादीत करण्यासहीत )  सुयोग्य परवानग्या उपलब्ध असणे अत्यावश्यक आहे आणि  चढवलेल्या संचिकाकरिता आयात सुविधा सक्षम असणे आवश्यक आहे.',
+	'gadgets-export-download' => 'उतरवा',
 );
 
 /** Malay (Bahasa Melayu)
@@ -1627,7 +1891,10 @@ Sila ambil perhatian juga bahawa gajet-gajet khas ini bukan sebahagian daripada
 	'gadgets-title' => 'Gajet',
 	'gadgets-pagetext' => 'Yang berikut ialah senarai gajet khas yang boleh dihidupkan oleh pengguna melalui [[Special:Preferences|laman keutamaan]], sebagai mana yang telah [[MediaWiki:Gadgets-definition|ditakrifkan]]. Laman ini menyediakan capaian mudah kepada laman pesanan sistem yang mentakrifkan setiap kod dan keterangan gajet.',
 	'gadgets-uses' => 'Menggunakan',
-	'gadgets-required-rights' => 'Memerlukan {{PLURAL:$2|hak $1|hak-hak berikut: $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Hak|Hak-hak}} yang berikut diperlukan:
+
+$1',
+	'gadgets-required-skins' => 'Terdapat pada {{PLURAL:$2|kulit $1|kulit-kulit berikut: $1}}.',
 	'gadgets-default' => 'Dihidupkan untuk semua orang secara sediaan.',
 	'gadgets-export' => 'Eksport',
 	'gadgets-export-title' => 'Eksport gajet',
@@ -1652,6 +1919,38 @@ L-amministraturi lokali jistgħu jimmodifikaw id-[[MediaWiki:Gadgets-definition|
 Din il-ħarsa tipprovdi aċċess faċli għall-messaġġi tas-sistema li fihom hemm deskrizzjoni u s-sors ta' kull aġġeġġ.",
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Jon Harald Søby
+ * @author Laaknor
+ * @author Nghtwlkr
+ * @author Sjurhamre
+ */
+$messages['nb'] = array(
+	'gadgets-desc' => 'Lar brukere velge egendefinerte [[Special:Gadgets|CSS- og JavaScript-verktøy]] i [[Special:Preferences|innstillingene sine]]',
+	'prefs-gadgets' => 'Tilleggsfunksjoner',
+	'gadgets-prefstext' => 'Nedenfor er en liste over tilleggsfunksjoner du kan slå på for kontoen din.
+Disse funksjonene er for det meste basert på JavaScript, så du må ha dette slått på i nettleseren din for at de skal fungere.
+Merk at funksjonene ikke vil ha noen innvirkning på denne innstillingssiden.
+
+Merk også at disse verktøyene ikke er del av MediaWiki-programvaren, og vanligvis utvikles og vedlikeholdes av brukere på den lokale wikien. Lokale administratorer kan redigere tilgjengelig verktøy ved å endre [[MediaWiki:Gadgets-definition|definisjonene]] og [[Special:Gadgets|beskrivelsene]].',
+	'gadgets' => 'Tilleggsfunksjoner',
+	'gadgets-title' => 'Tilleggsfunksjoner',
+	'gadgets-pagetext' => 'Nedenfor er en liste over tilleggsfunksjoner brukere kan slå på i [[Special:Preferences|innstillingene]], som definert på [[MediaWiki:Gadgets-definition]]. Denne oversikten gir lett tilgang til systembeskjedsidene som definerer hvert verktøys beskrivelse og kode.',
+	'gadgets-uses' => 'Bruk',
+	'gadgets-required-rights' => 'Krever følgende {{PLURAL:$2|rettighet|rettigheter}}:
+
+$1',
+	'gadgets-required-skins' => 'Tilgjengelig i {{PLURAL:$2|drakta $1|følgende drakter: $1}}.',
+	'gadgets-default' => 'Aktivert for alle som standard',
+	'gadgets-export' => 'Eksporter',
+	'gadgets-export-title' => 'Tilleggsfunksjon eksport',
+	'gadgets-not-found' => 'Tilleggsfunksjon «$1» ikke funnet.',
+	'gadgets-export-text' => 'For å eksportere verktøyet $1, klikk på «{{int:gadgets-export-download}}»-knappen, lagre den nedlastede filen, gå til Special:Import på destinasjonswikien og last den opp. Deretter legger du til følgende på siden MediaWiki:Gadgets-definition:
+<pre>$2</pre>
+Du må ha de nødvendige tillatelsene på destinasjonswikien (inkludert retten til å redigere systemmeldinger) og import fra filopplastinger må være aktivert.',
+	'gadgets-export-download' => 'Last ned',
+);
+
 /** Low German (Plattdüütsch)
  * @author Slomox
  */
@@ -1674,19 +1973,19 @@ Disse Översicht gifft direkten Togang to de Systemnarichten, in de de Text to d
  * @author Servien
  */
 $messages['nds-nl'] = array(
-	'gadgets-desc' => 'Laot gebrukers [[Special:Gadgets|CSS en JavaScripts]] activeren in der [[Special:Preferences|veurkeuren]]',
-	'prefs-gadgets' => 'Technisch spul',
-	'gadgets-prefstext' => "Hieronder steet speciaal techinische spul da-j inschakelen kunnen.
-'t Is veurnamelijk ebaseerd op JavaScript, dus JavaScript mu-j an hemmen staon in joew webkieker um 't te laoten warken.
-Al dit technische spul hef gien invleud op disse veurkeurenpagina.
+	'gadgets-desc' => 'Laot gebrukers [[Special:Gadgets|CSS en JavaScripts]] aktiveren in der eigen [[Special:Preferences|veurkeuren]]',
+	'prefs-gadgets' => 'Technies spul',
+	'gadgets-prefstext' => "Hieronder steet spesiaal techiniese spul da'j inschakelen kunnen.
+'t Is veurnamelik ebaseerd op JavaScript, dus JavaScript mö'j an hebben staon in joew webkieker um t te laoten warken.
+Al dit techniese spul hef gien invleud op disse veurkeurenpagina.
 
-Disse technische snufjes maken oek gien deel uut van de MediaWiki-pregrammetuur, en 't wönnen meestentieds ontwikkeld en onderhouwen
+Disse techniese snufjes maken oek gien deel uut van de MediaWiki-programmatuur, en t wörden meestentieds ontwikkeld en onderhouwen
 deur gebrukers van joew eigen wiki.
-Beheerders kunnen 't beschikbaore technische spul angeven in [[MediaWiki:Gadgets-definition|defenisies]] en [[Special:Gadgets|beschrievingen]].",
-	'gadgets' => 'Technisch spul',
-	'gadgets-title' => 'Technisch spul',
-	'gadgets-pagetext' => 'Hieronder steet speciaal technisch spul dee gebrukers in kunnen schakelen bie [[Special:Preferences|mien veurkeuren]], zoas in-esteld in de [[MediaWiki:Gadgets-definition|defenisies]].
-Dit overzichte biejt eenvoudige toegang tot de systeemtekspagina waor de beschrieving en de pregrammacode van elke technisch snufjen steet.',
+Beheerders kunnen t beschikbaore techniese spul angeven in [[MediaWiki:Gadgets-definition|defenisies]] en [[Special:Gadgets|beschrievingen]].",
+	'gadgets' => 'Technies spul',
+	'gadgets-title' => 'Technies spul',
+	'gadgets-pagetext' => 'Hieronder steet spesiaal technies spul die gebrukers in kunnen schakelen bie [[Special:Preferences|mien veurkeuren]], zo as in-esteld in de [[MediaWiki:Gadgets-definition|defenisies]].
+Dit overzichte biejt eenvoudige toegang tot de systeemtekstpagina waor de beschrieving en de programmakode van elke technies snufjen steet.',
 	'gadgets-uses' => 'Gebruuk',
 );
 
@@ -1698,7 +1997,7 @@ $messages['ne'] = array(
 	'prefs-gadgets' => 'उपकरणहरु',
 	'gadgets-prefstext' => 'विशेष उपकरणहरुको सूची तल दिइएकोछ तपाईंले आफ्नो खातामा सक्रिय पार्न सक्नुहुन्छ।
 प्राय सबै उपकरणहरु जाभास्क्रीप्टमा आधारित छन्, यस कारण ब्राउजरमा काम गराउनको लागि जाभास्क्रीप्टलाई सक्रिय  गर्नु पर्छ।
-याद राख्नुहोस् ती उपकरणहरुले अभिरुचि पृष्ठमा असर गर्दैनन्। 
+याद राख्नुहोस् ती उपकरणहरुले अभिरुचि पृष्ठमा असर गर्दैनन्।
 यो पनि याद राखुहोस् यी विशेष उपकरणहरु मीडिया विकि सफ्टवेयरभित्र पर्दैनन् र प्राय स्थानीय विकि प्रयोगकर्ताहरुले विकास यसको विकास र सञ्चालन गर्दछन्।                  स्थानीय प्रबन्धकहरुले उपलब्ध उपकरणहरुका [[MediaWiki:Gadgets-definition|परिभाषाहरु]] र [[Special:Gadgets|विवरणहरु]] सम्पादन गर्दछन्।',
 	'gadgets' => 'उपकरणहरु',
 	'gadgets-title' => 'उपकरणहरु',
@@ -1736,7 +2035,10 @@ Beheerders kunnen de beschikbare uitbreidingen aangeven in [[MediaWiki:Gadgets-d
 	'gadgets-pagetext' => 'Hieronder staan de speciale uitbreidingen die gebruikers kunnen inschakelen via hun [[Special:Preferences|voorkeuren]], zoals ingesteld in de [[MediaWiki:Gadgets-definition|definities]].
 Dit overzicht biedt eenvoudige toegang tot de systeemtekstpagina waar de beschrijving en de programmacode van iedere uitbreiding staat.',
 	'gadgets-uses' => 'Gebruikt',
-	'gadgets-required-rights' => '{{PLURAL:$2|Het volgende recht is|De volgende rechten zijn}} vereist: $1.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Het volgende recht is|De volgende rechten zijn}} vereist:
+
+$1.',
+	'gadgets-required-skins' => 'Beschikbaar op de {{PLURAL:$2|vormgeving $1|volgende vormgevingen: $1}}.',
 	'gadgets-default' => 'Standaard ingeschakeld voor iedereen.',
 	'gadgets-export' => 'Exporteren',
 	'gadgets-export-title' => 'Uitbreiding exporteren',
@@ -1770,36 +2072,8 @@ Dette oversynet gjev enkel tilgang til systemmeldingssidene som inneheld skildri
 	'gadgets-export-download' => 'Last ned',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Jon Harald Søby
- * @author Laaknor
- * @author Nghtwlkr
- * @author Sjurhamre
- */
-$messages['no'] = array(
-	'gadgets-desc' => 'Lar brukere velge egendefinerte [[Special:Gadgets|CSS- og JavaScript-verktøy]] i [[Special:Preferences|innstillingene sine]]',
-	'prefs-gadgets' => 'Tilleggsfunksjoner',
-	'gadgets-prefstext' => 'Nedenfor er en liste over tilleggsfunksjoner du kan slå på for kontoen din.
-Disse funksjonene er for det meste basert på JavaScript, så du må ha dette slått på i nettleseren din for at de skal fungere.
-Merk at funksjonene ikke vil ha noen innvirkning på denne innstillingssiden.
-
-Merk også at disse verktøyene ikke er del av MediaWiki-programvaren, og vanligvis utvikles og vedlikeholdes av brukere på den lokale wikien. Lokale administratorer kan redigere tilgjengelig verktøy ved å endre [[MediaWiki:Gadgets-definition|definisjonene]] og [[Special:Gadgets|beskrivelsene]].',
-	'gadgets' => 'Tilleggsfunksjoner',
-	'gadgets-title' => 'Tilleggsfunksjoner',
-	'gadgets-pagetext' => 'Nedenfor er en liste over tilleggsfunksjoner brukere kan slå på i [[Special:Preferences|innstillingene]], som definert på [[MediaWiki:Gadgets-definition]]. Denne oversikten gir lett tilgang til systembeskjedsidene som definerer hvert verktøys beskrivelse og kode.',
-	'gadgets-uses' => 'Bruk',
-	'gadgets-required-rights' => 'Krever {{PLURAL:$2|$1 rettighet|følgende rettigheter: $1}}.',
-	'gadgets-default' => 'Aktivert for alle som standard',
-	'gadgets-export' => 'Eksporter',
-	'gadgets-export-title' => 'Tilleggsfunksjon eksport',
-	'gadgets-not-found' => 'Tilleggsfunksjon «$1» ikke funnet.',
-	'gadgets-export-text' => 'For å eksportere verktøyet $1, klikk på «{{int:gadgets-export-download}}»-knappen, lagre den nedlastede filen, gå til Special:Import på destinasjonswikien og last den opp. Deretter legger du til følgende på siden MediaWiki:Gadgets-definition:
-<pre>$2</pre>
-Du må ha de nødvendige tillatelsene på destinasjonswikien (inkludert retten til å redigere systemmeldinger) og import fra filopplastinger må være aktivert.',
-	'gadgets-export-download' => 'Last ned',
-);
-
 /** Occitan (Occitan)
+ * @author Boulaur
  * @author Cedric31
  */
 $messages['oc'] = array(
@@ -1814,6 +2088,41 @@ Los administrators pòdon modificar los gadgets en passant per [[MediaWiki:Gadge
 	'gadgets-pagetext' => "Çaijós apareis una lista de gadgets que los utilizaires pòdon activar dins lor [[Special:Preferences|pagina de preferéncias]], coma definit dins ''[[MediaWiki:Gadgets-definition|las definicions]]''.
 Aqueste susvòl dona un accès rapid a las paginas de messatges del sistèma que definisson cada descripcion e cada còde dels gadgets.",
 	'gadgets-uses' => 'Utiliza',
+	'gadgets-export' => 'Exportar',
+	'gadgets-export-download' => 'Telecargar',
+);
+
+/** Oriya (ଓଡ଼ିଆ)
+ * @author Odisha1
+ * @author Psubhashish
+ */
+$messages['or'] = array(
+	'gadgets-desc' => 'ସଭ୍ୟମାନଙ୍କୁ ଆପଣା ମନପସନ୍ଦର [[Special:Gadgets|CSS ଓ ଜାଭାସ୍କ୍ରିପ୍ଟ ଗ୍ୟାଜେଟ]] ସେମାନଙ୍କର [[Special:Preferences|ପସନ୍ଦସବୁ]]ରେ ବାଛିବାକୁ ଦିଅନ୍ତୁ',
+	'prefs-gadgets' => 'ଗ୍ୟାଜେଟ',
+	'gadgets-prefstext' => 'ତଳେ ଆପଣଙ୍କ ଖାତା ଲାଗି କେତେକ ବିଶେଷ ଗ୍ୟାଜେଟର ତାଲିକା ଦିଆଗଲା ।
+ଏହି ଗ୍ୟାଜେଟମାନ ମୂଳତ ଜାଭାସ୍କ୍ରିପ୍ଟକୁ ଆଧାର କରି ତିଆରି, ତେଣୁ ସେମାନଙ୍କୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଆପଣଙ୍କୁ ନିଜ ବ୍ରାଉଜରରେ ଜାଭାସ୍କ୍ରିପ୍ଟ ସଚଳ କରିବାକୁ ପଡ଼ିବ ।
+ଜାଣିରଖନ୍ତୁ ଯେ ଏହିସବୁ ଗ୍ୟାଜେଟ ଆପଣଙ୍କର ପସନ୍ଦ ପୃଷ୍ଠା ଉପରେ କିଛି ପ୍ରଭାବ ପକାଇବେ ନାହିଁ ।
+
+ଆହୁରି ଜାଣିରଖନ୍ତୁ ଯେ ଏହି ବିଶେଷ ଗ୍ୟାଜେଟସବୁ ମିଡ଼ିଆଉଇକି ସଫ୍ଟଵେର ଅନ୍ତଭୁକ୍ତ ନୁହଁନ୍ତି । ଏହିସବୁ ସାଧାରଣତ ଆପଣଙ୍କ ଆଞ୍ଚଳିକ ଉଇକିର ସଭ୍ୟ ମାନଙ୍କ ଦେଇ ତିଆରି ଓ ପରିଚାଳିତ ହୋଇଥାଏ ।
+ଆଞ୍ଚଳିକ ପରିଛାଗଣ ଗ୍ୟାଜେଟର [[MediaWiki:Gadgets-definition|ସଜ୍ଞା]] ଓ [[Special:Gadgets|ବିବରଣୀ]]ସବୁ ବଦଳାଇପାରିବେ ।',
+	'gadgets' => 'ଗ୍ୟାଜେଟ',
+	'gadgets-title' => 'ଗ୍ୟାଜେଟ',
+	'gadgets-pagetext' => '[[MediaWiki:Gadgets-definition|ସଜ୍ଞା]] ଅନୁସାରେ ତଳେ ସଭ୍ୟମାନଙ୍କ [[Special:Preferences|ପସନ୍ଦ ପୃଷ୍ଠା]]ରୁ ସଚଳ କରାଯାଇପାରିବା ଭଳି କେତେକ ବିଶେଷ ଗ୍ୟାଜେଟର ତାଲିକା ଦିଆଗଲା ।
+ଏହି ଅବଲୋକନ ପ୍ରତ୍ୟେକ ଗ୍ୟାଜେଟର ବିବରଣୀ ଓ କୋଡ଼ ନିର୍ଦ୍ଧାରଣ କରୁଥିବା ସିଷ୍ଟମ  ମେସେଜ ପୃଷ୍ଠା ସବୁକୁ ସହଜ ଯିବାଆସିବାର ସୁବିଧା ଦେଇଥାଏ ।',
+	'gadgets-uses' => 'ବ୍ୟବହାର',
+	'gadgets-required-rights' => 'ଏହି {{PLURAL:$2|ଅଧିକାରଟି|ଅଧିକାରସମୂହ}} ଲୋଡ଼ା :
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1 ବହିରାବରଣ|ଏହି ସବୁ ବହିରାବରଣରେ: $1}} ମିଳୁଅଛି ।',
+	'gadgets-default' => 'ଆପେଆପେ ସଭିଙ୍କ ପାଇଁ ସଚଳ କରାଗଲା ।',
+	'gadgets-export' => 'ରପ୍ତାନୀ',
+	'gadgets-export-title' => 'ଗ୍ୟାଜେଟ ରପ୍ତାନି',
+	'gadgets-not-found' => '"$1"  ଗ୍ୟାଜେଟଟି ମିଳିଲା ନାହିଁ ।',
+	'gadgets-export-text' => '$1 ଗ୍ୟାଜେଟ ରପ୍ତାନି କରିବା ନିମନ୍ତେ "{{int:gadgets-export-download}}" ବୋତାମରେ କ୍ଲିକ କରି ଫାଇଲଟି ଆହରଣ କରନ୍ତୁ ଓ ସାଇତି ରଖନ୍ତୁ,
+ମୁକାମ ଉଇକିରେ Special:Import କୁ ଯାଇ ଏହାକୁ ଅପଲୋଡ଼ କରନ୍ତୁ । ତାହାପରେ MediaWiki:Gadgets-definition ପୃଷ୍ଠାରେ ରେ ତଳ ଲେଖାଟିକୁ ଯୋଡ଼ନ୍ତୁ:
+<pre>$2</pre>
+ମୁକାମ ଉଇକିରେ ଆପଣଙ୍କ ପାଖରେ ଦରକାରୀ ଅନୁମୋଦନ ଥିବା ଲୋଡ଼ା (ସିଷ୍ଟମ ମେସେଜକୁ ବଦଲାଇବାର ଅଧିକାର ସହିତ) ତଥା ଫାଇଲ ଅପଲୋଡ଼ରୁ ଆହରଣ ମଧ୍ୟ ସଚଳ ହୋଇଥିବା ଲୋଡ଼ା ।',
+	'gadgets-export-download' => 'ଡାଉନଲୋଡ଼',
 );
 
 /** Pampanga (Kapampangan)
@@ -1842,10 +2151,12 @@ $messages['pdc'] = array(
 	'prefs-gadgets' => 'Gadgets',
 	'gadgets' => 'Gadgets',
 	'gadgets-title' => 'Gadgets',
+	'gadgets-export-download' => 'Runnerdraage',
 );
 
 /** Polish (Polski)
  * @author Derbeth
+ * @author Marcin Łukasz Kiejzik
  * @author Sp5uhe
  */
 $messages['pl'] = array(
@@ -1861,12 +2172,15 @@ Lokalni administratorzy mogą edytować dostępne gadżety używając stron [[Me
 	'gadgets-pagetext' => 'Poniżej znajduje się lista specjalnych gadżetów, które użytkownicy mogą włączyć na swojej [[Special:Preferences|stronie preferencji]]. Lista ta jest zdefiniowana na stronie [[MediaWiki:Gadgets-definition|definicji]].
 Poniższy przegląd ułatwia dostęp do komunikatów systemu, które definiują opis i kod każdego z gadżetów.',
 	'gadgets-uses' => 'Użycie',
-	'gadgets-required-rights' => 'Wymaga {{PLURAL:$2|uprawnienia|następujących uprawnień:}} $1.',
+	'gadgets-required-rights' => 'Wymaga {{PLURAL:$2|uprawnienia|następujących uprawnień:}}
+
+$1',
+	'gadgets-required-skins' => 'Działa wyłącznie ze {{PLURAL:$2|skórką $1|skórkami: $1}}.',
 	'gadgets-default' => 'Domyślnie włączone dla wszystkich.',
 	'gadgets-export' => 'Eksportuj',
 	'gadgets-export-title' => 'Eksportowanie gadżetów',
 	'gadgets-not-found' => 'Nie odnaleziono gadżetu „$1”.',
-	'gadgets-export-text' => 'Aby wyeksportować gadżet „$1” kliknij na przycisk „{{int:gadgets-export-download}}”, zapisz pobrany plik, wejdź na stronę Special;Import w docelowej wiki i prześlij go. Następnie dodaj poniższy kod do strony MediaWiki:Gadgets-definition:
+	'gadgets-export-text' => 'Jeśli chcesz wyeksportować gadżet „$1” kliknij na przycisk „{{int:gadgets-export-download}}”, zapisz pobrany plik, wejdź na stronę „Special:Import” w docelowej wiki i prześlij go. Następnie dodaj poniższy kod do strony MediaWiki:Gadgets-definition:
 <pre>$2</pre>
 Musisz mieć właściwe uprawnienia na wiki docelowej (w tym do edycji komunikatów systemowych) oraz musi być włączony import na serwer poprzez przesłanie pliku.',
 	'gadgets-export-download' => 'Pobierz',
@@ -1880,19 +2194,22 @@ Musisz mieć właściwe uprawnienia na wiki docelowej (w tym do edycji komunikat
 $messages['pms'] = array(
 	'gadgets-desc' => "A lassa che j'utent a selession-o [[Special:Gadgets|CSS e gadget JavaScript]]  ant ij [[Special:Preferences|sò gust]]",
 	'prefs-gadgets' => 'Component',
-	'gadgets-prefstext' => "Ambelessì sota a-i é na lista ëd component ch'a peul vischesse ant sò cont personal. 
-Sti component-sì a son dzortut basà ansima a JavaScript, donca a venta anans tut che JavaScript a sia avisch ant sò navigator, s'a veul che ij component a travajo. 
+	'gadgets-prefstext' => "Ambelessì sota a-i é na lista ëd component ch'a peul vischesse ant sò cont personal.
+Sti component-sì a son dzortut basà ansima a JavaScript, donca a venta anans tut che JavaScript a sia avisch ant sò navigator, s'a veul che ij component a travajo.
 Ch'a ten-a present che sti component a l'han gnun efet ansima a la pàgina dij \"sò gust\".
 
-Ch'a nòta ëdcò che a son nen part dël programa MediaWiki e che për sòlit a resto dësvlupà e mantnù da dj'utent dla wiki andova chiel/chila as treuva adess. 
+Ch'a nòta ëdcò che a son nen part dël programa MediaWiki e che për sòlit a resto dësvlupà e mantnù da dj'utent dla wiki andova chiel/chila as treuva adess.
 J'aministrator locaj a peulo regolé ij component disponibij ën dovrand le pàgine [[MediaWiki:Gadgets-definition|definission dij component]] e [[Special:Gadgets|component]].",
 	'gadgets' => 'Component',
 	'gadgets-title' => 'Component',
-	'gadgets-pagetext' => "Ambelessì sota a-i é na lista ëd component spessiaj che j'utent a peulo butesse avisch ant ij [[Special:Preferences|sò gust]], conforma a la [[MediaWiki:Gadgets-definition|definission dij component]]. 
+	'gadgets-pagetext' => "Ambelessì sota a-i é na lista ëd component spessiaj che j'utent a peulo butesse avisch ant ij [[Special:Preferences|sò gust]], conforma a la [[MediaWiki:Gadgets-definition|definission dij component]].
 Sta lista complessiva a smon na stra còmoda për rivé a le pàgine ëd messagi ëd sistema ch'a definisso descrission e còdes ëd vira component.",
 	'gadgets-uses' => 'a dòvra',
-	'gadgets-required-rights' => "A ciama {{PLURAL:$2|ël drit $1|ij drit ch'a ven-o: $1}}.",
-	'gadgets-default' => 'Abilità për mincadun për default',
+	'gadgets-required-rights' => 'A ciama {{PLURAL:$1|ël drit|ij drit}} sì-dapress:
+
+$2',
+	'gadgets-required-skins' => 'Disponìbil an {{PLURAL:$2|$1 sla pel|sle pej sì-dapress: $1}}.',
+	'gadgets-default' => 'Abilità për tuti coma stàndard',
 	'gadgets-export' => 'Esporté',
 	'gadgets-export-title' => "Esportassion d'acessòri",
 	'gadgets-not-found' => 'Acessòri "$1" pa trovà.',
@@ -1902,11 +2219,44 @@ A-i é da manca d'avèj ij përmess aproprià an sla wiki ëd destinassion (comp
 	'gadgets-export-download' => 'Dëscaria',
 );
 
+/** Western Punjabi (پنجابی)
+ * @author Khalid Mahmood
+ */
+$messages['pnb'] = array(
+	'gadgets-desc' => 'ورتن والیاں نوں کسٹم [[Special:Gadgets|CSS and JavaScript gadgets]] چنن دیو اپنیاں [[خاص:تانگاں|تانگاں]] چ',
+	'prefs-gadgets' => 'گیجٹ',
+	'gadgets-prefstext' => 'تھلے خاص گیجٹ دی لسٹ اے  جینون تسیں اپنے کھاتے ج چلاسکدے او۔
+ایہ گیجٹ جاواسکرپٹ تے چلدے نیں، ایس لئی جاواسکرپٹ تواڈے چ چلنا چائیدا اے اوناں نوں چلان لئی۔
+ایہ گل یاد رکھنا جے ایناں گیجٹ دا اثر ایس تانگ صفے تے نئیں ہوندا۔
+
+ایہ وی گل یاد رکھنا جے ایہ خاص گیجٹ میڈیاوکی سوفٹوئیر دا انگ نئیں، تے ایہ بناۓ جاندے نیں یا ورتن والے رکھدے نیں اپنے لوکل وکی تے۔
+مکھۓ تبدیل کرسکدے نیں [[MediaWiki:Gadgets-definition|definitions]] تے [[Special:Gadgets|descriptions]]  اپنے کول ہیگے گیجٹاں چ۔',
+	'gadgets' => 'گیجٹ',
+	'gadgets-title' => 'گیجٹ',
+	'gadgets-pagetext' => 'تھلے خاص گیجٹاں  دی اک لسٹ جینوں ورتن والے  اپنے [[خاص:تانگاں|تانگاں والا صفہ]] ، جیویں کے [[میڈیاوکی:گیجٹ ڈیفینیشن|ڈیفینیشن]] چ دسیا گیا اے۔
+ایہ وکھالہ اسان راہ پربندھ سنیعہ دا راہ دسدا اے جیدے چ ہر گیجٹ دا کم کاج تے کوڈ دتا گیا اے۔',
+	'gadgets-uses' => 'ورتن آلے',
+	'gadgets-required-rights' => '{{PLURAL:$2|$1 حق|تھلے دتے گۓ حق: $1}} دی لوڑ اے۔',
+	'gadgets-default' => 'ہر اک لئی ڈیفالٹ راہیں قابل کیتا گیا۔',
+	'gadgets-export' => 'برامد کرو',
+	'gadgets-export-title' => 'گیجٹ برامد کرو',
+	'gadgets-not-found' => '"$1" گیجٹ نئیں لبیا',
+	'gadgets-export-text' => '$1 گیجٹ نوں اگے پیجن لئی  "{{int:gadgets-export-download}}" بٹن تے کلک کرو، کاپی کیتیاں فاغلاں نوں بچاؤ،
+Special:Import تے جاؤ وکی تے ، چرھاؤ اینوں۔ فیر تھلے دتے گۓ نوں MediaWiki:Gadgets-definition page گۓ نوں جوڑو: <pre>$2</pre>
+تواڈے کول لازمی اجازت ہونی چائیدی وکی تے (پربندھ سنیعے نوں تبدیل کرن دا) تے لیاندے ہوۓ چڑھائیاں فائلاں نوں قابل کیتے۔',
+	'gadgets-export-download' => 'ڈاؤنلوڈ',
+);
+
 /** Pashto (پښتو)
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
 $messages['ps'] = array(
+	'prefs-gadgets' => 'ګاډجېټ',
+	'gadgets' => 'ګاډجېټ',
+	'gadgets-title' => 'ګاډجېټ',
 	'gadgets-uses' => 'کارونې',
+	'gadgets-export' => 'صادرول',
+	'gadgets-not-found' => 'د "$1" ګاډجېټ و نه موندل شو.',
 	'gadgets-export-download' => 'ښکته کول',
 );
 
@@ -1945,6 +2295,7 @@ Na wiki de destino, tem de ter as permissões necessárias (incluindo o privilé
  * @author Eduardo.mps
  * @author Giro720
  * @author GoEThe
+ * @author Rafael Vargas
  */
 $messages['pt-br'] = array(
 	'gadgets-desc' => 'Permite aos utilizadores selecionarem [[Special:Gadgets|"gadgets" JavaScript e CSS]] personalizados nas suas [[Special:Preferences|preferências]]',
@@ -1960,7 +2311,8 @@ Administradores locais podem editar os gadgets disponíveis através de [[MediaW
 	'gadgets-pagetext' => 'Segue-se uma lista de "gadgets" que podem ser ativados por utilizadores através de [[Special:Preferences|suas páginas de preferências]], definidos em [[MediaWiki:Gadgets-definition|definições]].
 Esta visão geral proporciona um acesso fácil para as mensagens de sistema que definem as descrições e códigos de cada um dos gadgets.',
 	'gadgets-uses' => 'Utiliza',
-	'gadgets-required-rights' => 'Requer {{PLURAL:$2|o privilégio $1|os seguintes privilégios: $1}}.',
+	'gadgets-required-rights' => 'Requer {{PLURAL:$2|o seguinte privilégio $1|os seguintes privilégios: $1}}.',
+	'gadgets-required-skins' => 'Disponível {{PLURAL:$2|no skin $1|nos seguintes skins: $1}}.',
 	'gadgets-default' => 'Ativar para todos por padrão.',
 	'gadgets-export' => 'Exportar',
 	'gadgets-export-title' => 'Exportação de gadget',
@@ -1985,6 +2337,7 @@ $messages['qu'] = array(
  * @author Cin
  * @author Firilacroco
  * @author KlaudiuMihaila
+ * @author Minisarm
  * @author Stelistcristi
  */
 $messages['ro'] = array(
@@ -1993,6 +2346,11 @@ $messages['ro'] = array(
 	'gadgets' => 'Gadgeturi',
 	'gadgets-title' => 'Gadgeturi',
 	'gadgets-uses' => 'Utilizări',
+	'gadgets-required-rights' => 'Necesită {{PLURAL:$2|următorul drept|următoarele drepturi}}:
+
+$1',
+	'gadgets-required-skins' => 'Disponibil pe {{PLURAL:$2|tema $1|următoarele teme: $1}}.',
+	'gadgets-default' => 'Activat pentru toată lumea în mod implicit.',
 	'gadgets-export' => 'Exportă',
 	'gadgets-export-title' => 'Exportul de gadgeturi',
 	'gadgets-not-found' => 'Gadgetul „$1” nu a fost găsit.',
@@ -2016,7 +2374,10 @@ Le amministrature locale ponne cangià le gadget disponibbele ausanne le [[Media
 	'gadgets-pagetext' => "Sotte stè 'n'elenghe de gadget speciale ca l'utinde ponne abbilità sus a lore [[Special:Preferences|pàgene de le preferenze]], cumme definite da le [[MediaWiki:Gadgets-definition|definiziune]].
 Stu riepileghe prevede 'nu facile facile accesse a le pàggene de le messagge d'u sisteme ca definiscene ogne descrizione e codece de le gadget.",
 	'gadgets-uses' => 'Ause',
-	'gadgets-required-rights' => "Richiede {{PLURAL:$2|'u $1 deritte|le seguende deritte: $1}}.",
+	'gadgets-required-rights' => 'Richiede {{PLURAL:$2|deritte|deritte}}:
+
+$1',
+	'gadgets-required-skins' => "Disponibbele sus a {{PLURAL:$2|$1 'u skin|le seguende skin: $1}}.",
 	'gadgets-default' => 'Abbilete pe ogneune pe default.',
 	'gadgets-export' => 'Esporte',
 	'gadgets-export-title' => "Esporte 'u gadget",
@@ -2049,13 +2410,16 @@ $messages['ru'] = array(
 	'gadgets-pagetext' => 'Ниже приведён список гаджетов, которые участники могут включить на своей странице настроек, в соответствии со списком на странице [[MediaWiki:Gadgets-definition|определений]].
 Этот список позволяет легко получить доступ к страницам системных сообщений, определяющих описания и исходные коды гаджетов.',
 	'gadgets-uses' => 'Использует',
-	'gadgets-required-rights' => '{{PLURAL:$2|Требуется право «$1»|Требуются права: $1}}.',
+	'gadgets-required-rights' => '{{PLURAL:$2|Требуется право|Требуются права}}:
+
+$1',
+	'gadgets-required-skins' => 'Доступен при {{PLURAL:$2|теме оформления $1|следующих темах оформления: $1}}.',
 	'gadgets-default' => 'Включён для всех по умолчанию.',
 	'gadgets-export' => 'Экспортировать',
 	'gadgets-export-title' => 'Экспорт гаджета',
 	'gadgets-not-found' => 'Гаджет «$1» не найден.',
-	'gadgets-export-text' => 'Для экспорта гаджета $1, нажмите кнопку «{{int:gadgets-export-download}}», сохраните загруженный файл, 
-перейдите на страницу Special:Import целевой вики и загрузите файл. Затем добавьте следующие строки на страницу MediaWiki:Gadgets-definition: 
+	'gadgets-export-text' => 'Для экспорта гаджета $1, нажмите кнопку «{{int:gadgets-export-download}}», сохраните загруженный файл,
+перейдите на страницу Special:Import целевой вики и загрузите файл. Затем добавьте следующие строки на страницу MediaWiki:Gadgets-definition:
 <pre>$2</pre>
 Вы должны иметь соответствующие разрешения в целевой вики (в том числе право на редактирование системных сообщений), также на сервере должна быть включена настройка импорта из файлов.',
 	'gadgets-export-download' => 'Загрузить',
@@ -2078,6 +2442,8 @@ $messages['rue'] = array(
 	'gadgets-pagetext' => 'Ниже є перегляд шпеціалных додатків, котры собі хоснователї можуть запнути у своїм [[Special:Preferences|наставлїню]]. Їх список ся дасть управляти на сторінцї [[MediaWiki:Gadgets-definition]].
 Тот перегляд додавать простый приступ к&nbsp;сістемным повідомлїням, котры дефінують код і&nbsp;попис каждого додатку.',
 	'gadgets-uses' => 'Хоснує',
+	'gadgets-required-rights' => 'Потребує {{PLURAL:$2|права $1|наступны права: $1}}.',
+	'gadgets-default' => 'Імпліцітно запнуте вшыткым.',
 	'gadgets-export' => 'Експортовати',
 	'gadgets-export-title' => 'Експорт додатку',
 	'gadgets-not-found' => 'Додато „$1“ не найдженый.',
@@ -2087,7 +2453,7 @@ $messages['rue'] = array(
 	'gadgets-export-download' => 'Скачати',
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -2108,8 +2474,8 @@ $messages['sah'] = array(
 	'gadgets-export' => 'Экспортаа',
 	'gadgets-export-title' => 'Ҕааддьыты таһаарыы (экспорт)',
 	'gadgets-not-found' => '"$1" ҕааддьыт көстүбэтэ.',
-	'gadgets-export-text' => '$1 ҕааддьыты таһаарарга (экспорт), «{{int:gadgets-export-download}}» тимэҕи баттаа, хачайдаммыт билэни бигэргэт, 
-онтон угуохтаах биикиҥ Special:Import сирэйигэр киирэн уган кэбис. Ол кэннэ MediaWiki:Gadgets-definition сирэйгэ бу устуруокалары эп: 
+	'gadgets-export-text' => '$1 ҕааддьыты таһаарарга (экспорт), «{{int:gadgets-export-download}}» тимэҕи баттаа, хачайдаммыт билэни бигэргэт,
+онтон угуохтаах биикиҥ Special:Import сирэйигэр киирэн уган кэбис. Ол кэннэ MediaWiki:Gadgets-definition сирэйгэ бу устуруокалары эп:
 <pre>$2</pre>
 Угуохтаах биикигэр аналлаах көҥүллээх буолуохтааххын (ол иһигэр тиһилик биллэриилэрин эрэдээксийэлиир кыах), эбиитин сиэрбэргэ билэни киллэрии көҥүллэммит буолуохтаах.',
 	'gadgets-export-download' => 'Хачайдааһын',
@@ -2125,6 +2491,7 @@ $messages['sgs'] = array(
 /** Sinhala (සිංහල)
  * @author Budhajeewa
  * @author නන්දිමිතුරු
+ * @author පසිඳු කාවින්ද
  * @author බිඟුවා
  */
 $messages['si'] = array(
@@ -2141,6 +2508,11 @@ $messages['si'] = array(
 	'gadgets-pagetext' => 'පහත දැක්වෙන්නේ [[MediaWiki:Gadgets-definition|අර්ථදැක්වීම්]] කරන ලද ආකාරය අනුව පරිශීලකයන්ට ඔවුන්ගේ [[Special:Preferences|රිසිකෙරුම් පිටුව]] මතදී සක්‍රීය කළ හැකි විශේෂ ගැජටයන් ලයිස්තුවකි.
 මෙම දළ විශ්ලේෂණය සියළු ගැජටයන්ගේ විස්තර කෙරුම් හා කේතයන් අර්ථ දක්වන පද්ධති පණිවුඩ පිටු වෙත පහසු ළඟාවීම් ලබාදේ.',
 	'gadgets-uses' => 'පරිශීලනය කරයි',
+	'gadgets-required-rights' => 'මෙම {{PLURAL:$2|හිමිකම|හිමිකම්}} අවශ්‍ය වේ:
+
+$1',
+	'gadgets-required-skins' => '{{PLURAL:$2|$1 චර්මයෙන්|චර්මයන්ගෙන් ලබා ගත හැක: $1}}.',
+	'gadgets-default' => 'සාමාන්‍යයෙන් සෑම දෙනාටම සක්‍රීය කර ඇත.',
 	'gadgets-export' => 'අපනයනය කරන්න',
 	'gadgets-export-title' => 'ගැජටය අපනයනය කරන්න',
 	'gadgets-not-found' => '"$1" ගැජටය හමුවුනේ නැත.',
@@ -2168,13 +2540,15 @@ Lokálni správcovia môžu upraviť zoznam dostupných nástrojov pomocou [[Med
 	'gadgets-title' => 'Nástroje',
 	'gadgets-pagetext' => 'Dolu je zoznam špeciálych nástrojov, ktoré môžu používatelia zapnúť v rámci svojho účtu na svojej stránke [[Special:Preferences|nastavení]]. Tento zoznam definuje stránka [[MediaWiki:Gadgets-definition]]. Tento prehľad poskytuje jednoduchý prístup k systémovým stránkam, ktoré definujú popis a kód každého z nástrojov.',
 	'gadgets-uses' => 'Použitia',
-	'gadgets-required-rights' => 'Vyžaduje {{PLURAL:$2|právo $1|nasledovné práva: $1}}.',
+	'gadgets-required-rights' => 'Vyžaduje nasledovné {{PLURAL:$2|právo|práva}}:
+
+$1',
 	'gadgets-default' => 'Povolené pre každého v predvolenom nastavení.',
 	'gadgets-export' => 'Exportovať',
 	'gadgets-export-title' => 'Export nástroja',
 	'gadgets-not-found' => 'Nástroj „$1” nebol nájdený.',
-	'gadgets-export-text' => 'Ak chcete exportovať nástroj $1, kliknite na tlačidlo „{{int:gadgets-export-download}}“, uložte stiahnutý súbor, 
- choďte na stránku Special:Import na cieľovej wiki a nahrajte ho. Potom pridajte nasledujúce na stránku MediaWiki:Gadgets-definition: 
+	'gadgets-export-text' => 'Ak chcete exportovať nástroj $1, kliknite na tlačidlo „{{int:gadgets-export-download}}“, uložte stiahnutý súbor,
+ choďte na stránku Special:Import na cieľovej wiki a nahrajte ho. Potom pridajte nasledujúce na stránku MediaWiki:Gadgets-definition:
 <pre>$2</pre>
 Musíte mať príslušné oprávnenia na cieľovej wiki (vrátane práva na úpravu systémových správ) a import z nahraného súboru musí byť povolený.',
 	'gadgets-export-download' => 'Stiahnuť',
@@ -2188,8 +2562,8 @@ $messages['sl'] = array(
 	'gadgets-desc' => 'Omogoča uporabnikom, da vključijo [[Special:Gadgets|vtičnike CSS in JavaScript]] v [[Special:Preferences|nastavitvah]]',
 	'prefs-gadgets' => 'Vtičniki',
 	'gadgets-prefstext' => 'Prikazan je seznam posebnih vtičnikov, ki si jih lahko omogočite za vaš račun.
-Večinoma temeljijo na JavaScript, zato mora biti za njihovo delovanje omogočen v vašem brskalniku. 
-Ti vtičniki nimajo nobenega vpliva na to nastavitveno stran. 
+Večinoma temeljijo na JavaScript, zato mora biti za njihovo delovanje omogočen v vašem brskalniku.
+Ti vtičniki nimajo nobenega vpliva na to nastavitveno stran.
 
 Prav tako pomnite, da ti vtičniki niso del programja MediaWiki, in jih običajno razvijajo ter vzdržujejo uporabniki na vašem lokalnem wikiju.
 Administratorji lahko uredite seznam vtičnikov z uporabo [[Special:Gadgets|posebne strani]] in [[MediaWiki:Gadgets-definition|opisov]].',
@@ -2198,7 +2572,10 @@ Administratorji lahko uredite seznam vtičnikov z uporabo [[Special:Gadgets|pose
 	'gadgets-pagetext' => 'Spodaj je seznam posebnih vtičnikov (opredeljenih z [[MediaWiki:Gadgets-definition|definicijami]]), ki jih lahko uporabniki vključijo v svojih [[Special:Preferences|nastavitvah]].
 Ta pregled omogoča enostaven dostop do sistema za nastavljanje opisa in kode vsakega vtičnika posebej.',
 	'gadgets-uses' => 'Uporablja',
-	'gadgets-required-rights' => 'Zahteva {{PLURAL:$2|pravico $1|naslednji pravici: $1|naslednje pravice: $1}}.',
+	'gadgets-required-rights' => 'Zahteva {{PLURAL:$2|naslednjo pravico|naslednji pravici|naslednje pravice}}:
+
+$1',
+	'gadgets-required-skins' => 'Na voljo na {{PLURAL:$2|koži $1|naslednjih kožah: $1}}.',
 	'gadgets-default' => 'Privzeto omogočeno za vsakogar.',
 	'gadgets-export' => 'Izvozi',
 	'gadgets-export-title' => 'Izvoz vtičnika',
@@ -2229,7 +2606,10 @@ Administratorët lokalë mund t'i ndryshojnë [[MediaWiki:Gadgets-definition|pë
 	'gadgets-pagetext' => 'Më poshtë është një listë e mjeteve shtesë speciale që mund të aktivizohen në [[Special:Preferences|faqen e preferencave]] të tyre, siç është përcaktuar nga [[MediaWiki:Gadgets-definition|përkufizimet]].
 Kjo pasqyrë siguron qasje të lehtë në faqet e mesazheve të sistemit që përkufizon përshkrimin e çdo mjeti shtesë dhe kodin.',
 	'gadgets-uses' => 'Përdorues',
-	'gadgets-required-rights' => 'Kërkon {{PLURAL:$2| $1 drejtën | drejta: $1 }}.',
+	'gadgets-required-rights' => 'Kërkon {{PLURAL:$2|të drejtën|të drejtat}} e mëposhtme:
+
+$1',
+	'gadgets-required-skins' => 'E mundshme në {{PLURAL:$2|$1 pamje|pamjet e mëposhtme: $1}}.',
 	'gadgets-default' => 'Aktivizuar për të gjithë nga default.',
 	'gadgets-export' => 'Eksporto',
 	'gadgets-export-title' => 'Eksport mjetesh shtesë',
@@ -2241,8 +2621,9 @@ Ju duhet të keni leje të përshtatshme në wiki-n e destinuar (duke përfshir�
 	'gadgets-export-download' => 'Shkarko',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Millosh
+ * @author Nikola Smolenski
  * @author Rancher
  * @author Жељко Тодоровић
  */
@@ -2258,8 +2639,13 @@ $messages['sr-ec'] = array(
 	'gadgets' => 'Гаџети',
 	'gadgets-title' => 'Гаџети',
 	'gadgets-pagetext' => 'Испод је списак посебних гаџета које корисници могу да омогуће на својој [[Special:Preferences|страници за подешавање]], као што је наведено у [[MediaWiki:Gadgets-definition|дефиницијама]].
-Овај преглед пружа брз приступ системским порукама које дефинишу сваки опис и кôд гаџета.',
-	'gadgets-uses' => 'Користи се',
+Овај преглед пружа брз приступ системским порукама које дефинишу сваки опис и кoд гаџета.',
+	'gadgets-uses' => 'Користи',
+	'gadgets-required-rights' => 'Захтева {{PLURAL:$2|следеће право|следећа права}}:
+
+$1',
+	'gadgets-required-skins' => 'Доступно у {{PLURAL:$2|теми $1|следећим темама: $1}}.',
+	'gadgets-default' => 'Подразумевано укључен за сваког.',
 	'gadgets-export' => 'Извези',
 	'gadgets-export-title' => 'Извоз гаџета',
 	'gadgets-not-found' => 'Гаџет „$1“ није пронађен.',
@@ -2270,15 +2656,36 @@ $messages['sr-ec'] = array(
 	'gadgets-export-download' => 'Преузми',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Michaello
  * @author Жељко Тодоровић
  */
 $messages['sr-el'] = array(
+	'gadgets-desc' => 'Omogućava korisnicima da izaberu prilagođene [[Special:Gadgets|CSS i javaskript gadžete]] u svojim [[Special:Preferences|podešavanjima]]',
 	'prefs-gadgets' => 'Gedžeti',
+	'gadgets-prefstext' => 'Ispod se nalazi spisak posebnih gadžeta koje možete da omogućite na svom nalogu.
+Ove spravice su uglavnom zasnovane na javaskripti, tako da ona mora biti omogućena.
+Gadžeti neće uticati na stranicu za podešavanje.
+
+Oni nisu deo softvera Medijaviki, već se razvijaju i održavaju od strane korisnika vaše vikije.
+Administratori mogu da izmene [[MediaWiki:Gadgets-definition|značenja]] i [[Special:Gadgets|opise]] dostupnih gadžeta.',
 	'gadgets' => 'gedžeti',
 	'gadgets-title' => 'gedžeti',
+	'gadgets-pagetext' => 'Ispod je spisak posebnih gadžeta koje korisnici mogu da omoguće na svojoj [[Special:Preferences|stranici za podešavanje]], kao što je navedeno u [[MediaWiki:Gadgets-definition|definicijama]].
+Ovaj pregled pruža brz pristup sistemskim porukama koje definišu svaki opis i kod gadžeta.',
 	'gadgets-uses' => 'koristi se',
+	'gadgets-required-rights' => 'Zahteva {{PLURAL:$2|sledeće pravo|sledeća prava}}:
+
+$1',
+	'gadgets-default' => 'Podrazumevano uključen za svakog.',
+	'gadgets-export' => 'Izvezi',
+	'gadgets-export-title' => 'Izvoz gadžeta',
+	'gadgets-not-found' => 'Gadžet „$1“ nije pronađen.',
+	'gadgets-export-text' => "Da biste izvezli $1 gadžet, kliknite na dugme „{{int:gadgets-export-download}}“, sačuvajte preuzetu datoteku,
+pređite na ''Special:Import'' na željenoj vikiji i pošaljite gadžet. Nakon toga, dodajte sledeće na ''MediaWiki:Gadgets-definition'' stranicu:
+<pre>$2</pre>
+Morate imati određene dozvole na navedenoj vikiji (uključujući i pravo za uređivanje sistemskih poruka), dok uvoz preko datoteka mora biti omogućen.",
+	'gadgets-export-download' => 'Preuzmi',
 );
 
 /** Seeltersk (Seeltersk)
@@ -2292,11 +2699,11 @@ Do Hälpere basierje maastens ap Javascript, deeruum mout Javascript in dän Bro
 Do Hälpere funktionierje oawers nit ap disse Siede mäd persöönelke Ienstaalengen.
 
 Buutendät is tou beoachtjen, dät disse Hälpere in Algemeenen nit Paat fon MediaWiki sunt, man maast fon
-Benutsere fon lokoale Wikis äntwikkeld un fersuurged wäide. Lokoale Wiki-Administratore konnen do ferföichboare Hälpere beoarbaidje. Deerfoar stounde do [[MediaWiki:Gadgets-definition|Definitione]] un [[Special:Gadgets|Beschrieuwengen]] tou Ferföigenge.',
+Benutsere fon lokoale Wikis äntwikkeld un fersuurged wäide. Lokoale Wiki-Administratore konnen do ferföichboare Hälpere beoarbaidje. Deerfoar stounde do [[MediaWiki:Gadgets-definition|Definitione]] un [[Special:Gadgets|Beskrieuwengen]] tou Ferföigenge.',
 	'gadgets' => 'Gadgets',
 	'gadgets-title' => 'Gadgets',
 	'gadgets-pagetext' => 'Lieste fon spezielle Hälpere, do der foar älken Benutser in sien [[Special:Preferences|persöönelke Ienstaalengen]] ferföichboar sunt, as [[MediaWiki:Gadgets-definition| definierd]].
-Disse Uursicht bjut direkten Tougoang tou do Systemättergjuchte, do ju Beschrieuwenge as uk dän Programkode fon älken Hälper änthoolde.',
+Disse Uursicht bjut direkten Tougoang tou do Systemättergjuchte, do ju Beskrieuwenge as uk dän Programkode fon älken Hälper änthoolde.',
 	'gadgets-uses' => 'Benutsed',
 );
 
@@ -2311,6 +2718,7 @@ $messages['su'] = array(
  * @author Ainali
  * @author Boivie
  * @author Cohan
+ * @author Diupwijk
  * @author Lejonel
  * @author M.M.S.
  */
@@ -2328,7 +2736,10 @@ Lokala administratörer kan redigera [[MediaWiki:Gadgets-definition|definitioner
 	'gadgets-pagetext' => 'Härunder finns en lista över finesser som användare kan aktivera i sina [[Special:Preferences|inställningar]], definierad av [[MediaWiki:Gadgets-definition|definieringarna]].
 Den här översikten ger enkel åtkomst till de systemmeddelanden som definierar beskrivningarna och koden för varje finess.',
 	'gadgets-uses' => 'Använder',
-	'gadgets-required-rights' => 'Kräver {{PLURAL:$2|$1 rättighet|följande rättigheter: $1}}.',
+	'gadgets-required-rights' => 'Kräver följande {{PLURAL:$2|rättighet|rättigheter}}:
+
+$1',
+	'gadgets-required-skins' => 'Tillgängligt i {{PLURAL:$2|$1-utseendet|följande utseenden: $1}}.',
 	'gadgets-default' => 'Som standard aktiverat för alla.',
 	'gadgets-export' => 'Exportera',
 	'gadgets-export-title' => 'Exportera finess',
@@ -2377,7 +2788,7 @@ $messages['te'] = array(
 	'gadgets-export-download' => 'దింపుకోండి',
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (Тоҷикӣ)
  * @author Ibrahim
  */
 $messages['tg-cyrl'] = array(
@@ -2392,7 +2803,7 @@ $messages['tg-cyrl'] = array(
 	'gadgets-uses' => 'Корбурдҳо',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -2460,8 +2871,8 @@ Nagbibigay ang pagtalakay na ito ng magaang na daan/akseso patungo sa mga pahina
 	'gadgets-export' => 'Iluwas',
 	'gadgets-export-title' => 'Pagluluwas ng gadyet',
 	'gadgets-not-found' => 'Hindi natagpuan ang gadyet na "$1".',
-	'gadgets-export-text' => 'Upang iluwas ang gadyet na $1, pindutin ang pindutang "{{int:gadgets-export-download}}", sagipin ang talaksang ikinargang paibaba, 
-pumunta sa Special:Import na nasa kapupuntahang wiki at ikarga itong paitaas.  Pagkaraan ay idagdag ang sumusunod sa pahina ng MediaWiki:Gadgets-definition:  
+	'gadgets-export-text' => 'Upang iluwas ang gadyet na $1, pindutin ang pindutang "{{int:gadgets-export-download}}", sagipin ang talaksang ikinargang paibaba,
+pumunta sa Special:Import na nasa kapupuntahang wiki at ikarga itong paitaas.  Pagkaraan ay idagdag ang sumusunod sa pahina ng MediaWiki:Gadgets-definition:
 <pre>$2</pre>
 Dapat kang mayroong nararapat na mga pahintulot sa kapupuntahang wiki (kasama ang karapatang mamatnugot ng mga mensahe ng sistema) at dapat na gumagana ang mga inangkat mula sa mga talaksang ikinargang paitaas',
 	'gadgets-export-download' => 'Ikargang pababa',
@@ -2496,7 +2907,7 @@ Hedef vikide uygun izinlerinizin olması (sistem mesajlarını değiştirmek yet
 	'gadgets-export-download' => 'İndir',
 );
 
-/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic))
+/** Tatar (Cyrillic script) (Татарча)
  * @author Ильнар
  */
 $messages['tt-cyrl'] = array(
@@ -2508,8 +2919,11 @@ $messages['tt-cyrl'] = array(
 /** Ukrainian (Українська)
  * @author AS
  * @author Ahonc
+ * @author Dim Grits
  * @author Prima klasy4na
  * @author Riwnodennyk
+ * @author Sodmy
+ * @author Тест
  */
 $messages['uk'] = array(
 	'gadgets-desc' => 'Дозволяє користувачам обирати [[Special:Gadgets|CSS- та JavaScript-додатки]] у своїх [[Special:Preferences|налаштуваннях]]',
@@ -2525,6 +2939,11 @@ $messages['uk'] = array(
 	'gadgets-pagetext' => 'Нижче наведений список додатків, які можна ввімкнути на [[Special:Preferences|сторінці налаштувань]]. Список міститься на [[MediaWiki:Gadgets-definition|сторінці визначень]].
 Цей список дозволяє легко переглядати системні повідомлення, які містять описи і коди додатків.',
 	'gadgets-uses' => 'Використовує',
+	'gadgets-required-rights' => '{{PLURAL:$2|Потрібне право|Потрібні такі права}}:
+
+$1',
+	'gadgets-required-skins' => 'Доступний на {{PLURAL:$2|$1 skin|наступних темах оформлення: $1}}.',
+	'gadgets-default' => 'Увімкнено для всіх за замовчуванням.',
 	'gadgets-export' => 'Експортувати',
 	'gadgets-export-title' => 'Експорт додатка',
 	'gadgets-not-found' => 'Додаток "$1" не знайдено.',
@@ -2559,7 +2978,7 @@ Te serve i parmessi su la wiki de destinassion (compreso quelo de modificar i me
 	'gadgets-export-download' => 'Descarga',
 );
 
-/** Veps (Vepsan kel')
+/** Veps (Vepsän kel')
  * @author Игорь Бродский
  */
 $messages['vep'] = array(
@@ -2567,6 +2986,7 @@ $messages['vep'] = array(
 	'gadgets' => 'Gadžetad:',
 	'gadgets-title' => 'Gadžetad',
 	'gadgets-uses' => 'Kävutab',
+	'gadgets-export' => 'Eksportiruida',
 );
 
 /** Vietnamese (Tiếng Việt)
@@ -2586,7 +3006,10 @@ Cũng chú ý rằng những công cụ đặc biệt này không phải là m�
 	'gadgets-title' => 'Công cụ đa năng',
 	'gadgets-pagetext' => 'Dưới đây là danh sách các công cụ đa năng đặc biệt mà thành viên có thể dùng tại [[Special:Preferences|trang tùy chọn cá nhân]] của họ, theo [[MediaWiki:Gadgets-definition|định nghĩa]]. Trang tổng quan này cung cấp cách tiếp cận dễ dàng đến trang các thông báo hệ thống để định nghĩa miêu tả và mã của từng công cụ.',
 	'gadgets-uses' => 'Sử dụng',
-	'gadgets-required-rights' => 'Cần {{PLURAL:$2|quyền $1|các quyền: $1}}.',
+	'gadgets-required-rights' => 'Cần {{PLURAL:$2|quyền|các quyền}} sau:
+
+$1',
+	'gadgets-required-skins' => 'Có sẵn trên {{PLURAL:$2|hình dạng $1|các hình dạng: $1}}.',
 	'gadgets-default' => 'Được kích hoạt cho tất cả mọi người theo mặc định.',
 	'gadgets-export' => 'Xuất',
 	'gadgets-export-title' => 'Xuất công cụ đa năng',
@@ -2640,8 +3063,11 @@ $messages['yue'] = array(
 );
 
 /** Simplified Chinese (‪中文(简体)‬)
+ * @author Anakmalaysia
+ * @author Bencmq
  * @author Gaoxuewei
  * @author Hydra
+ * @author Liangent
  * @author Shinjiman
  * @author Xiaomingyan
  * @author 阿pp
@@ -2653,14 +3079,17 @@ $messages['zh-hans'] = array(
 这些小工具多数都是基于JavaScript建造，如果要激活它们，那么浏览器的JavaScript就需要激活后方可使用。
 要留意的是这些小工具在这个参数设置页面中是没有效果的。
 
-亦都同时留意这些小工具的特殊页面不是MediaWiki软件的一部份，通常都是由您本地的wiki中开发以及维护。本地管理员可以在[[MediaWiki:Gadgets-definition]]以及[[Special:Gadgets]]编辑可供使用的小工具。',
+亦都同时留意这些小工具的特殊页面不是MediaWiki软件的一部份，通常都是由您本地的wiki中开发以及维护。本地管理员可以编辑可供使用的小工具的[[MediaWiki:Gadgets-definition|定义]]以及[[Special:Gadgets|描述]]。',
 	'gadgets' => '小工具',
 	'gadgets-title' => '小工具',
-	'gadgets-pagetext' => '以下是一个按照[[MediaWiki:Gadgets-definition]]定义的特殊小工具列表，用户可以在他们的参数设置页面中激活它们。
+	'gadgets-pagetext' => '以下是一个按照[[MediaWiki:Gadgets-definition]]定义的特殊小工具列表，用户可以在他们的[[Special:Preferences|参数设置页面]]中激活它们。
 通过这个概览可以方便的获得系统信息页面，从而可以定义每个小工具的描述以及源码。',
 	'gadgets-uses' => '使用',
-	'gadgets-required-rights' => '需要{{PLURAL:$2|$1权限|以下权限：$1}}.',
-	'gadgets-default' => '默认情况下启用的每个人。',
+	'gadgets-required-rights' => '需要以下{{PLURAL:$2|权限|权限}}：
+
+$1',
+	'gadgets-required-skins' => '可用在{{PLURAL:$2|$1外观|以下外观：$1}}。',
+	'gadgets-default' => '默认所有人启用。',
 	'gadgets-export' => '导出',
 	'gadgets-export-title' => '小工具出口',
 	'gadgets-not-found' => '找不到“$1”小工具。',
@@ -2672,7 +3101,9 @@ $messages['zh-hans'] = array(
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
+ * @author Anakmalaysia
  * @author Horacewai2
+ * @author Liangent
  * @author Mark85296341
  * @author Shinjiman
  * @author Waihorace
@@ -2681,17 +3112,19 @@ $messages['zh-hant'] = array(
 	'gadgets-desc' => '讓使用者可以在[[Special:Preferences|偏好設定]]中自訂 [[Special:Gadgets|CSS與JavaScript工具]]',
 	'prefs-gadgets' => '小工具',
 	'gadgets-prefstext' => '以下是一個特殊小工具，您可以在您的帳戶中啟用。
-這些小工具多數都是基於 JavaScript 建造，如果要啟用它們，那麼瀏覽器的 JavaScript 就需要啟用後方可使用。
+這些小工具多數都是基於JavaScript建造，如果要啟用它們，那麼瀏覽器的JavaScript就需要啟用後方可使用。
 要留意的是這些小工具在這個偏好設定頁面中是沒有效果的。
 
-亦都同時留意這些小工具的特殊頁面不是 MediaWiki 軟體的一部份，通常都是由您本地的 wiki 中開發以及維護。本地管理員可以在 [[MediaWiki:Gadgets-definition]] 以及 [[Special:Gadgets]] 編輯可供使用的小工具。',
+亦都同時留意這些小工具的特殊頁面不是MediaWiki軟體的一部份，通常都是由您本地的wiki中開發以及維護。本地管理員可以編輯可供使用的小工具的[[MediaWiki:Gadgets-definition|定義]]以及[[Special:Gadgets|描述]]。',
 	'gadgets' => '小工具',
 	'gadgets-title' => '小工具',
 	'gadgets-pagetext' => '以下是一個按照 [[MediaWiki:Gadgets-definition]] 的定義特殊小工具清單，用戶可以在它們的[[Special:Preferences|偏好設定頁面]]中啟用它們。
-
 這個概覽提供的系統資訊頁面的簡易存取，可以定義每個小工具的描述以及原始碼。',
 	'gadgets-uses' => '使用',
-	'gadgets-required-rights' => '需要{{PLURAL:$2|$1權限|以下權限：$1}}。',
+	'gadgets-required-rights' => '需要以下{{PLURAL:$2|權限|權限}}：
+
+$1',
+	'gadgets-required-skins' => '可用在{{PLURAL:$2|$1面板|以下面板：$1}}。',
 	'gadgets-default' => '預設所有人啟用。',
 	'gadgets-export' => '匯出',
 	'gadgets-export-title' => '匯出小工具',
diff --git a/extensions/Gadgets/Gadgets.php b/extensions/Gadgets/Gadgets.php
index 11409a22..d90f5977 100644
--- a/extensions/Gadgets/Gadgets.php
+++ b/extensions/Gadgets/Gadgets.php
@@ -2,7 +2,6 @@
 /**
  * Gadgets extension - lets users select custom javascript gadgets
  *
- *
  * For more info see http://mediawiki.org/wiki/Extension:Gadgets
  *
  * @file
@@ -12,7 +11,7 @@
  * @license GNU General Public Licence 2.0 or later
  */
 
-if( !defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
 	echo( "This file is an extension to the MediaWiki software and cannot be used standalone.\n" );
 	die( 1 );
 }
@@ -36,9 +35,9 @@ $wgHooks['GetPreferences'][]                = 'GadgetHooks::getPreferences';
 $wgHooks['ResourceLoaderRegisterModules'][] = 'GadgetHooks::registerModules';
 $wgHooks['UnitTestsList'][]                 = 'GadgetHooks::unitTestsList';
 
-$dir = dirname(__FILE__) . '/';
+$dir = dirname( __FILE__ ) . '/';
 $wgExtensionMessagesFiles['Gadgets'] = $dir . 'Gadgets.i18n.php';
-$wgExtensionAliasesFiles['Gadgets'] = $dir . 'Gadgets.alias.php';
+$wgExtensionMessagesFiles['GadgetsAlias'] = $dir . 'Gadgets.alias.php';
 
 $wgAutoloadClasses['ApiQueryGadgetCategories'] = $dir . 'ApiQueryGadgetCategories.php';
 $wgAutoloadClasses['ApiQueryGadgets'] = $dir . 'ApiQueryGadgets.php';
diff --git a/extensions/Gadgets/Gadgets_body.php b/extensions/Gadgets/Gadgets_body.php
index a904d6e4..e606b231 100644
--- a/extensions/Gadgets/Gadgets_body.php
+++ b/extensions/Gadgets/Gadgets_body.php
@@ -2,7 +2,6 @@
 /**
  * Gadgets extension - lets users select custom javascript gadgets
  *
- *
  * For more info see http://mediawiki.org/wiki/Extension:Gadgets
  *
  * @file
@@ -13,7 +12,6 @@
  */
 
 class GadgetHooks {
-
 	/**
 	 * ArticleSaveComplete hook handler.
 	 *
@@ -22,9 +20,9 @@ class GadgetHooks {
 	 * @param $text String: New page text
 	 */
 	public static function articleSaveComplete( $article, $user, $text ) {
-		//update cache if MediaWiki:Gadgets-definition was edited
+		// update cache if MediaWiki:Gadgets-definition was edited
 		$title = $article->mTitle;
-		if( $title->getNamespace() == NS_MEDIAWIKI && $title->getText() == 'Gadgets-definition' ) {
+		if ( $title->getNamespace() == NS_MEDIAWIKI && $title->getText() == 'Gadgets-definition' ) {
 			Gadget::loadStructuredList( $text );
 		}
 		return true;
@@ -36,15 +34,16 @@ class GadgetHooks {
 	 */
 	public static function userGetDefaultOptions( &$defaultOptions ) {
 		$gadgets = Gadget::loadStructuredList();
-		if (!$gadgets) return true;
+		if ( !$gadgets ) return true;
 
-		foreach( $gadgets as $section => $thisSection ) {
-			foreach( $thisSection as $gadgetId => $gadget ) {
+		foreach ( $gadgets as $section => $thisSection ) {
+			foreach ( $thisSection as $gadgetId => $gadget ) {
 				if ( $gadget->isOnByDefault() ) {
 					$defaultOptions['gadget-' . $gadgetId] = 1;
 				}
 			}
 		}
+
 		return true;
 	}
 
@@ -55,23 +54,31 @@ class GadgetHooks {
 	 */
 	public static function getPreferences( $user, &$preferences ) {
 		$gadgets = Gadget::loadStructuredList();
-		if (!$gadgets) return true;
+
+		if ( !$gadgets ) {
+			return true;
+		}
 
 		$options = array();
 		$default = array();
-		foreach( $gadgets as $section => $thisSection ) {
+		foreach ( $gadgets as $section => $thisSection ) {
 			$available = array();
-			foreach( $thisSection as $gadget ) {
+
+			foreach ( $thisSection as $gadget ) {
 				if ( $gadget->isAllowed( $user ) ) {
 					$gname = $gadget->getName();
-					$available[$gadget->getDescription()] = $gname;
+					# bug 30182: dir="auto" because it's often not translated
+					$desc = '<span dir="auto">' . $gadget->getDescription() . '</span>';
+					$available[$desc] = $gname;
 					if ( $gadget->isEnabled( $user ) ) {
 						$default[] = $gname;
 					}
 				}
 			}
+
 			if ( $section !== '' ) {
 				$section = wfMsgExt( "gadget-section-$section", 'parseinline' );
+
 				if ( count ( $available ) ) {
 					$options[$section] = $available;
 				}
@@ -111,9 +118,11 @@ class GadgetHooks {
 	 */
 	public static function registerModules( &$resourceLoader ) {
 		$gadgets = Gadget::loadList();
+
 		if ( !$gadgets ) {
 			return true;
 		}
+
 		foreach ( $gadgets as $g ) {
 			$module = $g->getModule();
 			if ( $module ) {
@@ -121,6 +130,7 @@ class GadgetHooks {
 			}
 		}
 		return true;
+
 	}
 
 	/**
@@ -145,8 +155,10 @@ class GadgetHooks {
 		foreach ( $gadgets as $gadget ) {
 			if ( $gadget->isEnabled( $wgUser ) && $gadget->isAllowed( $wgUser ) ) {
 				if ( $gadget->hasModule() ) {
+					$out->addModuleStyles( $gadget->getModuleName() );
 					$out->addModules( $gadget->getModuleName() );
 				}
+
 				foreach ( $gadget->getLegacyScripts() as $page ) {
 					$lb->add( NS_MEDIAWIKI, $page );
 					$pages[] = $page;
@@ -157,8 +169,12 @@ class GadgetHooks {
 		$lb->execute( __METHOD__ );
 
 		$done = array();
+
 		foreach ( $pages as $page ) {
-			if ( isset( $done[$page] ) ) continue;
+			if ( isset( $done[$page] ) ) {
+				continue;
+			}
+
 			$done[$page] = true;
 			self::applyScript( $page, $out );
 		}
@@ -180,12 +196,14 @@ class GadgetHooks {
 		# ResourceLoader handle this in OutputPage::getModules()
 		# TODO: make this extension load everything via RL, then we don't need to worry
 		# about any of this.
-		if( $out->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) < ResourceLoaderModule::ORIGIN_USER_SITEWIDE ){
+		if ( $out->getAllowedModules( ResourceLoaderModule::TYPE_SCRIPTS ) < ResourceLoaderModule::ORIGIN_USER_SITEWIDE ) {
 			return;
 		}
 
 		$t = Title::makeTitleSafe( NS_MEDIAWIKI, $page );
-		if ( !$t ) return;
+		if ( !$t ) {
+			return;
+		}
 
 		$u = $t->getLocalURL( 'action=raw&ctype=' . $wgJsMimeType );
 		$out->addScriptFile( $u, $t->getLatestRevID() );
@@ -197,6 +215,7 @@ class GadgetHooks {
 	 */
 	public static function unitTestsList( $files ) {
 		$files[] = dirname( __FILE__ ) . '/Gadgets_tests.php';
+
 		return true;
 	}
 }
@@ -208,16 +227,17 @@ class Gadget {
 	/**
 	 * Increment this when changing class structure
 	 */
-	const GADGET_CLASS_VERSION = 5;
+	const GADGET_CLASS_VERSION = 6;
 
 	private $version = self::GADGET_CLASS_VERSION,
-	        $scripts = array(),
-	        $styles = array(),
+			$scripts = array(),
+			$styles = array(),
 			$dependencies = array(),
-	        $name,
+			$name,
 			$definition,
 			$resourceLoaded = false,
 			$requiredRights = array(),
+			$requiredSkins = array(),
 			$onByDefault = false,
 			$category;
 
@@ -231,13 +251,14 @@ class Gadget {
 		if ( !preg_match( '/^\*+ *([a-zA-Z](?:[-_:.\w\d ]*[a-zA-Z0-9])?)(\s*\[.*?\])?\s*((\|[^|]*)+)\s*$/', $definition, $m ) ) {
 			return false;
 		}
-		//NOTE: the gadget name is used as part of the name of a form field,
+		// NOTE: the gadget name is used as part of the name of a form field,
 		//      and must follow the rules defined in http://www.w3.org/TR/html4/types.html#type-cdata
 		//      Also, title-normalization applies.
 		$gadget = new Gadget();
-		$gadget->name = trim( str_replace(' ', '_', $m[1] ) );
+		$gadget->name = trim( str_replace( ' ', '_', $m[1] ) );
 		$gadget->definition = $definition;
 		$options = trim( $m[2], ' []' );
+
 		foreach ( preg_split( '/\s*\|\s*/', $options, -1, PREG_SPLIT_NO_EMPTY ) as $option ) {
 			$arr  = preg_split( '/\s*=\s*/', $option, 2 );
 			$option = $arr[0];
@@ -247,6 +268,7 @@ class Gadget {
 			} else {
 				$params = array();
 			}
+
 			switch ( $option ) {
 				case 'ResourceLoader':
 					$gadget->resourceLoaded = true;
@@ -257,19 +279,25 @@ class Gadget {
 				case 'rights':
 					$gadget->requiredRights = $params;
 					break;
+				case 'skins':
+					$gadget->requiredSkins = $params;
+					break;
 				case 'default':
 					$gadget->onByDefault = true;
 					break;
 			}
 		}
+
 		foreach ( preg_split( '/\s*\|\s*/', $m[3], -1, PREG_SPLIT_NO_EMPTY ) as $page ) {
 			$page = "Gadget-$page";
+
 			if ( preg_match( '/\.js/', $page ) ) {
 				$gadget->scripts[] = $page;
 			} elseif ( preg_match( '/\.css/', $page ) ) {
 				$gadget->styles[] = $page;
 			}
 		}
+
 		return $gadget;
 	}
 
@@ -333,7 +361,8 @@ class Gadget {
 	 * @return Boolean
 	 */
 	public function isAllowed( $user ) {
-		return count( array_intersect( $this->requiredRights, $user->getRights() ) ) == count( $this->requiredRights );
+		return count( array_intersect( $this->requiredRights, $user->getRights() ) ) == count( $this->requiredRights )
+			&& ( !count( $this->requiredSkins ) || in_array( $user->getOption( 'skin' ), $this->requiredSkins ) );
 	}
 
 	/**
@@ -394,17 +423,21 @@ class Gadget {
 	 */
 	public function getModule() {
 		$pages = array();
-		foreach( $this->styles as $style ) {
+
+		foreach ( $this->styles as $style ) {
 			$pages['MediaWiki:' . $style] = array( 'type' => 'style' );
 		}
+
 		if ( $this->supportsResourceLoader() ) {
 			foreach ( $this->scripts as $script ) {
 				$pages['MediaWiki:' . $script] = array( 'type' => 'script' );
 			}
 		}
+
 		if ( !count( $pages ) ) {
 			return null;
 		}
+
 		return new GadgetResourceLoaderModule( $pages, $this->dependencies );
 	}
 
@@ -436,16 +469,27 @@ class Gadget {
 	}
 
 	/**
+	 * Returns array of skins where this gadget works
+	 * @return Array
+	 */
+	public function getRequiredSkins() {
+		return $this->requiredSkins;
+	}
+
+	/**
 	 * Loads and returns a list of all gadgets
 	 * @return Mixed: Array of gadgets or false
 	 */
 	public static function loadList() {
 		static $gadgets = null;
 
-		if ( $gadgets !== null ) return $gadgets;
+		if ( $gadgets !== null ) {
+			return $gadgets;
+		}
 
 		wfProfileIn( __METHOD__ );
 		$struct = self::loadStructuredList();
+
 		if ( !$struct ) {
 			$gadgets = $struct;
 			wfProfileOut( __METHOD__ );
@@ -478,6 +522,7 @@ class Gadget {
 				}
 			}
 		}
+
 		return true; // empty array
 	}
 
@@ -493,13 +538,15 @@ class Gadget {
 		global $wgMemc;
 
 		static $gadgets = null;
-		if ( $gadgets !== null && $forceNewText === null ) return $gadgets;
+		if ( $gadgets !== null && $forceNewText === null ) {
+			return $gadgets;
+		}
 
 		wfProfileIn( __METHOD__ );
 		$key = wfMemcKey( 'gadgets-definition', self::GADGET_CLASS_VERSION );
 
 		if ( $forceNewText === null ) {
-			//cached?
+			// cached?
 			$gadgets = $wgMemc->get( $key );
 			if ( self::isValidList( $gadgets ) ) {
 				wfProfileOut( __METHOD__ );
@@ -537,10 +584,10 @@ class Gadget {
 			}
 		}
 
-		//cache for a while. gets purged automatically when MediaWiki:Gadgets-definition is edited
-		$wgMemc->set( $key, $gadgets, 60*60*24 );
+		// cache for a while. gets purged automatically when MediaWiki:Gadgets-definition is edited
+		$wgMemc->set( $key, $gadgets, 60 * 60 * 24 );
 		$source = $forceNewText !== null ? 'input text' : 'MediaWiki:Gadgets-definition';
-		wfDebug( __METHOD__ . ": $source parsed, cache entry $key updated\n");
+		wfDebug( __METHOD__ . ": $source parsed, cache entry $key updated\n" );
 		wfProfileOut( __METHOD__ );
 
 		return $gadgets;
diff --git a/extensions/Gadgets/Gadgets_tests.php b/extensions/Gadgets/Gadgets_tests.php
index 58cb2a3e..2b1e6a70 100644
--- a/extensions/Gadgets/Gadgets_tests.php
+++ b/extensions/Gadgets/Gadgets_tests.php
@@ -1,14 +1,14 @@
 <?php
-
 /**
  * @group Gadgets
  */
-class GadgetsTest extends PHPUnit_Framework_TestCase {
 
+class GadgetsTest extends PHPUnit_Framework_TestCase {
 	private function create( $line ) {
 		$g = Gadget::newFromDefinition( $line );
 		// assertInstanceOf() is available since PHPUnit 3.5
 		$this->assertEquals( 'Gadget', get_class( $g ) );
+
 		return $g;
 	}
 
@@ -34,7 +34,7 @@ class GadgetsTest extends PHPUnit_Framework_TestCase {
 		$g = $this->create( '*foo [ResourceLoader]|foo.js|foo.css' );
 		$this->assertEquals( 'foo', $g->getName() );
 		$this->assertTrue( $g->supportsResourceLoader() );
-		$this->assertEquals(0, count( $g->getLegacyScripts() ) );
+		$this->assertEquals( 0, count( $g->getLegacyScripts() ) );
 	}
 
 	function testDependencies() {
@@ -45,12 +45,11 @@ class GadgetsTest extends PHPUnit_Framework_TestCase {
 	}
 
 	function testPreferences() {
-		global $wgUser;
+		global $wgUser, $wgOut, $wgTitle;
 
 		// This test makes call to the parser which requires valids Outputpage
 		// and Title objects. Set them up there, they will be released at the
 		// end of the test.
-		global $wgOut, $wgTitle;
 		$old_wgOut = $wgOut;
 		$old_wgTitle = $wgTitle;
 		$wgTitle = Title::newFromText( 'Parser test for Gadgets extension' );
diff --git a/extensions/Gadgets/README b/extensions/Gadgets/README
index 6b42059d..4754865a 100644
--- a/extensions/Gadgets/README
+++ b/extensions/Gadgets/README
@@ -32,7 +32,7 @@ See http://www.mediawiki.org/wiki/Extension:Gadgets#Usage
 
 == Caveats ==
 
-* Gadgets do not apply to Special:Preferences, Special:UserLogin and 
+* Gadgets do not apply to Special:Preferences, Special:UserLogin and
   Special:ResetPass so users can always disable any broken gadgets they
   may have enabled, and malicious gadgets will be unable to steal passwords.
 * Uses BeforePageDisplay hook, thus only works with MonoBook based skins;
diff --git a/extensions/Gadgets/SpecialGadgets.php b/extensions/Gadgets/SpecialGadgets.php
index eb872fc7..21b2dad4 100644
--- a/extensions/Gadgets/SpecialGadgets.php
+++ b/extensions/Gadgets/SpecialGadgets.php
@@ -9,14 +9,6 @@
  * @license GNU General Public License 2.0 or later
  */
 
-if( !defined( 'MEDIAWIKI' ) ) {
-	echo( "not a valid entry point.\n" );
-	die( 1 );
-}
-
-/**
- *
- */
 class SpecialGadgets extends SpecialPage {
 
 	/**
@@ -32,13 +24,14 @@ class SpecialGadgets extends SpecialPage {
 	 */
 	function execute( $par ) {
 		$parts = explode( '/', $par );
+
 		if ( count( $parts ) == 2 && $parts[0] == 'export' ) {
 			$this->showExportForm( $parts[1] );
 		} else {
 			$this->showMainForm();
 		}
 	}
-	
+
 	/**
 	 * Displays form showing the list of installed gadgets
 	 */
@@ -63,43 +56,50 @@ class SpecialGadgets extends SpecialPage {
 
 		$msgOpt = array( 'parseinline', 'parsemag' );
 		$editInterfaceAllowed = $wgUser->isAllowed( 'editinterface' );
-			
+
 		foreach ( $gadgets as $section => $entries ) {
 			if ( $section !== false && $section !== '' ) {
 				$t = Title::makeTitleSafe( NS_MEDIAWIKI, "Gadget-section-$section$lang" );
 				if ( $editInterfaceAllowed ) {
 					$lnkTarget = $t
-						? $skin->link( $t, wfMsgHTML( 'edit' ), array(), array( 'action' => 'edit' ) ) 
+						? $skin->link( $t, wfMsgHTML( 'edit' ), array(), array( 'action' => 'edit' ) )
 						: htmlspecialchars( $section );
 					$lnk =  "&#160; &#160; [$lnkTarget]";
 				} else {
 					$lnk = '';
 				}
+
 				$ttext = wfMsgExt( "gadget-section-$section", $msgOpt );
 
-				if( $listOpen ) {
+				if ( $listOpen ) {
 					$wgOut->addHTML( Xml::closeElement( 'ul' ) . "\n" );
 					$listOpen = false;
 				}
+
 				$wgOut->addHTML( Html::rawElement( 'h2', array(), $ttext . $lnk ) . "\n" );
 			}
 
 			foreach ( $entries as $gadget ) {
 				$t = Title::makeTitleSafe( NS_MEDIAWIKI, "Gadget-{$gadget->getName()}$lang" );
-				if ( !$t ) continue;
+
+				if ( !$t ) {
+					continue;
+				}
 
 				$links = array();
 				if ( $editInterfaceAllowed ) {
 					$links[] = $skin->link( $t, wfMsgHTML( 'edit' ), array(), array( 'action' => 'edit' ) );
 				}
+
 				$links[] = $skin->link( $this->getTitle( "export/{$gadget->getName()}" ), wfMsgHtml( 'gadgets-export' ) );
-				
+
 				$ttext = wfMsgExt( "gadget-{$gadget->getName()}", $msgOpt );
 
-				if( !$listOpen ) {
+				if ( !$listOpen ) {
 					$listOpen = true;
 					$wgOut->addHTML( Xml::openElement( 'ul' ) );
 				}
+
 				$lnk = '&#160;&#160;' . wfMsg( 'parentheses', $wgLang->pipeList( $links ) );
 				$wgOut->addHTML( Xml::openElement( 'li' ) .
 						$ttext . $lnk . "<br />" .
@@ -109,26 +109,49 @@ class SpecialGadgets extends SpecialPage {
 				$lnk = array();
 				foreach ( $gadget->getScriptsAndStyles() as $codePage ) {
 					$t = Title::makeTitleSafe( NS_MEDIAWIKI, $codePage );
-					if ( !$t ) continue;
+
+					if ( !$t ) {
+						continue;
+					}
 
 					$lnk[] = $skin->link( $t, htmlspecialchars( $t->getText() ) );
 				}
 				$wgOut->addHTML( $wgLang->commaList( $lnk ) );
-				$rights = $gadget->getRequiredRights();
+
+				$rights = array();
+				foreach ( $gadget->getRequiredRights() as $right ) {
+					$rights[] = '* ' . wfMessage( "right-$right" )->plain();
+				}
 				if ( count( $rights ) ) {
-					$wgOut->addHTML( '<br />' . 
-						wfMessage( 'gadgets-required-rights', $wgLang->commaList( $rights ), count( $rights ) )->parse()
+					$wgOut->addHTML( '<br />' .
+						wfMessage( 'gadgets-required-rights', implode( "\n", $rights ), count( $rights ) )->parse()
+					);
+				}
+
+				$skins = array();
+				$validskins = Skin::getSkinNames();
+				foreach ( $gadget->getRequiredSkins() as $skinid ) {
+					if ( isset( $validskins[$skinid] ) ) {
+						$skins[] = wfMessage( "skinname-$skinid" )->plain();
+					} else {
+						$skins[] = $skinid;
+					}
+				}
+				if ( count( $skins ) ) {
+					$wgOut->addHTML( '<br />' .
+						wfMessage( 'gadgets-required-skins', $wgLang->commaList( $skins ), count( $skins ) )->parse()
 					);
 				}
+
 				if ( $gadget->isOnByDefault() ) {
 					$wgOut->addHTML( '<br />' . wfMessage( 'gadgets-default' )->parse() );
 				}
-				
+
 				$wgOut->addHTML( Xml::closeElement( 'li' ) . "\n" );
 			}
 		}
 
-		if( $listOpen ) {
+		if ( $listOpen ) {
 			$wgOut->addHTML( Xml::closeElement( 'ul' ) . "\n" );
 		}
 	}
@@ -145,7 +168,7 @@ class SpecialGadgets extends SpecialPage {
 			$wgOut->showErrorPage( 'error', 'gadgets-not-found', array( $gadget ) );
 			return;
 		}
-		
+
 		$g = $gadgets[$gadget];
 		$this->setHeaders();
 		$wgOut->setPagetitle( wfMsg( "gadgets-export-title" ) );
diff --git a/extensions/Nuke/Nuke.alias.php b/extensions/Nuke/Nuke.alias.php
index e7fdac5d..6f8c9176 100644
--- a/extensions/Nuke/Nuke.alias.php
+++ b/extensions/Nuke/Nuke.alias.php
@@ -143,6 +143,11 @@ $specialPageAliases['ms'] = array(
 	'Nuke' => array( 'Hapus_pukal' ),
 );
 
+/** Norwegian Bokmål (‪Norsk (bokmål)‬) */
+$specialPageAliases['nb'] = array(
+	'Nuke' => array( 'Massesletting' ),
+);
+
 /** Nedersaksisch (Nedersaksisch) */
 $specialPageAliases['nds-nl'] = array(
 	'Nuke' => array( 'Massaal_vortdoon' ),
@@ -158,17 +163,12 @@ $specialPageAliases['nn'] = array(
 	'Nuke' => array( 'Massesletting' ),
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
-$specialPageAliases['no'] = array(
-	'Nuke' => array( 'Massesletting' ),
-);
-
 /** Polish (Polski) */
 $specialPageAliases['pl'] = array(
 	'Nuke' => array( 'Masowe_usuwanie' ),
 );
 
-/** Sanskrit (संस्कृत) */
+/** Sanskrit (संस्कृतम्) */
 $specialPageAliases['sa'] = array(
 	'Nuke' => array( 'न्यूक' ),
 );
@@ -200,15 +200,10 @@ $specialPageAliases['vi'] = array(
 
 /** Simplified Chinese (‪中文(简体)‬) */
 $specialPageAliases['zh-hans'] = array(
-	'Nuke' => array( '杜克鲁克' ),
+	'Nuke' => array( '大量删除' ),
 );
 
 /** Traditional Chinese (‪中文(繁體)‬) */
 $specialPageAliases['zh-hant'] = array(
 	'Nuke' => array( '大量刪除' ),
-);
-
-/**
- * For backwards compatibility with MediaWiki 1.15 and earlier.
- */
-$aliases =& $specialPageAliases;
-\ No newline at end of file
+);
+\ No newline at end of file
diff --git a/extensions/Nuke/Nuke.i18n.php b/extensions/Nuke/Nuke.i18n.php
index e028221f..f1a63f8a 100644
--- a/extensions/Nuke/Nuke.i18n.php
+++ b/extensions/Nuke/Nuke.i18n.php
@@ -14,6 +14,7 @@ $messages = array();
  */
 $messages['en'] = array(
 	'nuke'               => 'Mass delete',
+	'action-nuke'        => 'nuke pages',
 	'nuke-desc'          => 'Gives administrators the ability to [[Special:Nuke|mass delete]] pages',
 	'nuke-nopages'       => "No new pages by [[Special:Contributions/$1|$1]] in recent changes.",
 	'nuke-list'          => "The following pages were recently created by [[Special:Contributions/$1|$1]];
@@ -21,6 +22,7 @@ put in a comment and hit the button to delete them.",
 	'nuke-list-multiple' => 'The following pages were recently created;
 put in a comment and hit the button to delete them.',
 	'nuke-defaultreason' => "Mass deletion of pages added by $1",
+	'nuke-multiplepeople'=> 'Mass deletion of recently added pages',
 	'nuke-tools'         => 'This tool allows for mass deletions of pages recently added by a given user or an IP address.
 Input the username or IP address to get a list of pages to delete, or leave blank for all users.',
 	'nuke-submit-user'   => 'Go',
@@ -29,23 +31,44 @@ Input the username or IP address to get a list of pages to delete, or leave blan
 	'nuke-select'        => 'Select: $1',
 	'nuke-userorip'      => 'Username, IP address or blank:',
 	'nuke-maxpages'      => 'Maximum number of pages:',
-	'nuke-multiplepeople'=> 'multiple users',
 	'nuke-editby'        => 'Created by [[Special:Contributions/$1|$1]]',
 	'nuke-deleted'       => "Page '''$1''' has been deleted.",
 	'nuke-not-deleted'   => "Page [[:$1]] '''could not''' be deleted.",
+	'nuke-delete-more'	 => '[[Special:Nuke|Delete more pages]]',
+	'nuke-pattern'       => 'Pattern for the page name:',
+	'nuke-nopages-global'=> 'There are no new pages in [[Special:RecentChanges|recent changes]].',
 );
 
 /** Message documentation (Message documentation)
+ * @author Jeroen De Dauw
  * @author Jon Harald Søby
  * @author Meno25
  * @author Purodha
+ * @author SPQRobin
+ * @author Siebrand
  * @author The Evil IP address
+ * @author Umherirrender
+ * @author Yekrats
  */
 $messages['qqq'] = array(
-	'nuke-desc' => '{{desc}}',
+	'nuke' => 'The Nuke extension allows for sysops to delete a large number of pages ("Mass delete"). 
+For more information, see http://www.mediawiki.org/wiki/Extension:Nuke',
+	'action-nuke' => '{{doc-action|nuke}}',
+	'nuke-desc' => 'The Nuke extension allows for sysops to delete a large number of pages ("Mass delete"). 
+For more information, see http://www.mediawiki.org/wiki/Extension:Nuke
+{{desc}}',
+	'nuke-defaultreason' => 'Reason for deletion in logs. Parameters: $1 is a username or IP address, with a link to their contributions.
+
+{{msg-mw|nuke-multiplepeople}} is used when pages created by multiple people are deleted.',
+	'nuke-multiplepeople' => 'Reason for deletion in logs, when pages created by multiple users were deleted.
+
+{{msg-mw|nuke-defaultreason}} is used when pages created by only 1 user are deleted.',
 	'nuke-submit-user' => '{{Identical|Go}}',
-	'right-nuke' => '{{doc-right}}',
-	'nuke-select' => '{{Identical|Select}}',
+	'nuke-submit-delete' => 'Submit button to delete the selected pages.',
+	'right-nuke' => '{{doc-right|nuke}}',
+	'nuke-select' => 'Parameter $1 are two links: {{msg-mw|powersearch-toggleall}} and {{msg-mw|powersearch-togglenone}} which respectively selects all pages and de-selects all pages.
+
+{{Identical|Select}}',
 );
 
 /** Niuean (ko e vagahau Niuē)
@@ -57,15 +80,25 @@ $messages['niu'] = array(
 
 /** Afrikaans (Afrikaans)
  * @author Naudefj
+ * @author පසිඳු කාවින්ද
  */
 $messages['af'] = array(
 	'nuke' => 'Massa verwyder',
 	'nuke-nopages' => 'Geen nuwe bladsye [[Special:Contributions/$1|$1]] in onlangse wysigings.',
+	'nuke-list-multiple' => "Die volgende bladsye is onlangs geskep word;
+sit dit in 'n kommentaar en druk die knoppie om dit te skrap.",
 	'nuke-defaultreason' => 'Massa verwydering van bladsye van $1',
+	'nuke-multiplepeople' => 'verskeie gebruikers',
 	'nuke-submit-user' => 'Laat waai',
 	'nuke-submit-delete' => 'Skrap geselekteerde',
 	'right-nuke' => 'Massa verwydering van bladsye',
 	'nuke-select' => 'Selekteer: $1',
+	'nuke-userorip' => 'Gebruikersnaam, IP-adres of leeg:',
+	'nuke-maxpages' => 'Maksimum aantal bladsye:',
+	'nuke-editby' => 'Geskep deur [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Bladsy '''$1''' is verwyder.",
+	'nuke-not-deleted' => "Bladsy [[:$1]] '''kon nie''' verwyder word nie.",
+	'nuke-pattern' => 'Patroon vir die naam:',
 );
 
 /** Aragonese (Aragonés)
@@ -85,6 +118,7 @@ $messages['an'] = array(
 
 /** Arabic (العربية)
  * @author Meno25
+ * @author زكريا
  */
 $messages['ar'] = array(
 	'nuke' => 'حذف كمي',
@@ -92,12 +126,21 @@ $messages['ar'] = array(
 	'nuke-nopages' => 'لا صفحات جديدة بواسطة [[Special:Contributions/$1|$1]] في أحدث التغييرات.',
 	'nuke-list' => 'الصفحات التالية تم إنشاؤها حديثا بواسطة [[Special:Contributions/$1|$1]]؛
 ضع تعليقا واضغط الزر لحذفهم.',
+	'nuke-list-multiple' => 'الصفحات التالية أنشئت حديثا؛
+علق عليها واضغط الزر لحذفها',
 	'nuke-defaultreason' => 'إزالة كمية للصفحات المضافة بواسطة $1',
-	'nuke-tools' => 'هذه الأداة تسمح بالحذف الضخم للصفحات المضافة حديثا بواسطة مستخدم أو أيبي معطى.
-أدخل اسم المستخدم أو الأيبي لعرض قائمة بالصفحات للحذف:',
+	'nuke-multiplepeople' => 'مستخدمون كثر',
+	'nuke-tools' => 'هذه الأداة تسمح بالحذف الكمي للصفحات المضافة حديثا بواسطة مستخدم أو أيبي معطى.
+أدخل اسم المستخدم أو الأيبي لعرض قائمة بالصفحات للحذف، أو اترك فارغة لكل المستخدمين.',
 	'nuke-submit-user' => 'اذهب',
 	'nuke-submit-delete' => 'حذف المختار',
 	'right-nuke' => 'حذف الصفحات كميا',
+	'nuke-select' => 'اختر: $1',
+	'nuke-userorip' => 'اسم مستخدم أو عنوان بروتوكول إنترنت أو فراغ:',
+	'nuke-maxpages' => 'الحد الأقصى لعدد الصفحات:',
+	'nuke-editby' => 'من إنشاء [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "صفحة '''$1''' حذفت.",
+	'nuke-not-deleted' => "صفحة [[:$1]] '''لا''' تحذف.",
 );
 
 /** Aramaic (ܐܪܡܝܐ)
@@ -131,21 +174,34 @@ $messages['arz'] = array(
  */
 $messages['ast'] = array(
 	'nuke' => 'Esborráu masivu',
+	'action-nuke' => 'desaniciar páxines en masa',
 	'nuke-desc' => "Da a los alministradores la capacidá d'[[Special:Nuke|esborrar páxines masivamente]]",
 	'nuke-nopages' => 'Nun hai páxines nueves de [[Special:Contributions/$1|$1]] nos cambeos recientes.',
 	'nuke-list' => 'Les páxines siguientes foron creaes recién por [[Special:Contributions/$1|$1]]; escribi un comentariu y calca nel botón pa esborrales.',
 	'nuke-list-multiple' => "Les páxines darréu se crearon recientemente;
 escribi un comentariu y calca'l botón pa desaniciales.",
 	'nuke-defaultreason' => 'Esborráu masivu de páxines añadíes por $1',
+	'nuke-multiplepeople' => 'Desaniciu en masa de páxines nueves',
 	'nuke-tools' => "Esta ferramienta permite desanicios masivos de páxines añadíes recién por un usuariu o una IP determinada. Escribi'l nome d'usuariu o la IP pa obtener una llista de páxines a desaniciar, o dexa en blanco pa tolos usuarios.",
 	'nuke-submit-user' => 'Dir',
-	'nuke-submit-delete' => 'Esborrar seleicionaes',
+	'nuke-submit-delete' => 'Desaniciar seleicionaes',
 	'right-nuke' => 'Esborráu masivu de páxines',
 	'nuke-select' => 'Seleicionar: $1',
 	'nuke-userorip' => "Nome d'usuariu, direición IP o en blanco:",
 	'nuke-maxpages' => 'Máximu númberu de páxines:',
-	'nuke-multiplepeople' => 'múltiples usuarios',
 	'nuke-editby' => 'Creáu por [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "La páxina '''$1''' se desanició.",
+	'nuke-not-deleted' => "La páxina [[:$1]] '''nun se pudo''' desaniciar.",
+	'nuke-delete-more' => '[[Special:Nuke|Desaniciar más páxines]]',
+	'nuke-pattern' => 'Patrón pal nome de páxina:',
+	'nuke-nopages-global' => 'Nun hai páxines nueves nos [[Special:RecentChanges|cambios recientes]].',
+);
+
+/** Azerbaijani (Azərbaycanca)
+ * @author Cekli829
+ */
+$messages['az'] = array(
+	'nuke-select' => 'Seçin: $1',
 );
 
 /** Bashkir (Башҡортса)
@@ -208,6 +264,7 @@ $messages['be'] = array(
  */
 $messages['be-tarask'] = array(
 	'nuke' => 'Масавае выдаленьне',
+	'action-nuke' => 'масавае выдаленьне старонак',
 	'nuke-desc' => 'Дае адміністратарам магчымасьць [[Special:Nuke|масавага выдаленьня]] старонак',
 	'nuke-nopages' => 'У апошніх зьменах няма новых старонак, створаных [[Special:Contributions/$1|$1]].',
 	'nuke-list' => 'Наступныя старонкі былі нядаўна створаны ўдзельнікам [[Special:Contributions/$1|$1]];
@@ -215,6 +272,7 @@ $messages['be-tarask'] = array(
 	'nuke-list-multiple' => 'Наступныя старонкі былі створаны нядаўна;
 устаўце камэнтар і націсьніце кнопку каб іх выдаліць.',
 	'nuke-defaultreason' => 'Масавае выдаленьне старонак, створаных удзельнікам $1',
+	'nuke-multiplepeople' => 'Масавае выдаленьне нядаўна дададзеных старонак',
 	'nuke-tools' => 'Гэты інструмэнт дазваляе рабіць масавыя выдаленьні старонак, створаных пэўным удзельнікам альбо з IP-адрасу. Увядзіце імя ўдзельніка ці IP-адрас для таго, каб атрымаць сьпіс старонак для выдаленьня, ці пакіньце пустым для ўсіх удзельнікаў.',
 	'nuke-submit-user' => 'Выканаць',
 	'nuke-submit-delete' => 'Выдаліць выбраныя',
@@ -222,10 +280,12 @@ $messages['be-tarask'] = array(
 	'nuke-select' => 'Выбраць: $1',
 	'nuke-userorip' => 'Удзельнік, IP-адрас ці пустое:',
 	'nuke-maxpages' => 'Максымальная колькасьць старонак:',
-	'nuke-multiplepeople' => 'некалькі ўдзельнікаў',
 	'nuke-editby' => 'Створана [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => 'Старонка «$1» выдаленая.',
 	'nuke-not-deleted' => "Старонка [[:$1]] '''ня можа''' быць выдаленая.",
+	'nuke-delete-more' => '[[Special:Nuke|Масавае выдаленьне старонак]]',
+	'nuke-pattern' => 'Узор для назвы старонкі:',
+	'nuke-nopages-global' => 'У [[Special:RecentChanges|апошніх зьменах]] больш няма новых старонак.',
 );
 
 /** Bulgarian (Български)
@@ -256,13 +316,13 @@ $messages['bn'] = array(
 	'nuke-nopages' => 'সাম্প্রতিক পরিবর্তনগুলিতে [[Special:Contributions/$1|$1]]-এর তৈরি কোন নতুন পাতা নেই।',
 	'nuke-list' => '[[Special:Contributions/$1|$1]] সাম্প্রতিক কালে নিচের পাতাগুলি সৃষ্টি করেছেন; একটি মন্তব্য দিন এবং বোতাম চেপে এগুলি মুছে ফেলুন।',
 	'nuke-defaultreason' => '$1-এর যোগ করা পাতাগুলির গণ মুছে-ফেলা',
+	'nuke-multiplepeople' => 'একাধিক ব্যবহারকারী',
 	'nuke-tools' => 'এই সরঞ্জামটি ব্যবহার করে আপনি একটি প্রদত্ত ব্যবহারকারীর বা আইপি ঠিকানার যোগ করা পাতাগুলি গণ আকারে মুছে ফেলতে পারবেন। পাতাগুলির তালিকা পেতে ব্যবহারকারী নাম বা আইপি ঠিকানাটি ইনপুট করুন:',
 	'nuke-submit-user' => 'যাও',
 	'nuke-submit-delete' => 'নির্বাচিত গুলো মুছে ফেলো',
 	'nuke-select' => 'নির্বাচন: $1',
 	'nuke-userorip' => 'ব্যবহারকারী নাম, আইপি ঠিকানা বা খালি:',
 	'nuke-maxpages' => 'সর্বোচ্চ সংখ্যক পাতাসমূহ:',
-	'nuke-multiplepeople' => 'একাধিক ব্যবহারকারী',
 );
 
 /** Breton (Brezhoneg)
@@ -270,6 +330,7 @@ $messages['bn'] = array(
  */
 $messages['br'] = array(
 	'nuke' => "Diverkañ a-vloc'h",
+	'action-nuke' => 'pajennoù nukleel',
 	'nuke-desc' => "Reiñ a ra an tu d'ar verourien da [[Special:Nuke|ziverkañ pajennoù a-vras]]",
 	'nuke-nopages' => "Pajenn nevez ebet bet krouet gant [[Special:Contributions/$1|$1]] er c'hemmoù diwezhañ.",
 	'nuke-list' => "Nevez zo eo bet krouet ar pajennoù da-heul gant [[Special:Contributions/$1|$1]];
@@ -277,6 +338,7 @@ Merkañ un tamm notenn ha klikañ war ar bouton d'o diverkañ.",
 	'nuke-list-multiple' => 'Krouet e oa bet ar pajennoù da-heul nevez zo ;
 Lakait un notenn ha klikit war ar bouton evit o diverkañ.',
 	'nuke-defaultreason' => 'Diverkañ a-vras ar pajennoù bet ouzhpennet gant $1',
+	'nuke-multiplepeople' => 'Diverkañ a-vras ar pajennoù nevez-ouzhpennet',
 	'nuke-tools' => "Talvezout a ra an ostilh-mañ da ziverkañ a-vras pajennoù bet ouzhpennet nevez zo gant un implijer enrollet pe gant ur chomlec'h IP. 
 Merkañ ar c'homlec'h IP pe anv an implijer evit kaout roll ar pajennoù da ziverkañ, pe lezel gwenn evit an holl implijerien.",
 	'nuke-submit-user' => 'Mont',
@@ -285,8 +347,12 @@ Merkañ ar c'homlec'h IP pe anv an implijer evit kaout roll ar pajennoù da zive
 	'nuke-select' => 'Diuzañ : $1',
 	'nuke-userorip' => "Anv implijer, chomlec'h IP pe gwenn :",
 	'nuke-maxpages' => 'Niver brasañ a bajennoù :',
-	'nuke-multiplepeople' => 'meur a implijer',
 	'nuke-editby' => 'Savet gant [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Diverket eo bet ar bajenn '''$1'''.",
+	'nuke-not-deleted' => "'''N'eus ket bet gallet''' diverkañ ar bajenn [[:$1]].",
+	'nuke-delete-more' => '[[Special:Nuke|Diverkañ pajennoù all]]',
+	'nuke-pattern' => 'Patrom evit anv ar bajenn :',
+	'nuke-nopages-global' => "N'eus pajenn nevez ebet er [[Special:RecentChanges|c'hemmoù diwezhañ]].",
 );
 
 /** Bosnian (Bosanski)
@@ -301,6 +367,7 @@ navedite razloge i komentare te kliknite na dugme da bi ste ih obrisali.',
 	'nuke-list-multiple' => 'Slijedeće stranice su nedavno napravljene;
 stavite ih u komentar i pritisnite dugme za njihovo brisanje.',
 	'nuke-defaultreason' => 'Masovno uklanjanje stranica koje je dodao $1',
+	'nuke-multiplepeople' => 'više korisnika',
 	'nuke-tools' => 'Ovaj alat omogućuje masovno brisanje stranica koje je nedavno dodao određeni korisnik ili IP adresa. 
 Unesite korisničko ime ili IP adresu za izlistavanje stranica koje se brišu ili ostavite prazno za prikaz svih korisnika.',
 	'nuke-submit-user' => 'Idi',
@@ -309,11 +376,11 @@ Unesite korisničko ime ili IP adresu za izlistavanje stranica koje se brišu il
 	'nuke-select' => 'Odaberi: $1',
 	'nuke-userorip' => 'Korisničko ime, IP adresa ili ostaviti prazno:',
 	'nuke-maxpages' => 'Najveći broj stranica:',
-	'nuke-multiplepeople' => 'više korisnika',
 	'nuke-editby' => 'Napravio [[Special:Contributions/$1|$1]]',
 );
 
 /** Catalan (Català)
+ * @author Aleator
  * @author Paucabot
  * @author SMP
  * @author Toniher
@@ -326,7 +393,7 @@ $messages['ca'] = array(
 feu un comentari i cliqueu el botó per a esborrar-les.',
 	'nuke-defaultreason' => 'Esborrat massiu de pàgines creades per $1',
 	'nuke-tools' => "Aquesta eina permet l'eliminació massiva de pàgines creades recentment per un usuari o IP.
-Introduïu el nom d'usuari o la IP per obtenir una llista de pàgines per esborrar.",
+Per obtenir la llista de pàgines per esborrar podeu introduir el nom d'un usuari o una IP.",
 	'nuke-submit-user' => 'Vés-hi',
 	'nuke-submit-delete' => 'Esborra la selecció',
 	'right-nuke' => 'Esborrar pàgines de forma massiva',
@@ -364,6 +431,7 @@ $messages['cs'] = array(
 	'nuke-list-multiple' => 'Nedávno byly vytvořeny následující stránky;
 zadáním komentáře a stisknutím tlačítka je smažete.',
 	'nuke-defaultreason' => 'Hromadné odstranění stránek, které vytvořil $1',
+	'nuke-multiplepeople' => 'více uživatelů',
 	'nuke-tools' => 'Tento nástroj umožňuje hromadné smazání stránek nedávno vytvořených zadaným uživatelem nebo IP adresou.
 Zadejte uživatelské jméno nebo IP adresu, zobrazí se seznam stránek ke smazání; případně ponechte prázdné pro všechny uživatele.',
 	'nuke-submit-user' => 'Provést',
@@ -372,32 +440,49 @@ Zadejte uživatelské jméno nebo IP adresu, zobrazí se seznam stránek ke smaz
 	'nuke-select' => 'Vybrat: $1',
 	'nuke-userorip' => 'Uživatelské jméno, IP adresa nebo ponechte prázdné:',
 	'nuke-maxpages' => 'Maximální počet stran:',
-	'nuke-multiplepeople' => 'více uživatelů',
-	'nuke-editby' => 'Vytvořili [[Special:Contributions/$1|$1]]',
+	'nuke-editby' => '{{gender:$1|Vytvořil|Vytvořila|Vytvořil}} [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Stránka '''$1''' byla smazána.",
+	'nuke-not-deleted' => "Stránka [[:$1]] '''nemohla být''' smazána.",
 );
 
 /** Danish (Dansk)
  * @author Byrial
+ * @author Peter Alberti
  */
 $messages['da'] = array(
 	'nuke' => 'Massesletning',
+	'action-nuke' => 'masseslette sider',
 	'nuke-desc' => 'Giver administratorer mulighed for at [[Special:Nuke|masseslette]] sider',
 	'nuke-nopages' => 'Der er ingen nye sider af [[Special:Contributions/$1|$1]] i seneste ændringer.',
 	'nuke-list' => 'Følgende sider er oprettet for nylig af [[Special:Contributions/$1|$1]]; skriv en kommentar og tryk på knappen for at slette dem.',
-	'nuke-defaultreason' => 'Massesletting af sider som er oprettet af $1',
-	'nuke-tools' => 'Dette værktøj muliggør massesletting af sider som for nylig er oprettet af en bestemt bruger eller IP.
-Skriv et brugernavn eller en IP for at få en liste over sider at slette.',
+	'nuke-list-multiple' => 'De følgende sider blev oprettet fornylig;
+skriv en kommentar ind og tryk på knappen for at slette dem.',
+	'nuke-defaultreason' => 'Massesletning af sider, som er oprettet af $1',
+	'nuke-multiplepeople' => 'flere brugere',
+	'nuke-tools' => 'Dette værktøj muliggør massesletning af sider, som for nylig er oprettet af en bestemt bruger eller IP-adresse.
+Skriv et brugernavn eller en IP-adresse for at få en liste over sider at slette eller lad stå tom for alle brugere.',
 	'nuke-submit-user' => 'Udfør',
 	'nuke-submit-delete' => 'Slet valgte',
 	'right-nuke' => 'masseslette sider',
+	'nuke-select' => 'Vælg: $1',
+	'nuke-userorip' => 'Brugernavn, IP-adresse eller tom:',
+	'nuke-maxpages' => 'Maksimalt antal sider:',
+	'nuke-editby' => 'Oprettet af [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Siden '''$1''' er blevet slettet.",
+	'nuke-not-deleted' => "Siden [[:$1]] '''kunne ikke''' slettes.",
+	'nuke-delete-more' => '[[Special:Nuke|Slet flere sider]]',
+	'nuke-pattern' => 'Mønster for sidenavnet:',
+	'nuke-nopages-global' => 'Der er ikke nogen nye sider i [[Special:RecentChanges|de seneste ændringer]].',
 );
 
 /** German (Deutsch)
  * @author Kghbln
  * @author Raimond Spekking
+ * @author SVG
  */
 $messages['de'] = array(
 	'nuke' => 'Massenlöschung von Seiten',
+	'action-nuke' => 'Seiten massenhaft zu löschen',
 	'nuke-desc' => 'Ergänzt eine [[Special:Nuke|Spezialseite]] zur Massenlöschung von Seiten',
 	'nuke-nopages' => 'Es gibt in den „Letzten Änderungen“ keine neuen Seiten von [[Special:Contributions/$1|$1]].',
 	'nuke-list' => 'Die folgenden Seiten wurden von [[Special:Contributions/$1|$1]] angelegt.
@@ -405,6 +490,7 @@ Gib einen Kommentar bezüglich der Löschung an und klicke auf die Schaltfläche
 	'nuke-list-multiple' => 'Die folgenden Seiten wurden vor kurzem erstellt.
 Gib einen Kommentar bezüglich der Löschung an und klicke auf die Schaltfläche, um die Seiten nun zu löschen.',
 	'nuke-defaultreason' => 'Massenlöschung der Seiten, die von „$1“ angelegt wurden',
+	'nuke-multiplepeople' => 'Massenlöschung kürzlich erstellter Seiten',
 	'nuke-tools' => 'Diese Arbeitshilfe ermöglicht die Massenlöschung von Seiten, die von einer IP-Adresse oder einem Benutzer angelegt wurden.
 Gib die IP-Adresse oder den Benutzernamen ein, um eine Liste der zu löschenden Seiten zu erhalten. Sofern Du keine Angabe machst, werden alle Benutzer ausgewählt.',
 	'nuke-submit-user' => 'Hole die Liste',
@@ -413,15 +499,18 @@ Gib die IP-Adresse oder den Benutzernamen ein, um eine Liste der zu löschenden
 	'nuke-select' => 'Auswählen: $1',
 	'nuke-userorip' => 'Benutzername, IP-Adresse oder keine Angabe:',
 	'nuke-maxpages' => 'Maximale Anzahl der Seiten:',
-	'nuke-multiplepeople' => 'mehrere Benutzer',
 	'nuke-editby' => 'Erstellt von [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => 'Seite „$1“ wurde gelöscht.',
 	'nuke-not-deleted' => "Seite [[:$1]] '''konnte nicht''' gelöscht werden.",
+	'nuke-delete-more' => '[[Special:Nuke|Weitere Seiten löschen]]',
+	'nuke-pattern' => 'Muster für den Seitennamen:',
+	'nuke-nopages-global' => 'Es gibt keine neuen Seiten unter den [[Special:RecentChanges|letzten Änderungen]].',
 );
 
 /** German (formal address) (‪Deutsch (Sie-Form)‬)
  * @author Kghbln
  * @author Raimond Spekking
+ * @author SVG
  */
 $messages['de-formal'] = array(
 	'nuke-list' => 'Die folgenden Seiten wurden von [[Special:Contributions/$1|$1]] angelegt.
@@ -460,6 +549,7 @@ zapódaj komentar a klikni na tłocašk, aby je lašował.',
 	'nuke-list-multiple' => 'Slědujuce boki su se rowno napórali;
 zapódaj komentar a klikni na tłocašk, aby je wulašował.',
 	'nuke-defaultreason' => 'Masowe lašowanje bokow, kótarež $1 jo pśidał.',
+	'nuke-multiplepeople' => 'někotare wužywarje',
 	'nuke-tools' => 'Toś ten rěd zmóžnja masowe lašowanja bokow, kótarež wěsty wužywaŕ abo IP jo rowno pśidał. Zapódaj wužywarske mě abo IP-adresu, aby dostał lisćinu bokow, kótarež maju se lašowaś abo wóstaj pólo prozne, aby wubrał wšych wužywarjow.',
 	'nuke-submit-user' => 'W pórěźe',
 	'nuke-submit-delete' => 'Wubrane wulašowaś',
@@ -467,8 +557,10 @@ zapódaj komentar a klikni na tłocašk, aby je wulašował.',
 	'nuke-select' => 'Wubraś: $1',
 	'nuke-userorip' => 'Wužywarske mě, IP-adresa abo žedno pódaśe:',
 	'nuke-maxpages' => 'Maksimalna licba bokow:',
-	'nuke-multiplepeople' => 'někotare wužywarje',
 	'nuke-editby' => 'Napórany wót [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Bok '''$1''' jo se wulašował.",
+	'nuke-not-deleted' => "Bok [[:$1]] '''njejo dał''' se wulašowaś.",
+	'nuke-delete-more' => '[[Special:Nuke|Dalšne boki lašowaś]]',
 );
 
 /** Ewe (Eʋegbe) */
@@ -487,23 +579,35 @@ $messages['el'] = array(
 	'nuke-list' => 'Οι ακόλουθες σελίδες δημιουργήθηκαν προσφατα από τον/την [[Special:Contributions/$1|$1]]·
 βάλτε ένα σχόλιο και πατήστε το κουμπί για να τις διαγράψετε.',
 	'nuke-defaultreason' => 'Μαζική αφαίρεση σελίδων προστιθέμενων από τον/την $1',
+	'nuke-multiplepeople' => 'πολλαπλοί χρήστες',
 	'nuke-tools' => 'Αυτό το εργαλείο επιτρέπει μαζικές διαγραφές σελίδων πρόσφατα προστιθέμενων από έναν δοσμέ-νο/νη χρήστ-η/ρια ή IP.<br />
 Εισάγετε το όνομα χρήστ-η/ριας ή την IP για να πάρετε έναν κατάλογο με σελίδες προς διαγραφή.',
 	'nuke-submit-user' => 'Πήγαινε',
 	'nuke-submit-delete' => 'Διαγραφή επιλεγμένων',
 	'right-nuke' => 'Μαζική διαγραφή σελίδων',
+	'nuke-select' => 'Επιλογή: $1',
+	'nuke-userorip' => 'Όνομα χρήστη, διεύθυνση IP ή κενό:',
+	'nuke-maxpages' => 'Μέγιστος αριθμός σελίδων:',
+	'nuke-editby' => 'Δημιουργήθηκε από [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Η σελίδα '''$1''' έχει διαγραφεί.",
+	'nuke-not-deleted' => "Η σελίδα [[:$1]] '''δεν μπορούσε''' να διαγραφεί.",
 );
 
 /** Esperanto (Esperanto)
+ * @author Blahma
  * @author Yekrats
  */
 $messages['eo'] = array(
 	'nuke' => 'Amasforigi',
+	'action-nuke' => 'amasforigi paĝojn',
 	'nuke-desc' => 'Rajtigas al administrantoj la kapablon [[Special:Nuke|amasforigi]] paĝojn',
 	'nuke-nopages' => 'Neniuj novaj paĝoj de [[Special:Contributions/$1|$1]] en lastaj ŝanĝoj.',
 	'nuke-list' => 'La jenaj paĝoj estis lastatempe kreitaj de [[Special:Contributions/$1|$1]];
 aldonu komenton kaj klaku la butonon forigi ilin.',
+	'nuke-list-multiple' => 'La jenaj paĝoj estis lastatempaj kreitaj;
+enmetu komenton kaj klaku la butonon por forigi ilin.',
 	'nuke-defaultreason' => 'Amasforigo de paĝoj aldonita de $1',
+	'nuke-multiplepeople' => 'Amasa forigo de laste aldonitaj paĝoj',
 	'nuke-tools' => 'Ĉi tiu ilo ebligas amasforigojn da paĝoj lastatempe aldonitaj de aparta uzanto aŭ IP-adreso.
 Enigu la salutnomon aŭ IP-adreson por akiri liston de paĝoj forigi, aŭ lasu ĝin malplena por ĉiuj uzantoj.',
 	'nuke-submit-user' => 'Ek!',
@@ -512,30 +616,48 @@ Enigu la salutnomon aŭ IP-adreson por akiri liston de paĝoj forigi, aŭ lasu �
 	'nuke-select' => 'Elektu: $1',
 	'nuke-userorip' => 'Salutnomo, IP-adreso, aŭ nenio:',
 	'nuke-maxpages' => 'Maksimuma nombro de paĝoj:',
-	'nuke-multiplepeople' => 'multaj uzantoj',
 	'nuke-editby' => 'Kreita de [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Paĝo '''$1''' estis forigita.",
+	'nuke-not-deleted' => "Paĝo [[:$1]] '''ne eblis''' esti forigita.",
+	'nuke-delete-more' => '[[Special:Nuke|Forigu plurajn paĝojn]]',
+	'nuke-pattern' => 'Modelo por la paĝonomo:',
 );
 
 /** Spanish (Español)
  * @author Aleator
  * @author Crazymadlover
+ * @author DJ Nietzsche
  * @author Dferg
+ * @author Imre
  * @author Jatrobat
+ * @author Platonides
  * @author Remember the dot
  * @author Sanbec
  */
 $messages['es'] = array(
 	'nuke' => 'Borrado en masa',
+	'action-nuke' => 'Destruir páginas',
 	'nuke-desc' => 'Da a los administradores la posibilidad de [[Special:Nuke|borrar páginas de forma masiva]]',
 	'nuke-nopages' => 'No hay páginas nuevas de [[Special:Contributions/$1|$1]] en los cambios recientes.',
 	'nuke-list' => '[[Special:Contributions/$1|$1]] creó recientemente las siguientes páginas;
 escriba un comentario y haga clic en el botón para borrarlas.',
+	'nuke-list-multiple' => 'Las siguientes páginas han sido creadas recientemente; introduce un comentario y pulsa el botón para eliminarlas.',
 	'nuke-defaultreason' => 'Eliminación en masa de páginas añadidas por $1',
+	'nuke-multiplepeople' => 'Eliminación masiva de páginas nuevas de múltiples usuarios',
 	'nuke-tools' => 'Esta herramienta permite borrados masivos de páginas creadas recientemente por un usuario o una dirección IP.
 Introduzca el nombre de usuario o la dirección IP para obtener la lista de páginas a borrar, o déjelo en blanco para todos los usuarios.',
 	'nuke-submit-user' => 'Ir',
 	'nuke-submit-delete' => 'Borrar lo seleccionado',
 	'right-nuke' => 'Borrar páginas masivamente',
+	'nuke-select' => 'Seleccionar: $1',
+	'nuke-userorip' => 'Nombre de usuario, dirección IP o en blanco:',
+	'nuke-maxpages' => 'Número máximo de páginas:',
+	'nuke-editby' => 'Creado por [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "La página '''$1''' ha sido borrada.",
+	'nuke-not-deleted' => "La página [[:$1]] '''no se ha podido''' borrar.",
+	'nuke-delete-more' => '[[Special:Nuke|Borrar más páginas]]',
+	'nuke-pattern' => 'Patrón del título de la página:',
+	'nuke-nopages-global' => 'No hay nuevas páginas en los [[Special:RecentChanges|cambios recientes]].',
 );
 
 /** Estonian (Eesti)
@@ -543,15 +665,27 @@ Introduzca el nombre de usuario o la dirección IP para obtener la lista de pág
  */
 $messages['et'] = array(
 	'nuke' => 'Lauskustutamine',
-	'nuke-desc' => 'Võimaldab ülematel lehekülgede [[Special:Nuke|lauskustutamist]].',
+	'action-nuke' => 'lehekülgi lauskustutada',
+	'nuke-desc' => 'Võimaldab administraatoritel lehekülgede [[Special:Nuke|lauskustutamist]].',
 	'nuke-nopages' => 'Viimaste muudatuste all pole uusi kasutaja [[Special:Contributions/$1|$1]] loodud lehekülgi.',
 	'nuke-list' => 'Kasutaja [[Special:Contributions/$1|$1]] on hiljuti loonud järgnevad leheküljed. Enne kustutamist sisesta kommentaar.',
+	'nuke-list-multiple' => 'Järgmised leheküljed on hiljuti loodud.
+Sisesta kommentaar ja klõpsa kustutamisnuppu.',
 	'nuke-defaultreason' => 'Kasutaja $1 lisatud lehekülgede lauseemaldamine',
-	'nuke-tools' => 'See tööriist võimaldab ülesantud kasutaja või IP-aadressi lisatud leheküljed lauskustutada.
-Kustutatavate lehekülgede nimekirja näitamiseks sisesta kasutajanimi või IP-aadress.',
+	'nuke-multiplepeople' => 'Hiljuti lisatud lehekülgede lauskustutamine',
+	'nuke-tools' => 'See tööriist võimaldab kasutaja või IP-aadressi hiljuti lisatud leheküljed lauskustutada.
+Kustutatavate lehekülgede nimekirja näitamiseks sisesta kasutajanimi või IP-aadress. Kõigi kasutajate lisatud lehekülgede jaoks jäta väli tühjaks.',
 	'nuke-submit-user' => 'Mine',
 	'nuke-submit-delete' => 'Kustuta väljavalitud',
 	'right-nuke' => 'Lehekülgi lauskustutada',
+	'nuke-select' => 'Valik: $1',
+	'nuke-userorip' => 'Kasutajanimi, IP-aadress või tühemik:',
+	'nuke-maxpages' => 'Lehekülgede ülemmäär:',
+	'nuke-editby' => 'Alustanud [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Lehekülg '''$1''' on kustutatud.",
+	'nuke-not-deleted' => "Lehekülge [[:$1]] '''ei saa''' kustutada.",
+	'nuke-delete-more' => '[[Special:Nuke|Kustuta veel lehekülgi]]',
+	'nuke-nopages-global' => '[[Special:RecentChanges|Viimaste muudatuste]] all pole uusi lehekülgi.',
 );
 
 /** Basque (Euskara)
@@ -569,55 +703,90 @@ $messages['eu'] = array(
 
 /** Persian (فارسی)
  * @author Huji
+ * @author Mjbmr
+ * @author Reza1615
+ * @author ZxxZxxZ
  */
 $messages['fa'] = array(
 	'nuke' => 'حذف دسته‌جمعی',
 	'nuke-desc' => 'به مدیران امکان [[Special:Nuke|حذف دسته‌جمعی]] صفحه‌ها را می‌دهد',
-	'nuke-nopages' => 'صفحه‌ٔ جدیدی از [[Special:Contributions/$1|$1]] در تغییرات اخیر وجود ندارد.',
+	'nuke-nopages' => 'صفحهٔ جدیدی از [[Special:Contributions/$1|$1]] در تغییرات اخیر وجود ندارد.',
 	'nuke-list' => 'صفحه‌های زیر به تازگی توسط [[Special:Contributions/$1|$1]] ایجاد شده‌اند؛ توضیحی ارائه کنید و دکمه را بزنید تا این صحفه‌ها حذف شوند.',
+	'nuke-list-multiple' => 'صفحه‌های مقابل اخیراً ایجاد شده‌اند؛
+یک توضیح قرار دهید و برای حذف کلید را فشار دهید.',
 	'nuke-defaultreason' => 'حذف دسته‌جمعی صفحه‌هایی که توسط $1 ایجاد شده‌اند',
+	'nuke-multiplepeople' => 'حذف توده‌ای صفحه‌های به‌تازگی افزوده‌شده',
 	'nuke-tools' => 'این ابزار امکان حذف دسته‌جمعی صفحه‌هایی که به تازگی توسط یک کاربر یا نشانی آی‌پی اضافه شده‌اند را فراهم می‌کند.
 نام کاربری یا نشانی آی‌پی موردنظر را وارد کنید، یا جعبه را خالی بگذارید تا تمام کاربرها در نظر گرفته شوند.',
 	'nuke-submit-user' => 'برو',
 	'nuke-submit-delete' => 'حذف موارد انتخاب شده',
 	'right-nuke' => 'حذف دسته‌جمعی صفحه‌ها',
+	'nuke-select' => 'انتخاب: $1',
+	'nuke-userorip' => 'نام کاربری، نشانی آی‌پی یا خالی:',
+	'nuke-maxpages' => 'حداکثر تعداد صفحه‌ها:',
+	'nuke-editby' => 'ایجاد شده توسط [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "صفحهٔ '''$1''' حذف شده است.",
+	'nuke-not-deleted' => "صفحهٔ [[:$1]] را '''نمی‌توان''' حذف کرد.",
+	'nuke-delete-more' => '[[Special:Nuke|حذف صفحه‌های بیشتر]]',
+	'nuke-pattern' => 'الگو برای نام صفحه:',
+	'nuke-nopages-global' => 'هیچ صفحهٔ جدیدی در [[Special:RecentChanges|فهرست تغییرات اخیر]] نیست.',
 );
 
 /** Finnish (Suomi)
  * @author Crt
  * @author Jaakonam
+ * @author Nike
+ * @author Olli
  */
 $messages['fi'] = array(
 	'nuke' => 'Massapoisto',
+	'action-nuke' => 'massapoistaa sivuja',
 	'nuke-desc' => 'Mahdollistaa ylläpitäjille sivujen [[Special:Nuke|massapoistamisen]].',
 	'nuke-nopages' => 'Ei käyttäjän [[Special:Contributions/$1|$1]] lisäämiä uusia sivuja tuoreissa muutoksissa.',
-	'nuke-list' => 'Käyttäjä [[Special:Contributions/$1|$1]] on äskettäin luonut seuraavat sivut.',
+	'nuke-list' => 'Käyttäjä [[Special:Contributions/$1|$1]] on äskettäin luonut seuraavat sivut.
+Lisää kommentti ja poista napsauttamalla painiketta.',
+	'nuke-list-multiple' => 'Seuraavat sivut tehtiin äskettäin.
+Lisää kommentti ja poista napsauttamalla painiketta.',
 	'nuke-defaultreason' => 'Käyttäjän $1 lisäämien sivujen massapoistaminen',
+	'nuke-multiplepeople' => 'Äskettäin lisättyjen sivujen massapoistaminen',
 	'nuke-tools' => 'Tämä työkalu mahdollistaa äskettäin lisättyjen sivujen massapoistamisen käyttäjänimen tai IP-osoitteen perusteella.
-Kirjoita käyttäjänimi tai IP-osoite, niin saat listan poistettavista sivuista.',
+Kirjoita käyttäjänimi tai IP-osoite, niin saat listan poistettavista sivuista, tai jätä kenttä tyhjäksi niin saat kaikkien käyttäjien tekemät sivut.',
 	'nuke-submit-user' => 'Siirry',
 	'nuke-submit-delete' => 'Poista valitut',
 	'right-nuke' => 'Massapoistaa sivuja',
 	'nuke-select' => 'Valitse: $1',
+	'nuke-userorip' => 'Käyttäjänimi tai IP-osoite (voi jättää myös tyhjäksi):',
+	'nuke-maxpages' => 'Sivujen enimmäismäärä:',
+	'nuke-editby' => 'Tehnyt [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Sivu '''$1''' on poistettu.",
+	'nuke-not-deleted' => "Sivua [[:$1]] '''ei voitu''' poistaa.",
+	'nuke-delete-more' => '[[Special:Nuke|Poista lisää sivuja]]',
+	'nuke-pattern' => 'Sivun nimien etuliite',
+	'nuke-nopages-global' => '[[Special:RecentChanges|Tuoreissa muutoksissa]] ei ole uusia sivuja.',
 );
 
 /** French (Français)
+ * @author Crochet.david
+ * @author Gomoko
  * @author Grondin
  * @author IAlex
  * @author Jean-Frédéric
  * @author Louperivois
  * @author Peter17
+ * @author Seb35
  * @author Sherbrooke
  * @author Zetud
  */
 $messages['fr'] = array(
 	'nuke' => 'Suppression en masse',
+	'action-nuke' => 'pages nucléaires',
 	'nuke-desc' => 'Donne la possibilité aux administrateurs de [[Special:Nuke|supprimer en masse]] des pages',
 	'nuke-nopages' => 'Aucune nouvelle page créée par [[Special:Contributions/$1|$1]] dans la liste des changements récents.',
 	'nuke-list' => 'Les pages suivantes ont été créées récemment par [[Special:Contributions/$1|$1]]; Indiquer un commentaire et cliquer sur le bouton pour les supprimer.',
 	'nuke-list-multiple' => 'Les pages suivantes ont été récemment créées ; 
 entrez un commentaire et cliquez sur le bouton pour les supprimer.',
 	'nuke-defaultreason' => 'Suppression en masse des pages ajoutées par $1',
+	'nuke-multiplepeople' => 'Suppression de masse de pages récemment ajoutées',
 	'nuke-tools' => 'Cet outil permet les suppressions en masse des pages ajoutées récemment par un utilisateur enregistré ou par une adresse IP. Indiquer l’adresse IP afin d’obtenir la liste des pages à supprimer, ou laisser blanc pour tous les utilisateurs.',
 	'nuke-submit-user' => 'Valider',
 	'nuke-submit-delete' => 'Supprimer la sélection',
@@ -625,8 +794,12 @@ entrez un commentaire et cliquez sur le bouton pour les supprimer.',
 	'nuke-select' => 'Sélectionnez : $1',
 	'nuke-userorip' => "Nom d'utilisateur, adresse IP ou vide :",
 	'nuke-maxpages' => 'Nombre maximal de pages :',
-	'nuke-multiplepeople' => 'plusieurs utilisateurs',
 	'nuke-editby' => 'Créé par [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "La page '''$1''' a été effacée.",
+	'nuke-not-deleted' => "La page [[:$1]] '''ne peut pas''' être effacée.",
+	'nuke-delete-more' => '[[Special:Nuke|Supprimer plus de pages]]',
+	'nuke-pattern' => 'Modèle pour le nom de page:',
+	'nuke-nopages-global' => "Il n'y a pas de nouvelle page dans [[Special:RecentChanges|changements récents]].",
 );
 
 /** Franco-Provençal (Arpetan)
@@ -634,20 +807,29 @@ entrez un commentaire et cliquez sur le bouton pour les supprimer.',
  */
 $messages['frp'] = array(
 	'nuke' => 'Suprèssion en massa',
+	'action-nuke' => 'suprimar des pâges en massa',
 	'nuke-desc' => 'Balye la possibilitât ux administrators de [[Special:Nuke|suprimar en massa]] des pâges.',
 	'nuke-nopages' => 'Gins de pâge novèla fêta per [[Special:Contributions/$1|$1]] dens la lista des dèrriérs changements.',
 	'nuke-list' => 'Cetes pâges ont étâ fêtes dèrriérement per [[Special:Contributions/$1|$1]] ;
 buchiéd un comentèro et pués clicâd sur lo boton por les suprimar.',
+	'nuke-list-multiple' => 'Cetes pâges ont étâ fêtes dèrriérement ;
+buchiéd un comentèro et pués clicâd sur lo boton por les suprimar.',
 	'nuke-defaultreason' => 'Suprèssion en massa de les pâges apondues per $1',
-	'nuke-tools' => 'Ceti outil pèrmèt les suprèssions en massa de les pâges apondues dèrriérement per un utilisator encartâ ou ben per una adrèce IP.
-Buchiér lo nom d’utilisator ou ben l’adrèce IP por avêr la lista de les pâges a suprimar, ou ben lèssiér blanc por tôs los utilisators.',
+	'nuke-multiplepeople' => 'Suprèssions en massa de les pâges apondues dèrriérement',
+	'nuke-tools' => 'Ceti outil pèrmèt les suprèssions en massa de les pâges apondues dèrriérement per un usanciér encartâ ou ben per una adrèce IP.
+Buchiér lo nom d’usanciér ou ben l’adrèce IP por avêr la lista de les pâges a suprimar, ou ben lèssiér blanc por tôs los usanciérs.',
 	'nuke-submit-user' => 'Validar',
 	'nuke-submit-delete' => 'Suprimar lo chouèx',
 	'right-nuke' => 'Suprimar des pâges en massa',
 	'nuke-select' => 'Chouèsésséd : $1',
-	'nuke-userorip' => 'Nom d’utilisator, adrèce IP ou ben vouedo :',
-	'nuke-multiplepeople' => 'un mouél d’utilisators',
+	'nuke-userorip' => 'Nom d’usanciér, adrèce IP ou ben vouedo :',
+	'nuke-maxpages' => 'Nombro lo ples grant de pâges :',
 	'nuke-editby' => 'Fêt per [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "La pâge '''$1''' at étâ suprimâ.",
+	'nuke-not-deleted' => "La pâge [[:$1]] '''pôt pas''' étre suprimâ.",
+	'nuke-delete-more' => '[[Special:Nuke|Suprimar més de pâges]]',
+	'nuke-pattern' => 'Modèlo por lo nom de pâge :',
+	'nuke-nopages-global' => 'Y at gins de pâge novèla dedens los [[Special:RecentChanges|dèrriérs changements]].',
 );
 
 /** Friulian (Furlan)
@@ -664,6 +846,7 @@ $messages['fur'] = array(
  */
 $messages['gl'] = array(
 	'nuke' => 'Eliminar en masa',
+	'action-nuke' => 'borrar páxinas en masa',
 	'nuke-desc' => 'Dá aos administradores a posibilidade de [[Special:Nuke|borrar páxinas]] masivamente',
 	'nuke-nopages' => 'Non hai novas páxinas feitas por [[Special:Contributions/$1|$1]] nos cambios recentes.',
 	'nuke-list' => '[[Special:Contributions/$1|$1]] creou nos últimos intres as seguintes páxinas;
@@ -671,16 +854,21 @@ escriba un comentario e prema o botón para borralas.',
 	'nuke-list-multiple' => 'As seguintes páxinas creáronse recentemente;
 insira un comentario e prema o botón para borralas.',
 	'nuke-defaultreason' => 'Eliminación en masa das páxinas engadidas por $1',
+	'nuke-multiplepeople' => 'Eliminación en masa de páxinas recentes',
 	'nuke-tools' => 'Esta ferramenta permite borrar en masa as páxinas engadidas recentemente por un determinado usuario ou enderezo IP.
 Introduza o nome do usuario ou enderezo IP para obter unha lista das páxinas para borrar. Déixeo en branco para todos os usuarios.',
 	'nuke-submit-user' => 'Adiante',
-	'nuke-submit-delete' => 'Eliminar o seleccionado',
+	'nuke-submit-delete' => 'Eliminar a selección',
 	'right-nuke' => 'Borrar páxinas masivamente',
 	'nuke-select' => 'Seleccionar: $1',
 	'nuke-userorip' => 'Nome de usuario, enderezo IP ou en branco:',
 	'nuke-maxpages' => 'Número máximo de páxinas:',
-	'nuke-multiplepeople' => 'varios usuarios',
 	'nuke-editby' => 'Creado por [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "A páxina \"'''\$1'''\" foi borrada.",
+	'nuke-not-deleted' => "A páxina \"[[:\$1]]\" '''non''' se pode borrar.",
+	'nuke-delete-more' => '[[Special:Nuke|Borrar máis páxinas]]',
+	'nuke-pattern' => 'Patrón para o nome de páxina:',
+	'nuke-nopages-global' => 'Non hai páxinas novas nos [[Special:RecentChanges|cambios recentes]].',
 );
 
 /** Ancient Greek (Ἀρχαία ἑλληνικὴ)
@@ -701,6 +889,7 @@ $messages['grc'] = array(
 );
 
 /** Swiss German (Alemannisch)
+ * @author Als-Chlämens
  * @author Als-Holder
  */
 $messages['gsw'] = array(
@@ -712,6 +901,7 @@ gib e Kommentar yy un druck uf dr Leschchnopf.',
 	'nuke-list-multiple' => 'Die Syte sin vor churzem aagleit wore.
 Schryb e Kommentar un druck uf dr Chnopf go si lesche.',
 	'nuke-defaultreason' => 'Masseleschig vu Syte, wu vu „$1“ aagleit wore sin',
+	'nuke-multiplepeople' => 'mehreri Benutzer',
 	'nuke-tools' => 'Des Wärchzyyg git d Megligkeit fir e Masseleschig vu Syte, wu vun ere IP-Adräss oder vun eme Benutzer aagleit wore sin. Gib d IP-Adräss/dr Benutzername yy fir ne Lischt z iberchu. Wänn du kei Aagab machsch, wäre alli Benutzer uusgwehlt.',
 	'nuke-submit-user' => 'Hol Lischt',
 	'nuke-submit-delete' => 'Lesche',
@@ -719,8 +909,10 @@ Schryb e Kommentar un druck uf dr Chnopf go si lesche.',
 	'nuke-select' => 'Uuswehle: $1',
 	'nuke-userorip' => 'Benutzername, IP-Adräss oder kei Aagab:',
 	'nuke-maxpages' => 'Maximali Sytezahl:',
-	'nuke-multiplepeople' => 'mehreri Benutzer',
 	'nuke-editby' => 'Aagleit vu [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => 'Syte „$1“ isch glescht wore.',
+	'nuke-not-deleted' => "Syte [[:$1]] '''het nit chönne''' glöscht werde.",
+	'nuke-delete-more' => '[[Special:Nuke|Wyteri Syte lösche]]',
 );
 
 /** Manx (Gaelg)
@@ -737,6 +929,7 @@ $messages['gv'] = array(
  */
 $messages['he'] = array(
 	'nuke' => 'מחיקה מרובה',
+	'action-nuke' => 'למחוק דפים מרובים',
 	'nuke-desc' => 'אפשרות למפעילי המערכת לבצע [[Special:Nuke|מחיקה מרובה]] של דפים',
 	'nuke-nopages' => 'אין דפים חדשים שנוצרו על ידי [[Special:Contributions/$1|$1]] in בשינויים האחרונים.',
 	'nuke-list' => 'הדפים הבאים נוצרו לאחרונה על ידי [[Special:Contributions/$1|$1]];
@@ -744,6 +937,7 @@ $messages['he'] = array(
 	'nuke-list-multiple' => 'הדפים הבאים נוצרו לאחרונה;
 אנא כתבו נימוק למחיקה ולחצו על הכפתור כדי למחוק אותם.',
 	'nuke-defaultreason' => 'הסרה מרובה של דפים שנוספו על ידי $1',
+	'nuke-multiplepeople' => 'משתמשים מרובים',
 	'nuke-tools' => 'כלי זה מאפשר מחיקות המוניות של דפים שנוספו לאחרונה על ידי משתמש או כתובת IP מסוימים.
 כתבו את שם המשתמש או כתובת ה־IP כדי לקבל את רשימת הדפים למחיקה או השאירו את השדה הזה ריק עבור כל המשתמשים.',
 	'nuke-submit-user' => 'הצגה',
@@ -752,13 +946,16 @@ $messages['he'] = array(
 	'nuke-select' => 'בחירה: $1',
 	'nuke-userorip' => 'שם משתמש, כתובת IP או ריק:',
 	'nuke-maxpages' => 'מספר מרבי של דפים:',
-	'nuke-multiplepeople' => 'משתמשים מרובים',
 	'nuke-editby' => 'נוצר על ידי [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "הדף '''$1''' נמחק.",
 	'nuke-not-deleted' => "'''לא ניתן''' למחוק את הדף [[:$1]].",
+	'nuke-delete-more' => '[[Special:Nuke|למחוק עוד דפים]]',
+	'nuke-pattern' => 'תבנית עבור שם הדף:',
+	'nuke-nopages-global' => 'אין דפים חדשים ב[[Special:RecentChanges|שינויים אחרונים]].',
 );
 
 /** Hindi (हिन्दी)
+ * @author Ansumang
  * @author Kaustubh
  * @author Shyam
  */
@@ -773,6 +970,10 @@ $messages['hi'] = array(
 	'nuke-submit-user' => 'जायें',
 	'nuke-submit-delete' => 'चुने हुए हटायें',
 	'right-nuke' => 'बहुतसे पन्ने एकसाथ हटायें',
+	'nuke-select' => 'चयन करें: $1',
+	'nuke-userorip' => 'सदस्यनाम, आईपी पते या खाली:',
+	'nuke-maxpages' => 'अधिकतम पृष्ठ संख्या:',
+	'nuke-deleted' => "पृष्ठ '''$1''' को हटा दिया गया हैं।",
 );
 
 /** Hiligaynon (Ilonggo)
@@ -805,12 +1006,14 @@ $messages['hr'] = array(
  */
 $messages['hsb'] = array(
 	'nuke' => 'Masowe wušmórnjenje',
+	'action-nuke' => 'Strony zhašeć',
 	'nuke-desc' => 'Zmóžnja administratoram [[Special:Nuke|masowe wušmórnjenje]] stronow',
 	'nuke-nopages' => 'W poslednich změnach njejsu nowe strony z [[Special:Contributions/$1|$1]].',
 	'nuke-list' => 'Slědowace strony buchu runje přez [[Special:Contributions/$1|$1]] wutworjene; zapodaj komentar a klikń na tłóčatko wušmórnjenja.',
 	'nuke-list-multiple' => 'Slědowace strony su so runje wutowrili;
 napisaj komentar a klikń na tłóčatko, zo by je wušmórnył.',
 	'nuke-defaultreason' => 'Masowe wušmórnjenje stronow, kotrež buchu wot $1 wutworjene',
+	'nuke-multiplepeople' => 'Masowe zhašenje njedawno přidatych stronow',
 	'nuke-tools' => 'Tutón grat zmóžnja masowe wušmórnjenje stronow, kotrež buchu wot IP-adresy abo wužiwarja přidate. Zapodaj IP-adresu abo wužiwarske mjeno, zo by lisćinu stronow dóstał, kotrež maja so wušmórnyć.',
 	'nuke-submit-user' => 'W porjadku',
 	'nuke-submit-delete' => 'Wušmórnyć',
@@ -818,14 +1021,20 @@ napisaj komentar a klikń na tłóčatko, zo by je wušmórnył.',
 	'nuke-select' => 'Wubrać: $1',
 	'nuke-userorip' => 'Wužiwar, IP abo prózdny:',
 	'nuke-maxpages' => 'Maksimalna ličba stronow:',
-	'nuke-multiplepeople' => 'wjacori ludźo',
 	'nuke-editby' => 'Wutworjeny wot [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Strona '''„$1“''' bu wušmórnjena.",
+	'nuke-not-deleted' => "Strona [[:$1]]  '''njeda so''' wušmórnyć.",
+	'nuke-delete-more' => '[[Special:Nuke|Dalše strony wušmórnyć]]',
+	'nuke-pattern' => 'Přikład za mjeno strony:',
+	'nuke-nopages-global' => 'Njejsu žane nowe strony w [[Special:RecentChanges|aktualnych změnach]].',
 );
 
 /** Hungarian (Magyar)
  * @author Dani
+ * @author Dj
  * @author Dorgan
  * @author KossuthRad
+ * @author Misibacsi
  */
 $messages['hu'] = array(
 	'nuke' => 'Halmozott törlés',
@@ -833,10 +1042,16 @@ $messages['hu'] = array(
 	'nuke-nopages' => 'Nincsenek új oldalak [[Special:Contributions/$1|$1]] az aktuális események között.',
 	'nuke-list' => 'Az alábbi lapokat nem rég készítette [[Special:Contributions/$1|$1]]; adj meg egy indoklást, és kattints a gombra a törlésükhöz.',
 	'nuke-defaultreason' => '$1 által készített lapok tömeges eltávolítása',
-	'nuke-tools' => 'Ez az eszköz lehetővé teszi egy adott felhasználó vagy IP által nem rég készített lapok tömeges törlését. Add meg a felhasználónevet vagy az IP-címet, hogy lekérd a törlendő lapok listáját:',
+	'nuke-tools' => 'Ez az eszköz lehetővé teszi egy adott felhasználó vagy IP által nemrég készített lapok tömeges törlését. Add meg a felhasználónevet vagy az IP-címet, ezzel megkapod a törölhető lapok listáját. Ha nem adsz meg nevet, az összes felhasználót listázza.',
 	'nuke-submit-user' => 'Menj',
 	'nuke-submit-delete' => 'Kijelöltek törlése',
 	'right-nuke' => 'oldalak tömeges törlése',
+	'nuke-select' => 'Kiválasztás: $1',
+	'nuke-userorip' => 'Felhasználónév, IP-cím vagy üres:',
+	'nuke-maxpages' => 'Lapok maximális száma:',
+	'nuke-deleted' => "'''$1''' oldal törölve lett.",
+	'nuke-not-deleted' => "[[:$1]] oldalt ''nem sikerült''' törölni.",
+	'nuke-delete-more' => '[[Special:Nuke|További oldalak törlése]]',
 );
 
 /** Interlingua (Interlingua)
@@ -844,6 +1059,7 @@ $messages['hu'] = array(
  */
 $messages['ia'] = array(
 	'nuke' => 'Deletion in massa',
+	'action-nuke' => 'deler paginas in massa',
 	'nuke-desc' => 'Da le possibilitate al administratores de [[Special:Nuke|deler paginas in massa]]',
 	'nuke-nopages' => 'Nulle nove paginas per [[Special:Contributions/$1|$1]] trovate in le modificationes recente.',
 	'nuke-list' => 'Le sequente paginas esseva recentemente create per [[Special:Contributions/$1|$1]];
@@ -851,18 +1067,21 @@ entra un commento e clicca le button pro deler los.',
 	'nuke-list-multiple' => 'Le sequente paginas esseva create recentemente;
 entra un commento e pulsa sur le button pro deler los.',
 	'nuke-defaultreason' => 'Deletion in massa de paginas addite per $1',
+	'nuke-multiplepeople' => 'Deletion in massa de paginas addite recentemente',
 	'nuke-tools' => 'Iste instrumento permitte le deletion in massa de paginas recentemente addite per un usator o adresse IP specific.
 Entra le nomine de usator o adresse IP pro obtener un lista de paginas a deler, o lassa vacue pro tote le usatores.',
-	'nuke-submit-user' => 'Ir',
+	'nuke-submit-user' => 'Va',
 	'nuke-submit-delete' => 'Deler selection',
 	'right-nuke' => 'Deler paginas in massa',
 	'nuke-select' => 'Seliger: $1',
 	'nuke-userorip' => 'Nomine de usator, adresse IP o vacue:',
 	'nuke-maxpages' => 'Numero maxime de paginas:',
-	'nuke-multiplepeople' => 'multiple usatores',
 	'nuke-editby' => 'Create per [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Le pagina '''$1''' ha essite delite.",
 	'nuke-not-deleted' => "Le pagina [[:$1]] '''non poteva''' esser delite.",
+	'nuke-delete-more' => '[[Special:Nuke|Deler plus paginas]]',
+	'nuke-pattern' => 'Patrono pro le nomine de pagina:',
+	'nuke-nopages-global' => 'Il non ha nove paginas in le [[Special:RecentChanges|modificationes recente]].',
 );
 
 /** Indonesian (Bahasa Indonesia)
@@ -878,6 +1097,7 @@ $messages['id'] = array(
 	'nuke-list-multiple' => 'Halaman berikut baru dibuat; 
 masukkan suatu komentar dan tekan tombol untuk menghapus.',
 	'nuke-defaultreason' => 'Penghapusan massal halaman-halaman yang dibuat oleh $1',
+	'nuke-multiplepeople' => 'beberapa pengguna',
 	'nuke-tools' => 'Alat ini memungkinkan penghapusan massal halaman-halaman yang baru saja dibuat oleh seorang pengguna atau IP.
 Masukkan nama pengguna atau IP untuk mendapat daftar halaman yang dapat dihapus atau kosongkan untuk daftar halaman dari semua pengguna.',
 	'nuke-submit-user' => 'Tuju ke',
@@ -886,7 +1106,6 @@ Masukkan nama pengguna atau IP untuk mendapat daftar halaman yang dapat dihapus
 	'nuke-select' => 'Pilih: $1',
 	'nuke-userorip' => 'Nama pengguna, alamat IP, atau kosong:',
 	'nuke-maxpages' => 'Jumlah maksimum halaman:',
-	'nuke-multiplepeople' => 'beberapa pengguna',
 	'nuke-editby' => 'Dibuat oleh [[Special:Contributions/$1|$1]]',
 );
 
@@ -897,6 +1116,36 @@ $messages['ig'] = array(
 	'nuke-submit-user' => 'Gá',
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'nuke' => 'Paga-adduan nga pinag-ikkat',
+	'action-nuke' => 'ikkaten dagiti panid',
+	'nuke-desc' => 'Ikkan na ti administrador ti abilidad nga [[Special:Nuke|	paga-adduan nga pang-ikkat]] kadagit panid',
+	'nuke-nopages' => 'Awan dagiti baro nga panid [[Special:Contributions/$1|$1]] idiay kaudian nga balbaliw.',
+	'nuke-list' => 'Dagita sumaganad nga panid ket kaararamid ni [[Special:Contributions/$1|$1]];
+ikkam ti komento ken ikklik ti buton tapno maikkat dan.',
+	'nuke-list-multiple' => 'Dagiti sumaganad nga panid kaararamid;
+ikkam ti komento ken ikklik ti buton tapno maikkat dan.',
+	'nuke-defaultreason' => 'Dagiti paga-adduan nga pinag-ikkat ti panid ket inikkan ni $1',
+	'nuke-multiplepeople' => 'adu nga agusar',
+	'nuke-tools' => 'Daytoy nga ramit ket mangpabalin ti paga-adduan ti pinag-ikkat ti panid nga kinaikkan ti maysa nga agaramat wenno maysa nga IP address.
+Ikabil ti nagan ti agar-aramat wenno IP address tapno maalam dagiti listaan dagiti naikkat nga panid, wenno ibatim nga blanko kadagit amin nga agar-aramat.',
+	'nuke-submit-user' => 'Inkan',
+	'nuke-submit-delete' => 'Ikkatem dagita napili',
+	'right-nuke' => 'Ikkatem amin dagiti panid',
+	'nuke-select' => 'Agpili: $1',
+	'nuke-userorip' => 'Nagan ti agar-aramat, IP address wenno blanko:',
+	'nuke-maxpages' => 'Ti manu nga bilang dagiti panid:',
+	'nuke-editby' => 'Inaramid ni [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Ti panid '''$1''' ket naikkaten.",
+	'nuke-not-deleted' => "Ti panid [[:$1]] '''saan nga''' maikkat.",
+	'nuke-delete-more' => '[[Special:Nuke|Agikkat ka pay kadagita nga panid]]',
+	'nuke-pattern' => 'Manipud a kita iti nagan ti panid:',
+	'nuke-nopages-global' => 'Awan dagiti baro a panid idiay [[Special:RecentChanges|kinaudian a pinagbaliw]].',
+);
+
 /** Ido (Ido)
  * @author Malafaya
  */
@@ -907,10 +1156,33 @@ $messages['io'] = array(
 
 /** Icelandic (Íslenska)
  * @author S.Örvarr.S
+ * @author Snævar
  */
 $messages['is'] = array(
 	'nuke' => 'Fjöldaeyða',
+	'action-nuke' => 'fjöldaeyða síðum',
+	'nuke-desc' => 'Gefur möppudýrum kleyft að [[Special:Nuke|fjöldaeyða]] síðum.',
+	'nuke-nopages' => 'Engar nýjar síður eftir [[Special:Contributions/$1|$1]] í nýlegum breytingum.',
+	'nuke-list' => 'Eftirfarandi síður voru nýverið búnar til af [[Special:Contributions/$1|$1]];
+tilgreindu athugasemd og ýttu á takkann til að eyða þeim.',
+	'nuke-list-multiple' => 'Eftirfarandi síður voru nýlega búnar til;
+tilgreindu athugasemd og ýttu á takkann til að eyða þeim.',
+	'nuke-defaultreason' => 'Fjöldaeyðing síðna sem búnar voru til af $1',
+	'nuke-multiplepeople' => 'margir notendur',
+	'nuke-tools' => 'Hér er hægt að fjöldaeyða síðum sem voru nýlega búnar til af notanda eða vistfangi.
+Tilgreindu notendanafn eða vistfang til að fá lista yfir síður til að eyða, eða skildu reitinn eftir tóman til að fá lista yfir síður frá öllum notendum.',
 	'nuke-submit-user' => 'Áfram',
+	'nuke-submit-delete' => 'Eyða völdum síðum',
+	'right-nuke' => 'Fjöldaeyða síðum',
+	'nuke-select' => 'Velja: $1',
+	'nuke-userorip' => 'Notandanafn, vistfang eða tómt:',
+	'nuke-maxpages' => 'Hámarksfjöldi síðna:',
+	'nuke-editby' => 'Búnar til af [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "'''$1''' hefur verið eytt.",
+	'nuke-not-deleted' => 'Mistök við eyðingu síðunnar [[:$1]].',
+	'nuke-delete-more' => '[[Special:Nuke|Fjöldaeyða fleiri skrám]]',
+	'nuke-pattern' => 'Nafna mynstur:',
+	'nuke-nopages-global' => 'Það eru engar nýjar síður í [[Special:RecentChanges|nýjustu breytingum]].',
 );
 
 /** Italian (Italiano)
@@ -918,15 +1190,18 @@ $messages['is'] = array(
  * @author Beta16
  * @author BrokenArrow
  * @author Darth Kule
+ * @author F. Cosoleto
  */
 $messages['it'] = array(
 	'nuke' => 'Cancellazione di massa',
+	'action-nuke' => 'cancellare in massa le pagine',
 	'nuke-desc' => 'Consente agli amministratori la [[Special:Nuke|cancellazione in massa]] delle pagine',
 	'nuke-nopages' => 'Non sono state trovate nuove pagine create da [[Special:Contributions/$1|$1]] tra le modifiche recenti.',
 	'nuke-list' => 'Le seguenti pagine sono state create di recente da [[Special:Contributions/$1|$1]]; inserisci un commento e conferma la cancellazione.',
 	'nuke-list-multiple' => 'Le seguenti pagine sono state create recentemente;
 inserisci un commento e premi il pulsante per cancellarle.',
 	'nuke-defaultreason' => 'Cancellazione di massa delle pagine create da $1',
+	'nuke-multiplepeople' => 'Cancellazione di massa delle pagine create recentemente',
 	'nuke-tools' => "Questo strumento permette la cancellazione in massa delle pagina create di recente da un determinato utente registrato o anonimo (IP).
 Inserisci il nome utente o l'indirizzo IP per la lista delle pagine da cancellare, oppure lascia vuoto per tutti gli utenti.",
 	'nuke-submit-user' => 'Vai',
@@ -935,8 +1210,12 @@ Inserisci il nome utente o l'indirizzo IP per la lista delle pagine da cancellar
 	'nuke-select' => 'Seleziona: $1',
 	'nuke-userorip' => 'Nome utente, indirizzo IP o vuoto:',
 	'nuke-maxpages' => 'Numero massimo di pagine:',
-	'nuke-multiplepeople' => 'più utenti',
 	'nuke-editby' => 'Creato da [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "La pagina '''$1''' è stata cancellata.",
+	'nuke-not-deleted' => "La pagina [[:$1]] '''non può''' essere cancellata.",
+	'nuke-delete-more' => '[[Special:Nuke|Cancella più pagine]]',
+	'nuke-pattern' => 'Modello per il titolo della pagina:',
+	'nuke-nopages-global' => 'Non ci sono nuove pagine negli [[Special:RecentChanges|ultimi cambiamenti]].',
 );
 
 /** Japanese (日本語)
@@ -946,26 +1225,30 @@ Inserisci il nome utente o l'indirizzo IP per la lista delle pagine da cancellar
  * @author JtFuruhata
  * @author Muttley
  * @author Ohgi
+ * @author Schu
  * @author 青子守歌
  */
 $messages['ja'] = array(
-	'nuke' => 'まとめて削除',
-	'nuke-desc' => '{{int:group-sysop}}がページを[[Special:Nuke|まとめて削除]]できるようにする',
+	'nuke' => '一括削除',
+	'nuke-desc' => '{{int:group-sysop}}がページを[[Special:Nuke|一括削除]]できる機能を提供します。',
 	'nuke-nopages' => '最近の更新ページに[[Special:Contributions/$1|$1]]が新規作成したページはありません。',
-	'nuke-list' => '以下は、[[Special:Contributions/$1|$1]] によって最近作成されたページの一覧です。理由を記入しボタンを押すと、一気に削除されます。',
+	'nuke-list' => '以下は、[[Special:Contributions/$1|$1]] によって最近作成されたページの一覧です；
+理由を記入しボタンを押すと、これらは削除されます。',
 	'nuke-list-multiple' => '最近作成されたページが表示されています。
 コメントを入力し、ボタンを押すと、削除されます。',
-	'nuke-defaultreason' => '$1 によって加えられたページを一括して削除',
+	'nuke-defaultreason' => '$1 によって加えられたページを一括削除',
+	'nuke-multiplepeople' => '複数の利用者',
 	'nuke-tools' => 'このツールを使うと、指定した利用者またはIPアドレスによって最近作成されたページを、まとめて削除することができます。
 利用者名またはIPアドレスを入力すると、削除対象ページの一覧が生成されます。空にすると、すべての利用者によるものが対象になります。',
 	'nuke-submit-user' => '一覧取得',
 	'nuke-submit-delete' => '選択されたページを削除',
 	'right-nuke' => 'ページの一括削除',
 	'nuke-select' => '選択：$1',
-	'nuke-userorip' => '利用者名、IPアドレスまたは空白:',
+	'nuke-userorip' => '利用者名、IP アドレスまたは空白:',
 	'nuke-maxpages' => 'ページの最大量:',
-	'nuke-multiplepeople' => '複数の利用者',
 	'nuke-editby' => '[[Special:Contributions/$1|$1]]によって作成',
+	'nuke-deleted' => "ページ  '''$1''' は削除されています。",
+	'nuke-not-deleted' => "Page [[:$1]] は削除'''出来ません''' 。",
 );
 
 /** Jutish (Jysk)
@@ -1051,6 +1334,7 @@ $messages['kn'] = array(
  */
 $messages['ko'] = array(
 	'nuke' => '문서 대량 삭제',
+	'action-nuke' => '문서를 대량 삭제할',
 	'nuke-desc' => '관리자가 문서를 [[Special:Nuke|대량 삭제]]할 수 있는 기능을 추가합니다.',
 	'nuke-nopages' => '최근에 [[Special:Contributions/$1|$1]] 사용자가 만든 문서가 없습니다.',
 	'nuke-list' => '다음은 [[Special:Contributions/$1|$1]]이(가) 최근에 만든 문서입니다.
@@ -1058,6 +1342,7 @@ $messages['ko'] = array(
 	'nuke-list-multiple' => '다음은 최근에 생성된 문서입니다.
 문서를 삭제하려면 이유를 입력하고 삭제 버튼을 누르십시오.',
 	'nuke-defaultreason' => '$1이(가) 작성한 문서를 대량 삭제함',
+	'nuke-multiplepeople' => '최근 작성된 문서를 대량 삭제함',
 	'nuke-tools' => '이 도구를 이용해 특정 사용자나 IP 사용자가 최근 생성한 문서를 대량으로 삭제할 수 있습니다.
 삭제할 문서 목록을 가져오려면 계정 이름이나 IP 주소를 입력하십시오. 입력하지 않으면 모든 사용자를 대상으로 합니다.',
 	'nuke-submit-user' => '계속',
@@ -1066,8 +1351,12 @@ $messages['ko'] = array(
 	'nuke-select' => '선택: $1',
 	'nuke-userorip' => '계정 이름이나 IP 주소 (혹은 공란으로 남겨 두십시오):',
 	'nuke-maxpages' => '문서의 최대 크기:',
-	'nuke-multiplepeople' => '다수의 편집자',
 	'nuke-editby' => '[[Special:Contributions/$1|$1]]이(가) 생성함',
+	'nuke-deleted' => "문서 '''$1'''이(가) 삭제되었습니다.",
+	'nuke-not-deleted' => "문서 [[:$1]]를 삭제하지 '''못했습니다'''.",
+	'nuke-delete-more' => '[[Special:Nuke|더 많은 문서를 삭제하기]]',
+	'nuke-pattern' => '문서 이름의 패턴:',
+	'nuke-nopages-global' => '[[Special:RecentChanges|최근 바뀜]]에 새 문서가 없습니다.',
 );
 
 /** Krio (Krio)
@@ -1098,6 +1387,7 @@ un dann donn der Knopp zom Fottschmieße dröcke.',
 Jiv ene Jrond udder Zosammegfassung aan,
 un kleck op dä Knopp för se fott ze schmiiße.',
 	'nuke-defaultreason' => 'Fum $1 neu aanjelaate Sigge ang Block fottschmieße',
+	'nuke-multiplepeople' => 'ongerscheidlijje Metmaacher',
 	'nuke-tools' => 'Di Sigg hee hellef Der, angmaß Sigge fottzeschmieße,
 di ene bestemmpte enjeloggte udder namelose Metmaacher
 köözlesch aanjalaat hät.
@@ -1110,7 +1400,6 @@ udder lohß dat Feld läddesch, dann kriß De en Leß vun Alle.',
 	'nuke-select' => 'Ußwähle: $1',
 	'nuke-userorip' => 'Metmaacher_Name, <i lang="en">IP</i>-Addräß udder nix:',
 	'nuke-maxpages' => 'Nit mieh Sigge, wi:',
-	'nuke-multiplepeople' => 'ongerscheidlijje Metmaacher',
 	'nuke-editby' => 'Aanjelaat vum [[Special:Contributions/$1|$1]]',
 );
 
@@ -1120,12 +1409,14 @@ udder lohß dat Feld läddesch, dann kriß De en Leß vun Alle.',
  */
 $messages['lb'] = array(
 	'nuke' => 'Masse-Läschung',
+	'action-nuke' => "Säiten 'en masse' ze läschen",
 	'nuke-desc' => "Gëtt Administrateuren d'Méiglechkeet fir [[Special:Nuke|vill Säite mateneen ze läschen]]",
 	'nuke-nopages' => 'Et gëtt bei de läschten Ännerunge keng nei Säite vum [[Special:Contributions/$1|$1]].',
 	'nuke-list' => 'Dës Säite goufe viru kuerzem vum [[Special:Contributions/$1|$1]] nei ugeluecht; gitt w.e.g. eng Bemierkung an, an dréckt op de Knäppche Läschen.',
 	'nuke-list-multiple' => 'Dës Säite goufe rezent gemaach;
 setzt eng Bemierkung derbäi a klickt op de Knäppche fir se ze läschen.',
 	'nuke-defaultreason' => 'Masse-Läschung vu Säiten, déi vum $1 ugefaang goufen',
+	'nuke-multiplepeople' => 'Masse-Läschung vu Säiten déi rezent derbäi gesat goufen',
 	'nuke-tools' => "Dësen Tool erlaabt vill Säite mateneen ze läschen, déi vun engem Benotzer oder vun enger IP-Adresse ugeluecht goufen.
 Gitt w.e.g. d'IP-Adress respektiv de Benotzer n fir eng Lescht vun de Säiten ze kréien déi geläscht solle ginn, oder loosst et eidel fir all Benotzer.",
 	'nuke-submit-user' => 'Lass',
@@ -1134,10 +1425,12 @@ Gitt w.e.g. d'IP-Adress respektiv de Benotzer n fir eng Lescht vun de Säiten ze
 	'nuke-select' => 'Eraussichen:$1',
 	'nuke-userorip' => 'Benotzernumm, IP-Adress oder eidel:',
 	'nuke-maxpages' => 'Maximal Zuel vu Säiten:',
-	'nuke-multiplepeople' => 'méi Benotzer',
 	'nuke-editby' => 'Gemaach vum [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "D'Säit '''$1''' gouf geläscht.",
 	'nuke-not-deleted' => "D'Säit [[:$1]] '''konnt net''' geläscht ginn.",
+	'nuke-delete-more' => '[[Special:Nuke|Méi Säite läschen]]',
+	'nuke-pattern' => 'Muster fir de Säitennumm:',
+	'nuke-nopages-global' => 'Et si keng nei Säiten an de [[Special:RecentChanges|rezenten Ännerungen]].',
 );
 
 /** Limburgish (Limburgs)
@@ -1156,9 +1449,11 @@ $messages['li'] = array(
 	'nuke-submit-user' => 'Gank',
 	'nuke-submit-delete' => 'Geslecteerd wisse',
 	'right-nuke' => "Massaal pagina's weggoeje",
+	'nuke-select' => 'Selecteer: $1',
 );
 
 /** Lithuanian (Lietuvių)
+ * @author Eitvys200
  * @author Homo
  * @author Matasg
  */
@@ -1174,6 +1469,11 @@ $messages['lt'] = array(
 	'nuke-submit-user' => 'Išsiųsti',
 	'nuke-submit-delete' => 'Ištrinti pasirinktus(ą)',
 	'right-nuke' => 'Masinis puslapių trynėjas',
+	'nuke-select' => 'Pasirinkite: $1',
+	'nuke-userorip' => 'Vartotojo vardas, IP adresas arba tuščia:',
+	'nuke-maxpages' => 'Didžiausias puslapių skaičius:',
+	'nuke-deleted' => "Puslapis '''$1''' buvo ištrintas.",
+	'nuke-not-deleted' => "Puslapis [[:$1]] '''negalimas''' ištrinti.",
 );
 
 /** Literary Chinese (文言) */
@@ -1200,6 +1500,7 @@ $messages['mg'] = array(
  */
 $messages['mk'] = array(
 	'nuke' => 'Групно бришење',
+	'action-nuke' => 'масовно бришење на страници',
 	'nuke-desc' => 'Им дава можност на администраторите да вршат [[Special:Nuke|групно бришење]] на страници',
 	'nuke-nopages' => 'Нема нови страници од [[Special:Contributions/$1|$1]] во скорешните промени.',
 	'nuke-list' => 'Следниве страници биле неодамна создадени од [[Special:Contributions/$1|$1]];
@@ -1207,6 +1508,7 @@ $messages['mk'] = array(
 	'nuke-list-multiple' => 'Следниве страници се создадени неодамна.
 Внесете коментар и стиснете на копчето за да ги избришете.',
 	'nuke-defaultreason' => 'Групно отстранување на страници додадени од $1',
+	'nuke-multiplepeople' => 'Групно бришење на неодамна додадени страници',
 	'nuke-tools' => 'Оваа алатка овозможува збирни бришења на страници неодамна додадени од извесен корисник или IP-адреса.
 Внесете го корисничкото име или IP-адреса за да го добиете списокот на страници за бришење, или пак оставете го празно ако сакате да се наведат сите корисници.',
 	'nuke-submit-user' => 'Изврши',
@@ -1215,10 +1517,12 @@ $messages['mk'] = array(
 	'nuke-select' => 'Одбери: $1',
 	'nuke-userorip' => 'Корисничко име, IP-адреса или празно:',
 	'nuke-maxpages' => 'Макс. број на страници:',
-	'nuke-multiplepeople' => 'повеќе лица',
 	'nuke-editby' => 'Создадено од [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Страницата '''$1''' е избришана.",
 	'nuke-not-deleted' => "Страницата [[:$1]] '''не можеше''' да се избрише.",
+	'nuke-delete-more' => '[[Special:Nuke|Избриши уште страници]]',
+	'nuke-pattern' => 'Мостра за име на страница:',
+	'nuke-nopages-global' => 'Нема нови страници во [[Special:RecentChanges|скорешните промени]].',
 );
 
 /** Malayalam (മലയാളം)
@@ -1227,6 +1531,7 @@ $messages['mk'] = array(
  */
 $messages['ml'] = array(
 	'nuke' => 'കൂട്ട മായ്ക്കൽ',
+	'action-nuke' => 'താളുകൾ കൂട്ടമായി മായ്ക്കുക',
 	'nuke-desc' => 'സിസോപ്പുകൾക്ക്  താളുകൾ [[Special:Nuke|കൂട്ടമായി മായ്ക്കാനുള്ള]] അവകാശം നൽകുക',
 	'nuke-nopages' => '[[Special:Contributions/$1|$1]] ഉണ്ടാക്കിയ പുതിയ താളുകളൊന്നും പുതിയ മാറ്റങ്ങളിലില്ല.',
 	'nuke-list' => 'താഴെ പ്രദർശിപ്പിച്ചിരിക്കുന്ന താളുകൾ [[Special:Contributions/$1|$1]] സമീപ കാലത്ത് സൃഷ്ടിച്ചവ ആണ്‌;
@@ -1234,6 +1539,7 @@ $messages['ml'] = array(
 	'nuke-list-multiple' => 'താഴെക്കൊടുത്തിരിക്കുന്ന താളുകൾ അടുത്തിടെ സൃഷ്ടിച്ചതാണ്;
 അഭിപ്രായമാക്കിയിട്ട് അവ മായ്ക്കാനായി ബട്ടൺ ഞെക്കുക.',
 	'nuke-defaultreason' => '$1 ചേർത്ത താളുകൾ മൊത്തമായി മായ്ക്കുന്നതിനുള്ള സം‌വിധാനം',
+	'nuke-multiplepeople' => 'സമീപകാലത്ത് ചേർത്ത താളുകളുടെ കൂട്ട മായ്ക്കൽ',
 	'nuke-tools' => 'ഏതെങ്കിലും ഒരു ഉപയോക്താവ് അല്ലെങ്കിൽ ഐ.പി. സമീപകാലത്തു സൃഷ്ടിച്ച താളുകൾ കൂട്ടമായി മായ്ക്കാനുള്ള സൗകര്യം ഈ സം‌വിധാനം നൽകുന്നു. ഉപയോക്തൃനാമം അല്ലെങ്കിൽ ഐ.പി. ഇവിടെ നൽകിയാൽ മായ്ക്കേണ്ട താളുകളുടെ പട്ടിക ലഭ്യമാകുന്നതാണ്, എല്ലാ ഉപയോക്താക്കളും സൃഷ്ടിച്ചിട്ടുള്ള താൾ മായ്ക്കാൻ ശൂന്യമായിടുക.',
 	'nuke-submit-user' => 'പോകൂ',
 	'nuke-submit-delete' => 'തിരഞ്ഞെടുത്തവ മായ്ക്കുക',
@@ -1241,10 +1547,12 @@ $messages['ml'] = array(
 	'nuke-select' => 'തിരഞ്ഞെടുക്കുക: $1',
 	'nuke-userorip' => 'ഉപയോക്തൃനാമം, ഐ.പി. വിലാസം അല്ലെങ്കിൽ ശൂന്യമായിടുക:',
 	'nuke-maxpages' => 'പരമാവധി എത്ര താളുകൾ:',
-	'nuke-multiplepeople' => 'ഒന്നിലധികം പേർ',
 	'nuke-editby' => 'നിർമ്മിച്ചത് [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "'''$1''' എന്ന താൾ മായ്ച്ചു കഴിഞ്ഞു.",
 	'nuke-not-deleted' => "[[:$1]] എന്ന താൾ മായ്ക്കാൻ '''കഴിയില്ല'''.",
+	'nuke-delete-more' => '[[Special:Nuke|കൂടുതൽ താളുകൾ മായ്ക്കുക]]',
+	'nuke-pattern' => 'താളിന്റെ പേരിന്റെ ശൈലി:',
+	'nuke-nopages-global' => '[[Special:RecentChanges|സമീപകാലമാറ്റങ്ങളിൽ]] പുതിയ താളുകളൊന്നുമില്ല.',
 );
 
 /** Marathi (मराठी)
@@ -1268,12 +1576,14 @@ $messages['mr'] = array(
  */
 $messages['ms'] = array(
 	'nuke' => 'Hapus pukal',
+	'action-nuke' => 'menghapuskan laman secara besar-besaran',
 	'nuke-desc' => 'Membolehkan penyelia [[Special:Nuke|menghapuskan laman-laman]] secara pukal',
 	'nuke-nopages' => 'Tiada laman baru oleh [[Special:Contributions/$1|$1]] dalam senarai perubahan terkini.',
 	'nuke-list' => 'Laman-laman berikut dicipta oleh [[Special:Contributions/$1|$1]]; sila masukkan komen anda dan tekan butang untuk menghapuskannya.',
 	'nuke-list-multiple' => 'Laman-laman berikut baru diwujudkan;
 isikan komen dan tekan butang untuk menghapuskannya.',
 	'nuke-defaultreason' => 'Menghapuskan laman-laman yang ditambah oleh $1 secara pukal',
+	'nuke-multiplepeople' => 'Penghapusan laman yang baru ditambahkan secara pukal',
 	'nuke-tools' => 'Alat ini membolehkan penghapusan secara besar-besaran laman-laman yang dibuka oleh pengguna atau alamat IP tertentu.
 Isikan nama pengguna atau alamat IP untuk mendapat senarai laman yang hendak dikosongkan, atau biarkan kosong untuk semua pengguna.',
 	'nuke-submit-user' => 'Pergi',
@@ -1282,10 +1592,12 @@ Isikan nama pengguna atau alamat IP untuk mendapat senarai laman yang hendak dik
 	'nuke-select' => 'Pilih: $1',
 	'nuke-userorip' => 'Nama pengguna, alamat IP atau kosong:',
 	'nuke-maxpages' => 'Bilangan halaman maksimum:',
-	'nuke-multiplepeople' => 'berbilang pengguna',
 	'nuke-editby' => 'Dibuat oleh [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Laman '''$1''' telah dihapuskan.",
 	'nuke-not-deleted' => "Laman [[:$1]] '''tidak dapat''' dihapuskan.",
+	'nuke-delete-more' => '[[Special:Nuke|Hapuskan lebih banyak laman]]',
+	'nuke-pattern' => 'Pola nama laman:',
+	'nuke-nopages-global' => 'Tiada laman baru dalam [[Special:RecentChanges|perubahan terkini]].',
 );
 
 /** Maltese (Malti)
@@ -1298,11 +1610,14 @@ $messages['mt'] = array(
 	'nuke-list' => 'Il-paġni segwenti ġew riċentament maħluqa minn [[Special:Contributions/$1|$1]];
 daħħal kumment u agħfas il-buttuna sabiex tħassarhom.',
 	'nuke-defaultreason' => "Tħassir ta' massa ta' paġni miżjuda minn $1",
+	'nuke-multiplepeople' => 'iktar minn utent wieħed',
 	'nuke-tools' => "Din l-għodda tippermetti t-tħassir ta' massa ta' paġni li ġew miżjuda riċentament minn utent partikulari jew IP.
 Daħħal l-isem tal-utent jew l-indirizz IP biex tikseb lista ta' paġni li jridu jitħassru, jew ħalliha votja sabiex issejjaħ l-utenti kollha.",
 	'nuke-submit-user' => 'Mur',
 	'nuke-submit-delete' => 'Ħassar dawk magħżula',
 	'right-nuke' => 'Ħassar paġni bil-massa',
+	'nuke-userorip' => 'Isem tal-utent, indirizz IP jew vojt:',
+	'nuke-maxpages' => "Numru massimu ta' paġni:",
 );
 
 /** Erzya (Эрзянь)
@@ -1320,6 +1635,33 @@ $messages['nah'] = array(
 	'nuke-submit-user' => 'Yāuh',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Event
+ * @author Jon Harald Søby
+ * @author Nghtwlkr
+ */
+$messages['nb'] = array(
+	'nuke' => 'Massesletting',
+	'nuke-desc' => 'Gir administratorer muligheten til å [[Special:Nuke|masseslette]] sider',
+	'nuke-nopages' => 'Ingen nye sider av [[Special:Contributions/$1|$1]] i siste endringer.',
+	'nuke-list' => 'Følgende sider ble nylig opprettet av [[Special:Contributions/$1|$1]]; skriv inn en slettingsgrunn og trykk på knappen for å slette alle sidene.',
+	'nuke-list-multiple' => 'Følgende sider ble nylig opprettet;
+sett inn en kommentar og trykk på knappen for å slette dem.',
+	'nuke-defaultreason' => 'Massesletting av sider lagt inn av $1',
+	'nuke-multiplepeople' => 'flere brukere',
+	'nuke-tools' => 'Dette verktøyet muliggjør massesletting av sider som nylig er opprettet av gitt bruker eller IP-adresse.
+Skriv et brukernavn eller en IP-adresse for å få en liste over sider som kan slettes, eller angi tomt for alle brukere.',
+	'nuke-submit-user' => 'Gå',
+	'nuke-submit-delete' => 'Slett valgte',
+	'right-nuke' => 'Slette sider <i>en masse</i>',
+	'nuke-select' => 'Velg: $1',
+	'nuke-userorip' => 'Brukernavn, IP-adresse eller tomt:',
+	'nuke-maxpages' => 'Maksimalt antall sider:',
+	'nuke-editby' => 'Opprettet av [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Side '''$1''' ble slettet.",
+	'nuke-not-deleted' => "Side [[:$1]] ''kunne ikke''' slettes.",
+);
+
 /** Low German (Plattdüütsch)
  * @author Slomox
  */
@@ -1346,68 +1688,83 @@ $messages['nds-nl'] = array(
 	'right-nuke' => "Massaal pagina's vortdoon",
 );
 
+/** Nepali (नेपाली)
+ * @author RajeshPandey
+ */
+$messages['ne'] = array(
+	'nuke' => 'धेरैवटा हटाउने',
+	'action-nuke' => 'न्युक पृष्ठहरू',
+	'nuke-submit-user' => 'जाउ',
+	'nuke-select' => '$1 छान्नुहोस:',
+	'nuke-userorip' => 'प्रयोगकर्ता, आइपी ठेगाना वा खाली:',
+	'nuke-maxpages' => 'पृष्ठहरूको उच्चतम संख्या:',
+	'nuke-editby' => '[[Special:Contributions/$1|$1]] द्वारा सिर्जना गरिएको',
+	'nuke-deleted' => "'''$1''' पृष्ठ मेटिएको छ।",
+	'nuke-not-deleted' => "[[:$1]] पृष्ठ मेट्न '''सकिएन'''।",
+	'nuke-delete-more' => '[[Special:Nuke|अरू पृष्ठहरू मेट्नुहोस]]',
+	'nuke-pattern' => 'पृष्ठको नाम को लागि स्वरूप :',
+	'nuke-nopages-global' => '[[Special:RecentChanges|नयाँ परिवर्तनहरू]]मा कुनै नयाँ पृष्ठ छैनन।',
+);
+
 /** Dutch (Nederlands)
  * @author SPQRobin
  * @author Siebrand
  */
 $messages['nl'] = array(
 	'nuke' => 'Massaal verwijderen',
+	'action-nuke' => "massaal pagina's te verwijderen",
 	'nuke-desc' => "Geeft beheerders de mogelijkheid om [[Special:Nuke|massaal pagina's te verwijderen]]",
 	'nuke-nopages' => "Geen nieuwe pagina's van [[Special:Contributions/$1|$1]] in de recente wijzigingen.",
 	'nuke-list' => "De onderstaande pagina's zijn recentelijk aangemaakt door [[Special:Contributions/$1|$1]]; voer een reden in en klik op de knop om ze te verwijderen.",
 	'nuke-list-multiple' => "De volgende pagina's zijn recentelijk aangemaakt.
 Geef een reden op en klik op de knop om ze te verwijderen.",
-	'nuke-defaultreason' => "Massaal verwijderen van pagina's van $1",
+	'nuke-defaultreason' => "Massaal verwijderen van pagina's toegevoegd door $1",
+	'nuke-multiplepeople' => "Massaal verwijderen van recent toegevoegde pagina's",
 	'nuke-tools' => "Dit hulpmiddel maakt het mogelijk pagina's die recentelijk zijn aangemaakt door een gebruiker of IP-adres massaal te verwijderen.
 Voer de gebruikersnaam of het IP-adres in voor een lijst van te verwijderen pagina's of laat leeg voor alle gebruikers.",
 	'nuke-submit-user' => 'OK',
-	'nuke-submit-delete' => 'Selectie verwijderen',
+	'nuke-submit-delete' => "Geselecteerde pagina's verwijderen",
 	'right-nuke' => "Massaal pagina's verwijderen",
 	'nuke-select' => 'Selectie: $1',
 	'nuke-userorip' => 'Gebruikersnaam, IP-adres of leeg:',
 	'nuke-maxpages' => "Maximum aantal pagina's:",
-	'nuke-multiplepeople' => 'meerdere gebruikers',
 	'nuke-editby' => 'Aangemaakt door [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Pagina '''$1''' is verwijderd.",
 	'nuke-not-deleted' => "Pagina [[:$1]] '''kon niet''' worden verwijderd.",
+	'nuke-delete-more' => "[[Special:Nuke|Meer pagina's verwijderen]]",
+	'nuke-pattern' => 'Patroon voor de paginanaam:',
+	'nuke-nopages-global' => "Er zijn geen nieuwe pagina's in de [[Special:RecentChanges|recente wijzigingen]].",
 );
 
 /** Norwegian Nynorsk (‪Norsk (nynorsk)‬)
  * @author Harald Khan
+ * @author Njardarlogar
  */
 $messages['nn'] = array(
 	'nuke' => 'Massesletting',
+	'action-nuke' => 'massesletta sider',
 	'nuke-desc' => 'Gjev administratorane moglegheita til å [[Special:Nuke|massesletta]] sider',
-	'nuke-nopages' => 'Ingen nye sider av [[Special:Contributions/$1|$1]] i siste endringar.',
-	'nuke-list' => 'Følgjande sider blei nyleg oppretta av [[Special:Contributions/$1|$1]]. 
-Skriv inn ei sletteårsak og trykk på knappen for å sletta alle sidene.',
+	'nuke-nopages' => 'Ingen nye sider av [[Special:Contributions/$1|$1]] i siste endringane.',
+	'nuke-list' => 'Dei fylgjande sidene vart nyleg oppretta av [[Special:Contributions/$1|$1]];
+skriv inn ei sletteårsak og trykk på knappen for å sletta dei.',
+	'nuke-list-multiple' => 'Dei fylgjande sidene vart nyleg oppretta;
+skriv ein kommentar og trykk på knappen for å sletta dei.',
 	'nuke-defaultreason' => 'Massesletting av sider lagde inn av $1',
-	'nuke-tools' => 'Dette verktøyet mogleggjer massesletting av sider som nyleg er lagde inn av ein viss brukar eller ei viss IP-adressa. 
-Skriv inn eit brukarnamn eller ei IP-adressa for å få ei lista over sider som ein kan sletta her.',
+	'nuke-multiplepeople' => 'Massesletting av nyleg oppretta sider',
+	'nuke-tools' => 'Dette verktøyet mogeleggjer massesletting av sider som nyleg er lagde inn av ein viss brukar eller ei viss IP-adresse. 
+Skriv inn eit brukarnamn eller ei IP-adresse for å få ei liste over sider som kan verta sletta, eller lat feltet stå tomt for alle brukarar.',
 	'nuke-submit-user' => 'Gå',
 	'nuke-submit-delete' => 'Slett valde',
 	'right-nuke' => 'Masseslett sider',
 	'nuke-select' => 'Vel: $1',
-	'nuke-multiplepeople' => 'fleire brukarar',
+	'nuke-userorip' => 'Brukarnamn, IP-adresse eller tomt:',
+	'nuke-maxpages' => 'Høgste talet på sider:',
 	'nuke-editby' => 'Oppretta av [[Special:Contributions/$1|$1]]',
-);
-
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Jon Harald Søby
- * @author Nghtwlkr
- */
-$messages['no'] = array(
-	'nuke' => 'Massesletting',
-	'nuke-desc' => 'Gir administratorer muligheten til å [[Special:Nuke|masseslette]] sider',
-	'nuke-nopages' => 'Ingen nye sider av [[Special:Contributions/$1|$1]] i siste endringer.',
-	'nuke-list' => 'Følgende sider ble nylig opprettet av [[Special:Contributions/$1|$1]]; skriv inn en slettingsgrunn og trykk på knappen for å slette alle sidene.',
-	'nuke-defaultreason' => 'Massesletting av sider lagt inn av $1',
-	'nuke-tools' => 'Dette verktøyet muliggjør massesletting av sider som nylig er lagt inn av en gitt bruker eller IP. Skriv et brukernavn eller en IP for å få en liste over sider som slettes:',
-	'nuke-submit-user' => 'Gå',
-	'nuke-submit-delete' => 'Slett valgte',
-	'right-nuke' => 'Slette sider <i>en masse</i>',
-	'nuke-select' => 'Velg: $1',
-	'nuke-editby' => 'Opprettet av [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Sida '''$1''' vart sletta.",
+	'nuke-not-deleted' => "Sida [[:$1]] ''kunne ikkje''' verta sletta.",
+	'nuke-delete-more' => '[[Special:Nuke|Slett fleire sider]]',
+	'nuke-pattern' => 'Mønster for sidenamnet:',
+	'nuke-nopages-global' => 'Det er ingen nye sider i [[Special:RecentChanges|siste endringane]].',
 );
 
 /** Northern Sotho (Sesotho sa Leboa)
@@ -1432,7 +1789,24 @@ $messages['oc'] = array(
 	'right-nuke' => 'Suprimir de paginas en massa',
 );
 
-/** Ossetic (Иронау)
+/** Oriya (ଓଡ଼ିଆ)
+ * @author Jnanaranjan Sahu
+ * @author Psubhashish
+ */
+$messages['or'] = array(
+	'nuke-submit-user' => 'ଯିବେ',
+	'nuke-submit-delete' => 'ବାଛିଥିବାଗୁଡିକ ଲିଭାଇବେ',
+	'right-nuke' => 'ସମୂହପୃଷ୍ଠା ଲିଭେଇବେ',
+	'nuke-select' => 'ବାଛିବେ : $1',
+	'nuke-userorip' => 'ବ୍ୟବହାରକାରୀ ନାମ, ଆଇପି ଠିକଣା କିମ୍ବା ଖାଲି :',
+	'nuke-maxpages' => 'ଅତ୍ୟଧିକ ସଂଖ୍ୟକ ପୃଷ୍ଠା :',
+	'nuke-editby' => '[[Special:Contributions/$1|$1]]ଙ୍କ ଦ୍ଵାରା ତିଆରିକରାଯାଇଛି',
+	'nuke-deleted' => "'''$1'''ପୃଷ୍ଠାଟିକୁ ଲିଭାଇ ଦିଆଗଲା ।",
+	'nuke-pattern' => 'ପୃଷ୍ଠା ନାମ ପାଇଁ ଶୈଳୀ:',
+	'nuke-nopages-global' => '[[Special:RecentChanges|ନଗଦ ବଦଳ]]ରେ ଗୋଟିଏ ବି ନୂଆ ପୃଷ୍ଠା ନାହିଁ ।',
+);
+
+/** Ossetic (Ирон)
  * @author Amikeco
  */
 $messages['os'] = array(
@@ -1446,22 +1820,26 @@ $messages['os'] = array(
  */
 $messages['pdc'] = array(
 	'nuke-submit-user' => 'Lischt hole',
+	'nuke-deleted' => 'Blatt „$1“ is glescht warre.',
 );
 
 /** Polish (Polski)
  * @author Derbeth
  * @author Leinad
  * @author Nux
+ * @author Olgak85
  * @author Sp5uhe
  */
 $messages['pl'] = array(
 	'nuke' => 'Masowe usuwanie',
+	'action-nuke' => 'masowego usuwania stron',
 	'nuke-desc' => 'Dodaje administratorom funkcję równoczesnego [[Special:Nuke|usuwania dużej liczby stron]]',
 	'nuke-nopages' => 'Brak nowych stron autorstwa [[Special:Contributions/$1|$1]] w ostatnich zmianach.',
 	'nuke-list' => 'Następujące strony zostały ostatnio utworzone przez [[Special:Contributions/$1|$1]]; wpisz komentarz i wciśnij przycisk by usunąć je.',
 	'nuke-list-multiple' => 'Poniższa lista przedstawia ostatnio dodane strony.
 Wpisz powód, a następnie zatwierdź usunięcie stron.',
 	'nuke-defaultreason' => 'Masowe usunięcie stron dodanych przez $1',
+	'nuke-multiplepeople' => 'Masowe usuwanie ostatnio dodanych stron',
 	'nuke-tools' => 'Narzędzie pozwala na masowe usuwanie stron ostatnio dodanych przez zarejestrowanego lub anonimowego użytkownika.
 Wpisz nazwę użytkownika lub adres IP by otrzymać listę stron do usunięcia. Możesz także nic nie wpisywać, wtedy będzie można masowo usunąć wkład wszystkich użytkowników.',
 	'nuke-submit-user' => 'Dalej',
@@ -1470,10 +1848,12 @@ Wpisz nazwę użytkownika lub adres IP by otrzymać listę stron do usunięcia.
 	'nuke-select' => 'Wybierz: $1',
 	'nuke-userorip' => 'Podaj nazwę użytkownika, adres IP lub pozostaw puste pole',
 	'nuke-maxpages' => 'Maksymalna liczba stron',
-	'nuke-multiplepeople' => 'wielu użytkowników',
 	'nuke-editby' => 'Utworzona przez [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Strona '''$1''' została usunięta.",
 	'nuke-not-deleted' => "Strony [[:$1]] '''nie można''' usunąć.",
+	'nuke-delete-more' => '[[Special:Nuke|Usuń więcej stron]]',
+	'nuke-pattern' => 'Wzór dla nazwy strony:',
+	'nuke-nopages-global' => 'Brak nowych stron w [[Special:RecentChanges|ostatnich zmianach]].',
 );
 
 /** Piedmontese (Piemontèis)
@@ -1483,12 +1863,14 @@ Wpisz nazwę użytkownika lub adres IP by otrzymać listę stron do usunięcia.
  */
 $messages['pms'] = array(
 	'nuke' => "Scancelament d'amblé",
+	'action-nuke' => 'scancelé dle pàgine a baron',
 	'nuke-desc' => "A dà a j'aministrador l'abilitassion a [[Special:Nuke|scanselé a baron]] le pàgine",
 	'nuke-nopages' => "Gnun-a pàgine faite da [[Special:Contributions/$1|$1]] ant j'ùltim cambiament.",
 	'nuke-list' => "Ste pàgine-sì a son staite faite ant j'ùltim temp da [[Special:Contributions/$1|$1]]; ch'a lassa un coment e ch'a-i daga 'n colp ansima al boton për gaveje via tute d'amblé.",
 	'nuke-list-multiple' => "Le pàgine sì-dapress a son stàite creà da pòch;
 ch'a buta un coment e ch'a sgnaca ël boton për scanceleje.",
 	'nuke-defaultreason' => "Scancelament d'amblé dle pàgine faite da $1",
+	'nuke-multiplepeople' => 'Scancelassion a baron ëd pàgine giontà da pòch',
 	'nuke-tools' => "St'utiss-sì a lassa scancelé d'amblé le pàgine giontà ant j'ùltim temp da un chèich utent ò da 'nt na chèicha adrëssa IP. Ch'a buta lë stranòm ò l'adrëssa IP për tiré giù na lista dle pàgine da scancelé, o ch'a lassa an bianch për tùit j'utent.",
 	'nuke-submit-user' => 'Va',
 	'nuke-submit-delete' => 'Scansela le selessionà',
@@ -1496,16 +1878,30 @@ ch'a buta un coment e ch'a sgnaca ël boton për scanceleje.",
 	'nuke-select' => 'Selessioné: $1',
 	'nuke-userorip' => 'Nòm utent, adrëssa IP o gnente:',
 	'nuke-maxpages' => 'Màssim nùmer ëd pàgine:',
-	'nuke-multiplepeople' => 'pi utent',
 	'nuke-editby' => 'Creà da [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "La pàgina '''$1''' a l'é stàita scancelà.",
+	'nuke-not-deleted' => "La pàgina [[:$1]] '''a peul pa''' esse scancelà.",
+	'nuke-delete-more' => "[[Special:Nuke|Scancelé pì 'd pàgine]]",
+	'nuke-pattern' => 'Model për ël nòm ëd pàgina:',
+	'nuke-nopages-global' => "A-i é pa 'd pàgine neuve an [[Special:RecentChanges|ùltime modìfiche]].",
 );
 
 /** Pashto (پښتو)
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
 $messages['ps'] = array(
+	'nuke' => 'ټول ړنګېدنه',
+	'action-nuke' => 'نيوک مخونه',
+	'nuke-multiplepeople' => 'د تازه راګډ شويو مخونو ټول ړنګېدنه',
 	'nuke-submit-user' => 'ورځه',
 	'nuke-submit-delete' => 'ټاکل شوی ړنګول',
+	'right-nuke' => 'د ټول ړنګېدنې مخونه',
+	'nuke-select' => 'ټاکل: $1',
+	'nuke-userorip' => 'کارن-نوم، آي پي پته يا تش:',
+	'nuke-maxpages' => 'د حد اکثر شمېر مخونه:',
+	'nuke-deleted' => "د '''$1''' مخ ړنګ شو.",
+	'nuke-not-deleted' => "د [[:$1]] مخ '''نشي''' ړنګېدلی.",
+	'nuke-delete-more' => '[[Special:Nuke|لا نور مخونه ړنګول]]',
 );
 
 /** Portuguese (Português)
@@ -1521,6 +1917,7 @@ $messages['pt'] = array(
 	'nuke-list-multiple' => 'As seguintes páginas foram criadas recentemente;
 introduza um comentário e clique o botão para eliminá-las.',
 	'nuke-defaultreason' => 'Eliminação em massa de páginas criadas por $1',
+	'nuke-multiplepeople' => 'vários utilizadores',
 	'nuke-tools' => 'Esta ferramenta permite a eliminação em massa de páginas criadas recentemente por um utilizador ou IP específico. Forneça o nome de utilizador ou o IP para obter a lista de páginas a eliminar, ou deixe em branco para todos os utilizadores.',
 	'nuke-submit-user' => 'Ir',
 	'nuke-submit-delete' => 'Eliminar as seleccionadas',
@@ -1528,7 +1925,6 @@ introduza um comentário e clique o botão para eliminá-las.',
 	'nuke-select' => 'Seleccionar: $1',
 	'nuke-userorip' => 'Utilizador, endereço IP, ou vazio:',
 	'nuke-maxpages' => 'Nº máximo de páginas:',
-	'nuke-multiplepeople' => 'vários utilizadores',
 	'nuke-editby' => 'Criada por [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "A página '''$1''' foi eliminada.",
 	'nuke-not-deleted' => 'Não foi possível eliminar a página [[:$1]].',
@@ -1538,6 +1934,7 @@ introduza um comentário e clique o botão para eliminá-las.',
  * @author Carla404
  * @author Eduardo.mps
  * @author Giro720
+ * @author MetalBrasil
  */
 $messages['pt-br'] = array(
 	'nuke' => 'Eliminar em massa',
@@ -1547,6 +1944,7 @@ $messages['pt-br'] = array(
 	'nuke-list-multiple' => 'As seguintes páginas foram criadas recentemente;
 introduza um comentário e clique o botão para eliminá-las.',
 	'nuke-defaultreason' => 'Eliminação em massa de páginas criadas por $1',
+	'nuke-multiplepeople' => 'vários usuários',
 	'nuke-tools' => 'Esta ferramenta permite a eliminação em massa de páginas criadas recentemente por um usuário ou IP específico.
 Forneça o nome de usuário ou o IP para obter a lista de páginas a eliminar, ou deixe em branco para todos os usuários.',
 	'nuke-submit-user' => 'Ir',
@@ -1555,8 +1953,9 @@ Forneça o nome de usuário ou o IP para obter a lista de páginas a eliminar, o
 	'nuke-select' => 'Selecionar: $1',
 	'nuke-userorip' => 'Nome de usuário, endereço IP, ou vazio:',
 	'nuke-maxpages' => 'Número máximo de páginas:',
-	'nuke-multiplepeople' => 'vários usuários',
 	'nuke-editby' => 'Criada por [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => 'A página ""$1"" foi excluída.',
+	'nuke-not-deleted' => "A página [[:$1]] '''não pôde''' ser excluída.",
 );
 
 /** Quechua (Runa Simi)
@@ -1570,6 +1969,7 @@ $messages['qu'] = array(
 	'nuke-list-multiple' => "Kay qatiq p'anqakunaqa ñaqha kamarisqam;
 imatapas willapuspa butunta ñit'ipay qullunapaq.",
 	'nuke-defaultreason' => "$1-pa rurasqan p'anqakunata tawqalla qulluy",
+	'nuke-multiplepeople' => "Ñaqha yapasqa p'anqakunata tawqa qulluy",
 	'nuke-tools' => "Kay llamk'anawanqa huk ruraqpa icha huk IP huchhap ñaqha kamarisqan p'anqakunata tawqalla qulluytam atinki.
 Ruraqpa sutinta icha IP huchhanta yaykuchiy qulluna p'anqakunata rikunaykipaq.",
 	'nuke-submit-user' => 'Riy',
@@ -1578,7 +1978,6 @@ Ruraqpa sutinta icha IP huchhanta yaykuchiy qulluna p'anqakunata rikunaykipaq.",
 	'nuke-select' => 'Akllay: $1',
 	'nuke-userorip' => "Ruraqpa sutin, IP huchha icha ch'usaq:",
 	'nuke-maxpages' => "Kay chhika p'anqakunamanta ama aswan kachunchu:",
-	'nuke-multiplepeople' => 'imaymana ruraqkuna',
 	'nuke-editby' => '[[Special:Contributions/$1|$1]] sutiyuqpa kamarisqan',
 );
 
@@ -1603,7 +2002,8 @@ $messages['ro'] = array(
 	'nuke-nopages' => 'Nicio pagină nouă de către [[Special:Contributions/$1|$1]] în schimbările recente.',
 	'nuke-list' => 'Aceste pagini au fost recent create de [[Special:Contributions/$1|$1]];
 adăugați un comentariu și apăsați butonul pentru a le șterge.',
-	'nuke-defaultreason' => 'Eliminatorul în masă al paginilor adăugat de $1',
+	'nuke-defaultreason' => 'Ștergere în masă a paginilor adăugate de $1',
+	'nuke-multiplepeople' => 'Ștergere în masă a paginilor recent adăugate',
 	'nuke-tools' => 'Această unealtă permite ștergeri în masă a paginilor recent adăugate de către un utilizator dat sau adresă IP.
 Introduceți numele de utilizator sau adresa IP pentru a primi o listă cu paginile de șters sau nu completați nimic pentru a lua în calcul toți utilizatorii.',
 	'nuke-submit-user' => 'Du-te',
@@ -1612,8 +2012,9 @@ Introduceți numele de utilizator sau adresa IP pentru a primi o listă cu pagin
 	'nuke-select' => 'Alegeți: $1',
 	'nuke-userorip' => 'Nume de utilizator, adresă IP sau necompletare:',
 	'nuke-maxpages' => 'Număr maxim de pagini:',
-	'nuke-multiplepeople' => 'mai mulți utilizatori',
 	'nuke-editby' => 'Creat de [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Pagina '''$1''' a fost ștearsă.",
+	'nuke-not-deleted' => "Pagina [[:$1]] '''nu a putut''' fi ștearsă.",
 );
 
 /** Tarandíne (Tarandíne)
@@ -1628,6 +2029,7 @@ mitte 'nu commende e cazze sus a 'u buttone pe scangellarle.",
 	'nuke-list-multiple' => "Le pàggene seguende onne state ccrejate recendemende;
 mitte 'nu commende e cazze 'u buttone pe scangellarle.",
 	'nuke-defaultreason' => 'Scangellazzione de masse de le pàggene aggiunde da $1',
+	'nuke-multiplepeople' => 'Scangellazione massive de le pàggene aggiunde de recende',
 	'nuke-tools' => "Stu strumende permette le scangellazziune de masse de le pàggene aggiunde de recende da 'nu certe utende o IP.<br />
 Mitte 'u nome de l'utende o l'indirizze IP pe avè 'n'elenghe de le pàggene de scangellà, o lasse vianghe pe tutte l'utinde.",
 	'nuke-submit-user' => 'Veje',
@@ -1636,23 +2038,29 @@ Mitte 'u nome de l'utende o l'indirizze IP pe avè 'n'elenghe de le pàggene de
 	'nuke-select' => 'Scacchie: $1',
 	'nuke-userorip' => "Nome de l'utende, indirizze IP o vianghe:",
 	'nuke-maxpages' => 'Numere massime de pàggene:',
-	'nuke-multiplepeople' => 'utinde multiple',
 	'nuke-editby' => 'Ccrejate da [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Pàgene '''$1''' ha state scangellate.",
+	'nuke-not-deleted' => "Pàgene [[:$1]] '''non ge pò''' essere scangellate.",
+	'nuke-pattern' => "Segnaposte pu nomed'a pàgene:",
 );
 
 /** Russian (Русский)
+ * @author Eugrus
  * @author HalanTul
+ * @author KPu3uC B Poccuu
  * @author VasilievVV
  * @author Александр Сигачёв
  */
 $messages['ru'] = array(
 	'nuke' => 'Множественное удаление',
+	'action-nuke' => 'массовое удаление страниц',
 	'nuke-desc' => 'Даёт администраторам возможность [[Special:Nuke|множественного удаления]] страниц',
 	'nuke-nopages' => 'Созданий страниц участником [[Special:Contributions/$1|$1]] не найдено в свежих правках.',
 	'nuke-list' => 'Следующие страницы были недавно созданы участником [[Special:Contributions/$1|$1]]. Введите комментарий и нажмите на кнопку для того, чтобы удалить их.',
 	'nuke-list-multiple' => 'Следующие страницы были недавно созданы.
 Оставьте примечание и нажмите кнопку, чтобы удалить их.',
 	'nuke-defaultreason' => 'Множественное удаление страниц, созданных участником $1',
+	'nuke-multiplepeople' => 'Массовое удаление недавно добавленных страниц',
 	'nuke-tools' => 'Эта страница позволяет множественно удалять страницы, недавно созданные определённым участником или с заданного IP-адреса.
 Введите имя участника или IP-адрес, чтобы получить список страниц для удаления, или оставьте поле пустым, если хотите выбрать всех участников.',
 	'nuke-submit-user' => 'Выполнить',
@@ -1661,10 +2069,12 @@ $messages['ru'] = array(
 	'nuke-select' => 'Выбор: $1',
 	'nuke-userorip' => 'Имя участника, IP-адрес (можно оставить пустым):',
 	'nuke-maxpages' => 'Максимальное количество страниц:',
-	'nuke-multiplepeople' => 'нескольких участников',
 	'nuke-editby' => 'Созданные [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Страница '''$1''' была удалена.",
 	'nuke-not-deleted' => "Страницы  [[:$1]] '''не может''' быть удалена.",
+	'nuke-delete-more' => '[[Special:Nuke|Множественное удаление страниц]]',
+	'nuke-pattern' => 'Шаблон для имени страницы:',
+	'nuke-nopages-global' => 'В [[Special:RecentChanges|недавних изменениях]] нет новых страниц.',
 );
 
 /** Rusyn (Русиньскый)
@@ -1672,12 +2082,27 @@ $messages['ru'] = array(
  */
 $messages['rue'] = array(
 	'nuke' => 'Масове вылучіня',
+	'nuke-desc' => 'Дасть адміністраторам [[Special:Nuke|масового змазаня]] сторінок',
+	'nuke-nopages' => 'В остатнїх змінах не суть жадны новы сторінкы од хоснователя [[Special:Contributions/$1|$1]].',
+	'nuke-list' => 'Наступны сторінкы недавно створив хоснователь [[Special:Contributions/$1|$1]]; выповньте коментарь і вшыткы змажте кликнутём на клапку.',
+	'nuke-list-multiple' => 'Недавно были створены наступны сторінкы;
+уведжінём коментаря і стиснутём клапкы їх вымажете.',
+	'nuke-defaultreason' => 'Масове вылучіня сторінок, котры створив $1',
+	'nuke-multiplepeople' => 'дакілько хоснователїв',
+	'nuke-tools' => 'Тот інштрумент доволює масове вылучіня сторінок недавно створеных уведженым хоснователём або IP адресов.
+Уведьте імя хоснователя або IP адресу, зобразить ся список сторінок про змазаня; припадно зохабте порожнє про вшыткых хоснователїв.',
 	'nuke-submit-user' => 'Выконати',
 	'nuke-submit-delete' => 'Змазати выбдарны',
 	'right-nuke' => 'Масове вылучіня сторінок',
+	'nuke-select' => 'Выбрати: $1',
+	'nuke-userorip' => 'Імя хоснователя, IP адреса або зохабте порожнє:',
+	'nuke-maxpages' => 'Максімалне чісло сторінок:',
+	'nuke-editby' => '{{gender:$1|Створивl|Створила|Створив}} [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Сторінка '''$1''' была змазана.",
+	'nuke-not-deleted' => "Сторінка [[:$1]] '''не може''' быти змазана.",
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -1688,6 +2113,7 @@ $messages['sah'] = array(
 	'nuke-list-multiple' => 'Бу сирэйдэр соторутааҕыта оҥоһуллубуттар.
 Соторго быһаарыыта суруйан баран тимэҕи баттаа.',
 	'nuke-defaultreason' => '$1 кыттааччы айбыт сирэйдэрин бүтүннүү суох оҥоруу',
+	'nuke-multiplepeople' => 'элбэх кыттааччы',
 	'nuke-tools' => 'Бу сирэй көмөтүнэн ханнык эмэ кыттааччы оҥорбут көннөрүүлэрин эбэтэр биир IP-ттан оҥоһуллубут көннөрүүлэри бүтүннүү суох гынахха сөп. 
 Кыттааччы аатын эбэтэр IP-тын киллэрдэххинэ оҥорбут көннөрүүлэрин тиһигэ тахсыа, кураанах хааллардаххына бары кыттааччылар көннөрүүлэрэ көстүө.',
 	'nuke-submit-user' => 'Толор',
@@ -1696,7 +2122,6 @@ $messages['sah'] = array(
 	'nuke-select' => 'Талыы: $1',
 	'nuke-userorip' => 'Кыттааччы аата, IP-аадырыһа (кураанах хаалларыахха сөп):',
 	'nuke-maxpages' => 'Сирэй ахсаанын хааччаҕа (максимум):',
-	'nuke-multiplepeople' => 'элбэх кыттааччы',
 	'nuke-editby' => 'Оҥоһуллубуттар [[Special:Contributions/$1|$1]]',
 );
 
@@ -1717,9 +2142,26 @@ $messages['scn'] = array(
 
 /** Sinhala (සිංහල)
  * @author නන්දිමිතුරු
+ * @author පසිඳු කාවින්ද
  */
 $messages['si'] = array(
+	'nuke' => 'සමස්ත මැකීම',
+	'action-nuke' => 'පිටු න්‍යෂ්ටිකරණය',
+	'nuke-desc' => 'පිටුවල [[Special:Nuke|සමස්ත මැකීම]] සඳහා පරිපාලකවරුන්ට අවස්ථාව දෙන්න',
+	'nuke-defaultreason' => '$1 විසින් සමස්ත මැකුම් සඳහා පිටු එක් කරන ලදී',
+	'nuke-multiplepeople' => 'මෑතකදී එක් කල පිටු සඳහා සමස්ත මැකුම',
 	'nuke-submit-user' => 'යන්න',
+	'nuke-submit-delete' => 'තෝරාගත් දෑ මකන්න',
+	'right-nuke' => 'සමස්ත මැකුම් පිටු',
+	'nuke-select' => 'තෝරන්න: $1',
+	'nuke-userorip' => 'පරිශීලකනාමය, අයිපී ලිපිනය හෝ හිස්තැන:',
+	'nuke-maxpages' => 'උපරිම පිටු ගණන:',
+	'nuke-editby' => '[[Special:Contributions/$1|$1]] විසින් තනන ලදී',
+	'nuke-deleted' => "'''$1''' පිටුව මකා දමන ලදි.",
+	'nuke-not-deleted' => "[[:$1]] පිටුව මැකිය '''නොහැක'''.",
+	'nuke-delete-more' => '[[Special:Nuke|තවත් පිටු මකන්න]]',
+	'nuke-pattern' => 'පිටුවේ නම සඳහා රටාව:',
+	'nuke-nopages-global' => '[[Special:RecentChanges|මෑත වෙනස්වීම්වල]]  නව පිටු නොමැත.',
 );
 
 /** Slovak (Slovenčina)
@@ -1733,6 +2175,7 @@ $messages['sk'] = array(
 	'nuke-list-multiple' => 'Tieto stránky boli nedávno vytvorené;
 vložením komentára a stlačením tlačidla ich môžete zmazať.',
 	'nuke-defaultreason' => 'Hromadné odstránenie stránok, ktoré pridal $1',
+	'nuke-multiplepeople' => 'viacerí používatelia',
 	'nuke-tools' => 'Tento nástroj umožňuje hromadné odstránenie stránok, ktoré nedávno pridal zadaný používateľ alebo IP.
 Zadajte používateľa alebo IP a dostanete zoznam stránok na zmazanie. Ponechajte prázdne a použije sa na všetkých používateľov.',
 	'nuke-submit-user' => 'Vykonať',
@@ -1741,7 +2184,6 @@ Zadajte používateľa alebo IP a dostanete zoznam stránok na zmazanie. Ponecha
 	'nuke-select' => 'Vybrať: $1',
 	'nuke-userorip' => 'Používateľské meno, IP adresa alebo prázdne:',
 	'nuke-maxpages' => 'Maximálny počet strán:',
-	'nuke-multiplepeople' => 'viacerí používatelia',
 	'nuke-editby' => 'Vytvoril [[Special:Contributions/$1|$1]]',
 );
 
@@ -1750,6 +2192,7 @@ Zadajte používateľa alebo IP a dostanete zoznam stránok na zmazanie. Ponecha
  */
 $messages['sl'] = array(
 	'nuke' => 'Množični izbris',
+	'action-nuke' => 'množično brisanje',
 	'nuke-desc' => 'Da administratorjem zmožnost [[Special:Nuke|množičnega izbrisa]] strani',
 	'nuke-nopages' => 'Ni novih strani uporabnika [[Special:Contributions/$1|$1]] v zadnjih spremembah.',
 	'nuke-list' => 'Naslednje strani je nedavno ustvaril uporabnik [[Special:Contributions/$1|$1]];
@@ -1757,6 +2200,7 @@ vnesite komentar in pritisnite gumb za njihov izbris.',
 	'nuke-list-multiple' => 'Naslednje strani so bile pred kratkim ustvarjene;
 vnesite pripombo in kliknite gumb, da jih izbrišete.',
 	'nuke-defaultreason' => 'Množično brisanje strani, ki jih je dodal $1',
+	'nuke-multiplepeople' => 'Množični izbris nedavno dodanih strani',
 	'nuke-tools' => 'To orodje omogoča množični izbris strani, ki jih je nedavno ustvaril določen uporabnik ali IP.
 Vnesite uporabniško ime ali IP, da pridobite seznam strani za izbris, ali pustite prazno za vse uporabnike.',
 	'nuke-submit-user' => 'Pojdi',
@@ -1765,30 +2209,34 @@ Vnesite uporabniško ime ali IP, da pridobite seznam strani za izbris, ali pusti
 	'nuke-select' => 'Izberite: $1',
 	'nuke-userorip' => 'Uporabniško ime, IP-naslov ali prazno:',
 	'nuke-maxpages' => 'Največje število strani:',
-	'nuke-multiplepeople' => 'več oseb',
 	'nuke-editby' => 'Ustvaril(-a) [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Stran '''$1''' je bila izbrisana.",
 	'nuke-not-deleted' => "Strani [[:$1]] '''ni bilo mogoče''' izbrisati.",
+	'nuke-delete-more' => '[[Special:Nuke|Izbriši več strani]]',
+	'nuke-pattern' => 'Vzorec imena strani:',
+	'nuke-nopages-global' => 'V [[Special:RecentChanges|zadnjih spremembah]] ni novih strani.',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Millosh
  * @author Rancher
  * @author Жељко Тодоровић
  */
 $messages['sr-ec'] = array(
 	'nuke' => 'Масовно брисање',
+	'action-nuke' => 'масовно брисање страница',
 	'nuke-desc' => 'Даје администратору могућност да [[Special:Nuke|масовно брише]] странице.',
 	'nuke-nopages' => 'Нема нових страница од стране корисника [[Special:Contributions/$1|$1]] у скорашњим изменама.',
 	'nuke-list' => 'Следеће странице је скоро направио корисник [[Special:Contributions/$1|$1]]; коментариши и притисни дугме за њихово брисање.',
 	'nuke-defaultreason' => 'Масовно брисање страница које је направио корисник $1',
-	'nuke-tools' => 'Ово оруђе омогућава масовно брисање страница које је скоро додао одређени корисник (регистрован или не). Унеси корисничко име или ИП адресу за добијање списка страница за брисање.',
+	'nuke-tools' => 'Ова алатка омогућава збирно брисање страница које је недавно додао одређени корисник (са налогом или без њега).
+Унесите корисничко име или ИП адресу да бисте добили списак страница за брисање, или оставите празно ако желите да се наведу сви корисници.',
 	'nuke-submit-user' => 'Иди',
 	'nuke-submit-delete' => 'Обриши изабрано',
 	'right-nuke' => 'масовно брисање страница',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Michaello
  * @author Жељко Тодоровић
  */
@@ -1798,7 +2246,8 @@ $messages['sr-el'] = array(
 	'nuke-nopages' => 'Nema novih stranica od strane korisnika [[Special:Contributions/$1|$1]] u skorašnjim izmenama.',
 	'nuke-list' => 'Sledeće stranice je skoro napravio korisnik [[Special:Contributions/$1|$1]]; komentariši i pritisni dugme za njihovo brisanje.',
 	'nuke-defaultreason' => 'Masovno brisanje stranica koje je napravio korisnik $1.',
-	'nuke-tools' => 'Ovo oruđe omogućava masovno brisanje stranica koje je skoro dodao određeni korisnik (registrovan ili ne). Unesi korisničko ime ili IP adresu za dobijanje spiska stranica za brisanje.',
+	'nuke-tools' => 'Ova alatka omogućava zbirno brisanje stranica koje je nedavno dodao određeni korisnik (sa nalogom ili bez njega).
+Unesite korisničko ime ili IP adresu da biste dobili spisak stranica za brisanje, ili ostavite prazno ako želite da se navedu svi korisnici.',
 	'nuke-submit-user' => 'Idi',
 	'nuke-submit-delete' => 'Obriši obeleženo',
 	'right-nuke' => 'Masovno brisanje strana.',
@@ -1839,19 +2288,28 @@ tuliskeun pamanggih anjeun, terus pencét tombolna pikeun ngahapus.',
 /** Swedish (Svenska)
  * @author Lejonel
  * @author Tobulos1
+ * @author WikiPhoenix
  */
 $messages['sv'] = array(
 	'nuke' => 'Massradering',
 	'nuke-desc' => 'Gör det möjligt för administratörer att [[Special:Nuke|massradera]] sidor',
 	'nuke-nopages' => 'Inga nya sidor av [[Special:Contributions/$1|$1]] bland de senaste ändringarna.',
 	'nuke-list' => 'Följande sidor har nyligen skapats av [[Special:Contributions/$1|$1]]. Skriv en raderingskommentar och klicka på knappen för att ta bort dem.',
+	'nuke-list-multiple' => 'Följande sidor skapades nyligen;
+skriv in en kommentar och tryck på knappen för att radera dem.',
 	'nuke-defaultreason' => 'Massradering av sidor skapade av $1',
+	'nuke-multiplepeople' => 'Massradering av nyligen tillagda sidor',
 	'nuke-tools' => 'Det här verktyget gör det möjligt att massradera sidor som nyligen skapats av en viss användare eller IP-adress.
-Ange ett användarnamn eller en IP-adress för att se en lista över sidor som kan tas bort.',
+Ange användarnamnet eller IP-adressen för att se en lista över sidor som kan tas bort, eller lämna tomt för alla användare.',
 	'nuke-submit-user' => 'Visa',
 	'nuke-submit-delete' => 'Ta bort valda',
 	'right-nuke' => 'Massradera sidor',
 	'nuke-select' => 'Välj: $1',
+	'nuke-userorip' => 'Användarnamn, IP-adress eller tomt:',
+	'nuke-maxpages' => 'Maximalt antal sidor:',
+	'nuke-editby' => 'Skapades av [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Sidan '''$1''' har raderats.",
+	'nuke-not-deleted' => "Sidan [[:$1]] '''kunde inte''' raderas.",
 );
 
 /** Swahili (Kiswahili) */
@@ -1875,13 +2333,13 @@ $messages['te'] = array(
 	'nuke-nopages' => 'ఇటీవలి మార్పులలో [[Special:Contributions/$1|$1]] సృష్టించిన కొత్త పేజీలేమీ లేవు.',
 	'nuke-list' => 'ఈ క్రింద పేర్కొన్న పేజీలను [[Special:Contributions/$1|$1]] ఇటీవలే సృష్టించారు; వాటిని తొలగించడానికి ఎందుకో ఓ వ్యాఖ్య రాసి ఆతర్వాత తొలగించు అన్న బొత్తం నొక్కండి.',
 	'nuke-defaultreason' => '$1 చేర్చిన పేజీల యొక్క సామూహిక తొలగింపు',
+	'nuke-multiplepeople' => 'ఇటీవల సృష్టించిన పేజీల యొక్క సామూహిక తొలగింపు',
 	'nuke-tools' => 'ఓ ప్రత్యేక వాడుకరి లేదా IP చేర్చిన పేజీలను ఒక్కసారిగా తొలగించడానికి ఈ పనిముట్టు వీలుకల్పిస్తుంది. పేజీల జాబితాని పొందడానికి ఆ వాడుకరిపేరుని లేదా IPని ఇవ్వండి:',
 	'nuke-submit-user' => 'వెళ్ళు',
 	'nuke-submit-delete' => 'ఎంచుకున్నవి తొలగించు',
 	'right-nuke' => 'పేజీలను సామూహికంగా తొలగించడం',
 	'nuke-select' => 'ఎంచుకోండి: $1',
 	'nuke-maxpages' => 'గరిష్ఠ పుటల సంఖ్య:',
-	'nuke-multiplepeople' => 'పలు వాడుకరులు',
 );
 
 /** Tetum (Tetun)
@@ -1891,7 +2349,7 @@ $messages['tet'] = array(
 	'nuke-submit-user' => 'Bá',
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (Тоҷикӣ)
  * @author Ibrahim
  */
 $messages['tg-cyrl'] = array(
@@ -1906,7 +2364,7 @@ $messages['tg-cyrl'] = array(
 	'right-nuke' => 'Ҳазфи дастаҷамъии саҳифаҳо',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -1950,6 +2408,7 @@ maglagay/magpasok ng isang puna (kumento) at pindutin ang pindutan upang mabura
 	'nuke-list-multiple' => 'Ang sumusunod na mga pahina ay kamakailan lamang nalikha;
 maglagay ng isang puna at pindutin ang pindutan upang mabura ang mga ito.',
 	'nuke-defaultreason' => 'Idinagdag ni $1 ang malawakang pagbubura ng mga pahina',
+	'nuke-multiplepeople' => 'maramihang mga tagagamit',
 	'nuke-tools' => 'Nagpapahintulot ang kagamitang ito upang mabura ng malawakan ang mga pahinang idinagdag kamakailan ng isang ibinigay na tagagamit o tirahan ng IP.
 Ipasok ang pangalan ng tagagamit o tirahan ng IP upang makakuha ng isang talaan ng mga pahinang buburahin, o iwanang walang laman para sa lahat ng mga tagagamit.',
 	'nuke-submit-user' => 'Gawin',
@@ -1958,7 +2417,6 @@ Ipasok ang pangalan ng tagagamit o tirahan ng IP upang makakuha ng isang talaan
 	'nuke-select' => 'Piliin: $1',
 	'nuke-userorip' => 'Pangalan ng tagagamit, Tirahan ng IP o walang laman:',
 	'nuke-maxpages' => 'Pinakamaraming bilang ng mga pahina:',
-	'nuke-multiplepeople' => 'maramihang mga tagagamit',
 	'nuke-editby' => 'Nilikha ni [[Special:Contributions/$1|$1]]',
 );
 
@@ -1983,7 +2441,7 @@ Silinecek sayfaların listesini almak için kullanıcı adını ya da IPyi girin
 	'nuke-select' => 'Seçilmiş: $1',
 );
 
-/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic))
+/** Tatar (Cyrillic script) (Татарча)
  * @author Ильнар
  */
 $messages['tt-cyrl'] = array(
@@ -1991,14 +2449,14 @@ $messages['tt-cyrl'] = array(
 	'right-nuke' => 'битләрне күпләп бетерү',
 );
 
-/** ئۇيغۇرچە (ئۇيغۇرچە)
+/** Uyghur (Arabic script) (ئۇيغۇرچە)
  * @author Alfredie
  */
 $messages['ug-arab'] = array(
 	'nuke-submit-user' => 'كۆچۈش',
 );
 
-/** Uighur (Latin) (ئۇيغۇرچە / Uyghurche‎ (Latin))
+/** Uyghur (Latin script) (Uyghurche‎)
  * @author Jose77
  */
 $messages['ug-latn'] = array(
@@ -2007,6 +2465,7 @@ $messages['ug-latn'] = array(
 
 /** Ukrainian (Українська)
  * @author Ahonc
+ * @author Dim Grits
  * @author Тест
  */
 $messages['uk'] = array(
@@ -2015,15 +2474,21 @@ $messages['uk'] = array(
 	'nuke-nopages' => 'У нових редагуваннях не знайдено сторінок, створених користувачем [[Special:Contributions/$1|$1]].',
 	'nuke-list' => 'Наступні сторінки були нещодавно створені користувачем [[Special:Contributions/$1|$1]].
 Уведіть коментар і натисніть на кнопку для того, щоб вилучити їх.',
+	'nuke-list-multiple' => 'Ці сторінки були нещодавно створені.
+Залиште примітку й натисніть кнопку, щоб вилучити.',
 	'nuke-defaultreason' => 'Масове вилучення сторінок, створених користувачем $1',
-	'nuke-tools' => "Ця сторінка дозволяє масово вилучати сторінки, створені певним користувачем або з певної IP-адреси.
-Уведіть ім'я користувача або IP для того, щоб отримати список створених ним сторінок:",
+	'nuke-multiplepeople' => 'Масове вилучення недавно доданих сторінок',
+	'nuke-tools' => "Цей інструмент дозволяє масово вилучати сторінки, створені певним користувачем або з певної IP-адреси.
+Уведіть ім'я користувача або IP-адресу для того, щоб отримати список сторінок для вилучення, або залиште поле порожнім для вибору усіх користувачів.",
 	'nuke-submit-user' => 'Виконати',
 	'nuke-submit-delete' => 'Вилучити обрані',
 	'right-nuke' => 'Масове вилучення сторінок',
 	'nuke-select' => 'Вибір: $1',
+	'nuke-userorip' => "Ім'я користувача, IP-адреса (за бажанням):",
 	'nuke-maxpages' => 'Максимальна кількість сторінок:',
 	'nuke-editby' => 'Створені [[Special:Contributions/$1|$1]]',
+	'nuke-deleted' => "Сторінка '''$1''' була вилучена.",
+	'nuke-not-deleted' => "Сторінка [[:$1]] '''не може''' бути вилучена.",
 );
 
 /** Vèneto (Vèneto)
@@ -2056,12 +2521,14 @@ $messages['vep'] = array(
  */
 $messages['vi'] = array(
 	'nuke' => 'Xóa hàng loạt',
+	'action-nuke' => 'xóa hàng loạt trang',
 	'nuke-desc' => 'Cung cấp cho bảo quản viên khả năng [[Special:Nuke|xóa trang hàng loạt]]',
 	'nuke-nopages' => 'Không có trang mới do [[Special:Contributions/$1|$1]] tạo ra trong thay đổi gần đây.',
 	'nuke-list' => 'Các trang sau do [[Special:Contributions/$1|$1]] tạo ra gần đây; hãy ghi lý do và nhấn nút để xóa tất cả những trang này.',
 	'nuke-list-multiple' => 'Các trang sau được tạo ra gần đây.
 Đưa vào lý do và bấm nút để xóa chúng.',
 	'nuke-defaultreason' => 'Xóa hàng loạt các trang do $1 tạo ra',
+	'nuke-multiplepeople' => 'Xóa hàng loạt các trang được tạo gần đây',
 	'nuke-tools' => 'Công cụ này cho phép xóa hàng loạt các trang do một thành viên hoặc người dùng địa chỉ IP nào đó tạo ra gần đây.
 Hãy nhập tên thành viên hoặc địa chỉ IP để lấy danh sách các trang sẽ xóa, hoặc để trống để xem các trang của mọi người dùng.',
 	'nuke-submit-user' => 'Tìm kiếm',
@@ -2070,10 +2537,12 @@ Hãy nhập tên thành viên hoặc địa chỉ IP để lấy danh sách các
 	'nuke-select' => 'Chọn: $1',
 	'nuke-userorip' => 'Tên thành viên, địa chỉ IP, hoặc trống:',
 	'nuke-maxpages' => 'Số trang tối đa:',
-	'nuke-multiplepeople' => 'hơn một người',
 	'nuke-editby' => 'Được tạo bởi [[Special:Contributions/$1|$1]]',
 	'nuke-deleted' => "Đã xóa trang '''$1'''.",
 	'nuke-not-deleted' => "'''Không thể''' xóa trang [[:$1]].",
+	'nuke-delete-more' => '[[Special:Nuke|Xóa thêm trang]]',
+	'nuke-pattern' => 'Mẫu tên trang:',
+	'nuke-nopages-global' => 'Không có trang mới trong các [[Special:RecentChanges|thay đổi gần đây]].',
 );
 
 /** Volapük (Volapük)
@@ -2092,10 +2561,12 @@ $messages['vo'] = array(
 );
 
 /** Yiddish (ייִדיש)
+ * @author Imre
  * @author פוילישער
  */
 $messages['yi'] = array(
 	'nuke-submit-user' => 'צייגן',
+	'nuke-select' => 'אויסוויילן: $1',
 );
 
 /** Cantonese (粵語)
@@ -2114,6 +2585,7 @@ $messages['yue'] = array(
 );
 
 /** Simplified Chinese (‪中文(简体)‬)
+ * @author Anakmalaysia
  * @author Gaoxuewei
  * @author Hydra
  * @author Liangent
@@ -2124,39 +2596,54 @@ $messages['yue'] = array(
  */
 $messages['zh-hans'] = array(
 	'nuke' => '大量删除',
-	'nuke-desc' => '使系统管理员具有[[Special:Nuke|大量删除]]页面的能力',
-	'nuke-nopages' => '在最近更改中没有[[Special:Contributions/$1|$1]]所作的新页面。',
-	'nuke-list' => '以下页面是由[[Special:Contributions/$1|$1]]最新创建的；
-请留下摘要信息，并点击按钮删除这些页面。',
-	'nuke-list-multiple' => '最近创建以下页面 ；
-在注释中，点击要删除它们。',
-	'nuke-defaultreason' => '大量删除由$1所创建的页面',
-	'nuke-tools' => '此工具允许大规模删除指定用户或 IP 地址最近添加的页面。
-输入用户名或 IP 地址以获取可删除页面的列表，空白则检索所有用户。',
-	'nuke-submit-user' => '提交',
-	'nuke-submit-delete' => '删除已选择的',
+	'action-nuke' => '大量删除页面',
+	'nuke-desc' => '让管理员可以[[Special:Nuke|大量删除]]页面',
+	'nuke-nopages' => '在最近更改中没有[[Special:Contributions/$1|$1]]创建的新页面。',
+	'nuke-list' => '以下为[[Special:Contributions/$1|$1]]最近创建的页面，请填写注释并点击按钮删除它们。',
+	'nuke-list-multiple' => '以下为最近创建的页面，请填写注释并点击按钮删除它们。',
+	'nuke-defaultreason' => '大量删除$1创建的页面',
+	'nuke-multiplepeople' => '大量删除最近添加的页面',
+	'nuke-tools' => '此工具允许大量删除指定用户或IP地址在最近创建的页面。输入用户名或IP地址可获取可删除页面列表，留白则检索所有用户。',
+	'nuke-submit-user' => '执行',
+	'nuke-submit-delete' => '删除所选',
 	'right-nuke' => '大量删除页面',
-	'nuke-select' => '选定：$1',
-	'nuke-userorip' => 'IP 地址或空白的用户名：',
-	'nuke-maxpages' => '最大页面：',
-	'nuke-multiplepeople' => '多个用户',
-	'nuke-editby' => '与 [[Special:Contributions/$1|$1]]创建的',
+	'nuke-select' => '选择：$1',
+	'nuke-userorip' => '用户名、IP地址或空白：',
+	'nuke-maxpages' => '最多页面数：',
+	'nuke-editby' => '由[[Special:Contributions/$1|$1]]创建',
+	'nuke-deleted' => "已删除页面'''$1'''。",
+	'nuke-not-deleted' => "'''无法'''删除[[:$1]]页面。",
+	'nuke-delete-more' => '[[Special:Nuke|删除更多页面]]',
+	'nuke-pattern' => '页面名称的模式：',
+	'nuke-nopages-global' => '[[Special:RecentChanges|最近更改]]中没有新的页面。',
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
+ * @author Anakmalaysia
  * @author Mark85296341
  * @author Shinjiman
  */
 $messages['zh-hant'] = array(
 	'nuke' => '大量刪除',
+	'action-nuke' => '大量刪除頁面',
 	'nuke-desc' => '給操作員作出[[Special:Nuke|大量刪除]]的能力',
 	'nuke-nopages' => '在最近更改中沒有 [[Special:Contributions/$1|$1]] 所作的新頁面。',
 	'nuke-list' => '以下的頁面是由[[Special:Contributions/$1|$1]]在以前所寫的；記下一個註解再點擊按鈕去刪除它們。',
+	'nuke-list-multiple' => '以下為最近創建的頁面，請填寫註釋並點擊按鈕刪除它們。',
 	'nuke-defaultreason' => '大量刪除由 $1 所建立的頁面',
-	'nuke-tools' => '這個工具容許先前提供了的用戶或 IP 位址建立的頁面。輸入用戶名或IP去取得頁面列表以作刪除：',
+	'nuke-multiplepeople' => '大量刪除最近添加的頁面',
+	'nuke-tools' => '此工具允許大量刪除指定用戶或IP地址在最近創建的頁面。輸入用戶名或IP地址可獲取可刪除頁面列表，留白則檢索所有用戶。',
 	'nuke-submit-user' => '執行',
 	'nuke-submit-delete' => '刪除已選擇的',
 	'right-nuke' => '大量刪除頁面',
 	'nuke-select' => '選擇：$1',
+	'nuke-userorip' => '用戶名、IP地址或空白：',
+	'nuke-maxpages' => '最多頁面數：',
+	'nuke-editby' => '由[[Special:Contributions/$1|$1]]創建',
+	'nuke-deleted' => "'''$1'''頁面已刪除。",
+	'nuke-not-deleted' => "'''無法'''刪除[[:$1]]頁面。",
+	'nuke-delete-more' => '[[Special:Nuke|刪除更多頁面]]',
+	'nuke-pattern' => '頁面名稱的模式：',
+	'nuke-nopages-global' => '[[Special:RecentChanges|最近更改]]中沒有新的頁面。',
 );
 
diff --git a/extensions/Nuke/Nuke.php b/extensions/Nuke/Nuke.php
index 28c7cda1..70b31291 100644
--- a/extensions/Nuke/Nuke.php
+++ b/extensions/Nuke/Nuke.php
@@ -4,19 +4,19 @@ if( !defined( 'MEDIAWIKI' ) ) {
 	die( 'Not an entry point.' );
 }
 
-define( 'Nuke_VERSION', '1.1' );
+define( 'Nuke_VERSION', '1.1.3' );
 
 $dir = dirname(__FILE__) . '/';
 
 $wgExtensionMessagesFiles['Nuke'] = $dir . 'Nuke.i18n.php';
-$wgExtensionAliasesFiles['Nuke'] = $dir . 'Nuke.alias.php';
+$wgExtensionMessagesFiles['NukeAlias'] = $dir . 'Nuke.alias.php';
 
 $wgExtensionCredits['specialpage'][] = array(
 	'path'           => __FILE__,
 	'name'           => 'Nuke',
 	'descriptionmsg' => 'nuke-desc',
-	'author'         => 'Brion Vibber',
-	'url'            => 'http://www.mediawiki.org/wiki/Extension:Nuke',
+	'author'         => array( 'Brion Vibber', 'Jeroen De Dauw' ),
+	'url'            => 'https://www.mediawiki.org/wiki/Extension:Nuke',
 	'version'        => Nuke_VERSION,
 );
 
@@ -26,3 +26,19 @@ $wgAvailableRights[] = 'nuke';
 $wgAutoloadClasses['SpecialNuke'] = $dir . 'Nuke_body.php';
 $wgSpecialPages['Nuke'] = 'SpecialNuke';
 $wgSpecialPageGroups['Nuke'] = 'pagetools';
+
+// Resource loader modules
+$moduleTemplate = array(
+	'localBasePath' => dirname( __FILE__ ) . '/',
+	'remoteExtPath' => 'Nuke/'
+);
+
+$wgResourceModules['ext.nuke'] = $moduleTemplate + array(
+	'scripts' => array(
+		'ext.nuke.js'
+	),
+	'messages' => array(
+	)
+);
+
+unset( $moduleTemplate );
diff --git a/extensions/Nuke/Nuke_body.php b/extensions/Nuke/Nuke_body.php
index faa205ca..4fdc0809 100644
--- a/extensions/Nuke/Nuke_body.php
+++ b/extensions/Nuke/Nuke_body.php
@@ -1,64 +1,69 @@
 <?php
 
 class SpecialNuke extends SpecialPage {
-	
+
 	public function __construct() {
 		parent::__construct( 'Nuke', 'nuke' );
 	}
 
-	public function execute( $par ){
-		global $wgUser, $wgRequest;
-
-		if( !$this->userCanExecute( $wgUser ) ){
+	public function execute( $par ) {
+		if( !$this->userCanExecute( $this->getUser() ) ) {
 			$this->displayRestrictionError();
 			return;
 		}
 
 		$this->setHeaders();
 		$this->outputHeader();
-		
-		if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ) ) ) {
-			$target = $wgRequest->getText( 'target', $par );
-				
-			// Normalise name
-			if ( $target !== '' ) {
-				$user = User::newFromName( $target );
-				if ( $user ) $target = $user->getName();
-			}
 
-			$reason = $wgRequest->getText(
-				'wpReason',
-				wfMsgForContent(
-					'nuke-defaultreason',
-					$target === '' ? wfMsg( 'nuke-multiplepeople' ) : $target
-				)
-			);
-			
-			if ( $wgRequest->getVal( 'action' ) == 'delete' ) {
-				$pages = $wgRequest->getArray( 'pages' );
-				
+		$req = $this->getRequest();
+
+		$target = trim( $req->getText( 'target', $par ) );
+
+		// Normalise name
+		if ( $target !== '' ) {
+			$user = User::newFromName( $target );
+			if ( $user ) $target = $user->getName();
+		}
+
+		$reason = $req->getText( 'wpReason',
+			$target === '' ?
+				wfMsgForContent( 'nuke-multiplepeople' ) :
+				wfMsgForContent( 'nuke-defaultreason', "[[Special:Contributions/$target|$target]]" )
+		);
+
+		if( $req->wasPosted()
+			&& $this->getUser()->matchEditToken( $req->getVal( 'wpEditToken' ) ) ) {
+
+			if ( $req->getVal( 'action' ) == 'delete' ) {
+				$pages = $req->getArray( 'pages' );
+
 				if( $pages ) {
-					return $this->doDelete( $pages, $reason );
+					$this->doDelete( $pages, $reason );
+					return;
 				}
+			} elseif ( $req->getVal( 'action' ) == 'submit' ) {
+				$this->listForm( $target, $reason, $req->getInt( 'limit', 500 ) );
+			} else {
+				$this->promptForm();
 			}
-			else {
-				$this->listForm( $target, $reason, $wgRequest->getInt( 'limit' ) );
-			}
-		}
-		else {
+		} elseif ( $target === '' ) {
 			$this->promptForm();
+		} else {
+			$this->listForm( $target, $reason, $req->getInt( 'limit', 500 ) );
 		}
 	}
 
 	/**
 	 * Prompt for a username or IP address.
+	 *
+	 * @param $userName string
 	 */
-	protected function promptForm() {
-		global $wgOut, $wgUser;
+	protected function promptForm( $userName = '' ) {
+		$out = $this->getOutput();
+
+		$out->addWikiMsg( 'nuke-tools' );
 
-		$wgOut->addWikiMsg( 'nuke-tools' );
-		
-		$wgOut->addHTML(
+		$out->addHTML(
 			Xml::openElement(
 				'form',
 				array(
@@ -67,150 +72,153 @@ class SpecialNuke extends SpecialPage {
 				)
 			)
 			. '<table><tr>'
-				. '<td>' . htmlspecialchars( wfMsg( 'nuke-userorip' ) ) . '</td>'
-				. '<td>' . Xml::input( 'target', 40 ) . '</td>'
+				. '<td>' . Xml::label( wfMsg( 'nuke-userorip' ), 'nuke-target' ) . '</td>'
+				. '<td>' . Xml::input( 'target', 40, $userName, array( 'id' => 'nuke-target' ) ) . '</td>'
+			. '</tr><tr>'
+				. '<td>' . Xml::label( wfMsg( 'nuke-pattern' ), 'nuke-pattern' ) . '</td>'
+				. '<td>' . Xml::input( 'pattern', 40, '', array( 'id' => 'nuke-pattern' ) ) . '</td>'
 			. '</tr><tr>'
-				. '<td>' . htmlspecialchars( wfMsg( 'nuke-maxpages' ) ) . '</td>'
-				. '<td>' . Xml::input( 'limit', 7, '500' ) . '</td>'
+				. '<td>' . Xml::label( wfMsg( 'nuke-maxpages' ), 'nuke-limit' ) . '</td>'
+				. '<td>' . Xml::input( 'limit', 7, '500', array( 'id' => 'nuke-limit' ) ) . '</td>'
 			. '</tr><tr>'
 				. '<td></td>'
 				. '<td>' . Xml::submitButton( wfMsg( 'nuke-submit-user' ) ) . '</td>'
-			.'</tr></table>'  
-			. Html::hidden( 'wpEditToken', $wgUser->editToken() ) 
+			.'</tr></table>'
+			. Html::hidden( 'wpEditToken', $this->getUser()->editToken() )
 			. Xml::closeElement( 'form' )
 		);
 	}
 
 	/**
 	 * Display list of pages to delete.
-	 * 
+	 *
 	 * @param string $username
 	 * @param string $reason
 	 * @param integer $limit
 	 */
 	protected function listForm( $username, $reason, $limit ) {
-		global $wgUser, $wgOut, $wgLang;
+		$out = $this->getOutput();
 
 		$pages = $this->getNewPages( $username, $limit );
 
 		if( count( $pages ) == 0 ) {
-			$wgOut->addWikiMsg( 'nuke-nopages', $username );
-			return $this->promptForm();
-		}
-		
-		if ( $username == '' ) {
-			$wgOut->addWikiMsg( 'nuke-list-multiple' );
+			if ( $username === '' ) {
+				$out->addWikiMsg( 'nuke-nopages-global' );
+			} else {
+				$out->addWikiMsg( 'nuke-nopages', $username );
+			}
+
+			$this->promptForm( $username );
+			return;
 		}
-		else {
-			$wgOut->addWikiMsg( 'nuke-list', $username );
+
+		if ( $username === '' ) {
+			$out->addWikiMsg( 'nuke-list-multiple' );
+		} else {
+			$out->addWikiMsg( 'nuke-list', $username );
 		}
 
 		$nuke = $this->getTitle();
 
-		$script = <<<JAVASCRIPT
-<script type="text/javascript">
-function selectPages( bool ) {
-	var inputs = document.getElementsByTagName("input");
-	for (i = 0; i < inputs.length; i++) {
-		if (inputs[i].type == "checkbox") {
-			inputs[i].checked = bool;
-		}
-	}
-}
-</script>
-JAVASCRIPT;
-		$wgOut->addScript( $script );
+		$out->addModules( 'ext.nuke' );
 
-		$wgOut->addHTML(
+		$out->addHTML(
 			Xml::openElement( 'form', array(
 				'action' => $nuke->getLocalURL( 'action=delete' ),
 				'method' => 'post',
 				'name' => 'nukelist')
 			) .
-			Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
+			Html::hidden( 'wpEditToken', $this->getUser()->editToken() ) .
 			Xml::tags( 'p',
 				null,
 				Xml::inputLabel(
-					wfMsg( 'deletecomment' ), 'wpReason', 'wpReason', 60, $reason
+					wfMsg( 'deletecomment' ), 'wpReason', 'wpReason', 70, $reason
 				)
 			)
 		);
 
 		// Select: All, None
 		$links = array();
-		$links[] = '<a href="#" onclick="selectPages( true ); return false;">' . 
+		$links[] = '<a href="#" id="toggleall">' .
 			wfMsg( 'powersearch-toggleall' ) . '</a>';
-		$links[] = '<a href="#" onclick="selectPages( false ); return false;">' . 
+		$links[] = '<a href="#" id="togglenone">' .
 			wfMsg( 'powersearch-togglenone' ) . '</a>';
-		$wgOut->addHTML(
+		$out->addHTML(
 			Xml::tags( 'p',
 				null,
-				wfMsg( 'nuke-select', $wgLang->commaList( $links ) )
+				wfMsg( 'nuke-select', $this->getLanguage()->commaList( $links ) )
 			)
 		);
 
 		// Delete button
-		$wgOut->addHTML(
+		$out->addHTML(
 			Xml::submitButton( wfMsg( 'nuke-submit-delete' ) )
 		);
 
-		$wgOut->addHTML( '<ul>' );
+		$out->addHTML( '<ul>' );
 
-		$sk = $wgUser->getSkin();
 		foreach( $pages as $info ) {
+			/**
+			 * @var $title Title
+			 */
 			list( $title, $edits, $userName ) = $info;
+
 			$image = $title->getNamespace() == NS_IMAGE ? wfLocalFile( $title ) : false;
 			$thumb = $image && $image->exists() ? $image->transform( array( 'width' => 120, 'height' => 120 ), 0 ) : false;
 
-			$changes = wfMsgExt( 'nchanges', 'parsemag', $wgLang->formatNum( $edits ) );
-			
-			$wgOut->addHTML( '<li>' .
+			$changes = wfMsgExt( 'nchanges', 'parsemag', $this->getLanguage()->formatNum( $edits ) );
+
+			$out->addHTML( '<li>' .
 				Xml::check( 'pages[]', true,
 					array( 'value' =>  $title->getPrefixedDbKey() )
 				) .
 				'&#160;' .
 				( $thumb ? $thumb->toHtml( array( 'desc-link' => true ) ) : '' ) .
-				$sk->makeKnownLinkObj( $title ) .
+				Linker::linkKnown( $title ) .
 				'&#160;(' .
 				( $userName ? wfMsgExt( 'nuke-editby', 'parseinline', $userName ) . ',&#160;' : '' ) .
-				$sk->makeKnownLinkObj( $title, $changes, 'action=history' ) .
+				Linker::linkKnown( $title, $changes, array(), array('action' => 'history' ) ) .
 				")</li>\n" );
 		}
-		
-		$wgOut->addHTML(
+
+		$out->addHTML(
 			"</ul>\n" .
 			Xml::submitButton( wfMsg( 'nuke-submit-delete' ) ) .
-			"</form>"
+			'</form>'
 		);
 	}
 
 	/**
 	 * Gets a list of new pages by the specified user or everyone when none is specified.
-	 * 
+	 *
 	 * @param string $username
 	 * @param integer $limit
-	 * 
+	 *
 	 * @return array
 	 */
 	protected function getNewPages( $username, $limit ) {
 		$dbr = wfGetDB( DB_SLAVE );
-		
+
 		$what = array(
 			'rc_namespace',
 			'rc_title',
 			'rc_timestamp',
 			'COUNT(*) AS edits'
-		);		
-		
+		);
+
 		$where = array( "(rc_new = 1) OR (rc_log_type = 'upload' AND rc_log_action = 'upload')" );
-		
-		if ( $username == '' ) {
+
+		if ( $username === '' ) {
 			$what[] = 'rc_user_text';
-		}
-		else {
+		} else {
 			$where['rc_user_text'] = $username;
 		}
-		
+
+		$pattern = $this->getRequest()->getText( 'pattern' );
+		if ( !is_null( $pattern ) && trim( $pattern ) !== '' ) {
+			$where[] = 'rc_title LIKE ' . $dbr->addQuotes( $pattern );
+		}
+
 		$result = $dbr->select( 'recentchanges',
 			$what,
 			$where,
@@ -221,9 +229,9 @@ JAVASCRIPT;
 				'LIMIT' => $limit
 			)
 		);
-		
+
 		$pages = array();
-		
+
 		foreach ( $result as $row ) {
 			$pages[] = array(
 				Title::makeTitle( $row->rc_namespace, $row->rc_title ),
@@ -231,22 +239,19 @@ JAVASCRIPT;
 				$username == '' ? $row->rc_user_text : false
 			);
 		}
-		
-		$dbr->freeResult( $result );
-		
+
 		return $pages;
 	}
 
 	/**
 	 * Does the actual deletion of the pages.
-	 * 
+	 *
 	 * @param array $pages The pages to delete
 	 * @param string $reason
 	 */
 	protected function doDelete( array $pages, $reason ) {
-		global $wgOut;
-
 		$res = array();
+
 		foreach( $pages as $page ) {
 			$title = Title::newFromURL( $page );
 			$file = $title->getNamespace() == NS_FILE ? wfLocalFile( $title ) : false;
@@ -263,6 +268,10 @@ JAVASCRIPT;
 				$res[] = wfMsgExt( 'nuke-not-deleted', array( 'parseinline' ), $title->getPrefixedText() );
 			}
 		}
-		$wgOut->addHTML( "<ul>\n<li>" .implode( "</li>\n<li>", $res ) . "</li>\n</ul>\n" );
+
+		$this->getOutput()->addHTML( "<ul>\n<li>" . implode( "</li>\n<li>", $res ) . "</li>\n</ul>\n" );
+
+		$this->getOutput()->addWikiMsg( 'nuke-delete-more' );
 	}
+
 }
diff --git a/extensions/Nuke/ext.nuke.js b/extensions/Nuke/ext.nuke.js
new file mode 100644
index 00000000..c3260946
--- /dev/null
+++ b/extensions/Nuke/ext.nuke.js
@@ -0,0 +1,18 @@
+/**
+ * JavasSript for the Nuke MediaWiki extension.
+ * @see https://www.mediawiki.org/wiki/Extension:Nuke
+ *
+ * @licence GNU GPL v2 or later
+ * @author Jeroen De Dauw <jeroendedauw at gmail dot com>
+ */
+
+(function( $, mw ) { $( document ).ready( function() {
+	
+	function selectPages( check ) {
+		$( 'input[type=checkbox]' ).prop( 'checked', check )
+	}
+	
+	$( '#toggleall' ).click( function(){ selectPages( true ); } );
+	$( '#togglenone' ).click( function(){ selectPages( false ); } );
+	
+} ); })( window.jQuery, window.mediaWiki );
+\ No newline at end of file
diff --git a/extensions/ParserFunctions/Convert.php b/extensions/ParserFunctions/Convert.php
index 2ae54d19..cdfd2232 100644
--- a/extensions/ParserFunctions/Convert.php
+++ b/extensions/ParserFunctions/Convert.php
@@ -54,6 +54,8 @@ class ConvertParser {
 	# The last value converted, which will be used for PLURAL evaluation
 	protected $lastValue;
 
+	protected $precision;
+
 	/**
 	 * Reset the parser so it isn't contaminated by the results of previous parses
 	 */
@@ -182,6 +184,19 @@ class ConvertParser {
 			);
 		}
 
+		# If the Language hasn't been deliberately specified, get it from the wiki's
+		# content language, but run it through a configurable map first
+		if( $this->language === true ){
+			global $wgContLang, $wgPFUnitLanguageVariants;
+			$code = $wgContLang->getCode();
+			if( isset( $wgPFUnitLanguageVariants[$code] ) ){
+				$this->language = Language::factory( $wgPFUnitLanguageVariants[$code] );
+			} else {
+				# Ok, actually *do* use $wgContLang
+				$this->language = true;
+			}
+		}
+
 		return $this->processString( $string );
 	}
 
@@ -217,13 +232,13 @@ class ConvertParser {
 		if( $this->raw ){
 			return trim( $string );
 		} else {
-			$unit = $this->targetUnit->getText(
+			return $this->targetUnit->getText(
+				$string,
 				$this->lastValue,
 				$this->link,
 				$this->abbreviate,
 				$this->language
 			);
-			return  $string . $unit;
 		}
 	}
 
@@ -791,13 +806,14 @@ class ConvertUnit {
 
 	/**
 	 * Get the text of the unit
+	 * @param $string String Original text, with the number converted
 	 * @param $value String number for PLURAL support
 	 * @param $link Bool
 	 * @param $abbreviate Bool
 	 * @param $language Language
 	 * @return String
 	 */
-	public function getText( $value, $link=false, $abbreviate=false, $language=null ){
+	public function getText( $string, $value, $link=false, $abbreviate=false, $language=null ){
 		global $wgContLang;
 		$value = $wgContLang->formatNum( $value );
 
@@ -806,7 +822,7 @@ class ConvertUnit {
 				$this->dimension->getName(),
 				$this->unitName,
 				$this->prefix,
-				$value, $link, $abbreviate, $language
+				$string, $value, $link, $abbreviate, $language
 			);
 
 		} elseif( !wfEmptyMsg( "pfunc-convert-unit-{$this->dimension->getName(true)}-{$this->unitName[0]}-{$this->unitName[1]}" ) ){
@@ -817,7 +833,7 @@ class ConvertUnit {
 				$this->dimension->getName(true),
 				"{$this->unitName[0]}-{$this->unitName[1]}",
 				$this->prefix, # This will probably be rubbish, but it's the wiki users' problem, not ours
-				$value, $link, $abbreviate, $language
+				$string, $value, $link, $abbreviate, $language
 			);
 
 		} else {
@@ -826,12 +842,13 @@ class ConvertUnit {
 				$dimensionNames[0],
 				$this->unitName[0],
 				$this->prefix[0],
-				$value, $link, $abbreviate, $language
+				$string, $value, $link, $abbreviate, $language
 			);
 			$msg2Text = $this->getTextFromMessage(
 				$dimensionNames[1],
 				$this->unitName[1],
 				$this->prefix[1],
+				'',
 				1, # Singular for denominator
 				$link, $abbreviate, $language
 			);
@@ -862,6 +879,7 @@ class ConvertUnit {
 		$text = wfMsgExt(
 			"pfunc-convert-unit-$dimension-$unit$abbr",
 			array( 'parsemag', 'language' => $language ),
+			$string,
 			$number,
 			$prefix
 		);
diff --git a/extensions/ParserFunctions/Expr.php b/extensions/ParserFunctions/Expr.php
index 299d382d..ee646021 100644
--- a/extensions/ParserFunctions/Expr.php
+++ b/extensions/ParserFunctions/Expr.php
@@ -157,6 +157,8 @@ class ExprParser {
 	 * The algorithm here is based on the infix to RPN algorithm given in
 	 * http://montcs.bloomu.edu/~bobmon/Information/RPN/infix2rpn.shtml
 	 * It's essentially the same as Dijkstra's shunting yard algorithm.
+	 * @param $expr string
+	 * @return string
 	 */
 	function doExpression( $expr ) {
 		$operands = array();
@@ -371,181 +373,260 @@ class ExprParser {
 		return implode( "<br />\n", $operands );
 	}
 
+	/**
+	 * @param $op int
+	 * @param $stack array
+	 * @throws ExprError
+	 */
 	function doOperation( $op, &$stack ) {
 		switch ( $op ) {
 			case EXPR_NEGATIVE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = -$arg;
 				break;
 			case EXPR_POSITIVE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				break;
 			case EXPR_TIMES:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left * $right;
 					break;
 			case EXPR_DIVIDE:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
-				if ( $right == 0 ) throw new ExprError( 'division_by_zero', $this->names[$op] );
+				if ( $right == 0 ) {
+					throw new ExprError( 'division_by_zero', $this->names[$op] );
+				}
 				$stack[] = $left / $right;
 				break;
 			case EXPR_MOD:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
-				if ( $right == 0 ) throw new ExprError( 'division_by_zero', $this->names[$op] );
+				if ( $right == 0 ) {
+					throw new ExprError( 'division_by_zero', $this->names[$op] );
+				}
 				$stack[] = $left % $right;
 				break;
 			case EXPR_PLUS:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left + $right;
 				break;
 			case EXPR_MINUS:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left - $right;
 				break;
 			case EXPR_AND:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left && $right ) ? 1 : 0;
 				break;
 			case EXPR_OR:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left || $right ) ? 1 : 0;
 				break;
 			case EXPR_EQUALITY:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left == $right ) ? 1 : 0;
 				break;
 			case EXPR_NOT:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = ( !$arg ) ? 1 : 0;
 				break;
 			case EXPR_ROUND:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$digits = intval( array_pop( $stack ) );
 				$value = array_pop( $stack );
 				$stack[] = round( $value, $digits );
 				break;
 			case EXPR_LESS:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left < $right ) ? 1 : 0;
 				break;
 			case EXPR_GREATER:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left > $right ) ? 1 : 0;
 				break;
 			case EXPR_LESSEQ:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left <= $right ) ? 1 : 0;
 				break;
 			case EXPR_GREATEREQ:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left >= $right ) ? 1 : 0;
 				break;
 			case EXPR_NOTEQ:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left != $right ) ? 1 : 0;
 				break;
 			case EXPR_EXPONENT:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left * pow( 10, $right );
 				break;
 			case EXPR_SINE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = sin( $arg );
 				break;
 			case EXPR_COSINE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = cos( $arg );
 				break;
 			case EXPR_TANGENS:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = tan( $arg );
 				break;
 			case EXPR_ARCSINE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
-				if ( $arg < -1 || $arg > 1 ) throw new ExprError( 'invalid_argument', $this->names[$op] );
+				if ( $arg < -1 || $arg > 1 ) {
+					throw new ExprError( 'invalid_argument', $this->names[$op] );
+				}
 				$stack[] = asin( $arg );
 				break;
 			case EXPR_ARCCOS:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
-				if ( $arg < -1 || $arg > 1 ) throw new ExprError( 'invalid_argument', $this->names[$op] );
+				if ( $arg < -1 || $arg > 1 ) {
+					throw new ExprError( 'invalid_argument', $this->names[$op] );
+				}
 				$stack[] = acos( $arg );
 				break;
 			case EXPR_ARCTAN:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = atan( $arg );
 				break;
 			case EXPR_EXP:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = exp( $arg );
 				break;
 			case EXPR_LN:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
-				if ( $arg <= 0 ) throw new ExprError( 'invalid_argument_ln', $this->names[$op] );
+				if ( $arg <= 0 ) {
+					throw new ExprError( 'invalid_argument_ln', $this->names[$op] );
+				}
 				$stack[] = log( $arg );
 				break;
 			case EXPR_ABS:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = abs( $arg );
 				break;
 			case EXPR_FLOOR:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = floor( $arg );
 				break;
 			case EXPR_TRUNC:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = (int)$arg;
 				break;
 			case EXPR_CEIL:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = ceil( $arg );
 				break;
 			case EXPR_POW:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
-				if ( false === ( $stack[] = pow( $left, $right ) ) ) throw new ExprError( 'division_by_zero', $this->names[$op] );
+				if ( false === ( $stack[] = pow( $left, $right ) ) ) {
+					throw new ExprError( 'division_by_zero', $this->names[$op] );
+				}
 				break;
 			default:
 				// Should be impossible to reach here.
diff --git a/extensions/ParserFunctions/ParserFunctions.i18n.magic.php b/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
index 78ba7747..0dda0911 100644
--- a/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
+++ b/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
@@ -246,7 +246,7 @@ $magicWords['ig'] = array(
 
 /** Italian (Italiano) */
 $magicWords['it'] = array(
-	'ifexist' => array( 0, 'ifexists' ),
+	'ifexist' => array( 0, 'ifexist' ),
 	'language' => array( 0, '#LINGUA' ),
 );
 
diff --git a/extensions/ParserFunctions/ParserFunctions.i18n.php b/extensions/ParserFunctions/ParserFunctions.i18n.php
index 1fa3892d..2e8c8ad4 100644
--- a/extensions/ParserFunctions/ParserFunctions.i18n.php
+++ b/extensions/ParserFunctions/ParserFunctions.i18n.php
@@ -10,31 +10,31 @@ $messages = array();
 
 $messages['en'] = array(
 	'pfunc_desc'                            => 'Enhance parser with logical functions',
-	'pfunc_time_error'                      => 'Error: invalid time',
-	'pfunc_time_too_long'                   => 'Error: too many #time calls',
-	'pfunc_time_too_big'                    => 'Error: #time only supports years up to 9999',
-	'pfunc_rel2abs_invalid_depth'           => 'Error: Invalid depth in path: "$1" (tried to access a node above the root node)',
-	'pfunc_expr_stack_exhausted'            => 'Expression error: Stack exhausted',
-	'pfunc_expr_unexpected_number'          => 'Expression error: Unexpected number',
-	'pfunc_expr_preg_match_failure'         => 'Expression error: Unexpected preg_match failure',
-	'pfunc_expr_unrecognised_word'          => 'Expression error: Unrecognised word "$1"',
-	'pfunc_expr_unexpected_operator'        => 'Expression error: Unexpected $1 operator',
-	'pfunc_expr_missing_operand'            => 'Expression error: Missing operand for $1',
-	'pfunc_expr_unexpected_closing_bracket' => 'Expression error: Unexpected closing bracket',
-	'pfunc_expr_unrecognised_punctuation'   => 'Expression error: Unrecognised punctuation character "$1"',
-	'pfunc_expr_unclosed_bracket'           => 'Expression error: Unclosed bracket',
-	'pfunc_expr_division_by_zero'           => 'Division by zero',
-	'pfunc_expr_invalid_argument'           => 'Invalid argument for $1: < -1 or > 1',
-	'pfunc_expr_invalid_argument_ln'        => 'Invalid argument for ln: <= 0',
-	'pfunc_expr_unknown_error'              => 'Expression error: Unknown error ($1)',
-	'pfunc_expr_not_a_number'               => 'In $1: result is not a number',
-	'pfunc_string_too_long'                 => 'Error: string exceeds $1 character limit',
-	'pfunc-convert-dimensionmismatch'       => 'Error: cannot convert between units of "$1" and "$2"',
-	'pfunc-convert-unknownunit'             => 'Error: unknown unit "$1"',
-	'pfunc-convert-unknowndimension'        => 'Error: unknown dimension "$1"',
-	'pfunc-convert-invalidcompoundunit'     => 'Error: invalid compound unit "$1"',
-	'pfunc-convert-nounit'                  => 'Error: no source unit given',
-	'pfunc-convert-doublecompoundunit'      => 'Error: cannot parse double compound units like "$1"',
+	'pfunc_time_error'                      => 'Error: Invalid time.',
+	'pfunc_time_too_long'                   => 'Error: Too many #time calls.',
+	'pfunc_time_too_big'                    => 'Error: #time only supports years up to 9999.',
+	'pfunc_rel2abs_invalid_depth'           => 'Error: Invalid depth in path: "$1" (tried to access a node above the root node).',
+	'pfunc_expr_stack_exhausted'            => 'Expression error: Stack exhausted.',
+	'pfunc_expr_unexpected_number'          => 'Expression error: Unexpected number.',
+	'pfunc_expr_preg_match_failure'         => 'Expression error: Unexpected preg_match failure.',
+	'pfunc_expr_unrecognised_word'          => 'Expression error: Unrecognised word "$1".',
+	'pfunc_expr_unexpected_operator'        => 'Expression error: Unexpected $1 operator.',
+	'pfunc_expr_missing_operand'            => 'Expression error: Missing operand for $1.',
+	'pfunc_expr_unexpected_closing_bracket' => 'Expression error: Unexpected closing bracket.',
+	'pfunc_expr_unrecognised_punctuation'   => 'Expression error: Unrecognised punctuation character "$1".',
+	'pfunc_expr_unclosed_bracket'           => 'Expression error: Unclosed bracket.',
+	'pfunc_expr_division_by_zero'           => 'Division by zero.',
+	'pfunc_expr_invalid_argument'           => 'Invalid argument for $1: < -1 or > 1.',
+	'pfunc_expr_invalid_argument_ln'        => 'Invalid argument for ln: <= 0.',
+	'pfunc_expr_unknown_error'              => 'Expression error: Unknown error ($1).',
+	'pfunc_expr_not_a_number'               => 'In $1: Result is not a number.',
+	'pfunc_string_too_long'                 => 'Error: String exceeds $1 character limit.',
+	'pfunc-convert-dimensionmismatch'       => 'Error: Cannot convert between units of "$1" and "$2".',
+	'pfunc-convert-unknownunit'             => 'Error: Unknown unit "$1".',
+	'pfunc-convert-unknowndimension'        => 'Error: Unknown dimension "$1".',
+	'pfunc-convert-invalidcompoundunit'     => 'Error: Invalid compound unit "$1".',
+	'pfunc-convert-nounit'                  => 'Error: No source unit given.',
+	'pfunc-convert-doublecompoundunit'      => 'Error: Cannot parse double compound units like "$1".',
 
 	# DIMENSION NAMES
 	'pfunc-convert-dimension-length'                 => 'length',
@@ -100,175 +100,176 @@ $messages['en'] = array(
 	'pfunc-convert-prefix-yocto-abbr' => 'y',
 
 	# LENGTH
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2meter|$2meters}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstroms}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|mile|miles}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlongs}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|chain|chains}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|rod|rods}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|fathom|fathoms}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yard|yards}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|foot|feet}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|hand|hands}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|inch|inches}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|nautical mile|nautical miles}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|nautical mile (pre-1970 British)|nautical miles (pre-1970 British)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|nautical mile (pre-1954 US)|nautical miles (pre-1954 US)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsec|$2parsecs}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2lightyear|$2lightyears}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomical unit|astronomical units}}',
-
-	'pfunc-convert-unit-length-metre-abbr' => '$2m',
-	'pfunc-convert-unit-length-angstrom-abbr' => 'Å',
-	'pfunc-convert-unit-length-mile-abbr' => 'mi',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fathom',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Brit)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (pre-1954 US)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2ly',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AU',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3meter|$3meters}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstroms}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mile|miles}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chain|chains}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|rod|rods}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|fathom|fathoms}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|foot|feet}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|hand|hands}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|inch|inches}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautical mile|nautical miles}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|nautical mile (pre-1970 British)|nautical miles (pre-1970 British)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|nautical mile (pre-1954 US)|nautical miles (pre-1954 US)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3lightyear|$3lightyears}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomical unit|astronomical units}}',
+
+	'pfunc-convert-unit-length-metre-abbr' => '$1$3m',
+	'pfunc-convert-unit-length-angstrom-abbr' => '$1Å',
+	'pfunc-convert-unit-length-mile-abbr' => '$1mi',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fathom',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (pre-1954 US)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
 
 	# AREA #
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|square kilometer|square kilometers}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|square meter|square meters}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|square centimeter|square centimeters}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|square millimeter|square millimeters}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hectare|hectares}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|square mile|square miles}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|acre|acres}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|square yard|square yards}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|square foot|square feet}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|square inch|square inches}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|square nautical mile|square nautical miles}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunams}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'sq mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'acre',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'sq yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'sq ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'sq in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'sq nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|square kilometer|square kilometers}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|square meter|square meters}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|square centimeter|square centimeters}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|square millimeter|square millimeters}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectare|hectares}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|square mile|square miles}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|acre|acres}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|square yard|square yards}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|square foot|square feet}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|square inch|square inches}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|square nautical mile|square nautical miles}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunams}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1sq mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1sq yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1sq ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1sq in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sq nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
 
 	# TIME #
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|second|seconds}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2year|$2years}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|day|days}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|hour|hours}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minute|minutes}}',
-
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2yr',
-	'pfunc-convert-unit-time-day-abbr' => 'day',
-	'pfunc-convert-unit-time-hour-abbr' => 'hr',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|second|seconds}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3year|$3years}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|day|days}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|hour|hours}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minute|minutes}}',
+
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3yr',
+	'pfunc-convert-unit-time-day-abbr' => '$1day',
+	'pfunc-convert-unit-time-hour-abbr' => '$1hr',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
 	
 	# VOLUME #
-	'pfunc-convert-unit-volume-cubicmetre'      => '{{PLURAL:$1|cubic meter|cubic meters}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|cubic centimeter|cubic centimeters}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|cubic millimeter|cubic millimeters}}',
-	'pfunc-convert-unit-volume-kilolitre'       => '{{PLURAL:$1|kiloliter|kiloliters}}',
-	'pfunc-convert-unit-volume-litre'           => '{{PLURAL:$1|liter|liters}}',
-	'pfunc-convert-unit-volume-centilitre'      => '{{PLURAL:$1|centiliter|centiliters}}',
-	'pfunc-convert-unit-volume-millilitre'      => '{{PLURAL:$1|milliliter|milliliters}}',
-	'pfunc-convert-unit-volume-cubicyard'       => '{{PLURAL:$1|cubic yard|cubic yards}}',
-	'pfunc-convert-unit-volume-cubicfoot'       => '{{PLURAL:$1|cubic foot|cubic feet}}',
-	'pfunc-convert-unit-volume-cubicinch'       => '{{PLURAL:$1|cubic inch|cubic inches}}',
-	'pfunc-convert-unit-volume-barrel'          => '{{PLURAL:$1|barrel|barrels}}',
-	'pfunc-convert-unit-volume-bushel'          => '{{PLURAL:$1|bushel|bushels}}',
-	'pfunc-convert-unit-volume-gallon'          => '{{PLURAL:$1|gallon|gallons}}',
-	'pfunc-convert-unit-volume-quart'           => '{{PLURAL:$1|quart|quarts}}',
-	'pfunc-convert-unit-volume-pint'            => '{{PLURAL:$1|pint|pints}}',
-	'pfunc-convert-unit-volume-fluidounce'      => '{{PLURAL:$1|fluid ounce|fluid ounces}}',
-	'pfunc-convert-unit-volume-barrelus'        => '{{PLURAL:$1|US barrel|US barrels}}',
-	'pfunc-convert-unit-volume-barreloil'       => '{{PLURAL:$1|barrel|barrel}}',
-	'pfunc-convert-unit-volume-barrelbeer'      => '{{PLURAL:$1|barrel|barrel}}',
-	'pfunc-convert-unit-volume-usgallon'        => '{{PLURAL:$1|US gallon|US gallons}}',
-	'pfunc-convert-unit-volume-usquart'         => '{{PLURAL:$1|US quart|US quarts}}',
-	'pfunc-convert-unit-volume-uspint'          => '{{PLURAL:$1|US pint|US pints}}',
-	'pfunc-convert-unit-volume-usfluidounce'    => '{{PLURAL:$1|US fluid ounce|US fluid ounces}}',
-	'pfunc-convert-unit-volume-usdrybarrel'     => '{{PLURAL:$1|US dry barrel|US dry barrels}}',
-	'pfunc-convert-unit-volume-usbushel'        => '{{PLURAL:$1|US bushel|US bushels}}',
-	'pfunc-convert-unit-volume-usdrygallon'     => '{{PLURAL:$1|US dry gallon|US dry gallons}}',
-	'pfunc-convert-unit-volume-usdryquart'      => '{{PLURAL:$1|US dry quart|US dry quarts}}',
-	'pfunc-convert-unit-volume-usdrypint'       => '{{PLURAL:$1|US dry pint|US dry pints}}',
-
-	'pfunc-convert-unit-volume-cubicmetre-abbr'      => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr'           => '$2l',
-	'pfunc-convert-unit-volume-cubicyard-abbr'       => 'cu yd',
-	'pfunc-convert-unit-volume-cubicfoot-abbr'       => 'cu ft',
-	'pfunc-convert-unit-volume-cubicinch-abbr'       => 'cu in',
-	'pfunc-convert-unit-volume-barrel-abbr'          => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr'          => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr'          => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr'           => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr'            => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr'      => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr'        => 'US bbl',
-	'pfunc-convert-unit-volume-barreloil-abbr'       => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr'      => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr'        => 'US gal',
-	'pfunc-convert-unit-volume-usquart-abbr'         => 'US qt',
-	'pfunc-convert-unit-volume-uspint-abbr'          => 'US pt',
-	'pfunc-convert-unit-volume-usfluidounce-abbr'    => 'US fl oz',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr'     => 'US bbl',
-	'pfunc-convert-unit-volume-usbushel-abbr'        => 'US bsh',
-	'pfunc-convert-unit-volume-usdrygallon-abbr'     => 'US dry gal',
-	'pfunc-convert-unit-volume-usdryquart-abbr'      => 'US dry qt',
-	'pfunc-convert-unit-volume-usdrypint-abbr'       => 'US dry pt',
+	'pfunc-convert-unit-volume-cubicmetre'      => '$1{{PLURAL:$2|cubic meter|cubic meters}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|cubic centimeter|cubic centimeters}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|cubic millimeter|cubic millimeters}}',
+	'pfunc-convert-unit-volume-kilolitre'       => '$1{{PLURAL:$2|kiloliter|kiloliters}}',
+	'pfunc-convert-unit-volume-litre'           => '$1{{PLURAL:$2|liter|liters}}',
+	'pfunc-convert-unit-volume-centilitre'      => '$1{{PLURAL:$2|centiliter|centiliters}}',
+	'pfunc-convert-unit-volume-millilitre'      => '$1{{PLURAL:$2|milliliter|milliliters}}',
+	'pfunc-convert-unit-volume-cubicyard'       => '$1{{PLURAL:$2|cubic yard|cubic yards}}',
+	'pfunc-convert-unit-volume-cubicfoot'       => '$1{{PLURAL:$2|cubic foot|cubic feet}}',
+	'pfunc-convert-unit-volume-cubicinch'       => '$1{{PLURAL:$2|cubic inch|cubic inches}}',
+	'pfunc-convert-unit-volume-barrel'          => '$1{{PLURAL:$2|barrel|barrels}}',
+	'pfunc-convert-unit-volume-bushel'          => '$1{{PLURAL:$2|bushel|bushels}}',
+	'pfunc-convert-unit-volume-gallon'          => '$1{{PLURAL:$2|gallon|gallons}}',
+	'pfunc-convert-unit-volume-quart'           => '$1{{PLURAL:$2|quart|quarts}}',
+	'pfunc-convert-unit-volume-pint'            => '$1{{PLURAL:$2|pint|pints}}',
+	'pfunc-convert-unit-volume-fluidounce'      => '$1{{PLURAL:$2|fluid ounce|fluid ounces}}',
+	'pfunc-convert-unit-volume-barrelus'        => '$1{{PLURAL:$2|US barrel|US barrels}}',
+	'pfunc-convert-unit-volume-barreloil'       => '$1{{PLURAL:$2|barrel|barrel}}',
+	'pfunc-convert-unit-volume-barrelbeer'      => '$1{{PLURAL:$2|barrel|barrel}}',
+	'pfunc-convert-unit-volume-usgallon'        => '$1{{PLURAL:$2|US gallon|US gallons}}',
+	'pfunc-convert-unit-volume-usquart'         => '$1{{PLURAL:$2|US quart|US quarts}}',
+	'pfunc-convert-unit-volume-uspint'          => '$1{{PLURAL:$2|US pint|US pints}}',
+	'pfunc-convert-unit-volume-usfluidounce'    => '$1{{PLURAL:$2|US fluid ounce|US fluid ounces}}',
+	'pfunc-convert-unit-volume-usdrybarrel'     => '$1{{PLURAL:$2|US dry barrel|US dry barrels}}',
+	'pfunc-convert-unit-volume-usbushel'        => '$1{{PLURAL:$2|US bushel|US bushels}}',
+	'pfunc-convert-unit-volume-usdrygallon'     => '$1{{PLURAL:$2|US dry gallon|US dry gallons}}',
+	'pfunc-convert-unit-volume-usdryquart'      => '$1{{PLURAL:$2|US dry quart|US dry quarts}}',
+	'pfunc-convert-unit-volume-usdrypint'       => '$1{{PLURAL:$2|US dry pint|US dry pints}}',
+
+	'pfunc-convert-unit-volume-cubicmetre-abbr'      => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr'           => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr'       => '$1cu yd',
+	'pfunc-convert-unit-volume-cubicfoot-abbr'       => '$1cu ft',
+	'pfunc-convert-unit-volume-cubicinch-abbr'       => '$1cu in',
+	'pfunc-convert-unit-volume-barrel-abbr'          => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr'          => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr'          => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr'           => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr'            => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr'      => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr'        => '$1US bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr'       => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr'      => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr'        => '$1US gal',
+	'pfunc-convert-unit-volume-usquart-abbr'         => '$1US qt',
+	'pfunc-convert-unit-volume-uspint-abbr'          => '$1US pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr'    => '$1US fl oz',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr'     => '$1US bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr'        => '$1US bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr'     => '$1US dry gal',
+	'pfunc-convert-unit-volume-usdryquart-abbr'      => '$1US dry qt',
+	'pfunc-convert-unit-volume-usdrypint-abbr'       => '$1US dry pt',
 
 	# SPEED
-	'pfunc-convert-unit-speed-mile-hour'             => 'miles per hour',
-	'pfunc-convert-unit-speed-speedoflight'          => 'c',
+	'pfunc-convert-unit-speed-mile-hour'             => '$1miles per hour',
+	'pfunc-convert-unit-speed-speedoflight'          => '$1c',
 
-	'pfunc-convert-unit-speed-mile-hour-abbr'        => 'mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr'     => 'c',
+	'pfunc-convert-unit-speed-mile-hour-abbr'        => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr'     => '$1c',
 	
 	# PRESSURE
-	'pfunc-convert-unit-pressure-pascal'            => '{{PLURAL:$1|$2pascal|$2pascals}}',
-	'pfunc-convert-unit-pressure-bar'               => 'bar',
-	'pfunc-convert-unit-pressure-decibar'           => 'decibar',
-	'pfunc-convert-unit-pressure-millibar'          => 'millibar',
-	'pfunc-convert-unit-pressure-kilobarye'         => 'kilobarye',
-	'pfunc-convert-unit-pressure-barye'             => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere'        => '{{PLURAL:$1|atmosphere|atmospheres}}',
-	'pfunc-convert-unit-pressure-torr'              => '{{PLURAL:$1|Torr|Torr}}',
-	'pfunc-convert-unit-pressure-mmhg'              => '{{PLURAL:$1|millimeter of mercury|millimeters of mercury}}',
-	'pfunc-convert-unit-pressure-inhg'              => '{{PLURAL:$1|inch of mercury|inches of mercury}}',
-	'pfunc-convert-unit-pressure-psi'               => '{{PLURAL:$1|pound per square-inch|pounds per square-inch}}',
-
-	'pfunc-convert-unit-pressure-pascal-abbr'            => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr'               => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr'           => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr'           => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr'         => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr'             => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr'        => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr'              => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr'              => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr'              => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr'               => 'psi',
+	'pfunc-convert-unit-pressure-pascal'            => '$1{{PLURAL:$2|$3pascal|$3pascals}}',
+	'pfunc-convert-unit-pressure-bar'               => '$1bar',
+	'pfunc-convert-unit-pressure-decibar'           => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar'          => '$1millibar',
+	'pfunc-convert-unit-pressure-kilobarye'         => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye'             => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere'        => '$1{{PLURAL:$2|atmosphere|atmospheres}}',
+	'pfunc-convert-unit-pressure-torr'              => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg'              => '$1{{PLURAL:$2|millimeter of mercury|millimeters of mercury}}',
+	'pfunc-convert-unit-pressure-inhg'              => '$1{{PLURAL:$2|inch of mercury|inches of mercury}}',
+	'pfunc-convert-unit-pressure-psi'               => '$1{{PLURAL:$2|pound per square-inch|pounds per square-inch}}',
+
+	'pfunc-convert-unit-pressure-pascal-abbr'            => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr'               => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr'           => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr'          => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr'         => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr'             => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr'        => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr'              => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr'              => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr'              => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr'               => '$1psi',
 );
 
 /** Message documentation (Message documentation)
  * @author Jon Harald Søby
+ * @author Kghbln
  * @author Meno25
  * @author Siebrand
  * @author The Evil IP address
@@ -277,6 +278,8 @@ $messages['qqq'] = array(
 	'pfunc_desc' => '{{desc}}',
 	'pfunc_expr_division_by_zero' => '{{Identical|Divizion by zero}}',
 	'pfunc_string_too_long' => 'PLURAL is supported for $1.',
+	'pfunc-convert-unit-length-parsec-abbr' => 'The $3 is directly connected to the abbreviated unit to hold abbreviations like "kilo", "milli", "pico", etc.',
+	'pfunc-convert-unit-length-lightyear-abbr' => 'The $3 is directly connected to the abbreviated unit to hold abbreviations like "kilo", "milli", "pico", etc.',
 );
 
 /** Afrikaans (Afrikaans)
@@ -775,17 +778,29 @@ $messages['cs'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metr|$2metry|$2metrů}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|míle|míle|mil}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|stopa|stopy|stop}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|palec|palce|palců}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsek|$2parseky|$2parseků}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomická jednotka|astronomické jednotky|astronomických jednotek}}',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kilometr čtvereční|kilometry čtvereční|kilometrů čtverečních}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektary|hektarů}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|akr|akry|akrů}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|čtvereční stopa|čtvereční stopy|čtverečních stop}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|čtvereční palec|čtvereční palce|čtverečních palců}}',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metr|$3metry|$3metrů}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|míle|míle|mil}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|stopa|stopy|stop}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|palec|palce|palců}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsek|$3parseky|$3parseků}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomická jednotka|astronomické jednotky|astronomických jednotek}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilometr čtvereční|kilometry čtvereční|kilometrů čtverečních}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektary|hektarů}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|akr|akry|akrů}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|čtvereční stopa|čtvereční stopy|čtverečních stop}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|čtvereční palec|čtvereční palce|čtverečních palců}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km²',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m²',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm²',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm²',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m³',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm³',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascaly|$3pascalů}}',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosféra|atmosféry|atmosfér}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torry|torrů}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
 );
 
 /** Danish (Dansk)
@@ -821,6 +836,8 @@ $messages['da'] = array(
  * @author LWChris
  * @author Metalhead64
  * @author Raimond Spekking
+ * @author Rentenirer
+ * @author Rillke
  */
 $messages['de'] = array(
 	'pfunc_desc' => 'Erweitert den Parser um logische Funktionen',
@@ -843,6 +860,196 @@ $messages['de'] = array(
 	'pfunc_expr_unknown_error' => 'Expression-Fehler: Unbekannter Fehler ($1)',
 	'pfunc_expr_not_a_number' => 'In $1: Ergebnis ist keine Zahl',
 	'pfunc_string_too_long' => 'Fehler: Zeichenkette überschreitet Zeichenlimit von $1',
+	'pfunc-convert-dimensionmismatch' => 'Fehler: Die Einheiten „$1“ und „$2“ sind nicht untereinander konvertierbar',
+	'pfunc-convert-unknownunit' => 'Fehler: Unbekannte Einheit „$1“',
+	'pfunc-convert-unknowndimension' => 'Fehler: Unbekannte Dimension „$1“',
+	'pfunc-convert-invalidcompoundunit' => 'Fehler: Ungültige Einheitenkombination „$1“',
+	'pfunc-convert-nounit' => 'Fehler: Ausgangseinheit fehlt',
+	'pfunc-convert-doublecompoundunit' => 'Fehler: Doppelte Einheitenkombinationen wie „$1“ können nicht verarbeitet werden',
+	'pfunc-convert-dimension-length' => 'Länge',
+	'pfunc-convert-dimension-area' => 'Fläche',
+	'pfunc-convert-dimension-volume' => 'Volumen',
+	'pfunc-convert-dimension-time' => 'Zeit',
+	'pfunc-convert-dimension-timesquared' => 'Zeit<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'Masse',
+	'pfunc-convert-dimension-speed' => 'Geschwindigkeit',
+	'pfunc-convert-dimension-temperature' => 'Temperatur',
+	'pfunc-convert-dimension-acceleration' => 'Beschleunigung',
+	'pfunc-convert-dimension-force' => 'Kraft',
+	'pfunc-convert-dimension-torque' => 'Drehmoment',
+	'pfunc-convert-dimension-energy' => 'Energie',
+	'pfunc-convert-dimension-power' => 'Leistung',
+	'pfunc-convert-dimension-pressure' => 'Druck',
+	'pfunc-convert-dimension-density' => 'Dichte',
+	'pfunc-convert-dimension-fuelefficiencypositive' => 'Positive Kraftstoffeffizienz',
+	'pfunc-convert-dimension-fuelefficiencynegative' => 'Negative Kraftstoffeffizienz',
+	'pfunc-convert-prefix-yotta' => 'Yotta',
+	'pfunc-convert-prefix-zetta' => 'Zetta',
+	'pfunc-convert-prefix-exa' => 'Exa',
+	'pfunc-convert-prefix-peta' => 'Peta',
+	'pfunc-convert-prefix-tera' => 'Tera',
+	'pfunc-convert-prefix-giga' => 'Giga',
+	'pfunc-convert-prefix-mega' => 'Mega',
+	'pfunc-convert-prefix-kilo' => 'Kilo',
+	'pfunc-convert-prefix-hecto' => 'Hekto',
+	'pfunc-convert-prefix-deca' => 'Deka',
+	'pfunc-convert-prefix-deci' => 'Dezi',
+	'pfunc-convert-prefix-centi' => 'Zenti',
+	'pfunc-convert-prefix-milli' => 'Milli',
+	'pfunc-convert-prefix-micro' => 'Mikro',
+	'pfunc-convert-prefix-nano' => 'Nano',
+	'pfunc-convert-prefix-pico' => 'Piko',
+	'pfunc-convert-prefix-femto' => 'Femto',
+	'pfunc-convert-prefix-atto' => 'Atto',
+	'pfunc-convert-prefix-zepto' => 'Zepto',
+	'pfunc-convert-prefix-yocto' => 'Yokto',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|Meter|Meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|Ångström|Ångström}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|Meile|Meilen}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|Furlong|Furlong}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|Chain|Chain}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|Rute|Ruten}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|Fathom|Fathom}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|Yard|Yard}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|Fuß|Fuß}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|Hand|Hand}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|Zoll|Zoll}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|Seemeile|Seemeilen}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|britische Seemeile (vor 1970)|britische Seemeilen (vor 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|US-Seemeile (vor 1954)|US-Seemeilen (vor 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsec}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 Lichtjahr|$3 Lichtjahre}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomische Einheit|astronomische Einheiten}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1Chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1Faden',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1″',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (US, vor 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3lj',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AE',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|Quadratkilometer|Quadratkilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|Quadratmeter|Quadratmeter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|Quadratzentimeter|Quadratzentimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|Quadratmillimeter|Quadratmillimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|Hektar|Hektar}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|Quadratmeile|Quadratmeilen}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|Acre|Acre}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|Quadratyard|Quadratyard}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|Quadratfuß|Quadratfuß}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|Quadratzoll|Quadratzoll}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|Quadratseemeilen|Quadratseemeilen}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|Dunam|Dunam}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|Tsubo|Tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mi²',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1yd²',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ft²',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1inch²',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sm<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|Sekunde|Sekunden}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3 Jahr|$3 Jahre}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|Tag|Tage}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|Stunde|Stunden}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|Minute|Minuten}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1sek',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3a',
+	'pfunc-convert-unit-time-day-abbr' => '$1d',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|Kubikmeter|Kubikmeter}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|Kubikzentimeter|Kubikzentimeter}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|Kubikmillimeter|Kubikmillimeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|Kiloliter|Kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|Liter|Liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|Zentiliter|Zentiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|Milliliter|Milliliter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|Kubikyard|Kubikyard}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|Kubikfuß|Kubikfuß}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|Kubikzoll|Kubikzoll}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|Barrel|Barrel}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|Bushel|Bushel}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|Gallone|Gallonen}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|Quart|Quart}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|Pinte|Pinten}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|Flüssigunze|Flüssigunzen}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|US-Barrel|US-Barrel}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|Barrel|Barrel}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|Barrel|Barrel}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|US-Gallone|US-Gallonen}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|US-Quart|US-Quart}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|US-Pinte|US-Pinten}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|US-Flüssigunze|US-Flüssigunzen}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|US-Trockenbarrel|US-Trockenbarrel}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|US-Bushel|US-Bushel}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|US-Trockengallone|US-Trockengallonen}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|US-Trockenquart|US-Trockenquart}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|US-Trockenpinte|US-Trockenpinten}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1yd<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ft<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1in<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl.',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh.',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal.',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt.',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt.',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl.oz.',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1US bbl.',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl.',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl.',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1US gal.',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1US qt.',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1US pt.',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1US fl.oz.',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1US bbl.',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1US bsh.',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1US dry gal.',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1US dry qt.',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1US dry pt.',
+	'pfunc-convert-unit-speed-mile-hour' => '$1Meilen pro Stunde',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3 Pascal|$3 Pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1Bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1Dezibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1Millibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1Kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1Barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|Atmosphäre|Atmosphären}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|Millimeter-Quecksilbersäule|Millimeter-Quecksilbersäule}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|Zoll Quecksilber|Zoll Quecksilber}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|Pfund pro Quadratzoll|Pfund pro Quadratzoll}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3 Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1Bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Swiss High German (Schweizer Hochdeutsch)
@@ -930,28 +1137,20 @@ $messages['el'] = array(
 	'pfunc_string_too_long' => 'Σφάλμα: ο ορμαθός υπερβαίνει $1 το όριο χαρακτήρων',
 );
 
-/**
- * British english
+/** British English (British English)
  * @author Happy-melon
  */
 $messages['en-gb'] = array(
-	# LENGTH
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metre|$2metres}}',
-	
-	# AREA #
-	'pfunc-convert-unit-area-squarekilometre'  => '{{PLURAL:$1|square kilometre|square kilometres}}',
-	'pfunc-convert-unit-area-squaremetre'      => '{{PLURAL:$1|square metre|square metres}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|square centimetre|square centimetres}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|square millimetre|square millimetres}}',
-	
-	# VOLUME #
-	'pfunc-convert-unit-volume-cubicmetre'      => '{{PLURAL:$1|cubic metre|cubic metres}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|cubic centimetre|cubic centimetres}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|cubic millimetre|cubic millimetres}}',
-	'pfunc-convert-unit-volume-litre'           => '{{PLURAL:$1|$2litre|$2litres}}',
-
-	# PRESSURE
-	'pfunc-convert-unit-pressure-mmhg'              => '{{PLURAL:$1|millimetre of mercury|millimetres of mercury}}',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metre|$3metres}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|square kilometre|square kilometres}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|square metre|square metres}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|square centimetre|square centimetres}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|square millimetre|square millimetres}}',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|cubic metre|cubic metres}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|cubic centimetre|cubic centimetres}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|cubic millimetre|cubic millimetres}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|$3litre|$3litres}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimetre of mercury|millimetres of mercury}}',
 );
 
 /** Esperanto (Esperanto)
@@ -1012,6 +1211,7 @@ $messages['es'] = array(
  */
 $messages['et'] = array(
 	'pfunc_desc' => 'Laiendab parserit loogiliste funktsioonidega.',
+	'pfunc_time_error' => 'Tõrge: Vigane aeg',
 	'pfunc_expr_division_by_zero' => 'Nulliga jagamine',
 );
 
@@ -1095,8 +1295,11 @@ $messages['fi'] = array(
 
 /** French (Français)
  * @author Crochet.david
+ * @author Gomoko
  * @author Grondin
+ * @author Hashar
  * @author IAlex
+ * @author Od1n
  * @author Sherbrooke
  * @author Urhixidur
  * @author Verdy p
@@ -1122,8 +1325,12 @@ $messages['fr'] = array(
 	'pfunc_expr_unknown_error' => 'Erreur d’expression : erreur inconnue ($1).',
 	'pfunc_expr_not_a_number' => 'Dans $1 : le résultat n’est pas un nombre.',
 	'pfunc_string_too_long' => 'Erreur : La chaîne dépasse la limite maximale de $1 caractère{{PLURAL:$1||s}}.',
+	'pfunc-convert-dimensionmismatch' => 'Erreur: Impossible de faire une conversion entre les unités de "$1" et "$2".',
 	'pfunc-convert-unknownunit' => 'Erreur : "$1" est une unité inconnue.',
 	'pfunc-convert-unknowndimension' => 'Erreur : "$1" est une dimension inconnue.',
+	'pfunc-convert-invalidcompoundunit' => 'Erreur: Unité composée "$1" invalide.',
+	'pfunc-convert-nounit' => 'Erreur: Aucune unité source fournie.',
+	'pfunc-convert-doublecompoundunit' => 'Erreur: Impossible d\'analyser des unités doublement composées comme "$1".',
 	'pfunc-convert-dimension-length' => 'longueur',
 	'pfunc-convert-dimension-area' => 'aire',
 	'pfunc-convert-dimension-volume' => 'volume',
@@ -1139,6 +1346,8 @@ $messages['fr'] = array(
 	'pfunc-convert-dimension-power' => 'puissance',
 	'pfunc-convert-dimension-pressure' => 'pression',
 	'pfunc-convert-dimension-density' => 'densité',
+	'pfunc-convert-dimension-fuelefficiencypositive' => 'fuelefficiencypositive',
+	'pfunc-convert-dimension-fuelefficiencynegative' => 'fuelefficiencynegative',
 	'pfunc-convert-prefix-yotta' => 'yotta',
 	'pfunc-convert-prefix-zetta' => 'zetta',
 	'pfunc-convert-prefix-exa' => 'exa',
@@ -1151,7 +1360,7 @@ $messages['fr'] = array(
 	'pfunc-convert-prefix-deca' => 'deca',
 	'pfunc-convert-prefix-deci' => 'deci',
 	'pfunc-convert-prefix-centi' => 'centi',
-	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-milli' => 'mili',
 	'pfunc-convert-prefix-micro' => 'micro',
 	'pfunc-convert-prefix-nano' => 'nano',
 	'pfunc-convert-prefix-pico' => 'pico',
@@ -1159,38 +1368,153 @@ $messages['fr'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|brasse|brasses}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|pied|pieds}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|main|mains}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|pouce|pouces}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|unité astronomique|unités astronomiques}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hectare|hectares}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|seconde|secondes}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|jour|jours}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|heure|heures}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minute|minutes}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2an',
-	'pfunc-convert-unit-time-day-abbr' => 'j',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'm',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|litre|litres}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centilitre|centilitres}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|millilitre|millilitres}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|boisseau|boisseaux}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-speed-mile-hour' => 'miles par heure',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'millibar',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3 mètre|$3 mètres}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angström|angströms}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mile|miles}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chaîne|chaînes}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|tige|tiges}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|brasse|brasses}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|pied|pieds}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|main|mains}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|pouce|pouces}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|mile nautique|miles nautiques}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|mile nautique (britannique, avant 1970)|miles nautiques (britanniques, avant 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|mile nautique (États-Unis, avant 1954)|miles nautiques (États-Unis, avant 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 année-lumière|$3 années-lumière}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unité astronomique|unités astronomiques}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chaîne',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1brasse',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit.)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (États-Unis avant 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilomètre carré|kilomètres carrés}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|mètre carré|mètres carrés}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|centimètre carré|centimètres carrés}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|millimètre carré|millimètres carrés}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectare|hectares}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|mile carré|miles carrés}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|acre|acres}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|yard carré|yards carrés}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|pied carré|pieds carrés}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|pouce carré|pouces carrés}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|mile nautique carré|miles nautiques carrés}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunams}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubos}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mi^2',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1yd^2',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ft^2',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1in^2',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1nmi^2',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|seconde|secondes}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3 an|$3 ans}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|jour|jours}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|heure|heures}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minute|minutes}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3an',
+	'pfunc-convert-unit-time-day-abbr' => '$1j',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1m',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|mètre cube|mètres cubes}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|centimètre cube|centimètres cubes}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|millimètre cube|millimètres cubes}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kilolitre|kilolitres}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litre|litres}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centilitre|centilitres}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|millilitre|millilitres}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|yard cube|yards cubes}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|pied cube|pieds cubes}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|pouce cube|pouces cubes}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|baril|barils}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|boisseau|boisseaux}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gallon|gallons}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|litre|litres}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pinte|pintes}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|once liquide|onces liquides}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|baril US|barils US}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|baril|barils}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|baril|barils}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|gallon US|gallons US}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|litre US|litres US}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|pinte US|pintes US}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|once liquide US|onces liquides US}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|baril sec US|barils secs US}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|boisseau US|boisseaux US}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|gallon sec US|gallons secs US}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|litre sec US|litres secs US}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|pinte sèche US|pintes sèches US}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1yd^3',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ft^3',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1in^3',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1US bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1US gal',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1US qt',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1US pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1US fl oz',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1US bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1US bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1US gal sec',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1US qt sec',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1US pt sec',
+	'pfunc-convert-unit-speed-mile-hour' => '$1miles par heure',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1m/h',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3 pascal|$3 pascals}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobar',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosphère|atmosphères}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torrs}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimètre de mercure|millimètres de mercure}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|pouce de mercure|pouces de mercure}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|livre par pouce carré|livres par pouce carré}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3 Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Franco-Provençal (Arpetan)
@@ -1216,6 +1540,126 @@ $messages['frp'] = array(
 	'pfunc_expr_unknown_error' => 'Èrror d’èxprèssion : èrror encognua ($1)',
 	'pfunc_expr_not_a_number' => 'Dens $1 : lo rèsultat est pas un nombro',
 	'pfunc_string_too_long' => 'Èrror : la chêna dèpâsse la limita d’amont de $1 caractèro{{PLURAL:$1||s}}',
+	'pfunc-convert-unknownunit' => 'Èrror : « $1 » est una unitât encognua.',
+	'pfunc-convert-unknowndimension' => 'Èrror : « $1 » est una dimension encognua.',
+	'pfunc-convert-dimension-length' => 'longior',
+	'pfunc-convert-dimension-area' => 'surface',
+	'pfunc-convert-dimension-volume' => 'cubâjo',
+	'pfunc-convert-dimension-time' => 'temps',
+	'pfunc-convert-dimension-timesquared' => 'temps<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'massa',
+	'pfunc-convert-dimension-speed' => 'vitèsse',
+	'pfunc-convert-dimension-temperature' => 'tempèratura',
+	'pfunc-convert-dimension-acceleration' => 'accèlèracion',
+	'pfunc-convert-dimension-force' => 'fôrce',
+	'pfunc-convert-dimension-torque' => 'cobla',
+	'pfunc-convert-dimension-energy' => 'nèrf',
+	'pfunc-convert-dimension-power' => 'pouessience',
+	'pfunc-convert-dimension-pressure' => 'prèssion',
+	'pfunc-convert-dimension-density' => 'densitât',
+	'pfunc-convert-prefix-yotta' => 'yota',
+	'pfunc-convert-prefix-zetta' => 'zèta',
+	'pfunc-convert-prefix-exa' => 'ègza',
+	'pfunc-convert-prefix-peta' => 'pèta',
+	'pfunc-convert-prefix-tera' => 'tèra',
+	'pfunc-convert-prefix-giga' => 'giga',
+	'pfunc-convert-prefix-mega' => 'mèga',
+	'pfunc-convert-prefix-kilo' => 'kilo',
+	'pfunc-convert-prefix-hecto' => 'hècto',
+	'pfunc-convert-prefix-deca' => 'dèca',
+	'pfunc-convert-prefix-deci' => 'dèci',
+	'pfunc-convert-prefix-centi' => 'centi',
+	'pfunc-convert-prefix-milli' => 'mili',
+	'pfunc-convert-prefix-micro' => 'micro',
+	'pfunc-convert-prefix-nano' => 'nano',
+	'pfunc-convert-prefix-pico' => 'pico',
+	'pfunc-convert-prefix-femto' => 'femto',
+	'pfunc-convert-prefix-atto' => 'ato',
+	'pfunc-convert-prefix-zepto' => 'zèpto',
+	'pfunc-convert-prefix-yocto' => 'yocto',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1$3mètre{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-angstrom' => '$1ångström{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-mile' => '$1mile{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-furlong' => '$1furlong{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-chain' => '$1chên{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-length-rod' => '$1pèrche{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-fathom' => '$1braciê{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-yard' => '$1vèrge{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-foot' => '$1pied{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-hand' => '$1man{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-inch' => '$1pôjo{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|mile marin|miles marins}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|mile marin (prè-1970 britanico)|miles marins (prè-1970 britanicos)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|mile marin (prè-1954 des Ètats-Unis)|miles marins (prè-1954 des Ètats-Unis)}}',
+	'pfunc-convert-unit-length-parsec' => '$1$3parsec{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3an|$3ans}}-lumiére',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unitât astronomica|unitâts astronomiques}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chêna',
+	'pfunc-convert-unit-length-rod-abbr' => '$1pèrche',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1braciê',
+	'pfunc-convert-unit-length-yard-abbr' => '$1vg',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1po',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3al',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1UA',
+	'pfunc-convert-unit-area-hectare' => '$1hèctâre{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|mile carrâ|miles carrâs}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|vèrge carrâ|vèrges carrâs}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|pôjo carrâ|pôjos carrâs}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mi<sup>2</sup>',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1vg<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1po<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1nmi<sup>2</sup>',
+	'pfunc-convert-unit-time-second' => '$1second{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-time-year' => '$1$3an{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-time-day' => '$1jorn{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-time-hour' => '$1hor{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-time-minute' => '$1menut{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3a',
+	'pfunc-convert-unit-time-day-abbr' => '$1j',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-speed-mile-hour' => '$1miles per hora',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascâl|$3pascâls}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1dècibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1atmosfér{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-pressure-torr' => '$1torr{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1milimètre{{PLURAL:$2||s}} de mèrcure',
+	'pfunc-convert-unit-pressure-inhg' => '$1pôjo{{PLURAL:$2||s}} de mèrcure',
+	'pfunc-convert-unit-pressure-psi' => '$1livr{{PLURAL:$2|a|es}} per pôjo carrâ',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Galician (Galego)
@@ -1245,6 +1689,12 @@ $messages['gl'] = array(
 	'pfunc_expr_unknown_error' => 'Erro de expresión: Erro descoñecido ($1).',
 	'pfunc_expr_not_a_number' => 'En $1: O resultado non é un número.',
 	'pfunc_string_too_long' => 'Erro: A cadea excede o límite de $1 caracteres.',
+	'pfunc-convert-dimensionmismatch' => 'Erro: Non se pode converter entre as unidades "$1" e "$2".',
+	'pfunc-convert-unknownunit' => 'Erro: Descoñécese a unidade "$1".',
+	'pfunc-convert-unknowndimension' => 'Erro: Descoñécese a dimensión "$1".',
+	'pfunc-convert-invalidcompoundunit' => 'Erro: A unidade composta "$1" é inválida.',
+	'pfunc-convert-nounit' => 'Erro: Non se deu ningunha unidade de orixe.',
+	'pfunc-convert-doublecompoundunit' => 'Erro: Non se poden analizar as unidades compostas dobres como "$1".',
 	'pfunc-convert-dimension-length' => 'lonxitude',
 	'pfunc-convert-dimension-area' => 'área',
 	'pfunc-convert-dimension-volume' => 'volume',
@@ -1272,7 +1722,7 @@ $messages['gl'] = array(
 	'pfunc-convert-prefix-deca' => 'deca',
 	'pfunc-convert-prefix-deci' => 'deci',
 	'pfunc-convert-prefix-centi' => 'centi',
-	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-milli' => 'mili',
 	'pfunc-convert-prefix-micro' => 'micro',
 	'pfunc-convert-prefix-nano' => 'nano',
 	'pfunc-convert-prefix-pico' => 'pico',
@@ -1280,8 +1730,80 @@ $messages['gl'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metro|$3metros}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstroms}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|milla|millas}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|cadea|cadeas}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|rod|rods}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|braza|brazas}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|iarda|iardas}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|pé|pés}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|palmo|palmos}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|polgada|polgadas}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|milla náutica|millas náuticas}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3ano luz|$3anos luz}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unidade astronómica|unidades astronómicas}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1cadea',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rod',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1braza',
+	'pfunc-convert-unit-length-yard-abbr' => '$1iarda',
+	'pfunc-convert-unit-length-foot-abbr' => '$1pé',
+	'pfunc-convert-unit-length-hand-abbr' => '$1palmo',
+	'pfunc-convert-unit-length-inch-abbr' => '$1polgada',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1milla náutica',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3parsec',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ano luz',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1UA',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|quilómetro cadrado|quilómetros cadrados}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|metro cadrado|metros cadrados}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|centímetro cadrado|centímetros cadrados}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|milímetro cadrado|milímetros cadrados}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectárea|hectáreas}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|segundo|segundos}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3ano|$3anos}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|día|días}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|hora|horas}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuto|minutos}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3ano',
+	'pfunc-convert-unit-time-day-abbr' => '$1día',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|metro cúbico|metros cúbicos}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|centímetro cúbico|centímetros cúbicos}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|milímetro cúbico|milímetros cúbicos}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|quilolitro|quilolitros}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litro|litros}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centilitro|centilitros}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|mililitro|mililitros}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3L',
+	'pfunc-convert-unit-speed-mile-hour' => '$1millas por hora',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascais}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosferas}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milímetro de mercurio|milímetros de mercurio}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
 );
 
 /** Ancient Greek (Ἀρχαία ἑλληνικὴ)
@@ -1382,81 +1904,81 @@ $messages['he'] = array(
 	'pfunc-convert-prefix-atto' => 'אטו',
 	'pfunc-convert-prefix-zepto' => 'זפטו',
 	'pfunc-convert-prefix-yocto' => 'יוקטו',
-	'pfunc-convert-unit-length-furlong-abbr' => 'פרלונג',
-	'pfunc-convert-unit-length-chain-abbr' => 'שלשלת',
-	'pfunc-convert-unit-length-rod-abbr' => 'מַטֶּה',
-	'pfunc-convert-unit-length-fathom-abbr' => 'פאתום',
-	'pfunc-convert-unit-length-yard-abbr' => 'יארד',
-	'pfunc-convert-unit-length-foot-abbr' => 'רגל',
-	'pfunc-convert-unit-length-hand-abbr' => 'כף־יד',
-	'pfunc-convert-unit-length-inch-abbr' => 'אינץ׳',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'מיל ימי',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'מיל ימי (אנגלי)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'מיל ימי (ארה״ב לפני 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 פארסק',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 שנות אור',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'יחידה אסטרונומית',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'קמ״ר',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'מ״ר',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'סמ״ר',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'ממ״ר',
-	'pfunc-convert-unit-area-hectare-abbr' => 'הקטאר',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'מיל רבוע',
-	'pfunc-convert-unit-area-acre-abbr' => 'אקר',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'יארד רבוע',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'רגל רבועה',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'אינץ׳ רבוע',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'מיל ימי רבוע',
-	'pfunc-convert-unit-area-dunam-abbr' => 'דונם',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'צובו',
-	'pfunc-convert-unit-time-second-abbr' => 'שנייה',
-	'pfunc-convert-unit-time-day-abbr' => 'יום',
-	'pfunc-convert-unit-time-hour-abbr' => 'שעה',
-	'pfunc-convert-unit-time-minute-abbr' => 'דקה',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'מטר מעוקב',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'ס״מ מעוקב',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'מ״מ מעוקב',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 ל׳',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'יארד מעוקב',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'רגל מעוקבת',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'אינץ׳ מעוקב',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'חבית',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'בושל',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'גלון',
-	'pfunc-convert-unit-volume-quart-abbr' => 'קווארטה',
-	'pfunc-convert-unit-volume-pint-abbr' => 'פיינט',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'אונקייה',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'חבית אמריקאית',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'חבית',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'חבית',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'גלון אמריקאי',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'קווארטה אמריקאית',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'פיינט אמריקאי',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'אונקייה אמריקאית',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'חבית אמריקאית',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'בושל אמריקאי',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'גלון יבש אמריקאי',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'קווארטה יבשה אמריקאית',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'פיינט יבש אמריקאי',
-	'pfunc-convert-unit-speed-mile-hour' => 'מיל לשעה',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'מיל לשעה',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-bar' => 'בר',
-	'pfunc-convert-unit-pressure-decibar' => 'דציבר',
-	'pfunc-convert-unit-pressure-millibar' => 'מיליבר',
-	'pfunc-convert-unit-pressure-kilobarye' => 'קילובָּרְיֶה',
-	'pfunc-convert-unit-pressure-barye' => 'בָּרְיֶה',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'בר',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'דציבר',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'מיליבר',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'קילובָּרְיֶה',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'בָּרְיֶה',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'אטמ׳',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'טור',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'מ״מ כספית',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'אינץ׳ כספית',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1פרלונג',
+	'pfunc-convert-unit-length-chain-abbr' => '$1שלשלת',
+	'pfunc-convert-unit-length-rod-abbr' => '$1מַטֶּה',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1פאתום',
+	'pfunc-convert-unit-length-yard-abbr' => '$1יארד',
+	'pfunc-convert-unit-length-foot-abbr' => '$1רגל',
+	'pfunc-convert-unit-length-hand-abbr' => '$1כף־יד',
+	'pfunc-convert-unit-length-inch-abbr' => '$1אינץ׳',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1מיל ימי',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1מיל ימי (אנגלי)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1מיל ימי (ארה״ב לפני 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 פארסק',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 שנות אור',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1יחידה אסטרונומית',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1קמ״ר',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1מ״ר',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1סמ״ר',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1ממ״ר',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1הקטאר',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1מיל רבוע',
+	'pfunc-convert-unit-area-acre-abbr' => '$1אקר',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1יארד רבוע',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1רגל רבועה',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1אינץ׳ רבוע',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1מיל ימי רבוע',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1דונם',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1צובו',
+	'pfunc-convert-unit-time-second-abbr' => '$1שנייה',
+	'pfunc-convert-unit-time-day-abbr' => '$1יום',
+	'pfunc-convert-unit-time-hour-abbr' => '$1שעה',
+	'pfunc-convert-unit-time-minute-abbr' => '$1דקה',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1מטר מעוקב',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1ס״מ מעוקב',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1מ״מ מעוקב',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 ל׳',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1יארד מעוקב',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1רגל מעוקבת',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1אינץ׳ מעוקב',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1חבית',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1בושל',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1גלון',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1קווארטה',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1פיינט',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1אונקייה',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1חבית אמריקאית',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1חבית',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1חבית',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1גלון אמריקאי',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1קווארטה אמריקאית',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1פיינט אמריקאי',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1אונקייה אמריקאית',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1חבית אמריקאית',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1בושל אמריקאי',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1גלון יבש אמריקאי',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1קווארטה יבשה אמריקאית',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1פיינט יבש אמריקאי',
+	'pfunc-convert-unit-speed-mile-hour' => '$1מיל לשעה',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1מיל לשעה',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-bar' => '$1בר',
+	'pfunc-convert-unit-pressure-decibar' => '$1דציבר',
+	'pfunc-convert-unit-pressure-millibar' => '$1מיליבר',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1קילובָּרְיֶה',
+	'pfunc-convert-unit-pressure-barye' => '$1בָּרְיֶה',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1בר',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1דציבר',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1מיליבר',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1קילובָּרְיֶה',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1בָּרְיֶה',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1אטמ׳',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1טור',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1מ״מ כספית',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1אינץ׳ כספית',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Hindi (हिन्दी)
@@ -1535,6 +2057,51 @@ $messages['hsb'] = array(
 	'pfunc_expr_unknown_error' => 'Wurazowy zmylk: Njeznaty zmylk ($1)',
 	'pfunc_expr_not_a_number' => 'W $1: Wuslědk ličba njeje',
 	'pfunc_string_too_long' => 'Zmylk: Znamješkowy slěd překročuje limit $1 znamješkow',
+	'pfunc-convert-dimensionmismatch' => 'Zmylk: Konwertowanje mjez "$1" a "$2" njemóžno',
+	'pfunc-convert-unknownunit' => 'Zmylk: Njeznata jednotka "$1"',
+	'pfunc-convert-unknowndimension' => 'Zmylk: Njeznata dimensija "$1"',
+	'pfunc-convert-nounit' => 'Zmylk: žórłowa jednotka faluje',
+	'pfunc-convert-dimension-length' => 'Dołhosć',
+	'pfunc-convert-dimension-area' => 'přestrjeń',
+	'pfunc-convert-dimension-volume' => 'wolumen',
+	'pfunc-convert-dimension-time' => 'čas',
+	'pfunc-convert-dimension-timesquared' => 'čas <sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'Masa',
+	'pfunc-convert-dimension-speed' => 'spěšnosć',
+	'pfunc-convert-dimension-temperature' => 'temperatura',
+	'pfunc-convert-dimension-acceleration' => 'pospěšenje',
+	'pfunc-convert-dimension-force' => 'móc',
+	'pfunc-convert-dimension-torque' => 'wjertny moment',
+	'pfunc-convert-dimension-energy' => 'energija',
+	'pfunc-convert-dimension-power' => 'wukon',
+	'pfunc-convert-dimension-pressure' => 'ćišć',
+	'pfunc-convert-dimension-density' => 'hustota',
+	'pfunc-convert-dimension-fuelefficiencypositive' => 'Pozitiwna ćěriwowa eficienca',
+	'pfunc-convert-dimension-fuelefficiencynegative' => 'Negatiwna ćěriwowa eficienca',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|meter|metraj|metry|metrow}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomiska jednotka|astronomiskej jednotce|astronomiske jednotki|astronomiskich jednotkow}}',
+	'pfunc-convert-unit-length-metre-abbr' => '$1m',
+	'pfunc-convert-unit-length-angstrom-abbr' => '$1Å',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sm<sup>2</sup>',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekunda|sekundźe|sekundy|sekundow}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|lěto|lěće|lěta|lět}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dźeń|dnjej|dny|dnjow}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|hodźina|hodźinje|hodźiny|hodźin}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|mjeńšina|mjeńšinje|mjeńšiny|mjeńšin}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1lěto',
+	'pfunc-convert-unit-time-day-abbr' => '$1dźeń',
+	'pfunc-convert-unit-time-hour-abbr' => '$1hodź.',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1l',
 );
 
 /** Hungarian (Magyar)
@@ -1561,6 +2128,50 @@ $messages['hu'] = array(
 	'pfunc_expr_unknown_error' => 'Hiba a kifejezésben: ismeretlen hiba ($1)',
 	'pfunc_expr_not_a_number' => '$1: az eredmény nem szám',
 	'pfunc_string_too_long' => 'Hiba: a sztring túllépte a(z) $1 karakteres határt',
+	'pfunc-convert-dimensionmismatch' => 'Hiba: „$1” és „$2” mértékegységek között nem lehet átváltani.',
+	'pfunc-convert-unknownunit' => 'Hiba: ismeretlen mértékegység: „$1”',
+	'pfunc-convert-nounit' => 'Hiba: nincs megadva a forrásmértékegység.',
+	'pfunc-convert-dimension-length' => 'hossz',
+	'pfunc-convert-dimension-area' => 'terület',
+	'pfunc-convert-dimension-volume' => 'térfogat',
+	'pfunc-convert-dimension-time' => 'idő',
+	'pfunc-convert-dimension-timesquared' => 'idő<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'tömeg',
+	'pfunc-convert-dimension-speed' => 'sebesség',
+	'pfunc-convert-dimension-temperature' => 'hőmérséklet',
+	'pfunc-convert-dimension-acceleration' => 'gyorsulás',
+	'pfunc-convert-dimension-force' => 'erő',
+	'pfunc-convert-dimension-torque' => 'nyomaték',
+	'pfunc-convert-dimension-energy' => 'energia',
+	'pfunc-convert-dimension-pressure' => 'nyomás',
+	'pfunc-convert-dimension-density' => 'sűrűség',
+	'pfunc-convert-prefix-yotta' => 'yotta',
+	'pfunc-convert-prefix-zetta' => 'zetta',
+	'pfunc-convert-prefix-exa' => 'exa',
+	'pfunc-convert-prefix-peta' => 'peta',
+	'pfunc-convert-prefix-tera' => 'tera',
+	'pfunc-convert-prefix-giga' => 'giga',
+	'pfunc-convert-prefix-mega' => 'mega',
+	'pfunc-convert-prefix-kilo' => 'kilo',
+	'pfunc-convert-prefix-hecto' => 'hekto',
+	'pfunc-convert-prefix-deca' => 'deka',
+	'pfunc-convert-prefix-deci' => 'deci',
+	'pfunc-convert-prefix-centi' => 'centi',
+	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-micro' => 'mikro',
+	'pfunc-convert-prefix-nano' => 'nano',
+	'pfunc-convert-prefix-pico' => 'piko',
+	'pfunc-convert-prefix-femto' => 'femto',
+	'pfunc-convert-prefix-atto' => 'atto',
+	'pfunc-convert-prefix-zepto' => 'zepto',
+	'pfunc-convert-prefix-yocto' => 'yokto',
+	'pfunc-convert-unit-length-metre' => '$1$3méter',
+	'pfunc-convert-unit-length-mile' => '$1mérföld',
+	'pfunc-convert-unit-length-foot' => '$1láb',
+	'pfunc-convert-unit-length-nauticalmile' => '$1tengeri mérföld',
+	'pfunc-convert-unit-length-lightyear' => '$1$3fényév',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1csillagászati egység',
+	'pfunc-convert-unit-area-hectare' => '$1hektár',
 );
 
 /** Interlingua (Interlingua)
@@ -1630,12 +2241,12 @@ $messages['ia'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metro|$2metros}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ångström|ångströmes}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|millia|millias}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlongs}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|catena|catenas}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|pertica|perticas}}',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metro|$3metros}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ångström|ångströmes}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|millia|millias}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|catena|catenas}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|pertica|perticas}}',
 );
 
 /** Indonesian (Bahasa Indonesia)
@@ -1701,6 +2312,73 @@ $messages['it'] = array(
 	'pfunc_expr_unknown_error' => "Errore nell'espressione: errore sconosciuto ($1)",
 	'pfunc_expr_not_a_number' => 'In $1: il risultato non è un numero',
 	'pfunc_string_too_long' => 'Errore: la stringa supera il limite di $1 {{PLURAL:$1|carattere|caratteri}}',
+	'pfunc-convert-unknownunit' => 'Errore: Unità sconosciuta "$1".',
+	'pfunc-convert-unknowndimension' => 'Errore: Dimensione sconosciuta "$1".',
+	'pfunc-convert-dimension-length' => 'lunghezza',
+	'pfunc-convert-dimension-area' => 'area',
+	'pfunc-convert-dimension-volume' => 'volume',
+	'pfunc-convert-dimension-time' => 'tempo',
+	'pfunc-convert-dimension-timesquared' => 'tempo<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'massa',
+	'pfunc-convert-dimension-speed' => 'velocità',
+	'pfunc-convert-dimension-temperature' => 'temperatura',
+	'pfunc-convert-dimension-acceleration' => 'accelerazione',
+	'pfunc-convert-dimension-force' => 'forza',
+	'pfunc-convert-dimension-torque' => 'coppia',
+	'pfunc-convert-dimension-energy' => 'energia',
+	'pfunc-convert-dimension-power' => 'potenza',
+	'pfunc-convert-dimension-pressure' => 'pressione',
+	'pfunc-convert-dimension-density' => 'densità',
+	'pfunc-convert-prefix-yotta' => 'yotta',
+	'pfunc-convert-prefix-zetta' => 'zetta',
+	'pfunc-convert-prefix-exa' => 'exa',
+	'pfunc-convert-prefix-peta' => 'peta',
+	'pfunc-convert-prefix-tera' => 'tera',
+	'pfunc-convert-prefix-giga' => 'giga',
+	'pfunc-convert-prefix-mega' => 'mega',
+	'pfunc-convert-prefix-hecto' => 'etto',
+	'pfunc-convert-prefix-deca' => 'deca',
+	'pfunc-convert-prefix-deci' => 'deci',
+	'pfunc-convert-prefix-centi' => 'centi',
+	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-micro' => 'micro',
+	'pfunc-convert-prefix-nano' => 'nano',
+	'pfunc-convert-prefix-pico' => 'pico',
+	'pfunc-convert-prefix-femto' => 'femto',
+	'pfunc-convert-prefix-atto' => 'atto',
+	'pfunc-convert-prefix-zepto' => 'zepto',
+	'pfunc-convert-prefix-yocto' => 'yocto',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metro|$3metri}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|piede|piedi}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|pollice|pollici}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3anno luce|$3anni luce}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|secondo|secondi}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3anno|$3anni}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|giorno|giorni}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|ora|ore}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuto|minuti}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|metro cubo|metri cubi}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litro|litri}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimetro di mercurio|millimetri di mercurio}}',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
 );
 
 /** Japanese (日本語)
@@ -1869,6 +2547,7 @@ $messages['ko'] = array(
 
 /** Colognian (Ripoarisch)
  * @author Purodha
+ * @author Rentenirer
  */
 $messages['ksh'] = array(
 	'pfunc_desc' => 'Deit em Wiki Funxione för Entscheidunge un esu dobei.',
@@ -1918,11 +2597,11 @@ $messages['ksh'] = array(
 	'pfunc-convert-prefix-atto' => 'Atto',
 	'pfunc-convert-prefix-zepto' => 'Zäpto',
 	'pfunc-convert-prefix-yocto' => 'Jokto',
-	'pfunc-convert-unit-length-metre' => 'Meeter',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|Meil|Meile|Meile}}',
-	'pfunc-convert-unit-area-squarekilometre' => 'Quadraatkillomeetere',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm²',
+	'pfunc-convert-unit-length-metre' => '$1Meeter',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|Meil|Meile|Meile}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1Quadraatkillomeetere',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m²',
 );
 
 /** Luxembourgish (Lëtzebuergesch)
@@ -1947,6 +2626,46 @@ $messages['lb'] = array(
 	'pfunc_expr_unknown_error' => 'Expression-Feeler: Onbekannte Feeler ($1)',
 	'pfunc_expr_not_a_number' => "An $1: D'Resultat ass keng Zuel",
 	'pfunc_string_too_long' => "Feeler: D'Zeecheketten ass méi laang wéi d'Limit vu(n) $1 Zeechen",
+	'pfunc-convert-dimensionmismatch' => 'Feeler: Et kann net vun der Eenheet "$1" an d\'Eenheet "$2" konvertéiert ginn',
+	'pfunc-convert-unknownunit' => 'Feeler: Onbekannten Eenheet "$1".',
+	'pfunc-convert-unknowndimension' => 'Feeler: Onbekannten Dimensioun "$1".',
+	'pfunc-convert-dimension-length' => 'Längt',
+	'pfunc-convert-dimension-area' => 'Fläch',
+	'pfunc-convert-dimension-volume' => 'Volume',
+	'pfunc-convert-dimension-time' => 'Zäit',
+	'pfunc-convert-dimension-mass' => 'Mass',
+	'pfunc-convert-dimension-speed' => 'Vitesse',
+	'pfunc-convert-dimension-temperature' => 'Temperatur',
+	'pfunc-convert-dimension-acceleration' => 'Beschleunegung',
+	'pfunc-convert-dimension-force' => 'Kraaft',
+	'pfunc-convert-dimension-torque' => 'Dréimoment',
+	'pfunc-convert-dimension-energy' => 'Energie',
+	'pfunc-convert-dimension-power' => 'Leeschtung',
+	'pfunc-convert-dimension-pressure' => 'Drock',
+	'pfunc-convert-dimension-density' => 'Densitéit',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|Meter|Meter}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|Meil|Meilen}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|Fouss|Féiss}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautesch Meil|nautesch Meilen}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 Liichtjoer|$3 Liichtjoer}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomesch Eenheet|astronomesch Eenheeten}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|Quadratkilometer|Quadratkilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|Quadratmeter|Quadratmeter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|Quadratzentimeter|Quadratzentimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|Quadratmillimeter|Quadratmillimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|Hektar|Hektar}}',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|Sekonn|Sekonnen}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|Joer|Joer}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|Dag|Deeg}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|Stonn|Stonnen}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|Minutt|Minutten}}',
+	'pfunc-convert-unit-time-day-abbr' => '$1Dag',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|Kubikmeter|Kubikmeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|Fudder|Fudder}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|Liter|Liter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|Milliliter|Milliliter}}',
+	'pfunc-convert-unit-speed-mile-hour' => '$1Meile pro Stonn',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|Atmosphäre|Atmosphären}}',
 );
 
 /** Limburgish (Limburgs)
@@ -2079,154 +2798,154 @@ $messages['mk'] = array(
 	'pfunc-convert-prefix-atto-abbr' => 'а',
 	'pfunc-convert-prefix-zepto-abbr' => 'з',
 	'pfunc-convert-prefix-yocto-abbr' => 'ј',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|метар|метри}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ангстрем|ангстреми}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|милја|милји}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|фурлонг|фурлонзи}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|ланец|ланци}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|прачка|прачки}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|фатом|фатоми}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|јарда|јарди}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|стапка|стапки}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|дланка|дланки}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|инч|инчи}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|наутичка милја|наутички милји}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|наутичка милја (британска, пред 1970)|наутички милји (британска, пред 1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{PLURAL:$1|наутичка милја (американска, пред 1954)|наутички милји (американски, пред 1954)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2 парсек|$2 парсеци}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|светлосна година|светлосни години}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|астрономска единица|астрономски единици}}',
-	'pfunc-convert-unit-length-metre-abbr' => '$2 м',
-	'pfunc-convert-unit-length-mile-abbr' => 'ми',
-	'pfunc-convert-unit-length-furlong-abbr' => 'фурлонг',
-	'pfunc-convert-unit-length-chain-abbr' => 'ланец',
-	'pfunc-convert-unit-length-rod-abbr' => 'пр',
-	'pfunc-convert-unit-length-fathom-abbr' => 'фатом',
-	'pfunc-convert-unit-length-yard-abbr' => 'јд',
-	'pfunc-convert-unit-length-foot-abbr' => 'ст',
-	'pfunc-convert-unit-length-hand-abbr' => 'дл',
-	'pfunc-convert-unit-length-inch-abbr' => 'ин',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'нми',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'нми (брит)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'нми (амер. пред 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 пс',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 сг',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'ae',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|квадратен километар|квадратни километри}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|квадратен метар|квадратни метри}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|квадратен сантиметар|квадратни сантиметри}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|квадратен милиметар|квадратни милиметри}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|хектар|хектари}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|квадратна милја|квадратни милји}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|акр|акри}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|квадратна јарда|квадратни јарди}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|квадратна стапка|квадратни стапки}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|квадратен инч|квадратни инчи}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|квадратна наутичка милја|квадратни наутички милји}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|дунум|дунуми}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|цубо|цуба}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'км<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'м<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'см<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'мм<msup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ха',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'ми<sup>2</sup>',
-	'pfunc-convert-unit-area-acre-abbr' => 'акр',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'јд<sup>2</sup>',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'ст<sup>2</sup>',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'ин<sup>2</sup>',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'нми<sup>2</sup>',
-	'pfunc-convert-unit-area-dunam-abbr' => 'дунум',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'цубо',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|секунда|секунди}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|година|години}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|ден|дена}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|час|часа}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|минута|минути}}',
-	'pfunc-convert-unit-time-second-abbr' => 'с',
-	'pfunc-convert-unit-time-year-abbr' => '$2 г',
-	'pfunc-convert-unit-time-day-abbr' => 'ден',
-	'pfunc-convert-unit-time-hour-abbr' => 'ч',
-	'pfunc-convert-unit-time-minute-abbr' => 'мин',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|кубен метар|кубни метри}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|кубен сантиметар|кубни сантиметри}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|кубен милиметар|кубни милиметри}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|килолитар|килолитри}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|литар|литри}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|центилитар|центилитри}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|милилитар|милилитри}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|кубна јарда|кубни јарди}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|кубна стапка|кубни стапки}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|кубен инч|кубни инчи}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|барел|барели}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|бушел|бушели}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|галон|галони}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|кварта|кварти}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|пинта|пинти}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|течна унца|течни унци}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|американски барел|американски барели}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|барел|барели}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|барел|барели}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|американски галон|американски галони}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|американска кварта|американски кварти}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|американска пинта|американски пинти}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|американска течна унца|американски течни унци}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|американски сув барел|американски суви барели}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|американски бушел|американски бушели}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|американски сув галон|американски суви галони}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|американска сува кварта|американски суви кварти}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|американска сува пинта|американски суви пинти}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'м<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'см<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'мм<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 л',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'јд<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'ст<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'ин<sup>3</sup>',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'ббл',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'бш',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'гал',
-	'pfunc-convert-unit-volume-quart-abbr' => 'кт',
-	'pfunc-convert-unit-volume-pint-abbr' => 'пт',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'тч уц',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'ббл (САД)',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'ббл',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'ббл',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'гал (САД)',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'кт (САД)',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'пт (САД)',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'тч уц (САД)',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'ббл (САД)',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'бш (САД)',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'сув гал (САД)',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'сув кт (САД)',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'сув пт (САД)',
-	'pfunc-convert-unit-speed-mile-hour' => 'милји на час',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'ми/ч',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|паскал|паскали}}',
-	'pfunc-convert-unit-pressure-bar' => 'бар',
-	'pfunc-convert-unit-pressure-decibar' => 'децибар',
-	'pfunc-convert-unit-pressure-millibar' => 'милибар',
-	'pfunc-convert-unit-pressure-kilobarye' => 'килобарија',
-	'pfunc-convert-unit-pressure-barye' => 'барија',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|атмосфера|атмосфери}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|тор|тора}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|милиметар живин столб|милиметри живин столб}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|инч живин столб|инчи живин столб}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|фунта на квадратен инч|фунти на квадратен инч}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2 Па',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'бар',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'дбар',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'мбар',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'кБа',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ба',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'атм',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'тор',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'ммHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'инHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|метар|метри}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ангстрем|ангстреми}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|милја|милји}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|фурлонг|фурлонзи}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|ланец|ланци}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|прачка|прачки}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|фатом|фатоми}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|јарда|јарди}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|стапка|стапки}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|дланка|дланки}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|инч|инчи}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|наутичка милја|наутички милји}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|наутичка милја (британска, пред 1970)|наутички милји (британска, пред 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{PLURAL:$2|наутичка милја (американска, пред 1954)|наутички милји (американски, пред 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3 парсек|$3 парсеци}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|светлосна година|светлосни години}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|астрономска единица|астрономски единици}}',
+	'pfunc-convert-unit-length-metre-abbr' => '$1$3 м',
+	'pfunc-convert-unit-length-mile-abbr' => '$1ми',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1фурлонг',
+	'pfunc-convert-unit-length-chain-abbr' => '$1ланец',
+	'pfunc-convert-unit-length-rod-abbr' => '$1пр',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1фатом',
+	'pfunc-convert-unit-length-yard-abbr' => '$1јд',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ст',
+	'pfunc-convert-unit-length-hand-abbr' => '$1дл',
+	'pfunc-convert-unit-length-inch-abbr' => '$1ин',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1нми',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1нми (брит)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1нми (амер. пред 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 пс',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 сг',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1ae',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|квадратен километар|квадратни километри}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|квадратен метар|квадратни метри}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|квадратен сантиметар|квадратни сантиметри}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|квадратен милиметар|квадратни милиметри}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|хектар|хектари}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|квадратна милја|квадратни милји}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|акр|акри}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|квадратна јарда|квадратни јарди}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|квадратна стапка|квадратни стапки}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|квадратен инч|квадратни инчи}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|квадратна наутичка милја|квадратни наутички милји}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|дунум|дунуми}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|цубо|цуба}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1км<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1м<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1см<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1мм<msup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ха',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1ми<sup>2</sup>',
+	'pfunc-convert-unit-area-acre-abbr' => '$1акр',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1јд<sup>2</sup>',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ст<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1ин<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1нми<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1дунум',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1цубо',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|секунда|секунди}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|година|години}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|ден|дена}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|час|часа}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|минута|минути}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1с',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3 г',
+	'pfunc-convert-unit-time-day-abbr' => '$1ден',
+	'pfunc-convert-unit-time-hour-abbr' => '$1ч',
+	'pfunc-convert-unit-time-minute-abbr' => '$1мин',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|кубен метар|кубни метри}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|кубен сантиметар|кубни сантиметри}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|кубен милиметар|кубни милиметри}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|килолитар|килолитри}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|литар|литри}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|центилитар|центилитри}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|милилитар|милилитри}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|кубна јарда|кубни јарди}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|кубна стапка|кубни стапки}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|кубен инч|кубни инчи}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|барел|барели}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|бушел|бушели}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|галон|галони}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|кварта|кварти}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|пинта|пинти}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|течна унца|течни унци}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|американски барел|американски барели}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|барел|барели}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|барел|барели}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|американски галон|американски галони}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|американска кварта|американски кварти}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|американска пинта|американски пинти}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|американска течна унца|американски течни унци}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|американски сув барел|американски суви барели}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|американски бушел|американски бушели}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|американски сув галон|американски суви галони}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|американска сува кварта|американски суви кварти}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|американска сува пинта|американски суви пинти}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1м<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1см<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1мм<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 л',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1јд<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ст<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1ин<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1ббл',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1бш',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1гал',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1кт',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1пт',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1тч уц',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1ббл (САД)',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1ббл',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1ббл',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1гал (САД)',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1кт (САД)',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1пт (САД)',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1тч уц (САД)',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1ббл (САД)',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1бш (САД)',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1сув гал (САД)',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1сув кт (САД)',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1сув пт (САД)',
+	'pfunc-convert-unit-speed-mile-hour' => '$1милји на час',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1ми/ч',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|паскал|паскали}}',
+	'pfunc-convert-unit-pressure-bar' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar' => '$1децибар',
+	'pfunc-convert-unit-pressure-millibar' => '$1милибар',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1килобарија',
+	'pfunc-convert-unit-pressure-barye' => '$1барија',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|атмосфера|атмосфери}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|тор|тора}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|милиметар живин столб|милиметри живин столб}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|инч живин столб|инчи живин столб}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|фунта на квадратен инч|фунти на квадратен инч}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3 Па',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1дбар',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1мбар',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1кБа',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ба',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1атм',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1тор',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1ммHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1инHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Malayalam (മലയാളം)
@@ -2254,6 +2973,124 @@ $messages['ml'] = array(
 	'pfunc_expr_unknown_error' => 'പ്രയോഗരീതിയിൽ പിഴവ്: കാരണം അജ്ഞാതമായ പിഴവ് ($1)',
 	'pfunc_expr_not_a_number' => '$1-ൽ: ഫലം ഒരു സംഖ്യയല്ല',
 	'pfunc_string_too_long' => 'പിഴവ്: പദം ലിപികളുടെ പരിധിയായ $1 അതിലംഘിക്കുന്നു',
+	'pfunc-convert-dimensionmismatch' => 'പിഴവ്: "$1", "$2" എന്നീ ഏകകങ്ങൾ തമ്മിൽ പരിവർത്തിപ്പിക്കാനാവില്ല.',
+	'pfunc-convert-unknownunit' => 'പിഴവ്: അപരിചിതമായ ഏകകം "$1".',
+	'pfunc-convert-unknowndimension' => 'പിഴവ്: അപരിചിതമായ പരിമാണം "$1".',
+	'pfunc-convert-invalidcompoundunit' => 'പിഴവ്: അസാധുവായ സംയുക്ത ഏകകം "$1".',
+	'pfunc-convert-nounit' => 'പിഴവ്: സ്രോതസ്സ് ഏകകം നൽകിയിട്ടില്ല.',
+	'pfunc-convert-dimension-length' => 'നീളം',
+	'pfunc-convert-dimension-area' => 'വിസ്തീർണ്ണം',
+	'pfunc-convert-dimension-volume' => 'വ്യാപ്തം',
+	'pfunc-convert-dimension-time' => 'സമയം',
+	'pfunc-convert-dimension-timesquared' => 'സമയം<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'പിണ്ഡം',
+	'pfunc-convert-dimension-speed' => 'വേഗം',
+	'pfunc-convert-dimension-temperature' => 'താപനില',
+	'pfunc-convert-dimension-acceleration' => 'ത്വരണം',
+	'pfunc-convert-dimension-force' => 'ബലം',
+	'pfunc-convert-dimension-torque' => 'ടോർക്ക്',
+	'pfunc-convert-dimension-energy' => 'ഊർജ്ജം',
+	'pfunc-convert-dimension-power' => 'ശക്തി',
+	'pfunc-convert-dimension-pressure' => 'മർദ്ദം',
+	'pfunc-convert-dimension-density' => 'സാന്ദ്രത',
+	'pfunc-convert-prefix-yotta' => 'യോട്ട',
+	'pfunc-convert-prefix-zetta' => 'സീറ്റ',
+	'pfunc-convert-prefix-exa' => 'എക്സാ',
+	'pfunc-convert-prefix-peta' => 'പെറ്റാ',
+	'pfunc-convert-prefix-tera' => 'ടെറാ',
+	'pfunc-convert-prefix-giga' => 'ഗിഗാ',
+	'pfunc-convert-prefix-mega' => 'മെഗാ',
+	'pfunc-convert-prefix-kilo' => 'കിലോ',
+	'pfunc-convert-prefix-hecto' => 'ഹെക്ടോ',
+	'pfunc-convert-prefix-deca' => 'ഡെക്കാ',
+	'pfunc-convert-prefix-deci' => 'ഡെസി',
+	'pfunc-convert-prefix-centi' => 'സെന്റി',
+	'pfunc-convert-prefix-milli' => 'മില്ലി',
+	'pfunc-convert-prefix-micro' => 'മൈക്രോ',
+	'pfunc-convert-prefix-nano' => 'നാനോ',
+	'pfunc-convert-prefix-pico' => 'പൈകോ',
+	'pfunc-convert-prefix-femto' => 'ഫെംറ്റോ',
+	'pfunc-convert-prefix-atto' => 'അറ്റോ',
+	'pfunc-convert-prefix-zepto' => 'സെപ്റ്റോ',
+	'pfunc-convert-prefix-yocto' => 'യോക്റ്റോ',
+	'pfunc-convert-prefix-milli-abbr' => 'മി.',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3മീറ്റർ|$3 മീറ്ററുകൾ}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ആംസ്ട്രോം|ആംസ്ട്രോം}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|മൈൽ|മൈൽ}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|ഗജം|ഗജം}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|അടി|അടി}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|ഇഞ്ച്|ഇഞ്ച്}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|നോട്ടിക്കൽ മൈൽ|നോട്ടിക്കൽ മൈൽ}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3പാർസെക്|$3പാർസെക്}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3പ്രകാശവർഷം|$3പ്രകാശവർഷങ്ങൾ}}',
+	'pfunc-convert-unit-length-yard-abbr' => '$1ഗജം',
+	'pfunc-convert-unit-length-foot-abbr' => '$1അടി',
+	'pfunc-convert-unit-length-inch-abbr' => '$1ഇഞ്ച്',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3പാ.സെ.',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3പ്ര.വ.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|ചതുരശ്ര കിലോമീറ്റർ|ചതുരശ്ര കിലോമീറ്റർ}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|ചതുരശ്ര മീറ്റർ|ചതുരശ്ര മീറ്റർ}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|ചതുരശ്ര സെന്റീമീറ്റർ|ചതുരശ്ര സെന്റീമീറ്റർ}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|ചതുരശ്ര മില്ലിമീറ്റർ|ചതുരശ്ര മില്ലിമീറ്റർ}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|ഹെക്ടർ|ഹെക്ടർ}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|ചതുരശ്ര മൈൽ|ചതുരശ്ര മൈൽ}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|ഏക്കർ|ഏക്കർ}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|ചതുരശ്ര ഗജം|ചതുരശ്ര ഗജം}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|ചതുരശ്ര അടി|ചതുരശ്ര അടി}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|ചതുരശ്ര ഇഞ്ച്|ചതുരശ്ര ഇഞ്ച്}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|ചതുരശ്ര നോട്ടിക്കൽ മൈൽ|ചതുരശ്ര നോട്ടിക്കൽ മൈൽ}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1കി.മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1സെ.മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1മി.മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ഹെ.',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1ചതു.മൈൽ',
+	'pfunc-convert-unit-area-acre-abbr' => '$1ഏക്കർ',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1ചതു.വാര',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ചതു.അടി',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1ചതു.ഇഞ്ച്',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|സെക്കന്റ്|സെക്കന്റ്}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|ഒരു വർഷം|$3 വർഷം}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|ദിവസം|ദിവസം}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|മണിക്കൂർ|മണിക്കൂർ}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|മിനിറ്റ്|മിനിറ്റ്}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1സെ.',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3വർഷം',
+	'pfunc-convert-unit-time-day-abbr' => '$1ദിവസം',
+	'pfunc-convert-unit-time-hour-abbr' => '$1മണി.',
+	'pfunc-convert-unit-time-minute-abbr' => '$1മിനി.',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|ഘന മീറ്റർ|ഘന മീറ്റർ}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|ഘന സെന്റീമീറ്റർ|ഘന സെന്റീമീറ്റർ}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|ഘന മില്ലീമീറ്റർ|ഘന മില്ലീമീറ്റർ}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|കിലോലിറ്റർ|കിലോലിറ്റർ}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|ലിറ്റർ|ലിറ്റർ}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|സെന്റിലിറ്റർ|സെന്റിലിറ്റർ}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|മില്ലിലിറ്റർ|മില്ലിലിറ്റർ}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|ഘന ഗജം|ഘന ഗജം}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|ഘന അടി|ഘന അടി}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|ഘന ഇഞ്ച്|ഘന ഇഞ്ച്}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|ബാരൽ|ബാരൽ}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|ബാരൽ|ബാരൽ}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|ബാരൽ|ബാരൽ}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1മീ.<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1സെ.മീ.<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1മി.മീ.<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3ലി.',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1ഘന ഗജം',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ഘ. അടി.',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1ഘ. ഇഞ്ച്.',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1ബാരൽ',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1ഗാലൺ',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1ബാരൽ',
+	'pfunc-convert-unit-speed-mile-hour' => '$1മൈൽ/മണിക്കൂർ',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1മൈ./മണി.',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3പാസ്കൽ|$3പാസ്കൽ}}',
+	'pfunc-convert-unit-pressure-bar' => '$1ബാർ',
+	'pfunc-convert-unit-pressure-decibar' => '$1ഡെസിബാർ',
+	'pfunc-convert-unit-pressure-millibar' => '$1മില്ലിബാർ',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|രസം മില്ലിമീറ്ററിൽ|രസം മില്ലിമീറ്ററിൽ}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|രസം ഇഞ്ചിൽ|രസം ഇഞ്ചിൽ}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3പാസ്ക.',
 );
 
 /** Marathi (मराठी)
@@ -2352,152 +3189,153 @@ $messages['ms'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2meter|$2meter}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstrom}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|batu|batu}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlong}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|rantai|rantai}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|pol|pol}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|fatom|fatom}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|ela|ela}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|kaki|kaki}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|tangan|tangan}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|inci|inci}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|batu nautika|batu nautika}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|batu nautika (British pra-1970)|batu nautika (British pra-1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|batu nautika (AS pra-1954)|batu nautika (AS pra-1954)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsek|$2parsek}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2tahun cahaya|$2tahun cahaya}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|unit astronomi|unit astronomi}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'rantai',
-	'pfunc-convert-unit-length-rod-abbr' => 'pol',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fatom',
-	'pfunc-convert-unit-length-yard-abbr' => 'ela',
-	'pfunc-convert-unit-length-foot-abbr' => 'kaki',
-	'pfunc-convert-unit-length-hand-abbr' => 'tgn',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'batu n',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'batu n (Brit)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'batu n (AS pra-1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2tc',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AU',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kilometer persegi|kilometer persegi}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|meter persegi|meter persegi}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|sentimeter persegi|sentimeter persegi}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|milimeter persegi|milimeter persegi}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektar}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|batu persegi|batu persegi}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|ekar|ekar}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|ela persegi|ela persegi}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|kaki persegi|kaki persegi}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|inci persegi|inci persegi}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|batu nautika persegi|batu nautika persegi}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunam}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'batu<sup>2</sup>',
-	'pfunc-convert-unit-area-acre-abbr' => 'ekar',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'ela<sup>2</sup>',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'kaki<sup>2</sup>',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'inci<sup>2</sup>',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'batu n<sup>2</sup>',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL: $1|saat|saat}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL: $1|$2tahun|$2tahun}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|hari|hari}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|jam|jam}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minit|minit}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2thn',
-	'pfunc-convert-unit-time-day-abbr' => 'hari',
-	'pfunc-convert-unit-time-hour-abbr' => 'jam',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|meter padu|meter padu}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|sentimeter padu|sentimeter padu}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|milimeter padu|milimeter padu}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kilolite|kiloliter}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|liter}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|sentiliter|sentiliter}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|mililiter|mililiter}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|ela padu|ela padu}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kaki padu|kaki padu}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|inci padu|inci padu}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|tong|tong}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|busyel|busyel}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|gelen|gelen}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|kuart|kuart}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pain|pain}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|auns bendalir|auns bendalir}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|tong AS|tong AS}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|tong|tong}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|tong|tong}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|gelen AS|gelen AS}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|kuart AS|kuart AS}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|pain AS|pain AS}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|auns bendalir AS|auns bendalir AS}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|tong kering AS|tong kering AS}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|busyel AS|busyel AS}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|gelen kering AS|gelen kering AS}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|kuart kering AS|kuart kering AS}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|pain kering AS|pain kering AS}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'ela<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'kaki<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'inci<sup>3</sup>',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'tong',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'tong AS',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'tong',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'tong',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'gal AS',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'qt AS',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'pt AS',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'fl oz AS',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'tong AS',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'bsh AS',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'gal kering AS',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'qt kering AS',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'pt kering AS',
-	'pfunc-convert-unit-speed-mile-hour' => 'batu sejam',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'bsj',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascal}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'desibar',
-	'pfunc-convert-unit-pressure-millibar' => 'milibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarye',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfera|atmosfera}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|Torr|Torr}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|milimeter raksa|milimeter raksa}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|inci raksa|inci raksa}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|paun seinci persegi|paun seinci persegi}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3meter|$3meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstrom}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|batu|batu}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlong}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|rantai|rantai}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|pol|pol}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|fatom|fatom}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|ela|ela}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|kaki|kaki}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|tangan|tangan}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|inci|inci}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|batu nautika|batu nautika}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|batu nautika (British pra-1970)|batu nautika (British pra-1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|batu nautika (AS pra-1954)|batu nautika (AS pra-1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsek|$3parsek}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3tahun cahaya|$3tahun cahaya}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unit astronomi|unit astronomi}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1rantai',
+	'pfunc-convert-unit-length-rod-abbr' => '$1pol',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fatom',
+	'pfunc-convert-unit-length-yard-abbr' => '$1ela',
+	'pfunc-convert-unit-length-foot-abbr' => '$1kaki',
+	'pfunc-convert-unit-length-hand-abbr' => '$1tgn',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1batu n',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1batu n (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1batu n (AS pra-1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3tc',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilometer persegi|kilometer persegi}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|meter persegi|meter persegi}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|sentimeter persegi|sentimeter persegi}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|milimeter persegi|milimeter persegi}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektar}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|batu persegi|batu persegi}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|ekar|ekar}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|ela persegi|ela persegi}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|kaki persegi|kaki persegi}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|inci persegi|inci persegi}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|batu nautika persegi|batu nautika persegi}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunam}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1batu<sup>2</sup>',
+	'pfunc-convert-unit-area-acre-abbr' => '$1ekar',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1ela<sup>2</sup>',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1kaki<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1inci<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1batu n<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL: $2|saat|saat}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL: $2|$3tahun|$3tahun}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|hari|hari}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|jam|jam}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minit|minit}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3thn',
+	'pfunc-convert-unit-time-day-abbr' => '$1hari',
+	'pfunc-convert-unit-time-hour-abbr' => '$1jam',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|meter padu|meter padu}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|sentimeter padu|sentimeter padu}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|milimeter padu|milimeter padu}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kilolite|kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|sentiliter|sentiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|mililiter|mililiter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|ela padu|ela padu}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kaki padu|kaki padu}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|inci padu|inci padu}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|tong|tong}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|busyel|busyel}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gelen|gelen}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|kuart|kuart}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pain|pain}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|auns bendalir|auns bendalir}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|tong AS|tong AS}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|tong|tong}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|tong|tong}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|gelen AS|gelen AS}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|kuart AS|kuart AS}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|pain AS|pain AS}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|auns bendalir AS|auns bendalir AS}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|tong kering AS|tong kering AS}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|busyel AS|busyel AS}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|gelen kering AS|gelen kering AS}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|kuart kering AS|kuart kering AS}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|pain kering AS|pain kering AS}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1ela<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1kaki<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1inci<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1tong',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1tong AS',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1tong',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1tong',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1gal AS',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1qt AS',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1pt AS',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1fl oz AS',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1tong AS',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1bsh AS',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1gal kering AS',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1qt kering AS',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1pt kering AS',
+	'pfunc-convert-unit-speed-mile-hour' => '$1batu sejam',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1bsj',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1desibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosfera}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milimeter raksa|milimeter raksa}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|inci raksa|inci raksa}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|paun seinci persegi|paun seinci persegi}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Erzya (Эрзянь)
@@ -2615,152 +3453,153 @@ $messages['nl'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|meter|meter}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstrom}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|mijl|mijl}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlong}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|chain|chains}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|roede|roede}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|vadem|vadem}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yard|yards}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|voet|voet}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|hand|handen}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|inch|inches}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|nautische mijl|nautische mijlen}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|nautische mijl (Brits, voor 1970)|nautische mijlen (Brits, voor 1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|nautische mijl (VS, voor 1954)|nautische mijlen (VS, voor 1954)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2 parsec|$2 parsecs}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2 lichtjaar|$2 lichtjaren}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomische eenheid|astronomische eenheden}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fath',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'NM',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'MN (Brits)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'MN (VS voor 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2lj',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AE',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|vierkante kilometer|vierkante kilometer}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|vierkante meter|vierkante meter}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|vierkante centimeter|vierkante centimeter}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|vierkante millimeter|vierkante millimeter}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hectare|hectare}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|vierkante mijl|vierkante mijl}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|acre|acres}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|vierkante yard|vierkante yards}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|voerkante foot|vierkante foot}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|vierkante inch|vierkante inches}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|vierkante nautische mijl|vierkante nautische mijlen}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunams}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'sq mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'acre',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'sq yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'sq ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'sq in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'vierkante mijl',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|seconde|seconden}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2jaar|$2jaren}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dag|dagen}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|uur|uur}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minuut|minuten}}',
-	'pfunc-convert-unit-time-second-abbr' => 'sec.',
-	'pfunc-convert-unit-time-year-abbr' => '$2jaar',
-	'pfunc-convert-unit-time-day-abbr' => 'dag',
-	'pfunc-convert-unit-time-hour-abbr' => 'uur',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1| kubieke meter|kubieke meter}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|kubieke centimeter|kubieke centimeter}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|kubieke millimeter|kubieke millimeter}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kiloliter|kiloliter}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|liter}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centiliters|centiliter}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|milliliter|milliliter}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|kubieke yard|kubieke yard}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kubieke voet|kubieke voet}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|kubieke inch|kubieke inch}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|vat|vaten}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|bushel|bushels}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|gallon|gallon}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|quart|quart}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pint|pints}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|fluid ounce|fluid ounces}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|VS-vat|VS-vaten}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|vat|vaten}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|vat|vaten}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|VS-gallon|VS-gallon}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|VS-quart|VS-quart}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|VS-pint|VS-pints}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|VS-fluid ounce|VS-fluid ounces}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|VS-droog vat|VS-droge vaten}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|VS-bushel|VS-bushels}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|VS-droge gallon|VS-droge gallon}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|VS-droge quart|VS-droge quart}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|VS-droge pint|VS-droge pints}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => 'l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'yd<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'ft<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'in<sup>3</sup>',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl.oz.',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'VS bbl',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'VS gal',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'VS qt',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'VS pt',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'VS fl.oz.',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'VS bbl',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'VS bsh',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'VS drg.gal',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'VS drg.qt',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'VS drg.pt',
-	'pfunc-convert-unit-speed-mile-hour' => 'mijl per uur',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mpu',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascal}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'millibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarn',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfeer|atmosfeer}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|Torr|Torr}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|millimeter kwik|millimeter kwik}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|duim kwik|duimen kwik}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|pond per vierkante inch|pond per vierkante inch}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|meter|meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstrom}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mijl|mijl}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlong}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chain|chains}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|roede|roede}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|vadem|vadem}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|voet|voet}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|hand|handen}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|inch|inches}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautische mijl|nautische mijlen}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|nautische mijl (Brits, voor 1970)|nautische mijlen (Brits, voor 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|nautische mijl (VS, voor 1954)|nautische mijlen (VS, voor 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3 parsec|$3 parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 lichtjaar|$3 lichtjaren}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomische eenheid|astronomische eenheden}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fath',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1NM',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1MN (Brits)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1MN (VS voor 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3lj',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AE',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|vierkante kilometer|vierkante kilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|vierkante meter|vierkante meter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|vierkante centimeter|vierkante centimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|vierkante millimeter|vierkante millimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectare|hectare}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|vierkante mijl|vierkante mijl}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|acre|acres}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|vierkante yard|vierkante yards}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|voerkante foot|vierkante foot}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|vierkante inch|vierkante inches}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|vierkante nautische mijl|vierkante nautische mijlen}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunams}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1sq mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1sq yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1sq ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1sq in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1vierkante mijl',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|seconde|seconden}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3jaar|$3jaren}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dag|dagen}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|uur|uur}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuut|minuten}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1sec.',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3jaar',
+	'pfunc-convert-unit-time-day-abbr' => '$1dag',
+	'pfunc-convert-unit-time-hour-abbr' => '$1uur',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2| kubieke meter|kubieke meter}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|kubieke centimeter|kubieke centimeter}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|kubieke millimeter|kubieke millimeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kiloliter|kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centiliters|centiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|milliliter|milliliter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|kubieke yard|kubieke yard}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kubieke voet|kubieke voet}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|kubieke inch|kubieke inch}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|vat|vaten}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|bushel|bushels}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gallon|gallon}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|quart|quart}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pint|pints}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|fluid ounce|fluid ounces}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|VS-vat|VS-vaten}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|vat|vaten}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|vat|vaten}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|VS-gallon|VS-gallon}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|VS-quart|VS-quart}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|VS-pint|VS-pints}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|VS-fluid ounce|VS-fluid ounces}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|VS-droog vat|VS-droge vaten}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|VS-bushel|VS-bushels}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|VS-droge gallon|VS-droge gallon}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|VS-droge quart|VS-droge quart}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|VS-droge pint|VS-droge pints}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1yd<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ft<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1in<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl.oz.',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1VS bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1VS gal',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1VS qt',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1VS pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1VS fl.oz.',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1VS bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1VS bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1VS drg.gal',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1VS drg.qt',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1VS drg.pt',
+	'pfunc-convert-unit-speed-mile-hour' => '$1mijl per uur',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mpu',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarn',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfeer|atmosfeer}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimeter kwik|millimeter kwik}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|duim kwik|duimen kwik}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|pond per vierkante inch|pond per vierkante inch}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Norwegian Nynorsk (‪Norsk (nynorsk)‬)
@@ -2792,10 +3631,11 @@ $messages['nn'] = array(
 );
 
 /** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Event
  * @author Jon Harald Søby
  * @author Laaknor
  */
-$messages['no'] = array(
+$messages['nb'] = array(
 	'pfunc_desc' => 'Utvid parser med logiske funksjoner',
 	'pfunc_time_error' => 'Feil: ugyldig tid',
 	'pfunc_time_too_long' => 'Feil: #time brukt for mange ganger',
@@ -2816,6 +3656,12 @@ $messages['no'] = array(
 	'pfunc_expr_unknown_error' => 'Uttrykksfeil: Ukjent feil ($1)',
 	'pfunc_expr_not_a_number' => 'I $1: resultat er ikke et tall',
 	'pfunc_string_too_long' => 'Feil: Strengen går over grensen på $1 tegn',
+	'pfunc-convert-unit-pressure-bar' => 'bar',
+	'pfunc-convert-unit-pressure-decibar' => 'decibar',
+	'pfunc-convert-unit-pressure-millibar' => 'millibar',
+	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfære|atmosfærer}',
+	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|mmHg|mmHg}}',
 );
 
 /** Occitan (Occitan)
@@ -2845,7 +3691,9 @@ $messages['oc'] = array(
 
 /** Polish (Polski)
  * @author Derbeth
+ * @author Grzechooo
  * @author Sp5uhe
+ * @author Woytecr
  */
 $messages['pl'] = array(
 	'pfunc_desc' => 'Rozszerza analizator składni o funkcje logiczne',
@@ -2911,99 +3759,101 @@ $messages['pl'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'jokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2 metr|$2 metry|$2 metrów}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrem|angstremy|angstremów}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|mila|mile|mil}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlongi|furlongów}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|łańcuch|łańcuchy|łańcuchów}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|pręt|pręty|prętów}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|sążeń|sążnie|sążni}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|jard|jardy|jardów}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|stopa|stopy|stóp}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|dłoń|dłonie|dłoni}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|cal|cale|cali}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|mila morska|mile morskie|mil morskich}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|mila morska brytyjska|mile morskie brytyjskie|mil morskich brytyjskich}} sprzed 1970 roku',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|mila morska amerykańska|mile morskie amerykańskie|mil morskich amerykańskich}} sprzed 1954 roku',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2 parsek|$2 parseki|$2 parseków}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2 rok świetlny|$2 lata świetlne|$2 lat świetlnych}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|jednostka astronomiczna|jednostki astronomiczne|jednostek astronomicznych}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'łańcuch',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'sążeń',
-	'pfunc-convert-unit-length-yard-abbr' => 'jard',
-	'pfunc-convert-unit-length-foot-abbr' => 'stopa',
-	'pfunc-convert-unit-length-hand-abbr' => 'dłoń',
-	'pfunc-convert-unit-length-inch-abbr' => 'cal',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'INM',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'angielska mila morska',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'amerykańska mila morska sprzed 1954 roku',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 lat świetlnych',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'j.a.',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kilometr kwadratowy|kilometry kwadratowe|kilometrów kwadratowych}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|metr kwadratowy|metry kwadratowe|metrów kwadratowych}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|centymetr kwadratowy|centymetry kwadratowe|centymetrów kwadratowych}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|milimetr kwadratowy|milimetry kwadratowe|milimetrów kwadratowych}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektary|hektarów}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|mila kwadratowa|mile kwadratowe|mil kwadratowych}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|akr|akry|akrów}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|jard kwadratowy|jardy kwadratowe|jardów kwadratowych}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|stopa kwadratowa|stopy kwadratowe|stóp kwadratowych}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|cal kwadratowy|cale kwadratowe|cali kwadratowych}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|mila morska kwadratowa|mile morskie kwadratowe|mil morskich kwadratowych}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunamy|dunamów}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'mila<sup>2</sup>',
-	'pfunc-convert-unit-area-acre-abbr' => 'akr',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'jard<sup>2</sup>',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'stopa<sup>2</sup>',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'cal<sup>2</sup>',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'mila morska<sup>2</sup>',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|sekunda|sekundy|sekund}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2 rok|$2 lata|$2 lat}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dzień|dni}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|godzina|godziny|godzin}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minuta|minuty|minut}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2 jard',
-	'pfunc-convert-unit-time-day-abbr' => 'doba',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|metr sześcienny|metry sześcienne|metrów sześciennych}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|centymetr sześcienny|centymetry sześcienne|centymetrów sześciennych}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|milimetr sześcienny|milimetry sześcienne|milimetrów sześciennych}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|tysiąc litrów|tysiące litrów|tysięcy litrów}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|litr|litry|litrów}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|dziesiąta część|dziesiąte części|dziesiątych części}} litra',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|mililitr|mililitry|mililitrów}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|jard|jardów}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 l',
-	'pfunc-convert-unit-speed-mile-hour' => 'mil na godzinę',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2paskal|$2paskali}}',
-	'pfunc-convert-unit-pressure-bar' => 'barów',
-	'pfunc-convert-unit-pressure-decibar' => 'decybarów',
-	'pfunc-convert-unit-pressure-millibar' => 'millibarów',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarów',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfera|atmosfer}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|milimtr słupka rtęci|milimetrów słupka rtęci}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|cal słupka rtęci|cali słupka rtęci}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar.',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3 metr|$3 metry|$3 metrów}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrem|angstremy|angstremów}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mila|mile|mil}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongi|furlongów}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|łańcuch|łańcuchy|łańcuchów}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|pręt|pręty|prętów}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|sążeń|sążnie|sążni}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|jard|jardy|jardów}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|stopa|stopy|stóp}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|dłoń|dłonie|dłoni}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|cal|cale|cali}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|mila morska|mile morskie|mil morskich}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|mila morska brytyjska|mile morskie brytyjskie|mil morskich brytyjskich}} sprzed 1970 roku',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|mila morska amerykańska|mile morskie amerykańskie|mil morskich amerykańskich}} sprzed 1954 roku',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3 parsek|$3 parseki|$3 parseków}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 rok świetlny|$3 lata świetlne|$3 lat świetlnych}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|jednostka astronomiczna|jednostki astronomiczne|jednostek astronomicznych}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1łańcuch',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1sążeń',
+	'pfunc-convert-unit-length-yard-abbr' => '$1jard',
+	'pfunc-convert-unit-length-foot-abbr' => '$1stopa',
+	'pfunc-convert-unit-length-hand-abbr' => '$1dłoń',
+	'pfunc-convert-unit-length-inch-abbr' => '$1cal',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1INM',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1angielska mila morska',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1amerykańska mila morska sprzed 1954 roku',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 lat świetlnych',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1j.a.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilometr kwadratowy|kilometry kwadratowe|kilometrów kwadratowych}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|metr kwadratowy|metry kwadratowe|metrów kwadratowych}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|centymetr kwadratowy|centymetry kwadratowe|centymetrów kwadratowych}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|milimetr kwadratowy|milimetry kwadratowe|milimetrów kwadratowych}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektary|hektarów}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|mila kwadratowa|mile kwadratowe|mil kwadratowych}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|akr|akry|akrów}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|jard kwadratowy|jardy kwadratowe|jardów kwadratowych}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|stopa kwadratowa|stopy kwadratowe|stóp kwadratowych}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|cal kwadratowy|cale kwadratowe|cali kwadratowych}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|mila morska kwadratowa|mile morskie kwadratowe|mil morskich kwadratowych}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunamy|dunamów}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mila<sup>2</sup>',
+	'pfunc-convert-unit-area-acre-abbr' => '$1akr',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1jard<sup>2</sup>',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1stopa<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1cal<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1mila morska<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekunda|sekundy|sekund}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3 rok|$3 lata|$3 lat}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dzień|dni}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|godzina|godziny|godzin}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuta|minuty|minut}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3 jard',
+	'pfunc-convert-unit-time-day-abbr' => '$1doba',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|metr sześcienny|metry sześcienne|metrów sześciennych}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|centymetr sześcienny|centymetry sześcienne|centymetrów sześciennych}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|milimetr sześcienny|milimetry sześcienne|milimetrów sześciennych}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|tysiąc litrów|tysiące litrów|tysięcy litrów}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litr|litry|litrów}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|dziesiąta część|dziesiąte części|dziesiątych części}} litra',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|mililitr|mililitry|mililitrów}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|jard|jardów}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 l',
+	'pfunc-convert-unit-speed-mile-hour' => '$1mil na godzinę',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3paskal|$3paskali}}',
+	'pfunc-convert-unit-pressure-bar' => '$1barów',
+	'pfunc-convert-unit-pressure-decibar' => '$1decybarów',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibarów',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarów',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosfer}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milimtr słupka rtęci|milimetrów słupka rtęci}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|cal słupka rtęci|cali słupka rtęci}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar.',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
 );
 
 /** Piedmontese (Piemontèis)
@@ -3037,6 +3887,8 @@ $messages['pms'] = array(
  * @author Khalid Mahmood
  */
 $messages['pnb'] = array(
+	'pfunc_time_error' => 'غلطی: ویلہ ٹھیک نئیں۔',
+	'pfunc_time_too_long' => 'غلطی: بعوت ساریاں # کالاں',
 	'pfunc-convert-dimension-length' => 'لمبائی',
 	'pfunc-convert-dimension-area' => 'تھاں',
 	'pfunc-convert-dimension-volume' => 'والیوم',
@@ -3072,93 +3924,93 @@ $messages['pnb'] = array(
 	'pfunc-convert-prefix-atto' => 'اٹو',
 	'pfunc-convert-prefix-zepto' => 'زپٹو',
 	'pfunc-convert-prefix-yocto' => 'یوکٹو',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2میٹر}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'فرلانگ',
-	'pfunc-convert-unit-length-chain-abbr' => 'زنجیر',
-	'pfunc-convert-unit-length-rod-abbr' => 'رداس',
-	'pfunc-convert-unit-length-fathom-abbr' => 'فیدم',
-	'pfunc-convert-unit-length-yard-abbr' => 'گز',
-	'pfunc-convert-unit-length-foot-abbr' => 'فٹ',
-	'pfunc-convert-unit-length-hand-abbr' => 'کینٹہ',
-	'pfunc-convert-unit-length-inch-abbr' => 'انچ',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'سمندری میل',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'سمندری میل (برطانیہ)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'سمندری میل (امریکہ 1954 توں پہلے)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2کمپیوٹر',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2ly',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'اسمانی ناپ',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|مربع کلومیٹر|مربع کلومیٹر}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|مربع میٹر|مربع میٹر}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|مربع میلیمیٹر|مربع میلیمیٹر}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|ہیکٹر|ہیکٹر}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|مربع میلیمیٹر|مربع میل}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|ایکڑ|ایکڑ}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|مربع گز|مربع گز}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|مربع فٹ|مربع فٹ}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|مربع انچ|مربع انچ}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|مربع سمندری میل|مربع سمندری میل}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|ڈنام|ڈنام}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|زوبو|زوبو}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'کلومیٹر<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ہیکٹر',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'مربع میل',
-	'pfunc-convert-unit-area-acre-abbr' => 'ایکڑ',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'مربع گز',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'مربع فٹ',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'مربع انچ',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'مربع سمندری میل',
-	'pfunc-convert-unit-area-dunam-abbr' => 'دونام',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'سوبو',
-	'pfunc-convert-unit-time-second' => '$1 {{PLURAL:$1|سکنٹ|سکنٹاں}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2ورہ|$2ورے}}',
-	'pfunc-convert-unit-time-day' => ' {{PLURAL:$1|دن|دناں}}',
-	'pfunc-convert-unit-time-hour' => ' {{PLURAL:$1|کینٹا|کینٹے}}',
-	'pfunc-convert-unit-time-minute' => ' {{PLURAL:$1|منٹ|منٹاں}}',
-	'pfunc-convert-unit-time-second-abbr' => 'سکنث',
-	'pfunc-convert-unit-time-year-abbr' => '$2ورہ',
-	'pfunc-convert-unit-time-day-abbr' => 'دیاڑھ',
-	'pfunc-convert-unit-time-hour-abbr' => 'کینٹہ',
-	'pfunc-convert-unit-time-minute-abbr' => 'منٹ',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|مربع میٹر|مربع میٹر}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|مربع میلیمیٹر|مربع میلیمیٹر}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|کلولٹر|کلولٹر}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|لٹر|لٹر}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|سینٹیلٹر}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|ملیلٹر}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|مربع گز}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|مربع فٹ}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|مربع انچ}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|بشل}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|گیلن}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|کوارٹز}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|پنٹ}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|پانیسر اونس}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|گیلن}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|کوارٹز}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|پنٹ}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|پانیسر اونس}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|بشل}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|گیلن}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|کوارٹز}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|پنٹ}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'سینٹی میٹر<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'ملی میٹر<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2ly',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'مربع گز',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'مربع فٹ',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'مکعب انچ',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3میٹر}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1فرلانگ',
+	'pfunc-convert-unit-length-chain-abbr' => '$1زنجیر',
+	'pfunc-convert-unit-length-rod-abbr' => '$1رداس',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1فیدم',
+	'pfunc-convert-unit-length-yard-abbr' => '$1گز',
+	'pfunc-convert-unit-length-foot-abbr' => '$1فٹ',
+	'pfunc-convert-unit-length-hand-abbr' => '$1کینٹہ',
+	'pfunc-convert-unit-length-inch-abbr' => '$1انچ',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1سمندری میل',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1سمندری میل (برطانیہ)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1سمندری میل (امریکہ 1954 توں پہلے)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3کمپیوٹر',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1اسمانی ناپ',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|مربع کلومیٹر|مربع کلومیٹر}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|مربع میٹر|مربع میٹر}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|مربع میلیمیٹر|مربع میلیمیٹر}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|ہیکٹر|ہیکٹر}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|مربع میلیمیٹر|مربع میل}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|ایکڑ|ایکڑ}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|مربع گز|مربع گز}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|مربع فٹ|مربع فٹ}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|مربع انچ|مربع انچ}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|مربع سمندری میل|مربع سمندری میل}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|ڈنام|ڈنام}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|زوبو|زوبو}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1کلومیٹر<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ہیکٹر',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1مربع میل',
+	'pfunc-convert-unit-area-acre-abbr' => '$1ایکڑ',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1مربع گز',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1مربع فٹ',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1مربع انچ',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1مربع سمندری میل',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1دونام',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1سوبو',
+	'pfunc-convert-unit-time-second' => '$1$2 {{PLURAL:$2|سکنٹ|سکنٹاں}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3ورہ|$3ورے}}',
+	'pfunc-convert-unit-time-day' => '$1 {{PLURAL:$2|دن|دناں}}',
+	'pfunc-convert-unit-time-hour' => '$1 {{PLURAL:$2|کینٹا|کینٹے}}',
+	'pfunc-convert-unit-time-minute' => '$1 {{PLURAL:$2|منٹ|منٹاں}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1سکنث',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3ورہ',
+	'pfunc-convert-unit-time-day-abbr' => '$1دیاڑھ',
+	'pfunc-convert-unit-time-hour-abbr' => '$1کینٹہ',
+	'pfunc-convert-unit-time-minute-abbr' => '$1منٹ',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|مربع میٹر|مربع میٹر}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|مربع میلیمیٹر|مربع میلیمیٹر}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|کلولٹر|کلولٹر}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|لٹر|لٹر}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|سینٹیلٹر}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|ملیلٹر}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|مربع گز}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|مربع فٹ}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|مربع انچ}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|بشل}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|گیلن}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|کوارٹز}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|پنٹ}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|پانیسر اونس}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|گیلن}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|کوارٹز}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|پنٹ}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|پانیسر اونس}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|بشل}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|گیلن}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|کوارٹز}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|پنٹ}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1سینٹی میٹر<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1ملی میٹر<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3ly',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1مربع گز',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1مربع فٹ',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1مکعب انچ',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
 );
 
 /** Pashto (پښتو)
@@ -3221,6 +4073,29 @@ $messages['pt-br'] = array(
 	'pfunc_expr_unknown_error' => 'Erro de expressão: Erro desconhecido ($1)',
 	'pfunc_expr_not_a_number' => 'Em $1: resultado não é um número',
 	'pfunc_string_too_long' => 'Erro: cadeia de caracteres excede o limite de $1 caracteres',
+	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1| $2 metros | $2 metros}}',
+	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1| ångström | ångströms}}',
+	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|milhas| milhas}}',
+	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1| furlong | estádios}}',
+	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1| corrente | correntes}}',
+	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1| vara | varas}}',
+	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1| fathom | braças}}',
+	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|jarda|jardas}}',
+	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1| pé | pés}}',
+	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1| mão | mãos}}',
+	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1| polegada | polegadas}}',
+	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1| milha náutica | milhas náuticas}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1| milhas náuticas (pré-1970 britânico) | milhas náuticas (pré-1970 britânico)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1| milhas náuticas (pré-1954 dos EUA) | milhas náuticas (pré-1954 dos EUA)}}',
+	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1| $2 parsec | $2 parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1| $2 ano-luz | $2 anos-luz}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1| unidade astronômica | UA}}',
+	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
+	'pfunc-convert-unit-length-chain-abbr' => 'corrente',
+	'pfunc-convert-unit-length-rod-abbr' => 'rd',
+	'pfunc-convert-unit-length-fathom-abbr' => 'fathom',
+	'pfunc-convert-unit-length-yard-abbr' => 'yd',
+	'pfunc-convert-unit-length-foot-abbr' => 'ft',
 );
 
 /** Quechua (Runa Simi)
@@ -3255,14 +4130,15 @@ $messages['qu'] = array(
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'pfunc_desc' => 'Îmbunătățiți parser-ul cu funcții logice',
+	'pfunc_desc' => 'Îmbunătățește parserul cu funcții logice',
 	'pfunc_time_error' => 'Eroare: timp incorect',
 	'pfunc_time_too_long' => 'Eroare: prea multe apeluri #time',
-	'pfunc_rel2abs_invalid_depth' => 'Eroare: adâncime incorectă în cale: "$1" (încercat accesarea unui nod deasupra nodului rădăcină)',
-	'pfunc_expr_stack_exhausted' => 'Eroare de expresie: Stivă epuizată',
+	'pfunc_time_too_big' => 'Eroare: #time acceptă doar ani până la 9999',
+	'pfunc_rel2abs_invalid_depth' => 'Eroare: adâncime incorectă în cale: „$1” (încercat accesarea unui nod deasupra nodului rădăcină)',
+	'pfunc_expr_stack_exhausted' => 'Eroare de expresie: stivă epuizată',
 	'pfunc_expr_unexpected_number' => 'Eroare de expresie: număr neașteptat',
 	'pfunc_expr_preg_match_failure' => 'Eroare de expresie: eșuare preg_match neașteptată',
-	'pfunc_expr_unrecognised_word' => 'Eroare de expresie: "$1" este cuvânt necunoscut',
+	'pfunc_expr_unrecognised_word' => 'Eroare de expresie: „$1” este un cuvânt nerecunoscut',
 	'pfunc_expr_unexpected_operator' => 'Eroare de expresie: operator $1 neașteptat',
 	'pfunc_expr_missing_operand' => 'Eroare de expresie: operand lipsă pentru $1',
 	'pfunc_expr_unexpected_closing_bracket' => 'Eroare de expresie: paranteză închisă neașteptată',
@@ -3273,7 +4149,7 @@ $messages['ro'] = array(
 	'pfunc_expr_invalid_argument_ln' => 'Argument incorect pentru ln: <= 0',
 	'pfunc_expr_unknown_error' => 'Eroare de expresie: eroare necunoscută ($1)',
 	'pfunc_expr_not_a_number' => 'În $1: rezultatul nu este un număr',
-	'pfunc_string_too_long' => 'Eroare: Şirul depășește limita de caractere de $1',
+	'pfunc_string_too_long' => 'Eroare: șirul depășește limita de caractere de $1',
 );
 
 /** Tarandíne (Tarandíne)
@@ -3283,6 +4159,7 @@ $messages['roa-tara'] = array(
 	'pfunc_desc' => "L'analizzatore avanzate cu le funziune loggeche",
 	'pfunc_time_error' => 'Errore: Orarie invalide',
 	'pfunc_time_too_long' => 'Errore: stonne troppe #time chiamate',
+	'pfunc_time_too_big' => "Errore: #time vole sulamende valore de anne 'mbonde a 9999",
 	'pfunc_rel2abs_invalid_depth' => "Errore: Profondità invalide jndr'à 'u percorse: \"\$1\" (s'à pruvate a pigghià 'nu node sus a 'u node radice)",
 	'pfunc_expr_stack_exhausted' => 'Espressione in errore: Stack anghiute',
 	'pfunc_expr_unexpected_number' => 'Espressione in errore: Numere inaspettate',
@@ -3369,152 +4246,153 @@ $messages['ru'] = array(
 	'pfunc-convert-prefix-atto' => 'атто',
 	'pfunc-convert-prefix-zepto' => 'зепто',
 	'pfunc-convert-prefix-yocto' => 'йокто',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2метр|$2метра|$2метров}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ангстрем|ангстрема|ангстрем}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|миля|мили|миль}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|фурлонг|фурлонга|фурлонгов}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|чейн|чейна|чейнов}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|род|рода|родов}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|фатом|фатома|фатомов}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|ярд|ярда|ярдов}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|фут|фута|футов}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|хэнд|хэнда|хэндов}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|дюйм|дюйма|дюймов}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|морская миля|морские мили|морских милей}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|морская миля (британская до 1970)|морские мили (британских до 1970)|морских миль (британских до 1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|морская миля (США до 1970)|морские мили (США до 1970)|морских миль (США до 1970)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2парсек|$2парсека|$2парсек}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2 световой год|$2 световых года|$2 световых лет}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|астрономическая единица|астрономические единицы|астрономических единиц}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'фурлонг',
-	'pfunc-convert-unit-length-chain-abbr' => 'чейн',
-	'pfunc-convert-unit-length-rod-abbr' => 'род',
-	'pfunc-convert-unit-length-fathom-abbr' => 'фатом',
-	'pfunc-convert-unit-length-yard-abbr' => 'ярд',
-	'pfunc-convert-unit-length-foot-abbr' => 'фут',
-	'pfunc-convert-unit-length-hand-abbr' => 'хэнд',
-	'pfunc-convert-unit-length-inch-abbr' => 'дюйм',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'морская миля',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'брит. морская миля',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'морская миля (США до 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 пк',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 св. г.',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'а. е.',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|квадратный километр|квадратных километра|квадратных километров}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|квадратный метр|квадратных метра|квадратных метров}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|квадратный сантиметр|квадратных сантиметра|квадратных сантиметров}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|квадратный миллиметр|квадратных миллиметра|квадратных миллиметров}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|гектар|гектара|гектар}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|квадратная миля|квадратных мили|квадратных миль}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|акр|акра|акров}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|квадратный ярд|квадратных ярда|квадратных ярдов}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|квадратный фут|квадратных фута|квадратных футов}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|квадратный дюйм|квадратных дюйма|квадратных дюймов}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|квадратная морская миля|квадратные морские мили|квадратных морских миль}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|дунам|дунама|дунамов}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|цубо|цубо|цубо}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'км<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'м<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'см<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'мм<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'га',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'кв. ми',
-	'pfunc-convert-unit-area-acre-abbr' => 'акр',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'кв. ярд',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'кв. м',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'кв. дюйм',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'кв. м. ми',
-	'pfunc-convert-unit-area-dunam-abbr' => 'дунам',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'цубо',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|секунда|секунды|секунд}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2год|$2года|$2лет}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|день|дня|дней}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|час|часа|часов}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|минута|минуты|минут}}',
-	'pfunc-convert-unit-time-second-abbr' => 'с',
-	'pfunc-convert-unit-time-year-abbr' => '$2 г',
-	'pfunc-convert-unit-time-day-abbr' => 'дн',
-	'pfunc-convert-unit-time-hour-abbr' => 'ч.',
-	'pfunc-convert-unit-time-minute-abbr' => 'м.',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|кубический метр|кубических метра|кубических метров}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|кубический сантиметр|кубических сантиметра|кубических сантиметров}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|кубический миллиметр|кубических миллиметра|кубических миллиметров}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|килолитр|килолитра|килолитров}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|литр|литра|литров}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|сантилитр|сантилитра|сантилитров}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|миллилитр|миллилитра|миллилитров}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|кубический ярд|кубических ярда|кубических ярдов}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|кубический фут|кубических фута|кубических футов}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|кубический дюйм|кубических дюйма|кубических дюймов}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|баррель|барреля|баррелей}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|бушель|бушеля|бушелей}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|галлон|галлона|галлонов}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|кварта|кварты|кварт}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|пинта|пинты|пинт}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|жидкая унция|жидких унции|жидких унций}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|баррель США|барреля США|баррелей США}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|баррель|барреля|баррелей}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|баррель|барреля|баррелей}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|галлон США|галлона США|галлонов США}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|кварта США|кварты США|кварт США}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|пинта США|пинты США|пинт США}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|жидкая унция США|жидких унции США|жидких унций США}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|сухой баррель США|сухих барреля США|сухих баррелей США}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|бушель США|бушеля США|бушелей США}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|сухой галлон США|сухих галлона США|сухих галлонов США}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|сухая кварта США|сухие кварты США|сухих кварт США}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|сухая пинта США|сухих пинты США|сухих пинт США}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'м<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'см<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'мм<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 л',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'куб. ярд',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'куб. фут',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'куб. дюйм',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'бр.',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'бш.',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'гал.',
-	'pfunc-convert-unit-volume-quart-abbr' => 'кв.',
-	'pfunc-convert-unit-volume-pint-abbr' => 'пт.',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'жид. унц.',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'бр. США',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'бр.',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'бр.',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'гал. США',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'кт. США',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'пт. США',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'жид. унц. США',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'бр. США',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'вш. США',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'сух. гал. США',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'сух. кт. США',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'сух. пт. США',
-	'pfunc-convert-unit-speed-mile-hour' => 'миль/час',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'миль/ч',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2паскаль|$2паскаля|$2паскалей}}',
-	'pfunc-convert-unit-pressure-bar' => 'бар',
-	'pfunc-convert-unit-pressure-decibar' => 'децибар',
-	'pfunc-convert-unit-pressure-millibar' => 'миллибар',
-	'pfunc-convert-unit-pressure-kilobarye' => 'килобария',
-	'pfunc-convert-unit-pressure-barye' => 'бария',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|атмосфера|атмосферы|атмосфер}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|торр|торра|торр}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|миллиметр ртутного столба|миллиметра ртутного столба|миллиметров ртутного столба}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|дюйм ртутного столба|дюйма ртутного столба|дюймов ртутного столба}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|фунт на квадратный дюйм|фунта на квадратный дюйм|фунтов на квадратный дюйм}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Па',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'бар',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'дбар',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'мбар',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'КБа',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ба',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'атм',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'торр',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'мм рт. ст.',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'дюйм. рт. ст.',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'фунт. на кв. дюйм',
+	'pfunc-convert-prefix-milli-abbr' => 'м',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3метр|$3метра|$3метров}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ангстрем|ангстрема|ангстрем}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|миля|мили|миль}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|фурлонг|фурлонга|фурлонгов}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|чейн|чейна|чейнов}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|род|рода|родов}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|фатом|фатома|фатомов}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|ярд|ярда|ярдов}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|фут|фута|футов}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|хэнд|хэнда|хэндов}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|дюйм|дюйма|дюймов}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|морская миля|морские мили|морских милей}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|морская миля (британская до 1970)|морские мили (британских до 1970)|морских миль (британских до 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|морская миля (США до 1970)|морские мили (США до 1970)|морских миль (США до 1970)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3парсек|$3парсека|$3парсек}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 световой год|$3 световых года|$3 световых лет}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|астрономическая единица|астрономические единицы|астрономических единиц}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1фурлонг',
+	'pfunc-convert-unit-length-chain-abbr' => '$1чейн',
+	'pfunc-convert-unit-length-rod-abbr' => '$1род',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1фатом',
+	'pfunc-convert-unit-length-yard-abbr' => '$1ярд',
+	'pfunc-convert-unit-length-foot-abbr' => '$1фут',
+	'pfunc-convert-unit-length-hand-abbr' => '$1хэнд',
+	'pfunc-convert-unit-length-inch-abbr' => '$1дюйм',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1морская миля',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1брит. морская миля',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1морская миля (США до 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 пк',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 св. г.',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1а. е.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|квадратный километр|квадратных километра|квадратных километров}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|квадратный метр|квадратных метра|квадратных метров}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|квадратный сантиметр|квадратных сантиметра|квадратных сантиметров}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|квадратный миллиметр|квадратных миллиметра|квадратных миллиметров}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|гектар|гектара|гектар}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|квадратная миля|квадратных мили|квадратных миль}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|акр|акра|акров}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|квадратный ярд|квадратных ярда|квадратных ярдов}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|квадратный фут|квадратных фута|квадратных футов}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|квадратный дюйм|квадратных дюйма|квадратных дюймов}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|квадратная морская миля|квадратные морские мили|квадратных морских миль}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|дунам|дунама|дунамов}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|цубо|цубо|цубо}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1км<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1м<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1см<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1мм<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1га',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1кв. ми',
+	'pfunc-convert-unit-area-acre-abbr' => '$1акр',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1кв. ярд',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1кв. м',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1кв. дюйм',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1кв. м. ми',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1дунам',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1цубо',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|секунда|секунды|секунд}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3год|$3года|$3лет}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|день|дня|дней}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|час|часа|часов}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|минута|минуты|минут}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1с',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3 г',
+	'pfunc-convert-unit-time-day-abbr' => '$1дн',
+	'pfunc-convert-unit-time-hour-abbr' => '$1ч.',
+	'pfunc-convert-unit-time-minute-abbr' => '$1м.',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|кубический метр|кубических метра|кубических метров}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|кубический сантиметр|кубических сантиметра|кубических сантиметров}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|кубический миллиметр|кубических миллиметра|кубических миллиметров}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|килолитр|килолитра|килолитров}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|литр|литра|литров}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|сантилитр|сантилитра|сантилитров}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|миллилитр|миллилитра|миллилитров}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|кубический ярд|кубических ярда|кубических ярдов}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|кубический фут|кубических фута|кубических футов}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|кубический дюйм|кубических дюйма|кубических дюймов}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|баррель|барреля|баррелей}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|бушель|бушеля|бушелей}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|галлон|галлона|галлонов}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|кварта|кварты|кварт}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|пинта|пинты|пинт}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|жидкая унция|жидких унции|жидких унций}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|баррель США|барреля США|баррелей США}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|баррель|барреля|баррелей}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|баррель|барреля|баррелей}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|галлон США|галлона США|галлонов США}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|кварта США|кварты США|кварт США}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|пинта США|пинты США|пинт США}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|жидкая унция США|жидких унции США|жидких унций США}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|сухой баррель США|сухих барреля США|сухих баррелей США}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|бушель США|бушеля США|бушелей США}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|сухой галлон США|сухих галлона США|сухих галлонов США}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|сухая кварта США|сухие кварты США|сухих кварт США}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|сухая пинта США|сухих пинты США|сухих пинт США}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1м<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1см<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1мм<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 л',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1куб. ярд',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1куб. фут',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1куб. дюйм',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1бр.',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1бш.',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1гал.',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1кв.',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1пт.',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1жид. унц.',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1бр. США',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1бр.',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1бр.',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1гал. США',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1кт. США',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1пт. США',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1жид. унц. США',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1бр. США',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1вш. США',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1сух. гал. США',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1сух. кт. США',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1сух. пт. США',
+	'pfunc-convert-unit-speed-mile-hour' => '$1миль/час',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1миль/ч',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3паскаль|$3паскаля|$3паскалей}}',
+	'pfunc-convert-unit-pressure-bar' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar' => '$1децибар',
+	'pfunc-convert-unit-pressure-millibar' => '$1миллибар',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1килобария',
+	'pfunc-convert-unit-pressure-barye' => '$1бария',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|атмосфера|атмосферы|атмосфер}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|торр|торра|торр}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|миллиметр ртутного столба|миллиметра ртутного столба|миллиметров ртутного столба}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|дюйм ртутного столба|дюйма ртутного столба|дюймов ртутного столба}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|фунт на квадратный дюйм|фунта на квадратный дюйм|фунтов на квадратный дюйм}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Па',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1дбар',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1мбар',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1КБа',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ба',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1атм',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1торр',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1мм рт. ст.',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1дюйм. рт. ст.',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1фунт. на кв. дюйм',
 );
 
 /** Rusyn (Русиньскый)
@@ -3542,7 +4420,7 @@ $messages['rue'] = array(
 	'pfunc_string_too_long' => 'Хыба: Ланц є довшый як $1 {{PLURAL:$1|знак|знакы|знаків}}, што є ліміт',
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -3712,154 +4590,155 @@ $messages['sl'] = array(
 	'pfunc-convert-prefix-atto' => 'ato',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'jokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|meter|metra|metri|metrov}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrem|angstrema|angstremi|angstremov}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|milja|milji|milje|milj}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlonga|furlongi|furlongov}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|veriga|verigi|verige|verig}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|palica|palici|palice|palic}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|seženj|sežnja|sežnji|sežnjev}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|jard|jarda|jardi|jardov}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|čevelj|čevlja|čevlji|čeljev}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|dlan|dlani}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|palec|palca|palci|palcev}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|navtična milja|navtični milji|navtične milje|navtičnih milj}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|navtična milja|navtični milji|navtične milje|navtičnih milj}} (britanska, pred 1970)',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|navtična milja|navtični milji|navtične milje|navtičnih milj}} (ZDA, pred 1954)',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|parsek|parseka|parseki|persekov}}',
-	'pfunc-convert-unit-length-lightyear' => '$2 {{PLURAL:$1|svetlobno leto|svetlobni leti|svetlobna leta|svetlobnih let}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomska enota|astronomski enoti|astronomske enote|astronomskih enot}}',
-	'pfunc-convert-unit-length-metre-abbr' => 'm',
-	'pfunc-convert-unit-length-angstrom-abbr' => 'Å',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'veriga',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'seženj',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Brit)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (ZDA, pred 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 sv. l.',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'a.e.',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kvadratni kilometer|kvadratna kilometra|kvadratni kilometri|kvadratnih kilometrov}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|kvadratni meter|kvadratna metra|kvadratni metri|kvadratnih metrov}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|kvadratni centimeter|kvadratna centimetra|kvadratni centimetri|kvadratnih centimetrov}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|kvadratni milimeter|kvadratna milimetra|kvadratni milimetri|kvadratnih milimetrov}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektara|hektare|hektarov}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|kvadratna milja|kvadratni milji|kvadratne milje|kvadratnih milj}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|aker|akra|akri|akrov}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|kvadratni jard|kvadratna jarda|kvadratni jardi|kvadratnih jardov}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|kvadratni čevelj|kvadratna čevlja|kvadratni čevlji|kvadratnih čevljev}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|kvadratni palec|kvadratna palca|kvadratni palci|kvadratnih palcev}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|kvadratna navtična milja|kvadratni navtični milji|kvadratne navtične milje|kvadratnih navtičnih milj}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunama|dunami|dunamov}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsuba|tsubi|tsubov}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'kv. mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'aker',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'kv. yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'kv. ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'kv. in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'kv nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|sekunda|sekundi|sekunde|sekund}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|leto|leti|leta|let}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dan|dneva|dnevi|dni}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|ura|uri|ure|ur}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minuta|minuti|minute|minut}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => 'leto',
-	'pfunc-convert-unit-time-day-abbr' => 'dan',
-	'pfunc-convert-unit-time-hour-abbr' => 'ura',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|kubični meter|kubična metra|kubični metri|kubičnih metrov}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|kubični centimeter|kubična centimetra|kubični centimetri|kubičnih centimetrov}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|kubični milimeter|kubična milimetra|kubični milimetri|kubičnih milimetrov}}',
-	'pfunc-convert-unit-volume-kilolitre' => 'kilo{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-centilitre' => 'centi{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-millilitre' => 'mili{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|kubični jard|kubična jarda|kubični jardi|kubičnih jardov}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kubični čevelj|kubična čevlja|kubični čevlji|kubičnih čevljev}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|kubični palec|kubična palca|kubični palci|kubičnih palcev}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|sod|soda|sodi|sodov}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|bušel|bušla|bušli|bušlov}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|galona|galoni|galone|galon}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|kvart|kvarta|kvarti|kvartov}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pint|pinta|pinti|pintov}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|tekočinska unča|tekočinski unči|tekočinske unče|tekočinskih unč}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|ameriški sod|ameriška soda|ameriški sodi|ameriških sodov}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|sod|soda|sodi|sodov}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|sod|soda|sodi|sodov}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|ameriška galona|ameriški galoni|ameriške galone|ameriških galon}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|ameriški kvart|ameriška kvarta|ameriški kvarti|ameriških kvartov}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|ameriški pint|ameriška pinta|ameriški pinti|ameriških pintov}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|ameriška tekočinska unča|ameriški tekočinski unči|ameriške tekočinske unče|ameriških tekočinskih unč}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|ameriški suhi sod|ameriška suha soda|ameriški suhi sodi|ameriških suhih sodov}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|ameriški bušel|ameriška bušla|ameriški bušli|ameriških bušlov}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|ameriška suha galona|ameriški suhi galoni|ameriške suhe galone|ameriških suhih galon}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|ameriški suhi kvart|ameriška suha kvarta|ameriški suhi kvarti|ameriških suhih kvartov}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|ameriški suhi pint|ameriška suha pinta|ameriški suhi pinti|ameriških suhih pintov}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'kub. yd',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'kub. ft',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'kub. in',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'am. bbl',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'am. gal',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'am. qt',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'am. pt',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'am. fl oz',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'am. bbl',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'am. bsh',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'am. suha gal',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'am. suhi qt',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'am. suhi pt',
-	'pfunc-convert-unit-speed-mile-hour' => 'milje na uro',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|paskal|paskala|paskali|paskalov}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'milibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarye',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfera|atmosferi|atmosfere|atmosfer}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|torr|torra|torri|torrov}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|milimeter|milimetra|milimetri|milimetrov}} živega srebra',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|palec|palca|palci|palcev}} živega srebra',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|funt|funta|funti|funtov}} na kvadratni palec',
-	'pfunc-convert-unit-pressure-pascal-abbr' => 'Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|meter|metra|metri|metrov}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrem|angstrema|angstremi|angstremov}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|milja|milji|milje|milj}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlonga|furlongi|furlongov}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|veriga|verigi|verige|verig}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|palica|palici|palice|palic}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|seženj|sežnja|sežnji|sežnjev}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|jard|jarda|jardi|jardov}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|čevelj|čevlja|čevlji|čeljev}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|dlan|dlani}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|palec|palca|palci|palcev}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|navtična milja|navtični milji|navtične milje|navtičnih milj}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|navtična milja|navtični milji|navtične milje|navtičnih milj}} (britanska, pred 1970)',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|navtična milja|navtični milji|navtične milje|navtičnih milj}} (ZDA, pred 1954)',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|parsek|parseka|parseki|persekov}}',
+	'pfunc-convert-unit-length-lightyear' => '$1$3 {{PLURAL:$2|svetlobno leto|svetlobni leti|svetlobna leta|svetlobnih let}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomska enota|astronomski enoti|astronomske enote|astronomskih enot}}',
+	'pfunc-convert-unit-length-metre-abbr' => '$1m',
+	'pfunc-convert-unit-length-angstrom-abbr' => '$1Å',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1veriga',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1seženj',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (ZDA, pred 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 sv. l.',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1a.e.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kvadratni kilometer|kvadratna kilometra|kvadratni kilometri|kvadratnih kilometrov}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|kvadratni meter|kvadratna metra|kvadratni metri|kvadratnih metrov}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|kvadratni centimeter|kvadratna centimetra|kvadratni centimetri|kvadratnih centimetrov}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|kvadratni milimeter|kvadratna milimetra|kvadratni milimetri|kvadratnih milimetrov}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektara|hektare|hektarov}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|kvadratna milja|kvadratni milji|kvadratne milje|kvadratnih milj}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|aker|akra|akri|akrov}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|kvadratni jard|kvadratna jarda|kvadratni jardi|kvadratnih jardov}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|kvadratni čevelj|kvadratna čevlja|kvadratni čevlji|kvadratnih čevljev}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|kvadratni palec|kvadratna palca|kvadratni palci|kvadratnih palcev}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|kvadratna navtična milja|kvadratni navtični milji|kvadratne navtične milje|kvadratnih navtičnih milj}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunama|dunami|dunamov}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsuba|tsubi|tsubov}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1kv. mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1aker',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1kv. yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1kv. ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1kv. in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1kv nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekunda|sekundi|sekunde|sekund}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|leto|leti|leta|let}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dan|dneva|dnevi|dni}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|ura|uri|ure|ur}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuta|minuti|minute|minut}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1leto',
+	'pfunc-convert-unit-time-day-abbr' => '$1dan',
+	'pfunc-convert-unit-time-hour-abbr' => '$1ura',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|kubični meter|kubična metra|kubični metri|kubičnih metrov}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|kubični centimeter|kubična centimetra|kubični centimetri|kubičnih centimetrov}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|kubični milimeter|kubična milimetra|kubični milimetri|kubičnih milimetrov}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1kilo{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1centi{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1mili{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|kubični jard|kubična jarda|kubični jardi|kubičnih jardov}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kubični čevelj|kubična čevlja|kubični čevlji|kubičnih čevljev}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|kubični palec|kubična palca|kubični palci|kubičnih palcev}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|sod|soda|sodi|sodov}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|bušel|bušla|bušli|bušlov}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|galona|galoni|galone|galon}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|kvart|kvarta|kvarti|kvartov}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pint|pinta|pinti|pintov}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|tekočinska unča|tekočinski unči|tekočinske unče|tekočinskih unč}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|ameriški sod|ameriška soda|ameriški sodi|ameriških sodov}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|sod|soda|sodi|sodov}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|sod|soda|sodi|sodov}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|ameriška galona|ameriški galoni|ameriške galone|ameriških galon}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|ameriški kvart|ameriška kvarta|ameriški kvarti|ameriških kvartov}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|ameriški pint|ameriška pinta|ameriški pinti|ameriških pintov}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|ameriška tekočinska unča|ameriški tekočinski unči|ameriške tekočinske unče|ameriških tekočinskih unč}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|ameriški suhi sod|ameriška suha soda|ameriški suhi sodi|ameriških suhih sodov}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|ameriški bušel|ameriška bušla|ameriški bušli|ameriških bušlov}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|ameriška suha galona|ameriški suhi galoni|ameriške suhe galone|ameriških suhih galon}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|ameriški suhi kvart|ameriška suha kvarta|ameriški suhi kvarti|ameriških suhih kvartov}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|ameriški suhi pint|ameriška suha pinta|ameriški suhi pinti|ameriških suhih pintov}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1kub. yd',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1kub. ft',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1kub. in',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1am. bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1am. gal',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1am. qt',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1am. pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1am. fl oz',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1am. bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1am. bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1am. suha gal',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1am. suhi qt',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1am. suhi pt',
+	'pfunc-convert-unit-speed-mile-hour' => '$1milje na uro',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|paskal|paskala|paskali|paskalov}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosferi|atmosfere|atmosfer}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torra|torri|torrov}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milimeter|milimetra|milimetri|milimetrov}} živega srebra',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|palec|palca|palci|palcev}} živega srebra',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|funt|funta|funti|funtov}} na kvadratni palec',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Albanian (Shqip)
@@ -3977,8 +4856,10 @@ $messages['su'] = array(
 /** Swedish (Svenska)
  * @author Ainali
  * @author Lejonel
+ * @author Lokal Profil
  * @author M.M.S.
  * @author Najami
+ * @author WikiPhoenix
  */
 $messages['sv'] = array(
 	'pfunc_desc' => 'Lägger till logiska funktioner i parsern',
@@ -4038,110 +4919,110 @@ $messages['sv'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2meter|$2meter}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ångström|ångström}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|engelsk mil|engelska mil}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlonger}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|chain|chains}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|stång|stänger}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|famn|famnar}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yard|yards}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|fot|fot}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|hand|händer}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|tum|tum}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|nautisk mil|nautiska mil}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|nautisk mil (innan 1970, brittisk)|nautiska mil (innan 1970, brittisk)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|nautisk mil (innan 1954, USA)|nautiska mil (innan 1954, USA)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsec|$2parsec}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2ljusår|$2ljusår}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomisk enhet|astronomiska enheter}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-fathom-abbr' => 'famn',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Storbr.)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (innan 1954, USA)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AU',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kvadratkilometer|kvadratkilometer}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|kvadratmeter|kvadratmeter}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|kvadratcentimeter|kvadratcentimeter}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|kvadratmillimeter|kvadratmillimeter}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektar}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|kvadratmil|kvadratmil}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|tunnland|tunnland}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|kvadratyard|kvadratyard}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|kvadratfot|kvadratfötter}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|kvadrattum|kvadrattum}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|kvadratisk nautisk mil|kvadratiska nautiska mil}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunam}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'kv mil',
-	'pfunc-convert-unit-area-acre-abbr' => 'tunnland',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'kv yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'kv ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'kv in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'kv nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|sekund|sekunder}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2år|$2år}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dag|dagar}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|timme|timmar}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minut|minuter}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-day-abbr' => 'dag',
-	'pfunc-convert-unit-time-hour-abbr' => 'tim',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|kubikmeter|kubikmeter}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|kubikcentimeter|kubikcentimeter}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|kubikmillimeter|kubikmillimeter}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kiloliter|kiloliter}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|liter}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centiliter|centiliter}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|milliliter|milliliter}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|kubikyard|kubikyards}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kubikfot|kubikfötter}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|kubiktum|kubiktum}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|fat|fat}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|gallon|gallons}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|quart|quarts}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pint|pints}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|gallon (USA, våt)|gallon (USA, våt)}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|quart (USA, våt)|quart (USA, våt)}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|pint (USA, våt)|pint (USA, våt)}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|gallon (USA, torr)|gallon (USA, torr)}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|quart (USA, torr)|quart (USA, torr)}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|pint (USA, torr)|pint (USA, torr)}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-speed-mile-hour' => 'miles per timme',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mph',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascal}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-millibar' => 'millibar',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfär|atmosfärer}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|torr|torr}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|millimeter kvicksilver|millimeter kvicksilver}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|tum kvicksilver|tum kvicksilver}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3meter|$3meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ångström|ångström}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|engelsk mil|engelska mil}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlonger}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chain|chains}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|stång|stänger}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|famn|famnar}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|fot|fot}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|hand|händer}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|tum|tum}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautisk mil|nautiska mil}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|nautisk mil (innan 1970, brittisk)|nautiska mil (innan 1970, brittisk)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|nautisk mil (innan 1954, USA)|nautiska mil (innan 1954, USA)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsec}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3ljusår|$3ljusår}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomisk enhet|astronomiska enheter}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1famn',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Storbr.)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (innan 1954, USA)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kvadratkilometer|kvadratkilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|kvadratmeter|kvadratmeter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|kvadratcentimeter|kvadratcentimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|kvadratmillimeter|kvadratmillimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektar}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|kvadratmil|kvadratmil}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|tunnland|tunnland}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|kvadratyard|kvadratyard}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|kvadratfot|kvadratfötter}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|kvadrattum|kvadrattum}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|kvadratisk nautisk mil|kvadratiska nautiska mil}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunam}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1kv mil',
+	'pfunc-convert-unit-area-acre-abbr' => '$1tunnland',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1kv yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1kv ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1kv in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1kv nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekund|sekunder}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3år|$3år}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dag|dagar}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|timme|timmar}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minut|minuter}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-day-abbr' => '$1dag',
+	'pfunc-convert-unit-time-hour-abbr' => '$1tim',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|kubikmeter|kubikmeter}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|kubikcentimeter|kubikcentimeter}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|kubikmillimeter|kubikmillimeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kiloliter|kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centiliter|centiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|milliliter|milliliter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|kubikyard|kubikyards}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kubikfot|kubikfötter}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|kubiktum|kubiktum}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|fat|fat}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gallon|gallons}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|quart|quarts}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pint|pints}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|gallon (USA, våt)|gallon (USA, våt)}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|quart (USA, våt)|quart (USA, våt)}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|pint (USA, våt)|pint (USA, våt)}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|gallon (USA, torr)|gallon (USA, torr)}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|quart (USA, torr)|quart (USA, torr)}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|pint (USA, torr)|pint (USA, torr)}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-speed-mile-hour' => '$1miles per timme',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfär|atmosfärer}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimeter kvicksilver|millimeter kvicksilver}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|tum kvicksilver|tum kvicksilver}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Telugu (తెలుగు)
@@ -4434,152 +5315,153 @@ $messages['vi'] = array(
 	'pfunc-convert-prefix-atto' => 'atô',
 	'pfunc-convert-prefix-zepto' => 'zéptô',
 	'pfunc-convert-prefix-yocto' => 'yóctô',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1}}$2mét',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1}}ångström',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1}}dặm',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1}}furlong',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1}}chain',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1}}rod',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1}}fathom',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1}}yard',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1}}foot',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1}}hand',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1}}inch',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1}}hải lý',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1}}hải lý (Anh trước 1970)',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1}}hải lý (Mỹ trước 1954)',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1}}$2parsec',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1}}$2 năm ánh sáng',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1}}đơn vị thiên văn',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fathom',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Anh)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (Mỹ trước 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2ly',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'ua',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1}}kilômét vuông',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1}}mét vuông',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1}}xentimét vuông',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1}}millimét vuông',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1}}hecta',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1}}dặm vuông',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1}}mẫu Anh',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1}}yard vuông',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1}}foot vuông',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1}}inch vuông',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1}}hải lý vuông',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1}}dunam',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1}}tsubo',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km²',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm²',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm²',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm²',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'sq mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'mẫu',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'sq yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'sq ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'sq in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'sq nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1}}giây',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1}}$2 năm',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1}}ngày',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1}}giờ',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1}}phút',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2yr',
-	'pfunc-convert-unit-time-day-abbr' => 'ngày',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1}}mét khối',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1}}xentimét khối',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1}}milimét khối',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1}}kilôlít',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1}}lít',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1}}xentilít',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1}}mililít',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1}}yard khối',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1}}foot khối',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1}}inch khối',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1}}thùng',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1}}giạ',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1}}gallon',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1}}quart',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1}}pint',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1}}aoxơ chất lỏng',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1}}thùng Mỹ',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1}}thùng',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1}}thùng',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1}}gallon Mỹ',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1}}quart Mỹ',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1}}pint Mỹ',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1}}aoxơ chất lỏng Mỹ',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1}}thùng chất khô Mỹ',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1}}thùng Mỹ',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1}}gallon chất khô Mỹ',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1}}quart chất khô Mỹ',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1}}pint chất khô Mỹ',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm³',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm³',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm³',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'cu yd',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'cu ft',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'cu in',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'bbl Mỹ',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'gal Mỹ',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'qt Mỹ',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'pt Mỹ',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'fl oz Mỹ',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'bbl Mỹ',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'bsh Mỹ',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'dry gal Mỹ',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'dry qt Mỹ',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'dry pt Mỹ',
-	'pfunc-convert-unit-speed-mile-hour' => 'dặm một giờ',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1}}$2pascal',
-	'pfunc-convert-unit-pressure-bar' => 'ba',
-	'pfunc-convert-unit-pressure-decibar' => 'đêxiba',
-	'pfunc-convert-unit-pressure-millibar' => 'miliba',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilôbarye',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1}}atmôtphe',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1}}torr',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1}}milimét thủy ngân',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1}}inch thủy ngân',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1}}pound một inch vuông',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2}}$3mét',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2}}ångström',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2}}dặm',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2}}furlong',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2}}chain',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2}}rod',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2}}fathom',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2}}yard',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2}}foot',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2}}hand',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2}}inch',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2}}hải lý',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2}}hải lý (Anh trước 1970)',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2}}hải lý (Mỹ trước 1954)',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2}}$3parsec',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2}}$3 năm ánh sáng',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2}}đơn vị thiên văn',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fathom',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Anh)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (Mỹ trước 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1ua',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2}}kilômét vuông',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2}}mét vuông',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2}}xentimét vuông',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2}}millimét vuông',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2}}hecta',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2}}dặm vuông',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2}}mẫu Anh',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2}}yard vuông',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2}}foot vuông',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2}}inch vuông',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2}}hải lý vuông',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2}}dunam',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2}}tsubo',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km²',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m²',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm²',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm²',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1sq mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1mẫu',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1sq yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1sq ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1sq in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sq nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2}}giây',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2}}$3 năm',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2}}ngày',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2}}giờ',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2}}phút',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3yr',
+	'pfunc-convert-unit-time-day-abbr' => '$1ngày',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2}}mét khối',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2}}xentimét khối',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2}}milimét khối',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2}}kilôlít',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2}}lít',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2}}xentilít',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2}}mililít',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2}}yard khối',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2}}foot khối',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2}}inch khối',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2}}thùng',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2}}giạ',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2}}gallon',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2}}quart',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2}}pint',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2}}aoxơ chất lỏng',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2}}thùng Mỹ',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2}}thùng',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2}}thùng',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2}}gallon Mỹ',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2}}quart Mỹ',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2}}pint Mỹ',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2}}aoxơ chất lỏng Mỹ',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2}}thùng chất khô Mỹ',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2}}thùng Mỹ',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2}}gallon chất khô Mỹ',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2}}quart chất khô Mỹ',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2}}pint chất khô Mỹ',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m³',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm³',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm³',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1cu yd',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1cu ft',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1cu in',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1bbl Mỹ',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1gal Mỹ',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1qt Mỹ',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1pt Mỹ',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1fl oz Mỹ',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1bbl Mỹ',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1bsh Mỹ',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1dry gal Mỹ',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1dry qt Mỹ',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1dry pt Mỹ',
+	'pfunc-convert-unit-speed-mile-hour' => '$1dặm một giờ',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2}}$3pascal',
+	'pfunc-convert-unit-pressure-bar' => '$1ba',
+	'pfunc-convert-unit-pressure-decibar' => '$1đêxiba',
+	'pfunc-convert-unit-pressure-millibar' => '$1miliba',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilôbarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2}}atmôtphe',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2}}torr',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2}}milimét thủy ngân',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2}}inch thủy ngân',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2}}pound một inch vuông',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Volapük (Volapük)
@@ -4637,14 +5519,18 @@ $messages['yue'] = array(
 );
 
 /** Simplified Chinese (‪中文(简体)‬)
+ * @author Hydra
  * @author Liangent
+ * @author PhiLiP
  * @author Philip
  * @author Shinjiman
+ * @author 阿pp
  */
 $messages['zh-hans'] = array(
 	'pfunc_desc' => '用逻辑函数加强解析器',
 	'pfunc_time_error' => '错误：无效时间',
 	'pfunc_time_too_long' => '错误：#time调用次数过多',
+	'pfunc_time_too_big' => '错误：#time只支持到9999年',
 	'pfunc_rel2abs_invalid_depth' => '错误：无效路径深度：“$1”（尝试访问根节点以上节点）',
 	'pfunc_expr_stack_exhausted' => '表达式错误：堆栈耗尽',
 	'pfunc_expr_unexpected_number' => '表达式错误：未预料的数字',
@@ -4661,6 +5547,11 @@ $messages['zh-hans'] = array(
 	'pfunc_expr_unknown_error' => '表达式错误：未知错误（$1）',
 	'pfunc_expr_not_a_number' => '在$1中：结果不是数字',
 	'pfunc_string_too_long' => '错误：字符串超过$1字符限制',
+	'pfunc-convert-dimension-time' => '时间',
+	'pfunc-convert-dimension-mass' => '重量',
+	'pfunc-convert-dimension-speed' => '速度',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1平方海里',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
diff --git a/extensions/ParserFunctions/ParserFunctions.php b/extensions/ParserFunctions/ParserFunctions.php
index da9f3bbe..fc28ece8 100644
--- a/extensions/ParserFunctions/ParserFunctions.php
+++ b/extensions/ParserFunctions/ParserFunctions.php
@@ -50,8 +50,8 @@ $wgPFUnitLanguageVariants = array(
 $wgExtensionCredits['parserhook'][] = array(
 	'path' => __FILE__,
 	'name' => 'ParserFunctions',
-	'version' => '1.4.0',
-	'url' => 'http://www.mediawiki.org/wiki/Extension:ParserFunctions',
+	'version' => '1.4.1',
+	'url' => 'https://www.mediawiki.org/wiki/Extension:ParserFunctions',
 	'author' => array( 'Tim Starling', 'Robert Rohde', 'Ross McClure', 'Juraj Simlovic' ),
 	'descriptionmsg' => 'pfunc_desc',
 );
@@ -69,25 +69,20 @@ $wgParserTestFiles[] = dirname( __FILE__ ) . "/convertTests.txt";
 
 $wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
 
+/**
+ * @param $parser Parser
+ * @return bool
+ */
 function wfRegisterParserFunctions( $parser ) {
 	global $wgPFEnableStringFunctions, $wgPFEnableConvert;
 
-	if ( defined( get_class( $parser ) . '::SFH_OBJECT_ARGS' ) ) {
-		// These functions accept DOM-style arguments
-		$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeqObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexistObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexprObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferrorObj', SFH_OBJECT_ARGS );
-	} else {
-		$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifHook' );
-		$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeq' );
-		$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchHook' );
-		$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexist' );
-		$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexpr' );
-		$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferror' );
-	}
+	// These functions accept DOM-style arguments
+	$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeqObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexistObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexprObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferrorObj', SFH_OBJECT_ARGS );
 
 	$parser->setFunctionHook( 'expr', 'ExtParserFunctions::expr' );
 	$parser->setFunctionHook( 'time', 'ExtParserFunctions::time' );
diff --git a/extensions/ParserFunctions/ParserFunctions_body.php b/extensions/ParserFunctions/ParserFunctions_body.php
index 13611510..d68ed8b7 100644
--- a/extensions/ParserFunctions/ParserFunctions_body.php
+++ b/extensions/ParserFunctions/ParserFunctions_body.php
@@ -7,6 +7,10 @@ class ExtParserFunctions {
 	static $mTimeChars = 0;
 	static $mMaxTimeChars = 6000; # ~10 seconds
 
+	/**
+	 * @param $parser Parser
+	 * @return bool
+	 */
 	public static function clearState( $parser ) {
 		self::$mTimeChars = 0;
 		$parser->pf_ifexist_breakdown = array();
@@ -30,6 +34,8 @@ class ExtParserFunctions {
 
 	/**
 	 * Get the marker regex. Cached.
+	 * @param $parser Parser
+	 * @return
 	 */
 	public static function getMarkerRegex( $parser ) {
 		self::registerClearHook();
@@ -41,16 +47,7 @@ class ExtParserFunctions {
 
 		$prefix = preg_quote( $parser->uniqPrefix(), '/' );
 
-		// The first line represents Parser from release 1.12 forward.
-		// subsequent lines are hacks to accomodate old Mediawiki versions.
-		if ( defined( 'Parser::MARKER_SUFFIX' ) )
-			$suffix = preg_quote( Parser::MARKER_SUFFIX, '/' );
-		elseif ( isset( $parser->mMarkerSuffix ) )
-			$suffix = preg_quote( $parser->mMarkerSuffix, '/' );
-		elseif ( defined( 'MW_PARSER_VERSION' ) &&
-				strcmp( MW_PARSER_VERSION, '1.6.1' ) > 0 )
-			$suffix = "QINU\x07";
-		else $suffix = 'QINU';
+		$suffix = preg_quote( Parser::MARKER_SUFFIX, '/' );
 
 		$parser->pf_markerRegex = '/' . $prefix . '(?:(?!' . $suffix . ').)*' . $suffix . '/us';
 
@@ -58,7 +55,11 @@ class ExtParserFunctions {
 		return $parser->pf_markerRegex;
 	}
 
-	// Removes unique markers from passed parameters, used by string functions.
+	/**
+	 * @param $parser Parser
+	 * @param $text string
+	 * @return string
+	 */
 	private static function killMarkers ( $parser, $text ) {
 		return preg_replace( self::getMarkerRegex( $parser ), '' , $text );
 	}
@@ -73,6 +74,11 @@ class ExtParserFunctions {
 		return self::$mExprParser;
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $expr string
+	 * @return string
+	 */
 	public static function expr( $parser, $expr = '' ) {
 		try {
 			return self::getExprParser()->doExpression( $expr );
@@ -81,6 +87,13 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $expr string
+	 * @param $then string
+	 * @param $else string
+	 * @return string
+	 */
 	public static function ifexpr( $parser, $expr = '', $then = '', $else = '' ) {
 		try {
 			$ret = self::getExprParser()->doExpression( $expr );
@@ -97,6 +110,12 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifexprObj( $parser, $frame, $args ) {
 		$expr = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$then = isset( $args[1] ) ? $args[1] : '';
@@ -108,14 +127,12 @@ class ExtParserFunctions {
 		return $result;
 	}
 
-	public static function ifHook( $parser, $test = '', $then = '', $else = '' ) {
-		if ( $test !== '' ) {
-			return $then;
-		} else {
-			return $else;
-		}
-	}
-
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifObj( $parser, $frame, $args ) {
 		$test = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		if ( $test !== '' ) {
@@ -125,14 +142,12 @@ class ExtParserFunctions {
 		}
 	}
 
-	public static function ifeq( $parser, $left = '', $right = '', $then = '', $else = '' ) {
-		if ( $left == $right ) {
-			return $then;
-		} else {
-			return $else;
-		}
-	}
-
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifeqObj( $parser, $frame, $args ) {
 		$left = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$right = isset( $args[1] ) ? trim( $frame->expand( $args[1] ) ) : '';
@@ -143,6 +158,13 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $test string
+	 * @param $then string
+	 * @param $else bool
+	 * @return bool|string
+	 */
 	public static function iferror( $parser, $test = '', $then = '', $else = false ) {
 		if ( preg_match( '/<(?:strong|span|p|div)\s(?:[^\s>]*\s+)*?class="(?:[^"\s>]*\s+)*?error(?:\s[^">]*)?"/', $test ) ) {
 			return $then;
@@ -153,6 +175,12 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function iferrorObj( $parser, $frame, $args ) {
 		$test = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$then = isset( $args[1] ) ? $args[1] : false;
@@ -165,47 +193,7 @@ class ExtParserFunctions {
 		}
 	}
 
-	public static function switchHook( $parser /*,...*/ ) {
-		$args = func_get_args();
-		array_shift( $args );
-		$primary = trim( array_shift( $args ) );
-		$found = $defaultFound = false;
-		$parts = null;
-		$default = null;
-		$mwDefault =& MagicWord::get( 'default' );
-		foreach ( $args as $arg ) {
-			$parts = array_map( 'trim', explode( '=', $arg, 2 ) );
-			if ( count( $parts ) == 2 ) {
-				# Found "="
-				if ( $found || $parts[0] == $primary ) {
-					# Found a match, return now
-					return $parts[1];
-				} elseif ( $defaultFound || $mwDefault->matchStartAndRemove( $parts[0] ) ) {
-					$default = $parts[1];
-				} # else wrong case, continue
-			} elseif ( count( $parts ) == 1 ) {
-				# Multiple input, single output
-				# If the value matches, set a flag and continue
-				if ( $parts[0] == $primary ) {
-					$found = true;
-				} elseif ( $mwDefault->matchStartAndRemove( $parts[0] ) ) {
-					$defaultFound = true;
-				}
-			} # else RAM corruption due to cosmic ray?
-		}
-		# Default case
-		# Check if the last item had no = sign, thus specifying the default case
-		if ( count( $parts ) == 1 ) {
-			return $parts[0];
-		} elseif ( !is_null( $default ) ) {
-			return $default;
-		} else {
-			return '';
-		}
-	}
-
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param $frame PPFrame
 	 * @param $args
@@ -272,6 +260,10 @@ class ExtParserFunctions {
 	 * initial slash is treated as a relative path, and vice versa.
 	 *
 	 * @param $parser Parser
+	 * @param $to string
+	 * @param $from string
+	 *
+	 * @return string
 	 */
 	public static function rel2abs( $parser , $to = '' , $from = '' ) {
 
@@ -328,7 +320,6 @@ class ExtParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param $frame PPFrame
 	 * @return bool
@@ -348,10 +339,15 @@ class ExtParserFunctions {
 		return $parser->mExpensiveFunctionCount <= $wgExpensiveParserFunctionLimit;
 	}
 
-	public static function ifexist( $parser, $title = '', $then = '', $else = '' ) {
-		return self::ifexistCommon( $parser, false, $title, $then, $else );
-	}
-
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $titletext string
+	 * @param $then string
+	 * @param $else string
+	 *
+	 * @return string
+	 */
 	public static function ifexistCommon( $parser, $frame, $titletext = '', $then = '', $else = '' ) {
 		global $wgContLang;
 		$title = Title::newFromText( $titletext );
@@ -385,11 +381,12 @@ class ExtParserFunctions {
 				return $else;
 			} else {
 				$pdbk = $title->getPrefixedDBkey();
-				$lc = LinkCache::singleton();
 				if ( !self::incrementIfexistCount( $parser, $frame ) ) {
 					return $else;
 				}
-				if ( 0 != ( $id = $lc->getGoodLinkID( $pdbk ) ) ) {
+				$lc = LinkCache::singleton();
+				$id = $lc->getGoodLinkID( $pdbk );
+				if ( $id != 0 ) {
 					$parser->mOutput->addLink( $title, $id );
 					return $then;
 				} elseif ( $lc->isBadLink( $pdbk ) ) {
@@ -406,6 +403,12 @@ class ExtParserFunctions {
 		return $else;
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifexistObj( $parser, $frame, $args ) {
 		$title = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$then = isset( $args[1] ) ? $args[1] : null;
@@ -419,81 +422,65 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $format string
+	 * @param $date string
+	 * @param $language string
+	 * @param $local string|bool
+	 * @return string
+	 */
 	public static function time( $parser, $format = '', $date = '', $language = '', $local = false ) {
-		global $wgLang, $wgContLang, $wgLocaltimezone;
+		global $wgLocaltimezone;
 		self::registerClearHook();
-		if ( isset( self::$mTimeCache[$format][$date][$language][$local] ) ) {
-			return self::$mTimeCache[$format][$date][$language][$local];
+		if ( $date === '' ) {
+			$cacheKey = $parser->getOptions()->getTimestamp();
+			$date = wfTimestamp( TS_ISO_8601, $cacheKey );
+		} else {
+			$cacheKey = $date;
+		}
+		if ( isset( self::$mTimeCache[$format][$cacheKey][$language][$local] ) ) {
+			return self::$mTimeCache[$format][$cacheKey][$language][$local];
 		}
 
 		# compute the timestamp string $ts
 		# PHP >= 5.2 can handle dates before 1970 or after 2038 using the DateTime object
-		# PHP < 5.2 is limited to dates between 1970 and 2038
 
 		$invalidTime = false;
 
-		if ( class_exists( 'DateTime' ) ) { # PHP >= 5.2
-			# the DateTime constructor must be used because it throws exceptions
-			# when errors occur, whereas date_create appears to just output a warning
-			# that can't really be detected from within the code
-			try {
-				# Determine timezone
-				if ( $local ) {
-					 # convert to MediaWiki local timezone if set
-					if ( isset( $wgLocaltimezone ) ) {
-						$tz = new DateTimeZone( $wgLocaltimezone );
-					} else {
-						$tz = new DateTimeZone( date_default_timezone_get() );
-					}
-				} else {
-					# if local time was not requested, convert to UTC
-					$tz = new DateTimeZone( 'UTC' );
-				}
-				
-				# Correct for DateTime interpreting 'XXXX' as XX:XX o'clock
-				if ( preg_match( '/^[0-9]{4}$/', $date ) ) {
-					$date = '00:00 '.$date;
-				}
+		# the DateTime constructor must be used because it throws exceptions
+		# when errors occur, whereas date_create appears to just output a warning
+		# that can't really be detected from within the code
+		try {
 
-				# Parse date
-				if ( $date !== '' ) {
-					$dateObject = new DateTime( $date, $tz );
-				} else {
-					# use current date and time
-					$dateObject = new DateTime( 'now', $tz );
-				}
+			# Default input timezone is UTC.
+			$utc = new DateTimeZone( 'UTC' );
 
-				# Generate timestamp
-				$ts = $dateObject->format( 'YmdHis' );
-			} catch ( Exception $ex ) {
-				$invalidTime = true;
-			}
-		} else { # PHP < 5.2
-			if ( $date !== '' ) {
-				$unix = @strtotime( $date );
-			} else {
-				$unix = time();
+			# Correct for DateTime interpreting 'XXXX' as XX:XX o'clock
+			if ( preg_match( '/^[0-9]{4}$/', $date ) ) {
+				$date = '00:00 '.$date;
 			}
 
-			if ( $unix == -1 || $unix == false ) {
-				$invalidTime = true;
-			} else {
-				if ( $local ) {
-					# Use the time zone
-					if ( isset( $wgLocaltimezone ) ) {
-						$oldtz = getenv( 'TZ' );
-						putenv( 'TZ=' . $wgLocaltimezone );
-					}
-					wfSuppressWarnings(); // E_STRICT system time bitching
-					$ts = date( 'YmdHis', $unix );
-					wfRestoreWarnings();
-					if ( isset( $wgLocaltimezone ) ) {
-						putenv( 'TZ=' . $oldtz );
-					}
+			# Parse date
+			# UTC is a default input timezone.
+			$dateObject = new DateTime( $date, $utc );
+
+			# Set output timezone.
+			if ( $local ) {
+				if ( isset( $wgLocaltimezone ) ) {
+					$tz = new DateTimeZone( $wgLocaltimezone );
 				} else {
-					$ts = wfTimestamp( TS_MW, $unix );
+					$tz = new DateTimeZone( date_default_timezone_get() );
 				}
+				$dateObject->setTimezone( $tz );
+			} else {
+				$dateObject->setTimezone( $utc );
 			}
+			# Generate timestamp
+			$ts = $dateObject->format( 'YmdHis' );
+
+		} catch ( Exception $ex ) {
+			$invalidTime = true;
 		}
 
 		# format the timestamp and return the result
@@ -518,10 +505,17 @@ class ExtParserFunctions {
 				}
 			}
 		}
-		self::$mTimeCache[$format][$date][$language][$local] = $result;
+		self::$mTimeCache[$format][$cacheKey][$language][$local] = $result;
 		return $result;
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $format string
+	 * @param $date string
+	 * @param $language string
+	 * @return string
+	 */
 	public static function localTime( $parser, $format = '', $date = '', $language = '' ) {
 		return self::time( $parser, $format, $date, $language, true );
 	}
@@ -530,10 +524,10 @@ class ExtParserFunctions {
 	 * Obtain a specified number of slash-separated parts of a title,
 	 * e.g. {{#titleparts:Hello/World|1}} => "Hello"
 	 *
-	 * @param Parser $parser Parent parser
-	 * @param string $title Title to split
-	 * @param int $parts Number of parts to keep
-	 * @param int $offset Offset starting at 1
+	 * @param $parser Parent parser
+	 * @param $title string Title to split
+	 * @param $parts int Number of parts to keep
+	 * @param $offset int Offset starting at 1
 	 * @return string
 	 */
 	public static function titleparts( $parser, $title = '', $parts = 0, $offset = 0 ) {
@@ -570,6 +564,9 @@ class ExtParserFunctions {
 		return self::$mConvertParser;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function convert( /*...*/ ) {
 		try {
 			$args = func_get_args();
@@ -579,13 +576,20 @@ class ExtParserFunctions {
 		}
 	}
 
-	// Verifies parameter is less than max string length.
+	/**
+	 *  Verifies parameter is less than max string length.
+	 * @param $text
+	 * @return bool
+	 */
 	private static function checkLength( $text ) {
 		global $wgPFStringLengthLimit;
 		return ( mb_strlen( $text ) < $wgPFStringLengthLimit );
 	}
 
-	// Generates error message.  Called when string is too long.
+	/**
+	 * Generates error message.  Called when string is too long.
+	 * @return string
+	 */
 	private static function tooLongError() {
 		global $wgPFStringLengthLimit, $wgContLang;
 		return '<strong class="error">' .
@@ -599,6 +603,9 @@ class ExtParserFunctions {
 	 * {{#len:string}}
 	 *
 	 * Reports number of characters in string.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @return int
 	 */
 	public static function runLen ( $parser, $inStr = '' ) {
 		wfProfileIn( __METHOD__ );
@@ -617,6 +624,11 @@ class ExtParserFunctions {
 	 *
 	 * Note: If the needle is an empty string, single space is used instead.
 	 * Note: If the needle is not found, empty string is returned.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inNeedle int
+	 * @param $inOffset int
+	 * @return int|string
 	 */
 	public static function runPos ( $parser, $inStr = '', $inNeedle = '', $inOffset = 0 ) {
 		wfProfileIn( __METHOD__ );
@@ -625,7 +637,7 @@ class ExtParserFunctions {
 		$inNeedle = self::killMarkers( $parser, (string)$inNeedle );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inNeedle ) ) {
+			!self::checkLength( $inNeedle ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -646,6 +658,10 @@ class ExtParserFunctions {
 	 *
 	 * Note: If the needle is an empty string, single space is used instead.
 	 * Note: If the needle is not found, -1 is returned.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inNeedle int
+	 * @return int|string
 	 */
 	public static function runRPos ( $parser, $inStr = '', $inNeedle = '' ) {
 		wfProfileIn( __METHOD__ );
@@ -654,7 +670,7 @@ class ExtParserFunctions {
 		$inNeedle = self::killMarkers( $parser, (string)$inNeedle );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inNeedle ) ) {
+			!self::checkLength( $inNeedle ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -679,6 +695,12 @@ class ExtParserFunctions {
 	 *   "string".
 	 * Note: A negative value for "length" returns a string reduced in
 	 *   length by that amount.
+	 *
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inStart int
+	 * @param $inLength int
+	 * @return string
 	 */
 	public static function runSub ( $parser, $inStr = '', $inStart = 0, $inLength = 0 ) {
 		wfProfileIn( __METHOD__ );
@@ -693,7 +715,7 @@ class ExtParserFunctions {
 		if ( intval( $inLength ) == 0 ) {
 			$result = mb_substr( $inStr, $inStart );
 		} else {
-			$result = mb_substr( $inStr, $inStart, $inLength );
+			$result = mb_substr( $inStr, intval( $inStart ), intval( $inLength ) );
 		}
 
 		wfProfileOut( __METHOD__ );
@@ -706,6 +728,10 @@ class ExtParserFunctions {
 	 * Returns number of occurrences of "substr" in "string".
 	 *
 	 * Note: If "substr" is empty, a single space is used.
+	 * @param $parser
+	 * @param $inStr string
+	 * @param $inSubStr string
+	 * @return int|string
 	 */
 	public static function runCount ( $parser, $inStr = '', $inSubStr = '' ) {
 		wfProfileIn( __METHOD__ );
@@ -714,12 +740,14 @@ class ExtParserFunctions {
 		$inSubStr = self::killMarkers( $parser, (string)$inSubStr );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inSubStr ) ) {
+			!self::checkLength( $inSubStr ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
 
-		if ( $inSubStr == '' ) { $inSubStr = ' '; }
+		if ( $inSubStr == '' ) {
+			$inSubStr = ' ';
+		}
 
 		$result = mb_substr_count( $inStr, $inSubStr );
 
@@ -735,6 +763,12 @@ class ExtParserFunctions {
 	 *
 	 * Note: Armored against replacements that would generate huge strings.
 	 * Note: If "from" is an empty string, single space is used instead.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inReplaceFrom string
+	 * @param $inReplaceTo string
+	 * @param $inLimit int
+	 * @return mixed|string
 	 */
 	public static function runReplace( $parser, $inStr = '',
 			$inReplaceFrom = '', $inReplaceTo = '', $inLimit = -1 ) {
@@ -746,8 +780,8 @@ class ExtParserFunctions {
 		$inReplaceTo = self::killMarkers( $parser, (string)$inReplaceTo );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inReplaceFrom ) ||
-		    !self::checkLength( $inReplaceTo ) ) {
+			!self::checkLength( $inReplaceFrom ) ||
+			!self::checkLength( $inReplaceTo ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -793,6 +827,12 @@ class ExtParserFunctions {
 	 * Note: Negative position can be used to specify tokens from the end.
 	 * Note: If the divider is an empty string, single space is used instead.
 	 * Note: Empty string is returned if there are not enough exploded chunks.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inDiv string
+	 * @param $inPos int
+	 * @param $inLim int|null
+	 * @return string
 	 */
 	public static function runExplode ( $parser, $inStr = '', $inDiv = '', $inPos = 0, $inLim = null ) {
 		wfProfileIn( __METHOD__ );
@@ -800,10 +840,12 @@ class ExtParserFunctions {
 		$inStr = self::killMarkers( $parser, (string)$inStr );
 		$inDiv = self::killMarkers( $parser, (string)$inDiv );
 
-		if ( $inDiv == '' ) { $inDiv = ' '; }
+		if ( $inDiv == '' ) {
+			$inDiv = ' ';
+		}
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inDiv ) ) {
+			!self::checkLength( $inDiv ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -828,6 +870,9 @@ class ExtParserFunctions {
 	 * {{#urldecode:string}}
 	 *
 	 * Decodes URL-encoded (like%20that) strings.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @return string
 	 */
 	public static function runUrlDecode( $parser, $inStr = '' ) {
 		wfProfileIn( __METHOD__ );
diff --git a/extensions/ParserFunctions/convertTests.txt b/extensions/ParserFunctions/convertTests.txt
index dc09c45a..b9d84f31 100644
--- a/extensions/ParserFunctions/convertTests.txt
+++ b/extensions/ParserFunctions/convertTests.txt
@@ -172,13 +172,13 @@ Errors
 *{{#convert: 25 km/s/l }}
 *{{#convert: 25 km/m3 }}
 !! result
-<ul><li><strong class="error">Error: no source unit given</strong>
-</li><li><strong class="error">Error: unknown unit "foobars"</strong>
-</li><li><strong class="error">Error: unknown unit "foobar"</strong>
-</li><li><strong class="error">Error: cannot convert between units of "length" and "time"</strong>
-</li><li><strong class="error">Error: invalid compound unit "length/pressure"</strong>
-</li><li><strong class="error">Error: cannot parse double compound units like "km/s/l"</strong>
-</li><li><strong class="error">Error: invalid compound unit "length/volume"</strong>
+<ul><li><strong class="error">Error: No source unit given.</strong>
+</li><li><strong class="error">Error: Unknown unit "foobars".</strong>
+</li><li><strong class="error">Error: Unknown unit "foobar".</strong>
+</li><li><strong class="error">Error: Cannot convert between units of "length" and "time".</strong>
+</li><li><strong class="error">Error: Invalid compound unit "length/pressure".</strong>
+</li><li><strong class="error">Error: Cannot parse double compound units like "km/s/l".</strong>
+</li><li><strong class="error">Error: Invalid compound unit "length/volume".</strong>
 </li></ul>
 
 !! end
@@ -225,7 +225,7 @@ Case sensitivity
 </li><li>10,000,000 metres
 </li><li>0.01 megametres
 </li><li>0.1 millimetres of mercury
-</li><li><strong class="error">Error: unknown unit "pa"</strong>
+</li><li><strong class="error">Error: Unknown unit "pa".</strong>
 </li></ul>
 
 !! end
diff --git a/extensions/ParserFunctions/funcsParserTests.txt b/extensions/ParserFunctions/funcsParserTests.txt
index ef2c1f38..a741836a 100644
--- a/extensions/ParserFunctions/funcsParserTests.txt
+++ b/extensions/ParserFunctions/funcsParserTests.txt
@@ -22,7 +22,7 @@ blah blah
 !! endarticle
 
 !! test
-Input times should probably be UTC, not local time
+Input times are UTC, not local time
 !! input
 {{#time:c|15 January 2001}}
 !!result
@@ -58,6 +58,42 @@ Time test after the 2038 32-bit Apocalype
 !! end
 
 !! test
+Explicitly specified timezone: UTC
+!! input
+{{#time:Y-m-d H:i| 2011-11-12 23:00 UTC }}
+!! result
+<p>2011-11-12 23:00
+</p>
+!! end
+
+!! test
+Explicitly specified timezone: Europe/Paris (UTC+1)
+!! input
+{{#time:Y-m-d H:i| 2011-11-12 23:00 Europe/Paris }}
+!! result
+<p>2011-11-12 22:00
+</p>
+!! end
+
+!! test
+Explicitly specified timezone: America/New_York (UTC-5)
+!! input
+{{#time:Y-m-d H:i| 2011-11-12 23:00 America/New_York }}
+!! result
+<p>2011-11-13 04:00
+</p>
+!! end
+
+!! test
+Explicitely specified output language (Dutch)
+!! input
+{{#time:d F Y|1988-02-28|nl}}
+!! result
+<p>28 februari 1988
+</p>
+!! end
+
+!! test
 Bug 19093: Default values don't fall through in switch
 !! input
 <{{#switch: foo | bar | #default = DEF }}>
diff --git a/extensions/ParserFunctions/testExpr.php b/extensions/ParserFunctions/testExpr.php
index 4a941737..b3336c53 100644
--- a/extensions/ParserFunctions/testExpr.php
+++ b/extensions/ParserFunctions/testExpr.php
@@ -13,7 +13,7 @@ $pass = $fail = 0;
 $parser = new ExprParser;
 foreach ( $tests as $test ) {
 	$test = trim( $test );
-	if ( in_string( ';', $test ) )
+	if ( strpos( $test, ';' ) !== false )
 		list( $input, $expected ) = explode( ';', $test );
 	else {
 		$input = $test;
diff --git a/extensions/README b/extensions/README
deleted file mode 100644
index 0437af69..00000000
--- a/extensions/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Extensions (such as the hieroglyphic module WikiHiero) are distributed
-separately. Drop them into this extensions directory and enable as
-per the extension's directions.
-
-If you are a developer, you want to fetch the extension tree in another
-directory and make a symbolic link:
-
- mediawiki/extensions$ ln -s ../../extensions-trunk/FooBarExt
-
-The extensions are available through svn at:
-    http://svn.wikimedia.org/svnroot/mediawiki/trunk/extensions/
-
-You can find documentation and additional extensions on MediaWiki website:
-    http://www.mediawiki.org/wiki/Category:Extensions
-
-
-Please note that under POSIX systems (Linux...), parent of a symbolic path
-refers to the link source, NOT to the target! You should check the env
-variable MW_INSTALL_PATH in case the extension is not in the default location.
-
-The following code snippet let you override the default path: 
-
- $IP = getenv( 'MW_INSTALL_PATH' );
- if( $IP === false ) {
-	$IP = dirname( __FILE__ ) . '/../..';
- }
- require( "$IP/maintenance/Maintenance.php" ); // a MediaWiki core file
diff --git a/extensions/Renameuser/Renameuser.alias.php b/extensions/Renameuser/Renameuser.alias.php
index c6e5b438..ea23951c 100644
--- a/extensions/Renameuser/Renameuser.alias.php
+++ b/extensions/Renameuser/Renameuser.alias.php
@@ -78,6 +78,11 @@ $specialPageAliases['es'] = array(
 	'Renameuser' => array( 'RenombrarUsuario', 'Renombrar_usuario', 'Cambiar_el_nombre_de_usuario' ),
 );
 
+/** Persian (فارسی) */
+$specialPageAliases['fa'] = array(
+	'Renameuser' => array( 'تغییر_نام_کاربر' ),
+);
+
 /** Finnish (Suomi) */
 $specialPageAliases['fi'] = array(
 	'Renameuser' => array( 'Käyttäjätunnusten_nimeäminen' ),
@@ -90,12 +95,12 @@ $specialPageAliases['fr'] = array(
 
 /** Franco-Provençal (Arpetan) */
 $specialPageAliases['frp'] = array(
-	'Renameuser' => array( 'Renomar l\'utilisator', 'RenomarLUtilisator' ),
+	'Renameuser' => array( 'Renomar_l\'usanciér', 'RenomarLUsanciér' ),
 );
 
 /** Galician (Galego) */
 $specialPageAliases['gl'] = array(
-	'Renameuser' => array( 'Renomear_usuario' ),
+	'Renameuser' => array( 'Renomear_o_usuario' ),
 );
 
 /** Swiss German (Alemannisch) */
@@ -198,6 +203,11 @@ $specialPageAliases['mt'] = array(
 	'Renameuser' => array( 'BiddelIsemUtent' ),
 );
 
+/** Norwegian Bokmål (‪Norsk (bokmål)‬) */
+$specialPageAliases['nb'] = array(
+	'Renameuser' => array( 'Gi_en_bruker_nytt_navn' ),
+);
+
 /** Nedersaksisch (Nedersaksisch) */
 $specialPageAliases['nds-nl'] = array(
 	'Renameuser' => array( 'Gebruker_herneumen' ),
@@ -213,11 +223,6 @@ $specialPageAliases['nn'] = array(
 	'Renameuser' => array( 'Døyp_om_brukar' ),
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
-$specialPageAliases['no'] = array(
-	'Renameuser' => array( 'Gi_en_bruker_nytt_navn' ),
-);
-
 /** Occitan (Occitan) */
 $specialPageAliases['oc'] = array(
 	'Renameuser' => array( 'TornarNomenarUtilizaire', 'Tornar nomenar Utilizaire' ),
@@ -235,7 +240,7 @@ $specialPageAliases['ps'] = array(
 
 /** Portuguese (Português) */
 $specialPageAliases['pt'] = array(
-	'Renameuser' => array( 'Alterar nome de utilizador' ),
+	'Renameuser' => array( 'Alterar_nome_de_utilizador' ),
 );
 
 /** Brazilian Portuguese (Português do Brasil) */
@@ -258,7 +263,7 @@ $specialPageAliases['sq'] = array(
 	'Renameuser' => array( 'RiemërtoPërdorues' ),
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬) */
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬) */
 $specialPageAliases['sr-ec'] = array(
 	'Renameuser' => array( 'Преименуј_корисника' ),
 );
@@ -296,9 +301,4 @@ $specialPageAliases['vi'] = array(
 /** Simplified Chinese (‪中文(简体)‬) */
 $specialPageAliases['zh-hans'] = array(
 	'Renameuser' => array( '重命名用户' ),
-);
-
-/**
- * For backwards compatibility with MediaWiki 1.15 and earlier.
- */
-$aliases =& $specialPageAliases;
-\ No newline at end of file
+);
+\ No newline at end of file
diff --git a/extensions/Renameuser/Renameuser.i18n.php b/extensions/Renameuser/Renameuser.i18n.php
index 9dd1bcc5..7b294d07 100644
--- a/extensions/Renameuser/Renameuser.i18n.php
+++ b/extensions/Renameuser/Renameuser.i18n.php
@@ -55,6 +55,7 @@ The rename log is provided below for reference.', # Supports GENDER
  * @author SPQRobin
  * @author Siebrand
  * @author The Evil IP address
+ * @author Umherirrender
  */
 $messages['qqq'] = array(
 	'renameuser-linkoncontribs' => 'Link description used on Special:Contributions and Special:DeletedContributions. Only added if a user has rights to rename users.',
@@ -66,7 +67,7 @@ $messages['qqq'] = array(
 	'renameuserlogentry' => 'Used in [[Special:Log/renameuser]].
 * Parameter $1 is the original username
 * Parameter $2 is the new username',
-	'right-renameuser' => '{{doc-right}}',
+	'right-renameuser' => '{{doc-right|renameuser}}',
 	'renameuser-renamed-notice' => 'This message supports the use of GENDER with parameter $1.',
 );
 
@@ -81,6 +82,7 @@ $messages['saz'] = array(
 /** Afrikaans (Afrikaans)
  * @author Naudefj
  * @author SPQRobin
+ * @author පසිඳු කාවින්ද
  */
 $messages['af'] = array(
 	'renameuser' => 'Hernoem gebruiker',
@@ -91,6 +93,7 @@ $messages['af'] = array(
 	'renameusernew' => 'Nuwe gebruikersnaam:',
 	'renameuserreason' => 'Rede vir hernoeming:',
 	'renameusermove' => 'Hernoem gebruikers- en besprekingsbladsye (met subblaaie) na nuwe naam',
+	'renameusersuppress' => 'Moenie skep aansture na die nuwe naam',
 	'renameuserreserve' => 'Voorkom dat die ou gebruiker in die toekoms weer gebruik kan word',
 	'renameuserwarnings' => 'Waarskuwings:',
 	'renameuserconfirm' => 'Ja, hernoem die gebruiker',
@@ -120,11 +123,15 @@ Relevante inligting uit die logboek van gebruikersnaamwysigings word hier onder
  */
 $messages['an'] = array(
 	'renameuser' => 'Renombrar un usuario',
+	'renameuser-linkoncontribs' => "cambiar o nombre d'iste usuario",
+	'renameuser-linkoncontribs-text' => "Cambiar o nombre d'iste usuario",
 	'renameuser-desc' => "Renombrar un usuario (amenista os dreitos de ''renameuser'')",
 	'renameuserold' => 'Nombre actual:',
 	'renameusernew' => 'Nombre nuevo:',
 	'renameuserreason' => "Razón d'o cambeo de nombre:",
 	'renameusermove' => "Tresladar as pachinas d'usuario y de descusión (y as suyas sozpachinas) ta o nuevo nombre",
+	'renameusersuppress' => 'No creyar reendreceras ta o nuevo nombre',
+	'renameuserreserve' => "Bloqueyar l'antigo nombre d'usuario ta privar que torne a ser usau",
 	'renameuserwarnings' => 'Alvertencias:',
 	'renameuserconfirm' => "Sí, quiero cambiar o nombre de l'usuario",
 	'renameusersubmit' => 'Ninviar',
@@ -143,6 +150,8 @@ $messages['an'] = array(
 	'renameuser-log' => '{{PLURAL:$1|1 edición|$1 edicions}}. Razón: $2',
 	'renameuser-move-log' => 'Pachina tresladata automaticament en renombrar o usuario "[[User:$1|$1]]" como "[[User:$2|$2]]"',
 	'right-renameuser' => 'Renombrar usuarios',
+	'renameuser-renamed-notice' => "O nombre d'iste usuario s'ha modificau.
+O rechistro de cambeos de nombre d'usuario se proveye debaixo ta mas referencia.",
 );
 
 /** Old English (Ænglisc)
@@ -207,6 +216,8 @@ $messages['arc'] = array(
 	'renameuserwarnings' => 'ܙܘܗܪ̈ܐ:',
 	'renameuserconfirm' => 'ܐܝܢ, ܫܚܠܦ ܫܡܐ ܕܡܦܠܚܢܐ',
 	'renameusersubmit' => 'ܡܨܝܘܬܐ',
+	'renameuserlogentry' => 'ܬܢܐ ܠܫܘܡܗܐ $1 ܒܫܡ "$2"',
+	'renameuser-log' => '{{PLURAL:$1|1 ܫܘܚܠܦܐ|$1 ܫܘܚܠܦ̈ܐ}}. ܥܠܬܐ: $2',
 );
 
 /** Egyptian Spoken Arabic (مصرى)
@@ -284,6 +295,7 @@ El rexistru de renomaos s'ufre darréu pa referencia.",
  * @author Cekli829
  * @author Vago
  * @author Vugar 1981
+ * @author Wertuose
  */
 $messages['az'] = array(
 	'renameuser' => 'İstifadəçi adını dəyiş',
@@ -292,7 +304,7 @@ $messages['az'] = array(
 	'renameusernew' => 'Yeni istifadəçi adı:',
 	'renameuserwarnings' => 'Xəbərdarlıqlar:',
 	'renameuserconfirm' => 'Bəli, istifadəçinin adını dəyiş',
-	'renameusersubmit' => 'Yolla',
+	'renameusersubmit' => 'Təsdiq et',
 	'renameusererrordoesnotexist' => '"<nowiki>$1</nowiki>" istifadəçi adı mövcud deyil.',
 	'renameusererrorexists' => '"<nowiki>$1</nowiki>" istifadəçi adı artıq mövcuddur.',
 	'renameusererrorinvalid' => '"<nowiki>$1</nowiki>" istifadəçi adı yolverilməzdir.',
@@ -475,7 +487,7 @@ $messages['bn'] = array(
 	'renameusermove' => 'ব্যবহারকারী এবং আলাপের পাতা (এবং তার উপপাতাসমূহ) নতুন নামে সরিয়ে নাও',
 	'renameuserwarnings' => 'সতর্কীকরণ:',
 	'renameuserconfirm' => 'হ্যাঁ, ব্যবহারকারীর নাম পরিবর্তন করো',
-	'renameusersubmit' => 'জমা দিন',
+	'renameusersubmit' => 'জমা দাও',
 	'renameusererrordoesnotexist' => '"<nowiki>$1</nowiki>" নামের কোন ব্যবহারকারী নাই।',
 	'renameusererrorexists' => '"<nowiki>$1</nowiki>" ব্যবহারকারী ইতিমধ্যে বিদ্যমান আছে।',
 	'renameusererrorinvalid' => '"<nowiki>$1</nowiki>" ব্যবহারকারী নামটি ঠিক নয়।',
@@ -624,7 +636,7 @@ $messages['ckb'] = array(
 	'renameusersubmit' => 'ناردن',
 );
 
-/** Crimean Turkish (Latin) (Qırımtatarca (Latin))
+/** Crimean Turkish (Latin script) (‪Qırımtatarca (Latin)‬)
  * @author Don Alessandro
  */
 $messages['crh-latn'] = array(
@@ -634,7 +646,7 @@ $messages['crh-latn'] = array(
 	'renameuser-log' => '{{PLURAL:$1|1 deñişiklik|$1 deñişiklik}} yapqan. Sebep: $2',
 );
 
-/** Crimean Turkish (Cyrillic) (Qırımtatarca (Cyrillic))
+/** Crimean Turkish (Cyrillic script) (‪Къырымтатарджа (Кирилл)‬)
  * @author Don Alessandro
  */
 $messages['crh-cyrl'] = array(
@@ -819,7 +831,7 @@ $messages['de'] = array(
 	'renameuserlogpage' => 'Benutzernamenänderungs-Logbuch',
 	'renameuserlogpagetext' => 'In diesem Logbuch werden die Änderungen von Benutzernamen protokolliert.',
 	'renameuserlogentry' => 'hat „$1“ in „$2“ umbenannt',
-	'renameuser-log' => '{{PLURAL:$1|1 Bearbeitung|$1 Bearbeitungen}}. Grund: $2',
+	'renameuser-log' => '{{PLURAL:$1|Eine Bearbeitung|$1 Bearbeitungen}}. Grund: $2',
 	'renameuser-move-log' => 'Seite während der Benutzerkontoumbenennung von „[[User:$1|$1]]“ in „[[User:$2|$2]]“ automatisch verschoben',
 	'right-renameuser' => 'Benutzer umbenennen',
 	'renameuser-renamed-notice' => '{{GENDER:$1|Dieser Benutzer|Diese Benutzerin|Dieser Benutzer}} wurde umbenannt.
@@ -948,10 +960,10 @@ Tο ημερολόγιο επανονομασιών δίνεται παρακά�
  * @author Yekrats
  */
 $messages['eo'] = array(
-	'renameuser' => 'Alinomigu uzanton',
+	'renameuser' => 'Alinomigi uzanton',
 	'renameuser-linkoncontribs' => 'renomigi uzanton',
 	'renameuser-linkoncontribs-text' => 'Renomigi ĉi tiun uzanton',
-	'renameuser-desc' => "Alinomigu uzanton (bezonas rajton ''renameuser'')",
+	'renameuser-desc' => "Aldonas [[Special:Renameuser|specialan paĝon]] por alinomigi uzanton (bezonas rajton ''renameuser'')",
 	'renameuserold' => 'Aktuala salutnomo:',
 	'renameusernew' => 'Nova salutnomo:',
 	'renameuserreason' => 'Kialo por alinomigo:',
@@ -995,18 +1007,18 @@ Jen la protokolo pri renomigado por via referenco.',
  * @author Translationista
  */
 $messages['es'] = array(
-	'renameuser' => 'Renombrar usuario',
-	'renameuser-linkoncontribs' => 'renombrar usuario',
-	'renameuser-linkoncontribs-text' => 'Renombrar este usuario',
-	'renameuser-desc' => "Añade una [[Special:Renameuser|página especial]] para renombrar a un usuario (necesita el derecho ''renameuser'')",
+	'renameuser' => 'Cambiar el nombre de usuario',
+	'renameuser-linkoncontribs' => 'cambiar el nombre de este usuario',
+	'renameuser-linkoncontribs-text' => 'Cambiar el nombre de este usuario',
+	'renameuser-desc' => "Añade una [[Special:Renameuser|página especial]] para cambiar de nombre a un usuario (necesita el derecho ''renameuser'')",
 	'renameuserold' => 'Nombre actual:',
 	'renameusernew' => 'Nuevo nombre de usuario:',
 	'renameuserreason' => 'Motivo:',
 	'renameusermove' => 'Trasladar las páginas de usuario y de discusión (y sus subpáginas) al nuevo nombre',
 	'renameusersuppress' => 'No crear redirecciones al nuevo nombre',
-	'renameuserreserve' => 'Bloquea el antiguo nombre de usuario para evitar usarlo en el futuro',
+	'renameuserreserve' => 'Bloquear el antiguo nombre de usuario para evitar que sea usado en el futuro',
 	'renameuserwarnings' => 'Avisos:',
-	'renameuserconfirm' => 'Sí, renombrar el usuario',
+	'renameuserconfirm' => 'Sí, cambiar el nombre del usuario',
 	'renameusersubmit' => 'Enviar',
 	'renameusererrordoesnotexist' => 'El usuario «<nowiki>$1</nowiki>» no existe',
 	'renameusererrorexists' => 'El usuario «<nowiki>$1</nowiki>» ya existe',
@@ -1014,18 +1026,18 @@ $messages['es'] = array(
 	'renameuser-error-request' => 'Hubo un problema al recibir la solicitud.
 Por favor, vuelve atrás e inténtalo de nuevo.',
 	'renameuser-error-same-user' => 'No puedes renombrar a un usuario con el nombre que ya tenía.',
-	'renameusersuccess' => 'El usuario «<nowiki>$1</nowiki>» ha sido renombrado a «<nowiki>$2</nowiki>»',
+	'renameusersuccess' => 'El nombre de usuario «<nowiki>$1</nowiki>» ha sido modificado a «<nowiki>$2</nowiki>»',
 	'renameuser-page-exists' => 'La página $1 ya existe y no puede ser reemplazada automáticamente.',
 	'renameuser-page-moved' => 'La página $1 ha sido trasladada a $2.',
 	'renameuser-page-unmoved' => 'La página $1 no pudo ser trasladada a $2.',
-	'renameuserlogpage' => 'Registro de cambios de nombre de usuarios',
-	'renameuserlogpagetext' => 'Este es un registro de cambios de nombres de usuarios',
-	'renameuserlogentry' => 'ha renombrado a $1 a "$2"',
+	'renameuserlogpage' => 'Registro de cambios de nombre de usuario',
+	'renameuserlogpagetext' => 'Este es un registro de cambios de nombres de usuario.',
+	'renameuserlogentry' => 'cambió el nombre de usuario de $1 a «$2»',
 	'renameuser-log' => '{{PLURAL:$1|1 edición|$1 ediciones}}. Motivo: $2',
-	'renameuser-move-log' => 'Página trasladada automáticamente al renombrar al usuario "[[User:$1|$1]]" a "[[User:$2|$2]]"',
-	'right-renameuser' => 'Renombrar usuarios',
-	'renameuser-renamed-notice' => 'Este usuario ha sido renombrado.
-El registro de cambios de nombre de usuario se provee abajo para referencia.',
+	'renameuser-move-log' => 'Página trasladada automáticamente al cambiar el nombre de usuario de «[[User:$1|$1]]» a «[[User:$2|$2]]»',
+	'right-renameuser' => 'Cambiar el nombre de los usuarios',
+	'renameuser-renamed-notice' => 'El nombre de este usuario ha sido modificado.
+El registro de cambios de nombre de usuario se provee debajo para mayor referencia.',
 );
 
 /** Estonian (Eesti)
@@ -1037,11 +1049,14 @@ El registro de cambios de nombre de usuario se provee abajo para referencia.',
  */
 $messages['et'] = array(
 	'renameuser' => 'Kasutajanime muutmine',
+	'renameuser-linkoncontribs' => 'kasutaja ümbernimetamine',
+	'renameuser-linkoncontribs-text' => 'Nimeta see kasutaja ümber',
 	'renameuser-desc' => "Lisab kasutajanime muutmise [[Special:Renameuser|erilehekülje]] (vajab ''renameuser''-õigust).",
 	'renameuserold' => 'Praegune kasutajanimi:',
 	'renameusernew' => 'Uus kasutajanimi:',
 	'renameuserreason' => 'Muutmise põhjus:',
 	'renameusermove' => 'Nimeta ümber kasutajaleht, aruteluleht ja nende alamlehed.',
+	'renameusersuppress' => 'Ära loo ümbersuunamisi uuele nimele',
 	'renameuserreserve' => 'Ära luba vana kasutajanime edaspidi kasutada',
 	'renameuserwarnings' => 'Hoiatused:',
 	'renameuserconfirm' => 'Jah, nimeta kasutaja ümber',
@@ -1176,10 +1191,31 @@ Alla on ote tunnusten vaihtolokista.',
 );
 
 /** Faroese (Føroyskt)
+ * @author EileenSanda
  * @author Spacebirdy
  */
 $messages['fo'] = array(
+	'renameuser' => 'Umdoyp brúkara',
+	'renameuser-linkoncontribs' => 'umdoyp brúkara',
+	'renameuser-linkoncontribs-text' => 'Umdoyp henda brúkara',
+	'renameuserold' => 'Rætta brúkaranavn:',
 	'renameusernew' => 'Nýtt brúkaranavn:',
+	'renameuserreason' => 'Orsøk til nýtt navn:',
+	'renameuserwarnings' => 'Ávaringar:',
+	'renameuserconfirm' => 'Ja, gev hesum brúkara nýtt navn',
+	'renameusersubmit' => 'Send inn',
+	'renameusererrordoesnotexist' => 'Brúkarin "<nowiki>$1</nowiki>" er ikki til.',
+	'renameusererrorexists' => 'Brúkarin "<nowiki>$1</nowiki>" er long til.',
+	'renameusererrorinvalid' => 'Brúkaranavnið "<nowiki>$1</nowiki>" er ógyldugt.',
+	'renameuser-error-request' => 'Har var ein trupulleiki við at móttaka fyrispurningin.
+Vinarliga far aftur og royn enn einaferð.',
+	'renameuser-page-moved' => 'Síðan $1 er blivin flutt til $2.',
+	'renameuser-page-unmoved' => 'Síðan $1 kundi ikki verða flutt til $2.',
+	'renameuserlogentry' => 'umdoypti $1 til "$2"',
+	'renameuser-log' => '{{PLURAL:$1|1 rætting|$1 rættingar}}. Orsøk: $2',
+	'right-renameuser' => 'Umdoyp brúkarar',
+	'renameuser-renamed-notice' => 'Hesin brúkari hevur fingið nýtt navn.
+Loggurin fyri navnabroytingina er givin niðanfyri fyri keldu ávísing.',
 );
 
 /** French (Français)
@@ -1231,25 +1267,25 @@ Le journal des renommages est disponible ci-dessous pour information.',
  */
 $messages['frp'] = array(
 	'renameuser' => 'Renomar l’utilisator',
-	'renameuser-linkoncontribs' => 'renomar l’utilisator',
-	'renameuser-linkoncontribs-text' => 'Renomar ceti utilisator',
-	'renameuser-desc' => "Apond una [[Special:Renameuser|pâge spèciâla]] por renomar un utilisator (at fôta des drêts de ''renameuser'').",
-	'renameuserold' => 'Nom d’ora a l’utilisator :',
-	'renameusernew' => 'Novél nom a l’utilisator :',
+	'renameuser-linkoncontribs' => 'renomar l’usanciér',
+	'renameuser-linkoncontribs-text' => 'Renomar ceti usanciér',
+	'renameuser-desc' => "Apond una [[Special:Renameuser|pâge spèciâla]] por renomar un usanciér (at fôta des drêts de ''renameuser'').",
+	'renameuserold' => 'Nom d’ora a l’usanciér :',
+	'renameusernew' => 'Novél nom a l’usanciér :',
 	'renameuserreason' => 'Rêson du changement de nom :',
-	'renameusermove' => 'Renomar totes les pâges a l’utilisator vers lo novél nom',
-	'renameusersuppress' => 'Pas fâre de redirèccion vers lo novél nom',
+	'renameusermove' => 'Renomar totes les pâges a l’usanciér vers lo novél nom',
+	'renameusersuppress' => 'Pas fâre de redirèccion de vers lo novél nom',
 	'renameuserreserve' => 'Resèrvar lo viely nom por un usâjo a vegnir',
 	'renameuserwarnings' => 'Avèrtissements :',
-	'renameuserconfirm' => 'Ouè, renomar l’utilisator',
+	'renameuserconfirm' => 'Ouè, renomar l’usanciér',
 	'renameusersubmit' => 'Sometre',
-	'renameusererrordoesnotexist' => 'L’utilisator « <nowiki>$1</nowiki> » ègziste pas.',
-	'renameusererrorexists' => 'L’utilisator « <nowiki>$1</nowiki> » ègziste ja.',
+	'renameusererrordoesnotexist' => 'L’usanciér « <nowiki>$1</nowiki> » ègziste pas.',
+	'renameusererrorexists' => 'L’usanciér « <nowiki>$1</nowiki> » ègziste ja.',
 	'renameusererrorinvalid' => 'Lo nom d’utilisator « <nowiki>$1</nowiki> » est envalido.',
 	'renameuser-error-request' => 'Un problèmo ègziste avouéc la reçua de la requéta.
 Volyéd tornar arriér et pués tornar èprovar.',
-	'renameuser-error-same-user' => 'Vos pouede pas renomar un utilisator du mémo nom que dês devant.',
-	'renameusersuccess' => 'L’utilisator « <nowiki>$1</nowiki> » at étâ renomâ en « <nowiki>$2</nowiki> ».',
+	'renameuser-error-same-user' => 'Vos pouede pas renomar un usanciér du mémo nom que dês devant.',
+	'renameusersuccess' => 'L’usanciér « <nowiki>$1</nowiki> » at étâ renomâ en « <nowiki>$2</nowiki> ».',
 	'renameuser-page-exists' => 'La pâge $1 ègziste ja et pôt pas étre remplaciê ôtomaticament.',
 	'renameuser-page-moved' => 'La pâge $1 at étâ dèplaciê vers $2.',
 	'renameuser-page-unmoved' => 'La pâge $1 pôt pas étre renomâ en $2.',
@@ -1257,9 +1293,9 @@ Volyéd tornar arriér et pués tornar èprovar.',
 	'renameuserlogpagetext' => 'O est lo jornal des changements de nom d’utilisator.',
 	'renameuserlogentry' => 'at renomâ « $1 » en « $2 »',
 	'renameuser-log' => '$1 changement{{PLURAL:$1||s}}. Rêson : $2',
-	'renameuser-move-log' => 'Pâge dèplaciê ôtomaticament quand l’utilisator « [[User:$1|$1]] » est vegnu « [[User:$2|$2]] »',
+	'renameuser-move-log' => 'Pâge dèplaciê ôtomaticament quand l’usanciér « [[User:$1|$1]] » est vegnu « [[User:$2|$2]] »',
 	'right-renameuser' => 'Renomar des utilisators',
-	'renameuser-renamed-notice' => 'Ceti utilisator at étâ renomâ.
+	'renameuser-renamed-notice' => 'Ceti usanciér at étâ renomâ.
 Lo jornal des changements de nom est disponiblo ce-desot por enformacion.',
 );
 
@@ -1402,8 +1438,45 @@ $messages['gsw'] = array(
 S Umnännigs-Logbuech wird do unte ufgfiert as Quälle.',
 );
 
+/** Gujarati (ગુજરાતી)
+ * @author KartikMistry
+ * @author Sushant savla
+ */
+$messages['gu'] = array(
+	'renameuser' => 'સભ્યનામ બદલો',
+	'renameuser-linkoncontribs' => 'સભ્યનામ બદલો',
+	'renameuser-linkoncontribs-text' => 'આ સભ્યનું નામ બદલો',
+	'renameuserold' => 'હાલનું સભ્યનામ:',
+	'renameusernew' => 'નવું સભ્યનામ:',
+	'renameuserreason' => 'નામ બદલવાનું કારણ:',
+	'renameusermove' => 'સભ્ય અને ગપ્પાં પાનાંઓ (અને તેમનાં ઉપપાનાંઓ) નવાં નામ પર ખસેડો',
+	'renameusersuppress' => 'નવા નામ પર દિશા નિર્દેશનો ન રચશો',
+	'renameuserreserve' => 'જૂના સભ્યનામને ભવિષ્યનો વપરાશ પ્રતિબંધીત કરો',
+	'renameuserwarnings' => 'ચેતવણીઓ:',
+	'renameuserconfirm' => 'હા, સભ્યનું નામ બદલો',
+	'renameusersubmit' => 'જમા કરો',
+	'renameusererrordoesnotexist' => 'આ સભ્ય  "<nowiki>$1</nowiki>" મોજૂદ નથી.',
+	'renameusererrorexists' => 'આ સભ્ય  "<nowiki>$1</nowiki>" પહેલેથી હાજર છે.',
+	'renameusererrorinvalid' => 'સભ્યનામ "<nowiki>$1</nowiki>" અયોગ્ય છે.',
+	'renameuser-error-request' => 'તમારી અરજી પ્રાપ્ત કરતાં કાંઈ ત્રુટી થઈ
+મહેરબાની કરી ફરી પ્રયત્ન કરશો',
+	'renameuser-error-same-user' => 'તમે સભ્યને ફરીથી પહેલાનું નામ આપી શકશો નહી.',
+	'renameusersuccess' => 'સભ્ય "<nowiki>$1</nowiki>" નું નામ બદલીને "<nowiki>$2</nowiki>" કરાયું છે.',
+	'renameuser-page-exists' => 'પાનું  $1 પહેલેથી અસ્તિત્વમાં છે તેના પર સ્વયંચલિત નવું લેખન ન થાય.',
+	'renameuser-page-moved' => 'પાના $1 ને $2 પર ખસેડાયું',
+	'renameuser-page-unmoved' => 'પાના $1ને $2 પર ન લઈ જઈ શકાયું',
+	'renameuserlogpage' => 'સભ્ય નામફેરનો લોગ',
+	'renameuserlogpagetext' => 'સભ્યના દ્વારા થયેલા ફેરફરની આ સંપાદન યાદિ છે .',
+	'renameuserlogentry' => '$1 નું નામ "$2" કર્યું',
+	'renameuser-log' => '{{PLURAL:$1|૧ ફેરફાર|$1 ફેરફારો}}. કારણ: $2',
+	'right-renameuser' => 'સભ્યોના નામ બદલો',
+	'renameuser-renamed-notice' => 'આ સભ્યનું નામ પરિવર્તન થયું છે.
+નામ પરિવર્તન લોગ તમારા સંદર્ભ માટે અહીં આપેલ છે',
+);
+
 /** Hebrew (עברית)
  * @author Amire80
+ * @author Ofekalef
  * @author Rotem Liss
  * @author YaronSh
  */
@@ -1419,7 +1492,7 @@ $messages['he'] = array(
 	'renameusersuppress' => 'לא ליצור הפניות לשם החדש',
 	'renameuserreserve' => 'חסימת שם המשתמש הישן לשימוש נוסף',
 	'renameuserwarnings' => 'אזהרות:',
-	'renameuserconfirm' => 'כן, שנה את שם המשתמש',
+	'renameuserconfirm' => 'כן, לשנות את שם המשתמש',
 	'renameusersubmit' => 'שינוי שם משתמש',
 	'renameusererrordoesnotexist' => 'המשתמש "<nowiki>$1</nowiki>" אינו קיים.',
 	'renameusererrorexists' => 'המשתמש "<nowiki>$1</nowiki>" כבר קיים.',
@@ -1441,15 +1514,22 @@ $messages['he'] = array(
 );
 
 /** Hindi (हिन्दी)
+ * @author Ansumang
  * @author Kaustubh
  */
 $messages['hi'] = array(
 	'renameuser' => 'सदस्यनाम बदलें',
+	'renameuser-linkoncontribs' => 'सदस्यनाम बदलें',
+	'renameuser-linkoncontribs-text' => 'इस सदस्य के नाम बदलें',
 	'renameuser-desc' => "सदस्यनाम बदलें (''सदस्यनाम बदलने अधिकार'' अनिवार्य)",
 	'renameuserold' => 'सद्य सदस्यनाम:',
 	'renameusernew' => 'नया सदस्यनाम:',
 	'renameuserreason' => 'नाम बदलने के कारण:',
 	'renameusermove' => 'सदस्य पृष्ठ और वार्ता पृष्ठ (और उनके सबपेज) नये नाम की ओर भेजें',
+	'renameusersuppress' => 'नूतन नाम को अनुप्रेषित ना करें',
+	'renameuserreserve' => 'पुरानी सदस्यनाम को अवरोध करें',
+	'renameuserwarnings' => 'चेतावनी:',
+	'renameuserconfirm' => 'हाँ, सदस्य के नाम बदलें',
 	'renameusersubmit' => 'भेजें',
 	'renameusererrordoesnotexist' => 'सदस्य "<nowiki>$1</nowiki>" अस्तित्वमें नहीं हैं।',
 	'renameusererrorexists' => 'सदस्य "<nowiki>$1</nowiki>" पहले से अस्तित्वमें हैं।',
@@ -1471,7 +1551,7 @@ $messages['hi'] = array(
 संदर्भ के लिए नीचे नाम बदलने का चिट्ठा है।',
 );
 
-/** Fiji Hindi (Latin) (Fiji Hindi (Latin))
+/** Fiji Hindi (Latin script) (Fiji Hindi)
  * @author Thakurji
  */
 $messages['hif-latn'] = array(
@@ -1704,6 +1784,43 @@ $messages['ig'] = array(
 	'renameuser-page-unmoved' => 'Ihü $1 énweghịkị páfù gá $2.',
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'renameuser' => 'Naganan ti agar-aramat',
+	'renameuser-linkoncontribs' => 'naganan ti agar-aramat',
+	'renameuser-linkoncontribs-text' => 'Naganan daytoy nga agar-aramat',
+	'renameuser-desc' => "Agnayon ti [[Special:Renameuser|naipangruna a panid]] nga agpanagan ti agar-aramat (masapul ti ''naganan ti agar-aramat'' a karbengan)",
+	'renameuserold' => 'Agdama a nagan ti agar-aramat:',
+	'renameusernew' => 'Baro a nagan ti agar-aramat:',
+	'renameuserreason' => 'Rason ti panagnagan:',
+	'renameusermove' => 'Iyalis ti agar-aramat ket tungtungan a pampanid (ken dagiti ap-apo a panid) iti baro a nagan',
+	'renameusersuppress' => 'Saan nga agaramid kadagiti baw-ing iti baro a nagan',
+	'renameuserreserve' => 'Serraan ti daan a nagan ti agar-aramat manipud ti masakbayan a pag-usar.',
+	'renameuserwarnings' => 'Dagiti ballaag:',
+	'renameuserconfirm' => 'Wen, naganan ti agar-aramat',
+	'renameusersubmit' => 'Ited',
+	'renameusererrordoesnotexist' => 'Ti agar-aramat "<nowiki>$1</nowiki>" ket awan.',
+	'renameusererrorexists' => 'Ti agar-aramat "<nowiki>$1</nowiki>" ket addaanen.',
+	'renameusererrorinvalid' => 'Ti nagan ti agar-aramat "<nowiki>$1</nowiki>" ket imbalido.',
+	'renameuser-error-request' => 'Adda pakirut ti pinakaala ti kiddaw.
+Pangngaasi nga agsubli ken padasen manen.',
+	'renameuser-error-same-user' => 'Saan mo a managanan ti agar-aramat a kasdi.',
+	'renameusersuccess' => 'Ti agar-aramat "<nowiki>$1</nowiki>" ket nanaganan iti "<nowiki>$2</nowiki>".',
+	'renameuser-page-exists' => 'Ti panid a $1 ket addaan ken saan a mautomatiko a suratan manen.',
+	'renameuser-page-moved' => 'Ti panid $1 ket naiyalis idiay $2.',
+	'renameuser-page-unmoved' => 'Ti panid  $1 ket saan a maiyalis idiay $2.',
+	'renameuserlogpage' => 'Listaan ti panagnagan ti agar-aramat',
+	'renameuserlogpagetext' => 'Listaan daytoy kadagiti sinukatan a nag-nagan ti agararamat.',
+	'renameuserlogentry' => 'ninaganan $1 iti "$2"',
+	'renameuser-log' => '{{PLURAL:$1|1 urnos|$1 ur-urnos}}. Rason: $2',
+	'renameuser-move-log' => 'Automatiko nga iyalis ti panid bayat nagnaganan ti agar-aramat "[[User:$1|$1]]" iti "[[User:$2|$2]]"',
+	'right-renameuser' => 'Naganan dagiti agar-aramat',
+	'renameuser-renamed-notice' => 'Nanaganen daytoy nga agar-aramat.
+Ti listaan ti nagnaganan ket naited dita baba para iti reperensia.',
+);
+
 /** Ido (Ido)
  * @author Malafaya
  * @author Wyvernoid
@@ -1731,25 +1848,43 @@ $messages['io'] = array(
 /** Icelandic (Íslenska)
  * @author Cessator
  * @author S.Örvarr.S
+ * @author Snævar
  * @author Spacebirdy
  * @author Ævar Arnfjörð Bjarmason
  * @author לערי ריינהארט
  */
 $messages['is'] = array(
 	'renameuser' => 'Breyta notandanafni',
+	'renameuser-linkoncontribs' => 'breyta notendanafni',
+	'renameuser-linkoncontribs-text' => 'breyta notendanafni notandans',
+	'renameuser-desc' => "Bætir við [[Special:Renameuser|kerfissíðu]] til að breyta notendanafni (þarfnast ''renameuser'' réttinda)",
 	'renameuserold' => 'Núverandi notandanafn:',
 	'renameusernew' => 'Nýja notandanafnið:',
 	'renameuserreason' => 'Ástæða:',
+	'renameusermove' => 'Færa notendasíðu og notendaspjallsíðu (og undirsíður þeirra) á nýja nafnið',
+	'renameusersuppress' => 'Ekki skilja eftir tilvísun',
+	'renameuserreserve' => 'Banna notkun á gamla notendanafninu',
+	'renameuserwarnings' => 'Viðvaranir:',
+	'renameuserconfirm' => 'Já, breyta nafni notandans',
 	'renameusersubmit' => 'Senda',
 	'renameusererrordoesnotexist' => 'Notandinn „<nowiki>$1</nowiki>“ er ekki til',
 	'renameusererrorexists' => 'Notandinn „<nowiki>$1</nowiki>“ er nú þegar til',
 	'renameusererrorinvalid' => 'Notandanafnið „<nowiki>$1</nowiki>“ er ógilt',
+	'renameuser-error-request' => 'Mistókst að sækja beiðnina um breytingu notendanafnsins.
+Vinsamlegast farðu til baka og reyndu aftur.',
+	'renameuser-error-same-user' => 'Óheimilt er að breyta nafni notanda aftur á það notendanafn sem hann hafði áður.',
+	'renameusersuccess' => 'Nafn notandans "<nowiki>$1</nowiki>" hefur verið breytt í "<nowiki>$2</nowiki>".',
 	'renameuser-page-exists' => 'Síða sem heitir $1 er nú þegar til og það er ekki hægt að búa til nýja grein með sama heiti.',
 	'renameuser-page-moved' => 'Síðan $1 hefur verið færð á $2.',
 	'renameuser-page-unmoved' => 'Ekki var hægt að færa síðuna $1 á $2.',
 	'renameuserlogpage' => 'Skrá yfir nafnabreytingar notenda',
 	'renameuserlogpagetext' => 'Þetta er skrá yfir nýlegar breytingar á notendanöfnum.',
+	'renameuserlogentry' => 'breytti nafni $1 í "$2"',
 	'renameuser-log' => '{{PLURAL:$1|1 breyting|$1 breytingar}}. Ástæða: $2',
+	'renameuser-move-log' => 'Færði síðuna sjálfvirkt þegar notendanafni "[[User:$1|$1]]" var breytt í "[[User:$2|$2]]"',
+	'right-renameuser' => 'Breyta notandanafni notenda',
+	'renameuser-renamed-notice' => 'Nafni notandans hefur verið breytt. 
+Síðasta færsla notandans úr skrá yfir nafnabreytingar notenda er sýnd hér fyrir neðan til skýringar:',
 );
 
 /** Italian (Italiano)
@@ -1957,7 +2092,7 @@ $messages['kk-arab'] = array(
 	'renameuser-move-log' => '«[[User:$1|$1]]» دەگەن قاتىسۋشى اتىن «[[User:$2|$2]]» دەگەنگە اۋىسقاندا بەت وزدىك تۇردە جىلجىتىلدى',
 );
 
-/** Kazakh (Cyrillic) (Қазақша (Cyrillic)) */
+/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬) */
 $messages['kk-cyrl'] = array(
 	'renameuser' => 'Қатысушыны қайта атау',
 	'renameuserold' => 'Ағымдағы қатысушы аты:',
@@ -1979,7 +2114,7 @@ $messages['kk-cyrl'] = array(
 	'renameuser-move-log' => '«[[User:$1|$1]]» деген қатысушы атын «[[User:$2|$2]]» дегенге ауысқанда бет өздік түрде жылжытылды',
 );
 
-/** Kazakh (Latin) (Қазақша (Latin)) */
+/** Kazakh (Latin script) (‪Qazaqşa (latın)‬) */
 $messages['kk-latn'] = array(
 	'renameuser' => 'Qatıswşını qaýta ataw',
 	'renameuserold' => 'Ağımdağı qatıswşı atı:',
@@ -2128,16 +2263,18 @@ Bes esu joot un versöök et noch ens.',
 Dat kanns De unge en däm Ußzoch uss_em Logbooch vum Metmacher Ömnänne fenge.',
 );
 
-/** Kurdish (Latin) (Kurdî (Latin))
+/** Kurdish (Latin script) (‪Kurdî (latînî)‬)
  * @author George Animal
+ * @author Gomada
  */
 $messages['ku-latn'] = array(
 	'renameuser' => 'Navî bikarhênerê biguherîne',
 	'renameuser-linkoncontribs' => 'navî bikarhênerê biguherîne',
 	'renameuser-linkoncontribs-text' => 'Navê vî bikarhênerî biguherîne',
-	'renameuserold' => 'Navî niha:',
-	'renameusernew' => 'Navî nuh:',
+	'renameuserold' => 'Navê niha:',
+	'renameusernew' => 'Navê nû:',
 	'renameuserreason' => 'Sedema ji bo navguhertinê:',
+	'renameuserwarnings' => 'Hişyarî:',
 	'renameuserconfirm' => 'Erê, navê vî bikarhênerî biguherîne',
 	'renameusersubmit' => 'Bike',
 	'renameusererrordoesnotexist' => 'Bikarhêner "<nowiki>$1</nowiki>" tune ye.',
@@ -2210,7 +2347,7 @@ Gitt w.e.g. zréck a versicht et nach eng Kéier.',
 	'renameuserlogpagetext' => 'An dësem Logbuch ginn Ännerunge vu Benotzernimm festgehal.',
 	'renameuserlogentry' => 'huet de Benotzer $1 op "$2" ëmbenannt',
 	'renameuser-log' => '{{PLURAL:$1|1 Ännerung|$1 Ännerungen}}. Grond: $2',
-	'renameuser-move-log' => 'Duerch d\'Réckele vum Benotzer  "[[User:$1|$1]]" op "[[User:$2|$2]]" goufen déi folgend Säiten automatesch matgeréckelt:',
+	'renameuser-move-log' => 'Duerch d\'Réckele vum Benotzer "[[User:$1|$1]]" op "[[User:$2|$2]]" goufen déi folgend Säiten automatesch matgeréckelt:',
 	'right-renameuser' => 'Benotzer ëmbenennen',
 	'renameuser-renamed-notice' => "Dëse Benotzer gouf ëmbenannt.
 D'Logbuch mat den Ëmbenunngen ass hei ënnendrënner.",
@@ -2256,12 +2393,15 @@ Relevante regels oet 't logbook staon hieónger.",
 );
 
 /** Lithuanian (Lietuvių)
+ * @author Eitvys200
  * @author Homo
  * @author Hugo.arg
  * @author Matasg
  */
 $messages['lt'] = array(
 	'renameuser' => 'Pervadinti naudotoją',
+	'renameuser-linkoncontribs' => 'Pervadinti naudotoją',
+	'renameuser-linkoncontribs-text' => 'Pervardyti šį vartotoją',
 	'renameuser-desc' => "Pervadinti naudotoją (reikia ''pervadintojo'' teisių)",
 	'renameuserold' => 'Esamas naudotojo vardas:',
 	'renameusernew' => 'Naujas naudotojo vardas:',
@@ -2308,6 +2448,7 @@ $messages['lv'] = array(
 	'renameusersuccess' => 'Lietotājs "<nowiki>$1</nowiki>" pārdēvēts par "<nowiki>$2</nowiki>".',
 	'renameuserlogpage' => 'Lietotāju pārdēvēšanas reģistrs',
 	'renameuserlogpagetext' => 'Lietotājvārdu maiņas reģistrs',
+	'renameuserlogentry' => 'pārsauca $1 par "$2"',
 	'right-renameuser' => 'Pārsaukt lietotājus',
 );
 
@@ -2413,16 +2554,24 @@ $messages['mn'] = array(
 );
 
 /** Marathi (मराठी)
+ * @author Kaajawa
  * @author Kaustubh
+ * @author Rahuldeshmukh101
+ * @author V.narsikar
  */
 $messages['mr'] = array(
 	'renameuser' => 'सदस्यनाम बदला',
 	'renameuser-linkoncontribs' => 'सदस्यनाम बदला',
+	'renameuser-linkoncontribs-text' => 'ह्या सदस्याचे नाव बदला',
 	'renameuser-desc' => "सदस्यनाम बदला (यासाठी तुम्हाला ''सदस्यनाम बदलण्याचे अधिकार'' असणे आवश्यक आहे)",
 	'renameuserold' => 'सध्याचे सदस्यनाम:',
 	'renameusernew' => 'नवीन सदस्यनाम:',
 	'renameuserreason' => 'नाम बदलण्याचे कारण:',
 	'renameusermove' => 'सदस्य तसेच सदस्य चर्चापान (तसेच त्यांची उपपाने) नवीन सदस्यनामाकडे स्थानांतरीत करा',
+	'renameusersuppress' => 'नवीन नावाकडे पुर्ननिर्देशने तयार करू नका',
+	'renameuserreserve' => 'जुने सदस्य खाते पुढील वापरासाठी अवरुद्ध करा',
+	'renameuserwarnings' => 'ताकीद:',
+	'renameuserconfirm' => 'होय, सदस्याचे नाव बदला',
 	'renameusersubmit' => 'पाठवा',
 	'renameusererrordoesnotexist' => '"<nowiki>$1</nowiki>" नावाचा सदस्य अस्तित्वात नाही.',
 	'renameusererrorexists' => '"<nowiki>$1</nowiki>" नावाचा सदस्य अगोदरच अस्तित्वात आहे',
@@ -2435,10 +2584,12 @@ $messages['mr'] = array(
 	'renameuser-page-unmoved' => '$1 हे पान $2 मथळ्याखाली स्थानांतरीत करू शकत नाही.',
 	'renameuserlogpage' => 'सदस्यनाम बदल यादी',
 	'renameuserlogpagetext' => 'ही सदस्यनामांमध्ये केलेल्या बदलांची यादी आहे.',
-	'renameuserlogentry' => 'नी $1 ला "$2" केले',
+	'renameuserlogentry' => '$1 ला "$2" केले',
 	'renameuser-log' => '{{PLURAL:$1|१ संपादन|$1 संपादने}}. कारण: $2',
 	'renameuser-move-log' => '"[[User:$1|$1]]" ला "[[User:$2|$2]]" बदलताना आपोआप सदस्य पान स्थानांतरीत केलेले आहे.',
 	'right-renameuser' => 'सदस्यांची नावे बदला',
+	'renameuser-renamed-notice' => 'या सदस्यास पुनर्नामित करण्यात आले आहे.
+पुनर्नामाचा क्रमलेख संदर्भासाठी खाली दिलेला आहे.',
 );
 
 /** Malay (Bahasa Melayu)
@@ -2486,10 +2637,13 @@ Log penukaran nama ditunjukkan di bawah sebagai rujukan.',
  */
 $messages['mt'] = array(
 	'renameuser' => 'Semmi utent mill-ġdid',
+	'renameuser-linkoncontribs' => 'semmi l-utent mill-ġdid',
+	'renameuser-linkoncontribs-text' => "Erġa' semmi lil dan l-utent",
 	'renameuserold' => 'Isem tal-utent attwali:',
 	'renameusernew' => 'Isem tal-utent il-ġdid:',
 	'renameuserreason' => 'Raġuni għall-bidla fl-isem:',
 	'renameusermove' => "Mexxi l-paġna tal-utent, il-paġna ta' diskussjoni u s-sottopaġni taħt l-isem il-ġdid",
+	'renameusersuppress' => 'Toħloqx rindirizzi lejn l-isem il-ġdid',
 	'renameuserreserve' => 'Imblokka l-użu tal-isem il-qadim fil-futur',
 	'renameuserwarnings' => 'Twissijiet:',
 	'renameuserconfirm' => 'Iva, semmi mill-ġdid dan l-utent',
@@ -2524,6 +2678,44 @@ $messages['nan'] = array(
 	'renameuserlogpagetext' => 'Chit-ê log lia̍t-chhut kái-piàn iōng-chiá miâ-jī ê tōng-chok.',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Jon Harald Søby
+ * @author Nghtwlkr
+ */
+$messages['nb'] = array(
+	'renameuser' => 'Døp om bruker',
+	'renameuser-linkoncontribs' => 'døp om bruker',
+	'renameuser-linkoncontribs-text' => 'Døp om denne brukeren',
+	'renameuser-desc' => "Legger til en [[Special:Renameuser|spesialside]] for å døpe om en bruker (krever ''renameuser''-rettigheter)",
+	'renameuserold' => 'Nåværende brukernavn:',
+	'renameusernew' => 'Nytt brukernavn:',
+	'renameuserreason' => 'Årsak for omdøping:',
+	'renameusermove' => 'Flytt bruker- og brukerdiskusjonssider (og deres undersider) til nytt navn',
+	'renameusersuppress' => 'Ikke opprett omdirigeringer til det nye navnet',
+	'renameuserreserve' => 'Blokker det gamle brukernavnet fra framtidig bruk',
+	'renameuserwarnings' => 'Advarsler:',
+	'renameuserconfirm' => 'Ja, døp om brukeren',
+	'renameusersubmit' => 'Utfør',
+	'renameusererrordoesnotexist' => 'Brukeren «<nowiki>$1</nowiki>» finnes ikke.',
+	'renameusererrorexists' => 'Brukeren «<nowiki>$1</nowiki>» finnes allerede.',
+	'renameusererrorinvalid' => 'Brukernavnet «<nowiki>$1</nowiki>» er ugyldig.',
+	'renameuser-error-request' => 'Det var et problem med å motta forespørselen.
+Gå tilbake og prøv igjen.',
+	'renameuser-error-same-user' => 'Du kan ikke gi en bruker samme navn som han/hun allerede har.',
+	'renameusersuccess' => 'Brukeren «<nowiki>$1</nowiki>» har blitt omdøpt til «<nowiki>$2</nowiki>».',
+	'renameuser-page-exists' => 'Siden $1 finnes allerede, og kunne ikke erstattes automatisk.',
+	'renameuser-page-moved' => 'Siden $1 har blitt flyttet til $2.',
+	'renameuser-page-unmoved' => 'Siden $1 kunne ikke flyttes til $2.',
+	'renameuserlogpage' => 'Omdøpingslogg',
+	'renameuserlogpagetext' => 'Dette er en logg over endringer i brukernavn.',
+	'renameuserlogentry' => 'døpte om $1 til «$2»',
+	'renameuser-log' => '{{PLURAL:$1|1 bidrag|$1 bidrag}}. Årsak: $2',
+	'renameuser-move-log' => 'Flyttet side automatisk under omdøping av brukeren «[[User:$1|$1]]» til «[[User:$2|$2]]»',
+	'right-renameuser' => 'Døpe om brukere',
+	'renameuser-renamed-notice' => 'Denne brukeren er døpt om.
+Til informasjon er omdøpningsloggen vist nedenfor.',
+);
+
 /** Low German (Plattdüütsch)
  * @author Slomox
  */
@@ -2563,27 +2755,27 @@ $messages['nds-nl'] = array(
 	'renameuser-linkoncontribs' => 'gebruker herneumen',
 	'renameuserold' => 'Gebrukersnaam noen',
 	'renameusernew' => 'Nieje gebrukersnaam:',
-	'renameuserreason' => "Reden veur 't herneumen:",
+	'renameuserreason' => 'Reden veur t herneumen:',
 	'renameusermove' => "Herneum gebruker en gebrukerspagina's (en subpagina's) naor de nieje naam.",
 	'renameusersuppress' => 'Gien deurverwiezingen maken naor de nieje naam',
-	'renameuserreserve' => 'Veurkoemen dat de ouwe gebruker opniej eregistreerd wönnen',
+	'renameuserreserve' => 'Veurkoemen dat de ouwe gebruker opniej eregistreerd wörden',
 	'renameuserwarnings' => 'Waorschuwingen:',
 	'renameuserconfirm' => 'Ja, herneum disse gebruker',
 	'renameusersubmit' => 'Herneumen',
-	'renameusererrordoesnotexist' => 'De gebruker "<nowiki>$1</nowiki>" besteet neet.',
+	'renameusererrordoesnotexist' => 'De gebruker "<nowiki>$1</nowiki>" besteet niet.',
 	'renameusererrorexists' => 'De gebrukersnaam "<nowiki>$1</nowiki>" is al in gebruuk.',
 	'renameusererrorinvalid' => 'De gebrukersnaam "<nowiki>$1</nowiki>" is ongeldig.',
 	'renameusersuccess' => 'Gebruker "<nowiki>$1</nowiki>" is herneumd naor "<nowiki>$2</nowiki>".',
-	'renameuser-page-exists' => 'De pagina $1 besteet al en kan neet autematisch overschreven wönnen.',
+	'renameuser-page-exists' => 'De pagina $1 besteet al en kan niet automaties overschreven wörden.',
 	'renameuser-page-moved' => 'De pagina $1 is herneumd naor $2.',
-	'renameuser-page-unmoved' => 'De pagina $1 kon neet herneumd wönnen naor $2.',
+	'renameuser-page-unmoved' => 'De pagina $1 kon niet herneumd wörden naor $2.',
 	'renameuserlogpage' => 'Logboek gebrukersnaamwiezigingen',
-	'renameuserlogpagetext' => 'Dit is een logboek mit wiezigingen van gebrukersnamen',
+	'renameuserlogpagetext' => 'Dit is n logboek mit wiezigingen van gebrukersnamen',
 	'renameuserlogentry' => 'hef $1 herneumd naor "$2"',
-	'renameuser-move-log' => 'Pagina is autematisch verplaos bie \'t herneumen van de gebruker "[[User:$1|$1]]" naor "[[User:$2|$2]]"',
-	'right-renameuser' => 'gebrukers herneumen',
-	'renameuser-renamed-notice' => "Disse gebrukersnaam is herneumd.
-Hieronder vie-j 't herneumlogboek as rifferentie.",
+	'renameuser-move-log' => 'Pagina is automaties verplaotst bie t herneumen van de gebruker "[[User:$1|$1]]" naor "[[User:$2|$2]]"',
+	'right-renameuser' => 'Gebrukers herneumen',
+	'renameuser-renamed-notice' => 'Disse gebrukersnaam is herneumd.
+Hieronder vie-j t herneumlogboek as referensie.',
 );
 
 /** Nepali (नेपाली) */
@@ -2613,7 +2805,7 @@ $messages['nl'] = array(
 	'renameusersuppress' => 'Geen doorverwijzingen maken naar de nieuwe naam',
 	'renameuserreserve' => 'Voorkomen dat de oude gebruiker opnieuw wordt geregistreerd',
 	'renameuserwarnings' => 'Waarschuwingen:',
-	'renameuserconfirm' => 'Ja, hernoem de gebruiker',
+	'renameuserconfirm' => 'Ja, de gebruiker hernoemen',
 	'renameusersubmit' => 'Opslaan',
 	'renameusererrordoesnotexist' => 'De gebruiker "<nowiki>$1</nowiki>" bestaat niet.',
 	'renameusererrorexists' => 'De gebruiker "<nowiki>$1</nowiki>" bestaat al.',
@@ -2625,7 +2817,7 @@ $messages['nl'] = array(
 	'renameuser-page-moved' => 'De pagina $1 is hernoemd naar $2.',
 	'renameuser-page-unmoved' => 'De pagina $1 kon niet hernoemd worden naar $2.',
 	'renameuserlogpage' => 'Logboek gebruikersnaamwijzigingen',
-	'renameuserlogpagetext' => 'Hieronder staan gebruikersnamen die gewijzigd zijn',
+	'renameuserlogpagetext' => 'Hieronder staan gebruikersnamen die gewijzigd zijn.',
 	'renameuserlogentry' => 'heeft $1 hernoemd naar "$2"',
 	'renameuser-log' => '{{PLURAL:$1|1 bewerking|$1 bewerkingen}}. Reden: $2',
 	'renameuser-move-log' => 'Automatisch hernoemd bij het wijzigen van gebruiker "[[User:$1|$1]]" naar "[[User:$2|$2]]"',
@@ -2671,44 +2863,6 @@ Gå attende og prøv på nytt.',
 Til informasjon er omdøpingsloggen synt nedanfor.',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Jon Harald Søby
- * @author Nghtwlkr
- */
-$messages['no'] = array(
-	'renameuser' => 'Døp om bruker',
-	'renameuser-linkoncontribs' => 'døp om bruker',
-	'renameuser-linkoncontribs-text' => 'Døp om denne brukeren',
-	'renameuser-desc' => "Legger til en [[Special:Renameuser|spesialside]] for å døpe om en bruker (krever ''renameuser''-rettigheter)",
-	'renameuserold' => 'Nåværende brukernavn:',
-	'renameusernew' => 'Nytt brukernavn:',
-	'renameuserreason' => 'Årsak for omdøping:',
-	'renameusermove' => 'Flytt bruker- og brukerdiskusjonssider (og deres undersider) til nytt navn',
-	'renameusersuppress' => 'Ikke opprett omdirigeringer til det nye navnet',
-	'renameuserreserve' => 'Blokker det gamle brukernavnet fra framtidig bruk',
-	'renameuserwarnings' => 'Advarsler:',
-	'renameuserconfirm' => 'Ja, døp om brukeren',
-	'renameusersubmit' => 'Utfør',
-	'renameusererrordoesnotexist' => 'Brukeren «<nowiki>$1</nowiki>» finnes ikke.',
-	'renameusererrorexists' => 'Brukeren «<nowiki>$1</nowiki>» finnes allerede.',
-	'renameusererrorinvalid' => 'Brukernavnet «<nowiki>$1</nowiki>» er ugyldig.',
-	'renameuser-error-request' => 'Det var et problem med å motta forespørselen.
-Gå tilbake og prøv igjen.',
-	'renameuser-error-same-user' => 'Du kan ikke gi en bruker samme navn som han/hun allerede har.',
-	'renameusersuccess' => 'Brukeren «<nowiki>$1</nowiki>» har blitt omdøpt til «<nowiki>$2</nowiki>».',
-	'renameuser-page-exists' => 'Siden $1 finnes allerede, og kunne ikke erstattes automatisk.',
-	'renameuser-page-moved' => 'Siden $1 har blitt flyttet til $2.',
-	'renameuser-page-unmoved' => 'Siden $1 kunne ikke flyttes til $2.',
-	'renameuserlogpage' => 'Omdøpingslogg',
-	'renameuserlogpagetext' => 'Dette er en logg over endringer i brukernavn.',
-	'renameuserlogentry' => 'døpte om $1 til «$2»',
-	'renameuser-log' => '{{PLURAL:$1|1 bidrag|$1 bidrag}}. Årsak: $2',
-	'renameuser-move-log' => 'Flyttet side automatisk under omdøping av brukeren «[[User:$1|$1]]» til «[[User:$2|$2]]»',
-	'right-renameuser' => 'Døpe om brukere',
-	'renameuser-renamed-notice' => 'Denne brukeren er døpt om.
-Til informasjon er omdøpningsloggen vist nedenfor.',
-);
-
 /** Northern Sotho (Sesotho sa Leboa)
  * @author Mohau
  */
@@ -2721,10 +2875,13 @@ $messages['nso'] = array(
 );
 
 /** Occitan (Occitan)
+ * @author Boulaur
  * @author Cedric31
  */
 $messages['oc'] = array(
 	'renameuser' => "Tornar nomenar l'utilizaire",
+	'renameuser-linkoncontribs' => "tornar nomenar l'utilizaire",
+	'renameuser-linkoncontribs-text' => "Tornar nomenar l'utilizaire",
 	'renameuser-desc' => "Torna nomenar un utilizaire (necessita los dreches de ''renameuser'')",
 	'renameuserold' => "Nom actual de l'utilizaire :",
 	'renameusernew' => "Nom novèl de l'utilizaire :",
@@ -2755,12 +2912,43 @@ Lo jornal dels cambiaments de noms es disponible çaijós per informacion.',
 
 /** Oriya (ଓଡ଼ିଆ)
  * @author Odisha1
+ * @author Psubhashish
  */
 $messages['or'] = array(
+	'renameuser' => 'ସଭ୍ୟଙ୍କ ନାମଟି ବଦଳାଇବେ',
+	'renameuser-linkoncontribs' => 'ସଭ୍ୟଙ୍କ ନାମଟି ବଦଳାଇବେ',
+	'renameuser-linkoncontribs-text' => 'ଏହି ସଭ୍ୟଙ୍କର ନାମ ବଦଳାଇବେ',
+	'renameuser-desc' => "ଜଣେ ସଭ୍ୟଙ୍କର ନାମ ବଦଳାଇବା ପାଇଁ ଏକ [[Special:Renameuser|ବିଶେଷ ପୃଷ୍ଠା]] ଯୋଡ଼ିଥାଏ ।(''ନୂଆ ନାମକରଣ'' ଅଧିକାର ଲୋଡ଼ା)",
+	'renameuserold' => 'ଏବେକାର ଇଉଜର ନାମ:',
+	'renameusernew' => 'ନୂଆ ଇଉଜର ନାମ:',
+	'renameuserreason' => 'ନାମ ବଦଳାଇବାର କାରଣ:',
+	'renameusermove' => 'ସଭ୍ୟ, ତାହାଙ୍କର ଆଲୋଚନା ପୃଷ୍ଠାମାନଙ୍କୁ (ତଥା ସାନପୃଷ୍ଠାମାନଙ୍କୁ)ନୂଆ ନାମକୁ ଘୁଞ୍ଚାଇବେ',
+	'renameusersuppress' => 'ନୂଆ ନାମକୁ ପୁନପ୍ରେରଣ କରନ୍ତୁ ନାହିଁ',
+	'renameuserreserve' => 'ଭବିଷ୍ୟତ ବ୍ୟବହାରରେ ପୁରୁଣା ଇଉଜର ନାମକୁ ଅଟକାଇ ଦିଅନ୍ତୁ',
+	'renameuserwarnings' => 'ଚେତାବନୀ:',
+	'renameuserconfirm' => 'ହଁ, ସଭ୍ୟଙ୍କ ନାମ ବଦଳାଇ ଦେବେ',
 	'renameusersubmit' => 'ଦାଖଲକରିବା',
-);
-
-/** Ossetic (Иронау)
+	'renameusererrordoesnotexist' => '"<nowiki>$1</nowiki>" ନାମକ ସଭ୍ୟଜଣକ ଏଠାରେ ନାହାନ୍ତି ।',
+	'renameusererrorexists' => '"<nowiki>$1</nowiki>" ନାମକ ସଭ୍ୟଜଣକ ଆଗରୁ ଅଛନ୍ତି ।',
+	'renameusererrorinvalid' => '"<nowiki>$1</nowiki>" ଇଉଜର ନାମଟି ଅଚଳ ଅଟେ ।',
+	'renameuser-error-request' => 'ଅନୁରୋଧ ଗ୍ରହଣ କରିବାରେ ଏକ ଅସୁବିଧା ହେଲା ।
+ଦୟାକରି ପଛକୁ ଫେରି ଆଉଥରେ ଚେଷ୍ଟା କରନ୍ତୁ ।',
+	'renameuser-error-same-user' => 'ଆଗ ଭଳି ଆପଣ ଜଣେ ସଭ୍ୟଙ୍କର ନାମ ବଦଳାଇପାରିବେ ନାହିଁ ।',
+	'renameusersuccess' => '"<nowiki>$1</nowiki>" ସଭ୍ୟଙ୍କ ନାମ "<nowiki>$2</nowiki>"କୁ ବଦଳାଗଲା ।',
+	'renameuser-page-exists' => '$1 ପୃଷ୍ଠାଟି ଆଗରୁ ଅଛି ଓ ଆଉଥରେ ଲେଖାଯାଇପାରିବ ନାହିଁ ।',
+	'renameuser-page-moved' => '$1 ପୃଷ୍ଠାଟିକୁ $2କୁ ଘୁଞ୍ଚାଇ ଦିଆଗଲା ।',
+	'renameuser-page-unmoved' => '$1 ପୃଷ୍ଠାଟି $2କୁ ଘୁଞ୍ଚାଯାଇ ପାରିବ ନାହିଁ ।',
+	'renameuserlogpage' => 'ସଭ୍ୟ ନାମବଦଳ ଇତିହାସ',
+	'renameuserlogpagetext' => 'ସଭ୍ୟଙ୍କ ନାମ ବଦଳର ଏହା ଏକ ଇତିହାସ ।',
+	'renameuserlogentry' => '$1 ରୁ "$2" କୁ ନାମ ବଦଳାଗଲା',
+	'renameuser-log' => '{{PLURAL:$1|ସମ୍ପାଦନାଟିଏ|$1 ଗୋଟି ସମ୍ପାଦନା}} । କାରଣ: $2',
+	'renameuser-move-log' => 'ସଭ୍ୟ "[[User:$1|$1]]"ରୁ "[[User:$2|$2]]"କୁ ନାମ ବଦଳ କଲାବେଳେ ବେଳେ ଛାଏଁ ଛାଏଁ ପୃଷ୍ଠାଟି ଘୁଞ୍ଚାଇ ଦିଆଗଲା',
+	'right-renameuser' => 'ସଭ୍ୟମାନଙ୍କ ନାମଟି ବଦଳାଇବେ',
+	'renameuser-renamed-notice' => 'ଏହି ସଭ୍ୟଙ୍କ ନାମ ବଦଳାଯାଇଅଛି ।
+ତଳେ ଅବଗତି ନିମନ୍ତେ ନାମ ବଦଳ ଇତିହାସ ଦିଆଗଲା ।',
+);
+
+/** Ossetic (Ирон)
  * @author Amikeco
  */
 $messages['os'] = array(
@@ -2893,6 +3081,42 @@ Për piasì torna andré e preuva torna.",
 Ël registr ëd l'arnòmina a l'é dàit sota për arferiment.",
 );
 
+/** Western Punjabi (پنجابی)
+ * @author Khalid Mahmood
+ */
+$messages['pnb'] = array(
+	'renameuser' => 'ورتن والے دا ہور ناں',
+	'renameuser-linkoncontribs' => 'ورتن والے دا ہور ناں',
+	'renameuser-linkoncontribs-text' => 'ایس ورتن والے دا ہور ناں رکھو',
+	'renameuser-desc' => "جوڑدا اے اک [[Special:Renameuser|خاص صفہ]] اک ورتن والے نوں ہور ناں دین لئی ( ''renameuser'' حق دی لوڑ اے۔)",
+	'renameuserold' => 'ہن والا ورتن والا ناں:',
+	'renameusernew' => 'نواں ورتن والا ناں:',
+	'renameuserreason' => 'ہور ناں رکھن دی وجہ:',
+	'renameusermove' => 'ورتن تے گل بات صفے نوں تے نال دے نکیاں صفیاں نوں نویں ناں ول لے چلو۔',
+	'renameusersuppress' => 'ایس نویں ناں نال ریڈائرکٹ ناں بناؤ۔',
+	'renameuserreserve' => 'پرانے ورتن والے ناں نوں اگے ورتے جان توں روکو',
+	'renameuserwarnings' => 'خبردار',
+	'renameuserconfirm' => 'ہاں، ورتن والے دا فیر ناں رکھو',
+	'renameusersubmit' => 'پیش کرو',
+	'renameusererrordoesnotexist' => 'ورتنوالا "<نوکی>$1</نوکی>" ہے ای نئیں۔',
+	'renameusererrorexists' => 'ورتنوالا "<نوکی>$1</نوکی>" پہلے ای ہیگا اے۔',
+	'renameusererrorinvalid' => 'ورتن ناں "<نوکی>$1</نوکی>" نئیں چل سکدا۔',
+	'renameuser-error-request' => 'گل منن چ مسلہ اے۔ مہربانی کرکے پچھے جاؤ تے فیر کوشش کرو۔',
+	'renameuser-error-same-user' => 'تسیں فیر پہلے وانگوں اک ورتن والے دا ناں فیر نئیں رکھ سکدے۔',
+	'renameusersuccess' => 'ورتن والا "<nowiki>$1</nowiki>" دا ناں بدل کے "<nowiki>$1</nowiki>" رکھ دتا گیا اے۔',
+	'renameuser-page-exists' => 'صفہ $1 پہلے ای ہیگا اے تے ایدے تے اپنے آپ نئیں لکھیا جاسکدا۔',
+	'renameuser-page-moved' => 'صفہ $1 نوں $2 ول لجایا گیا اے۔',
+	'renameuser-page-unmoved' => 'صفہ $1 ، $2 ول نئیں لجایا جاسکدا۔',
+	'renameuserlogpage' => 'ورتن ہور ناں لاگ',
+	'renameuserlogpagetext' => 'ورتن ناواں چ تبدیلیاں دی اے لاگ اے۔',
+	'renameuserlogentry' => '$1 بدل کے "$2" رکھیا گیا۔',
+	'renameuser-log' => '{{انیک:$1|1 تبدیلی|$1 تبدیلیاں}}. وجہ: $2',
+	'renameuser-move-log' => 'اپنے آپ صفے ٹرے "[[ورتن والا:$1|$1]]" دا ناں "[[ورتن والا:$2|$2]]" پلٹدیاں ہویاں',
+	'right-renameuser' => 'ورتن والے دا ہور ناں',
+	'renameuser-renamed-notice' => 'ایس ورتن والے دا ناں بدلیا گیا اے۔
+ناں بدلن والی لاگ اتے پتے لئی تھلے دتی گئی اے۔',
+);
+
 /** Pashto (پښتو)
  * @author Ahmed-Najib-Biabani-Ibrahimkhel
  */
@@ -3124,6 +3348,7 @@ L'archivije de le renomenaziune 'u iacchie aqquà sotte cumme referimende.",
  * @author Ahonc
  * @author EugeneZelenko
  * @author Innv
+ * @author KPu3uC B Poccuu
  * @author Kaganer
  * @author Александр Сигачёв
  */
@@ -3131,7 +3356,7 @@ $messages['ru'] = array(
 	'renameuser' => 'Переименовать участника',
 	'renameuser-linkoncontribs' => 'переименовать участника',
 	'renameuser-linkoncontribs-text' => 'Переименовать этого участника',
-	'renameuser-desc' => "Переименование участника (требуются права ''renameuser'')",
+	'renameuser-desc' => 'Добавляет [[Special:Renameuser|возможность]] переименования пользователей (требуется право <code>renameuser</code>)',
 	'renameuserold' => 'Имя в настоящий момент:',
 	'renameusernew' => 'Новое имя:',
 	'renameuserreason' => 'Причина переименования:',
@@ -3152,7 +3377,7 @@ $messages['ru'] = array(
 	'renameuser-page-unmoved' => 'Страница $1 не может быть переименована в $2.',
 	'renameuserlogpage' => 'Журнал переименований участников',
 	'renameuserlogpagetext' => 'Это журнал произведённых переименований зарегистрированных участников.',
-	'renameuserlogentry' => 'переименовал $1 в «$2»',
+	'renameuserlogentry' => 'переименовал «$1» в «$2»',
 	'renameuser-log' => '$1 {{PLURAL:$1|правка|правки|правок}}. Причина: $2',
 	'renameuser-move-log' => 'Автоматически в связи с переименованием учётной записи «[[User:$1|$1]]» в «[[User:$2|$2]]»',
 	'right-renameuser' => 'переименование участников',
@@ -3196,7 +3421,14 @@ $messages['rue'] = array(
 Про перегляд є ниже указаный выпис з лоґу переменовань хоснователїв.',
 );
 
-/** Yakut (Саха тыла)
+/** Sanskrit (संस्कृतम्)
+ * @author Ansumang
+ */
+$messages['sa'] = array(
+	'renameuserwarnings' => 'चेतावनी:',
+);
+
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -3280,7 +3512,7 @@ $messages['sgs'] = array(
 	'renameusersuccess' => 'Nauduotuos "<nowiki>$1</nowiki>" bova parvadėnts i "<nowiki>$2</nowiki>".',
 );
 
-/** Serbo-Croatian (Srpskohrvatski / Српскохрватски)
+/** Serbo-Croatian (Srpskohrvatski)
  * @author OC Ripper
  */
 $messages['sh'] = array(
@@ -3386,7 +3618,7 @@ $messages['sl'] = array(
 	'renameusererrorinvalid' => 'Uporabniško ime »<nowiki>$1</nowiki>« ni veljavno.',
 	'renameuser-error-request' => 'Pri prejemanju zahteve je prišlo do težave.
 Prosimo, pojdite nazaj in poskusite znova.',
-	'renameuser-error-same-user' => 'Ne morete preimenovati uporabnika na enako stvar kot prej.',
+	'renameuser-error-same-user' => 'Uporabnika ne morete preimenovati v isto stvar kot prej.',
 	'renameusersuccess' => 'Uporabnik »<nowiki>$1</nowiki>« je bil preimenovan v »<nowiki>$2</nowiki>«.',
 	'renameuser-page-exists' => 'Stran $1 že obstaja in je ni mogoče samodejno prepisati.',
 	'renameuser-page-moved' => 'Stran $1 je bila prestavljena na $2.',
@@ -3449,7 +3681,7 @@ Ju lutemi kthehuni prapa dhe provoni përsëri.',
 Regjistri i riemërimit është poshtë për referencë.',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Millosh
  * @author Rancher
  * @author Sasa Stefanovic
@@ -3479,7 +3711,7 @@ $messages['sr-ec'] = array(
 	'renameusersuccess' => 'Корисник "<nowiki>$1</nowiki>" је преименован на "<nowiki>$2</nowiki>"',
 	'renameuser-page-exists' => 'Страница $1 већ постоји и не може се заменити.',
 	'renameuser-page-moved' => 'Страница $1 је премештена у $2.',
-	'renameuser-page-unmoved' => 'Страница $1 се не може преместити у $2.',
+	'renameuser-page-unmoved' => 'Страница $1 не може да се премести на $2.',
 	'renameuserlogpage' => 'Историја преименовања корисника',
 	'renameuserlogpagetext' => 'Ово је историја измена корисничких имена.',
 	'renameuserlogentry' => '{{GENDER:|је преименовао|је преименовала|преименова}} $1 у „$2“',
@@ -3491,7 +3723,7 @@ $messages['sr-ec'] = array(
 Историја промена имена је приложена испод, као информација.',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Liangent
  * @author Michaello
  * @author Жељко Тодоровић
@@ -3505,6 +3737,7 @@ $messages['sr-el'] = array(
 	'renameusernew' => 'Novo korisničko ime:',
 	'renameuserreason' => 'Razlog preimenovanja:',
 	'renameusermove' => 'Premesti korisničku stranicu i stranicu za razgovor (i njihove podstranice) na novo ime',
+	'renameusersuppress' => 'Ne pravite preusmerenja na novi naziv',
 	'renameuserreserve' => 'Blokiraj staro korisničko ime za dalju upotrebu',
 	'renameuserwarnings' => 'Upozorenja:',
 	'renameuserconfirm' => 'Da, preimenuj korisničko ime.',
@@ -3538,9 +3771,9 @@ $messages['stq'] = array(
 	'renameuserold' => 'Benutsernoomer bithäär:',
 	'renameusernew' => 'Näie Benutsernoome:',
 	'renameuserreason' => 'Gruund foar Uumenaame:',
-	'renameusermove' => 'Ferschuuwe Benutser-/Diskussionssiede inkl. Unnersieden ap dän näie Benutsernoome',
+	'renameusermove' => 'Ferskuuwe Benutser-/Diskussionssiede inkl. Unnersieden ap dän näie Benutsernoome',
 	'renameuserreserve' => 'Blokkierje dän oolde Benutsernoome foar ne näie Registrierenge',
-	'renameuserwarnings' => 'Woarschauengen:',
+	'renameuserwarnings' => 'Woarskauengen:',
 	'renameuserconfirm' => 'Jee, Benutser uumbenaame',
 	'renameusersubmit' => 'Uumbenaame',
 	'renameusererrordoesnotexist' => 'Die Benutsernoome "<nowiki>$1</nowiki>" bestoant nit',
@@ -3549,14 +3782,14 @@ $messages['stq'] = array(
 	'renameuser-error-request' => 'Dät roat n Problem bie dän Ämpfang fon ju Anfroage. Fersäik jädden nochmoal.',
 	'renameuser-error-same-user' => 'Oolde un näie Benutsernoome sunt identisk.',
 	'renameusersuccess' => 'Die Benutser "<nowiki>$1</nowiki>" wuude mäd Ärfoulch uumenaamd in "<nowiki>$2</nowiki>"',
-	'renameuser-page-exists' => 'Ju Siede $1 bestoant al un kon nit automatisk uurschrieuwen wäide.',
-	'renameuser-page-moved' => 'Ju Siede $1 wuude ätter $2 ferschäuwen.',
-	'renameuser-page-unmoved' => 'Ju Siede $1 kuude nit ätter $2 ferschäuwen wäide.',
+	'renameuser-page-exists' => 'Ju Siede $1 bestoant al un kon nit automatisk uurskrieuwen wäide.',
+	'renameuser-page-moved' => 'Ju Siede $1 wuude ätter $2 ferskäuwen.',
+	'renameuser-page-unmoved' => 'Ju Siede $1 kuude nit ätter $2 ferskäuwen wäide.',
 	'renameuserlogpage' => 'Benutsernoomenannerengs-Logbouk',
 	'renameuserlogpagetext' => 'In dit Logbouk wäide do Annerengen fon Benutsernoomen protokollierd.',
 	'renameuserlogentry' => 'häd "$1" in "$2" uumenaamd',
 	'renameuser-log' => '{{PLURAL:$1|1 Beoarbaidenge|$1 Beoarbaidengen}}. Gruund: $2',
-	'renameuser-move-log' => 'truch ju Uumbenaamenge fon „[[User:$1|$1]]“ ätter „[[User:$2|$2]]“ automatisk ferschäuwene Siede.',
+	'renameuser-move-log' => 'truch ju Uumbenaamenge fon „[[User:$1|$1]]“ ätter „[[User:$2|$2]]“ automatisk ferskäuwene Siede.',
 	'right-renameuser' => 'Benutser uumenaame',
 );
 
@@ -3637,15 +3870,26 @@ $messages['sw'] = array(
 );
 
 /** Tamil (தமிழ்)
+ * @author Shanmugamp7
  * @author TRYPPN
  */
 $messages['ta'] = array(
+	'renameuser' => 'பயனரை பெயர்மாற்று',
+	'renameuser-linkoncontribs' => 'பயனரை பெயர்மாற்று',
+	'renameuser-linkoncontribs-text' => 'இந்த பயனரை பெயர்மாற்று',
 	'renameuserold' => 'தற்போதைய பயனர் பெயர்:',
 	'renameusernew' => 'புதிய பயனர் பெயர்:',
 	'renameuserreason' => 'மறுபெயருக்கான காரணம்:',
 	'renameuserwarnings' => 'எச்சரிக்கை:',
 	'renameuserconfirm' => 'சரி, பயனருக்கு மாற்றுப்பெயர் கொடுக்கவும்',
 	'renameusersubmit' => 'சமர்ப்பி',
+	'renameuserlogpage' => 'பயனரை பெயர்மாற்றுதல் குறிப்பேடு',
+	'renameuserlogpagetext' => 'இது பயனர் பெயர் மாற்றத்திற்கான குறிப்பேடு',
+	'renameuserlogentry' => 'பெயர் மற்றம் செய்யப்பட்டது $1 லிருந்து "$2" க்கு',
+	'renameuser-log' => '{{PLURAL:$1|1 திருத்தம்|$1 திருத்தங்கள்}}. காரணம்: $2',
+	'right-renameuser' => 'பயனர்களை மாற்று பெயரிடு',
+	'renameuser-renamed-notice' => 'இந்த பயனர் பெயர் மாற்றப்பட்டது.
+மாற்றுப்பெயரிடுதல் குறிப்பேடு குறிப்புதவிக்காக கீழே வழங்கப்பட்டுள்ளது',
 );
 
 /** Telugu (తెలుగు)
@@ -3661,7 +3905,7 @@ $messages['te'] = array(
 	'renameuserold' => 'ప్రస్తుత వాడుకరి పేరు:',
 	'renameusernew' => 'కొత్త వాడుకరి పేరు:',
 	'renameuserreason' => 'పేరు మార్చడానికి కారణం:',
-	'renameusermove' => 'సభ్యుని పేజీ, చర్చాపేజీలను (వాటి ఉపపేజీలతో సహా) కొత్త పేరుకు తరలించండి',
+	'renameusermove' => 'వాడుకరి పేజీ, చర్చాపేజీలను (వాటి ఉపపేజీలతో సహా) కొత్త పేరుకు తరలించండి',
 	'renameusersuppress' => 'కొత్త పేరుకి దారిమార్పులు సృష్టించకు',
 	'renameuserreserve' => 'పాత వాడుకరిపేరుని భవిష్యత్తులో వాడకుండా నిరోధించు',
 	'renameuserwarnings' => 'హెచ్చరికలు:',
@@ -3704,7 +3948,7 @@ $messages['tet'] = array(
 	'right-renameuser' => "Fó naran foun ba uza-na'in sira",
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (Тоҷикӣ)
  * @author Ibrahim
  */
 $messages['tg-cyrl'] = array(
@@ -3735,7 +3979,7 @@ $messages['tg-cyrl'] = array(
 	'right-renameuser' => 'Тағйири номи корбарон',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -3873,7 +4117,7 @@ Magbalik lamang at subukan uli.',
 Ibinigay sa ibaba ang talaan ng pagpapangalang muli para masangguni.',
 );
 
-/** Tonga (lea faka-Tonga) */
+/** Tongan (lea faka-Tonga) */
 $messages['to'] = array(
 	'renameuser' => 'Liliu hingoa ʻo e ʻetita',
 	'renameuserold' => 'Hingoa motuʻa ʻo e ʻetita:',
@@ -4010,10 +4254,12 @@ $messages['vec'] = array(
 Qua soto ghe xe el riferimento sul registro de rinomina.',
 );
 
-/** Veps (Vepsan kel')
+/** Veps (Vepsän kel')
  * @author Игорь Бродский
  */
 $messages['vep'] = array(
+	'renameuser' => 'Udesnimitada kävutajad',
+	'renameuserold' => 'Nügüdläine kävutajannimi:',
 	'renameusernew' => "Uz' kävutajan nimi:",
 	'renameuserreason' => 'Udesnimitandan sü:',
 	'renameusersubmit' => 'Tehta',
@@ -4121,16 +4367,21 @@ $messages['yi'] = array(
 	'renameuser' => 'בײַטן באַניצער נאָמען',
 	'renameuser-linkoncontribs' => 'בײַטן באַניצער נאָמען',
 	'renameuser-linkoncontribs-text' => 'בײַטן נאָמען פֿון דעם באַניצער',
+	'renameuser-desc' => "לייגט צו א [[Special:Renameuser|באַזונדערן בלאַט]] צו בײַטן א באַניצער נאָמען (פֿאדערט ''renameuser'' רעכט)",
 	'renameuserold' => 'לויפיגער באַניצער-נאָמען:',
 	'renameusernew' => 'נײַער באַניצער-נאָמען:',
 	'renameuserreason' => 'סיבה פֿאַר ענדערן נאָמען:',
 	'renameusermove' => 'באַוועגן באַניצער און שמועס בלעטער (מיט זייערע אונטערבלעטער) צו נײַעם נאָמען',
+	'renameusersuppress' => 'שאַפֿט נישט קיין ווייטערפֿירונגען צום נײַעם נאָמען',
+	'renameuserreserve' => 'בלאקירן דעם אַלטן באַניצער־נאָמען פֿון נוץ אין צוקונפֿט',
 	'renameuserwarnings' => 'ווארענונגען:',
 	'renameuserconfirm' => 'יאָ, ענדער דעם באַניצער־נאָמען',
 	'renameusersubmit' => 'אײַנגעבן',
-	'renameusererrordoesnotexist' => 'דער באניצער "<nowiki>$1</nowiki>" עקסיסטירט נישט.',
-	'renameusererrorexists' => 'דער באניצער  "<nowiki>$1</nowiki>" עקסיסטירט שוין.',
-	'renameusererrorinvalid' => 'דער באניצער נאמען  "<nowiki>$1</nowiki>" איז נישט גילטיק.',
+	'renameusererrordoesnotexist' => 'דער באַניצער "<nowiki>$1</nowiki>" עקזיסטירט נישט.',
+	'renameusererrorexists' => 'דער באַניצער "<nowiki>$1</nowiki>" עקזיסטירט שוין.',
+	'renameusererrorinvalid' => 'דער באַניצער נאָמען  "<nowiki>$1</nowiki>" איז נישט גילטיק.',
+	'renameuser-error-request' => 'געווען א פראבלעם מיט באַקומען די בקשה.
+ביטע גייט צוריק און פרואווט ווידעראַמאָל.',
 	'renameuser-error-same-user' => 'מען קען נישט ענדערן א באַניצער צום זעלבן נאָמען ווי פֿריער.',
 	'renameusersuccess' => 'דער באַניצער־נאָמען "<nowiki>$1</nowiki>" איז געווארן געענדערט צו "<nowiki>$2</nowiki>".',
 	'renameuser-page-exists' => "דער בלאַט $1 עקזיסטירט שוין און מ'קען אים נישט אויטאָמאַטיש איבערשרײַבן.",
@@ -4139,7 +4390,7 @@ $messages['yi'] = array(
 	'renameuserlogpage' => 'באַניצער נאָמען-טויש לאָג-בוך',
 	'renameuserlogpagetext' => 'דאָס איז אַ לאג פֿון ענדערונגען צו באַניצער־נעמען.',
 	'renameuserlogentry' => 'מ\'האט דעם נאָמען $1 געענדערט צו "$2"',
-	'renameuser-log' => '{{PLURAL:$1|1 רעדאַקטירונג|$1 רעדאַקטירונגעם}}. גרונד: $2',
+	'renameuser-log' => '{{PLURAL:$1|1 רעדאַקטירונג|$1 רעדאַקטירונגען}}. גרונד: $2',
 	'renameuser-move-log' => 'אויטאמאַטיש באַוועגט בלאַט דורך ענדערן באַניצער־נאָמען פֿון "[[User:$1|$1]]" צו "[[User:$2|$2]]"',
 	'right-renameuser' => 'בײַטן באַניצער נעמען',
 	'renameuser-renamed-notice' => 'דער נאָמען פֿון דעם באַניצער איז געענדערט געווארן.
@@ -4153,6 +4404,7 @@ $messages['yo'] = array(
 	'renameuserold' => 'Orúkọ oníṣe ìsinsìnyí:',
 	'renameusernew' => 'Orúkọ oníṣe tuntun:',
 	'renameuserwarnings' => 'Àwọn ìkìlọ̀:',
+	'renameusersubmit' => 'Fúnsílẹ̀',
 	'renameusererrordoesnotexist' => 'Oníṣe "<nowiki>$1</nowiki>" kò sí.',
 	'renameusererrorexists' => 'Oníṣe "<nowiki>$1</nowiki>" tilẹ̀ wà tẹ́lẹ̀.',
 	'renameuserlogentry' => 'ṣàtúnsọlórúkọ $1 sí $2',
@@ -4194,6 +4446,7 @@ $messages['yue'] = array(
  * @author Gzdavidwong
  * @author Hydra
  * @author Liangent
+ * @author PhiLiP
  * @author Xiaomingyan
  */
 $messages['zh-hans'] = array(
@@ -4201,7 +4454,7 @@ $messages['zh-hans'] = array(
 	'renameuser-linkoncontribs' => '用户重新命名',
 	'renameuser-linkoncontribs-text' => '重命名此用户',
 	'renameuser-desc' => "添加一个[[Special:Renameuser|特殊页面]]来重命名用户（需要''renameuser''权限）",
-	'renameuserold' => '当前用户名:',
+	'renameuserold' => '当前用户名：',
 	'renameusernew' => '新用户名:',
 	'renameuserreason' => '重命名的原因:',
 	'renameusermove' => '移动用户页及其对话页（包括各子页）到新的名字',
@@ -4220,14 +4473,13 @@ $messages['zh-hans'] = array(
 	'renameuser-page-exists' => '$1这一页己经存在，不能自动覆写。',
 	'renameuser-page-moved' => '$1这一页已经移动到$2。',
 	'renameuser-page-unmoved' => '$1这一页不能移动到$2。',
-	'renameuserlogpage' => '用户名变更日志',
-	'renameuserlogpagetext' => '这是用户名更改的日志',
-	'renameuserlogentry' => '已经把 $1 重命名为 "$2"',
+	'renameuserlogpage' => '用户更名日志',
+	'renameuserlogpagetext' => '本日志记录用户名的更改',
+	'renameuserlogentry' => '将$1更名为“$2”',
 	'renameuser-log' => '拥有$1次编辑。 理由: $2',
 	'renameuser-move-log' => '当由"[[User:$1|$1]]"重命名作"[[User:$2|$2]]"时已经自动移动用户页',
 	'right-renameuser' => '更名用户',
-	'renameuser-renamed-notice' => '该用户已被重新命名。
-以下列出更改用户名日志以供参考。',
+	'renameuser-renamed-notice' => '本用户已更名。下面提供更名日志以供参考。',
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
diff --git a/extensions/Renameuser/Renameuser.php b/extensions/Renameuser/Renameuser.php
index ecfb4298..962c0f3f 100644
--- a/extensions/Renameuser/Renameuser.php
+++ b/extensions/Renameuser/Renameuser.php
@@ -2,7 +2,7 @@
 if ( !defined( 'MEDIAWIKI' ) ) die();
 /**
  * A Special Page extension to rename users, runnable by users with renameuser
- * righs
+ * rights
  *
  * @file
  * @ingroup Extensions
@@ -18,14 +18,14 @@ $wgExtensionCredits['specialpage'][] = array(
 	'path' => __FILE__,
 	'name' => 'Renameuser',
 	'author'         => array( 'Ævar Arnfjörð Bjarmason', 'Aaron Schulz' ),
-	'url'            => 'http://www.mediawiki.org/wiki/Extension:Renameuser',
+	'url'            => 'https://www.mediawiki.org/wiki/Extension:Renameuser',
 	'descriptionmsg' => 'renameuser-desc',
 );
 
-# Internationalisation file
+# Internationalisation files
 $dir = dirname( __FILE__ ) . '/';
 $wgExtensionMessagesFiles['Renameuser'] = $dir . 'Renameuser.i18n.php';
-$wgExtensionAliasesFiles['Renameuser'] = $dir . 'Renameuser.alias.php';
+$wgExtensionMessagesFiles['RenameuserAliases'] = $dir . 'Renameuser.alias.php';
 
 /**
  * Users with more than this number of edits will have their rename operation
@@ -101,8 +101,7 @@ function wfRenameuserOnContribsLink( $id, $nt, &$tools ) {
 	global $wgUser;
 
 	if ( $wgUser->isAllowed( 'renameuser' ) && $id ) {
-		$sk = $wgUser->getSkin();
-		$tools[] = $sk->link(
+		$tools[] = Linker::link(
 			SpecialPage::getTitleFor( 'Renameuser' ),
 			wfMsg( 'renameuser-linkoncontribs' ),
 			array( 'title' => wfMsgExt( 'renameuser-linkoncontribs-text', 'parseinline' ) ),
diff --git a/extensions/Renameuser/Renameuser_body.php b/extensions/Renameuser/Renameuser_body.php
index 1e72aeaa..63ea1bbe 100644
--- a/extensions/Renameuser/Renameuser_body.php
+++ b/extensions/Renameuser/Renameuser_body.php
@@ -22,7 +22,7 @@ class SpecialRenameuser extends SpecialPage {
 	 * @param mixed $par Parameter passed to the page
 	 */
 	public function execute( $par ) {
-		global $wgOut, $wgUser, $wgRequest, $wgContLang, $wgLang;
+		global $wgOut, $wgUser, $wgRequest, $wgContLang;
 		global $wgCapitalLinks;
 
 		$this->setHeaders();
@@ -32,7 +32,7 @@ class SpecialRenameuser extends SpecialPage {
 			$wgOut->permissionRequired( 'renameuser' );
 			return;
 		}
-		
+
 		if ( wfReadOnly() ) {
 			$wgOut->readOnlyPage();
 			return;
@@ -101,7 +101,7 @@ class SpecialRenameuser extends SpecialPage {
 					"</td>
 				</tr>"
 			);
-			
+
 			if ( $wgUser->isAllowed( 'suppressredirect' ) ) {
 				$wgOut->addHTML( "
 					<tr>
@@ -280,36 +280,58 @@ class SpecialRenameuser extends SpecialPage {
 
 			$suppressRedirect = false;
 
-			if ( $wgRequest->getCheck( 'suppressredirect' ) && $wgUser->isAllowed( 'suppressredirect' ) ) {	
+			if ( $wgRequest->getCheck( 'suppressredirect' ) && $wgUser->isAllowed( 'suppressredirect' ) ) {
 				$suppressRedirect = true;
 			}
 
 			$output = '';
-			$skin = $wgUser->getSkin();
 			foreach ( $pages as $row ) {
 				$oldPage = Title::makeTitleSafe( $row->page_namespace, $row->page_title );
 				$newPage = Title::makeTitleSafe( $row->page_namespace,
 					preg_replace( '!^[^/]+!', $newusername->getDBkey(), $row->page_title ) );
 				# Do not autodelete or anything, title must not exist
 				if ( $newPage->exists() && !$oldPage->isValidMoveTarget( $newPage ) ) {
-					$link = $skin->makeKnownLinkObj( $newPage );
-					$output .= '<li class="mw-renameuser-pe">' . wfMsgHtml( 'renameuser-page-exists', $link ) . '</li>';
+					$link = Linker::linkKnown( $newPage );
+					$output .= Html::rawElement(
+								'li',
+								array( 'class' => 'mw-renameuser-pe' ),
+								wfMessage( 'renameuser-page-exists' )->rawParams( $link )->escaped()
+							);
 				} else {
-					$success = $oldPage->moveTo( $newPage, false, wfMsgForContent( 'renameuser-move-log',
-						$oldusername->getText(), $newusername->getText() ), !$suppressRedirect );
+					$success = $oldPage->moveTo(
+								$newPage,
+								false, 
+								wfMessage(
+									'renameuser-move-log',
+									$oldusername->getText(),
+									$newusername->getText() )->inContentLanguage()->text(),
+								!$suppressRedirect
+							);
 					if ( $success === true ) {
-						$oldLink = $skin->makeKnownLinkObj( $oldPage, '', 'redirect=no' );
-						$newLink = $skin->makeKnownLinkObj( $newPage );
-						$output .= '<li class="mw-renameuser-pm">' . wfMsgHtml( 'renameuser-page-moved', $oldLink, $newLink ) . '</li>';
+						# oldPage is not known in case of redirect suppression
+						$oldLink = Linker::link( $oldPage, null, array(), array( 'redirect' => 'no' ) );
+
+						# newPage is always known because the move was successful
+						$newLink = Linker::linkKnown( $newPage );
+
+						$output .= Html::rawElement(
+									'li',
+									array( 'class' => 'mw-renameuser-pm' ),
+									wfMessage( 'renameuser-page-moved' )->rawParams( $oldLink, $newLink )->escaped()
+								);
 					} else {
-						$oldLink = $skin->makeKnownLinkObj( $oldPage );
-						$newLink = $skin->makeLinkObj( $newPage );
-						$output .= '<li class="mw-renameuser-pu">' . wfMsgHtml( 'renameuser-page-unmoved', $oldLink, $newLink ) . '</li>';
+						$oldLink = Linker::linkKnown( $oldPage );
+						$newLink = Linker::link( $newPage );
+						$output .= Html::rawElement(
+									'li', array( 'class' => 'mw-renameuser-pu' ),
+									wfMessage( 'renameuser-page-unmoved' )->rawParams( $oldLink, $newLink )->escaped()
+								);
 					}
 				}
 			}
-			if ( $output )
-				$wgOut->addHTML( '<ul>' . $output . '</ul>' );
+			if ( $output ) {
+				$wgOut->addHTML( Html::rawElement( 'ul', array(), $output ) );
+			}
 		}
 
 		// Output success message stuff :)
@@ -320,8 +342,7 @@ class SpecialRenameuser extends SpecialPage {
 	/**
 	 * @param $username Title
 	 * @param $type
-	 * @param $out
-	 * @return void
+	 * @param $out OutputPage
 	 */
 	function showLogExtract( $username, $type, &$out ) {
 		# Show relevant lines from the logs:
@@ -366,8 +387,9 @@ class RenameuserSQL {
 	/**
 	 * Constructor
 	 *
-	 * @param string $old The old username
-	 * @param string $new The new username
+	 * @param $old string The old username
+	 * @param $new string The new username
+	 * @param $uid
 	 */
 	function __construct( $old, $new, $uid ) {
 		$this->old = $old;
@@ -420,6 +442,7 @@ class RenameuserSQL {
 			__METHOD__
 		);
 		if ( !$dbw->affectedRows() ) {
+			$dbw->rollback();
 			return false;
 		}
 		// Reset token to break login with central auth systems.
@@ -456,14 +479,14 @@ class RenameuserSQL {
 				__METHOD__
 			);
 		}
-		
+
 		// Increase time limit (like CheckUser); this can take a while...
 		if ( $this->tablesJob ) {
 			wfSuppressWarnings();
 			set_time_limit( 120 );
 			wfRestoreWarnings();
 		}
-		
+
 		$jobs = array(); // jobs for all tables
 		// Construct jobqueue updates...
 		// FIXME: if a bureaucrat renames a user in error, he/she
diff --git a/extensions/Renameuser/renameUserCleanup.php b/extensions/Renameuser/renameUserCleanup.php
index bd578b6a..374cb891 100644
--- a/extensions/Renameuser/renameUserCleanup.php
+++ b/extensions/Renameuser/renameUserCleanup.php
@@ -20,14 +20,14 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @ingroup Maintenance
- * @author Ariel Glenn <ariel@wikimedia.orf>
+ * @author Ariel Glenn <ariel@wikimedia.org>
  */
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
 	$IP = dirname( __FILE__ ) . '/../..';
 }
-require( "$IP/maintenance/Maintenance.php" );
+require_once( "$IP/maintenance/Maintenance.php" );
 
 class RenameUserCleanup extends Maintenance {
 	public function __construct() {
@@ -35,6 +35,7 @@ class RenameUserCleanup extends Maintenance {
 		$this->mDescription = "Maintenance script to finish incomplete rename user, in particular to reassign edits that were missed";
 		$this->addOption( 'olduser', 'Old user name', true, true );
 		$this->addOption( 'newuser', 'New user name', true, true );
+		$this->addOption( 'olduid', 'Old user id in revision records (DANGEROUS)', false, true );
 		$this->mBatchSize = 1000;
 	}
 
@@ -42,27 +43,58 @@ class RenameUserCleanup extends Maintenance {
 		$this->output( "Rename User Cleanup starting...\n\n" );
 		$olduser = User::newFromName( $this->getOption( 'olduser' ) );
 		$newuser = User::newFromName( $this->getOption( 'newuser' ) );
+		$olduid = $this->getOption( 'olduid' );
+
+		$this->checkUserExistence( $olduser, $newuser );
+		$this->checkRenameLog( $olduser, $newuser );
+
+		if ( $olduid ) {
+			$this->doUpdates( $olduser, $newuser, $olduid );
+		}
+		$this->doUpdates( $olduser, $newuser, $newuser->getId() );
+		$this->doUpdates( $olduser, $newuser, 0 );
+		
+		print "Done!\n";
+		exit(0);
+	}
+
+	/**
+	 * @param $olduser User
+	 * @param $newuser User
+	 */
+	public function checkUserExistence( $olduser, $newuser ) {
 		if ( !$newuser->getId() ) {
 			$this->error( "No such user: " . $this->getOption( 'newuser' ), true );
 			exit(1);
 		}
 		if ($olduser->getId() ) {
-			print( "WARNING!!: Old user still exists: " . $this->getOption( 'olduser' ) . "\n");
-			print("proceed anyways? We'll only re-attribute edits that have the new user uid (or 0) and the old user name.  [N/y]  ");
+			print "WARNING!!: Old user still exists: " . $this->getOption( 'olduser' ) . "\n";
+			print "proceed anyways? We'll only re-attribute edits that have the new user uid (or 0)";
+			print " or the uid specified by the caller, and the old user name.  [N/y]   ";
 			$stdin = fopen ("php://stdin","rt");
 			$line = fgets($stdin);
 			fclose($stdin);
 			if ( $line[0] != "Y" && $line[0] != "y" ) {
-				print("Exiting at user's request\n");
+				print "Exiting at user's request\n";
 				exit(0);
 			}
 		}
+	}
 
+	/**
+	 * @param $olduser User
+	 * @param $newuser User
+	 */
+	public function checkRenameLog( $olduser, $newuser ) {
 		$dbr = wfGetDB( DB_SLAVE );
+
+		$oldTitle = Title::makeTitle( NS_USER, $olduser->getName() );
+
 		$result = $dbr->select( 'logging', '*',
 			array( 'log_type' => 'renameuser',
 				'log_action'    => 'renameuser',
-				'log_title'     => $olduser->getName(),
+				'log_namespace' => NS_USER,
+				'log_title'     => $oldTitle->getDBkey(),
 				'log_params'    => $newuser->getName()
 			     ),
 			__METHOD__
@@ -72,129 +104,128 @@ class RenameUserCleanup extends Maintenance {
 			$result = $dbr->select( 'logging', '*',
 			array( 'log_type' => 'renameuser',
 				'log_action'    => 'renameuser',
+				'log_namespace' => NS_USER,
 				'log_title'     => $olduser->getName(),
 			     ),
 				__METHOD__
 			);
 			if (! $result ||  ! $result->numRows() ) {
-				print("No log entry found for a rename of ".$olduser->getName()." to ".$newuser->getName().", giving up\n");
-				exit(1);
-			}
-			else {
+				print "No log entry found for a rename of ".$olduser->getName()." to ".$newuser->getName().", proceed anyways??? [N/y] ";
+				$stdin = fopen ("php://stdin","rt");
+				$line = fgets($stdin);
+				fclose($stdin);
+				if ( $line[0] != "Y" && $line[0] != "y" ) {
+					print "Exiting at user's request\n";
+					exit(1);
+				}
+			} else {
 				foreach ( $result as $row ) {
-					print("Found possible log entry of the rename, please check: ".$row->log_title." with comment ".$row->log_comment." on $row->log_timestamp\n");
+					print "Found possible log entry of the rename, please check: ".$row->log_title." with comment ".$row->log_comment." on $row->log_timestamp\n";
 				}
 			}
-		}
-		else {
+		} else {
 			foreach ( $result as $row ) {
-				print("Found log entry of the rename: ".$olduser->getName()." to ".$newuser->getName()." on $row->log_timestamp\n");
+				print "Found log entry of the rename: ".$olduser->getName()." to ".$newuser->getName()." on $row->log_timestamp\n";
 			}
 		}
-		if ($result->numRows() > 1) {
-			print("More than one rename entry found in the log, not sure what to do. Continue anyways? [N/y]  ");
+		if ($result && $result->numRows() > 1) {
+			print "More than one rename entry found in the log, not sure what to do. Continue anyways? [N/y]  ";
 			$stdin = fopen ("php://stdin","rt");
 			$line = fgets($stdin);
 			fclose($stdin);
 			if ( $line[0] != "Y" && $line[0] != "y" ) {
-				print("Exiting at user's request\n");
+				print "Exiting at user's request\n";
 				exit(1);
 			}
 		}
-		$dbw = wfGetDB( DB_MASTER );
+	}
 
-		$this->updateTable('revision', 'rev_user_text', 'rev_user', 'rev_timestamp', $olduser, $newuser, $dbw);
-		$this->updateTable('archive', 'ar_user_text', 'ar_user', 'ar_timestamp',  $olduser, $newuser, $dbw);
-		$this->updateTable('logging', 'log_user_text', 'log_user', 'log_timestamp', $olduser, $newuser, $dbw);
-		$this->updateTable('image', 'img_user_text', 'img_user', 'img_timestamp', $olduser, $newuser, $dbw);
-		$this->updateTable('oldimage', 'oi_user_text', 'oi_user', 'oi_timestamp', $olduser, $newuser, $dbw);
-		$this->updateTable('filearchive', 'fa_user_text','fa_user', 'fa_timestamp', $olduser, $newuser, $dbw);
-		print "Done!\n";
-		exit(0);
+	/**
+	 * @param $olduser User
+	 * @param $newuser User
+	 * @param $uid
+	 */
+	public function doUpdates( $olduser, $newuser, $uid ) {
+		$this->updateTable( 'revision', 'rev_user_text', 'rev_user', 'rev_timestamp', $olduser, $newuser, $uid );
+		$this->updateTable( 'archive', 'ar_user_text', 'ar_user', 'ar_timestamp',  $olduser, $newuser, $uid );
+		$this->updateTable( 'logging', 'log_user_text', 'log_user', 'log_timestamp', $olduser, $newuser, $uid );
+		$this->updateTable( 'image', 'img_user_text', 'img_user', 'img_timestamp', $olduser, $newuser, $uid );
+		$this->updateTable( 'oldimage', 'oi_user_text', 'oi_user', 'oi_timestamp', $olduser, $newuser, $uid );
+		$this->updateTable( 'filearchive', 'fa_user_text','fa_user', 'fa_timestamp', $olduser, $newuser, $uid );
 	}
 
-	public function updateTable($table,$usernamefield,$useridfield,$timestampfield,$olduser,$newuser,$dbw) {
-		$doUid = 0;
+	/**
+	 * @param $table
+	 * @param $usernamefield
+	 * @param $useridfield
+	 * @param $timestampfield
+	 * @param $olduser User
+	 * @param $newuser User
+	 * @param $uid
+	 * @return int
+	 */
+	public function updateTable( $table, $usernamefield, $useridfield, $timestampfield, $olduser, $newuser, $uid ) {
+		$dbw = wfGetDB( DB_MASTER );
 
 		$contribs = $dbw->selectField( $table, 'count(*)',
-			array( $usernamefield => $olduser->getName(), $useridfield => $newuser->getId() ), __METHOD__ );
-		if ($contribs == 0) {
-			$contribs = $dbw->selectField( $table, 'count(*)',
-				array( $usernamefield => $olduser->getName(), $useridfield => 0 ), __METHOD__ );
-			if ($contribs > 0) {
-				print("Found $contribs edits to be re-attributed from table $table but the uid present is 0 (should be ".$newuser->getId().")\n");
-				print("If you proceed, the uid field will be set to that of the new user name (i.e. ".$newuser->getId().") in these rows.\n");
-				$doUid = 1;
-			}
-			else {
-				print("No edits to be re-attributed from table $table\n");
-				return(0);
-			}
+			array( $usernamefield => $olduser->getName(), $useridfield => $uid ), __METHOD__ );
+
+		if ( $contribs == 0 ) {
+			print "No edits to be re-attributed from table $table for uid $uid\n" ;
+			return(0);
 		}
-		else {
-			print("total number of edits to be re-attributed from table $table: $contribs\n");
+
+		print "Found $contribs edits to be re-attributed from table $table for uid $uid\n";
+		if ( $uid != $newuser->getId() ) {
+			print "If you proceed, the uid field will be set to that of the new user name (i.e. ".$newuser->getId().") in these rows.\n";
 		}
-		print("proceed? [N/y]  ");
+
+		print "Proceed? [N/y]  ";
 		$stdin = fopen ("php://stdin","rt");
 		$line = fgets($stdin);
 		fclose($stdin);
 		if ( $line[0] != "Y" && $line[0] != "y" ) {
-			print("skipping at user's request\n");
+			print "Skipping at user's request\n";
 			return(0);
 		}
-		$selectConds = array( $usernamefield => $olduser->getName() );
-		$updateFields = array( $usernamefield => $newuser->getName() );
-		$updateConds = array( $usernamefield => $olduser->getName() );
-
-		$extraConds = array( $useridfield => $newuser->getId() );
-		$extraCondsNoUid = array( $useridfield => 0 );
-		# uid in rows is set properly, use as cond to find rows, don't bother to update it
-		if (! $doUid) {
-			$selectConds = array_merge( $selectConds, $extraConds );
-			$updateConds = 	array_merge( $updateConds, $extraConds );
-		}
-		# uid in edit rows is 0, we will set it and we will only update rows with 0 uid and the old user name
-		else {
-			$selectConds = array_merge( $selectConds, $extraCondsNoUid );
-			$updateConds = 	array_merge( $updateConds, $extraCondsNoUid );
-			$updateFields = array_merge( $updateFields, $extraConds );
-		}
 
-		while ($contribs > 0) {
-			print("doing batch of up to approximately ".$this->mBatchSize."\n");
-			print("do this batch? [N/y]  ");
+		$selectConds = array( $usernamefield => $olduser->getName(), $useridfield => $uid );
+		$updateFields = array( $usernamefield => $newuser->getName(), $useridfield => $newuser->getId() );
+
+		while ( $contribs > 0 ) {
+			print "Doing batch of up to approximately ".$this->mBatchSize."\n";
+			print "Do this batch? [N/y]  ";
 			$stdin = fopen ("php://stdin","rt");
 			$line = fgets($stdin);
 			fclose($stdin);
 			if ( $line[0] != "Y" && $line[0] != "y" ) {
-				print("skipping at user's request\n");
+				print "Skipping at user's request\n";
 				return(0);
 			}
 			$dbw->begin();
 			$result = $dbw->select( $table, $timestampfield, $selectConds , __METHOD__,
 				array( 'ORDER BY' => $timestampfield.' DESC', 'LIMIT' => $this->mBatchSize ) );
 			if (! $result) {
-				print("There were rows for updating but now they are gone. Skipping.\n");
+				print "There were rows for updating but now they are gone. Skipping.\n";
 				$dbw->rollback();
 				return(0);
 			}
 			$result->seek($result->numRows() -1 );
 			$row = $result->fetchObject();
 			$timestamp = $row->$timestampfield;
-			$updateCondsWithTime = array_merge( $updateConds, array ("$timestampfield >= $timestamp") );
+			$updateCondsWithTime = array_merge( $selectConds, array ("$timestampfield >= $timestamp") );
 			$success = $dbw->update( $table, $updateFields, $updateCondsWithTime, __METHOD__ );
-			if ($success) {
+			if ( $success ) {
 				$rowsDone = $dbw->affectedRows();
 				$dbw->commit();
-			}
-			else {
-				print("problem with the update, rolling back and exiting\n");
+			} else {
+				print "Problem with the update, rolling back and exiting\n";
 				$dbw->rollback();
 				exit(1);
 			}
 			//$contribs = User::edits( $olduser->getId() );
 			$contribs = $dbw->selectField( $table, 'count(*)', $selectConds, __METHOD__ );
-			print("updated $rowsDone edits; $contribs edits remaining to be re-attributed\n");
+			print "Updated $rowsDone edits; $contribs edits remaining to be re-attributed\n";
 		}
 		return(0);
 	}
diff --git a/extensions/Vector/Vector.i18n.php b/extensions/Vector/Vector.i18n.php
index 409d065a..881433dd 100644
--- a/extensions/Vector/Vector.i18n.php
+++ b/extensions/Vector/Vector.i18n.php
@@ -14,7 +14,7 @@ $messages = array();
 $messages['en'] = array(
 	'vector' => 'UI improvements for Vector',
 	'vector-desc' => 'Improves on the user interface elements of the Vector skin.',
-	'vector-collapsiblenav-preference' => 'Enable collapsing of items in the navigation menu in Vector skin',
+	'vector-collapsiblenav-preference' => 'Enable collapsing of items in the sidebar in Vector skin',
 	'vector-collapsiblenav-more' => 'More languages',
 	'vector-editwarning-warning' => 'Leaving this page may cause you to lose any changes you have made.
 If you are logged in, you can disable this warning in the "Editing" section of your preferences.',
@@ -27,11 +27,13 @@ If you are logged in, you can disable this warning in the "Editing" section of y
 /** Message documentation (Message documentation)
  * @author Fryed-peach
  * @author Lloffiwr
+ * @author Nemo bis
  * @author Umherirrender
  */
 $messages['qqq'] = array(
 	'vector' => 'UI means User Interface. Vector is the name of an interface skin.',
 	'vector-desc' => '{{desc}}',
+	'vector-collapsiblenav-preference' => 'The message refers to the sidebar, whose sections are collapsible in Vector skin (some of them collapsed by default and some no); the preference disables collapsing entirely and is among "Advanced options" in the "Appearence" section.',
 	'vector-editwarning-warning' => "{{doc-important|Do ''not'' use <nowiki>{{int:prefs-editing}}</nowiki> for \"Editing\". It is forbidden in this message, see [[mwr:68405]].}}",
 	'vector-simplesearch-search' => 'Greyed out default text in the simple search box in the Vector skin. (It disappears and lets the user enter the requested search terms when the search box receives focus.)
 
@@ -43,6 +45,7 @@ $messages['qqq'] = array(
 /** Afrikaans (Afrikaans)
  * @author Adriaan
  * @author Naudefj
+ * @author පසිඳු කාවින්ද
  */
 $messages['af'] = array(
 	'vector' => 'Gebruikerskoppelvlak-verbeteringe vir Vektor',
@@ -54,6 +57,7 @@ Indien u aangemeld is, kan u hierdie waarskuwing in die {{int:prefs-editing}}"-a
 	'vector-editwarning-preference' => "Waarsku my as ek 'n gewysigde bladsy verlaat alvorens dit gestoor is",
 	'vector-simplesearch-search' => 'Soek',
 	'vector-simplesearch-containing' => 'bevat...',
+	'vector-noexperiments-preference' => 'Verban my uit funksie eksperimente',
 );
 
 /** Gheg Albanian (Gegë)
@@ -89,10 +93,12 @@ $messages['an'] = array(
 	'vector-editwarning-preference' => "Alvertir-me quan salga d'una pachina d'edición sin alzar os cambios",
 	'vector-simplesearch-search' => 'Mirar',
 	'vector-simplesearch-containing' => 'que contién...',
+	'vector-noexperiments-preference' => "Excluir-me d'as caracteristicas experimentals",
 );
 
 /** Arabic (العربية)
  * @author Aiman titi
+ * @author Alexknight12
  * @author Meno25
  * @author OsamaK
  */
@@ -106,7 +112,7 @@ $messages['ar'] = array(
 	'vector-editwarning-preference' => 'حذّرني عندما أغادر تحرير صفحة ذات تغييرات غير محفوظة',
 	'vector-simplesearch-search' => 'ابحث',
 	'vector-simplesearch-containing' => 'يحتوي...',
-	'vector-noexperiments-preference' => 'استبعادي من إستخدام الميزة',
+	'vector-noexperiments-preference' => 'استبعدني من تجارب الخاصية',
 );
 
 /** Aramaic (ܐܪܡܝܐ)
@@ -133,10 +139,28 @@ $messages['arz'] = array(
 	'vector-simplesearch-containing' => 'جوّاه...',
 );
 
+/** Asturian (Asturianu)
+ * @author Xuacu
+ */
+$messages['ast'] = array(
+	'vector' => "Meyores de la interfaz d'usuariu pa Vector",
+	'vector-desc' => "Meyora los elementos de la interfaz d'usuariu del aspeutu Vector.",
+	'vector-collapsiblenav-preference' => 'Activar anubrir elementos nel panel llateral del aspeutu Vector',
+	'vector-collapsiblenav-more' => 'Más llingües',
+	'vector-editwarning-warning' => 'Salir d\'esta páxina pue facer que se pierda cualesquier cambiu fechu.
+Si aniciasti sesión, puedes desactivar esti avisu na seición "Edición" de les tos preferencies.',
+	'vector-editwarning-preference' => "Avisame cuando salga d'una páxina d'edición con cambios ensin guardar",
+	'vector-simplesearch-search' => 'Guetar',
+	'vector-simplesearch-containing' => 'que contién...',
+	'vector-noexperiments-preference' => 'Escluíme de carauterístiques esperimentales',
+);
+
 /** Azerbaijani (Azərbaycanca)
  * @author PPerviz
+ * @author Vugar 1981
  */
 $messages['az'] = array(
+	'vector-collapsiblenav-more' => 'Çoxlu dillər',
 	'vector-simplesearch-search' => 'Axtar',
 );
 
@@ -224,7 +248,7 @@ $messages['bg'] = array(
 	'vector-noexperiments-preference' => 'Не желая да участвам в бъдещи експерименти',
 );
 
-/** Bahasa Banjar (Bahasa Banjar)
+/** Banjar (Bahasa Banjar)
  * @author Ezagren
  */
 $messages['bjn'] = array(
@@ -337,7 +361,7 @@ $messages['ckb'] = array(
 	'vector-simplesearch-containing' => 'بە لەبەرگرتنەوەی ...',
 );
 
-/** Crimean Turkish (Latin) (Qırımtatarca (Latin))
+/** Crimean Turkish (Latin script) (‪Qırımtatarca (Latin)‬)
  * @author Don Alessandro
  */
 $messages['crh-latn'] = array(
@@ -345,7 +369,7 @@ $messages['crh-latn'] = array(
 	'vector-simplesearch-containing' => 'içinde bu olğan...',
 );
 
-/** Crimean Turkish (Cyrillic) (Qırımtatarca (Cyrillic))
+/** Crimean Turkish (Cyrillic script) (‪Къырымтатарджа (Кирилл)‬)
  * @author Don Alessandro
  */
 $messages['crh-cyrl'] = array(
@@ -436,8 +460,8 @@ Denne advarsel kan slås fra under Redigering i dine indstillinger.',
  * @author ✓
  */
 $messages['de'] = array(
-	'vector' => 'Verbesserungen für die Vector-Benutzeroberfläche',
-	'vector-desc' => 'Stellt Verbesserungen für die Benutzeroberfläche „Vector“ zur Verfügung',
+	'vector' => 'Verbesserungen für die Benutzeroberfläche „Vector“',
+	'vector-desc' => 'Ermöglicht zusätzliche Verbesserungen der Benutzeroberfläche „Vector“',
 	'vector-collapsiblenav-preference' => 'Zusammenklappen von Elementen im Navigationsmenü der Benutzeroberfläche Vector aktivieren',
 	'vector-collapsiblenav-more' => 'Weitere Sprachen',
 	'vector-editwarning-warning' => 'Das Verlassen dieser Seite kann dazu führen, dass die Änderungen verloren gehen.
@@ -455,6 +479,7 @@ Wenn Sie angemeldet sind, können Sie das Anzeigen dieser Warnung im „Bearbeit
 );
 
 /** Zazaki (Zazaki)
+ * @author Erdemaslancan
  * @author Mirzali
  * @author Xoser
  */
@@ -466,7 +491,7 @@ $messages['diq'] = array(
 	'vector-editwarning-warning' => 'ihtimal o ke wexta şıma peli ra bıveci, vurnayiş o ke şıma kerdo, hewna şiyêro .
 eke şıma kewtê hesabê xo, no hişyari tercihanê xo ra şıma eşkeni "Ho vurnayeno" bıvındarnî .',
 	'vector-editwarning-preference' => 'wexta ke ez pelo nêqeydbiyaye ra veciyaya mı hişyar bıker',
-	'vector-simplesearch-search' => 'Cıgeyre',
+	'vector-simplesearch-search' => 'Cı geyre',
 	'vector-simplesearch-containing' => 'tedeestey...',
 );
 
@@ -482,6 +507,7 @@ $messages['dsb'] = array(
 	'vector-editwarning-preference' => 'Warnowaś, gaž bok spušća se z njeskłaźonymi změnami',
 	'vector-simplesearch-search' => 'Pytaś',
 	'vector-simplesearch-containing' => 'wopśimujo...',
+	'vector-noexperiments-preference' => 'Mě z funkciskich eksperimentow wuzamknuś',
 );
 
 /** Greek (Ελληνικά)
@@ -515,7 +541,7 @@ $messages['eo'] = array(
 	'vector-collapsiblenav-more' => 'Pli lingvoj',
 	'vector-editwarning-warning' => 'Forlasante ĉi tiun paĝon kaŭzos al vi perdi iun ajn ŝanĝojn kiujn vi faris.
 Se vi ensalutas, vi povas malŝalti ĉi tiun averton en la sekcio "Grandeco de redakta tekstujo" de viaj preferoj.',
-	'vector-editwarning-preference' => 'Avertu min kiam mi forlasas redaktan paĝon kun nekonservitaj ŝanĝoj',
+	'vector-editwarning-preference' => 'Averti min kiam mi forlasas redaktan paĝon kun nekonservitaj ŝanĝoj',
 	'vector-simplesearch-search' => 'Serĉi',
 	'vector-simplesearch-containing' => 'enhavas...',
 	'vector-noexperiments-preference' => 'Ekskluzivu min de estontecaj testoj',
@@ -531,12 +557,12 @@ Se vi ensalutas, vi povas malŝalti ĉi tiun averton en la sekcio "Grandeco de r
 $messages['es'] = array(
 	'vector' => 'Mejoras de interfaz de usuario para Vector',
 	'vector-desc' => 'Mejora los elementos de la interfaz de usuario del skin Vector.',
-	'vector-collapsiblenav-preference' => 'Activar el menú de navegación izquierda plegable en la piel Vector',
+	'vector-collapsiblenav-preference' => 'Activar menús plegables en la barra lateral de la piel Vector',
 	'vector-collapsiblenav-more' => 'Más idiomas',
-	'vector-editwarning-warning' => 'Dejar esta página le causará la pérdida de cualquier cambio que haya hecho.
-Si está "logueado", puede deshabilitar esta advertencia en la sección "Edición" de sus preferencias.',
+	'vector-editwarning-warning' => 'El dejar esta página causará la pérdida de cualquier cambio que hayas realizado.
+Si has iniciado sesión, puedes desactivar este aviso en la sección «Edición» en tus preferencias.',
 	'vector-editwarning-preference' => 'Advertirme cuando abandone una página editada con cambios sin grabar',
-	'vector-simplesearch-search' => 'Búsqueda',
+	'vector-simplesearch-search' => 'Buscar',
 	'vector-simplesearch-containing' => 'conteniendo...',
 	'vector-noexperiments-preference' => 'Excluirme de características experimentales',
 );
@@ -582,7 +608,7 @@ $messages['fa'] = array(
 	'vector-collapsiblenav-more' => 'زبان‌های بیشتر',
 	'vector-editwarning-warning' => 'خروج از این صفحه ممکن است باعث از دست رفتن هرچه نوشته‌اید شود.
 اگر شما با نام کاربری وارد شده‌اید می‌توانید این هشدار را در بخش «در حال ویرایش» ترجیحاتتان بیابید.',
-	'vector-editwarning-preference' => 'زمان خروج از صفحهٔ ویرایش در صورت داشتن ویرایش‌های‌ ذخیره‌نشده به من هشدار بده',
+	'vector-editwarning-preference' => 'زمان خروج از صفحهٔ ویرایش در صورت داشتن ویرایش‌های‌ ذخیره‌نشده به من هشدار داده شود',
 	'vector-simplesearch-search' => 'جستجو',
 	'vector-simplesearch-containing' => 'صفحه‌های دربردارنده...',
 	'vector-noexperiments-preference' => 'من را از ویژگی‌های آزمایشی مستثنی کن',
@@ -591,6 +617,7 @@ $messages['fa'] = array(
 /** Finnish (Suomi)
  * @author Crt
  * @author Nike
+ * @author Olli
  * @author Str4nd
  */
 $messages['fi'] = array(
@@ -603,6 +630,14 @@ Jos olet kirjautuneena sisään, voit poistaa tämän varoituksen käytöstä as
 	'vector-editwarning-preference' => 'Varoita minua, kun poistun muokkaussivulta tallentamatta muutoksia',
 	'vector-simplesearch-search' => 'Etsi',
 	'vector-simplesearch-containing' => 'sisältää...',
+	'vector-noexperiments-preference' => 'Älä ota minua mukaan ominaisuuskokeiluihin',
+);
+
+/** Faroese (Føroyskt)
+ * @author Diupwijk
+ */
+$messages['fo'] = array(
+	'vector-simplesearch-search' => 'Leita',
 );
 
 /** French (Français)
@@ -630,7 +665,7 @@ Si vous êtes connecté avec votre compte, vous pouvez retirer cet avertissement
  */
 $messages['frp'] = array(
 	'vector' => 'Mèlyoracions EU por « Vèctor »',
-	'vector-desc' => 'Mèlyoracions des èlèments de l’entèrface utilisator de l’habelyâjo « Vèctor ».',
+	'vector-desc' => 'Mèlyoracions des èlèments de l’entèrface usanciér de l’habelyâjo « Vèctor ».',
 	'vector-collapsiblenav-preference' => 'Activar lo menu de navigacion repleyâblo avouéc l’habelyâjo « Vèctor »',
 	'vector-collapsiblenav-more' => 'Més de lengoues',
 	'vector-editwarning-warning' => 'Quitar ceta pâge vos farat pèrdre tôs los changements que vos éd fêts.
@@ -638,6 +673,7 @@ Se vos éte branchiê, vos pouede enlevar ceti avèrtissement dens la sèccion �
 	'vector-editwarning-preference' => 'M’avèrtir quand quito una pâge de changement sen sôvar los changements',
 	'vector-simplesearch-search' => 'Rechèrchiér',
 	'vector-simplesearch-containing' => 'que contint...',
+	'vector-noexperiments-preference' => 'M’èxcllure des èxpèriences de novèles fonccionalitâts',
 );
 
 /** Friulian (Furlan)
@@ -650,6 +686,11 @@ $messages['fur'] = array(
 	'vector-simplesearch-containing' => 'che al à dentri...',
 );
 
+/** Simplified Gan script (‪赣语(简体)‬) */
+$messages['gan-hans'] = array(
+	'vector-simplesearch-search' => '寻吖',
+);
+
 /** Traditional Gan script (‪贛語(繁體)‬)
  * @author Symane
  */
@@ -677,8 +718,8 @@ Ma tha thu air logadh a-steach, \'s urrainn dhut an rabhadh seo a chur dheth san
  */
 $messages['gl'] = array(
 	'vector' => 'Melloras na interface de usuario para a aparencia Vector',
-	'vector-desc' => 'Mellora os elementos da interface de usuario da aparencia Vector.',
-	'vector-collapsiblenav-preference' => 'Activar o menú de navegación despregable á esquerda na aparencia vector',
+	'vector-desc' => 'Mellora os elementos da interface de usuario da aparencia Vector',
+	'vector-collapsiblenav-preference' => 'Activar o menú de navegación despregable á esquerda na aparencia Vector',
 	'vector-collapsiblenav-more' => 'Máis linguas',
 	'vector-editwarning-warning' => 'Deixar esta páxina pode causar a perda de calquera cambio feito.
 Se accedeu ao sistema, pode desactivar esta mensaxe de advertencia na sección "Edición" das súas preferencias.',
@@ -710,6 +751,17 @@ Wänn Du aagmäldet bisch, chasch s Anzeige vu däre Warnig im „Tekscht-Ygab�
 	'vector-noexperiments-preference' => 'Mi uusschließe vu dr Dailnahm Feature-Experimänt',
 );
 
+/** Gujarati (ગુજરાતી)
+ * @author KartikMistry
+ * @author Sushant savla
+ */
+$messages['gu'] = array(
+	'vector-collapsiblenav-more' => 'વધુ ભાષાઓ',
+	'vector-simplesearch-search' => 'શોધો',
+	'vector-simplesearch-containing' => 'ધરાવતી...',
+	'vector-noexperiments-preference' => 'મને પ્રયોગોમાંથી બકાત રાખો',
+);
+
 /** Manx (Gaelg)
  * @author Shimmin Beg
  */
@@ -741,6 +793,16 @@ $messages['he'] = array(
 	'vector-noexperiments-preference' => 'אל תכללו אותי בניסויים בעתיד',
 );
 
+/** Hindi (हिन्दी)
+ * @author Ansumang
+ */
+$messages['hi'] = array(
+	'vector' => 'यूआई उन्नति वेक्टर स्किन के लिए',
+	'vector-collapsiblenav-more' => 'और अधिक भाषाएं',
+	'vector-simplesearch-search' => 'खोज',
+	'vector-noexperiments-preference' => 'मुझे सुविधा प्रयोगों से बाहर निकालें',
+);
+
 /** Croatian (Hrvatski)
  * @author Anton008
  * @author Excaliboor
@@ -767,7 +829,7 @@ $messages['hsb'] = array(
 	'vector-desc' => 'Polěpša elementy wužiwarskeho powjercha šata Vector',
 	'vector-collapsiblenav-preference' => 'Pokazowanje zapiskow w nawigaciskim meniju w šaće Vector zmóžnić',
 	'vector-collapsiblenav-more' => 'Dalše rěče',
-	'vector-editwarning-warning' => 'Hdyž so strona wopušća, móžeja so změny zhubić, kotrež sy přewjedł. Jeli sy přizjewjeny, móžeš tute warnowanje we wotrězku Wobdźěłowanje swojich nastajenjow znjemóžnić.',
+	'vector-editwarning-warning' => 'Hdyž so strona wopušća, móžeja so změny zhubić, kotrež sy přewjedł. Jeli sy přizjewjeny, móžeš tute warnowanje we wotrězku "Wobdźěłowanje" swojich nastajenjow znjemóžnić.',
 	'vector-editwarning-preference' => 'Warnować, hdyž so wobdźěłowanska strona z njeskładowanymi změnami wopušća',
 	'vector-simplesearch-search' => 'Pytać',
 	'vector-simplesearch-containing' => 'wobsahuje...',
@@ -841,7 +903,23 @@ Jika Anda telah masuk log, Anda dapat mematikan peringatan ini lewat "Penyunting
  * @author Ukabia
  */
 $messages['ig'] = array(
-	'vector-simplesearch-search' => 'Chöwá',
+	'vector-simplesearch-search' => 'Chọwa',
+);
+
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'vector' => 'Napasayat nga UI iti Vector',
+	'vector-desc' => 'Napasaayat kadagiti "interface elements" ti agar-aramat no agusar iti kudil a Vector.',
+	'vector-collapsiblenav-preference' => 'Pakabaelan na ti pagpabassit kadagita adda dita  "sidebar" ti Vector a kudil',
+	'vector-collapsiblenav-more' => 'Adu pay a pagsasao',
+	'vector-editwarning-warning' => 'No pumanaw ka ditoy a panid baka agpukaw dagiti binalbaliwam.
+No nakastrekka, mabalin mo nga ikkaten daytoy a ballaag idiay "Panagurnos" a paset kadagiti kaykayatmo.',
+	'vector-editwarning-preference' => 'Pakaunaannak no pumanawak iti inurnos a panid a saan a naidulin dagiti sinukatan',
+	'vector-simplesearch-search' => 'Biruken',
+	'vector-simplesearch-containing' => 'naglaon ti...',
+	'vector-noexperiments-preference' => 'Saannak nga iraman kadagiti eksperimentoa langa',
 );
 
 /** Ido (Ido)
@@ -855,16 +933,25 @@ $messages['io'] = array(
 
 /** Icelandic (Íslenska)
  * @author Krun
+ * @author Snævar
  * @author Ævar Arnfjörð Bjarmason
  */
 $messages['is'] = array(
+	'vector' => 'Viðmóts lagfæringar á Vector-sniði',
+	'vector-desc' => 'Endurbætir notanda viðmót Vector sniðsins.',
+	'vector-collapsiblenav-preference' => 'Fella saman hluti í hliðarstiku Vector sniðsins',
 	'vector-collapsiblenav-more' => 'Fleiri tungumál',
+	'vector-editwarning-warning' => 'Ef farið er frá þessari síðu gætu þær breytingar sem þú hefur gert tapast.
+Ef þú ert skráður inn, þá getur þú óvirkjað þessi skilaboð í „Breytingarflipanum" undir stillingum.',
+	'vector-editwarning-preference' => 'Vara mig við þegar ég fer frá breytingarsíðu með óvistaðar breytingar',
 	'vector-simplesearch-search' => 'Leita',
 	'vector-simplesearch-containing' => 'sem innihalda ...',
+	'vector-noexperiments-preference' => 'Útiloka mig frá tilraunum framvegis.',
 );
 
 /** Italian (Italiano)
  * @author Beta16
+ * @author F. Cosoleto
  * @author Una giornata uggiosa '94
  */
 $messages['it'] = array(
@@ -874,7 +961,7 @@ $messages['it'] = array(
 	'vector-collapsiblenav-more' => 'Più lingue',
 	'vector-editwarning-warning' => 'Lasciare questa pagina potrebbe costarti la perdita di tutti i cambiamenti effettuati.
 Se sei loggato, puoi disattivare questo avviso nella sezione "Casella di modifica" delle tue preferenze.',
-	'vector-editwarning-preference' => 'Avvisa quando lascio una pagina di modifica con modifiche non salvate',
+	'vector-editwarning-preference' => 'Avvisa quando si lascia una pagina di modifica con modifiche non salvate',
 	'vector-simplesearch-search' => 'Ricerca',
 	'vector-simplesearch-containing' => 'contenente...',
 	'vector-noexperiments-preference' => 'Escludimi dalle funzionalità sperimentali',
@@ -904,6 +991,7 @@ $messages['jv'] = array(
 
 /** Georgian (ქართული)
  * @author BRUTE
+ * @author ITshnik
  * @author გიორგიმელა
  */
 $messages['ka'] = array(
@@ -915,6 +1003,26 @@ $messages['ka'] = array(
 	'vector-editwarning-preference' => 'გამაფრთხილე, როდესაც დავტოვებ რედაქტირებად გვერდს, დაუმახსოვრებელი ცვლილებებით',
 	'vector-simplesearch-search' => 'ძიება',
 	'vector-simplesearch-containing' => 'შეიცავს...',
+	'vector-noexperiments-preference' => 'გამომრიცხე შემდგომი ექსპერიმენტებისგან.',
+);
+
+/** Kazakh (Қазақша)
+ * @author Kaztrans
+ */
+$messages['kk'] = array(
+	'vector-editwarning-warning' => 'Басқа бетке өтсеңіз сіздің жазған соңғы өңдемелеріңіз жойылуы мүмкін. 
+Егер сiз жүйеде тiркелсеңiз, онда сiз баптауларыңыздағы «Өңдеу» бөлігіне кіріп, бұл ескертуді өшіре аласыз.',
+);
+
+/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬)
+ * @author GaiJin
+ * @author Kaztrans
+ */
+$messages['kk-cyrl'] = array(
+	'vector-editwarning-warning' => 'Басқа бетке өтсеңіз сіздің жазған соңғы өңдемелеріңіз жойылуы мүмкін. 
+Егер сiз жүйеде тiркелсеңiз, онда сiз баптауларыңыздағы «Өңдеу» бөлігіне кіріп, бұл ескертуді өшіре аласыз.',
+	'vector-simplesearch-search' => 'Іздеу',
+	'vector-noexperiments-preference' => 'Параметр эксперименттеріне қатыстырма',
 );
 
 /** Kalaallisut (Kalaallisut)
@@ -934,6 +1042,7 @@ $messages['km'] = array(
 	'vector-editwarning-preference' => 'សូមព្រមានខ្ញុំ ពេលដែលខ្ញុំចាកចេញពីទំព័រកែប្រែដោយមិនបានរក្សាទុកបំលាស់ប្ដូរនានា',
 	'vector-simplesearch-search' => 'ស្វែងរក',
 	'vector-simplesearch-containing' => 'ដែលមានពាក្យ...',
+	'vector-noexperiments-preference' => 'ដកខ្ញុំចេញពីការពិសោធន៍មុខងារថ្មីៗ',
 );
 
 /** Korean (한국어)
@@ -985,7 +1094,7 @@ Do kanns heh di Warnung affschallde, wann de aanjemelldt un enjelogg bes, dann k
 	'vector-noexperiments-preference' => 'Donn mesch nit met neue Saache zom Ußprobeere behällijje',
 );
 
-/** Kurdish (Latin) (Kurdî (Latin))
+/** Kurdish (Latin script) (‪Kurdî (latînî)‬)
  * @author Erdal Ronahi
  */
 $messages['ku-latn'] = array(
@@ -1049,6 +1158,7 @@ Es se bös aangemeld, kins se dees waorsjoewing oetzètten in 't bewerkingstabbl
 	'vector-editwarning-preference' => "Waorssjoew mich es ich 'n bewerkdje pagina die nag neet is opgeslage wil verlaote",
 	'vector-simplesearch-search' => 'Zeuke',
 	'vector-simplesearch-containing' => 'bevat...',
+	'vector-noexperiments-preference' => "Laot mich in 't vervolg neet mier mitdoon aan experimente",
 );
 
 /** Lithuanian (Lietuvių)
@@ -1094,6 +1204,7 @@ $messages['min'] = array(
 
 /** Macedonian (Македонски)
  * @author Bjankuloski06
+ * @author Brest
  */
 $messages['mk'] = array(
 	'vector' => 'Подобрувања на посредникот за изгледот „Векторски“',
@@ -1105,7 +1216,7 @@ $messages['mk'] = array(
 	'vector-editwarning-preference' => 'Предупреди ме кога сакам да напуштам страница за уредување без да ги имам зачувано промените',
 	'vector-simplesearch-search' => 'Пребарување',
 	'vector-simplesearch-containing' => 'содржи...',
-	'vector-noexperiments-preference' => 'Изземиме од експерименти so функции',
+	'vector-noexperiments-preference' => 'Изземи ме од експерименти сo функции',
 );
 
 /** Malayalam (മലയാളം)
@@ -1121,7 +1232,7 @@ $messages['ml'] = array(
 താങ്കൾ ലോഗിൻ ചെയ്തിട്ടുണ്ടെങ്കിൽ, താങ്കളുടെ ക്രമീകരണങ്ങളിൽ "തിരുത്തൽ" എന്ന ഭാഗത്ത് ചെന്ന് ഈ അറിയിപ്പ് പ്രദർശിപ്പിക്കുന്നത് ഒഴിവാക്കാവുന്നതാണ്.',
 	'vector-editwarning-preference' => 'സേവ് ചെയ്യാത്ത മാറ്റങ്ങളോടു കൂടിയ തിരുത്തൽ താളിൽ നിന്നും പോകുമ്പോൾ എന്നെ അറിയിക്കുക',
 	'vector-simplesearch-search' => 'തിരയുക',
-	'vector-simplesearch-containing' => 'ഉൾപ്പെടുത്തുന്നു...',
+	'vector-simplesearch-containing' => 'ഉൾപ്പെടുന്നവ...',
 	'vector-noexperiments-preference' => 'സവിശേഷഗുണങ്ങൾ പരീക്ഷിക്കുന്നതിൽ നിന്നും എന്നെ ഒഴിവാക്കുക',
 );
 
@@ -1144,6 +1255,7 @@ $messages['mr'] = array(
 	'vector-editwarning-preference' => 'जर मी संपादित करीत असलेल्या पानावरील माझे संपादिलेले बदल जतन न केल्यास मला इशारा द्या',
 	'vector-simplesearch-search' => 'शोधा',
 	'vector-simplesearch-containing' => '.......हे असलेले',
+	'vector-noexperiments-preference' => 'प्रायोगिक वैशिष्ट्यापासून मला दूर ठेवा',
 );
 
 /** Malay (Bahasa Melayu)
@@ -1187,16 +1299,34 @@ $messages['nah'] = array(
 	'vector-simplesearch-search' => 'Tlatēmoliztli',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Jon Harald Søby
+ * @author Laaknor
+ * @author Nghtwlkr
+ */
+$messages['nb'] = array(
+	'vector' => 'Brukergrensesnittsforbedringer for Vector',
+	'vector-desc' => 'Forbedrer elementer i brukergrensesnittet for Vector-utseendet.',
+	'vector-collapsiblenav-preference' => 'Aktiver sammenlegging av element i navigeringsmenyen i drakten Vector',
+	'vector-collapsiblenav-more' => 'Flere språk',
+	'vector-editwarning-warning' => 'Ved å forlate siden vil du miste alle endringer du har utført.
+Denne advarselen kan slås av under Redigering i instillingene dine.',
+	'vector-editwarning-preference' => 'Si ifra dersom jeg forlater en side jeg har gjort redigeringer på men ikke har lagret siden.',
+	'vector-simplesearch-search' => 'Søk',
+	'vector-simplesearch-containing' => 'inneholder …',
+	'vector-noexperiments-preference' => 'Eksluder meg fra funksjonseksperimenter',
+);
+
 /** Nedersaksisch (Nedersaksisch)
  * @author Servien
  */
 $messages['nds-nl'] = array(
-	'vector-collapsiblenav-preference' => "Inklapbaor navigasiemenu inschakelen bie 't gebruuk van Vector",
+	'vector-collapsiblenav-preference' => 'Inklapbaor navigasiemenu inschakelen bie t gebruuk van Vector',
 	'vector-collapsiblenav-more' => 'Meer talen',
-	'vector-editwarning-warning' => 'A-j disse pagina ofsluten dan kan \'t ween dat der wieziging dee-j emaak hemmen kwiet raken.
-A-j an-emeld bin, dan ku-j disse waorschuwing uutzetten in \'t tabblad "Bewarken" in joew veurkeuren.',
-	'vector-editwarning-preference' => 'Waorschuw mien a-k een bewörken pagina of wil sluten dee-j nog neet op-esleugen is',
-	'vector-simplesearch-search' => 'Zeuken',
+	'vector-editwarning-warning' => "A'j disse pagina aofsluten dan kan t ween dat der wieziging die'j emaakt hebben kwiet raken.
+A'j an-emeld bin, dan ku'j disse waorschuwing uutzetten in t tabblad \"Bewarken\" in joew veurkeuren.",
+	'vector-editwarning-preference' => "Waorschuw mien a'k n bewörken pagina of wil sluten die'j nog niet op-esleugen is",
+	'vector-simplesearch-search' => 'Zeuken / zuken / zuiken',
 	'vector-simplesearch-containing' => 'bevat...',
 );
 
@@ -1228,24 +1358,6 @@ Denne åtvaringa kan slåast av under Endring i instillingane dine.',
 	'vector-simplesearch-containing' => 'inneheld ...',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Jon Harald Søby
- * @author Laaknor
- * @author Nghtwlkr
- */
-$messages['no'] = array(
-	'vector' => 'Brukergrensesnittsforbedringer for Vector',
-	'vector-desc' => 'Forbedrer elementer i brukergrensesnittet for Vector-utseendet.',
-	'vector-collapsiblenav-preference' => 'Aktiver sammenlegging av element i navigeringsmenyen i drakten Vector',
-	'vector-collapsiblenav-more' => 'Flere språk',
-	'vector-editwarning-warning' => 'Ved å forlate siden vil du miste alle endringer du har utført.
-Denne advarselen kan slås av under Redigering i instillingene dine.',
-	'vector-editwarning-preference' => 'Si ifra dersom jeg forlater en side jeg har gjort redigeringer på men ikke har lagret siden.',
-	'vector-simplesearch-search' => 'Søk',
-	'vector-simplesearch-containing' => 'inneholder …',
-	'vector-noexperiments-preference' => 'Eksluder meg fra funksjonseksperimenter',
-);
-
 /** Occitan (Occitan)
  * @author Cedric31
  */
@@ -1260,6 +1372,23 @@ Se sètz connectat amb vòstre compte, podètz levar aqueste avertiment dins la
 	'vector-simplesearch-containing' => 'que conten...',
 );
 
+/** Oriya (ଓଡ଼ିଆ)
+ * @author Odisha1
+ * @author Psubhashish
+ */
+$messages['or'] = array(
+	'vector' => 'ଭେକ୍ଟର ପାଇଁ ଇଉଜର ଇଣ୍ଟରଫେସ ଉନ୍ନତିକରଣ',
+	'vector-desc' => 'ଭେକ୍ଟର ଆବରଣରେ ଇଉଜର ଇଣ୍ଟରଫେସ ଉପାଦାନସମୂହକୁ ଉନ୍ନତ କରିବେ ।',
+	'vector-collapsiblenav-preference' => 'ଭେକ୍ଟର ବହିରାବରଣରେ କଡ଼ରେ ଥିବା ପଟିକାର ଚିଜ ସବୁକୁ ଦେଖାଇବା-ଲୁଚାଇବା ସଚଳ କରିବେ',
+	'vector-collapsiblenav-more' => 'ଅଧିକ ଭାଷା',
+	'vector-editwarning-warning' => 'ଏହି ପୃଷ୍ଠାକୁ ଛାଡ଼ି ଚାଲିଗଲେ ହୁଏ ତ ଆପଣ କରିଥିବା କିଛି ସମ୍ପାଦନା ହରାଇ ପାରନ୍ତି ।
+ଯଦି ଆପଣ ଲଗ ଇନ କରିଥାନ୍ତି ତେବେ ଆପଣଙ୍କ ପସନ୍ଦର "ସମ୍ପାଦନା" ଭାଗରେ ଏହି ଚେତାବନୀଟିକୁ ଅଚଳ କରିପାରିବେ ।',
+	'vector-editwarning-preference' => 'ଯେତେବେଳେ ମୁଁ ଗୋଟିଏ ସାଇତାଯାଇନଥିବା ପୃଷ୍ଠାକୁ ବନ୍ଦ କରିଦିଏ ମୋତେ ଚେତାବନୀ ଦେବେ',
+	'vector-simplesearch-search' => 'ଖୋଜିବା',
+	'vector-simplesearch-containing' => 'ଧାରଣ ହେଉଛି...',
+	'vector-noexperiments-preference' => 'ସୁବିଧାର ପରଖରୁ ମୋତେ ବାହାର କରିବେ',
+);
+
 /** Deitsch (Deitsch)
  * @author Xqt
  */
@@ -1301,6 +1430,22 @@ S'it ses logà, it peule disabilité st'avis-sì ant la session \"Quàder ëd mo
 	'vector-noexperiments-preference' => "Gav-me da j'esperiment ëd le funsion",
 );
 
+/** Western Punjabi (پنجابی)
+ * @author Khalid Mahmood
+ */
+$messages['pnb'] = array(
+	'vector' => 'یو آئی بہتریاں ویکٹر لئی',
+	'vector-desc' => 'ورتن والے دے وکھالے',
+	'vector-collapsiblenav-preference' => 'ویکٹر سکن چ سائیڈ بار چ چیزاں دا ڈگنا ہون دیو۔',
+	'vector-collapsiblenav-more' => 'ہور بولیاں',
+	'vector-editwarning-warning' => 'اے صفے توں جان تے ہو سکدا اوہ ساریاں تبدیلیاں مک جان جیہڑیاں تساں بناياں نیں۔
+اگر تسیں لاکان او، تسیں ایڈیٹنگ سیکشن چ  اپنی پسنداں چ ایس خبرداری نوں پعلے ناں۔',
+	'vector-editwarning-preference' => 'جدوں میں کوئی صفحہ تبدیلی کر کے بچاۓ بغیر چھڈن لگاں تے منوں دس دیو',
+	'vector-simplesearch-search' => 'کھوج',
+	'vector-simplesearch-containing' => 'بند کر ریا اے۔۔۔',
+	'vector-noexperiments-preference' => 'منوں نویاں شیواں دے تجربیاں توں بار رکھو',
+);
+
 /** Pontic (Ποντιακά) */
 $messages['pnt'] = array(
 	'vector-simplesearch-search' => 'Αράεμαν',
@@ -1401,6 +1546,8 @@ Ce tu è trasute, tu puè disabbilità st\'avvertimende jndr\'à sezione "Cangia
 
 /** Russian (Русский)
  * @author G0rn
+ * @author KPu3uC B Poccuu
+ * @author Kaganer
  * @author MaxSem
  * @author Александр Сигачёв
  */
@@ -1430,9 +1577,17 @@ $messages['rue'] = array(
 	'vector-editwarning-preference' => 'Упозорнити ня, кідь буду опущати сторінку без уложіня змін',
 	'vector-simplesearch-search' => 'Глядати',
 	'vector-simplesearch-containing' => 'обсягуючій...',
+	'vector-noexperiments-preference' => 'Не брати участь на експеріментах з новыма функціями',
 );
 
-/** Yakut (Саха тыла)
+/** Sanskrit (संस्कृतम्)
+ * @author Ansumang
+ */
+$messages['sa'] = array(
+	'vector-simplesearch-search' => 'अन्वेषणम्',
+);
+
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -1464,6 +1619,7 @@ $messages['scn'] = array(
  * @author Budhajeewa
  * @author Calcey
  * @author තඹරු විජේසේකර
+ * @author පසිඳු කාවින්ද
  * @author බිඟුවා
  */
 $messages['si'] = array(
@@ -1476,6 +1632,7 @@ $messages['si'] = array(
 	'vector-editwarning-preference' => 'මා සංස්කරණ පිටුවක් සුරකිනු නොලැබූ වෙනස්කිරීම් සමඟ අතහැර යන විට අවවාද කරන්න',
 	'vector-simplesearch-search' => 'ගවේශණය කරන්න',
 	'vector-simplesearch-containing' => 'ඇතුළත් වෙමින් පවතී...',
+	'vector-noexperiments-preference' => 'ඉදිරි අත්හදා බැලීම් වලින් මාව බැහැර කරන්න',
 );
 
 /** Slovak (Slovenčina)
@@ -1533,7 +1690,7 @@ Nëse keni hyrë brenda, ju mund ta hiqni këtë paralajmërim në seksionin "Re
 	'vector-simplesearch-containing' => 'përmban ...',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Helios13
  * @author Rancher
  * @author Жељко Тодоровић
@@ -1542,19 +1699,25 @@ $messages['sr-ec'] = array(
 	'vector' => 'Побољшања корисничког интерфејса за вектор',
 	'vector-desc' => 'Побољшава корисничке елементе сучеља за пресвлаку Вектор.',
 	'vector-collapsiblenav-preference' => 'Скупљање ставки навигационог менија у Vector пресвлаци',
-	'vector-collapsiblenav-more' => 'Још језика:',
+	'vector-collapsiblenav-more' => 'Више језика:',
 	'vector-editwarning-warning' => 'Ако напустите ову страницу, изгубићете све измене које сте направили.
 Ако сте пријављени, можете онемогућити ово упозорење у својим подешавањима, у одељку „Уређивање“.',
 	'vector-editwarning-preference' => 'Упозори ме када напустим страницу која није сачувана',
 	'vector-simplesearch-search' => 'Претрага',
 	'vector-simplesearch-containing' => 'садржи...',
+	'vector-noexperiments-preference' => 'Изузми ме из пробних могућности',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Liangent
  */
 $messages['sr-el'] = array(
+	'vector' => 'Poboljšanja korisničkog interfejsa za vektor',
+	'vector-desc' => 'Poboljšava korisničke elemente sučelja za presvlaku Vektor.',
+	'vector-collapsiblenav-preference' => 'Skupljanje stavki navigacionog menija u Vector presvlaci',
 	'vector-collapsiblenav-more' => 'Još jezika:',
+	'vector-editwarning-warning' => 'Ako napustite ovu stranicu, izgubićete sve izmene koje ste napravili.
+Ako ste prijavljeni, možete onemogućiti ovo upozorenje u svojim podešavanjima, u odeljku „Uređivanje“.',
 	'vector-editwarning-preference' => 'Upozori me kada napustim stranicu sa nesačuvanim promenama',
 	'vector-simplesearch-search' => 'Pretraga',
 	'vector-simplesearch-containing' => 'sadrži...',
@@ -1685,7 +1848,7 @@ Eğer giriş yaptıysanız, bu uyarıyı, tercihlerinizin "Sayfa yazma alanı" b
 	'vector-simplesearch-containing' => 'içeren...',
 );
 
-/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic))
+/** Tatar (Cyrillic script) (Татарча)
  * @author Ильнар
  */
 $messages['tt-cyrl'] = array(
@@ -1697,6 +1860,7 @@ $messages['tt-cyrl'] = array(
 	'vector-editwarning-preference' => 'Битне сакламыйча китү вакытында мине кисәтергә',
 	'vector-simplesearch-search' => 'Эзләү',
 	'vector-simplesearch-containing' => 'эчтәлек...',
+	'vector-noexperiments-preference' => 'Тикшерүдәге мөмкинлекләрне кулланмаска',
 );
 
 /** Ukrainian (Українська)
@@ -1825,8 +1989,7 @@ $messages['zh-hans'] = array(
 	'vector-desc' => '改进Vector皮肤中的用户界面元素。',
 	'vector-collapsiblenav-preference' => '在Vector皮肤的导航菜单中折叠项目',
 	'vector-collapsiblenav-more' => '更多语言',
-	'vector-editwarning-warning' => '离开这个页面可能会令您失去之前的所有更改。
-若您已经登入，您可在您参数设置的“{{int:prefs-editing}}”节中关闭此警告。',
+	'vector-editwarning-warning' => '离开这个页面可能会令您失去之前的所有更改。若您已经登入，您可在您参数设置的“编辑”一栏中关闭此警告。',
 	'vector-editwarning-preference' => '如在更改未保存时离开页面，则发出警告',
 	'vector-simplesearch-search' => '搜索',
 	'vector-simplesearch-containing' => '含有...',
@@ -1834,6 +1997,7 @@ $messages['zh-hans'] = array(
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
+ * @author Bencmq
  * @author Gaoxuewei
  * @author Liangent
  * @author Mark85296341
@@ -1844,8 +2008,7 @@ $messages['zh-hant'] = array(
 	'vector-desc' => '改進 Vector 外觀中的使用者介面元素。',
 	'vector-collapsiblenav-preference' => '在 Vector 外觀的導覽選單中摺疊項目',
 	'vector-collapsiblenav-more' => '更多語言',
-	'vector-editwarning-warning' => '離開這個頁面可能會令您失去之前的所有更改。
-若您已經登入，您可在您偏好設定的「編輯」節中關閉此警告。',
+	'vector-editwarning-warning' => '離開這個頁面可能會令您失去之前的所有更改。若您已經登入，您可在您偏好設定的「編輯」節中關閉此警告。',
 	'vector-editwarning-preference' => '當我在更改未儲存時離開頁面時警告我',
 	'vector-simplesearch-search' => '搜尋',
 	'vector-simplesearch-containing' => '包含...',
diff --git a/extensions/Vector/Vector.php b/extensions/Vector/Vector.php
index 1d7eefdf..f47e2e93 100644
--- a/extensions/Vector/Vector.php
+++ b/extensions/Vector/Vector.php
@@ -52,7 +52,7 @@ $wgExtensionCredits['other'][] = array(
 	'name' => 'Vector',
 	'author' => array( 'Trevor Parscal', 'Roan Kattouw', 'Nimish Gautam', 'Adam Miller' ),
 	'version' => '0.3.0',
-	'url' => 'http://www.mediawiki.org/wiki/Extension:Vector',
+	'url' => 'https://www.mediawiki.org/wiki/Extension:Vector',
 	'descriptionmsg' => 'vector-desc',
 );
 $wgAutoloadClasses['VectorHooks'] = dirname( __FILE__ ) . '/Vector.hooks.php';
@@ -125,6 +125,7 @@ $wgResourceModules += array(
 			'jquery.suggestions',
 			'jquery.autoEllipsis',
 			'jquery.placeholder',
+			'mediawiki.legacy.mwsuggest', // to ensure we disable it in proper order
 		),
 	),
 );
diff --git a/extensions/Vector/modules/ext.vector.collapsibleNav.js b/extensions/Vector/modules/ext.vector.collapsibleNav.js
index 9a9b77f7..6e72ef84 100644
--- a/extensions/Vector/modules/ext.vector.collapsibleNav.js
+++ b/extensions/Vector/modules/ext.vector.collapsibleNav.js
@@ -1,7 +1,7 @@
 /*
  * Collapisble navigation for Vector
  */
-( function( $ ) {
+jQuery( function( $ ) {
 
 	/* Browser Support */
 
@@ -9,7 +9,6 @@
 		// Left-to-right languages
 		'ltr': {
 			// Collapsible Nav is broken in Opera < 9.6 and Konqueror < 4
-			'msie': [['>=', 7]],
 			'opera': [['>=', 9.6]],
 			'konqueror': [['>=', 4.0]],
 			'blackberry': false,
@@ -19,7 +18,6 @@
 		},
 		// Right-to-left languages
 		'rtl': {
-			'msie': [['>=', 7]],
 			'opera': [['>=', 9.6]],
 			'konqueror': [['>=', 4.0]],
 			'blackberry': false,
@@ -225,4 +223,4 @@
 			}
 			return false;
 		} );
-} )( jQuery );
+} );
diff --git a/extensions/Vector/modules/ext.vector.editWarning.js b/extensions/Vector/modules/ext.vector.editWarning.js
index d7494c70..5b97670d 100644
--- a/extensions/Vector/modules/ext.vector.editWarning.js
+++ b/extensions/Vector/modules/ext.vector.editWarning.js
@@ -30,7 +30,7 @@
 				// Check if the current values of some form elements are the same as
 				// the original values
 				if (
-					wgAction == 'submit' ||
+					mw.config.get( 'wgAction' ) == 'submit' ||
 					$( '#wpTextbox1' ).data( 'origtext' ) != $( '#wpTextbox1' ).val() ||
 					$( '#wpSummary' ).data( 'origtext' ) != $( '#wpSummary' ).val()
 				) {
diff --git a/extensions/Vector/modules/ext.vector.expandableSearch.js b/extensions/Vector/modules/ext.vector.expandableSearch.js
index 850ff74f..619ea9c2 100644
--- a/extensions/Vector/modules/ext.vector.expandableSearch.js
+++ b/extensions/Vector/modules/ext.vector.expandableSearch.js
@@ -1,7 +1,7 @@
 /*
  * Expandable search for Vector
  */
-$( document ).ready( function() {
+jQuery( document ).ready( function( $ ) {
 	
 	/* Browser Support */
 
diff --git a/extensions/Vector/modules/ext.vector.footerCleanup.js b/extensions/Vector/modules/ext.vector.footerCleanup.js
index eb9b3dd2..2df26540 100644
--- a/extensions/Vector/modules/ext.vector.footerCleanup.js
+++ b/extensions/Vector/modules/ext.vector.footerCleanup.js
@@ -1,7 +1,7 @@
 /*
  * Footer cleanup for Vector
  */
-$( document ).ready( function() {
+jQuery( document ).ready( function( $ ) {
 	$( '#editpage-copywarn' )
 		.add( '.editOptions' )
 		.wrapAll( '<div id="editpage-bottom"></div>' );
diff --git a/extensions/Vector/modules/ext.vector.simpleSearch.js b/extensions/Vector/modules/ext.vector.simpleSearch.js
index 01ef14ea..8af1f9a1 100644
--- a/extensions/Vector/modules/ext.vector.simpleSearch.js
+++ b/extensions/Vector/modules/ext.vector.simpleSearch.js
@@ -2,6 +2,14 @@
 
 jQuery( document ).ready( function( $ ) {
 
+	// Ensure that the thing is actually present!
+	if ($('#simpleSearch').length == 0) {
+		// Don't try to set anything up if simpleSearch is disabled sitewide.
+		// The loader code loads us if the option is present, even if we're
+		// not actually enabled (anymore).
+		return;
+	}
+
 	// Compatibility map
 	var map = {
 		'browsers': {
diff --git a/extensions/WikiEditor/WikiEditor.hooks.php b/extensions/WikiEditor/WikiEditor.hooks.php
index 1a8a251f..7a2c2e41 100644
--- a/extensions/WikiEditor/WikiEditor.hooks.php
+++ b/extensions/WikiEditor/WikiEditor.hooks.php
@@ -1,19 +1,19 @@
 <?php
 /**
  * Hooks for WikiEditor extension
- * 
+ *
  * @file
  * @ingroup Extensions
  */
 
 class WikiEditorHooks {
-	
+
 	/* Protected Static Members */
-	
+
 	protected static $features = array(
-		
+
 		/* Beta Features */
-		
+
 		'toolbar' => array(
 			'preferences' => array(
 				// Ideally this key would be 'wikieditor-toolbar'
@@ -63,9 +63,9 @@ class WikiEditorHooks {
 				'ext.wikiEditor.toolbar.hideSig',
 			),
 		),
-		
+
 		/* Labs Features */
-		
+
 		'templateEditor' => array(
 			'preferences' => array(
 				'wikieditor-template-editor' => array(
@@ -158,20 +158,21 @@ class WikiEditorHooks {
 			),
 		),
 	);
-	
+
 	/* Static Methods */
-	
+
 	/**
 	 * Checks if a certain option is enabled
 	 *
 	 * This method is public to allow other extensions that use WikiEditor to use the
 	 * same configuration as WikiEditor itself
 	 *
-	 * @param $name Name of the feature, should be a key of $features
+	 * @param $name string Name of the feature, should be a key of $features
+	 * @return bool
 	 */
 	public static function isEnabled( $name ) {
 		global $wgWikiEditorFeatures, $wgUser;
-		
+
 		// Features with global set to true are always enabled
 		if ( !isset( $wgWikiEditorFeatures[$name] ) || $wgWikiEditorFeatures[$name]['global'] ) {
 			return true;
@@ -188,20 +189,21 @@ class WikiEditorHooks {
 			}
 			return true;
 		}
-		// Features controlled by $wgWikiEditorFeatures with both global and user set to false are awlways disabled 
+		// Features controlled by $wgWikiEditorFeatures with both global and user set to false are awlways disabled
 		return false;
 	}
-	
+
 	/**
 	 * EditPage::showEditForm:initial hook
-	 * 
+	 *
 	 * Adds the modules to the edit form
-	 * 
+	 *
 	 * @param $toolbar array list of toolbar items
+	 * @return bool
 	 */
 	public static function editPageShowEditFormInitial( &$toolbar ) {
 		global $wgOut;
-		
+
 		// Add modules for enabled features
 		foreach ( self::$features as $name => $feature ) {
 			if ( isset( $feature['modules'] ) && self::isEnabled( $name ) ) {
@@ -210,18 +212,19 @@ class WikiEditorHooks {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * GetPreferences hook
-	 * 
+	 *
 	 * Adds WikiEditor-releated items to the preferences
-	 * 
+	 *
 	 * @param $user User current user
 	 * @param $defaultPreferences array list of default user preference controls
+	 * @return bool
 	 */
 	public static function getPreferences( $user, &$defaultPreferences ) {
 		global $wgWikiEditorFeatures;
-		
+
 		foreach ( self::$features as $name => $feature ) {
 			if (
 				isset( $feature['preferences'] ) &&
@@ -234,15 +237,17 @@ class WikiEditorHooks {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * MakeGlobalVariablesScript hook
-	 * 
+	 *
 	 * Adds enabled/disabled switches for WikiEditor modules
+	 * @param $vars array
+	 * @return bool
 	 */
 	public static function resourceLoaderGetConfigVars( &$vars ) {
 		global $wgWikiEditorFeatures;
-		
+
 		$configurations = array();
 		foreach ( self::$features as $name => $feature ) {
 			if (
@@ -260,16 +265,18 @@ class WikiEditorHooks {
 		}
 		return true;
 	}
-	
+
+	/**
+	 * @param $vars array
+	 * @return bool
+	 */
 	public static function makeGlobalVariablesScript( &$vars ) {
-		global $wgWikiEditorFeatures;
-		
 		// Build and export old-style wgWikiEditorEnabledModules object for back compat
 		$enabledModules = array();
 		foreach ( self::$features as $name => $feature ) {
 			$enabledModules[$name] = self::isEnabled( $name );
 		}
-		
+
 		$vars['wgWikiEditorEnabledModules'] = $enabledModules;
 		return true;
 	}
diff --git a/extensions/WikiEditor/WikiEditor.i18n.php b/extensions/WikiEditor/WikiEditor.i18n.php
index 8a975717..6e58512c 100644
--- a/extensions/WikiEditor/WikiEditor.i18n.php
+++ b/extensions/WikiEditor/WikiEditor.i18n.php
@@ -16,7 +16,7 @@ $messages['en'] = array(
 	'wikieditor' => 'Advanced wikitext editing interface',
 	'wikieditor-desc' => 'Provides an extendable wikitext editing interface and many feature-providing modules',
 	'wikieditor-wikitext-tab' => 'Wikitext',
-	'wikieditor-loading' => 'Loading',
+	'wikieditor-loading' => 'Loading...',
 	/* Preview */
 	'wikieditor-preview-preference' => 'Enable side-by-side preview',
 	'wikieditor-preview-tab' => 'Preview',
@@ -164,7 +164,7 @@ $1:Example.jpg|Caption2",
 	'wikieditor-toolbar-tool-replace-case' => 'Match case',
 	'wikieditor-toolbar-tool-replace-regex' => 'Treat search string as a regular expression',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Find next',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Replace next',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Replace',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Replace all',
 	'wikieditor-toolbar-tool-replace-close' => 'Close',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Your search did not match anything.',
@@ -259,6 +259,7 @@ $1:Example.jpg|Caption2",
 );
 
 /** Message documentation (Message documentation)
+ * @author Amire80
  * @author EugeneZelenko
  * @author Hamilton Abreu
  * @author Harald Khan
@@ -269,13 +270,17 @@ $1:Example.jpg|Caption2",
  * @author Prima klasy4na
  * @author Raymond
  * @author Siebrand
+ * @author Umherirrender
+ * @author Yekrats
  */
 $messages['qqq'] = array(
+	'wikieditor' => 'An extension to allow for advanced editing features.
+http://www.mediawiki.org/wiki/Extension:WikiEditor',
 	'wikieditor-desc' => "{{desc}}
 
 I guess that 'feature-providing modules' means the same as 'modules providing features'.",
 	'wikieditor-wikitext-tab' => 'Caption of the tab containing the edit box',
-	'wikieditor-loading' => "Explanatory text for the temporary cover placed over the wikiediort while it's being assembled
+	'wikieditor-loading' => "Explanatory text for the temporary cover placed over the wikieditor while it's being assembled.
 {{Identical|Loading}}",
 	'wikieditor-preview-preference' => "Option in [[Special:Preferences]], tab ''{{int:prefs-editing}}''",
 	'wikieditor-preview-tab' => 'Caption of the tab containing the preview
@@ -315,6 +320,8 @@ I guess that 'feature-providing modules' means the same as 'modules providing fe
 	'wikieditor-toc-preference' => "Option at [[Special:Preferences]], tab ''{{int:prefs-editing}}''",
 	'wikieditor-toc-show' => 'Label of the show/hide link when the navigable table of contents is hidden',
 	'wikieditor-toc-hide' => 'Label of the show/hide link when the navigable table of contents is visible',
+	'wikieditor-toolbar' => 'A customizable toolbar for the WikiEditor.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
 	'wikieditor-toolbar-desc' => '{{desc}}',
 	'wikieditor-toolbar-preference' => 'Option in [[Special:Preferences]]',
 	'wikieditor-toolbar-dialogs-preference' => "Caption of a checkbox on [[Special:Preferences]] (''editing'' tab), enabling helper dialogs for various features of the advanced edit toolbar (e.g. inserting links or tables).
@@ -353,7 +360,7 @@ I guess that 'feature-providing modules' means the same as 'modules providing fe
 	'wikieditor-toolbar-tool-nowiki' => '工具栏注释',
 	'wikieditor-toolbar-tool-redirect' => "Tooltip for icon to place wiki text for a redirect in the edit box. The label before these icons says 'Insert'. 'Redirect' is a noun here.
 {{Identical|Redirect}}",
-	'wikieditor-toolbar-tool-redirect-example' => "Target is an adjective describing the page name. You could use 'destination' instead of 'target'. 'Target page name' is the destination of the redirect and appears when the wikitext for a redirect is inserted in the text box thus 
+	'wikieditor-toolbar-tool-redirect-example' => "Target is an adjective describing the page name. You could use 'destination' instead of 'target'. 'Target page name' is the destination of the redirect and appears when the wikitext for a redirect is inserted in the text box thus
  <nowiki>#REDIRECT [[target page name]]</nowiki>",
 	'wikieditor-toolbar-tool-small' => '{{Identical|Small}}',
 	'wikieditor-toolbar-group-insert' => '{{Identical|Insert}}',
@@ -375,7 +382,8 @@ I guess that 'feature-providing modules' means the same as 'modules providing fe
 
 [[File:Wikieditor-toolbar-tool-table.png|thumb]] See screenshot.',
 	'wikieditor-toolbar-tool-table-cancel' => '{{Identical|Cancel}}',
-	'wikieditor-toolbar-tool-table-example-text' => 'Placeholder text to help the table example appear to be in the context of an article. Should be lorem ipsum, or equivalent.',
+	'wikieditor-toolbar-tool-table-example-text' => '{{optional}}
+Placeholder text to help the table example appear to be in the context of an article. Should be lorem ipsum, or equivalent.',
 	'wikieditor-toolbar-tool-table-toomany' => '[[file:Bulbgraph.png|left|22px]]
 This message does not support PLURAL on $1.',
 	'wikieditor-toolbar-tool-replace' => '{{Identical|Search and replace}}',
@@ -387,6 +395,7 @@ This message does not support PLURAL on $1.',
 
 More notes:
 * "Regular expression" is mostly a programmer tool, which is sometimes exposed to normal users too. It\'s almost as an programming language, but it is used to describe different kinds of strings (sometimes also called patterns and pattern matching), and is often used to change (parts of) the strings too.',
+	'wikieditor-toolbar-tool-replace-button-replace' => '{{Identical|Replace}}',
 	'wikieditor-toolbar-tool-replace-close' => '{{Identical|Close}}',
 	'wikieditor-toolbar-tool-replace-success' => '[[file:Bulbgraph.png|left|22px]]
 This message does not support PLURAL on $1.',
@@ -395,12 +404,25 @@ This message does not support PLURAL on $1.',
 A "regular expression" is a syntax to find strings based on patterns, for more see [[wikipedia:Regular expression|the Wikipedia article]].
 
 Regular expressions are mostly a programmer tool, which is sometimes exposed to normal users too. It\'s almost as an programming language, but it is used to describe different kinds of strings (sometimes also called patterns and pattern matching), and is often used to change (parts of) the strings too.',
+	'wikieditor-toolbar-section-characters' => 'This will be a toolbar for special characters, like emoticons.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
 	'wikieditor-toolbar-characters-page-latin' => 'This is the name of a script, or alphabet, not a language',
+	'wikieditor-toolbar-characters-page-latinextended' => 'The name of the Latin Extended character set section of the toolbar.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA means a script: "international phonetic alphabet" here, and not "international phonetic association", the organization behind it.',
+	'wikieditor-toolbar-characters-page-symbols' => 'The section name for symbols on the wiki-toolbar.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
 	'wikieditor-toolbar-characters-page-greek' => 'This is the name of a script, or alphabet, not a language.',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'This is the name of a script, or a group of alphabets, used mainly in Eastern Europe and North and Central Asia.',
 	'wikieditor-toolbar-characters-page-arabic' => 'This is the name of a script, or alphabet, not a language.',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'This is a description of the additional group of Arabic script characters for languages such as a Persian, Urdu, Pashto and others. This message is supposed to be similar to {{msg-mw|Wikieditor-toolbar-characters-page-latinextended}}.',
+	'wikieditor-toolbar-characters-page-persian' => 'The name of the Persian character set (alphabet) on the toolbar.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
 	'wikieditor-toolbar-characters-page-hebrew' => 'This is the name of a script, or alphabet, not a language.',
+	'wikieditor-toolbar-characters-page-bangla' => 'The name of the [[w:Bengali alphabet|Bangla]] (a.k.a. Bengali) character set (alphabet) on the toolbar.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
+	'wikieditor-toolbar-characters-page-telugu' => 'The name of the [[w:Telugu language#Alphabet|Telugu]] character set (alphabet) on the toolbar.
+For more information, see http://www.mediawiki.org/wiki/Extension:WikiEditor/Toolbar_customization',
 	'wikieditor-toolbar-section-help' => '{{Identical|Help}}',
 	'wikieditor-toolbar-help-heading-description' => '{{Identical|Description}}',
 	'wikieditor-toolbar-help-page-link' => '{{Identical|Links}}',
@@ -462,6 +484,7 @@ $messages['ab'] = array(
  * @author Adriaan
  * @author Anrie
  * @author Naudefj
+ * @author පසිඳු කාවින්ද
  */
 $messages['af'] = array(
 	'wikieditor' => 'Uitgebreide teksverwerker vir wikiteks',
@@ -496,6 +519,7 @@ $messages['af'] = array(
 	'wikieditor-toolbar-desc' => 'Wysigingsbalk met verhoogde bruikbaarheid',
 	'wikieditor-toolbar-preference' => 'Gebruik gevorderde redigeringsbalk',
 	'wikieditor-toolbar-dialogs-preference' => 'Aktiveer dialoog vir die byvoeging van skakels, tabelle en meer',
+	'wikieditor-toolbar-hidesig' => 'Steek die ondertekening knoppie van die bladsye in die hoof naamruimte',
 	'wikieditor-toolbar-loading' => 'Besig om te laai...',
 	'wikieditor-toolbar-tool-bold' => 'Vetdruk',
 	'wikieditor-toolbar-tool-bold-example' => 'Vetgedrukte teks',
@@ -604,7 +628,7 @@ $1:Voorbeeld2|Byskrif2',
 	'wikieditor-toolbar-tool-replace-case' => 'Gevoelig vir hoofletters',
 	'wikieditor-toolbar-tool-replace-regex' => 'Hanteer die soekstring as \'n "regular expression"',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Vind volgende',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Vervang volgende',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Vervang',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Vervang alles',
 	'wikieditor-toolbar-tool-replace-close' => 'Sluit',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'U soektog het geen resultate opgelewer nie.',
@@ -619,6 +643,7 @@ $1:Voorbeeld2|Byskrif2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grieks',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrillies',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabies',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabies uitgebrei',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiese',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreeus',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengaals',
@@ -834,7 +859,6 @@ $1: Example.jpg|Caption2',
 	'wikieditor-toolbar-tool-replace-case' => 'rast Match',
 	'wikieditor-toolbar-tool-replace-regex' => 'string Silleni kërkim si një shprehje e rregullt',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Gjej të ardhshëm',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Replace e ardhshme',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zëvendësojnë të gjithë',
 	'wikieditor-toolbar-tool-replace-close' => 'Mshele',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Kërkimi juaj nuk u përputh me ndonjë gjë.',
@@ -953,6 +977,7 @@ $messages['an'] = array(
 	'wikieditor-toolbar-desc' => "Barra de ferramientas d'edición con usabilidat amillorada",
 	'wikieditor-toolbar-preference' => "Activar a barra de ferramientas d'edición amillorada",
 	'wikieditor-toolbar-dialogs-preference' => 'Activar as caixas de dialogos ta ficar vinclos, tablas y atros',
+	'wikieditor-toolbar-hidesig' => 'Amagar o botón sinyar en as pachinas en o espacio de nombres prencipal',
 	'wikieditor-toolbar-loading' => 'Cargando...',
 	'wikieditor-toolbar-tool-bold' => 'Negreta',
 	'wikieditor-toolbar-tool-bold-example' => 'Texto en negreta',
@@ -1060,7 +1085,7 @@ $1:Eixemplo.jpg|Piet_de_foto_2',
 	'wikieditor-toolbar-tool-replace-case' => 'Distinguir mayusclas/minusclas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tractar a cadena a mirar como una expresión regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Mirar o siguient',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Substituye o siguient',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Reemplazar',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Substituir tot',
 	'wikieditor-toolbar-tool-replace-close' => 'Zarrar',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'A suya busca no ha trobau garra resultau concordant.',
@@ -1075,6 +1100,7 @@ $1:Eixemplo.jpg|Piet_de_foto_2',
 	'wikieditor-toolbar-characters-page-greek' => 'Griego',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirilico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabico',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabigo extendiu',
 	'wikieditor-toolbar-characters-page-persian' => 'Persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreu',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalí',
@@ -1206,7 +1232,9 @@ $messages['ang'] = array(
  * @author Meno25
  * @author OsamaK
  * @author Samer
+ * @author Zack wadghiri
  * @author ترجمان05
+ * @author زكريا
  */
 $messages['ar'] = array(
 	'wikieditor' => 'الواجهة المتقدمة لتعديل نص ويكي',
@@ -1220,7 +1248,7 @@ $messages['ar'] = array(
 	'wikieditor-previewDialog-preference' => 'مكّن حوار المعاينة',
 	'wikieditor-previewDialog-tab' => 'عاين',
 	'wikieditor-previewDialog-loading' => 'يُحمّل...',
-	'wikieditor-publish-preference' => 'فعل النشر خطوة بخطوة',
+	'wikieditor-publish-preference' => 'فعّل النشر خطوة بخطوة',
 	'wikieditor-publish-button-publish' => 'انشر',
 	'wikieditor-publish-button-cancel' => 'ألغِ',
 	'wikieditor-publish-dialog-title' => 'انشر في {{SITENAME}}',
@@ -1243,8 +1271,8 @@ $messages['ar'] = array(
 	'wikieditor-toolbar-dialogs-preference' => 'مكّن حوارات إدراج الوصلات والجداول وغيرها',
 	'wikieditor-toolbar-hidesig' => 'إخفاء زر التوقيع من الصفحات الموجودة في مساحة الاسم الرئيسي',
 	'wikieditor-toolbar-loading' => 'يُحمّل...',
-	'wikieditor-toolbar-tool-bold' => 'عريض',
-	'wikieditor-toolbar-tool-bold-example' => 'نص عريض',
+	'wikieditor-toolbar-tool-bold' => 'غليظ',
+	'wikieditor-toolbar-tool-bold-example' => 'نص غليظ',
 	'wikieditor-toolbar-tool-italic' => 'مائل',
 	'wikieditor-toolbar-tool-italic-example' => 'نص مائل',
 	'wikieditor-toolbar-tool-ilink' => 'وصلة داخلية',
@@ -1284,11 +1312,11 @@ $messages['ar'] = array(
 	'wikieditor-toolbar-tool-signature' => 'توقيع مع الطابع الزمني',
 	'wikieditor-toolbar-section-advanced' => 'متقدم',
 	'wikieditor-toolbar-tool-heading' => 'ترويسة',
-	'wikieditor-toolbar-tool-heading-1' => 'المستوى 1',
-	'wikieditor-toolbar-tool-heading-2' => 'المستوى 2',
-	'wikieditor-toolbar-tool-heading-3' => 'المستوى 3',
-	'wikieditor-toolbar-tool-heading-4' => 'المستوى 4',
-	'wikieditor-toolbar-tool-heading-5' => 'المستوى 5',
+	'wikieditor-toolbar-tool-heading-1' => 'مستوى 1',
+	'wikieditor-toolbar-tool-heading-2' => 'مستوى 2',
+	'wikieditor-toolbar-tool-heading-3' => 'مستوى 3',
+	'wikieditor-toolbar-tool-heading-4' => 'مستوى 4',
+	'wikieditor-toolbar-tool-heading-5' => 'مستوى 5',
 	'wikieditor-toolbar-tool-heading-example' => 'نص الترويسة',
 	'wikieditor-toolbar-group-format' => 'تنسيق',
 	'wikieditor-toolbar-tool-ulist' => 'قائمة منقّطة',
@@ -1349,30 +1377,31 @@ $1:Example.jpg|تعليق2',
 	'wikieditor-toolbar-tool-replace-case' => 'مطابقة الحالة',
 	'wikieditor-toolbar-tool-replace-regex' => 'عامل عبارة البحث كتعبير نمطي',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'جِد التالي',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'استبدل التالي',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'استبدل',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'استبدل الكل',
 	'wikieditor-toolbar-tool-replace-close' => 'أغلق',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'بحثك لم يطابق أي شيء.',
 	'wikieditor-toolbar-tool-replace-success' => 'أجري $1 استبدال(ات).',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'لم تكتب شيئًا لتبحث عنه.',
 	'wikieditor-toolbar-tool-replace-invalidregex' => 'التعبير النمطي الذي أدخلته غير صالح: $1',
-	'wikieditor-toolbar-section-characters' => 'محارف خاصة',
-	'wikieditor-toolbar-characters-page-latin' => 'اللاتينية',
-	'wikieditor-toolbar-characters-page-latinextended' => 'مد لاتيني',
-	'wikieditor-toolbar-characters-page-ipa' => 'آي بي إي',
+	'wikieditor-toolbar-section-characters' => 'أحرف خاصة',
+	'wikieditor-toolbar-characters-page-latin' => 'لاتينية',
+	'wikieditor-toolbar-characters-page-latinextended' => 'لاتينية موسعة',
+	'wikieditor-toolbar-characters-page-ipa' => 'صوتية دولية',
 	'wikieditor-toolbar-characters-page-symbols' => 'رموز',
-	'wikieditor-toolbar-characters-page-greek' => 'اليونانية',
-	'wikieditor-toolbar-characters-page-cyrillic' => 'السيريلية',
-	'wikieditor-toolbar-characters-page-arabic' => 'العربية',
+	'wikieditor-toolbar-characters-page-greek' => 'يونانية',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'كيريلية',
+	'wikieditor-toolbar-characters-page-arabic' => 'عربية',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'عربية موسعة',
 	'wikieditor-toolbar-characters-page-persian' => 'الفارسية',
-	'wikieditor-toolbar-characters-page-hebrew' => 'العبرية',
-	'wikieditor-toolbar-characters-page-bangla' => 'البنغالية',
-	'wikieditor-toolbar-characters-page-telugu' => 'تيلوجو',
-	'wikieditor-toolbar-characters-page-sinhala' => 'سنهالا',
-	'wikieditor-toolbar-characters-page-gujarati' => 'جوجاراتي',
-	'wikieditor-toolbar-characters-page-thai' => 'التايلاندية',
-	'wikieditor-toolbar-characters-page-lao' => 'اللاوية',
-	'wikieditor-toolbar-characters-page-khmer' => 'الخميرية (الكمبودية)',
+	'wikieditor-toolbar-characters-page-hebrew' => 'عبرية',
+	'wikieditor-toolbar-characters-page-bangla' => 'بنغالية',
+	'wikieditor-toolbar-characters-page-telugu' => 'تيلوجية',
+	'wikieditor-toolbar-characters-page-sinhala' => 'سنهالية',
+	'wikieditor-toolbar-characters-page-gujarati' => 'غجراتية',
+	'wikieditor-toolbar-characters-page-thai' => 'تايلندية',
+	'wikieditor-toolbar-characters-page-lao' => 'لاوية',
+	'wikieditor-toolbar-characters-page-khmer' => 'خميرية',
 	'wikieditor-toolbar-section-help' => 'مساعدة',
 	'wikieditor-toolbar-help-heading-description' => 'الوصف',
 	'wikieditor-toolbar-help-heading-syntax' => 'ما تكتبه',
@@ -1387,12 +1416,12 @@ $1:Example.jpg|تعليق2',
 	'wikieditor-toolbar-help-content-italic-description' => 'مائل',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''نص مائل''",
 	'wikieditor-toolbar-help-content-italic-result' => '<em>نص مائل</em>',
-	'wikieditor-toolbar-help-content-bold-description' => 'عريض',
-	'wikieditor-toolbar-help-content-bold-syntax' => "'''نص عريض'''",
-	'wikieditor-toolbar-help-content-bold-result' => '<strong>نص عريض</strong>',
-	'wikieditor-toolbar-help-content-bolditalic-description' => 'عريض ومائل',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''نص عريض ومائل'''''",
-	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>نص عريض ومائل</em></strong>',
+	'wikieditor-toolbar-help-content-bold-description' => 'غليظ',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''نص غليظ'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>نص غليظ</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'غليظ ومائل',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''نص غليظ ومائل'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>نص غليظ ومائل</em></strong>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'وصلة داخلية',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[عنوان الصفحة|اسم الوصلة]]<br />[[عنوان الصفحة]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>اسم الوصلة</a><br /><a href='#'>عنوان الصفحة</a>",
@@ -1676,7 +1705,6 @@ $1:Example.jpg|Caption2',
 	'wikieditor-toolbar-tool-replace-case' => 'Match case',
 	'wikieditor-toolbar-tool-replace-regex' => 'Treat search string as a regular expression',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'شوف اللى بعده',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'بدّل اللى بعده',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'بدلهم كلهم',
 	'wikieditor-toolbar-tool-replace-close' => 'إقفل',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'التدوير بتاعك ما وصلش لأى حاجه.',
@@ -1763,19 +1791,201 @@ $messages['as'] = array(
 	'wikieditor-toolbar-tool-file-example' => 'Example.jpg',
 );
 
+/** Asturian (Asturianu)
+ * @author Xuacu
+ */
+$messages['ast'] = array(
+	'wikieditor' => "Interfaz avanzada d'edición de testu wiki",
+	'wikieditor-wikitext-tab' => 'Testu wiki',
+	'wikieditor-loading' => 'Cargando...',
+	'wikieditor-preview-preference' => 'Activar la vista previa comparativa',
+	'wikieditor-preview-tab' => 'Entever',
+	'wikieditor-preview-changes-tab' => 'Cambios',
+	'wikieditor-preview-loading' => 'Cargando...',
+	'wikieditor-previewDialog-preference' => 'Activar el diálogu de vista previa',
+	'wikieditor-previewDialog-tab' => 'Entever',
+	'wikieditor-previewDialog-loading' => 'Cargando...',
+	'wikieditor-publish-preference' => 'Activar la publicación pasu a pasu',
+	'wikieditor-publish-button-publish' => 'Publicar',
+	'wikieditor-publish-button-cancel' => 'Encaboxar',
+	'wikieditor-publish-dialog-title' => 'Publicar en {{SITENAME}}',
+	'wikieditor-publish-dialog-minor' => 'Edición menor',
+	'wikieditor-publish-dialog-watch' => 'Vixilar esta páxina',
+	'wikieditor-publish-dialog-publish' => 'Publicar',
+	'wikieditor-publish-dialog-goback' => 'Volver',
+	'wikieditor-template-editor-preference' => 'Activar la edición de plantíes wiki basada en formularios',
+	'wikieditor-template-editor-dialog-title' => 'Editar plantía',
+	'wikieditor-template-editor-dialog-submit' => 'Anovar',
+	'wikieditor-template-editor-dialog-cancel' => 'Encaboxar',
+	'wikieditor-templates-preference' => 'Activar el plegáu de plantíes',
+	'wikieditor-toc-show' => 'Amosar el conteníu',
+	'wikieditor-toc-hide' => 'Anubrir el conteníu',
+	'wikieditor-toolbar' => 'Editando la barra de ferramientes',
+	'wikieditor-toolbar-desc' => "Barra de ferramientes de la páxina d'edición con usabilidá enantada",
+	'wikieditor-toolbar-preference' => "Activar a barra d'edición enantada",
+	'wikieditor-toolbar-loading' => 'Cargando...',
+	'wikieditor-toolbar-tool-bold' => 'Negrina',
+	'wikieditor-toolbar-tool-bold-example' => 'Testu en negrina',
+	'wikieditor-toolbar-tool-italic' => 'Cursiva',
+	'wikieditor-toolbar-tool-italic-example' => 'Testu en cursiva',
+	'wikieditor-toolbar-tool-ilink' => 'Enllaz internu',
+	'wikieditor-toolbar-tool-ilink-example' => 'Títulu del enllaz',
+	'wikieditor-toolbar-tool-xlink' => "Enllaz esternu (recuerda'l prefixu http://)",
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com títulu del enllaz',
+	'wikieditor-toolbar-tool-link' => 'Enllaz',
+	'wikieditor-toolbar-tool-link-title' => 'Inxertar enllaz',
+	'wikieditor-toolbar-tool-link-int' => 'A una páxina del wiki',
+	'wikieditor-toolbar-tool-link-int-target' => 'Páxina destín o URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Títulu de la páxina o URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'Testu a amosar:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => "El testu que s'amosará",
+	'wikieditor-toolbar-tool-link-ext' => 'A una páxina web esterna',
+	'wikieditor-toolbar-tool-link-ext-target' => 'URL del enllaz:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'Testu del enllaz:',
+	'wikieditor-toolbar-tool-link-insert' => 'Inxertar enllaz',
+	'wikieditor-toolbar-tool-link-cancel' => 'Encaboxar',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'La páxina yá esiste',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'La páxina nun esiste',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Títulu non válidu',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Enllaz esternu',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Comprobando la esistencia de la páxina...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'El títulu que conseñasti nun ye válidu.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Enllaz internu',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Enllaz esternu',
+	'wikieditor-toolbar-tool-file-example' => 'Exemplu.jpg',
+	'wikieditor-toolbar-tool-reference' => 'Referencia',
+	'wikieditor-toolbar-tool-reference-example' => 'Escribir equí el testu de la nota al pie',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Encaboxar',
+	'wikieditor-toolbar-tool-reference-title' => 'Inxertar referencia',
+	'wikieditor-toolbar-tool-reference-insert' => 'Inxertar',
+	'wikieditor-toolbar-tool-reference-text' => 'Testu de la referencia',
+	'wikieditor-toolbar-tool-signature' => 'Robla, data y hora',
+	'wikieditor-toolbar-section-advanced' => 'Avanzao',
+	'wikieditor-toolbar-tool-heading' => 'Cabecera',
+	'wikieditor-toolbar-tool-heading-1' => 'Nivel 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Nivel 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Nivel 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Nivel 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Nivel 5',
+	'wikieditor-toolbar-tool-heading-example' => 'Testu de cabecera',
+	'wikieditor-toolbar-group-format' => 'Formatu',
+	'wikieditor-toolbar-tool-ulist' => 'Llista con puntos',
+	'wikieditor-toolbar-tool-ulist-example' => 'Elementu de la llista con puntos',
+	'wikieditor-toolbar-tool-olist' => 'Llista numberada',
+	'wikieditor-toolbar-tool-olist-example' => 'Elementu de la llista numberada',
+	'wikieditor-toolbar-tool-indent' => 'Sangría',
+	'wikieditor-toolbar-tool-indent-example' => 'Llinia con sangría',
+	'wikieditor-toolbar-tool-nowiki' => 'Ensin formatu wiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Pon equí testu ensin formatu',
+	'wikieditor-toolbar-tool-redirect' => 'Redireición',
+	'wikieditor-toolbar-tool-redirect-example' => 'Nome de la páxina de destín',
+	'wikieditor-toolbar-tool-big' => 'Grande',
+	'wikieditor-toolbar-tool-big-example' => 'Testu grande',
+	'wikieditor-toolbar-tool-small' => 'Pequeñu',
+	'wikieditor-toolbar-tool-small-example' => 'Testu pequeñu',
+	'wikieditor-toolbar-tool-superscript' => 'Superíndiz',
+	'wikieditor-toolbar-tool-superscript-example' => 'Testu en superíndiz',
+	'wikieditor-toolbar-tool-subscript' => 'Subíndiz',
+	'wikieditor-toolbar-group-insert' => 'Inxertar',
+	'wikieditor-toolbar-tool-gallery' => "Galería d'imaxes",
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Testu de la caxella',
+	'wikieditor-toolbar-tool-table-example-header' => 'Testu de cabecera',
+	'wikieditor-toolbar-tool-table-title' => 'Inxertar una tabla',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Fileres',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Columnes',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Incluir llinia de cabecera',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Estilu con bordes',
+	'wikieditor-toolbar-tool-table-sortable' => 'Facer que la tabla pueda ordenase',
+	'wikieditor-toolbar-tool-table-example' => 'Exemplu',
+	'wikieditor-toolbar-tool-table-preview' => 'Vista previa',
+	'wikieditor-toolbar-tool-table-insert' => 'Inxertar',
+	'wikieditor-toolbar-tool-table-cancel' => 'Encaboxar',
+	'wikieditor-toolbar-tool-replace' => 'Guetar y reemplazar',
+	'wikieditor-toolbar-tool-replace-title' => 'Guetar y reemplazar',
+	'wikieditor-toolbar-tool-replace-search' => 'Buscar',
+	'wikieditor-toolbar-tool-replace-replace' => 'Sustituir por:',
+	'wikieditor-toolbar-tool-replace-case' => 'Distinguir mayúscules',
+	'wikieditor-toolbar-tool-replace-regex' => 'Tratar la cadena de gueta como una espresión regular',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Alcontrar siguiente',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Sustituir',
+	'wikieditor-toolbar-tool-replace-close' => 'Zarrar',
+	'wikieditor-toolbar-tool-replace-success' => '$1 reemplazos fechos',
+	'wikieditor-toolbar-section-characters' => 'Caráuteres especiales',
+	'wikieditor-toolbar-characters-page-latin' => 'Llatín',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Llatín estendíu',
+	'wikieditor-toolbar-characters-page-ipa' => 'AFI',
+	'wikieditor-toolbar-characters-page-symbols' => 'Símbolos',
+	'wikieditor-toolbar-characters-page-greek' => 'Griegu',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirílicu',
+	'wikieditor-toolbar-characters-page-arabic' => 'Árabe',
+	'wikieditor-toolbar-characters-page-persian' => 'Persa',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Hebréu',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bengalín',
+	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'Cingalés',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
+	'wikieditor-toolbar-characters-page-thai' => 'Tailandés',
+	'wikieditor-toolbar-characters-page-lao' => 'Laosianu',
+	'wikieditor-toolbar-characters-page-khmer' => 'Khmer',
+	'wikieditor-toolbar-section-help' => 'Ayuda',
+	'wikieditor-toolbar-help-heading-description' => 'Descripción',
+	'wikieditor-toolbar-help-heading-syntax' => "Lo qu'escribes",
+	'wikieditor-toolbar-help-heading-result' => 'Lo que te sal',
+	'wikieditor-toolbar-help-page-format' => 'Dar formatu',
+	'wikieditor-toolbar-help-page-link' => 'Enllaces',
+	'wikieditor-toolbar-help-page-heading' => 'Cabeceres',
+	'wikieditor-toolbar-help-page-list' => 'Llistes',
+	'wikieditor-toolbar-help-page-file' => 'Ficheros',
+	'wikieditor-toolbar-help-page-reference' => 'Referencies',
+	'wikieditor-toolbar-help-page-discussion' => 'Alderique',
+	'wikieditor-toolbar-help-content-italic-description' => 'Cursiva',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''Testu en cursiva''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Testu en cursiva</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Negrina',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Testu en negrina'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Testu en negrina</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Negrina &amp; cursiva',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Testu en negrina y cursiva'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Testu en negrina &amp; cursiva</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'Enllaz internu',
+	'wikieditor-toolbar-help-content-reference-description' => 'Referencia',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Testu de la páxina&lt;ref name="test"&gt;[http://www.example.org Testu del enllaz], otru testu.&lt;/ref&gt;.',
+	'wikieditor-toolbar-help-content-reference-result' => "Testu de la páxina.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'Otros usos de la mesma referencia',
+	'wikieditor-toolbar-help-content-rereference-result' => "Testu de la páxina.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Amosar les referencies',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Testu del enllaz</a>, otru testu.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Robla con data y hora',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Nome d'usuariu</a> (<a href='#' title='{{#special:mytalk}}'>alderique</a>) 15:54, 10 xunu 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signature-description' => 'Robla',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Nome d'usuariu</a> (<a href='#' title='{{#special:mytalk}}'>alderique</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'Sangría',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Testu normal<br />:Testu con sangría<br />::Testu con sangría',
+	'wikieditor-toolbar-help-content-indent-result' => 'Testu normal<dl><dd>Testu con sangría<dl><dd>Testu con sangría</dd></dl></dd></dl>',
+);
+
 /** Azerbaijani (Azərbaycanca)
  * @author Cekli829
+ * @author Koc61
  * @author PPerviz
  * @author Vago
+ * @author Vugar 1981
  */
 $messages['az'] = array(
 	'wikieditor-wikitext-tab' => 'Vikimətn',
 	'wikieditor-loading' => 'Yüklə',
 	'wikieditor-preview-tab' => 'Sınaq göstərişi',
+	'wikieditor-preview-changes-tab' => 'Dəyişikliklər',
 	'wikieditor-preview-loading' => 'Yüklənir…',
 	'wikieditor-previewDialog-tab' => 'Sınaq göstərişi',
 	'wikieditor-previewDialog-loading' => 'Yüklənir…',
+	'wikieditor-publish-button-publish' => 'Yeniləmə',
 	'wikieditor-publish-button-cancel' => 'Ləğv et',
+	'wikieditor-publish-dialog-minor' => 'Kiçik dəyişiklik',
+	'wikieditor-publish-dialog-publish' => 'Publish',
+	'wikieditor-publish-dialog-goback' => 'Geriyə',
+	'wikieditor-template-editor-dialog-title' => 'Şablonu redaktə et',
+	'wikieditor-template-editor-dialog-submit' => 'Yenilə',
 	'wikieditor-template-editor-dialog-cancel' => 'Ləğv et',
 	'wikieditor-toolbar-loading' => 'Yüklənir…',
 	'wikieditor-toolbar-tool-bold' => 'Qalın',
@@ -1790,6 +2000,8 @@ $messages['az'] = array(
 	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'URL üçün səhifə başlığı',
 	'wikieditor-toolbar-tool-link-ext-target' => 'URL linki:',
 	'wikieditor-toolbar-tool-link-cancel' => 'Ləğv et',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Səhifə mövcud deyil',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Yanlış başlıq',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Daxili keçid',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Xarici keçid',
 	'wikieditor-toolbar-tool-file' => 'Şəkil əlavə etmə',
@@ -1809,13 +2021,16 @@ $messages['az'] = array(
 	'wikieditor-toolbar-tool-heading-example' => 'Başlıq mətni',
 	'wikieditor-toolbar-group-format' => 'Format',
 	'wikieditor-toolbar-tool-redirect' => 'Yönləndirmə',
+	'wikieditor-toolbar-tool-redirect-example' => 'Səhifə adını əlavə et',
 	'wikieditor-toolbar-tool-big' => 'Böyük',
 	'wikieditor-toolbar-tool-big-example' => 'Böyük mətn',
 	'wikieditor-toolbar-tool-small' => 'Kiçik',
 	'wikieditor-toolbar-tool-small-example' => 'Kiçik mətn',
+	'wikieditor-toolbar-tool-subscript' => 'Subscript',
 	'wikieditor-toolbar-group-insert' => 'Yerləşdirmək',
 	'wikieditor-toolbar-tool-gallery' => 'Şəkil qalereyası',
 	'wikieditor-toolbar-tool-newline' => 'Yeni xətt',
+	'wikieditor-toolbar-tool-table' => 'Cədvəl',
 	'wikieditor-toolbar-tool-table-example-old' => '-
 ! başlıq 1
 ! başlıq 2
@@ -1828,6 +2043,7 @@ $messages['az'] = array(
 | sıra 2, sütun 1
 | sıra 2, sütun 2
 | sıra 2, sütun 3',
+	'wikieditor-toolbar-tool-table-example-header' => 'Başlıq mətni',
 	'wikieditor-toolbar-tool-table-title' => 'Cədvəl yerləşdir',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Sətirlər:',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Sütunlar:',
@@ -1840,7 +2056,6 @@ $messages['az'] = array(
 	'wikieditor-toolbar-tool-replace-search' => 'Axtar:',
 	'wikieditor-toolbar-tool-replace-replace' => 'Bununla dəyiş:',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Növbətini axtar',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Növbətini dəyiş',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Hamısını dəyiş',
 	'wikieditor-toolbar-tool-replace-close' => 'Bağla',
 	'wikieditor-toolbar-section-characters' => 'Xüsusi işarələr',
@@ -1855,8 +2070,11 @@ $messages['az'] = array(
 	'wikieditor-toolbar-characters-page-hebrew' => 'İvrit',
 	'wikieditor-toolbar-characters-page-bangla' => 'Benqal',
 	'wikieditor-toolbar-characters-page-telugu' => 'Teluqu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'Sinqal',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Qucarat',
 	'wikieditor-toolbar-characters-page-thai' => 'Tay',
 	'wikieditor-toolbar-characters-page-lao' => 'Lao',
+	'wikieditor-toolbar-characters-page-khmer' => 'Khmer',
 	'wikieditor-toolbar-section-help' => 'Kömək',
 	'wikieditor-toolbar-help-heading-description' => 'Təsvir',
 	'wikieditor-toolbar-help-heading-syntax' => 'Yazdığınız',
@@ -1922,6 +2140,7 @@ $messages['az'] = array(
 
 /** Bashkir (Башҡортса)
  * @author Assele
+ * @author Haqmar
  */
 $messages['ba'] = array(
 	'wikieditor' => 'Киңәйтелгән викитекст мөхәррирләү интерфейсы',
@@ -2063,7 +2282,7 @@ $1:Миҫал.jpg|Тасуирлама2',
 	'wikieditor-toolbar-tool-replace-case' => 'Регистрҙы иҫәпкә алырға',
 	'wikieditor-toolbar-tool-replace-regex' => 'Эҙләү өсөн текстты регуляр аңлатма тип иҫәпләргә',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Сираттағыны табырға',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Сираттағыны алмаштырырға',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Алмаштырырға',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Барыһын да алмаштырырға',
 	'wikieditor-toolbar-tool-replace-close' => 'Ябырға',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Һеҙҙең һорауығыҙ буйынса бер ни ҙә табылманы.',
@@ -2154,11 +2373,11 @@ $1:Миҫал.jpg|Тасуирлама2',
  * @author Mucalexx
  */
 $messages['bar'] = array(
-	'wikieditor-template-editor-preference' => 'Formularbasirnds Beorwaten vo Wiki-Vurlong aktivirn',
-	'wikieditor-template-editor-dialog-title' => 'Vurlog beorwaten',
+	'wikieditor-template-editor-preference' => 'Formularbasirnds Beorweiten voh Wiki-Vurlong aktivirn',
+	'wikieditor-template-editor-dialog-title' => 'Vurlog beorweiten',
 	'wikieditor-template-editor-dialog-submit' => 'Aktualisirn',
-	'wikieditor-template-editor-dialog-cancel' => 'Obbrecha',
-	'wikieditor-templates-preference' => 'Aktivirung vom Ei- und Ausblenden vo Vurlong',
+	'wikieditor-template-editor-dialog-cancel' => 'Obbrechen',
+	'wikieditor-templates-preference' => 'Aktiviarung vom Eih- und Ausblenden voh Vurlong',
 );
 
 /** Belarusian (Беларуская)
@@ -2303,7 +2522,6 @@ $1:Example.jpg|Апісанне2',
 	'wikieditor-toolbar-tool-replace-case' => 'З улікам рэгістру',
 	'wikieditor-toolbar-tool-replace-regex' => 'Лічыць радок пошуку рэгулярным выразам',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Знайсці наступнае',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замяніць наступнае',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замяніць усе',
 	'wikieditor-toolbar-tool-replace-close' => 'Закрыць',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Ваш пошук нічога не даў.',
@@ -2393,6 +2611,7 @@ $1:Example.jpg|Апісанне2',
 /** Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
  * @author EugeneZelenko
  * @author Jim-by
+ * @author Renessaince
  * @author Wizardist
  * @author Zedlik
  */
@@ -2538,7 +2757,7 @@ $1:Прыклад.jpg|Подпіс2',
 	'wikieditor-toolbar-tool-replace-case' => 'Улічваць рэгістар літар',
 	'wikieditor-toolbar-tool-replace-regex' => 'Лічыць радок пошуку рэгулярным выразам',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Працягваць пошук',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Працягваць замену',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Замяніць',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замяніць усё',
 	'wikieditor-toolbar-tool-replace-close' => 'Закрыць',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Па Вашым запыце нічога ня знойдзена.',
@@ -2553,6 +2772,7 @@ $1:Прыклад.jpg|Подпіс2',
 	'wikieditor-toolbar-characters-page-greek' => 'Грэцкія',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Кірылічныя',
 	'wikieditor-toolbar-characters-page-arabic' => 'Арабскія',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Арабскія пашыраныя',
 	'wikieditor-toolbar-characters-page-persian' => 'Пэрсыдзкія',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Іўрыт',
 	'wikieditor-toolbar-characters-page-bangla' => 'Бэнгальскія',
@@ -2770,7 +2990,6 @@ $1:Example.jpg|Описание2',
 	'wikieditor-toolbar-tool-replace-case' => 'Чувствителност към регистъра',
 	'wikieditor-toolbar-tool-replace-regex' => 'Третиране на низа за търсене като регулярен израз',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Търсене на следващо',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замяна на следващо',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замяна на всички',
 	'wikieditor-toolbar-tool-replace-close' => 'Затваряне',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Нямаше резултати, които да отговарят на вашето търсене.',
@@ -2856,7 +3075,7 @@ $1:Example.jpg|Описание2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Текст без отстъп<dl><dd>Текст с единичен отстъп<dl><dd>Текст с двоен отстъп</dd></dl></dd></dl>',
 );
 
-/** Bahasa Banjar (Bahasa Banjar)
+/** Banjar (Bahasa Banjar)
  * @author Ezagren
  * @author J Subhi
  */
@@ -2983,7 +3202,6 @@ $1:Cuntuh.jpg|Judul2',
 	'wikieditor-toolbar-tool-replace-replace' => 'Ganti lawan:',
 	'wikieditor-toolbar-tool-replace-case' => 'Rasukakan abjad ganal/halus',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Gagai dudinya',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Ganti dudinya',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ganti samunyaan',
 	'wikieditor-toolbar-tool-replace-close' => 'Tuhup',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Panggagaian Pian kadada ruhuinya.',
@@ -3144,7 +3362,7 @@ $messages['bn'] = array(
 	'wikieditor-toolbar-tool-heading-4' => 'শিরোনাম ৪',
 	'wikieditor-toolbar-tool-heading-5' => 'শিরোনাম ৫',
 	'wikieditor-toolbar-tool-heading-example' => 'শিরোনাম লেখ',
-	'wikieditor-toolbar-group-format' => 'তালিকা',
+	'wikieditor-toolbar-group-format' => 'ফরম্যাট',
 	'wikieditor-toolbar-tool-ulist' => 'বুলেটকৃত তালিকা',
 	'wikieditor-toolbar-tool-ulist-example' => 'বুলেটকৃত তালিকা আইটেম',
 	'wikieditor-toolbar-tool-olist' => 'সংখ্যায়িত তালিকা',
@@ -3203,9 +3421,9 @@ $1:Example.jpg|ক্যাপশন২',
 	'wikieditor-toolbar-tool-replace-case' => 'অক্ষরের ছাঁদ মেলানো',
 	'wikieditor-toolbar-tool-replace-regex' => 'অনুসন্ধান বাক্যকে রেগুলার এক্সপ্রেশন হিসেবে গন্য করো',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'পরবর্তী অনুসন্ধান',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'পরবর্তী প্রতিস্থাপন',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'প্রতিস্থাপন',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'সব প্রতিস্থাপন',
-	'wikieditor-toolbar-tool-replace-close' => 'বাতিল',
+	'wikieditor-toolbar-tool-replace-close' => 'বন্ধ',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'আপনার অনুসন্ধান কোনো কিছুর সাথে মিলেনি।',
 	'wikieditor-toolbar-tool-replace-success' => '$1 টি প্রতিস্থাপন সম্পন্ন হয়েছে।',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'আপনি অনুসন্ধানের জন্য কোনো কিছু দেননি।',
@@ -3439,7 +3657,6 @@ $1:Example.jpg|ক্যাপশন২',
 	'wikieditor-toolbar-tool-replace-case' => 'মেয়েকর অংতা মিলা',
 	'wikieditor-toolbar-tool-replace-regex' => 'বিসারতেই খন্তাহানরে রেগুলার এক্সপ্রেশনহান বুলিয়া দর',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'থাঙনাত বিসারা',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'থাঙনাত সিলকর',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'হাবি বদালা',
 	'wikieditor-toolbar-tool-replace-close' => 'ঝিপা',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'তি যেহান বিসারার অহান কিত্তার লগেউ না মিলের',
@@ -3625,7 +3842,7 @@ Hag ul liamm diabarzh eo a fell deoc'h lakaat?",
 	'wikieditor-toolbar-tool-nowiki' => 'Hep ereadur wiki',
 	'wikieditor-toolbar-tool-nowiki-example' => "Ensoc'hañ amañ un destenn difurmad",
 	'wikieditor-toolbar-tool-redirect' => 'Adkas',
-	'wikieditor-toolbar-tool-redirect-example' => 'Anv ar bajenn bal',
+	'wikieditor-toolbar-tool-redirect-example' => 'Anv ar bajenn da dizhout',
 	'wikieditor-toolbar-tool-big' => 'Bras',
 	'wikieditor-toolbar-tool-big-example' => 'Mell testenn',
 	'wikieditor-toolbar-tool-small' => 'Bihan',
@@ -3674,7 +3891,7 @@ $1:Skouer.jpg|Deskrivadur2',
 	'wikieditor-toolbar-tool-replace-case' => "Diforc'hañ Pennlizherennoù/Lizherennoù bihan",
 	'wikieditor-toolbar-tool-replace-regex' => 'Sellet ouzh ar chadennad klask evel ouzh ur jedad reoliek',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Kavout an hini da-heul',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => "Erlec'hiañ an hini da-heul",
+	'wikieditor-toolbar-tool-replace-button-replace' => "Erlec'hiañ",
 	'wikieditor-toolbar-tool-replace-button-replaceall' => "Erlec'hiañ pep tra",
 	'wikieditor-toolbar-tool-replace-close' => 'Serriñ',
 	'wikieditor-toolbar-tool-replace-nomatch' => "N'eus bet kavet netra o klotañ gant ar pezh a glaskit.",
@@ -3689,6 +3906,7 @@ $1:Skouer.jpg|Deskrivadur2',
 	'wikieditor-toolbar-characters-page-greek' => 'Gresianek',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kirillek',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabek',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabeg astennet',
 	'wikieditor-toolbar-characters-page-persian' => 'Perseg',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraek',
 	'wikieditor-toolbar-characters-page-bangla' => 'Banglaek',
@@ -3750,7 +3968,7 @@ $1:Skouer.jpg|Deskrivadur2',
 	'wikieditor-toolbar-help-content-reference-result' => "Testenn ar bajenn.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-rereference-description' => 'Adimplij eus an hevelep daveenn',
 	'wikieditor-toolbar-help-content-rereference-result' => "Testenn ar bajenn.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-showreferences-description' => 'Dispakañ an daveennoù',
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Diskwel an daveennoù',
 	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Anv al liamm</a>, testenn ouzhpenn.</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Sinadur gant an deiziad',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Anv implijer</a> (<a href='#' title='{{#special:mytalk}}'>kaozeal</a>) 15:54, 10 Mezheven 2009 (UTC)",
@@ -3907,7 +4125,6 @@ $1:Example.jpg|Opis2',
 	'wikieditor-toolbar-tool-replace-case' => 'Razlikuj velika i mala slova',
 	'wikieditor-toolbar-tool-replace-regex' => 'Smatraj traženi pojam kao regularni izraz',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Nađi slijedeći',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Zamijeni slijedeći',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zamijeni sve',
 	'wikieditor-toolbar-tool-replace-close' => 'Zatvori',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Vaša pretraga nije dala nijedan rezultat.',
@@ -3995,10 +4212,12 @@ $1:Example.jpg|Opis2',
 );
 
 /** Catalan (Català)
+ * @author BroOk
  * @author Martorell
  * @author Paucabot
  * @author SMP
  * @author Solde
+ * @author Toniher
  * @author Vriullop
  */
 $messages['ca'] = array(
@@ -4034,6 +4253,7 @@ $messages['ca'] = array(
 	'wikieditor-toolbar-desc' => "Barra d'eines d'edició amb usabilitat millorada",
 	'wikieditor-toolbar-preference' => "Habilita la barra d'eines millorada",
 	'wikieditor-toolbar-dialogs-preference' => 'Habilita caixes de diàleg per inserir enllaços, taules i altres',
+	'wikieditor-toolbar-hidesig' => "Amaga el botó de signar de les pàgines de l'espai de noms principal",
 	'wikieditor-toolbar-loading' => 'Carregant...',
 	'wikieditor-toolbar-tool-bold' => 'Negreta',
 	'wikieditor-toolbar-tool-bold-example' => 'Text en negreta',
@@ -4142,7 +4362,7 @@ $1:Example.jpg|Peu2',
 	'wikieditor-toolbar-tool-replace-case' => 'Distingeix majúscules/minúscules',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tracta la cadena de cerca com una expressió regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Cerca següent',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Substitueix següent',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Reemplaça',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Substitueix-ho tot',
 	'wikieditor-toolbar-tool-replace-close' => 'Tanca',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'La vostra cerca no ha trobat cap coincidència.',
@@ -4157,6 +4377,7 @@ $1:Example.jpg|Peu2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grec',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Ciríŀlic',
 	'wikieditor-toolbar-characters-page-arabic' => 'Aràbic',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Aràbic estès',
 	'wikieditor-toolbar-characters-page-persian' => 'Persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreu',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalí',
@@ -4372,7 +4593,6 @@ $1:Example.jpg|Цуьнах лаце2',
 	'wikieditor-toolbar-tool-replace-case' => 'Яздар тидаме оьцуш',
 	'wikieditor-toolbar-tool-replace-regex' => 'Хилийта могlа юх-юха лохуш долу дош',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Караде тlаьхьадогlург',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Тlаьхьадогlург хийца',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Деригге хийца',
 	'wikieditor-toolbar-tool-replace-close' => 'Дlачlагlа',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Хьан дехарца хlумма ца карийна.',
@@ -4492,7 +4712,7 @@ $messages['ckb'] = array(
 	'wikieditor-template-editor-dialog-cancel' => 'ھەڵوەشاندنەوە',
 	'wikieditor-templates-preference' => 'مۆڵەتدانی کۆکردنەوەی داڕێژە',
 	'wikieditor-toc-preference' => 'خستنەکاری خشتە ڕێدۆزەکانی ناوەڕۆک',
-	'wikieditor-toc-show' => 'نیشاندانی ناوەڕۆک',
+	'wikieditor-toc-show' => 'ناوەرۆک نیشانبدە',
 	'wikieditor-toc-hide' => 'شاردنەوەی ناوەڕۆک',
 	'wikieditor-toolbar' => 'شریتامرازی دەستکاریکردن',
 	'wikieditor-toolbar-desc' => 'شریتامرازی پەڕەی دەستکاریکردن بە کارەمەیی پەرەپێدراو',
@@ -4605,7 +4825,6 @@ $1:نموونە.jpg|شرۆڤەی ٢',
 	'wikieditor-toolbar-tool-replace-case' => 'کوت و مت وەک خۆی',
 	'wikieditor-toolbar-tool-replace-regex' => 'لەگەڵ نووسەی گەڕانەکە وەک دەقی ڕێک ھەڵسوکەوت بکە',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'دوای ئەمە بدۆزەوە',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'ئەوەی دواتر جێگۆڕکە',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'ھەموویان جێگیر بکە',
 	'wikieditor-toolbar-tool-replace-close' => 'دایخە',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'گەڕانەکەت لەگەڵ ھیچ شتێک نەگونجا.',
@@ -4620,12 +4839,15 @@ $1:نموونە.jpg|شرۆڤەی ٢',
 	'wikieditor-toolbar-characters-page-greek' => 'یۆنانی',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'سیریلیک',
 	'wikieditor-toolbar-characters-page-arabic' => 'عەرەبی',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'عەرەبیی پەرەپێدراو',
 	'wikieditor-toolbar-characters-page-persian' => 'فارسی',
 	'wikieditor-toolbar-characters-page-hebrew' => 'عیبری',
 	'wikieditor-toolbar-characters-page-bangla' => 'بەنگالی',
 	'wikieditor-toolbar-characters-page-telugu' => 'تێلوگو',
 	'wikieditor-toolbar-characters-page-sinhala' => 'سینھالا',
 	'wikieditor-toolbar-characters-page-gujarati' => 'گوجەراتی',
+	'wikieditor-toolbar-characters-page-thai' => 'تایلەندی',
+	'wikieditor-toolbar-characters-page-khmer' => 'خمێری',
 	'wikieditor-toolbar-section-help' => 'یارمەتی',
 	'wikieditor-toolbar-help-heading-description' => 'وەسف',
 	'wikieditor-toolbar-help-heading-syntax' => 'ئەوی تایپی دەکەی',
@@ -4844,7 +5066,7 @@ $1:Příklad.jpg|Titulek 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Rozlišovat velikost písmen',
 	'wikieditor-toolbar-tool-replace-regex' => 'Hledat pomocí regulárního výrazu',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Najít další',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Nahradit další',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Nahradit',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Nahradit vše',
 	'wikieditor-toolbar-tool-replace-close' => 'Zavřít',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Zadanému hledání nic neodpovídá.',
@@ -4859,6 +5081,7 @@ $1:Příklad.jpg|Titulek 2',
 	'wikieditor-toolbar-characters-page-greek' => 'Řecká abeceda',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrilice',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabské písmo',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Rozšíření arabštiny',
 	'wikieditor-toolbar-characters-page-persian' => 'Perština',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrejské písmo',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengálské písmo',
@@ -5179,7 +5402,7 @@ $1:Enghraifft.jpg|Disgrifiad2',
 	'wikieditor-toolbar-tool-replace-case' => 'Trin llythrennau mawr a bach fel llythrennau gwahanol',
 	'wikieditor-toolbar-tool-replace-regex' => 'Trin y llinyn chwilio fel ymadrodd rheolaidd',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Chwilio am y nesaf',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => "Disodli'r nesaf",
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Disodli',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => "Disodli'r cwbwl",
 	'wikieditor-toolbar-tool-replace-close' => 'Cau',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Ni chanfyddwyd yr hyn a chwiliwyd amdano.',
@@ -5194,6 +5417,7 @@ $1:Enghraifft.jpg|Disgrifiad2',
 	'wikieditor-toolbar-characters-page-greek' => 'Groeg',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrilig',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabeg',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabeg estynedig',
 	'wikieditor-toolbar-characters-page-persian' => 'Perseg',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraeg',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
@@ -5416,7 +5640,7 @@ $1:Eksempel.jpg|Billedtekst2',
 	'wikieditor-toolbar-tool-replace-case' => 'Skeln mellem store og små bogstaver',
 	'wikieditor-toolbar-tool-replace-regex' => 'Behandl søgestrengen som et regulært udtryk',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Find næste',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Erstat alle',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Erstat',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Erstat alle',
 	'wikieditor-toolbar-tool-replace-close' => 'Luk',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Din søgning gav ingen resultater',
@@ -5431,6 +5655,7 @@ $1:Eksempel.jpg|Billedtekst2',
 	'wikieditor-toolbar-characters-page-greek' => 'Græsk',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillisk',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabisk',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Udvidet arabisk',
 	'wikieditor-toolbar-characters-page-persian' => 'Persisk',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraisk',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
@@ -5511,6 +5736,7 @@ $1:Eksempel.jpg|Billedtekst2',
  * @author MF-Warburg
  * @author Metalhead64
  * @author Mikullovci11
+ * @author Ojay
  * @author Umherirrender
  * @author Ziko
  * @author ✓
@@ -5519,14 +5745,14 @@ $messages['de'] = array(
 	'wikieditor' => 'Fortgeschrittener Wikitext-Editor',
 	'wikieditor-desc' => 'Ermöglicht eine erweiterbare Oberfläche zur Wikitext-Bearbeitung sowie viele weitere neue Funktionen',
 	'wikieditor-wikitext-tab' => 'Wikitext',
-	'wikieditor-loading' => 'Lade',
-	'wikieditor-preview-preference' => 'Gegenüberstellungs-Vorschau ermöglichen',
+	'wikieditor-loading' => 'Am Laden …',
+	'wikieditor-preview-preference' => 'Gegenüberstellungsvorschau ermöglichen',
 	'wikieditor-preview-tab' => 'Vorschau',
 	'wikieditor-preview-changes-tab' => 'Änderungen',
-	'wikieditor-preview-loading' => 'lädt …',
+	'wikieditor-preview-loading' => 'Am Laden …',
 	'wikieditor-previewDialog-preference' => 'Aktiviere die Abfrage zur Vorschau',
 	'wikieditor-previewDialog-tab' => 'Vorschau',
-	'wikieditor-previewDialog-loading' => 'lädt …',
+	'wikieditor-previewDialog-loading' => 'Am Laden …',
 	'wikieditor-publish-preference' => 'Schritt-für-Schritt-Veröffentlichung ermöglichen',
 	'wikieditor-publish-button-publish' => 'Veröffentlichen',
 	'wikieditor-publish-button-cancel' => 'Abbrechen',
@@ -5541,7 +5767,7 @@ $messages['de'] = array(
 	'wikieditor-template-editor-dialog-submit' => 'Aktualisieren',
 	'wikieditor-template-editor-dialog-cancel' => 'Abbrechen',
 	'wikieditor-templates-preference' => 'Aktivierung des Ein- und Ausblendens von Vorlagen',
-	'wikieditor-toc-preference' => 'Inhaltsverzeichnis im Bearbeiten-Fenster aktivieren',
+	'wikieditor-toc-preference' => 'Inhaltsverzeichnis im Bearbeitungsfenster aktivieren',
 	'wikieditor-toc-show' => 'Inhaltsverzeichnis einblenden',
 	'wikieditor-toc-hide' => 'Inhaltsverzeichnis ausblenden',
 	'wikieditor-toolbar' => 'Bearbeiten-Werkzeugleiste',
@@ -5549,7 +5775,7 @@ $messages['de'] = array(
 	'wikieditor-toolbar-preference' => 'Erweiterte Bearbeiten-Werkzeugleiste aktivieren',
 	'wikieditor-toolbar-dialogs-preference' => 'Dialoge für das Einfügen von Links, Tabellen usw. aktivieren',
 	'wikieditor-toolbar-hidesig' => 'Den Unterschriftsbutton bei Seiten im Artikelnamensraum ausblenden',
-	'wikieditor-toolbar-loading' => 'Laden …',
+	'wikieditor-toolbar-loading' => 'Am Laden …',
 	'wikieditor-toolbar-tool-bold' => 'Fett',
 	'wikieditor-toolbar-tool-bold-example' => 'Fetter Text',
 	'wikieditor-toolbar-tool-italic' => 'Kursiv',
@@ -5561,9 +5787,9 @@ $messages['de'] = array(
 	'wikieditor-toolbar-tool-link' => 'Link',
 	'wikieditor-toolbar-tool-link-title' => 'Link einfügen',
 	'wikieditor-toolbar-tool-link-int' => 'Zu einer Wiki-Seite',
-	'wikieditor-toolbar-tool-link-int-target' => 'Seitentitel:',
+	'wikieditor-toolbar-tool-link-int-target' => 'Zielseite oder URL:',
 	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Titel der Seite oder URL',
-	'wikieditor-toolbar-tool-link-int-text' => 'Anzeige im Text:',
+	'wikieditor-toolbar-tool-link-int-text' => 'angezeigter Text/Linktext:',
 	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Text eingeben, der angezeigt werden soll',
 	'wikieditor-toolbar-tool-link-ext' => 'Zu einer externen Internetseite',
 	'wikieditor-toolbar-tool-link-ext-target' => 'URL des Links:',
@@ -5575,7 +5801,7 @@ $messages['de'] = array(
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Ungültiger Titel',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Externer Link',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Prüfe, ob Seite existiert …',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Der von dir angegebene Seitenname ist ungültig.',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Der angegebene Seitenname ist ungültig.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Die angegebene URL sieht so aus, als ob sie auf eine andere Wikiseite verlinken würde.
 Möchtest du daraus einen internen Link machen?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Interner Link',
@@ -5583,7 +5809,7 @@ Möchtest du daraus einen internen Link machen?',
 	'wikieditor-toolbar-tool-link-empty' => 'Du hast nichts zum Verlinken angegeben.',
 	'wikieditor-toolbar-tool-file' => 'Eingebettete Datei',
 	'wikieditor-toolbar-tool-file-example' => 'Beispiel.jpg',
-	'wikieditor-toolbar-tool-reference' => 'Beleg',
+	'wikieditor-toolbar-tool-reference' => 'Quellennachweis',
 	'wikieditor-toolbar-tool-reference-example' => 'Fußnotentext hier einfügen',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Abbrechen',
 	'wikieditor-toolbar-tool-reference-title' => 'Einzelnachweis einfügen',
@@ -5657,7 +5883,7 @@ $1:Beispiel.jpg|Beschreibung2',
 	'wikieditor-toolbar-tool-replace-case' => 'Groß- und Kleinschreibung beachten',
 	'wikieditor-toolbar-tool-replace-regex' => 'Suchzeichenkette als regulären Ausdruck behandeln',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Nächste finden',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Nächste ersetzen',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Ersetzen',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Alle ersetzen',
 	'wikieditor-toolbar-tool-replace-close' => 'Schließen',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Deine Suche hat keine Ergebnisse erbracht.',
@@ -5672,6 +5898,7 @@ $1:Beispiel.jpg|Beschreibung2',
 	'wikieditor-toolbar-characters-page-greek' => 'Griechisch',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillisch',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabisch',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Erweitertes Arabisch',
 	'wikieditor-toolbar-characters-page-persian' => 'Persisch',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebräisch',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalisch',
@@ -5728,7 +5955,7 @@ $1:Beispiel.jpg|Beschreibung2',
 	'wikieditor-toolbar-help-content-file-description' => 'Eingebettete Datei',
 	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Beispiel.png|thumb|Beschreibung]]',
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Beschreibung' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Vergrößern' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Beschreibung</div></div>",
-	'wikieditor-toolbar-help-content-reference-description' => 'Beleg',
+	'wikieditor-toolbar-help-content-reference-description' => 'Quellennachweis',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'Seitentext.&lt;ref name="test"&gt;[http://www.beispiel.org Linktext], zusätzlicher Text.&lt;/ref&gt;',
 	'wikieditor-toolbar-help-content-reference-result' => "Seitentext.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-rereference-description' => 'Den gleichen Beleg erneut verwenden',
@@ -5749,7 +5976,6 @@ $1:Beispiel.jpg|Beschreibung2',
  */
 $messages['de-formal'] = array(
 	'wikieditor-publish-dialog-summary' => 'Zusammenfassung (kurze Beschreibung der von Ihnen vorgenommenen Änderungen):',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Der von Ihnen angegebene Titel ist ungültig.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Die angegebene URL sieht so aus, als ob sie auf eine andere Wikiseite verlinken würde.
 Möchten Sie daraus einen internen Link machen?',
 	'wikieditor-toolbar-tool-link-empty' => 'Sie haben nichts zum Verlinken angegeben.',
@@ -5761,6 +5987,7 @@ Möchten Sie daraus einen internen Link machen?',
 );
 
 /** Zazaki (Zazaki)
+ * @author Erdemaslancan
  * @author Mirzali
  * @author Xoser
  */
@@ -5785,7 +6012,7 @@ $messages['diq'] = array(
 	'wikieditor-publish-dialog-publish' => 'Çap ke',
 	'wikieditor-publish-dialog-goback' => 'Reyna şi',
 	'wikieditor-template-editor-preference' => 'Vurnayışê form-bıngeyınê şablonanê wikiy feal ke',
-	'wikieditor-template-editor-dialog-title' => 'Template bivurne',
+	'wikieditor-template-editor-dialog-title' => 'Sabloni bivurnê',
 	'wikieditor-template-editor-dialog-submit' => 'Rocaniye',
 	'wikieditor-template-editor-dialog-cancel' => 'Bıtexelne',
 	'wikieditor-templates-preference' => 'Qic kerdisê sabloni a bike',
@@ -5904,7 +6131,6 @@ $1:misal.jpg|nuşteyê resmi2',
 	'wikieditor-toolbar-tool-replace-case' => 'harfa gırd u qıci re hessas o',
 	'wikieditor-toolbar-tool-replace-regex' => 'qutiya cıgerayişi de yew muameleya ifade bıker.',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'dıma ke yeno bıvin',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'o bin bıvurn',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'pêroyin bıvurn',
 	'wikieditor-toolbar-tool-replace-close' => 'Bıqefelne',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'çi yo ke şıma gêrenê cı çin o.',
@@ -6024,6 +6250,7 @@ $messages['dsb'] = array(
 	'wikieditor-toolbar-desc' => 'Rědowa kšoma za wobźěłowanje bokow z pólěpšoneju wužywajobnosću',
 	'wikieditor-toolbar-preference' => 'Pólěpšonu wobźěłowańsku rědowu kšomu aktiwěrowaś',
 	'wikieditor-toolbar-dialogs-preference' => 'Dialogi za zasajźenje wótkazow, tabelow a hynakšego zmóžniś',
+	'wikieditor-toolbar-hidesig' => 'Pódpisowy tłočašk w bokach w głownem mjenjowem rumje schowaś',
 	'wikieditor-toolbar-loading' => 'Zacytujo se...',
 	'wikieditor-toolbar-tool-bold' => 'Tucny',
 	'wikieditor-toolbar-tool-bold-example' => 'Tucny tekst',
@@ -6132,7 +6359,7 @@ $1:Pśikład.jpg|Pópisanje2',
 	'wikieditor-toolbar-tool-replace-case' => 'Wótpowědnik',
 	'wikieditor-toolbar-tool-replace-regex' => 'Z pytańskim teksto ako z regularnym wurazom wobchadaś',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Dalej pytaś',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Dalej wuměniś',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Wuměniś',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Wšykne wuměniś',
 	'wikieditor-toolbar-tool-replace-close' => 'Zacyniś',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Twójo pytanje njejo žedno wustupowanje namakało.',
@@ -6147,6 +6374,7 @@ $1:Pśikład.jpg|Pópisanje2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grichiske',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyriliske',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabiske',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Rozšyrjona arabšćina',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiske',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrejske',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalšćina',
@@ -6220,6 +6448,7 @@ $1:Pśikład.jpg|Pópisanje2',
 );
 
 /** Greek (Ελληνικά)
+ * @author AK
  * @author Dead3y3
  * @author Flyax
  * @author Geraki
@@ -6369,7 +6598,7 @@ $1:Example.jpg|Λεζάντα2',
 	'wikieditor-toolbar-tool-replace-case' => 'Ταίριασμα πεζών-κεφαλαίων',
 	'wikieditor-toolbar-tool-replace-regex' => 'Το αναζητούμενο κείμενο είναι κανονική έκφραση',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Εύρεση επόμενου',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Αντικατάσταση επομένου',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Αντικατάσταση',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Αντικατάσταση όλων',
 	'wikieditor-toolbar-tool-replace-close' => 'Κλείσιμο',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Η αναζήτηση δεν ταίριαξε με κάτι.',
@@ -6473,7 +6702,7 @@ $messages['eo'] = array(
 	'wikieditor-preview-tab' => 'Antaŭvido',
 	'wikieditor-preview-changes-tab' => 'Ŝanĝoj',
 	'wikieditor-preview-loading' => 'Ŝargante...',
-	'wikieditor-previewDialog-preference' => 'Ebligi antaŭprezentan dialogon',
+	'wikieditor-previewDialog-preference' => 'Ŝalti antaŭvidan dialogon',
 	'wikieditor-previewDialog-tab' => 'Antaŭvido',
 	'wikieditor-previewDialog-loading' => 'Ŝargante...',
 	'wikieditor-publish-preference' => 'Ŝalti po-paŝan eldonadon',
@@ -6606,7 +6835,7 @@ $1:Ekzemplo.jpg|Teksto2 pri dosiero',
 	'wikieditor-toolbar-tool-replace-case' => 'Gravas ĉu majusklo / minusklo',
 	'wikieditor-toolbar-tool-replace-regex' => 'Trakti signoĉenon kiel regularan esprimon',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Trovi sekvan',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Anstataŭigi sekvan',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Anstataŭigi',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Anstataŭigi ĉiujn',
 	'wikieditor-toolbar-tool-replace-close' => 'Fermi',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Via serĉo trafis nenion.',
@@ -6621,6 +6850,7 @@ $1:Ekzemplo.jpg|Teksto2 pri dosiero',
 	'wikieditor-toolbar-characters-page-greek' => 'Greka',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirila',
 	'wikieditor-toolbar-characters-page-arabic' => 'Araba',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'araba etendite',
 	'wikieditor-toolbar-characters-page-persian' => 'persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrea',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengala',
@@ -6696,6 +6926,7 @@ $1:Ekzemplo.jpg|Teksto2 pri dosiero',
 /** Spanish (Español)
  * @author AlimanRuna
  * @author Crazymadlover
+ * @author Fitoschido
  * @author Imre
  * @author Locos epraix
  * @author McDutchie
@@ -6738,6 +6969,7 @@ $messages['es'] = array(
 	'wikieditor-toolbar-desc' => 'Barra de herramientas de la página de edición con usabilidad mejorada',
 	'wikieditor-toolbar-preference' => 'Habilitar la barra de herramientas de edición mejorada',
 	'wikieditor-toolbar-dialogs-preference' => 'Habilitar diálogos para insertar enlaces, tablas y más',
+	'wikieditor-toolbar-hidesig' => 'Ocultar el botón firmar de las páginas en el espacio de nombres principal',
 	'wikieditor-toolbar-loading' => 'Cargando...',
 	'wikieditor-toolbar-tool-bold' => 'Negrita',
 	'wikieditor-toolbar-tool-bold-example' => 'Texto en negrita',
@@ -6846,7 +7078,7 @@ $1:Ejemplo.jpg|Descripción2',
 	'wikieditor-toolbar-tool-replace-case' => 'Considerar mayúsculas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratar la cadena de búsqueda como expresión regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Buscar siguiente',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Reemplazar siguiente',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Reemplazar',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Reemplazar todo',
 	'wikieditor-toolbar-tool-replace-close' => 'Cerrar',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Su búsqueda no halló resultados.',
@@ -6861,6 +7093,7 @@ $1:Ejemplo.jpg|Descripción2',
 	'wikieditor-toolbar-characters-page-greek' => 'Griego',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirílico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Árabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arábico extendido',
 	'wikieditor-toolbar-characters-page-persian' => 'Persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreo',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalí',
@@ -6875,7 +7108,7 @@ $1:Ejemplo.jpg|Descripción2',
 	'wikieditor-toolbar-help-heading-syntax' => 'Lo que escribe',
 	'wikieditor-toolbar-help-heading-result' => 'Lo que obtiene',
 	'wikieditor-toolbar-help-page-format' => 'Formateando',
-	'wikieditor-toolbar-help-page-link' => 'Vínculos',
+	'wikieditor-toolbar-help-page-link' => 'Enlaces',
 	'wikieditor-toolbar-help-page-heading' => 'Encabezados',
 	'wikieditor-toolbar-help-page-list' => 'Listas',
 	'wikieditor-toolbar-help-page-file' => 'Archivos',
@@ -7074,7 +7307,7 @@ $1:Näide.jpg|Pildiallkiri2',
 	'wikieditor-toolbar-tool-replace-replace' => 'Asendaja:',
 	'wikieditor-toolbar-tool-replace-case' => 'Tõstutundlik',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Otsi järgmine',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Asenda järgmine',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Asenda',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Asenda kõik',
 	'wikieditor-toolbar-tool-replace-close' => 'Sulge',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Ühtegi otsitavat ei leitud.',
@@ -7089,6 +7322,7 @@ $1:Näide.jpg|Pildiallkiri2',
 	'wikieditor-toolbar-characters-page-greek' => 'Kreeka',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kirillitsa',
 	'wikieditor-toolbar-characters-page-arabic' => 'Araabia',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Araabia (laiendatud)',
 	'wikieditor-toolbar-characters-page-persian' => 'Pärsia',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Heebrea',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
@@ -7165,6 +7399,7 @@ $1:Näide.jpg|Pildiallkiri2',
  * @author An13sa
  * @author Inorbez
  * @author Joxemai
+ * @author Xabier Armendaritz
  */
 $messages['eu'] = array(
 	'wikieditor' => 'Wikitestu edizio-interfaze aurreratua',
@@ -7239,7 +7474,7 @@ Barne lotura bezala sortu nahi duzu?',
 	'wikieditor-toolbar-tool-reference-title' => 'Txertatu erreferentzia',
 	'wikieditor-toolbar-tool-reference-insert' => 'Txertatu',
 	'wikieditor-toolbar-tool-reference-text' => 'Erreferentzia-testua',
-	'wikieditor-toolbar-tool-signature' => 'Sinadura data eta orduarekin',
+	'wikieditor-toolbar-tool-signature' => 'Sinadura, eguna eta ordua',
 	'wikieditor-toolbar-section-advanced' => 'Aurreratua',
 	'wikieditor-toolbar-tool-heading' => 'Izenburua',
 	'wikieditor-toolbar-tool-heading-1' => '1. maila',
@@ -7302,12 +7537,12 @@ $1:Adibidea.jpg|Oina2',
 	'wikieditor-toolbar-tool-table-zero' => 'Ezin duzu 0 errenkada edo zutabe duen taularik txertatu.',
 	'wikieditor-toolbar-tool-replace' => 'Bilatu eta ordezkatu',
 	'wikieditor-toolbar-tool-replace-title' => 'Bilatu eta aldatu',
-	'wikieditor-toolbar-tool-replace-search' => 'Honakoa bilatu:',
+	'wikieditor-toolbar-tool-replace-search' => 'Bilatu hau:',
 	'wikieditor-toolbar-tool-replace-replace' => 'Honegatik aldatu:',
 	'wikieditor-toolbar-tool-replace-case' => 'Bilaketa zehatza',
 	'wikieditor-toolbar-tool-replace-regex' => 'Bilaketa hitzak espresio erregular gisa tratatu',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Hurrengoa bilatu',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Hurrengoa ordezkatu',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Ordezkatu',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Denak ordezkatu',
 	'wikieditor-toolbar-tool-replace-close' => 'Itxi',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Ez dago bilaketarekin bat egiten duten emaitzarik.',
@@ -7385,8 +7620,8 @@ $1:Adibidea.jpg|Oina2',
 	'wikieditor-toolbar-help-content-rereference-result' => "Orrialdearen testua.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-showreferences-description' => 'Erreferentziak erakutsi',
 	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.adibidea.org' class='external text' href='#'>Loturaren testua</a>, testu gehigarria.</li></ol>",
-	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Sindaura data eta orduarekin',
-	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Lankide izena</a> (<a href='#' title='{{#special:mytalk}}'>eztabaida</a>) 15:54, 10 Ekaina 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Sindaura, eguna eta ordua',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Lankide izena</a> (<a href='#' title='{{#special:mytalk}}'>eztabaida</a>) 2009-06-10, 15:54 (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'Sinadura',
 	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Lankide izena</a> (<a href='#' title='{{#special:mytalk}}'>eztabaida</a>)",
 	'wikieditor-toolbar-help-content-indent-description' => 'Koska',
@@ -7398,7 +7633,9 @@ $1:Adibidea.jpg|Oina2',
  * @author Ebraminio
  * @author Huji
  * @author Ladsgroup
+ * @author Mjbmr
  * @author Wayiran
+ * @author ZxxZxxZ
  */
 $messages['fa'] = array(
 	'wikieditor' => 'رابط ویرایش پیشرفته ویکی‌متن',
@@ -7436,7 +7673,7 @@ $messages['fa'] = array(
 	'wikieditor-toolbar-hidesig' => 'نهفتن دکمهٔ امضا از صفحات در فضای نام اصلی',
 	'wikieditor-toolbar-loading' => 'در حال بارگذاری...',
 	'wikieditor-toolbar-tool-bold' => 'ضخیم',
-	'wikieditor-toolbar-tool-bold-example' => 'متن ضخیم',
+	'wikieditor-toolbar-tool-bold-example' => 'متن پررنگ',
 	'wikieditor-toolbar-tool-italic' => 'مورب',
 	'wikieditor-toolbar-tool-italic-example' => 'متن مورب',
 	'wikieditor-toolbar-tool-ilink' => 'پیوند داخلی',
@@ -7541,7 +7778,7 @@ $1:مثال.jpg|عنوان ۲',
 	'wikieditor-toolbar-tool-replace-case' => 'تطبیق بزرگی و کوچکی حروف',
 	'wikieditor-toolbar-tool-replace-regex' => 'به‌کارگیری عبارت جستجو به عنوان یک عبارت باقاعده',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'یافتن بعدی',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'جایگزین کردن بعدی',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'جایگزینی',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'جایگزین کردن همه موارد',
 	'wikieditor-toolbar-tool-replace-close' => 'بستن',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'جستجوی شما با هیچ موردی مطابقت نداشت.',
@@ -7556,6 +7793,7 @@ $1:مثال.jpg|عنوان ۲',
 	'wikieditor-toolbar-characters-page-greek' => 'یونانی',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'سیریلیک',
 	'wikieditor-toolbar-characters-page-arabic' => 'عربی',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'عربی توسعه یافته',
 	'wikieditor-toolbar-characters-page-persian' => 'فارسی',
 	'wikieditor-toolbar-characters-page-hebrew' => 'عبری',
 	'wikieditor-toolbar-characters-page-bangla' => 'بنگالی',
@@ -7580,11 +7818,11 @@ $1:مثال.jpg|عنوان ۲',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''متن مورب''",
 	'wikieditor-toolbar-help-content-italic-result' => '<em>متن مورب</em>',
 	'wikieditor-toolbar-help-content-bold-description' => 'ضخیم',
-	'wikieditor-toolbar-help-content-bold-syntax' => "'''متن ضخیم'''",
-	'wikieditor-toolbar-help-content-bold-result' => '<strong>متن ضخیم</strong>',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''متن پررنگ'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>متن پررنگ</strong>',
 	'wikieditor-toolbar-help-content-bolditalic-description' => 'ضخیم و مورب',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''متن ضخیم و مورب'''''",
-	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>متن ضخیم و مورب</em></strong>',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''متن پررنگ و مورب'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>متن پررنگ و مورب</em></strong>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'پیوند داخلی',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[عنوان صفحه|عنوان پیوند]]<br />[[عنوان صفحه]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>عنوان پیوند</a><br /><a href='#'>عنوان صفحه</a>",
@@ -7630,7 +7868,9 @@ $1:مثال.jpg|عنوان ۲',
 
 /** Finnish (Suomi)
  * @author Crt
+ * @author Nedergard
  * @author Nike
+ * @author Olli
  * @author Silvonen
  * @author Str4nd
  * @author ZeiP
@@ -7668,6 +7908,7 @@ $messages['fi'] = array(
 	'wikieditor-toolbar-desc' => 'Muokkaussivun työkalupalkki paremmalla käytettävyydellä.',
 	'wikieditor-toolbar-preference' => 'Ota käyttöön parannettu työkalupalkki muokkauksissa',
 	'wikieditor-toolbar-dialogs-preference' => 'Ota käyttöön valintatoiminto, jonka avulla voit lisätä linkkejä, taulukoita ja muuta',
+	'wikieditor-toolbar-hidesig' => 'Piilota allekirjoituspainike sivuilta päänimiavaruudessa',
 	'wikieditor-toolbar-loading' => 'Ladataan…',
 	'wikieditor-toolbar-tool-bold' => 'Lihavointi',
 	'wikieditor-toolbar-tool-bold-example' => 'Lihavoitu teksti',
@@ -7776,7 +8017,7 @@ $1:Esimerkki.jpg|Kuvateksti2',
 	'wikieditor-toolbar-tool-replace-case' => 'Huomio kirjainkoko',
 	'wikieditor-toolbar-tool-replace-regex' => 'Kohtele hakuarvoa säännöllisenä lausekkeena',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Etsi seuraava',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Korvaa seuraava',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Korvaa',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Korvaa kaikki',
 	'wikieditor-toolbar-tool-replace-close' => 'Sulje',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Hakusi ei tuottanut osumia.',
@@ -7791,6 +8032,7 @@ $1:Esimerkki.jpg|Kuvateksti2',
 	'wikieditor-toolbar-characters-page-greek' => 'Kreikka',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillinen',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabia',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Laajennettu arabia',
 	'wikieditor-toolbar-characters-page-persian' => 'Persia',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Heprea',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
@@ -7845,7 +8087,7 @@ $1:Esimerkki.jpg|Kuvateksti2',
 	'wikieditor-toolbar-help-content-olist-syntax' => '# Luettelon kohta<br /># Luettelon kohta',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Luettelon kohta</li><li>Luettelon kohta</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'Tallennettu tiedosto',
-	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Esimerkki.png|thumb|Kuvateksti]]',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|Kuvateksti]]',
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Kuvateksti' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Suurenna' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Kuvateksti</div></div>",
 	'wikieditor-toolbar-help-content-reference-description' => 'Viite',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'Sivun teksti.&lt;ref name="testi"&gt;[http://www.example.org Linkin teksti], lisäteksti.&lt;/ref&gt;',
@@ -7865,6 +8107,7 @@ $1:Esimerkki.jpg|Kuvateksti2',
 
 /** French (Français)
  * @author Crochet.david
+ * @author Gomoko
  * @author IAlex
  * @author Jean-Frédéric
  * @author McDutchie
@@ -7894,7 +8137,7 @@ $messages['fr'] = array(
 	'wikieditor-publish-dialog-minor' => 'Modification mineure',
 	'wikieditor-publish-dialog-watch' => 'Suivre cette page',
 	'wikieditor-publish-dialog-publish' => 'Publier',
-	'wikieditor-publish-dialog-goback' => 'Retour',
+	'wikieditor-publish-dialog-goback' => 'Revenir en arrière',
 	'wikieditor-template-editor-preference' => 'Activer la modification à base de formulaires des modèles wiki',
 	'wikieditor-template-editor-dialog-title' => 'Modifier le modèle',
 	'wikieditor-template-editor-dialog-submit' => 'Mettre à jour',
@@ -8016,7 +8259,7 @@ $1:Exemple.jpg|Description 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Faire correspondre la casse',
 	'wikieditor-toolbar-tool-replace-regex' => 'Traiter la chaîne de recherche comme une expression rationnelle',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Rechercher le suivant',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Remplacer le suivant',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Remplacer',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Remplacer tout',
 	'wikieditor-toolbar-tool-replace-close' => 'Fermer',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Votre recherche n’a abouti à aucune correspondance.',
@@ -8031,6 +8274,7 @@ $1:Exemple.jpg|Description 2',
 	'wikieditor-toolbar-characters-page-greek' => 'grec',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'cyrillique',
 	'wikieditor-toolbar-characters-page-arabic' => 'arabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabe étendu',
 	'wikieditor-toolbar-characters-page-persian' => 'persan',
 	'wikieditor-toolbar-characters-page-hebrew' => 'hébreu',
 	'wikieditor-toolbar-characters-page-bangla' => 'bengalî',
@@ -8139,6 +8383,7 @@ $messages['frp'] = array(
 	'wikieditor-toolbar-desc' => 'Bârra d’outils d’èdicion avouéc l’utilisabilitât mèlyorâ',
 	'wikieditor-toolbar-preference' => 'Activar la bârra d’outils d’èdicion mèlyorâ',
 	'wikieditor-toolbar-dialogs-preference' => 'Activar les bouètes de dialogo por apondre des lims, des tablôs et ples',
+	'wikieditor-toolbar-hidesig' => 'Cachiér lo boton de signatura dens les pâges de l’èspâço de noms principâl',
 	'wikieditor-toolbar-loading' => 'Chargement...',
 	'wikieditor-toolbar-tool-bold' => 'Grâs',
 	'wikieditor-toolbar-tool-bold-example' => 'Tèxto en grâs',
@@ -8247,7 +8492,7 @@ $1:Ègzemplo.jpg|Dèscripcion 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Fâre corrèspondre la câssa',
 	'wikieditor-toolbar-tool-replace-regex' => 'Trètar la chêna de rechèrche coment una èxprèssion racionèla',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Rechèrchiér celi d’aprés',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Remplaciér celi d’aprés',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Remplaciér',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Remplaciér tot',
 	'wikieditor-toolbar-tool-replace-close' => 'Cllôre',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Voutra rechèrche at trovâ gins de corrèspondance.',
@@ -8262,6 +8507,7 @@ $1:Ègzemplo.jpg|Dèscripcion 2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grèco',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirilico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabo',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabo ètendu',
 	'wikieditor-toolbar-characters-page-persian' => 'Pèrsan',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hèbrèo',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
@@ -8505,7 +8751,6 @@ $1:Ballsampaill.jpg|Mìneachadh an deilbh2',
 	'wikieditor-toolbar-tool-replace-case' => 'Maids an ceas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Dèilig ris an t-sreath luirg mar regular expression',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Lorg an ath-fhear',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Cuir an àite an ath-fhir',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Cuir an àite gach aon dhiubh',
 	'wikieditor-toolbar-tool-replace-close' => 'Dùin',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Cha do fhreagair an lorg agad ri rud sam bith.',
@@ -8632,9 +8877,9 @@ $messages['gl'] = array(
 	'wikieditor-toolbar-tool-italic' => 'Cursiva',
 	'wikieditor-toolbar-tool-italic-example' => 'Texto en cursiva',
 	'wikieditor-toolbar-tool-ilink' => 'Ligazón interna',
-	'wikieditor-toolbar-tool-ilink-example' => 'Título de ligazón',
+	'wikieditor-toolbar-tool-ilink-example' => 'Título da ligazón',
 	'wikieditor-toolbar-tool-xlink' => 'Ligazón externa (lembre o prefixo http://)',
-	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com título de ligazón',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com título da ligazón',
 	'wikieditor-toolbar-tool-link' => 'Ligazón',
 	'wikieditor-toolbar-tool-link-title' => 'Inserir unha ligazón',
 	'wikieditor-toolbar-tool-link-int' => 'Cara a unha páxina wiki',
@@ -8734,7 +8979,7 @@ $1:Example.jpg|Pé_de_foto_2',
 	'wikieditor-toolbar-tool-replace-case' => 'Facer coincidir as maiúsculas e as minúsculas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratar a secuencia de busca como unha expresión regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Atopar o seguinte',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Substituír o seguinte',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Substituír',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Substituír todos',
 	'wikieditor-toolbar-tool-replace-close' => 'Pechar',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'A súa busca non atopou nada.',
@@ -8749,6 +8994,7 @@ $1:Example.jpg|Pé_de_foto_2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grego',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirílico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Árabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Árabe estendido',
 	'wikieditor-toolbar-characters-page-persian' => 'Persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreo',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalí',
@@ -8821,9 +9067,12 @@ $1:Example.jpg|Pé_de_foto_2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Texto normal<dl><dd>Texto con sangría<dl><dd>Texto con máis sangría</dd></dl></dd></dl>',
 );
 
-/** Ancient Greek (Ἀρχαία ἑλληνικὴ) */
+/** Ancient Greek (Ἀρχαία ἑλληνικὴ)
+ * @author Crazymadlover
+ */
 $messages['grc'] = array(
 	'wikieditor-publish-button-cancel' => 'Ἀκυροῦν',
+	'wikieditor-template-editor-dialog-cancel' => 'Ἀκυροῦν',
 	'wikieditor-toolbar' => 'Ἐργαλειοθήκη μεταγραφῆς',
 	'wikieditor-toolbar-loading' => 'Φορτίζειν…',
 	'wikieditor-toolbar-tool-bold' => 'ἔντονον',
@@ -8838,6 +9087,7 @@ $messages['grc'] = array(
 	'wikieditor-toolbar-tool-file' => 'Ἐμβεβαπτισμένον ἀρχεῖον',
 	'wikieditor-toolbar-tool-reference' => 'Ἀναφορά',
 	'wikieditor-toolbar-tool-reference-example' => 'Εἰσάγειν κείμενον παραπομπῆς ὧδε',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Ἀκυροῦν',
 	'wikieditor-toolbar-tool-signature' => 'Ὑπογραφή σου μετὰ χρονοσφραγίδος',
 	'wikieditor-toolbar-section-advanced' => 'Προεωσμένον',
 	'wikieditor-toolbar-tool-heading' => 'Ἐπικεφαλίς',
@@ -8912,6 +9162,7 @@ $messages['grc'] = array(
 );
 
 /** Swiss German (Alemannisch)
+ * @author Als-Chlämens
  * @author Als-Holder
  * @author Kghbln
  */
@@ -9057,7 +9308,6 @@ $1:Byschpil.jpg|Bschriftig2',
 	'wikieditor-toolbar-tool-replace-case' => 'Groß- un Chleibuechstabe unterscheide',
 	'wikieditor-toolbar-tool-replace-regex' => 'D Zeichechette wu gsuecht soll wäre as reguläre Uusdruck versueche',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Negschti sueche',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Negschti ersetze',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Alli ersetze',
 	'wikieditor-toolbar-tool-replace-close' => 'Zuemache',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Zue Dyyre Suech git s kei Träffer.',
@@ -9072,6 +9322,7 @@ $1:Byschpil.jpg|Bschriftig2',
 	'wikieditor-toolbar-characters-page-greek' => 'Griechisch',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillisch',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabisch',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Erwyyterts Arabisch',
 	'wikieditor-toolbar-characters-page-persian' => 'Persisch',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebräisch',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalisch',
@@ -9144,6 +9395,223 @@ $1:Byschpil.jpg|Bschriftig2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Normale Tekscht<dl><dd>Yygruckte Tekscht<dl><dd>Yygruckte Tekscht</dd></dl></dd></dl>',
 );
 
+/** Gujarati (ગુજરાતી)
+ * @author KartikMistry
+ * @author Sushant savla
+ */
+$messages['gu'] = array(
+	'wikieditor-wikitext-tab' => 'વિકિલેખન (વિકિટેક્સ્ટ)‌',
+	'wikieditor-loading' => 'લવાઇ રહ્યું છે...',
+	'wikieditor-preview-preference' => 'બાજુમાં પુન:અવલોકન ચાલુ રાખો',
+	'wikieditor-preview-tab' => 'પૂર્વાવલોકન',
+	'wikieditor-preview-changes-tab' => 'ફેરફારો',
+	'wikieditor-preview-loading' => 'લવાઇ રહ્યું છે...',
+	'wikieditor-previewDialog-preference' => 'સંભાષણ પુનરાવલોકન સક્રીય કરો',
+	'wikieditor-previewDialog-tab' => 'પૂર્વાવલોકન',
+	'wikieditor-previewDialog-loading' => 'લવાઇ રહ્યું છે...',
+	'wikieditor-publish-preference' => 'ટપ્પા વાર પ્રકાશન કાર્યાન્વીત કરો',
+	'wikieditor-publish-button-publish' => 'પ્રસિદ્ધ કરો',
+	'wikieditor-publish-button-cancel' => 'રદ કરો',
+	'wikieditor-publish-dialog-title' => '{{SITENAME}} પર પ્રસિદ્ધ કરો',
+	'wikieditor-publish-dialog-minor' => 'નાનકડો ફેરફાર',
+	'wikieditor-publish-dialog-watch' => 'આ પાનાને ધ્યાનમાં રાખો',
+	'wikieditor-publish-dialog-publish' => 'પ્રસિદ્ધ કરો',
+	'wikieditor-publish-dialog-goback' => 'પાછાં જાવ',
+	'wikieditor-template-editor-dialog-title' => 'ઢાંચામાં ફેરફાર કરો',
+	'wikieditor-template-editor-dialog-submit' => 'અદ્યતન કરો',
+	'wikieditor-template-editor-dialog-cancel' => 'રદ કરો',
+	'wikieditor-templates-preference' => 'ઢાંચાનું નીચે તરફ ફેલાવ સક્રીય કરો',
+	'wikieditor-toc-show' => 'ટિપ્પણીઓ બતાવો',
+	'wikieditor-toc-hide' => 'ટિપ્પણીઓ સંતાડો',
+	'wikieditor-toolbar' => 'ફેરફાર  સાધન કંપાસ',
+	'wikieditor-toolbar-desc' => 'પૃષ્ઠના ફેરફાર સાધનો ને વધારેલ વપરાશ સાધનો ધરાવતી પેટી ઉમેરી મુકો',
+	'wikieditor-toolbar-preference' => 'અદ્યતન સંપાદન સાધનો સક્રીય કરો',
+	'wikieditor-toolbar-dialogs-preference' => 'કડીઓ, કોઠા અને અન્ય વસ્તુઓ ઉમેરવા સંભાષણ સક્રીય કરો',
+	'wikieditor-toolbar-loading' => 'લવાઇ રહ્યું છે...',
+	'wikieditor-toolbar-tool-bold' => 'ઘાટું',
+	'wikieditor-toolbar-tool-bold-example' => 'ઘાટું લખાણ',
+	'wikieditor-toolbar-tool-italic' => 'ત્રાંસું',
+	'wikieditor-toolbar-tool-italic-example' => 'ત્રાંસું લખાણ',
+	'wikieditor-toolbar-tool-ilink' => 'આંતરિક કડી',
+	'wikieditor-toolbar-tool-ilink-example' => 'કડીનું શીર્ષક',
+	'wikieditor-toolbar-tool-xlink' => 'બાહ્ય કડી (શરૂઆતમાં http:// ઉમેરવાનું ભુલશો નહી)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com કડીનું શીર્ષક',
+	'wikieditor-toolbar-tool-link' => 'કડી',
+	'wikieditor-toolbar-tool-link-title' => 'કડી ઉમેરો',
+	'wikieditor-toolbar-tool-link-int' => 'વિકિ પાના તરફ',
+	'wikieditor-toolbar-tool-link-int-target' => 'ઈચ્છીત સ્થળ કે URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'પૃષ્ઠ શીર્ષક કે  URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'દર્શાવવાનું લખાણ:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'દર્શાવવાનું લખાણ',
+	'wikieditor-toolbar-tool-link-ext' => 'બાહ્ય વેબ પાનાં તરફ',
+	'wikieditor-toolbar-tool-link-ext-target' => 'URL કડી:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'કડીના શબ્દો:',
+	'wikieditor-toolbar-tool-link-insert' => 'કડી ઉમેરો',
+	'wikieditor-toolbar-tool-link-cancel' => 'રદ કરો',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'પાનું પહેલેથી મોજૂદ છે',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'પાનું અસ્તિત્વ ધરાવતું નથી.',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'અમાન્ય મથાળું.',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'બાહ્ય કડી',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'અન્ય સ્થળે પાનાની મોજૂદગી ચકાસાઈ રહી છે',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'આ શીર્ષક અમાન્ય છે.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'બાહ્ય કડીઓ',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'બાહ્ય કડી',
+	'wikieditor-toolbar-tool-link-empty' => 'તમે શોધવા માટે કંઈ દાખલ કર્યું નથી.',
+	'wikieditor-toolbar-tool-file' => 'અંદર વણાયેલી (Embedded) ફાઇલ',
+	'wikieditor-toolbar-tool-file-example' => 'Example.jpg (ઉદાહરણ)',
+	'wikieditor-toolbar-tool-reference' => 'સંદર્ભ',
+	'wikieditor-toolbar-tool-reference-cancel' => 'રદ કરો',
+	'wikieditor-toolbar-tool-reference-title' => 'સંદર્ભ ઉમેરો',
+	'wikieditor-toolbar-tool-reference-insert' => 'ઉમેરો',
+	'wikieditor-toolbar-tool-reference-text' => 'સંદર્ભ લખાણ',
+	'wikieditor-toolbar-tool-signature' => 'હસ્તાક્ષર અને સમયછાપ',
+	'wikieditor-toolbar-section-advanced' => 'ઉચ્ચ',
+	'wikieditor-toolbar-tool-heading' => 'મથાળું',
+	'wikieditor-toolbar-tool-heading-1' => 'સ્તર ૧',
+	'wikieditor-toolbar-tool-heading-2' => 'સ્તર ૨',
+	'wikieditor-toolbar-tool-heading-3' => 'સ્તર ૩',
+	'wikieditor-toolbar-tool-heading-4' => 'સ્તર ૪',
+	'wikieditor-toolbar-tool-heading-5' => 'સ્તર ૫',
+	'wikieditor-toolbar-tool-heading-example' => 'મથાળાનાં મોટા અક્ષર',
+	'wikieditor-toolbar-group-format' => 'શૈલી',
+	'wikieditor-toolbar-tool-ulist' => 'ચિન્હાંકીત યાદી',
+	'wikieditor-toolbar-tool-ulist-example' => 'ચિન્હાંકીત યાદીની વસ્તુ',
+	'wikieditor-toolbar-tool-olist' => 'ક્રમગત: યાદી',
+	'wikieditor-toolbar-tool-olist-example' => 'ક્રમગત: યાદીની વસ્તુ',
+	'wikieditor-toolbar-tool-indent' => 'હાંસિયો',
+	'wikieditor-toolbar-tool-indent-example' => 'હાંસિયાની રેખા',
+	'wikieditor-toolbar-tool-nowiki' => 'વિકિ ફોર્મેટીંગ ગેરહાજર',
+	'wikieditor-toolbar-tool-nowiki-example' => 'ફોર્મેટ કર્યા વગરનું લખાણ અહીં ઉમેરો',
+	'wikieditor-toolbar-tool-redirect' => 'દિશાનિર્દેશ',
+	'wikieditor-toolbar-tool-redirect-example' => 'લક્ષ્યાંકીત પૃષ્ઠ નામ',
+	'wikieditor-toolbar-tool-big' => 'મોટું',
+	'wikieditor-toolbar-tool-big-example' => 'મોટું લખાણ',
+	'wikieditor-toolbar-tool-small' => 'નાનું',
+	'wikieditor-toolbar-tool-small-example' => 'નાનું લખાણ',
+	'wikieditor-toolbar-tool-superscript' => 'ઉપલા સ્તરના અક્ષરો',
+	'wikieditor-toolbar-tool-superscript-example' => 'ઉપલા સ્તરના અક્ષર દેહ',
+	'wikieditor-toolbar-tool-subscript' => 'નીચલા સ્તરના અક્ષરો',
+	'wikieditor-toolbar-tool-subscript-example' => 'નીચલા સ્તરનો અક્ષર દેહ',
+	'wikieditor-toolbar-group-insert' => 'ઉમેરો',
+	'wikieditor-toolbar-tool-gallery' => 'ચિત્ર માલા',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:Example.jpg|Caption1
+$1:Example.jpg|Caption2',
+	'wikieditor-toolbar-tool-newline' => 'નવું વાક્ય',
+	'wikieditor-toolbar-tool-table' => 'કોષ્ટક',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! header 1
+! header 2
+! header 3
+|-
+| row 1, cell 1
+| row 1, cell 2
+| row 1, cell 3
+|-
+| row 2, cell 1
+| row 2, cell 2
+| row 2, cell 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'ખાનાના અક્ષરો',
+	'wikieditor-toolbar-tool-table-example-header' => 'મથાળાનાં અક્ષર',
+	'wikieditor-toolbar-tool-table-title' => 'કોષ્ટક ઉમેરો',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'પંક્તિઓ',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'સ્તંભો',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'મથાળાની હરોળ ઉમેરો',
+	'wikieditor-toolbar-tool-table-wikitable' => 'શૈલી સાથી સીમા',
+	'wikieditor-toolbar-tool-table-sortable' => 'વર્ગાંતર સક્ષમ કોઠો બનાવો',
+	'wikieditor-toolbar-tool-table-example' => 'ઉદાહરણ',
+	'wikieditor-toolbar-tool-table-preview' => 'પૂર્વાવલોકન',
+	'wikieditor-toolbar-tool-table-insert' => 'ઉમેરો',
+	'wikieditor-toolbar-tool-table-cancel' => 'રદ કરો',
+	'wikieditor-toolbar-tool-table-toomany' => 'આ સંભાષણ કોઠાને વાપરીને $1 થી વધારે ચોકઠાંનો કોઠો નહીં બનાવી શકાય',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'તમે હરોળ કે સ્તંભની સંખ્યા યોગ્ય રીતે નથી મૂકી',
+	'wikieditor-toolbar-tool-table-zero' => 'તમે શૂન્ય હરોળ અને શૂન્ય સ્તંભ ધરાવતો કોઠો ન બનાવી શકો',
+	'wikieditor-toolbar-tool-replace' => 'શોધો અને બદલો',
+	'wikieditor-toolbar-tool-replace-title' => 'શોધો અને બદલો',
+	'wikieditor-toolbar-tool-replace-search' => 'આ માટે શોધો',
+	'wikieditor-toolbar-tool-replace-replace' => 'આનાથી બદલો',
+	'wikieditor-toolbar-tool-replace-case' => 'કેસ મોળવો',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'આગળ શોધો',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'બદલો',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'બધા બદલો',
+	'wikieditor-toolbar-tool-replace-close' => 'બંધ કરો',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'તમારી શોધ કશાયને મળતી આવતી નથી',
+	'wikieditor-toolbar-tool-replace-success' => '$1 બદલાવ(વો) કરાયાં.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'તમે શોધવા માટે કંઈ દાખલ કર્યું નથી.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'તમે માહિતી મૂકી તે અમાન્ય છે : $1',
+	'wikieditor-toolbar-section-characters' => 'ખાસ અક્ષરો કે ચિન્હો',
+	'wikieditor-toolbar-characters-page-latin' => 'લેટિન',
+	'wikieditor-toolbar-characters-page-latinextended' => 'લેટિન વિસ્તૃત',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'સંજ્ઞાઓ',
+	'wikieditor-toolbar-characters-page-greek' => 'ગ્રીક',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'સીરિલિક',
+	'wikieditor-toolbar-characters-page-arabic' => 'અરેબિક',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'અરેબિક વિસ્તૃત',
+	'wikieditor-toolbar-characters-page-persian' => 'પર્સિયન',
+	'wikieditor-toolbar-characters-page-hebrew' => 'હિબ્રૂ',
+	'wikieditor-toolbar-characters-page-bangla' => 'બાંગ્લા',
+	'wikieditor-toolbar-characters-page-telugu' => 'તેલુગુ',
+	'wikieditor-toolbar-characters-page-sinhala' => 'સિંહાલા',
+	'wikieditor-toolbar-characters-page-gujarati' => 'ગુજરાતી',
+	'wikieditor-toolbar-characters-page-thai' => 'થાઈ',
+	'wikieditor-toolbar-characters-page-lao' => 'લાઓ',
+	'wikieditor-toolbar-characters-page-khmer' => 'ખ્મેર',
+	'wikieditor-toolbar-section-help' => 'મદદ',
+	'wikieditor-toolbar-help-heading-description' => 'વર્ણન',
+	'wikieditor-toolbar-help-heading-syntax' => 'તમે જે લખો',
+	'wikieditor-toolbar-help-heading-result' => 'તમે જે મેળવો',
+	'wikieditor-toolbar-help-page-format' => 'રચના શૈલિ',
+	'wikieditor-toolbar-help-page-link' => 'કડીઓ',
+	'wikieditor-toolbar-help-page-heading' => 'મથાળું',
+	'wikieditor-toolbar-help-page-list' => 'યાદીઓ',
+	'wikieditor-toolbar-help-page-file' => 'ફાઈલો',
+	'wikieditor-toolbar-help-page-reference' => 'સંદર્ભો',
+	'wikieditor-toolbar-help-page-discussion' => 'ચર્ચા',
+	'wikieditor-toolbar-help-content-italic-description' => 'ત્રાંસું',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''ત્રાંસા અક્ષરો''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>ત્રાંસા અક્ષરો</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'ઘાટું',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''ઘાટં અક્ષરો'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>ઘાટું લખાણ</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'ઘાટા &amp; ત્રાંસા',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''ઘાટું &amp; ત્રાસુ લેખન'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>ઘાટું &amp; ત્રાંસુ લખાણ</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'આંતરિક કડી',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[પાનાં શીર્ષક|કડી લેબલ]]<br />[[પાનાં શીર્ષક]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>કડી લેબલ</a><br /><a href='#'>પાનાં શીર્ષક</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'બાહ્ય કડી',
+	'wikieditor-toolbar-help-content-heading2-description' => 'બીજા સ્તરનું મથાળું',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== મથાળાના અક્ષરો ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>મથાળાનાં અક્ષરો</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'ત્રીજા સ્તરનું મથાળું',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== મથાળાના અક્ષરો ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>મથાળાનાં અક્ષરો</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'ચોથા સ્તરનું મથાળું',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== મથાળાના અક્ષરો ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>મથાળાનાં અક્ષરો</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'પાંચમાં સ્તરનું મથાળું',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== મથાળાના અક્ષરો =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>મથાળાનાં અક્ષરો</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'ચિન્હાંકીત યાદી',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* વસ્તુ યાદી<br />* વસ્તુ યાદી',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>યાદી વસ્તુ</li><li>યાદી વસ્તુ</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'ક્રમગત: યાદી',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# યાદી વસ્તુ<br /># યાદી વસ્તુ',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>વસ્તુ યાદી</li><li>વસ્તુ યાદી</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'અંદર વણાયેલી (Embedded) ફાઇલ',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|કેપ્શન લખાણ]]',
+	'wikieditor-toolbar-help-content-reference-description' => 'સંદર્ભ',
+	'wikieditor-toolbar-help-content-reference-result' => "પૃષ્ઠ લેખન.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'તેજ સંદર્ભનો વધારાનો વપરાશ',
+	'wikieditor-toolbar-help-content-rereference-result' => "પૃષ્ઠ લેખન.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'સંદર્ભો દર્શાવો',
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'સમયછાપ સાથે હસ્તાક્ષર',
+	'wikieditor-toolbar-help-content-signature-description' => 'હસ્તાક્ષર',
+	'wikieditor-toolbar-help-content-indent-description' => 'હાંસિયો',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'સામાન્ય અક્ષરો<br />:હાંસિયા મારેલા અક્ષરો<br />::હાંસિયા મારેલા અક્ષરો',
+	'wikieditor-toolbar-help-content-indent-result' => 'સામાન્ય લેખન<dl><dd>હાંસિયા મારેલ લેખન<dl><dd>હાંસિયા મારેલ લેખન</dd></dl></dd></dl>',
+);
+
 /** Manx (Gaelg)
  * @author MacTire02
  * @author Shimmin Beg
@@ -9284,7 +9752,6 @@ $1:Example.jpg|Fo-heidyl2',
 	'wikieditor-toolbar-tool-replace-case' => 'Cur tastey da case',
 	'wikieditor-toolbar-tool-replace-regex' => 'Gra dy nee slonn reiltagh eh y raa ry-hirrey',
 	'wikieditor-toolbar-tool-replace-button-findnext' => "Feddyn y nah 'er",
-	'wikieditor-toolbar-tool-replace-button-replacenext' => "Caghlaa y nah 'er",
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Caghlaa dagh fer',
 	'wikieditor-toolbar-tool-replace-close' => 'Dooney',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Cha row y raa ry-hirrey ayd ry-akin.',
@@ -9396,7 +9863,7 @@ $messages['he'] = array(
 	'wikieditor-desc' => 'מספקת מנשק עריכת ויקיטקסט הניתן להרחבה ומודולים המאפשרים להוסיף יכולות',
 	'wikieditor-wikitext-tab' => 'קוד ויקי',
 	'wikieditor-loading' => 'בטעינה',
-	'wikieditor-preview-preference' => 'הפעלת תצוגה מקבילה',
+	'wikieditor-preview-preference' => 'הפעלת תצוגה מקדימה מקבילה',
 	'wikieditor-preview-tab' => 'תצוגה מקדימה',
 	'wikieditor-preview-changes-tab' => 'שינויים',
 	'wikieditor-preview-loading' => 'נטען...',
@@ -9418,8 +9885,8 @@ $messages['he'] = array(
 	'wikieditor-template-editor-dialog-cancel' => 'ביטול',
 	'wikieditor-templates-preference' => 'הפעלת קיפול תבניות',
 	'wikieditor-toc-preference' => 'הפעלת תוכן עניינים עם אפשרות ניווט',
-	'wikieditor-toc-show' => 'הצגת התכנים',
-	'wikieditor-toc-hide' => 'הסתרת התכנים',
+	'wikieditor-toc-show' => 'להציג תוכן עניינים',
+	'wikieditor-toc-hide' => 'להסתיר תוכן עניינים',
 	'wikieditor-toolbar' => 'סרגל עריכה',
 	'wikieditor-toolbar-desc' => 'הרחבת השמישות של סרגל עריכת הדף',
 	'wikieditor-toolbar-preference' => 'הפעלת סרגל עריכה משופר',
@@ -9532,7 +9999,7 @@ $1:דוגמה.jpg|כותרת 2',
 	'wikieditor-toolbar-tool-replace-case' => 'התאמת רישיות',
 	'wikieditor-toolbar-tool-replace-regex' => 'בדיקת מחרוזת החיפוש כביטוי רגולרי',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'חיפוש הבא',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'החלפה וחיפוש הבא',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'החלפה',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'החלפת הכול',
 	'wikieditor-toolbar-tool-replace-close' => 'סגירה',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'לא התקבלו התאמות לחיפושכם.',
@@ -9547,6 +10014,7 @@ $1:דוגמה.jpg|כותרת 2',
 	'wikieditor-toolbar-characters-page-greek' => 'יווני',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'קירילי',
 	'wikieditor-toolbar-characters-page-arabic' => 'ערבי',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'ערבי מורחב',
 	'wikieditor-toolbar-characters-page-persian' => 'פרסית',
 	'wikieditor-toolbar-characters-page-hebrew' => 'עברי',
 	'wikieditor-toolbar-characters-page-bangla' => 'בנגלית',
@@ -9619,7 +10087,225 @@ $1:דוגמה.jpg|כותרת 2',
 	'wikieditor-toolbar-help-content-indent-result' => 'טקסט רגיל<dl><dd>טקסט מוזח<dl><dd>טקסט מוזח</dd></dl></dd></dl>',
 );
 
-/** Fiji Hindi (Latin) (Fiji Hindi (Latin)) */
+/** Hindi (हिन्दी)
+ * @author Ansumang
+ * @author Pooja.srivastava
+ */
+$messages['hi'] = array(
+	'wikieditor' => 'उन्नत विकितेक्ष्त् संपादन इन्तेर्फचे',
+	'wikieditor-desc' => 'प्रदान करता है एक विकितेक्ष्त् एदितिङ् इन्तेर्फचे और् बहुत् सुविधा प्रदान कर्ता है मॉड्यूल',
+	'wikieditor-wikitext-tab' => 'व्विकितेक्ष्त्',
+	'wikieditor-loading' => 'लदान',
+	'wikieditor-preview-preference' => 'सक्षम पक्ष ध्वारा पक्ष पूर्वावलोकन',
+	'wikieditor-preview-tab' => 'पूर्वावलोकन',
+	'wikieditor-preview-changes-tab' => 'बद्लाप्न्',
+	'wikieditor-preview-loading' => 'लदान्',
+	'wikieditor-previewDialog-preference' => 'सक्श्म्',
+	'wikieditor-previewDialog-tab' => 'पूर्वावलोकन',
+	'wikieditor-previewDialog-loading' => 'लदान्',
+	'wikieditor-publish-preference' => 'सक्श्म्',
+	'wikieditor-publish-button-publish' => 'प्प्रकाशित करना',
+	'wikieditor-publish-button-cancel' => 'रद्द् किया जाय',
+	'wikieditor-publish-dialog-title' => '{{SITENAME}} को छापा जाय',
+	'wikieditor-publish-dialog-minor' => 'छोटा संपादन',
+	'wikieditor-publish-dialog-watch' => 'इस पृष्ठ पे ध्यान रखेँ',
+	'wikieditor-publish-dialog-publish' => 'प्रकाशित करें',
+	'wikieditor-publish-dialog-goback' => 'पीछे जाइए',
+	'wikieditor-template-editor-dialog-title' => 'साँचा संपादित करें',
+	'wikieditor-template-editor-dialog-submit' => 'अपड़ेट',
+	'wikieditor-template-editor-dialog-cancel' => 'रद्द करें',
+	'wikieditor-toc-show' => 'सामग्री दिखाएँ',
+	'wikieditor-toc-hide' => 'सामग्री छुपाएँ',
+	'wikieditor-toolbar' => 'संपादन उपकरण पट्टी',
+	'wikieditor-toolbar-loading' => 'लोड हो रहा है...',
+	'wikieditor-toolbar-tool-bold' => 'बोल्ड',
+	'wikieditor-toolbar-tool-bold-example' => 'मोटे अक्षर',
+	'wikieditor-toolbar-tool-italic' => 'इटैलिक',
+	'wikieditor-toolbar-tool-italic-example' => 'तिरछे अक्षर',
+	'wikieditor-toolbar-tool-ilink' => 'आंतरिक कड़ी',
+	'wikieditor-toolbar-tool-ilink-example' => 'कड़ी शीर्षक',
+	'wikieditor-toolbar-tool-xlink' => 'बाहरी कड़ी (http:// उपसर्ग याद रखें)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com कड़ी शीर्षक',
+	'wikieditor-toolbar-tool-link' => 'लिंक',
+	'wikieditor-toolbar-tool-link-title' => 'लिंक सम्मिलित करें',
+	'wikieditor-toolbar-tool-link-int' => 'एक विकि पृष्ठ तक',
+	'wikieditor-toolbar-tool-link-int-target' => 'लक्ष्य पृष्ठ या URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'पृष्ठ शीर्षक या URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'पाठ को प्रदर्शित करने के लिए:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'पाठ प्रदर्शित करना',
+	'wikieditor-toolbar-tool-link-ext' => 'एक बाह्य वेब पेज तक',
+	'wikieditor-toolbar-tool-link-ext-target' => 'लिंक URL:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'कड़ी पाठ:',
+	'wikieditor-toolbar-tool-link-insert' => 'लिंक सम्मिलित करें',
+	'wikieditor-toolbar-tool-link-cancel' => 'रद्द करें',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'पृष्ठ मौजूद है',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'पृष्ठ मौजूद नहीं है',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'अवैध शीर्षक',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'बाहरी कड़ियाँ',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'पृष्ठ अस्तित्व की जाँच...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'आपके द्वारा निर्दिष्ट शीर्षक अमान्य है।',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'आंतरिक लिंक',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'बाहरी कड़ियाँ',
+	'wikieditor-toolbar-tool-link-empty' => 'आप लिंक करने के लिए कुछ दर्ज़ नहीं किए थे ।',
+	'wikieditor-toolbar-tool-file' => 'संलग्न फ़ाइल',
+	'wikieditor-toolbar-tool-file-example' => 'उदाहरण.jpg',
+	'wikieditor-toolbar-tool-reference' => 'संदर्भ',
+	'wikieditor-toolbar-tool-reference-example' => 'आधार पाठ यहाँ सम्मिलित करें',
+	'wikieditor-toolbar-tool-reference-cancel' => 'रद्द करें',
+	'wikieditor-toolbar-tool-reference-title' => 'संदर्भ सम्मिलित करें',
+	'wikieditor-toolbar-tool-reference-insert' => 'सम्मिलित करें',
+	'wikieditor-toolbar-tool-reference-text' => 'संदर्भ पाठ',
+	'wikieditor-toolbar-tool-signature' => 'हस्ताक्षर और टाइमस्टैम्प',
+	'wikieditor-toolbar-section-advanced' => 'उन्नत',
+	'wikieditor-toolbar-tool-heading' => 'शीर्षक',
+	'wikieditor-toolbar-tool-heading-1' => 'स्तर १',
+	'wikieditor-toolbar-tool-heading-2' => 'स्तर २',
+	'wikieditor-toolbar-tool-heading-3' => 'स्तर ३',
+	'wikieditor-toolbar-tool-heading-4' => 'स्तर ४',
+	'wikieditor-toolbar-tool-heading-5' => 'स्तर ५',
+	'wikieditor-toolbar-tool-heading-example' => 'शीर्ष पाठ',
+	'wikieditor-toolbar-group-format' => 'स्वरूप',
+	'wikieditor-toolbar-tool-ulist' => 'बुलेटेड सूची',
+	'wikieditor-toolbar-tool-ulist-example' => 'बुलेटेड सूची आइटम',
+	'wikieditor-toolbar-tool-olist' => 'क्रमांकित सूची',
+	'wikieditor-toolbar-tool-olist-example' => 'क्रमांकित सूची आइटम',
+	'wikieditor-toolbar-tool-indent' => 'अभिस्थापन',
+	'wikieditor-toolbar-tool-indent-example' => 'अभिस्थापित रेखा',
+	'wikieditor-toolbar-tool-nowiki' => 'कोई विकि स्वरूपण नहीं',
+	'wikieditor-toolbar-tool-nowiki-example' => 'गैर-स्वरूपित पाठ यहाँ सम्मिलित करें',
+	'wikieditor-toolbar-tool-redirect' => 'पुनर्निर्देशन',
+	'wikieditor-toolbar-tool-redirect-example' => 'लक्ष्य पृष्ठ नाम',
+	'wikieditor-toolbar-tool-big' => 'बड़ा',
+	'wikieditor-toolbar-tool-big-example' => 'बड़ा पाठ',
+	'wikieditor-toolbar-tool-small' => 'छोटा',
+	'wikieditor-toolbar-tool-small-example' => 'छोटे पाठ',
+	'wikieditor-toolbar-tool-superscript' => 'सुपरस्क्रिप्ट',
+	'wikieditor-toolbar-tool-superscript-example' => 'सुपरस्क्रिप्ट पाठ',
+	'wikieditor-toolbar-tool-subscript' => 'सबस्क्रिप्ट',
+	'wikieditor-toolbar-tool-subscript-example' => 'सबस्क्रिप्ट पाठ',
+	'wikieditor-toolbar-group-insert' => 'सम्मिलित करें',
+	'wikieditor-toolbar-tool-gallery' => 'तस्वीर गैलरी',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:उदाहरण.jpg|चित्रशीर्षक१
+$1:उदाहरण.jpg|चित्रशीर्षक२',
+	'wikieditor-toolbar-tool-newline' => 'नई पंक्ति',
+	'wikieditor-toolbar-tool-table' => 'सारणी',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! शीर्ष लेख १
+! शीर्ष लेख २
+! शीर्ष लेख ३
+|-
+| पंक्ति १, प्रकोष्ठ १
+| पंक्ति १, प्रकोष्ठ २
+| पंक्ति १, प्रकोष्ठ ३
+|-
+| पंक्ति २, प्रकोष्ठ १
+| पंक्ति २, प्रकोष्ठ २
+| पंक्ति २, प्रकोष्ठ ३',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'प्रकोष्ठ पाठ',
+	'wikieditor-toolbar-tool-table-example-header' => 'शीर्ष पाठ',
+	'wikieditor-toolbar-tool-table-title' => 'सारणी सम्मिलित करें',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'पंक्तियाँ',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'कॉलम',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'शीर्ष लेख पंक्ति जोड़ें',
+	'wikieditor-toolbar-tool-table-wikitable' => 'बॉर्डर के साथ शैली',
+	'wikieditor-toolbar-tool-table-sortable' => 'सारणी सॉर्टबल बनाएँ',
+	'wikieditor-toolbar-tool-table-example' => 'उदाहरण',
+	'wikieditor-toolbar-tool-table-preview' => 'पूर्वावलोकन',
+	'wikieditor-toolbar-tool-table-insert' => 'सम्मिलित करें',
+	'wikieditor-toolbar-tool-table-cancel' => 'रद्द करें',
+	'wikieditor-toolbar-tool-replace' => 'खोजें और बदलें',
+	'wikieditor-toolbar-tool-replace-title' => 'खोजें और बदलें',
+	'wikieditor-toolbar-tool-replace-search' => 'खोजें:',
+	'wikieditor-toolbar-tool-replace-replace' => 'इसके साथ बदलें:',
+	'wikieditor-toolbar-tool-replace-case' => 'केस मिलाएँ',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'अगला ढूँढें',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'इससे बदलें',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'सभी बदलें',
+	'wikieditor-toolbar-tool-replace-close' => 'बंद करें',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'आपके खोज कुछ मिला नहीं',
+	'wikieditor-toolbar-tool-replace-success' => '$1 प्रतिस्थापन बनें ।',
+	'wikieditor-toolbar-section-characters' => 'विशेष वर्ण',
+	'wikieditor-toolbar-characters-page-latin' => 'लाटिन',
+	'wikieditor-toolbar-characters-page-latinextended' => 'लाटिन विस्तारित',
+	'wikieditor-toolbar-characters-page-ipa' => 'आइपीए',
+	'wikieditor-toolbar-characters-page-symbols' => 'प्रतीक',
+	'wikieditor-toolbar-characters-page-greek' => 'ग्रीक',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'सिरिलिक',
+	'wikieditor-toolbar-characters-page-arabic' => 'अरबी',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'अरबी विस्तारित',
+	'wikieditor-toolbar-characters-page-persian' => 'फार्सी',
+	'wikieditor-toolbar-characters-page-hebrew' => 'हिब्रू',
+	'wikieditor-toolbar-characters-page-bangla' => 'बांग्ला',
+	'wikieditor-toolbar-characters-page-telugu' => 'तेलूगू',
+	'wikieditor-toolbar-characters-page-sinhala' => 'सिंहल',
+	'wikieditor-toolbar-characters-page-gujarati' => 'गुजराती',
+	'wikieditor-toolbar-characters-page-thai' => 'थाई',
+	'wikieditor-toolbar-characters-page-lao' => 'लाओ',
+	'wikieditor-toolbar-characters-page-khmer' => 'खमेर',
+	'wikieditor-toolbar-section-help' => 'सहायता',
+	'wikieditor-toolbar-help-heading-description' => 'वर्णन',
+	'wikieditor-toolbar-help-heading-syntax' => 'तुम क्या लिखोगे',
+	'wikieditor-toolbar-help-heading-result' => 'तुम्हें क्या मिला',
+	'wikieditor-toolbar-help-page-format' => 'स्वरूपण',
+	'wikieditor-toolbar-help-page-link' => 'कड़ियाँ',
+	'wikieditor-toolbar-help-page-heading' => 'शीर्षक',
+	'wikieditor-toolbar-help-page-list' => 'सूचियाँ',
+	'wikieditor-toolbar-help-page-file' => 'फ़ाइलें',
+	'wikieditor-toolbar-help-page-reference' => 'संदर्भ',
+	'wikieditor-toolbar-help-page-discussion' => 'वार्ता',
+	'wikieditor-toolbar-help-content-italic-description' => 'इटैलिक',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''इटैलिक पाठ ''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>इटैलिक पाठ</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'बोल्ड',
+	'wikieditor-toolbar-help-content-bold-syntax' => "''' बोल्ड पाठ '''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>बोल्ड पाठ</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'बोल्ड &amp; इटैलिक',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''बोल्ड &amp; इटैलिक पाठ'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>बोल्ड &amp; इटैलिक पाठ</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'आंतरिक कड़ी',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[पृष्ठ शीर्षक|दृश्य शब्दलेखन]]<br />[[पृष्ठ शीर्षक]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>लिंक लेबल</a><br /><a href='#'>पृष्ठ शीर्षक</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'बाहरी कड़ि',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org  लिंक लेबल]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>लिंक लेबल</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading2-description' => 'द्वितीय स्तर शीर्षक',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== शीर्षक लेख ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>शीर्षक लेख</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'तृतीय स्तर शीर्षक',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== शीर्षक लेख ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>शीर्षक लेख</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'चतुर्थ स्तर शीर्षक',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== शीर्षक लेख ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>शीर्षक लेख</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'पंचम स्तर शीर्षक',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== शीर्षक लेख =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>शीर्षक लेख</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'बुलेटेड सूची',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* सूची आइटम<br />* सूची आइटम',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>सूची आइटम</li><li>सूची आइटम</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'क्रमांकित सूची',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# सूची आइटम<br /># सूची आइटम',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>सूची आइटम</li><li>सूची आइटम</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'संलग्न फ़ाइल',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:उदाहरण.png|thumb|शीर्षक नाम]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='चौड़ाई:104px;' class='thumbinner'><a title='शीर्षक नाम' class='इमेज' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='बढ़ाना' class='आंतरिक' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>शीर्षक नाम</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'संदर्भ',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'पृष्ठ लेख ।&lt;ref name="test"&gt;[http://www.example.org लिंक लेख], अतिरिक्त लेख.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "पृष्ठ लेख ।<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'वही संदर्भ का अतिरिक्त उपयोग',
+	'wikieditor-toolbar-help-content-rereference-result' => "पृष्ठ लेख ।<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'संदर्भ दिखाएँ',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='संदर्भ'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='बाहरी लेख' href='#'>लिंक लेख</a>, अतिरिक्त लेख ।</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'हस्ताक्षर टाइमस्टैम्प सहित',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>सदस्यनाम</a> (<a href='#' title='{{#special:mytalk}}'>चर्चा</a>) 15:54, 10 June 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signature-description' => 'हस्ताक्षर',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>सदस्यनाम</a> (<a href='#' title='{{#special:mytalk}}'>वार्ता</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'इनडेंट',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'सामान्य लेख<br />:इनडेंटेड लेख<br />::इनडेंटेड लेख',
+	'wikieditor-toolbar-help-content-indent-result' => 'सामान्य लेख<dl><dd>इनडेंटेड लेख<dl><dd>इनडेंटेड लेख</dd></dl></dd></dl>',
+);
+
+/** Fiji Hindi (Latin script) (Fiji Hindi) */
 $messages['hif-latn'] = array(
 	'wikieditor-toolbar-tool-bold' => 'Mota',
 	'wikieditor-toolbar-tool-bold-example' => 'Mota akchhar',
@@ -9627,8 +10313,10 @@ $messages['hif-latn'] = array(
 );
 
 /** Croatian (Hrvatski)
+ * @author Bugoslav
  * @author Ex13
  * @author Excaliboor
+ * @author Roberta F.
  * @author SpeedyGonsales
  */
 $messages['hr'] = array(
@@ -9660,8 +10348,8 @@ $messages['hr'] = array(
 	'wikieditor-toc-preference' => 'Omogući navigaciju sadržaja',
 	'wikieditor-toc-show' => 'Prikaži sadržaj',
 	'wikieditor-toc-hide' => 'Sakrij sadržaj',
-	'wikieditor-toolbar' => 'Alatna traka',
-	'wikieditor-toolbar-desc' => 'Alatna traka za uređivanje s poboljšanom uporabljivošću',
+	'wikieditor-toolbar' => 'Alatna vrpca',
+	'wikieditor-toolbar-desc' => 'Alatna vrpca za uređivanje s poboljšanom uporabljivošću',
 	'wikieditor-toolbar-preference' => 'Omogući poboljšanu alatnu traku',
 	'wikieditor-toolbar-dialogs-preference' => 'Dopusti upitnike za unos veza, tablica i ostalog',
 	'wikieditor-toolbar-hidesig' => 'Sakrij gumb potpisa sa stranica u glavnom imenskom prostoru',
@@ -9773,7 +10461,6 @@ $1:Primjer.jpg|Opis2',
 	'wikieditor-toolbar-tool-replace-case' => 'Pazi na velika slova',
 	'wikieditor-toolbar-tool-replace-regex' => 'Postupaj s traženim nizom kao regularnim izrazom',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Nađi sljedeću',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Zamijenite sljedeći',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zamijeni sve',
 	'wikieditor-toolbar-tool-replace-close' => 'Zatvori',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Pretraživanje nije pronašlo ništa.',
@@ -9793,10 +10480,10 @@ $1:Primjer.jpg|Opis2',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangla znakovi',
 	'wikieditor-toolbar-characters-page-telugu' => 'telugu',
 	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhaleški znakovi',
-	'wikieditor-toolbar-characters-page-gujarati' => 'Gudžarati znakovi',
-	'wikieditor-toolbar-characters-page-thai' => 'Tajlandski',
-	'wikieditor-toolbar-characters-page-lao' => 'Laoški znakovi',
-	'wikieditor-toolbar-characters-page-khmer' => 'Kmerskim',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Gudžaratski znakovi',
+	'wikieditor-toolbar-characters-page-thai' => 'Tajlandski (tajski) znakovi',
+	'wikieditor-toolbar-characters-page-lao' => 'Laoski znakovi',
+	'wikieditor-toolbar-characters-page-khmer' => 'kmerski',
 	'wikieditor-toolbar-section-help' => 'Pomoć',
 	'wikieditor-toolbar-help-heading-description' => 'Opis',
 	'wikieditor-toolbar-help-heading-syntax' => 'Što upisujete',
@@ -9896,6 +10583,7 @@ $messages['hsb'] = array(
 	'wikieditor-toolbar-desc' => 'Gratowa lajsta za wobdźěłowanje stronow z polěpšenej wužiwajomnosću',
 	'wikieditor-toolbar-preference' => 'Polěpšenu gratowu lajstu za wobdźěłowanje aktiwizować',
 	'wikieditor-toolbar-dialogs-preference' => 'Dialogi za zasunjenje wotkazow, tabelow a hinašeho zmóžnić',
+	'wikieditor-toolbar-hidesig' => 'Podpisowe tłóčatko w stronach we hłownym mjenowym rumje schować',
 	'wikieditor-toolbar-loading' => 'Čita so...',
 	'wikieditor-toolbar-tool-bold' => 'Tučny',
 	'wikieditor-toolbar-tool-bold-example' => 'Tučny tekst',
@@ -10004,7 +10692,7 @@ $1:Example.jpg|Popis2',
 	'wikieditor-toolbar-tool-replace-case' => 'Wotpowědowanje',
 	'wikieditor-toolbar-tool-replace-regex' => 'Z pytanskim tekstom kaž z regularnym wurazom wobchadźeć',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Dale pytać',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Dale narunać',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Narunać',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Wšě narunać',
 	'wikieditor-toolbar-tool-replace-close' => 'Začinić',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Twoje pytanje njeje wotpowědnik namakał.',
@@ -10019,6 +10707,7 @@ $1:Example.jpg|Popis2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grjekske',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyriliske',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabske',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Rozšěrjena arabšćina',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiske',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrejske',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalšćina',
@@ -10094,6 +10783,7 @@ $1:Example.jpg|Popis2',
 /** Hungarian (Magyar)
  * @author Bdamokos
  * @author Dani
+ * @author Dj
  * @author Glanthor Reviol
  * @author Hunyadym
  * @author McDutchie
@@ -10241,7 +10931,7 @@ $1:Példa.jpg|képaláírás2',
 	'wikieditor-toolbar-tool-replace-case' => 'Kis- és nagybetű-érzékenység',
 	'wikieditor-toolbar-tool-replace-regex' => 'A beírt szöveg egy reguláris kifejezés',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Következő keresése',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Következő cseréje',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Csere',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Összes cseréje',
 	'wikieditor-toolbar-tool-replace-close' => 'Bezárás',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Nincs egyetlen találat sem.',
@@ -10256,6 +10946,7 @@ $1:Példa.jpg|képaláírás2',
 	'wikieditor-toolbar-characters-page-greek' => 'Görög',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirill',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arab',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arab (bővített)',
 	'wikieditor-toolbar-characters-page-persian' => 'Perzsa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Héber',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengáli',
@@ -10461,7 +11152,6 @@ $1:Example.jpg|Նկարագրություն2',
 	'wikieditor-toolbar-tool-replace-case' => 'Համընկում ըստ տառաշարի (մեծատառ/փոքրատառ)',
 	'wikieditor-toolbar-tool-replace-regex' => 'Որոնման տողը ընկալել որպես regular expression',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Գտնել հաջորդը',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Փոխարինել հաջորդը',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Փոխարինել բոլորը',
 	'wikieditor-toolbar-tool-replace-close' => 'Բեկանել',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Ձեր որոնմանը համապատասխանող արդյունքներ չեն գտնվել։',
@@ -10473,9 +11163,10 @@ $1:Example.jpg|Նկարագրություն2',
 	'wikieditor-toolbar-characters-page-latinextended' => 'Լատիներեն ընդլայնված',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
 	'wikieditor-toolbar-characters-page-symbols' => 'Սիմվոլներ',
-	'wikieditor-toolbar-characters-page-greek' => 'Հուներեն',
+	'wikieditor-toolbar-characters-page-greek' => 'Հունարեն',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Կիրիլիցա',
 	'wikieditor-toolbar-characters-page-arabic' => 'Արաբերեն',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Արաբերեն ընդլայնված',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Եբրայերեն',
 	'wikieditor-toolbar-characters-page-bangla' => 'Բենգալերեն',
 	'wikieditor-toolbar-characters-page-telugu' => 'Տելուգու',
@@ -10689,7 +11380,7 @@ $1:Exemplo.jpg|Legenda2',
 	'wikieditor-toolbar-tool-replace-case' => 'Distinguer inter majusculas e minusculas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tractar le catena de recerca como un expression regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Cercar sequente',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Reimplaciar sequente',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Reimplaciar',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Reimplaciar toto',
 	'wikieditor-toolbar-tool-replace-close' => 'Clauder',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Tu recerca non ha producite resultatos.',
@@ -10701,11 +11392,12 @@ $1:Exemplo.jpg|Legenda2',
 	'wikieditor-toolbar-characters-page-latinextended' => 'Latin extendite',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
 	'wikieditor-toolbar-characters-page-symbols' => 'Symbolos',
-	'wikieditor-toolbar-characters-page-greek' => 'Grec',
+	'wikieditor-toolbar-characters-page-greek' => 'Greco',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrillic',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabe extendite',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiano',
-	'wikieditor-toolbar-characters-page-hebrew' => 'Hebree',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreo',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
 	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhala',
@@ -10925,7 +11617,6 @@ $1:Contoh.jpg|Judul2',
 	'wikieditor-toolbar-tool-replace-case' => 'Cocokkan huruf besar/kecil',
 	'wikieditor-toolbar-tool-replace-regex' => "Perlakukan string pencarian sebagai ''regular expression (regex)''",
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Cari berikutnya',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Ganti berikutnya',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ganti semua',
 	'wikieditor-toolbar-tool-replace-close' => 'Tutup',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Pencarian Anda tidak membuahkan hasil.',
@@ -11061,7 +11752,7 @@ $messages['ig'] = array(
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Ǹdịlị',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Ogìdì',
 	'wikieditor-toolbar-tool-table-cancel' => 'Kàchá',
-	'wikieditor-toolbar-tool-replace-search' => 'Chöwá màkà:',
+	'wikieditor-toolbar-tool-replace-search' => 'Chọwa màkà:',
 	'wikieditor-toolbar-tool-replace-close' => 'Mèchié',
 	'wikieditor-toolbar-characters-page-latin' => 'Latin',
 	'wikieditor-toolbar-characters-page-latinextended' => 'Latin dọrọ',
@@ -11084,7 +11775,7 @@ $messages['ig'] = array(
 	'wikieditor-toolbar-help-page-link' => 'Jikodo',
 	'wikieditor-toolbar-help-page-heading' => 'Íshí édé',
 	'wikieditor-toolbar-help-page-list' => 'Ndetu',
-	'wikieditor-toolbar-help-page-file' => 'Fail',
+	'wikieditor-toolbar-help-page-file' => 'Usòrò',
 	'wikieditor-toolbar-help-page-discussion' => 'Ákíkó',
 	'wikieditor-toolbar-help-content-italic-description' => 'Édémédé nsem',
 	'wikieditor-toolbar-help-content-bold-description' => 'Shí íke',
@@ -11103,6 +11794,239 @@ $messages['ig'] = array(
 	'wikieditor-toolbar-help-content-indent-description' => 'Tụ atụ',
 );
 
+/** Iloko (Ilokano)
+ * @author Lam-ang
+ */
+$messages['ilo'] = array(
+	'wikieditor' => 'Antenamo a wikitext a panagurnos nga interface',
+	'wikieditor-desc' => 'Agisagana ti maipadakkel a wikitext a panagurnos nga interface ken adu pay kadagiti agisagana ti langa a module',
+	'wikieditor-wikitext-tab' => 'Wikitext',
+	'wikieditor-loading' => 'Agkarkarga...',
+	'wikieditor-preview-preference' => 'Pakabaelan na ti bangir-babaen-bangir a panagpadas',
+	'wikieditor-preview-tab' => 'Ipadas',
+	'wikieditor-preview-changes-tab' => 'Dagiti sinukatan',
+	'wikieditor-preview-loading' => 'Agkarkarga...',
+	'wikieditor-previewDialog-preference' => 'Pakabaelan ti panagsarsarita ti panagpadas',
+	'wikieditor-previewDialog-tab' => 'Ipadas',
+	'wikieditor-previewDialog-loading' => 'Agkarkarga...',
+	'wikieditor-publish-preference' => 'Pakabaelan ti addang-babaen-addang a panagipablaak',
+	'wikieditor-publish-button-publish' => 'Ipablaak',
+	'wikieditor-publish-button-cancel' => 'Ukasen',
+	'wikieditor-publish-dialog-title' => 'Ipabablaak idiay {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'Pakapukpukan ti pinagurnos (ipalawag bassit dagiti sinukatam) :',
+	'wikieditor-publish-dialog-minor' => 'Bassit a pinag-urnos',
+	'wikieditor-publish-dialog-watch' => 'Bantayan daytoy a panid',
+	'wikieditor-publish-dialog-publish' => 'Ipablaak',
+	'wikieditor-publish-dialog-goback' => 'Agsubli',
+	'wikieditor-template-editor-preference' => 'Pakabaelan ti naibatay ti nakabuklan a pinag-urnos kadagiti plantilia ti wiki',
+	'wikieditor-template-editor-dialog-title' => 'Urnosen ti plantilia',
+	'wikieditor-template-editor-dialog-submit' => 'Pabaro',
+	'wikieditor-template-editor-dialog-cancel' => 'Ukasen',
+	'wikieditor-templates-preference' => 'Pakabaelan ti panagrebba ti plantilia',
+	'wikieditor-toc-preference' => 'Pakabaelan ti pagdaliasat kadagiti linaon ti tabla',
+	'wikieditor-toc-show' => 'Ipakita dagiti linaon',
+	'wikieditor-toc-hide' => 'Ilemmeng dagiti linaon',
+	'wikieditor-toolbar' => 'Ramit a baras ti pinag-urnos',
+	'wikieditor-toolbar-desc' => 'Ramit ti baras ti pinag-urnos nga addan ti napasayaat a pinag-usar',
+	'wikieditor-toolbar-preference' => 'Pakabaelan ti napasayaat a ramit ti baras a pinag-urnos',
+	'wikieditor-toolbar-dialogs-preference' => 'Pakabaekan dagiti panagsarsarita para iti panagsengngat kadagiti panilpo, tab-tabla ken adu pay',
+	'wikieditor-toolbar-hidesig' => 'Ilemmeng ti pirma a buton manipud kadagidiay panid iti umuna a nagan ti lugar',
+	'wikieditor-toolbar-loading' => 'Agkarkarga...',
+	'wikieditor-toolbar-tool-bold' => 'Napuskol',
+	'wikieditor-toolbar-tool-bold-example' => 'Napuskol a teksto',
+	'wikieditor-toolbar-tool-italic' => 'Agir-irig',
+	'wikieditor-toolbar-tool-italic-example' => 'Nakairig a teksto',
+	'wikieditor-toolbar-tool-ilink' => 'Akin-uneg a panilpo',
+	'wikieditor-toolbar-tool-ilink-example' => 'Titulo ti panilpo',
+	'wikieditor-toolbar-tool-xlink' => 'Akinruar a panilpo (laglagipen ti http:// a prefix)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com titulo ti panilpo',
+	'wikieditor-toolbar-tool-link' => 'Panilpo',
+	'wikieditor-toolbar-tool-link-title' => 'Isengngat ti panilpo',
+	'wikieditor-toolbar-tool-link-int' => 'Iti panid a wiki',
+	'wikieditor-toolbar-tool-link-int-target' => 'Puntaan a panid wenno URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Titulo ti panid wenno URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'Teksto nga iparang:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Teksto nga iparang',
+	'wikieditor-toolbar-tool-link-ext' => 'Idiay akin-uneg a panid ti sapot',
+	'wikieditor-toolbar-tool-link-ext-target' => 'Isilpo ti URL:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'Isilpo ti teksto:',
+	'wikieditor-toolbar-tool-link-insert' => 'Isengngat ti panilpo',
+	'wikieditor-toolbar-tool-link-cancel' => 'Ukasen',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Addaan ti panid',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Awan ti panid',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Imbalido a titulo',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Kasilpo iti ruar',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Kitkitaen no addaan ti panid...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Ti titulo a nainaganam ket imbalido.',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Ti URL a nainaganam ket kasla naaramid a panilpo iti sabali a panid ti wiki.
+Kayatmo mga aramiden nga akin-uneg a panilpo?',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Akin-uneg a panilpo',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Kasilpo iti ruar',
+	'wikieditor-toolbar-tool-link-empty' => 'Awan ti inkabil mo a pakaisilpuan.',
+	'wikieditor-toolbar-tool-file' => 'Naisengngat a papeles',
+	'wikieditor-toolbar-tool-file-example' => 'Kas pagarigan.jpg',
+	'wikieditor-toolbar-tool-reference' => 'Pinagibasaran',
+	'wikieditor-toolbar-tool-reference-example' => 'Isengngat ti paammo ti baba a teksto ditoy',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Ukasen',
+	'wikieditor-toolbar-tool-reference-title' => 'Isengngat ti pinagibasaran',
+	'wikieditor-toolbar-tool-reference-insert' => 'Isengngat',
+	'wikieditor-toolbar-tool-reference-text' => 'Teksto ti pinagibasaran',
+	'wikieditor-toolbar-tool-signature' => 'Pirma, petsa ken oras',
+	'wikieditor-toolbar-section-advanced' => 'Antenamo',
+	'wikieditor-toolbar-tool-heading' => 'Paulo',
+	'wikieditor-toolbar-tool-heading-1' => 'Agpang 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Agpang 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Agpang 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Agpang 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Agpang 5',
+	'wikieditor-toolbar-tool-heading-example' => 'Teksto ti paulo',
+	'wikieditor-toolbar-group-format' => 'Pormat',
+	'wikieditor-toolbar-tool-ulist' => 'Punglo a listaan',
+	'wikieditor-toolbar-tool-ulist-example' => 'Punglo a listaan ti banag',
+	'wikieditor-toolbar-tool-olist' => 'Nabilangan a listaan',
+	'wikieditor-toolbar-tool-olist-example' => 'Nabilangan a listaan ti banag',
+	'wikieditor-toolbar-tool-indent' => 'Lennekan',
+	'wikieditor-toolbar-tool-indent-example' => 'Nalennekan a linia',
+	'wikieditor-toolbar-tool-nowiki' => 'Saan a pormaen a kas wiki',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Mangisuldong iti saan a nabuklan a teksto ditoy',
+	'wikieditor-toolbar-tool-redirect' => 'Baw-ing',
+	'wikieditor-toolbar-tool-redirect-example' => 'Nagan ti puntaan a panid',
+	'wikieditor-toolbar-tool-big' => 'Dakkel',
+	'wikieditor-toolbar-tool-big-example' => 'Dakkel a teksto',
+	'wikieditor-toolbar-tool-small' => 'Bassit',
+	'wikieditor-toolbar-tool-small-example' => 'Bassit a teksto',
+	'wikieditor-toolbar-tool-superscript' => 'Superscript',
+	'wikieditor-toolbar-tool-superscript-example' => 'Teksto ti superscript',
+	'wikieditor-toolbar-tool-subscript' => 'Subscript',
+	'wikieditor-toolbar-tool-subscript-example' => 'Teksto ti subscript',
+	'wikieditor-toolbar-group-insert' => 'Isengngat',
+	'wikieditor-toolbar-tool-gallery' => 'Palko ti retrato',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:Example.jpg|Naisurat1
+$1:Example.jpg|Naisurat2',
+	'wikieditor-toolbar-tool-newline' => 'Baro a linia',
+	'wikieditor-toolbar-tool-table' => 'Tabla',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! paulo 1
+! paulo 2
+! paulo 3
+|-
+| aray 1, cell 1
+| aray 1, cell 2
+| aray 1, cell 3
+|-
+| aray2, cell 1
+| aray2, cell 2
+| aray 2, cell 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Teksto ti cell',
+	'wikieditor-toolbar-tool-table-example-header' => 'Teksto ti paulo',
+	'wikieditor-toolbar-tool-table-title' => 'Isengngat ti tabla',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Ar-aray:',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Tuk-tukol:',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Agnayon to paulo nga aray',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Estilo nga addaan kadagit pagbeddengan',
+	'wikieditor-toolbar-tool-table-sortable' => 'Aramiden ti tabla tapno mabalin a mailasin',
+	'wikieditor-toolbar-tool-table-example' => 'Kas pagarigan',
+	'wikieditor-toolbar-tool-table-preview' => 'Ipadas',
+	'wikieditor-toolbar-tool-table-insert' => 'Isengngat',
+	'wikieditor-toolbar-tool-table-cancel' => 'Ukasen',
+	'wikieditor-toolbar-tool-table-toomany' => 'Ti agisengngat ti tabla nga addan ti adadu pay ngem $1 a dagiti sell ket saan a mabalin iti daytoy a pagsarsarita',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'Saan ka pay a nakaikabil ti umisu a numero iti ar-aray wenno tuk-tukol.',
+	'wikieditor-toolbar-tool-table-zero' => 'Saan mo a mabalin ti agisengngat ti tabla nga addan ti sero nga ar-aray wenno tuk-tukol.',
+	'wikieditor-toolbar-tool-replace' => 'Agbiruk ken sukatan',
+	'wikieditor-toolbar-tool-replace-title' => 'Agbiruk ken sukatan',
+	'wikieditor-toolbar-tool-replace-search' => 'Biruken iti:',
+	'wikieditor-toolbar-tool-replace-replace' => 'Sukatan iti:',
+	'wikieditor-toolbar-tool-replace-case' => 'Agpada a kaso',
+	'wikieditor-toolbar-tool-replace-regex' => 'Kasuen ti biruken a kuerdas a kasla kadawyan a panangisao',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Sapulen ti sumaruno',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Sukatan',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Sukatan amin',
+	'wikieditor-toolbar-tool-replace-close' => 'Irikep',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'Ti panagbiruk mo ket awan napada na.',
+	'wikieditor-toolbar-tool-replace-success' => '$1 ti naaramid a nasukatan.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Awan ti ikabil mo  a biruken.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'Ti kadawyan a panangisao nga inkabil mo ket imbalido: $1',
+	'wikieditor-toolbar-section-characters' => 'Dagiti napagpagruna a karakter',
+	'wikieditor-toolbar-characters-page-latin' => 'Latin',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Latin napaatiddog',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'Dagiti tanda',
+	'wikieditor-toolbar-characters-page-greek' => 'Griego',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrillic',
+	'wikieditor-toolbar-characters-page-arabic' => 'Arabic',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabic a napaatiddog',
+	'wikieditor-toolbar-characters-page-persian' => 'Persian',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrew',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
+	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhala',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
+	'wikieditor-toolbar-characters-page-thai' => 'Thai',
+	'wikieditor-toolbar-characters-page-lao' => 'Lao',
+	'wikieditor-toolbar-characters-page-khmer' => 'Khmer',
+	'wikieditor-toolbar-section-help' => 'Tulong',
+	'wikieditor-toolbar-help-heading-description' => 'Deskripsion',
+	'wikieditor-toolbar-help-heading-syntax' => 'Ania a kita',
+	'wikieditor-toolbar-help-heading-result' => 'Ania ti maalam',
+	'wikieditor-toolbar-help-page-format' => 'Panagporma',
+	'wikieditor-toolbar-help-page-link' => 'Dagiti panilpo',
+	'wikieditor-toolbar-help-page-heading' => 'Dagiti paulo',
+	'wikieditor-toolbar-help-page-list' => 'Dagiti listaan',
+	'wikieditor-toolbar-help-page-file' => 'Dagiti papeles',
+	'wikieditor-toolbar-help-page-reference' => 'Pinagibasaran',
+	'wikieditor-toolbar-help-page-discussion' => 'Pagtungtongan',
+	'wikieditor-toolbar-help-content-italic-description' => 'Naka-irig',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''Naka-irig a teksto''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Naka-irig  a teksto</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Napuskol',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Napuskol a teksto'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Napuskol a teksto</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Napuskol&amp; nakairig',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Napuskol &amp; nakairig a teksto'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Nauskol &amp; nakairig a teksto</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'Akin-uneg a panilpo',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Titulo ti panid|Etiketa ti panilpo]]<br />[[Titulo ti panid]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Etiketa ti panilpo</a><br /><a href='#'>Titulo ti panid</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'Kasilpo iti ruar',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Etiketa ti panilpo]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Etiketa ti panilpo</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading2-description' => 'Maika-2 nga agpang a paulo',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Teksto ti paulo ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Teksto ti paulo</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'Maika-3 nga agpang a paulo',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Teksto ti paulo ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Teksto ti paulo</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'Maika-4 nga agpang a paulo',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Teksto ti paulo ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Teksto ti paulo</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'Maika-5 nga agpang a paulo',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Teksto ti paulo =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Teksto ti paulo</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Punglo a listaan',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* Ilista ti banag<br />* Ilista ti banag',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Ilista ti banag</li><li>Ilista ti banag</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'Nabilangan a listaan',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# Ilista ti banag<br /># Ilista ti banag',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Ilista ti banag</li><li>Ilista ti banag</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'Naisengngat a papeles',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|Naisurat a tekstot]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Naisurat a teksto' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Padakkelen' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Naisurat a teksto</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Pinagibasaran',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Teksto ti panid.&lt;ref name="test"&gt;[http://www.example.org Teksto ti panilpo], nainayon a teksto.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "Teksto ti panid.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'Nainayon a panagusar ti agpada pinagibasaran',
+	'wikieditor-toolbar-help-content-rereference-result' => "Teksto ti panid.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Iparang dagiti pinagibasaran',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Teksto ti panilpo</a>, nainayon a teksto.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Ti pirmam nga addaan ti oras ken petsa',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Nagan ti agar-aramat</a> (<a href='#' title='{{#special:mytalk}}'>talk</a>) 15:54, 10 Hunio 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signature-description' => 'Pirma',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Nagan ti agar-aramat</a> (<a href='#' title='{{#special:mytalk}}'>patang</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'Lennekan',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Kadawyana teksto<br />:Nalennekan a teksto<br />::Nalennekan a teksto',
+	'wikieditor-toolbar-help-content-indent-result' => 'Kadawyan ateksto<dl><dd>Nalennekan a teksto<dl><dd>Nalennekan a teksto</dd></dl></dd></dl>',
+);
+
 /** Ingush (ГІалгІай Ğalğaj)
  * @author Amire80
  * @author Sapral Mikail
@@ -11185,9 +12109,11 @@ $messages['io'] = array(
 
 /** Icelandic (Íslenska)
  * @author Krun
+ * @author Maxí
  */
 $messages['is'] = array(
 	'wikieditor-wikitext-tab' => 'Wiki-texti',
+	'wikieditor-loading' => 'Hleður...',
 	'wikieditor-preview-tab' => 'Forskoða',
 	'wikieditor-preview-changes-tab' => 'Breytingar',
 	'wikieditor-publish-button-cancel' => 'Hætta við',
@@ -11220,6 +12146,12 @@ Viltu gera hana að innri tengli?',
 	'wikieditor-toolbar-tool-link-empty' => 'Þú slóst ekki inn neitt til að tengja í.',
 	'wikieditor-toolbar-tool-file-example' => 'Sýnishorn.jpg',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Hætta við',
+	'wikieditor-toolbar-section-advanced' => 'Ítarlegt',
+	'wikieditor-toolbar-tool-big' => 'Stór',
+	'wikieditor-toolbar-tool-big-example' => 'Stór texti',
+	'wikieditor-toolbar-tool-small' => 'Lítill',
+	'wikieditor-toolbar-tool-small-example' => 'Lítill texti',
+	'wikieditor-toolbar-group-insert' => 'Setja inn',
 	'wikieditor-toolbar-tool-newline' => 'Ný lína',
 	'wikieditor-toolbar-tool-table' => 'Tafla',
 	'wikieditor-toolbar-tool-table-example-old' => '-
@@ -11237,6 +12169,8 @@ Viltu gera hana að innri tengli?',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Raðir',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Dálkar',
 	'wikieditor-toolbar-tool-table-dimensions-header' => 'Bæta titilröð við',
+	'wikieditor-toolbar-tool-table-example' => 'Dæmi',
+	'wikieditor-toolbar-tool-table-preview' => 'Forskoðun',
 	'wikieditor-toolbar-tool-table-cancel' => 'Hætta við',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'Þú slóst ekki inn neitt til að leita að.',
 	'wikieditor-toolbar-section-characters' => 'Sérstafir',
@@ -11262,6 +12196,7 @@ Viltu gera hana að innri tengli?',
 	'wikieditor-toolbar-help-page-heading' => 'Fyrirsagnir',
 	'wikieditor-toolbar-help-page-list' => 'Listar',
 	'wikieditor-toolbar-help-page-file' => 'Skrár',
+	'wikieditor-toolbar-help-page-reference' => 'Heimildir',
 	'wikieditor-toolbar-help-page-discussion' => 'Umræða',
 	'wikieditor-toolbar-help-content-italic-description' => 'Skáletrað',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''Skáletraður texti''",
@@ -11448,7 +12383,7 @@ $1:Esempio.jpg|Didascalia2',
 	'wikieditor-toolbar-tool-replace-case' => 'Maiuscole/minuscole',
 	'wikieditor-toolbar-tool-replace-regex' => "Usa la stringa di ricerca come un'espressione regolare",
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Trova successivi',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Sostituisci successivi',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Sostituisci',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Sostituisci tutto',
 	'wikieditor-toolbar-tool-replace-close' => 'Chiudi',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'La tua ricerca non ha prodotto risultati.',
@@ -11463,6 +12398,7 @@ $1:Esempio.jpg|Didascalia2',
 	'wikieditor-toolbar-characters-page-greek' => 'Greco',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirillico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabo',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabo esteso',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiano',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Ebraico',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalese',
@@ -11540,6 +12476,8 @@ $1:Esempio.jpg|Didascalia2',
  * @author Fryed-peach
  * @author Hosiryuhosi
  * @author Ohgi
+ * @author Schu
+ * @author Whym
  * @author 青子守歌
  */
 $messages['ja'] = array(
@@ -11684,7 +12622,7 @@ $1:Example.jpg|キャプション2',
 	'wikieditor-toolbar-tool-replace-case' => '大文字・小文字を区別する',
 	'wikieditor-toolbar-tool-replace-regex' => '正規表現で検索する',
 	'wikieditor-toolbar-tool-replace-button-findnext' => '次を検索',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => '次を置換',
+	'wikieditor-toolbar-tool-replace-button-replace' => '差し替える',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'すべて置換',
 	'wikieditor-toolbar-tool-replace-close' => '閉じる',
 	'wikieditor-toolbar-tool-replace-nomatch' => '検索文字列に一致するものはありませんでした。',
@@ -11693,20 +12631,21 @@ $1:Example.jpg|キャプション2',
 	'wikieditor-toolbar-tool-replace-invalidregex' => '入力された正規表現に誤りがあります: $1',
 	'wikieditor-toolbar-section-characters' => '特殊文字',
 	'wikieditor-toolbar-characters-page-latin' => 'ラテン文字',
-	'wikieditor-toolbar-characters-page-latinextended' => '拡張ラテン文字',
+	'wikieditor-toolbar-characters-page-latinextended' => 'ラテン文字拡張',
 	'wikieditor-toolbar-characters-page-ipa' => '国際音声記号',
 	'wikieditor-toolbar-characters-page-symbols' => '記号',
-	'wikieditor-toolbar-characters-page-greek' => 'ギリシャ文字',
+	'wikieditor-toolbar-characters-page-greek' => 'ギリシア文字',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'キリル文字',
 	'wikieditor-toolbar-characters-page-arabic' => 'アラビア文字',
-	'wikieditor-toolbar-characters-page-persian' => 'ペルシア語',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'アラビア文字拡張',
+	'wikieditor-toolbar-characters-page-persian' => 'ペルシア文字',
 	'wikieditor-toolbar-characters-page-hebrew' => 'ヘブライ文字',
 	'wikieditor-toolbar-characters-page-bangla' => 'ベンガル文字',
 	'wikieditor-toolbar-characters-page-telugu' => 'テルグ文字',
 	'wikieditor-toolbar-characters-page-sinhala' => 'シンハラ文字',
-	'wikieditor-toolbar-characters-page-gujarati' => 'グジャラーティー文字',
+	'wikieditor-toolbar-characters-page-gujarati' => 'グジャラート文字',
 	'wikieditor-toolbar-characters-page-thai' => 'タイ文字',
-	'wikieditor-toolbar-characters-page-lao' => 'ラーオ文字',
+	'wikieditor-toolbar-characters-page-lao' => 'ラオス文字',
 	'wikieditor-toolbar-characters-page-khmer' => 'クメール文字',
 	'wikieditor-toolbar-section-help' => 'ヘルプ',
 	'wikieditor-toolbar-help-heading-description' => '解説',
@@ -11792,6 +12731,7 @@ $messages['jv'] = array(
  * @author BRUTE
  * @author David1010
  * @author Dawid Deutschland
+ * @author ITshnik
  * @author გიორგიმელა
  */
 $messages['ka'] = array(
@@ -11934,7 +12874,7 @@ $1:Example.jpg|აღწერა2',
 	'wikieditor-toolbar-tool-replace-case' => 'რეგისტრის გათვალისწინება',
 	'wikieditor-toolbar-tool-replace-regex' => 'ჩათვალეთ ძიების ხაზი რეგულარულ გამოსახულებად',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'შემდეგის მოძიება',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'შემდეგის ჩანაცვლება',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'ჩანაცვლება',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'შეცვალეთ ყველაფერი',
 	'wikieditor-toolbar-tool-replace-close' => 'დახურვა',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'თქვენი მოთხოვნის შესაბამისი არაფერია ნაპოვნი',
@@ -12021,7 +12961,7 @@ $1:Example.jpg|აღწერა2',
 	'wikieditor-toolbar-help-content-indent-result' => 'ჩვეულებრივი ტექსტი<dl><dd>შეწეული ტექსტი<dl><dd>შეწეული ტექსტი</dd></dl></dd></dl>',
 );
 
-/** Kabardian (Cyrillic) (Къэбэрдеибзэ / Qabardjajəbza (Cyrillic))
+/** Адыгэбзэ (Адыгэбзэ)
  * @author Bogups
  */
 $messages['kbd-cyrl'] = array(
@@ -12037,11 +12977,28 @@ $messages['kiu'] = array(
 	'wikieditor-toolbar-tool-link' => 'Girê',
 );
 
+/** Kazakh (Cyrillic script) (‪Қазақша (кирил)‬)
+ * @author GaiJin
+ */
+$messages['kk-cyrl'] = array(
+	'wikieditor-toolbar-section-advanced' => 'Кеңейтілген',
+	'wikieditor-toolbar-group-format' => 'Пішім',
+	'wikieditor-toolbar-group-insert' => 'Енгізу',
+	'wikieditor-toolbar-section-characters' => 'Арнайы таңбалар',
+	'wikieditor-toolbar-section-help' => 'Анықтама',
+);
+
 /** Khmer (ភាសាខ្មែរ)
  * @author គីមស៊្រុន
  */
 $messages['km'] = array(
+	'wikieditor' => 'អន្តរមុខសំរាប់កែប្រែអត្ថបទវិគីថ្នាក់ខ្ពស់',
+	'wikieditor-wikitext-tab' => 'អត្ថបទវិគី',
 	'wikieditor-loading' => 'កំពុងផ្ទុក',
+	'wikieditor-preview-preference' => 'ប្រើការមើលមុខផ្ទឹមគ្នា',
+	'wikieditor-preview-tab' => 'ការមើលមុន',
+	'wikieditor-preview-changes-tab' => 'បំលាស់ប្ដូរ',
+	'wikieditor-preview-loading' => 'កំពុងផ្ទុក…',
 	'wikieditor-publish-button-publish' => 'បោះផ្សាយ',
 	'wikieditor-publish-button-cancel' => 'បោះបង់',
 	'wikieditor-publish-dialog-title' => 'បោះផ្សាយក្នុង{{SITENAME}}',
@@ -12055,6 +13012,8 @@ $messages['km'] = array(
 	'wikieditor-toc-show' => 'បង្ហាញខ្លឺមសារ',
 	'wikieditor-toc-hide' => 'លាក់ខ្លឹមសារ',
 	'wikieditor-toolbar' => 'របារឧបករណ៍កែប្រែ',
+	'wikieditor-toolbar-preference' => 'ប្រើរបារឧបករណ៍កែប្រែទំនើប',
+	'wikieditor-toolbar-dialogs-preference' => 'ប្រើផ្ទាំងពិសេសសំរាប់បញ្ចូលតំណភ្ជាប់ តារាង ជាដើម',
 	'wikieditor-toolbar-loading' => 'កំពុងផ្ទុក…',
 	'wikieditor-toolbar-tool-bold' => 'អក្សរដិត',
 	'wikieditor-toolbar-tool-bold-example' => 'អត្ថបទជាអក្សរដិត',
@@ -12162,7 +13121,7 @@ $1:ឧទាហរណ៍.jpg|ចំនងជើងក្រោមរូបភា
 	'wikieditor-toolbar-tool-replace-search' => 'ស្វែងរក៖',
 	'wikieditor-toolbar-tool-replace-replace' => 'ជំនួសដោយ៖',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'រុករកបន្ទាប់',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'ជំនួសអត្ថបទ',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'ជំនួស',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'ជំនួសទាំងអស់',
 	'wikieditor-toolbar-tool-replace-close' => 'បិទ',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'រកមិនឃើញអ្វីដែលអ្នកចង់រកទេ។',
@@ -12175,6 +13134,7 @@ $1:ឧទាហរណ៍.jpg|ចំនងជើងក្រោមរូបភា
 	'wikieditor-toolbar-characters-page-greek' => 'អក្សរក្រិច',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'អក្សរស៊ីរីល',
 	'wikieditor-toolbar-characters-page-arabic' => 'អក្សរអារ៉ាប់',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'អក្សរអារ៉ាប់បន្ថែម',
 	'wikieditor-toolbar-characters-page-persian' => 'អក្សរពែក្ស',
 	'wikieditor-toolbar-characters-page-hebrew' => 'អក្សរហេប៊្រូ',
 	'wikieditor-toolbar-characters-page-bangla' => 'អក្សរបេងក្លា',
@@ -12229,7 +13189,7 @@ $1:ឧទាហរណ៍.jpg|ចំនងជើងក្រោមរូបភា
 	'wikieditor-toolbar-help-content-olist-syntax' => '# ធាតុរបស់បញ្ជី<br /># ធាតុរបស់បញ្ចី',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>ធាតុរបស់បញ្ជី</li><li>ធាតុរបស់បញ្ជី</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'រូបភាពបង្កប់',
-	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:ឧទាហរណ៍.png|thumb|កូនចំនងជើងក្រោមរូបភាព]]',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:ឧទាហរណ៍.png|thumb|ចំនងជើងក្រោមរូបភាព]]',
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='ចំណងជើងក្រោមរូបភាព' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='ពង្រីក' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>ចំណងជើងក្រោមរូបភាព</div></div>",
 	'wikieditor-toolbar-help-content-reference-description' => 'ឯកសារយោង',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'អត្ថបទទំព័រ.&lt;ref name="test"&gt;[http://www.example.org តំណភ្ជាប់], អក្សរបន្ថែម.&lt;/ref&gt;',
@@ -12422,7 +13382,7 @@ $1:Example.jpg|설명2',
 	'wikieditor-toolbar-tool-replace-case' => '대소문자를 구별',
 	'wikieditor-toolbar-tool-replace-regex' => '찾을 문자열에 정규 표현식을 적용',
 	'wikieditor-toolbar-tool-replace-button-findnext' => '다음 찾기',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => '다음 바꾸기',
+	'wikieditor-toolbar-tool-replace-button-replace' => '바꾸기',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => '모두 바꾸기',
 	'wikieditor-toolbar-tool-replace-close' => '닫기',
 	'wikieditor-toolbar-tool-replace-nomatch' => '일치하는 문자열을 찾지 못했습니다.',
@@ -12437,6 +13397,7 @@ $1:Example.jpg|설명2',
 	'wikieditor-toolbar-characters-page-greek' => '그리스 문자',
 	'wikieditor-toolbar-characters-page-cyrillic' => '키릴 문자',
 	'wikieditor-toolbar-characters-page-arabic' => '아랍 문자',
+	'wikieditor-toolbar-characters-page-arabicextended' => '아랍어 확장',
 	'wikieditor-toolbar-characters-page-persian' => '페르시아어',
 	'wikieditor-toolbar-characters-page-hebrew' => '히브리 문자',
 	'wikieditor-toolbar-characters-page-bangla' => '뱅골어',
@@ -12651,7 +13612,6 @@ $1:Юлгю.jpg|Ангылатыу2',
 	'wikieditor-toolbar-tool-replace-case' => 'Уллу-гитче харифлени айыр',
 	'wikieditor-toolbar-tool-replace-regex' => 'Излеу тизгинни регуляр выражениеге сана',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Эндигини таб',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Эндигини ауушдур',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Барын да ауушдур',
 	'wikieditor-toolbar-tool-replace-close' => 'Джаб',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Сорууугъуз бла келишген эсеб джокъду.',
@@ -12884,7 +13844,7 @@ $1:Beishpell.jpg|zweijte Beld-Täx',
 	'wikieditor-toolbar-tool-replace-case' => 'Jruß un klein Boochstaave ongerscheide',
 	'wikieditor-toolbar-tool-replace-regex' => '„{{int:Edittoolbar-tool-replace-search}}“ es en <i lang="en">regular expression</i>',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Dä näxte fenge',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Tuusche, un noh_m näxte jonn',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Ußtuusche',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Alle ußtuusche',
 	'wikieditor-toolbar-tool-replace-close' => 'Zohmaache',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Doh ham_mer nix jefonge.',
@@ -12899,6 +13859,7 @@ $1:Beishpell.jpg|zweijte Beld-Täx',
 	'wikieditor-toolbar-characters-page-greek' => 'Jriischesch',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillesch',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabesch',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Araabesch met Extras',
 	'wikieditor-toolbar-characters-page-persian' => 'Pärsesch',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebräjesch',
 	'wikieditor-toolbar-characters-page-bangla' => 'Benjaalesch',
@@ -12971,9 +13932,10 @@ $1:Beishpell.jpg|zweijte Beld-Täx',
 	'wikieditor-toolbar-help-content-indent-result' => 'Nommaale Täx<dl><dd>Enjerök<dl><dd>Un norrens enjerök</dd></dl></dd></dl>',
 );
 
-/** Kurdish (Latin) (Kurdî (Latin))
+/** Kurdish (Latin script) (‪Kurdî (latînî)‬)
  * @author Erdal Ronahi
  * @author George Animal
+ * @author Gomada
  */
 $messages['ku-latn'] = array(
 	'wikieditor-loading' => 'Bar dibe',
@@ -12981,6 +13943,7 @@ $messages['ku-latn'] = array(
 	'wikieditor-preview-changes-tab' => 'Guhartin',
 	'wikieditor-preview-loading' => 'Bar dibe…',
 	'wikieditor-previewDialog-tab' => 'Pêşdîtin',
+	'wikieditor-previewDialog-loading' => 'Bar dibe…',
 	'wikieditor-publish-button-publish' => 'Weşandin',
 	'wikieditor-publish-button-cancel' => 'Betal',
 	'wikieditor-publish-dialog-minor' => 'Guhertina biçûk',
@@ -12990,23 +13953,23 @@ $messages['ku-latn'] = array(
 	'wikieditor-template-editor-dialog-title' => 'Şablonê biguherîne',
 	'wikieditor-template-editor-dialog-submit' => 'Rojanekirin',
 	'wikieditor-template-editor-dialog-cancel' => 'Betal',
-	'wikieditor-toc-show' => 'Naverrokan nîşan bide',
+	'wikieditor-toc-show' => 'Naverokan nîşan bide',
 	'wikieditor-toc-hide' => 'Naverokan veşêre',
 	'wikieditor-toolbar-loading' => 'Bar dibe…',
-	'wikieditor-toolbar-tool-bold' => 'Qalind',
-	'wikieditor-toolbar-tool-bold-example' => 'Nivîsa qalind',
-	'wikieditor-toolbar-tool-italic' => 'Xwar',
+	'wikieditor-toolbar-tool-bold' => 'Stûr',
+	'wikieditor-toolbar-tool-bold-example' => 'Nivîsa stûr',
+	'wikieditor-toolbar-tool-italic' => 'Xwahr',
 	'wikieditor-toolbar-tool-italic-example' => 'Nivîsa xwar',
-	'wikieditor-toolbar-tool-ilink' => 'Lînka hundirî',
+	'wikieditor-toolbar-tool-ilink' => 'Girêdana navxweyî',
 	'wikieditor-toolbar-tool-ilink-example' => 'Sernavê lînkê',
-	'wikieditor-toolbar-tool-xlink' => 'Lînka derveyî (pêşeka http:// ji bîr neke)',
+	'wikieditor-toolbar-tool-xlink' => 'Girêdana derve (http:// di destpêkê de ji bîr neke)',
 	'wikieditor-toolbar-tool-xlink-example' => 'http://www.minak.com sernavê lînkê',
-	'wikieditor-toolbar-tool-link' => 'Lînk',
-	'wikieditor-toolbar-tool-link-title' => 'Lînkê têxe',
+	'wikieditor-toolbar-tool-link' => 'Girêdan',
+	'wikieditor-toolbar-tool-link-title' => 'Girêdanê têxe',
 	'wikieditor-toolbar-tool-link-cancel' => 'Betal',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Rûpel heye',
 	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Rûpel tune',
-	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Lînka derve',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Girêdanên derve',
 	'wikieditor-toolbar-tool-file-example' => 'Mînak.jpg',
 	'wikieditor-toolbar-tool-reference' => 'Referans',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Betal',
@@ -13024,10 +13987,12 @@ $messages['ku-latn'] = array(
 	'wikieditor-toolbar-tool-heading-example' => 'Teksta sernivîsê',
 	'wikieditor-toolbar-group-format' => 'Teşe',
 	'wikieditor-toolbar-tool-nowiki-example' => 'Nivîs ku nebe formatkirin li vir têxe',
-	'wikieditor-toolbar-tool-redirect' => 'Redirect',
+	'wikieditor-toolbar-tool-redirect' => 'Beralîkirin',
 	'wikieditor-toolbar-tool-redirect-example' => 'Navê rûpela hedef',
 	'wikieditor-toolbar-tool-big' => 'Mezin',
+	'wikieditor-toolbar-tool-big-example' => 'Nivîsa girdek',
 	'wikieditor-toolbar-tool-small' => 'Biçûk',
+	'wikieditor-toolbar-tool-gallery' => 'Galeriya wêneyan',
 	'wikieditor-toolbar-tool-newline' => 'Rêzika nû',
 	'wikieditor-toolbar-tool-table' => 'Tablo',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Rêzik',
@@ -13037,8 +14002,8 @@ $messages['ku-latn'] = array(
 	'wikieditor-toolbar-tool-table-insert' => 'Têxistin',
 	'wikieditor-toolbar-tool-table-cancel' => 'Betal',
 	'wikieditor-toolbar-tool-replace-close' => 'Girtin',
-	'wikieditor-toolbar-characters-page-latin' => 'Latinî',
-	'wikieditor-toolbar-characters-page-latinextended' => 'Latinî berfirehkirî',
+	'wikieditor-toolbar-characters-page-latin' => 'Latînî',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Latînî berfirehkirî',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
 	'wikieditor-toolbar-characters-page-symbols' => 'Sembol',
 	'wikieditor-toolbar-characters-page-greek' => 'Yewnanî',
@@ -13054,21 +14019,21 @@ $messages['ku-latn'] = array(
 	'wikieditor-toolbar-characters-page-lao' => 'Lao',
 	'wikieditor-toolbar-characters-page-khmer' => 'Xmer',
 	'wikieditor-toolbar-section-help' => 'Alîkarî',
-	'wikieditor-toolbar-help-heading-description' => 'Rave',
+	'wikieditor-toolbar-help-heading-description' => 'Danasîn',
 	'wikieditor-toolbar-help-page-format' => 'Teşekirin',
-	'wikieditor-toolbar-help-page-link' => 'Lînk',
+	'wikieditor-toolbar-help-page-link' => 'Girêdan',
 	'wikieditor-toolbar-help-page-heading' => 'Sernivîs',
 	'wikieditor-toolbar-help-page-list' => 'Lîste',
 	'wikieditor-toolbar-help-page-file' => 'Pel',
 	'wikieditor-toolbar-help-page-reference' => 'Referans',
 	'wikieditor-toolbar-help-page-discussion' => 'Guftûgo',
-	'wikieditor-toolbar-help-content-italic-description' => 'Îtalîk',
+	'wikieditor-toolbar-help-content-italic-description' => 'Xwahr',
 	'wikieditor-toolbar-help-content-italic-syntax' => "''Nivîşa îtalîk''",
-	'wikieditor-toolbar-help-content-italic-result' => '<em>Nivîsa îtalîk</em>',
-	'wikieditor-toolbar-help-content-bold-description' => 'Qalind',
-	'wikieditor-toolbar-help-content-bold-syntax' => "'''Nivîsa qalind'''",
-	'wikieditor-toolbar-help-content-bold-result' => '<strong>Nivîsa qalind</strong>',
-	'wikieditor-toolbar-help-content-bolditalic-description' => 'Qalind û îtalîk',
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Nivîsa xwahr</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Stûr',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Nivîsa stûr'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Nivîsa stûr</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Stûr û xwahr',
 	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Nivîsa qalind û îtalîk</em></strong>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'Lînka hundirî',
 	'wikieditor-toolbar-help-content-xlink-description' => 'Lînka derve',
@@ -13199,7 +14164,6 @@ $1:Ensampel.jpg|Descrifans2',
 	'wikieditor-toolbar-tool-replace-search' => 'Whila:',
 	'wikieditor-toolbar-tool-replace-replace' => 'Kemeres le a:',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Cavos an nessa',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Kemeres le an nessa',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Kemeres le pubtra',
 	'wikieditor-toolbar-tool-replace-close' => 'Degea',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Na wrug agas whilans machya tra veth.',
@@ -13518,7 +14482,7 @@ $1:Example.jpg|Beschreiwung2',
 	'wikieditor-toolbar-tool-replace-case' => 'Op grouss a kleng Schreiwen oppassen',
 	'wikieditor-toolbar-tool-replace-regex' => 'Dat no deem Dir sicht als regulären Ausdrock behandelen',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Den nächste fannen',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Den nächsten ersetzen',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Ersetzen',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Alles ersetzen',
 	'wikieditor-toolbar-tool-replace-close' => 'Zoumaachen',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Beim Siche gouf näischt fonnt.',
@@ -13533,6 +14497,7 @@ $1:Example.jpg|Beschreiwung2',
 	'wikieditor-toolbar-characters-page-greek' => 'Griichesch',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillisch',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabesch',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabesch, erweidert',
 	'wikieditor-toolbar-characters-page-persian' => 'Persesch',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebräisch',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangalesch',
@@ -13661,6 +14626,7 @@ $messages['li'] = array(
 	'wikieditor-toolbar-desc' => 'Nuje bewèrkingsbalk',
 	'wikieditor-toolbar-preference' => 'Gebroek de nuje bewèrkingsbalk',
 	'wikieditor-toolbar-dialogs-preference' => 'Zèt inveurvensters aan',
+	'wikieditor-toolbar-hidesig' => 'Verberg de knoep veur óngerteikene in dees naamruumde',
 	'wikieditor-toolbar-loading' => 'Laje…',
 	'wikieditor-toolbar-tool-bold' => 'Vèt',
 	'wikieditor-toolbar-tool-bold-example' => 'Vètten teks',
@@ -13769,7 +14735,7 @@ $1:Veurbeildj2|Biesjrif2',
 	'wikieditor-toolbar-tool-replace-case' => 'Houflettergeveulig',
 	'wikieditor-toolbar-tool-replace-regex' => 'Behanjel de zeukreiks es regulier oetdrukking',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Zeuk de volgende',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Vervang de volgende',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Vervang',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Vervang alles',
 	'wikieditor-toolbar-tool-replace-close' => 'Sloet',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Dien zeukopdrach haet gein rizzeltaote gegaeve.',
@@ -13784,6 +14750,7 @@ $1:Veurbeildj2|Biesjrif2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grieks',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrillisch',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabisch',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Oetgebreid Arabisch',
 	'wikieditor-toolbar-characters-page-persian' => 'Perzisch',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreeuws',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengaals',
@@ -14001,7 +14968,6 @@ $1:Pavyzdys.jpg|Aprašymas2',
 	'wikieditor-toolbar-tool-replace-case' => 'Skirti didžiąsias ir mažąsias raides',
 	'wikieditor-toolbar-tool-replace-regex' => 'Laikyti paieškos eilutę kaip reguliariąją išraišką',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Rasti kitą',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Pakeisti kitą',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Pakeisti visus',
 	'wikieditor-toolbar-tool-replace-close' => 'Uždaryti',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Jūsų paieška nieko nerado.',
@@ -14096,12 +15062,15 @@ $messages['ltg'] = array(
 );
 
 /** Latvian (Latviešu)
+ * @author Gleb Borisov
+ * @author GreenZeb
  * @author Marozols
  * @author Papuass
  * @author Xil
  */
 $messages['lv'] = array(
 	'wikieditor-wikitext-tab' => 'Vikiteksts',
+	'wikieditor-loading' => 'Ielādē…',
 	'wikieditor-preview-preference' => "Ieslēgt ''side-by-side'' priekšskatu",
 	'wikieditor-preview-tab' => 'Pirmskats',
 	'wikieditor-preview-changes-tab' => 'Izmaiņas',
@@ -14149,7 +15118,7 @@ $messages['lv'] = array(
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Nekorekts nosaukums',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Ārējā saite',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Tiek pārbaudīts vai lapa eksistē...',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Norādītais nosaukums nav korekts.',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Norādītais nosaukums nav derīgs.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Norādītais URL izskatās pēc saites uz viki lapu. Vai vēlaties to pārveidot par iekšēju saiti?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Iekšējā saite',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Ārējā saite',
@@ -14163,7 +15132,7 @@ $messages['lv'] = array(
 	'wikieditor-toolbar-tool-reference-insert' => 'Ievietot',
 	'wikieditor-toolbar-tool-reference-text' => 'Atsauces teksts',
 	'wikieditor-toolbar-tool-signature' => 'Paraksts un parakstīšanās laiks',
-	'wikieditor-toolbar-section-advanced' => 'Papildus iespējas',
+	'wikieditor-toolbar-section-advanced' => 'Papildu iespējas',
 	'wikieditor-toolbar-tool-heading' => 'Virsraksts',
 	'wikieditor-toolbar-tool-heading-1' => '1. līmeņa',
 	'wikieditor-toolbar-tool-heading-2' => '2. līmeņa',
@@ -14230,7 +15199,6 @@ $1:Example.jpg|Apraksts2',
 	'wikieditor-toolbar-tool-replace-case' => 'Ņemt vērā lielos un mazos burtus',
 	'wikieditor-toolbar-tool-replace-regex' => 'Uztvert meklējamo virkni kā regulāru izteiksmi',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Meklēt nākamo',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Aizvietot nākamo',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Aizvietot visus',
 	'wikieditor-toolbar-tool-replace-close' => 'Aizvērt',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Nekas netika atrasts.',
@@ -14466,7 +15434,6 @@ $1:Contoh.jpg|Judul2',
 	'wikieditor-toolbar-tool-replace-case' => 'Keadaan cocok',
 	'wikieditor-toolbar-tool-replace-regex' => 'Perlakukan string cari sebagai "regular expression"',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Cari berikutnyo',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Ganti berikutnyo',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ganti semua',
 	'wikieditor-toolbar-tool-replace-close' => 'Tutup',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Pencarian awak indak berhasil',
@@ -14575,7 +15542,7 @@ $messages['mk'] = array(
 	'wikieditor-publish-dialog-title' => 'Објави на {{SITENAME}}',
 	'wikieditor-publish-dialog-summary' => 'Опис на уредувањето (накратко опишете ги промените кои ги направивте):',
 	'wikieditor-publish-dialog-minor' => 'Ситно уредување',
-	'wikieditor-publish-dialog-watch' => 'Набљудувај ја оваа страница',
+	'wikieditor-publish-dialog-watch' => 'Набљудувај ја страницава',
 	'wikieditor-publish-dialog-publish' => 'Објави',
 	'wikieditor-publish-dialog-goback' => 'Назад',
 	'wikieditor-template-editor-preference' => 'Овозможи уредување на вики-шаблони преку образец',
@@ -14617,7 +15584,7 @@ $messages['mk'] = array(
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Погрешен наслов',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Надворешна врска',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Проверувам дали постои страницата...',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Насловот којшто го назначивте е погрешен.',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Наведениот наслов е неважечки.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URL адресата која ја назначивте изгледа како врска до друга вики-страница. Сакате ова да биде внатрешна врска?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Внатрешна врска',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Надворешна врска',
@@ -14696,9 +15663,9 @@ $1:Пример.jpg|Опис2',
 	'wikieditor-toolbar-tool-replace-search' => 'Барај:',
 	'wikieditor-toolbar-tool-replace-replace' => 'Замени со:',
 	'wikieditor-toolbar-tool-replace-case' => 'Прави разлика помеѓу големи и мали букви',
-	'wikieditor-toolbar-tool-replace-regex' => 'Третирај ја низата за пребарување како регуларен израз',
+	'wikieditor-toolbar-tool-replace-regex' => 'Сметај ја низата за пребарување за регуларен израз',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Пронајди следно',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замени следно',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Замени',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замени сè',
 	'wikieditor-toolbar-tool-replace-close' => 'Затвори',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Ништо не се совпадна со бараното.',
@@ -14713,6 +15680,7 @@ $1:Пример.jpg|Опис2',
 	'wikieditor-toolbar-characters-page-greek' => 'Грчки',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Кирилица',
 	'wikieditor-toolbar-characters-page-arabic' => 'Арапски',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Арапски-проширено',
 	'wikieditor-toolbar-characters-page-persian' => 'персиски',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Хебрејски',
 	'wikieditor-toolbar-characters-page-bangla' => 'Бенгалски',
@@ -14931,7 +15899,7 @@ $1:Example.jpg|കുറിപ്പ്2',
 	'wikieditor-toolbar-tool-replace-case' => 'അക്ഷരമാലാ തരവും (case) ഒത്തുനോക്കുക',
 	'wikieditor-toolbar-tool-replace-regex' => 'അന്വേഷിക്കുന്ന പദത്തെ റെഗുലർ എക്സ്പ്രഷനായി കണക്കാക്കുക',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'അടുത്തതു കണ്ടെത്തുക',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'അടുത്തതു മാറ്റിച്ചേർക്കുക',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'മാറ്റിച്ചേർക്കുക',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'എല്ലാം മാറ്റിച്ചേർക്കുക',
 	'wikieditor-toolbar-tool-replace-close' => 'അടയ്ക്കുക',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'താങ്കളുടെ തിരച്ചിലുമായി ഒന്നും ഒത്തുപോകുന്നില്ല.',
@@ -14946,6 +15914,7 @@ $1:Example.jpg|കുറിപ്പ്2',
 	'wikieditor-toolbar-characters-page-greek' => 'ഗ്രീക്ക്',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'സിറിലിക്',
 	'wikieditor-toolbar-characters-page-arabic' => 'അറബിക്',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'അറബി വിപുലം',
 	'wikieditor-toolbar-characters-page-persian' => 'പേർഷ്യൻ',
 	'wikieditor-toolbar-characters-page-hebrew' => 'ഹീബ്രു',
 	'wikieditor-toolbar-characters-page-bangla' => 'ബംഗ്ലാ',
@@ -15033,6 +16002,7 @@ $messages['mn'] = array(
  * @author Htt
  * @author Mahitgar
  * @author McDutchie
+ * @author Rahuldeshmukh101
  * @author V.narsikar
  * @author अभय नातू
  */
@@ -15178,7 +16148,7 @@ $1:Example.jpg|चित्रपरिचय २',
 	'wikieditor-toolbar-tool-replace-case' => '’केस’जुळवा',
 	'wikieditor-toolbar-tool-replace-regex' => 'शोध सूत्रास(स्ट्रिंग) नियमीत पदावली(एक्सप्रेशन) प्रमाणे गृहीत धरा.',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'पुढील शोधा:',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'पुढील मजकुरावर पुनर्लेखन करा:',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'पुनर्स्थापित करा',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'सर्व बदली करा.',
 	'wikieditor-toolbar-tool-replace-close' => 'बंद करा.',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'आपला शोध कशाशीच जुळत नाही.',
@@ -15193,6 +16163,7 @@ $1:Example.jpg|चित्रपरिचय २',
 	'wikieditor-toolbar-characters-page-greek' => 'ग्रीक भाषा',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'सिरिलीक',
 	'wikieditor-toolbar-characters-page-arabic' => 'अरेबिक भाषा',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'अरबी विस्तारित',
 	'wikieditor-toolbar-characters-page-persian' => 'फार्सी',
 	'wikieditor-toolbar-characters-page-hebrew' => 'हिब्रू भाषा',
 	'wikieditor-toolbar-characters-page-bangla' => 'बंगाली भाषा',
@@ -15280,12 +16251,12 @@ $messages['ms'] = array(
 	'wikieditor-desc' => 'Menyediakan halaman wikitext suntingan dan ciri modul lain',
 	'wikieditor-wikitext-tab' => 'Wikiteks',
 	'wikieditor-loading' => 'Editor sedang dimuatkan',
-	'wikieditor-preview-preference' => 'Aktifkan pratonton sisi',
-	'wikieditor-preview-tab' => 'Pratonton',
+	'wikieditor-preview-preference' => 'Aktifkan pralihat perbandingan',
+	'wikieditor-preview-tab' => 'Pralihat',
 	'wikieditor-preview-changes-tab' => 'Perubahan',
 	'wikieditor-preview-loading' => 'Memuatkan...',
-	'wikieditor-previewDialog-preference' => 'Aktifkan dialog pratonton',
-	'wikieditor-previewDialog-tab' => 'Pratonton',
+	'wikieditor-previewDialog-preference' => 'Aktifkan dialog pralihat',
+	'wikieditor-previewDialog-tab' => 'Pralihat',
 	'wikieditor-previewDialog-loading' => 'Memuatkan...',
 	'wikieditor-publish-preference' => 'Aktifkan tutorial penerbitan',
 	'wikieditor-publish-button-publish' => 'Terbitkan',
@@ -15383,9 +16354,9 @@ $1:Contoh.jpg|Sari kata 2',
 	'wikieditor-toolbar-tool-newline' => 'Baris baru',
 	'wikieditor-toolbar-tool-table' => 'Jadual',
 	'wikieditor-toolbar-tool-table-example-old' => '-
-! pengepala 1
-! pengepala 2
-! pengepala 3
+! pengatas 1
+! pengatas 2
+! pengatas 3
 |-
 | baris 1, sel 1
 | baris 1, sel 2
@@ -15406,6 +16377,7 @@ $1:Contoh.jpg|Sari kata 2',
 	'wikieditor-toolbar-tool-table-preview' => 'Pralihat',
 	'wikieditor-toolbar-tool-table-insert' => 'Sisip',
 	'wikieditor-toolbar-tool-table-cancel' => 'Batalkan',
+	'wikieditor-toolbar-tool-table-example-text' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod.',
 	'wikieditor-toolbar-tool-table-toomany' => 'Memasukkan jadual dengan lebih $1 sel tidak dibenarkan dengan dialog ini.',
 	'wikieditor-toolbar-tool-table-invalidnumber' => 'Anda tidak menyertakan nombor yang sah untuk bilangan baris dan lajur.',
 	'wikieditor-toolbar-tool-table-zero' => 'Anda tidak boleh menyisipkan jadual dengan baris atau lajur sifar.',
@@ -15416,7 +16388,7 @@ $1:Contoh.jpg|Sari kata 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Padankan atur huruf',
 	'wikieditor-toolbar-tool-replace-regex' => 'Anggap rentetan carian sebagai ungkapan nalar',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Carian berikutnya',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Ganti berikutnya',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Ganti',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Tukar semua',
 	'wikieditor-toolbar-tool-replace-close' => 'Tutup',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Tiada padanan ditemui untuk carian anda.',
@@ -15425,15 +16397,16 @@ $1:Contoh.jpg|Sari kata 2',
 	'wikieditor-toolbar-tool-replace-invalidregex' => 'Ungkapan yang anda masukkan tidak sah: $1',
 	'wikieditor-toolbar-section-characters' => 'Aksara khas',
 	'wikieditor-toolbar-characters-page-latin' => 'Rumi',
-	'wikieditor-toolbar-characters-page-latinextended' => 'Rumi lanjut',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Rumi lanjutan',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
 	'wikieditor-toolbar-characters-page-symbols' => 'Simbol',
 	'wikieditor-toolbar-characters-page-greek' => 'Yunani',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyril',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arab',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arab lanjutan',
 	'wikieditor-toolbar-characters-page-persian' => 'Parsi',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Ibrani',
-	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
+	'wikieditor-toolbar-characters-page-bangla' => 'Benggala',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
 	'wikieditor-toolbar-characters-page-sinhala' => 'Sinhala',
 	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
@@ -15466,18 +16439,18 @@ $1:Contoh.jpg|Sari kata 2',
 	'wikieditor-toolbar-help-content-xlink-description' => 'Pautan luar',
 	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.contoh.org Label pautan]<br />[http://www.contoh.org]<br />http://www.contoh.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Label pautan</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.contoh.org</a>",
-	'wikieditor-toolbar-help-content-heading2-description' => 'Penjudulan tingkat 2',
-	'wikieditor-toolbar-help-content-heading2-syntax' => '== Teks judul ==',
-	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Teks judul</h2>',
-	'wikieditor-toolbar-help-content-heading3-description' => 'Penjudulan tingkat 3',
-	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Teks judul ===',
-	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Teks judul</h3>',
-	'wikieditor-toolbar-help-content-heading4-description' => 'Penjudulan tingkat 4',
-	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Teks judul ====',
-	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Teks judul</h4>',
-	'wikieditor-toolbar-help-content-heading5-description' => 'Penjudulan tingkat 5',
-	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Teks judul =====',
-	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Teks judul</h5>',
+	'wikieditor-toolbar-help-content-heading2-description' => 'Pengatas aras 2',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Teks pengatas ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Teks pengatas</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'Pengatas aras 3',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Teks pengatas ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Teks pengatas</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'Pengatas aras 4',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Teks pengatas ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Teks pengatas</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'Pengatas aras 5',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Teks pengatas =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Teks pengatas</h5>',
 	'wikieditor-toolbar-help-content-ulist-description' => 'Senarai berbutir',
 	'wikieditor-toolbar-help-content-ulist-syntax' => '* Perkara senarai<br />
 * Perkara senarai',
@@ -15647,7 +16620,6 @@ $1:Eżempju.jpg|Deskrizzjoni2',
 	'wikieditor-toolbar-tool-replace-case' => 'Ittra kapitali/żgħira',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratta t-test tat-tfittxija bħala espressjoni regolari',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Sib li jmiss',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Biddel li jmiss',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Biddel kollox',
 	'wikieditor-toolbar-tool-replace-close' => 'Agħlaq',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'It-tfittxija ma tat l-ebda riżultat.',
@@ -15713,7 +16685,7 @@ $1:Eżempju.jpg|Deskrizzjoni2',
 	'wikieditor-toolbar-help-content-olist-syntax' => '# Element tal-lista<br /># Element tal-lista',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Element tal-lista</li><li>Element tal-lista</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'Fajl inkorporat',
-	'wikieditor-toolbar-help-content-file-syntax' => "[[$1:Eżempju.png|thumb|Test ta' deskrizzjoni]]",
+	'wikieditor-toolbar-help-content-file-syntax' => "[[$1:Eżempju.png|thumb|thumb|Test ta' deskrizzjoni]]",
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Test tad-deskrizzjoni' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Kabbar' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Test tad-deskrizzjoni</div></div>",
 	'wikieditor-toolbar-help-content-reference-description' => 'Referenza',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'Test tal-paġna.&lt;ref name="test"&gt;[http://www.example.org Test tal-ħolqa], test addizzjonali.&lt;/ref&gt;',
@@ -15932,163 +16904,398 @@ $messages['nah'] = array(
 	'wikieditor-toolbar-help-content-indent-result' => 'Sâsanỉman tlâkuilòlmantli<dl><dd>Tlâtlapouhki tlakuilòlmantli<dl><dd>Tlâtlapouhki tlâkuilòlmantli</dd></dl></dd></dl>',
 );
 
+/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Event
+ * @author Jon Harald Søby
+ * @author Laaknor
+ * @author Nghtwlkr
+ */
+$messages['nb'] = array(
+	'wikieditor' => 'Avansert grensesnitt for redigering av wikitekst',
+	'wikieditor-desc' => 'Gir et utvidbart tekstredigeringsgrensesnitt og mange utvidelsesmoduler',
+	'wikieditor-wikitext-tab' => 'Wikitekst',
+	'wikieditor-loading' => 'Laster',
+	'wikieditor-preview-preference' => 'Aktiver forhåndsvisning side-ved-side',
+	'wikieditor-preview-tab' => 'Forhåndsvisning',
+	'wikieditor-preview-changes-tab' => 'Endringer',
+	'wikieditor-preview-loading' => 'Laster...',
+	'wikieditor-previewDialog-preference' => 'Aktiver forhåndsvisningsdialog',
+	'wikieditor-previewDialog-tab' => 'Forhåndsvisning',
+	'wikieditor-previewDialog-loading' => 'Laster...',
+	'wikieditor-publish-preference' => 'Aktiver steg-for-steg publisering',
+	'wikieditor-publish-button-publish' => 'Publiser',
+	'wikieditor-publish-button-cancel' => 'Avbryt',
+	'wikieditor-publish-dialog-title' => 'Publiser til {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'Redigeringssammendrag (oppsummering av hvilke endringer du har gjort)',
+	'wikieditor-publish-dialog-minor' => 'Mindre endring',
+	'wikieditor-publish-dialog-watch' => 'Overvåk denne siden',
+	'wikieditor-publish-dialog-publish' => 'Publiser',
+	'wikieditor-publish-dialog-goback' => 'Gå tilbake',
+	'wikieditor-template-editor-preference' => 'Aktiver skjemabasert redigering av wikimaler',
+	'wikieditor-template-editor-dialog-title' => 'Rediger mal',
+	'wikieditor-template-editor-dialog-submit' => 'Oppdater',
+	'wikieditor-template-editor-dialog-cancel' => 'Avbryt',
+	'wikieditor-templates-preference' => 'Aktiver sammenleggbare maler',
+	'wikieditor-toc-preference' => 'Aktiver navigerbar innholdsfortegnelse',
+	'wikieditor-toc-show' => 'Vis innhold',
+	'wikieditor-toc-hide' => 'Skjul innhold',
+	'wikieditor-toolbar' => 'Verktøylinje for redigering',
+	'wikieditor-toolbar-desc' => 'Verktøylinje for redigering med utvidet brukervennlighet',
+	'wikieditor-toolbar-preference' => 'Aktiver utvidet verktøylinje for redigering',
+	'wikieditor-toolbar-dialogs-preference' => 'Slå på dialoger for innsetting av lenker, tabeller og mer',
+	'wikieditor-toolbar-hidesig' => 'Skjul signaturknappen fra sider i hovednavnerommet',
+	'wikieditor-toolbar-loading' => 'Laster...',
+	'wikieditor-toolbar-tool-bold' => 'Fet',
+	'wikieditor-toolbar-tool-bold-example' => 'Fet tekst',
+	'wikieditor-toolbar-tool-italic' => 'Kursiv',
+	'wikieditor-toolbar-tool-italic-example' => 'Kursiv tekst',
+	'wikieditor-toolbar-tool-ilink' => 'Intern lenke',
+	'wikieditor-toolbar-tool-ilink-example' => 'Lenketittel',
+	'wikieditor-toolbar-tool-xlink' => 'Ekstern lenke (husk http:// først)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com lenketittel',
+	'wikieditor-toolbar-tool-link' => 'Lenke',
+	'wikieditor-toolbar-tool-link-title' => 'Sett inn lenke',
+	'wikieditor-toolbar-tool-link-int' => 'Til en wikiartikkel/-side',
+	'wikieditor-toolbar-tool-link-int-target' => 'Sidetittel/artikkeltittel:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Sidetittel eller internettadresse',
+	'wikieditor-toolbar-tool-link-int-text' => 'Lenketekst:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Legg inn teksten som skal vises',
+	'wikieditor-toolbar-tool-link-ext' => 'Til en ekstern webside',
+	'wikieditor-toolbar-tool-link-ext-target' => 'Adresse:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'Lenketekst:',
+	'wikieditor-toolbar-tool-link-insert' => 'Sett inn lenke',
+	'wikieditor-toolbar-tool-link-cancel' => 'Avbryt',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Siden finnes',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Siden finnes ikke',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Ugyldig tittel',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Ekstern lenke',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Kontrollerer om siden finnes...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Tittelen du gav er ugyldig',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URLen du la inn ser ut som en lenke til en annen wikiside. Vil du gjøre den til en internlenke?',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Intern lenke',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Ekstern lenke',
+	'wikieditor-toolbar-tool-link-empty' => 'Du skrev ikke inn noe å lenke til',
+	'wikieditor-toolbar-tool-file' => 'Fil',
+	'wikieditor-toolbar-tool-file-example' => 'Eksempel.jpg',
+	'wikieditor-toolbar-tool-reference' => 'Referanse',
+	'wikieditor-toolbar-tool-reference-example' => 'Sett inn fotnotetekst her',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Avbryt',
+	'wikieditor-toolbar-tool-reference-title' => 'Sett inn referanse',
+	'wikieditor-toolbar-tool-reference-insert' => 'Sett inn',
+	'wikieditor-toolbar-tool-reference-text' => 'Referansetekst',
+	'wikieditor-toolbar-tool-signature' => 'Din signatur med dato',
+	'wikieditor-toolbar-section-advanced' => 'Avansert',
+	'wikieditor-toolbar-tool-heading' => 'Overskrift',
+	'wikieditor-toolbar-tool-heading-1' => 'Nivå 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Nivå 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Nivå 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Nivå 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Nivå 5',
+	'wikieditor-toolbar-tool-heading-example' => 'Overskriftstekst',
+	'wikieditor-toolbar-group-format' => 'Format',
+	'wikieditor-toolbar-tool-ulist' => 'Punktliste',
+	'wikieditor-toolbar-tool-ulist-example' => 'Punktlisteelement',
+	'wikieditor-toolbar-tool-olist' => 'Nummerert liste',
+	'wikieditor-toolbar-tool-olist-example' => 'Nummerert liste-element',
+	'wikieditor-toolbar-tool-indent' => 'Indentering',
+	'wikieditor-toolbar-tool-indent-example' => 'Indentert linje',
+	'wikieditor-toolbar-tool-nowiki' => 'Ingen wikiformatering',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Sett inn uformatert tekst her',
+	'wikieditor-toolbar-tool-redirect' => 'Omdiriger',
+	'wikieditor-toolbar-tool-redirect-example' => 'Målsidenavn',
+	'wikieditor-toolbar-tool-big' => 'Stor',
+	'wikieditor-toolbar-tool-big-example' => 'Stor tekst',
+	'wikieditor-toolbar-tool-small' => 'Liten',
+	'wikieditor-toolbar-tool-small-example' => 'Liten tekst',
+	'wikieditor-toolbar-tool-superscript' => 'Hevet',
+	'wikieditor-toolbar-tool-superscript-example' => 'Hevet tekst',
+	'wikieditor-toolbar-tool-subscript' => 'Senket',
+	'wikieditor-toolbar-tool-subscript-example' => 'Senket tekst',
+	'wikieditor-toolbar-group-insert' => 'Sett inn',
+	'wikieditor-toolbar-tool-gallery' => 'Bildegalleri',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:Example.jpg|Bildetekst1
+$1:Example.jpg|Bildetekst2',
+	'wikieditor-toolbar-tool-newline' => 'Linjeskift',
+	'wikieditor-toolbar-tool-table' => 'Tabell',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! overskrift 1
+! overskrift 2
+! overskrift 3
+|-
+| rad 1, celle 1
+| rad 1, celle 2
+| rad 1, celle 3
+|-
+| rad 2, celle 1
+| rad 2, celle 2
+| rad 2, celle 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Celletekst',
+	'wikieditor-toolbar-tool-table-example-header' => 'Overskriftstekst',
+	'wikieditor-toolbar-tool-table-title' => 'Sett inn tabell',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Rader',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Kolonner',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Inkluder overskriftsrad',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Stil med kanter',
+	'wikieditor-toolbar-tool-table-sortable' => 'Gjør tabellen sorterbar',
+	'wikieditor-toolbar-tool-table-example' => 'Celletekst',
+	'wikieditor-toolbar-tool-table-preview' => 'Forhåndsvisning',
+	'wikieditor-toolbar-tool-table-insert' => 'Sett inn',
+	'wikieditor-toolbar-tool-table-cancel' => 'Avbryt',
+	'wikieditor-toolbar-tool-table-toomany' => 'Det er ikke mulig å sette inn mer enn $1 celler med denne boksen.',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'Du har ikke skrevet inn et gyldig antall rader eller kolonner.',
+	'wikieditor-toolbar-tool-table-zero' => 'De kan ikke sette inn en tabell med null rader eller kolonner.',
+	'wikieditor-toolbar-tool-replace' => 'Søk og erstatt',
+	'wikieditor-toolbar-tool-replace-title' => 'Søk og erstatt',
+	'wikieditor-toolbar-tool-replace-search' => 'Søk etter:',
+	'wikieditor-toolbar-tool-replace-replace' => 'Erstatt med:',
+	'wikieditor-toolbar-tool-replace-case' => 'Skill mellom store/små bokstaver',
+	'wikieditor-toolbar-tool-replace-regex' => 'Bruk søkestrengen som et regulært uttrykk',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'Finn neste',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Erstatt alle',
+	'wikieditor-toolbar-tool-replace-close' => 'Lukk',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'Søket ga ingen resultater.',
+	'wikieditor-toolbar-tool-replace-success' => 'Gjorde $1 erstating(er).',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Du skrev ikke inn noe å søke etter.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'Det regulære uttrykket du skrev inn er ugyldig: $1',
+	'wikieditor-toolbar-section-characters' => 'Spesialtegn',
+	'wikieditor-toolbar-characters-page-latin' => 'Latin',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Utvidet Latin',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'Symboler',
+	'wikieditor-toolbar-characters-page-greek' => 'Gresk',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillisk',
+	'wikieditor-toolbar-characters-page-arabic' => 'Arabisk',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Utvidet arabisk',
+	'wikieditor-toolbar-characters-page-persian' => 'Persisk',
+	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraisk',
+	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
+	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'Singalesisk',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
+	'wikieditor-toolbar-characters-page-thai' => 'Thai',
+	'wikieditor-toolbar-characters-page-lao' => 'Laotisk',
+	'wikieditor-toolbar-characters-page-khmer' => 'Khmer',
+	'wikieditor-toolbar-section-help' => 'Hjelp',
+	'wikieditor-toolbar-help-heading-description' => 'Beskrivelse',
+	'wikieditor-toolbar-help-heading-syntax' => 'Hva du skriver',
+	'wikieditor-toolbar-help-heading-result' => 'Hva du får',
+	'wikieditor-toolbar-help-page-format' => 'Formatering',
+	'wikieditor-toolbar-help-page-link' => 'Lenker',
+	'wikieditor-toolbar-help-page-heading' => 'Overskrifter',
+	'wikieditor-toolbar-help-page-list' => 'Lister',
+	'wikieditor-toolbar-help-page-file' => 'Filer',
+	'wikieditor-toolbar-help-page-reference' => 'Referanser',
+	'wikieditor-toolbar-help-page-discussion' => 'Diskusjon',
+	'wikieditor-toolbar-help-content-italic-description' => 'Kursiv',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''Kursiv tekst''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Kursiv tekst</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Fet',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Fet tekst'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Fet tekst</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Fet &amp; kursiv',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Fet &amp; kursiv tekst'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Fet &amp; kursiv tekst</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'Intern lenke',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Sidetittel|Lenkenavn]]<br />[[Sidetittel]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Lenkenavn</a><br /><a href='#'>Sidetittel</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'Ekstern lenke',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Lenkenavn]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Lenkenavn</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading2-description' => '2. nivå overskrift',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Overskrift ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Overskrift</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => '3. nivå overskrift',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Overskrift ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Overskrift</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => '4. nivå overskrift',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Overskrift ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Overskrift</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => '5. nivå overskrift',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Overskrift =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Overskrift</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Punktliste',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* Listeelement<br />
+* Listeelement',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Listeelement</li><li>Listeelement</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'Nummerert liste',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# Listeelement<br />
+# Listeelement',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Listeelement</li><li>Listeelement</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'Fil',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|Bildetekst]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Bildetekst' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Forstørr' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Bildetekst</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Referanse',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Tekst.&lt;ref name="test"&gt;[http://www.example.org Lenketekst], ytterligere tekst.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "Tekst.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'Ytterligere bruk av samme referanse',
+	'wikieditor-toolbar-help-content-rereference-result' => "Tekst.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Vis referanser',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Lenketekst</a>, ytterligere tekst.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Signatur med tidsangivelse',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Brukernavn</a> (<a href='#' title='{{#special:mytalk}}'>diskusjon</a>) 10. juni 2009, 15:54 (CEST)",
+	'wikieditor-toolbar-help-content-signature-description' => 'Signatur',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Brukernavn</a> (<a href='#' title='{{#special:mytalk}}'>diskusjon</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'Innrykk',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Normal tekst<br />:Innrykket tekst<br />::Innrykket tekst',
+	'wikieditor-toolbar-help-content-indent-result' => 'Normal tekst<dl><dd>Innrykket tekst<dl><dd>Innrykket tekst</dd></dl></dd></dl>',
+);
+
 /** Nedersaksisch (Nedersaksisch)
  * @author Servien
  */
 $messages['nds-nl'] = array(
-	'wikieditor' => 'Uut-ebreien teksverwarker veur wikitekse',
-	'wikieditor-desc' => 'Hierdeur krie-j een teksverwarker veur wikitekse dee-j uut kunnen breien en modules mit extra functies',
-	'wikieditor-wikitext-tab' => 'Wikitekse',
-	'wikieditor-loading' => "An 't laojen",
+	'wikieditor' => 'Uutebreien tekstverwarker veur wikitekste',
+	'wikieditor-desc' => "Hierdeur krie-j n tekstverwarker veur wikitekste die'j uut kunnen breien en modules mit extra funksies",
+	'wikieditor-wikitext-tab' => 'Wikitekste',
+	'wikieditor-loading' => 'An t laojen',
 	'wikieditor-preview-preference' => 'Bewarken en naokieken naos mekaar',
 	'wikieditor-preview-tab' => 'Naokieken',
 	'wikieditor-preview-changes-tab' => 'Wiezigingen',
-	'wikieditor-preview-loading' => "An 't laojen...",
-	'wikieditor-publish-preference' => 'Stap veur stap publiceren inschakelen',
-	'wikieditor-publish-button-publish' => 'Publiceren',
-	'wikieditor-publish-button-cancel' => 'Ofbreken',
-	'wikieditor-publish-dialog-title' => 'Publiceren naor {{SITENAME}}',
-	'wikieditor-publish-dialog-summary' => "Bewarkingssamenvatting (beschrief de wijzingen in 't kort):",
+	'wikieditor-preview-loading' => 'An t laojen...',
+	'wikieditor-publish-preference' => 'Stap veur stap publiseren inschakelen',
+	'wikieditor-publish-button-publish' => 'Publiseren',
+	'wikieditor-publish-button-cancel' => 'Aofbreken',
+	'wikieditor-publish-dialog-title' => 'Publiseren naor {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'Bewarkingssamenvatting (beschrief de wijzingen in t kort):',
 	'wikieditor-publish-dialog-minor' => 'Kleine bewarking',
 	'wikieditor-publish-dialog-watch' => 'Volg disse pagina',
-	'wikieditor-publish-dialog-publish' => 'Publiceren',
+	'wikieditor-publish-dialog-publish' => 'Publiseren',
 	'wikieditor-publish-dialog-goback' => 'Weerumme',
-	'wikieditor-template-editor-preference' => 'Formelier-ebaseerd bewarken van wikimallen inschakelen',
+	'wikieditor-template-editor-preference' => 'Formulier-ebaseerd bewarken van wikimallen inschakelen',
 	'wikieditor-template-editor-dialog-title' => 'Mallen bewarken',
 	'wikieditor-template-editor-dialog-submit' => 'Biewarken',
-	'wikieditor-template-editor-dialog-cancel' => 'Ofbreken',
+	'wikieditor-template-editor-dialog-cancel' => 'Aofbreken',
 	'wikieditor-templates-preference' => 'Inklapbaore mallen',
 	'wikieditor-toc-preference' => 'Navigeerbaore onderwarplieste inschakelen',
 	'wikieditor-toc-show' => 'Onderwarpen laoten zien',
 	'wikieditor-toc-hide' => 'Onderwarpen verbargen',
 	'wikieditor-toolbar' => 'Bewarkingswarkbalke',
-	'wikieditor-toolbar-desc' => 'Bewarkingsbalke dee gebruuksvriendelijker is',
-	'wikieditor-toolbar-preference' => 'De uut-ebreien bewarkingsbalke anzetten',
-	'wikieditor-toolbar-dialogs-preference' => "Dialogen veur 't toevoegen van verwiezingen, tebellen en meer inschakelen",
+	'wikieditor-toolbar-desc' => 'Bewarkingsbalke die makkeliker te gebruken is',
+	'wikieditor-toolbar-preference' => 'De uutebreien bewarkingsbalke anzetten',
+	'wikieditor-toolbar-dialogs-preference' => 'Dialogen veur t plaotsen van verwiezingen, tabellen en meer inschakelen',
 	'wikieditor-toolbar-loading' => 'Bezig mit laojen...',
 	'wikieditor-toolbar-tool-bold' => 'Vet',
-	'wikieditor-toolbar-tool-bold-example' => 'Vet-edrokken tekse',
-	'wikieditor-toolbar-tool-italic' => 'Schunedrok',
-	'wikieditor-toolbar-tool-italic-example' => 'Schunedrokken tekse',
+	'wikieditor-toolbar-tool-bold-example' => 'Vet-edrokten tekste',
+	'wikieditor-toolbar-tool-italic' => 'Schunedrokt',
+	'wikieditor-toolbar-tool-italic-example' => 'Schunedrokten tekste',
 	'wikieditor-toolbar-tool-ilink' => 'Interne verwiezing',
 	'wikieditor-toolbar-tool-ilink-example' => 'Verwiezingsbeschrieving',
-	'wikieditor-toolbar-tool-xlink' => "Uutgaonde verwiezing (vergeet 't veurvoegsel http:// neet)",
+	'wikieditor-toolbar-tool-xlink' => 'Uutgaonde verwiezing (vergeet t veurvoegsel http:// niet)',
 	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com beschrieving',
 	'wikieditor-toolbar-tool-link' => 'Verwiezing',
 	'wikieditor-toolbar-tool-link-title' => 'Verwiezing derbie doon',
-	'wikieditor-toolbar-tool-link-int' => 'Naor een wikipagina',
+	'wikieditor-toolbar-tool-link-int' => 'Naor n wikipagina',
 	'wikieditor-toolbar-tool-link-int-target' => 'Paginanaam:',
 	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Paginanaam of webadres',
 	'wikieditor-toolbar-tool-link-int-text' => 'Beschrieving:',
-	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Zet hier de tekse in dee te zien mut ween',
-	'wikieditor-toolbar-tool-link-ext' => 'Naor een uutgaonde webpagina',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Zet hier de tekste in die te zien mut ween',
+	'wikieditor-toolbar-tool-link-ext' => 'Naor n uutgaonde webpagina',
 	'wikieditor-toolbar-tool-link-ext-target' => 'Webadres:',
 	'wikieditor-toolbar-tool-link-ext-text' => 'Beschrieving:',
 	'wikieditor-toolbar-tool-link-insert' => 'Verwiezing derbie doon',
-	'wikieditor-toolbar-tool-link-cancel' => 'Ofbreken',
+	'wikieditor-toolbar-tool-link-cancel' => 'Aofbreken',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'De pagina besteet al',
-	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'De pagina besteet neet',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'De pagina besteet niet',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Ongeldige paginanaam',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Uutgaonde verwiezing',
-	'wikieditor-toolbar-tool-link-int-target-status-loading' => "Is an 't kieken of disse pagina al besteet...",
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Is an t kieken of disse pagina al besteet...',
 	'wikieditor-toolbar-tool-link-int-invalid' => 'De op-egeven pagina is ongeldig.',
-	'wikieditor-toolbar-tool-link-lookslikeinternal' => "'t Lik as of 't webadres da-j op-egeven hemmen een verwiezing naor een aandere wikipagina mut ween.
-Wi-j der een interne verwiezing van maken?",
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => "t Lik as of t webadres da'j op-egeven hebben n verwiezing naor n aandere wikipagina mut ween.
+Wi'j der n interne verwiezing van maken?",
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Interne verwiezing',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Uutgaonde verwiezing',
-	'wikieditor-toolbar-tool-link-empty' => 'Je hemmen niks op-egeven um naor te verwiezen.',
+	'wikieditor-toolbar-tool-link-empty' => 'Je hebben niks op-egeven um naor te verwiezen.',
 	'wikieditor-toolbar-tool-file' => 'Bestaand derbie doon',
 	'wikieditor-toolbar-tool-file-example' => 'Veurbeeld.jpg',
-	'wikieditor-toolbar-tool-reference' => 'Rifferentie',
-	'wikieditor-toolbar-tool-reference-example' => 'Plaos hier tekse veur de vootnote',
-	'wikieditor-toolbar-tool-reference-cancel' => 'Ofbreken',
-	'wikieditor-toolbar-tool-reference-title' => 'Rifferentie derbie doon',
+	'wikieditor-toolbar-tool-reference' => 'Referensie',
+	'wikieditor-toolbar-tool-reference-example' => 'Plaots hier tekste veur de vootnote',
+	'wikieditor-toolbar-tool-reference-cancel' => 'Aofbreken',
+	'wikieditor-toolbar-tool-reference-title' => 'Referensie derbie doon',
 	'wikieditor-toolbar-tool-reference-insert' => 'Invoegen',
-	'wikieditor-toolbar-tool-reference-text' => 'Rifferentietekse',
+	'wikieditor-toolbar-tool-reference-text' => 'Referensietekste',
 	'wikieditor-toolbar-tool-signature' => 'Ondertekening en tiedstempel',
-	'wikieditor-toolbar-section-advanced' => 'Meer functies',
+	'wikieditor-toolbar-section-advanced' => 'Meer funksies',
 	'wikieditor-toolbar-tool-heading' => 'Kopjen',
 	'wikieditor-toolbar-tool-heading-1' => 'Nivo 1',
 	'wikieditor-toolbar-tool-heading-2' => 'Nivo 2',
 	'wikieditor-toolbar-tool-heading-3' => 'Nivo 3',
 	'wikieditor-toolbar-tool-heading-4' => 'Nivo 4',
 	'wikieditor-toolbar-tool-heading-5' => 'Nivo 5',
-	'wikieditor-toolbar-tool-heading-example' => 'Koptekse',
+	'wikieditor-toolbar-tool-heading-example' => 'Koptekste',
 	'wikieditor-toolbar-group-format' => 'Opmaak',
 	'wikieditor-toolbar-tool-ulist' => 'Lieste zonder nummers',
-	'wikieditor-toolbar-tool-ulist-example' => 'Regel in een lieste zonder nummers',
+	'wikieditor-toolbar-tool-ulist-example' => 'Regel in n lieste zonder nummers',
 	'wikieditor-toolbar-tool-olist' => 'Lieste mit nummers',
-	'wikieditor-toolbar-tool-olist-example' => 'Regel in een lieste mit nummers',
+	'wikieditor-toolbar-tool-olist-example' => 'Regel in n lieste mit nummers',
 	'wikieditor-toolbar-tool-indent' => 'Inspringen',
-	'wikieditor-toolbar-tool-indent-example' => 'In-esprungen regel',
+	'wikieditor-toolbar-tool-indent-example' => 'In-espröngen regel',
 	'wikieditor-toolbar-tool-nowiki' => 'Gien wiki-opmaak',
-	'wikieditor-toolbar-tool-nowiki-example' => 'Tekse zonder opmaak hier invoegen',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Tekste zonder opmaak hier invoegen',
 	'wikieditor-toolbar-tool-redirect' => 'Deurverwiezing',
 	'wikieditor-toolbar-tool-redirect-example' => 'Doelpagina',
 	'wikieditor-toolbar-tool-big' => 'Groot',
-	'wikieditor-toolbar-tool-big-example' => 'Groot edrokken tekse',
+	'wikieditor-toolbar-tool-big-example' => 'Groot edrokten tekste',
 	'wikieditor-toolbar-tool-small' => 'Klein',
-	'wikieditor-toolbar-tool-small-example' => 'Klein edrokken tekse',
-	'wikieditor-toolbar-tool-superscript' => 'Superscript',
-	'wikieditor-toolbar-tool-superscript-example' => 'Tekse in superscript',
-	'wikieditor-toolbar-tool-subscript' => 'Subscript',
-	'wikieditor-toolbar-tool-subscript-example' => 'Subscript tekse',
+	'wikieditor-toolbar-tool-small-example' => 'Klein edrokten tekste',
+	'wikieditor-toolbar-tool-superscript' => 'Bovenschrift',
+	'wikieditor-toolbar-tool-superscript-example' => 'Tekste in bovenschrift',
+	'wikieditor-toolbar-tool-subscript' => 'Onderschrift',
+	'wikieditor-toolbar-tool-subscript-example' => 'Tekste in onderschrift',
 	'wikieditor-toolbar-group-insert' => 'Derbie doon',
-	'wikieditor-toolbar-tool-gallery' => 'Foto-uutstalling',
-	'wikieditor-toolbar-tool-gallery-example' => '$1:Veurbeeld1|Bieschrifte1
-$1:Veurbeeld2|Bieschrifte2',
+	'wikieditor-toolbar-tool-gallery' => 'Foto-uutstallige',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:Veurbeeld1|Bieschrift1
+$1:Veurbeeld2|Bieschrift2',
 	'wikieditor-toolbar-tool-newline' => 'Nieje regel',
-	'wikieditor-toolbar-tool-table' => 'Tebel',
+	'wikieditor-toolbar-tool-table' => 'Tabel',
 	'wikieditor-toolbar-tool-table-example-old' => '-
 ! kop 1
 ! kop 2
 ! kop 3
 |-
-| rie 1, cel 1
-| rie 1, cel 2
-| rie 1, cel 3
+| rie 1, sel 1
+| rie 1, sel 2
+| rie 1, sel 3
 |-
-| rie 2, cel 1
-| rie 2, cel 2
-| rie 2, cel 3',
-	'wikieditor-toolbar-tool-table-example-cell-text' => 'Celtekse',
-	'wikieditor-toolbar-tool-table-example-header' => 'Koptekse',
-	'wikieditor-toolbar-tool-table-title' => 'Tebel derbie doon',
+| rie 2, sel 1
+| rie 2, sel 2
+| rie 2, sel 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Seltekste',
+	'wikieditor-toolbar-tool-table-example-header' => 'Koptekste',
+	'wikieditor-toolbar-tool-table-title' => 'Tabel derbie doon',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Riejen',
-	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Kelommen',
-	'wikieditor-toolbar-tool-table-dimensions-header' => 'Koptekse derbie doon',
-	'wikieditor-toolbar-tool-table-wikitable' => 'Laot de celranen zien',
-	'wikieditor-toolbar-tool-table-sortable' => 'Tebel sorteerbaor maken',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Kolommen',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Koptekste derbie doon',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Laot de selraanden zien',
+	'wikieditor-toolbar-tool-table-sortable' => 'Tabel sorteerbaor maken',
 	'wikieditor-toolbar-tool-table-example' => 'Veurbeeld',
 	'wikieditor-toolbar-tool-table-preview' => 'Naokieken',
 	'wikieditor-toolbar-tool-table-insert' => 'Invoegen',
-	'wikieditor-toolbar-tool-table-cancel' => 'Ofbreken',
-	'wikieditor-toolbar-tool-table-toomany' => 'Je kunnen via dit dialoogvienster gien tebel derbie doon mit meer as $1 cellen.',
-	'wikieditor-toolbar-tool-table-invalidnumber' => 'Je hemmen nog gien geldig antal regels of kelommen op-egeven.',
-	'wikieditor-toolbar-tool-table-zero' => 'Je kunnen gien tebel derbie doon zonder regels of kelommen.',
+	'wikieditor-toolbar-tool-table-cancel' => 'Aofbreken',
+	'wikieditor-toolbar-tool-table-toomany' => 'Je kunnen via dit dialoogvienster gien tabel derbie doon mit meer as $1 sellen.',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'Je hebben nog gien geldig antal regels of kolommen op-egeven.',
+	'wikieditor-toolbar-tool-table-zero' => 'Je kunnen gien tabel derbie doon zonder regels of kolommen.',
 	'wikieditor-toolbar-tool-replace' => 'Zeuken en vervangen',
 	'wikieditor-toolbar-tool-replace-title' => 'Zeuken en vervangen',
 	'wikieditor-toolbar-tool-replace-search' => 'Zeuken naor:',
-	'wikieditor-toolbar-tool-replace-replace' => 'Vervangen deur:',
-	'wikieditor-toolbar-tool-replace-case' => 'Heuflettergeveulig',
-	'wikieditor-toolbar-tool-replace-regex' => 'De zeukreeks as regeliere expressie behaandelen',
+	'wikieditor-toolbar-tool-replace-replace' => 'Vervöngen deur:',
+	'wikieditor-toolbar-tool-replace-case' => 'Heufdlettergeveulig',
+	'wikieditor-toolbar-tool-replace-regex' => 'De zeukreeks as reguliere expressie behaandelen',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Volgende zeuken',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Volgende vervangen',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Alles vervangen',
 	'wikieditor-toolbar-tool-replace-close' => 'Sluten',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Joew zeukopdrach hef niks op-eleverd.',
 	'wikieditor-toolbar-tool-replace-success' => 'Der bin $1 vervangingen edaon.',
-	'wikieditor-toolbar-tool-replace-emptysearch' => 'Je hemmen gien zeukterm op-egeven.',
-	'wikieditor-toolbar-tool-replace-invalidregex' => 'De regeliere dee-j op-egeven hemmen is ongeldig: $1',
-	'wikieditor-toolbar-section-characters' => 'Speciale tekens',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'Je hebben gien zeukterm op-egeven.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => "De reguliere die'j op-egeven hebben is ongeldig: $1",
+	'wikieditor-toolbar-section-characters' => 'Spesiale tekens',
 	'wikieditor-toolbar-characters-page-latin' => 'Latien',
-	'wikieditor-toolbar-characters-page-latinextended' => 'Latien uut-ebreid',
-	'wikieditor-toolbar-characters-page-ipa' => 'Internasionaal Klankeschrif',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Latien uutebreid',
+	'wikieditor-toolbar-characters-page-ipa' => 'Internasionaal Klankeschrift',
 	'wikieditor-toolbar-characters-page-symbols' => 'Symbolen',
 	'wikieditor-toolbar-characters-page-greek' => 'Grieks',
-	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrillisch',
-	'wikieditor-toolbar-characters-page-arabic' => 'Arabisch',
-	'wikieditor-toolbar-characters-page-persian' => 'Perzisch',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillies',
+	'wikieditor-toolbar-characters-page-arabic' => 'Arabies',
+	'wikieditor-toolbar-characters-page-persian' => 'Perzies',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreeuws',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengaals',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
@@ -16096,24 +17303,24 @@ $1:Veurbeeld2|Bieschrifte2',
 	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
 	'wikieditor-toolbar-section-help' => 'Hulpe',
 	'wikieditor-toolbar-help-heading-description' => 'Beschrieving',
-	'wikieditor-toolbar-help-heading-syntax' => 'Wa-j tikken',
-	'wikieditor-toolbar-help-heading-result' => 'Wa-j kriegen',
+	'wikieditor-toolbar-help-heading-syntax' => "Wa'j tikken",
+	'wikieditor-toolbar-help-heading-result' => "Wa'j kriegen",
 	'wikieditor-toolbar-help-page-format' => 'Opmaak',
 	'wikieditor-toolbar-help-page-link' => 'Verwiezingen',
 	'wikieditor-toolbar-help-page-heading' => 'Kopjes',
 	'wikieditor-toolbar-help-page-list' => 'Liesten',
-	'wikieditor-toolbar-help-page-file' => 'Bestanen',
-	'wikieditor-toolbar-help-page-reference' => 'Rifferenties',
+	'wikieditor-toolbar-help-page-file' => 'Bestaanden',
+	'wikieditor-toolbar-help-page-reference' => 'Referensies',
 	'wikieditor-toolbar-help-page-discussion' => 'Overleg',
-	'wikieditor-toolbar-help-content-italic-description' => 'Schunedrok',
-	'wikieditor-toolbar-help-content-italic-syntax' => 'Schunedrokken tekse',
-	'wikieditor-toolbar-help-content-italic-result' => '<em>Schunedrokken tekse</em>',
-	'wikieditor-toolbar-help-content-bold-description' => 'Vet-edrok',
-	'wikieditor-toolbar-help-content-bold-syntax' => "'''Vet-edrokken tekse'''",
-	'wikieditor-toolbar-help-content-bold-result' => '<strong>Vet-edrokken tekse</strong>',
-	'wikieditor-toolbar-help-content-bolditalic-description' => 'Vet- en schunedrok',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Vet- en schunedrokken tekse'''''",
-	'wikieditor-toolbar-help-content-bolditalic-result' => '<em><strong>Vet- en schunedrokken tekse</strong></em>',
+	'wikieditor-toolbar-help-content-italic-description' => 'Schunedrokt',
+	'wikieditor-toolbar-help-content-italic-syntax' => 'Schunedrokten tekste',
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Schunedrokten tekste</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'Vet-edrokt',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''Vet-edrokten tekste'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Vet-edrokten tekste</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Vet- en schunedrokt',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Vet- en schunedrokten tekste'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<em><strong>Vet- en schunedrokten tekste</strong></em>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'Interne verwiezing',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Paginanaam|Beschrieving]]<br />[[Paginanaam]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Beschrieving</a><br /><a href='#'>Paginanaam</a>",
@@ -16121,40 +17328,40 @@ $1:Veurbeeld2|Bieschrifte2',
 	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Beschrieving]<br />[http://www.example.org]<br />http://www.example.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Beschrieving</a><br /><a href='#' class='external autonummering'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
 	'wikieditor-toolbar-help-content-heading2-description' => 'Kopjen nivo 2',
-	'wikieditor-toolbar-help-content-heading2-syntax' => '== Koptekse ==',
-	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Koptekse</h2>',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Koptekste ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Koptekste</h2>',
 	'wikieditor-toolbar-help-content-heading3-description' => 'Kopjen nivo 3',
-	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Koptekse ===',
-	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Koptekse</h3>',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Koptekste ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Koptekste</h3>',
 	'wikieditor-toolbar-help-content-heading4-description' => 'Kopjen nivo 4',
-	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Koptekse ====',
-	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Koptekse</h4>',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Koptekste ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Koptekste</h4>',
 	'wikieditor-toolbar-help-content-heading5-description' => 'Kopjen nivo 5',
-	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Koptekse =====',
-	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Koptekse</h5>',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Koptekste =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Koptekste</h5>',
 	'wikieditor-toolbar-help-content-ulist-description' => 'Lieste zonder nummers',
-	'wikieditor-toolbar-help-content-ulist-syntax' => '* Regel in een lieste zonder nummers<br />* Regel in een lieste zonder nummers',
-	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Regel in een lieste zonder nummers</li><li>Regel in een lieste zonder nummers</li></ul>',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* Regel in n lieste zonder nummers<br />* Regel in n lieste zonder nummers',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Regel in n lieste zonder nummers</li><li>Regel in n lieste zonder nummers</li></ul>',
 	'wikieditor-toolbar-help-content-olist-description' => 'Lieste mit nummers',
-	'wikieditor-toolbar-help-content-olist-syntax' => '# Regel in een lieste mit nummers<br /># Regel in een lieste mit nummers',
-	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Regel in een lieste mit nummers</li><li>Regel in een lieste mit nummers</li></ol>',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# Regel in n lieste mit nummers<br /># Regel in n lieste mit nummers',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Regel in n lieste mit nummers</li><li>Regel in n lieste mit nummers</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'Bestaand derbie doon',
 	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Veurbeeld.png|thumb|Beschrieving]]',
-	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Bieschrifte' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Vergroten' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Bieschrifte</div></div>",
-	'wikieditor-toolbar-help-content-reference-description' => 'Rifferentie',
-	'wikieditor-toolbar-help-content-reference-syntax' => 'Paginatekse.&lt;ref name="test"&gt;[http://www.example.org Beschrieving], eventuele tekse.&lt;/ref&gt;',
-	'wikieditor-toolbar-help-content-reference-result' => "Paginatekse <sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-rereference-description' => 'Hergebruuk van dezelfde rifferentie',
-	'wikieditor-toolbar-help-content-rereference-result' => "Paginatekse <sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-showreferences-description' => 'Rifferenties weergeven',
-	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Beschrieving</a>, eventuele tekse.</li></ol>",
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Bieschrift' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Vergroten' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Bieschrift</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Referensie',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Paginatekste.&lt;ref name="test"&gt;[http://www.example.org Beschrieving], eventuele tekste.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "Paginatekste <sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'Hergebruuk van de zelfde referensie',
+	'wikieditor-toolbar-help-content-rereference-result' => "Paginatekste <sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Referensies weergeven',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Beschrieving</a>, eventuele tekste.</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Ondertekening mit tiedstempel',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Gebrukersnaam</a> (<a href='#' title='{{#special:mytalk}}'>overleg</a>) 15:54, 10 juni 2009 (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'Ondertekening',
 	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Gebrukersnaam</a> (<a href='#' title='{{#special:mytalk}}'>overleg</a>)",
 	'wikieditor-toolbar-help-content-indent-description' => 'Inspringen',
-	'wikieditor-toolbar-help-content-indent-syntax' => 'Normale tekse<br />: In-esprungen tekse<br />::In-esprungen tekse',
-	'wikieditor-toolbar-help-content-indent-result' => 'Normale tekse<dl><dd>In-esprungen tekse<dl><dd>In-esprungen tekse</dd></dl></dd></dl>',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Normale tekste<br />: In-espröngen tekste<br />::In-espröngen tekste',
+	'wikieditor-toolbar-help-content-indent-result' => 'Normale tekste<dl><dd>In-espröngen tekste<dl><dd>In-espröngen tekste</dd></dl></dd></dl>',
 );
 
 /** Nepali (नेपाली)
@@ -16173,6 +17380,7 @@ $messages['ne'] = array(
 /** Dutch (Nederlands)
  * @author Hamaryns
  * @author McDutchie
+ * @author SPQRobin
  * @author Siebrand
  * @author Tvdm
  */
@@ -16180,14 +17388,14 @@ $messages['nl'] = array(
 	'wikieditor' => 'Uitgebreide tekstverwerker voor wikitekst',
 	'wikieditor-desc' => 'Voegt een uitbreidbare tekstverwerker voor wikitekst toe en modules met extra mogelijkheden',
 	'wikieditor-wikitext-tab' => 'Wikitekst',
-	'wikieditor-loading' => 'Bezig met laden',
+	'wikieditor-loading' => 'Bezig met laden...',
 	'wikieditor-preview-preference' => 'Bewerken en voorvertoning naast elkaar',
 	'wikieditor-preview-tab' => 'Voorvertoning',
 	'wikieditor-preview-changes-tab' => 'Wijzigingen',
-	'wikieditor-preview-loading' => 'Bezig met laden...',
+	'wikieditor-preview-loading' => 'Bezig met laden…',
 	'wikieditor-previewDialog-preference' => 'Voorvertoningsdialoogvenster inschakelen',
 	'wikieditor-previewDialog-tab' => 'Voorvertoning',
-	'wikieditor-previewDialog-loading' => 'Bezig met laden...',
+	'wikieditor-previewDialog-loading' => 'Bezig met laden…',
 	'wikieditor-publish-preference' => 'Stap voor stap publiceren inschakelen',
 	'wikieditor-publish-button-publish' => 'Publiceren',
 	'wikieditor-publish-button-cancel' => 'Annuleren',
@@ -16318,7 +17526,7 @@ $1:Voorbeeld.jpg|Bijschrift2',
 	'wikieditor-toolbar-tool-replace-case' => 'Hoofdlettergevoelig',
 	'wikieditor-toolbar-tool-replace-regex' => 'De zoekreeks als reguliere expressie behandelen',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Volgende zoeken',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Volgende vervangen',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Vervangen',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Alles vervangen',
 	'wikieditor-toolbar-tool-replace-close' => 'Sluiten',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Uw zoekopdracht heeft geen resultaten opgeleverd.',
@@ -16333,6 +17541,7 @@ $1:Voorbeeld.jpg|Bijschrift2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grieks',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrillisch',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabisch',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Uitgebreid Arabisch',
 	'wikieditor-toolbar-characters-page-persian' => 'Farsi',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreeuws',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengaals',
@@ -16549,7 +17758,6 @@ $1:Døme.jpg|Bilettekst2',
 	'wikieditor-toolbar-tool-replace-case' => 'Skil mellom små og store bokstavar',
 	'wikieditor-toolbar-tool-replace-regex' => 'Handsam søkjestrengen som eit regulæruttrykk',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Finn neste',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Erstatt neste',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Erstatt alle',
 	'wikieditor-toolbar-tool-replace-close' => 'Lukk',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Søket gav ingen resultat.',
@@ -16632,241 +17840,6 @@ $1:Døme.jpg|Bilettekst2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Normal tekst<dl><dd>Tekst med innrykk<dl><dd>Tekst med innrykk</dd></dl></dd></dl>',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Jon Harald Søby
- * @author Laaknor
- * @author Nghtwlkr
- */
-$messages['no'] = array(
-	'wikieditor' => 'Avansert grensesnitt for redigering av wikitekst',
-	'wikieditor-desc' => 'Gir et utvidbart tekstredigeringsgrensesnitt og mange utvidelsesmoduler',
-	'wikieditor-wikitext-tab' => 'Wikitekst',
-	'wikieditor-loading' => 'Laster',
-	'wikieditor-preview-preference' => 'Aktiver forhåndsvisning side-ved-side',
-	'wikieditor-preview-tab' => 'Forhåndsvisning',
-	'wikieditor-preview-changes-tab' => 'Endringer',
-	'wikieditor-preview-loading' => 'Laster...',
-	'wikieditor-previewDialog-preference' => 'Aktiver forhåndsvisningsdialog',
-	'wikieditor-previewDialog-tab' => 'Forhåndsvisning',
-	'wikieditor-previewDialog-loading' => 'Laster...',
-	'wikieditor-publish-preference' => 'Aktiver steg-for-steg publisering',
-	'wikieditor-publish-button-publish' => 'Publiser',
-	'wikieditor-publish-button-cancel' => 'Avbryt',
-	'wikieditor-publish-dialog-title' => 'Publiser til {{SITENAME}}',
-	'wikieditor-publish-dialog-summary' => 'Redigeringssammendrag (oppsummering av hvilke endringer du har gjort)',
-	'wikieditor-publish-dialog-minor' => 'Mindre endring',
-	'wikieditor-publish-dialog-watch' => 'Overvåk denne siden',
-	'wikieditor-publish-dialog-publish' => 'Publiser',
-	'wikieditor-publish-dialog-goback' => 'Gå tilbake',
-	'wikieditor-template-editor-preference' => 'Aktiver skjemabasert redigering av wikimaler',
-	'wikieditor-template-editor-dialog-title' => 'Rediger mal',
-	'wikieditor-template-editor-dialog-submit' => 'Oppdater',
-	'wikieditor-template-editor-dialog-cancel' => 'Avbryt',
-	'wikieditor-templates-preference' => 'Aktiver sammenleggbare maler',
-	'wikieditor-toc-preference' => 'Aktiver navigerbar innholdsfortegnelse',
-	'wikieditor-toc-show' => 'Vis innhold',
-	'wikieditor-toc-hide' => 'Skjul innhold',
-	'wikieditor-toolbar' => 'Verktøylinje for redigering',
-	'wikieditor-toolbar-desc' => 'Verktøylinje for redigering med utvidet brukervennlighet',
-	'wikieditor-toolbar-preference' => 'Aktiver utvidet verktøylinje for redigering',
-	'wikieditor-toolbar-dialogs-preference' => 'Slå på dialoger for innsetting av lenker, tabeller og mer',
-	'wikieditor-toolbar-hidesig' => 'Skjul signaturknappen fra sider i hovednavnerommet',
-	'wikieditor-toolbar-loading' => 'Laster...',
-	'wikieditor-toolbar-tool-bold' => 'Fet',
-	'wikieditor-toolbar-tool-bold-example' => 'Fet tekst',
-	'wikieditor-toolbar-tool-italic' => 'Kursiv',
-	'wikieditor-toolbar-tool-italic-example' => 'Kursiv tekst',
-	'wikieditor-toolbar-tool-ilink' => 'Intern lenke',
-	'wikieditor-toolbar-tool-ilink-example' => 'Lenketittel',
-	'wikieditor-toolbar-tool-xlink' => 'Ekstern lenke (husk http:// først)',
-	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com lenketittel',
-	'wikieditor-toolbar-tool-link' => 'Lenke',
-	'wikieditor-toolbar-tool-link-title' => 'Sett inn lenke',
-	'wikieditor-toolbar-tool-link-int' => 'Til en wikiartikkel/-side',
-	'wikieditor-toolbar-tool-link-int-target' => 'Sidetittel/artikkeltittel:',
-	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Sidetittel eller internettadresse',
-	'wikieditor-toolbar-tool-link-int-text' => 'Lenketekst:',
-	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Legg inn teksten som skal vises',
-	'wikieditor-toolbar-tool-link-ext' => 'Til en ekstern webside',
-	'wikieditor-toolbar-tool-link-ext-target' => 'Adresse:',
-	'wikieditor-toolbar-tool-link-ext-text' => 'Lenketekst:',
-	'wikieditor-toolbar-tool-link-insert' => 'Sett inn lenke',
-	'wikieditor-toolbar-tool-link-cancel' => 'Avbryt',
-	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'Siden finnes',
-	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'Siden finnes ikke',
-	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Ugyldig tittel',
-	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Ekstern lenke',
-	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Kontrollerer om siden finnes...',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Tittelen du gav er ugyldig',
-	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'URLen du la inn ser ut som en lenke til en annen wikiside. Vil du gjøre den til en internlenke?',
-	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Intern lenke',
-	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Ekstern lenke',
-	'wikieditor-toolbar-tool-link-empty' => 'Du skrev ikke inn noe å lenke til',
-	'wikieditor-toolbar-tool-file' => 'Fil',
-	'wikieditor-toolbar-tool-file-example' => 'Eksempel.jpg',
-	'wikieditor-toolbar-tool-reference' => 'Referanse',
-	'wikieditor-toolbar-tool-reference-example' => 'Sett inn fotnotetekst her',
-	'wikieditor-toolbar-tool-reference-cancel' => 'Avbryt',
-	'wikieditor-toolbar-tool-reference-title' => 'Sett inn referanse',
-	'wikieditor-toolbar-tool-reference-insert' => 'Sett inn',
-	'wikieditor-toolbar-tool-reference-text' => 'Referansetekst',
-	'wikieditor-toolbar-tool-signature' => 'Din signatur med dato',
-	'wikieditor-toolbar-section-advanced' => 'Avansert',
-	'wikieditor-toolbar-tool-heading' => 'Overskrift',
-	'wikieditor-toolbar-tool-heading-1' => 'Nivå 1',
-	'wikieditor-toolbar-tool-heading-2' => 'Nivå 2',
-	'wikieditor-toolbar-tool-heading-3' => 'Nivå 3',
-	'wikieditor-toolbar-tool-heading-4' => 'Nivå 4',
-	'wikieditor-toolbar-tool-heading-5' => 'Nivå 5',
-	'wikieditor-toolbar-tool-heading-example' => 'Overskriftstekst',
-	'wikieditor-toolbar-group-format' => 'Format',
-	'wikieditor-toolbar-tool-ulist' => 'Punktliste',
-	'wikieditor-toolbar-tool-ulist-example' => 'Punktlisteelement',
-	'wikieditor-toolbar-tool-olist' => 'Nummerert liste',
-	'wikieditor-toolbar-tool-olist-example' => 'Nummerert liste-element',
-	'wikieditor-toolbar-tool-indent' => 'Indentering',
-	'wikieditor-toolbar-tool-indent-example' => 'Indentert linje',
-	'wikieditor-toolbar-tool-nowiki' => 'Ingen wikiformatering',
-	'wikieditor-toolbar-tool-nowiki-example' => 'Sett inn uformatert tekst her',
-	'wikieditor-toolbar-tool-redirect' => 'Omdiriger',
-	'wikieditor-toolbar-tool-redirect-example' => 'Målsidenavn',
-	'wikieditor-toolbar-tool-big' => 'Stor',
-	'wikieditor-toolbar-tool-big-example' => 'Stor tekst',
-	'wikieditor-toolbar-tool-small' => 'Liten',
-	'wikieditor-toolbar-tool-small-example' => 'Liten tekst',
-	'wikieditor-toolbar-tool-superscript' => 'Hevet',
-	'wikieditor-toolbar-tool-superscript-example' => 'Hevet tekst',
-	'wikieditor-toolbar-tool-subscript' => 'Senket',
-	'wikieditor-toolbar-tool-subscript-example' => 'Senket tekst',
-	'wikieditor-toolbar-group-insert' => 'Sett inn',
-	'wikieditor-toolbar-tool-gallery' => 'Bildegalleri',
-	'wikieditor-toolbar-tool-gallery-example' => '$1:Example.jpg|Bildetekst1
-$1:Example.jpg|Bildetekst2',
-	'wikieditor-toolbar-tool-newline' => 'Linjeskift',
-	'wikieditor-toolbar-tool-table' => 'Tabell',
-	'wikieditor-toolbar-tool-table-example-old' => '-
-! overskrift 1
-! overskrift 2
-! overskrift 3
-|-
-| rad 1, celle 1
-| rad 1, celle 2
-| rad 1, celle 3
-|-
-| rad 2, celle 1
-| rad 2, celle 2
-| rad 2, celle 3',
-	'wikieditor-toolbar-tool-table-example-cell-text' => 'Celletekst',
-	'wikieditor-toolbar-tool-table-example-header' => 'Overskriftstekst',
-	'wikieditor-toolbar-tool-table-title' => 'Sett inn tabell',
-	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Rader',
-	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Kolonner',
-	'wikieditor-toolbar-tool-table-dimensions-header' => 'Inkluder overskriftsrad',
-	'wikieditor-toolbar-tool-table-wikitable' => 'Stil med kanter',
-	'wikieditor-toolbar-tool-table-sortable' => 'Gjør tabellen sorterbar',
-	'wikieditor-toolbar-tool-table-example' => 'Celletekst',
-	'wikieditor-toolbar-tool-table-preview' => 'Forhåndsvisning',
-	'wikieditor-toolbar-tool-table-insert' => 'Sett inn',
-	'wikieditor-toolbar-tool-table-cancel' => 'Avbryt',
-	'wikieditor-toolbar-tool-table-toomany' => 'Det er ikke mulig å sette inn mer enn $1 celler med denne boksen.',
-	'wikieditor-toolbar-tool-table-invalidnumber' => 'Du har ikke skrevet inn et gyldig antall rader eller kolonner.',
-	'wikieditor-toolbar-tool-table-zero' => 'De kan ikke sette inn en tabell med null rader eller kolonner.',
-	'wikieditor-toolbar-tool-replace' => 'Søk og erstatt',
-	'wikieditor-toolbar-tool-replace-title' => 'Søk og erstatt',
-	'wikieditor-toolbar-tool-replace-search' => 'Søk etter:',
-	'wikieditor-toolbar-tool-replace-replace' => 'Erstatt med:',
-	'wikieditor-toolbar-tool-replace-case' => 'Skill mellom store/små bokstaver',
-	'wikieditor-toolbar-tool-replace-regex' => 'Bruk søkestrengen som et regulært uttrykk',
-	'wikieditor-toolbar-tool-replace-button-findnext' => 'Finn neste',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Erstatt neste',
-	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Erstatt alle',
-	'wikieditor-toolbar-tool-replace-close' => 'Lukk',
-	'wikieditor-toolbar-tool-replace-nomatch' => 'Søket ga ingen resultater.',
-	'wikieditor-toolbar-tool-replace-success' => 'Gjorde $1 erstating(er).',
-	'wikieditor-toolbar-tool-replace-emptysearch' => 'Du skrev ikke inn noe å søke etter.',
-	'wikieditor-toolbar-tool-replace-invalidregex' => 'Det regulære uttrykket du skrev inn er ugyldig: $1',
-	'wikieditor-toolbar-section-characters' => 'Spesialtegn',
-	'wikieditor-toolbar-characters-page-latin' => 'Latin',
-	'wikieditor-toolbar-characters-page-latinextended' => 'Utvidet Latin',
-	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
-	'wikieditor-toolbar-characters-page-symbols' => 'Symboler',
-	'wikieditor-toolbar-characters-page-greek' => 'Gresk',
-	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrillisk',
-	'wikieditor-toolbar-characters-page-arabic' => 'Arabisk',
-	'wikieditor-toolbar-characters-page-persian' => 'Persisk',
-	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraisk',
-	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
-	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
-	'wikieditor-toolbar-characters-page-sinhala' => 'Singalesisk',
-	'wikieditor-toolbar-characters-page-gujarati' => 'Gujarati',
-	'wikieditor-toolbar-characters-page-thai' => 'Thai',
-	'wikieditor-toolbar-characters-page-lao' => 'Laotisk',
-	'wikieditor-toolbar-characters-page-khmer' => 'Khmer',
-	'wikieditor-toolbar-section-help' => 'Hjelp',
-	'wikieditor-toolbar-help-heading-description' => 'Beskrivelse',
-	'wikieditor-toolbar-help-heading-syntax' => 'Hva du skriver',
-	'wikieditor-toolbar-help-heading-result' => 'Hva du får',
-	'wikieditor-toolbar-help-page-format' => 'Formatering',
-	'wikieditor-toolbar-help-page-link' => 'Lenker',
-	'wikieditor-toolbar-help-page-heading' => 'Overskrifter',
-	'wikieditor-toolbar-help-page-list' => 'Lister',
-	'wikieditor-toolbar-help-page-file' => 'Filer',
-	'wikieditor-toolbar-help-page-reference' => 'Referanser',
-	'wikieditor-toolbar-help-page-discussion' => 'Diskusjon',
-	'wikieditor-toolbar-help-content-italic-description' => 'Kursiv',
-	'wikieditor-toolbar-help-content-italic-syntax' => "''Kursiv tekst''",
-	'wikieditor-toolbar-help-content-italic-result' => '<em>Kursiv tekst</em>',
-	'wikieditor-toolbar-help-content-bold-description' => 'Fet',
-	'wikieditor-toolbar-help-content-bold-syntax' => "'''Fet tekst'''",
-	'wikieditor-toolbar-help-content-bold-result' => '<strong>Fet tekst</strong>',
-	'wikieditor-toolbar-help-content-bolditalic-description' => 'Fet &amp; kursiv',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Fet &amp; kursiv tekst'''''",
-	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Fet &amp; kursiv tekst</em></strong>',
-	'wikieditor-toolbar-help-content-ilink-description' => 'Intern lenke',
-	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Sidetittel|Lenkenavn]]<br />[[Sidetittel]]',
-	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Lenkenavn</a><br /><a href='#'>Sidetittel</a>",
-	'wikieditor-toolbar-help-content-xlink-description' => 'Ekstern lenke',
-	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Lenkenavn]<br />[http://www.example.org]<br />http://www.example.org',
-	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Lenkenavn</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
-	'wikieditor-toolbar-help-content-heading2-description' => '2. nivå overskrift',
-	'wikieditor-toolbar-help-content-heading2-syntax' => '== Overskrift ==',
-	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Overskrift</h2>',
-	'wikieditor-toolbar-help-content-heading3-description' => '3. nivå overskrift',
-	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Overskrift ===',
-	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Overskrift</h3>',
-	'wikieditor-toolbar-help-content-heading4-description' => '4. nivå overskrift',
-	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Overskrift ====',
-	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Overskrift</h4>',
-	'wikieditor-toolbar-help-content-heading5-description' => '5. nivå overskrift',
-	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Overskrift =====',
-	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Overskrift</h5>',
-	'wikieditor-toolbar-help-content-ulist-description' => 'Punktliste',
-	'wikieditor-toolbar-help-content-ulist-syntax' => '* Listeelement<br />
-* Listeelement',
-	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Listeelement</li><li>Listeelement</li></ul>',
-	'wikieditor-toolbar-help-content-olist-description' => 'Nummerert liste',
-	'wikieditor-toolbar-help-content-olist-syntax' => '# Listeelement<br />
-# Listeelement',
-	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Listeelement</li><li>Listeelement</li></ol>',
-	'wikieditor-toolbar-help-content-file-description' => 'Fil',
-	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|Bildetekst]]',
-	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Bildetekst' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Forstørr' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Bildetekst</div></div>",
-	'wikieditor-toolbar-help-content-reference-description' => 'Referanse',
-	'wikieditor-toolbar-help-content-reference-syntax' => 'Tekst.&lt;ref name="test"&gt;[http://www.example.org Lenketekst], ytterligere tekst.&lt;/ref&gt;',
-	'wikieditor-toolbar-help-content-reference-result' => "Tekst.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-rereference-description' => 'Ytterligere bruk av samme referanse',
-	'wikieditor-toolbar-help-content-rereference-result' => "Tekst.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-showreferences-description' => 'Vis referanser',
-	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Lenketekst</a>, ytterligere tekst.</li></ol>",
-	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Signatur med tidsangivelse',
-	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Brukernavn</a> (<a href='#' title='{{#special:mytalk}}'>diskusjon</a>) 10. juni 2009, 15:54 (CEST)",
-	'wikieditor-toolbar-help-content-signature-description' => 'Signatur',
-	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Brukernavn</a> (<a href='#' title='{{#special:mytalk}}'>diskusjon</a>)",
-	'wikieditor-toolbar-help-content-indent-description' => 'Innrykk',
-	'wikieditor-toolbar-help-content-indent-syntax' => 'Normal tekst<br />:Innrykket tekst<br />::Innrykket tekst',
-	'wikieditor-toolbar-help-content-indent-result' => 'Normal tekst<dl><dd>Innrykket tekst<dl><dd>Innrykket tekst</dd></dl></dd></dl>',
-);
-
 /** Northern Sotho (Sesotho sa Leboa)
  * @author Mohau
  */
@@ -16900,6 +17873,7 @@ $messages['nso'] = array(
 );
 
 /** Occitan (Occitan)
+ * @author Boulaur
  * @author Cedric31
  * @author Jfblanc
  * @author McDutchie
@@ -16972,6 +17946,7 @@ $messages['oc'] = array(
 	'wikieditor-toolbar-tool-reference' => 'Referéncia',
 	'wikieditor-toolbar-tool-reference-example' => 'Inserir lo tèxte de la nòta en bas de pagina aicí',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Anullar',
+	'wikieditor-toolbar-tool-reference-insert' => 'Inserir',
 	'wikieditor-toolbar-tool-signature' => 'Signatura e data',
 	'wikieditor-toolbar-section-advanced' => 'Avançat',
 	'wikieditor-toolbar-tool-heading' => 'Títol',
@@ -17036,7 +18011,6 @@ $1:Exemple.jpg|Descripcion 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Far correspondre la cassa',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tractar la cadena de recèrca coma una expression regulara',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Recercar lo seguent',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Remplaçar lo seguent',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Remplaçar tot',
 	'wikieditor-toolbar-tool-replace-close' => 'Tampar',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Vòstra recèrca a pas trobat cap de correspondéncia.',
@@ -17119,11 +18093,238 @@ $1:Exemple.jpg|Descripcion 2',
 );
 
 /** Oriya (ଓଡ଼ିଆ)
+ * @author Ansumang
  * @author Odisha1
  * @author Psubhashish
  */
 $messages['or'] = array(
-	'wikieditor-toolbar-help-content-signature-description' => 'ପରିଚାୟକ',
+	'wikieditor' => 'ଉନ୍ନତ ଉଇକିଟେକ୍ସଟ ସମ୍ପାଦନା ଇଣ୍ଟରଫେସ',
+	'wikieditor-desc' => 'ଏକ ଉନ୍ନତ ଉଇକିଟେକ୍ସଟ ସମ୍ପାଦନା ଇଣ୍ଟରଫେସ ଓ ଅନେକ ସୁବିଧା ଯୋଗାଣକାରୀ ମଡ୍ୟୁଲ ଯୋଗାଇଥାଏ',
+	'wikieditor-wikitext-tab' => 'ଉଇକିଟେକ୍ସଟ',
+	'wikieditor-loading' => 'ଖୋଜୁଅଛି',
+	'wikieditor-preview-preference' => 'ପାଖାପାଖି ଦେଖଣା ସଚଳ କରାଇବେ',
+	'wikieditor-preview-tab' => 'ସାଇତା ଆଗରୁ ଦେଖଣା',
+	'wikieditor-preview-changes-tab' => 'ବଦଳସବୁ',
+	'wikieditor-preview-loading' => 'ଖୋଲୁଅଛି...',
+	'wikieditor-previewDialog-preference' => 'ଦେଖଣା ଘରଟି ଖୋଲୁଅଛି',
+	'wikieditor-previewDialog-tab' => 'ସାଇତା ଆଗରୁ ଦେଖଣା',
+	'wikieditor-previewDialog-loading' => 'ଖୋଲୁଅଛି...',
+	'wikieditor-publish-preference' => 'ସ୍ତର ପରେ ସ୍ତର ପ୍ରକାଶନ',
+	'wikieditor-publish-button-publish' => 'ପ୍ରକାଶ କରିବେ',
+	'wikieditor-publish-button-cancel' => 'ନାକଚ',
+	'wikieditor-publish-dialog-title' => '{{SITENAME}}ରେ ପ୍ରକାଶିତ କରିବେ',
+	'wikieditor-publish-dialog-summary' => 'ସାରକଥା ସମ୍ପାଦନ କରିବେ (ଆପଣ କରିଥିବା ବଦଳସବୁକୁ ଅଳ୍ପରେ ବଖାଣିବେ):',
+	'wikieditor-publish-dialog-minor' => 'ଟିକେ ବଦଳ',
+	'wikieditor-publish-dialog-watch' => 'ଏହି ପୃଷ୍ଠାଟିକୁ ଦେଖିବେ',
+	'wikieditor-publish-dialog-publish' => 'ପ୍ରକାଶ କରିବେ',
+	'wikieditor-publish-dialog-goback' => 'ପଛକୁ ଫେରିବେ',
+	'wikieditor-template-editor-preference' => 'ଉଇକି-ଛାଞ୍ଚସବୁର ଫର୍ମ ବାଲା ସମ୍ପାଦନାକୁ ସଚଳ କରାଇବେ',
+	'wikieditor-template-editor-dialog-title' => 'ଛାଞ୍ଚ ସମ୍ପାଦନ କରିବେ',
+	'wikieditor-template-editor-dialog-submit' => 'ଅପଡେଟ',
+	'wikieditor-template-editor-dialog-cancel' => 'ନାକଚ',
+	'wikieditor-templates-preference' => 'ଛାଞ୍ଚର ଦେଖାଇବା-ଲୁଚାଇବା ସୁବିଧ ସଚଳ କରିବେ',
+	'wikieditor-toc-preference' => 'ଖୋଜା ଯାଇପାରୁଥିବା ସୂଚି',
+	'wikieditor-toc-show' => 'ସୂଚି ଦେଖାଇବେ',
+	'wikieditor-toc-hide' => 'ସୂଚି ଲୁଚାଇବେ',
+	'wikieditor-toolbar' => 'ସମ୍ପାଦନା ଉପକରଣ ପଟିକା',
+	'wikieditor-toolbar-desc' => 'ଅଧିକ ବ୍ୟବହାର ସୁବିଧା ସହ ପୃଷ୍ଠା ସମ୍ପାଦନା ଉପକରଣ ପଟିକା',
+	'wikieditor-toolbar-preference' => 'ଉନ୍ନତ ସମ୍ପାଦନା ଉପକରଣ ପେଡ଼ିକୁ ସଚଳ କରିବେ',
+	'wikieditor-toolbar-dialogs-preference' => 'ଲିଙ୍କ, ସାରଣୀ ଓ ଅଧିକ ସୁବିଧା ସବୁ ଯୋଡ଼ିବା ନିମନ୍ତେ ଆଦେଶ ସଚଳ କରାଇବେ',
+	'wikieditor-toolbar-hidesig' => 'ମୂଳ ନେମସ୍ପେସରେ ପୃଷ୍ଠାମାନଙ୍କରୁ  ସନ୍ତକ ଦେବା ସୁବିଧାଟିକୁ ଲୁଚାଇଦେବେ',
+	'wikieditor-toolbar-loading' => 'ଖୋଲୁଅଛି...',
+	'wikieditor-toolbar-tool-bold' => 'ମୋଟା ଅକ୍ଷର',
+	'wikieditor-toolbar-tool-bold-example' => 'ମୋଟା ଲେଖା',
+	'wikieditor-toolbar-tool-italic' => 'ତେରେଛା',
+	'wikieditor-toolbar-tool-italic-example' => 'ତେରେଛା ଲେଖା',
+	'wikieditor-toolbar-tool-ilink' => 'ଭିତର ଲିଙ୍କ',
+	'wikieditor-toolbar-tool-ilink-example' => 'ଲିଙ୍କ ଶିରୋନାମା',
+	'wikieditor-toolbar-tool-xlink' => 'ବାହାର ଲିଙ୍କ (http:// ଆଗରେ ଲଗାଇବାକୁ ମନେରଖିଥିବେ)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com ଲିଙ୍କ ଶିରୋନାମା',
+	'wikieditor-toolbar-tool-link' => 'ଲିଙ୍କ',
+	'wikieditor-toolbar-tool-link-title' => 'ଲିଙ୍କ ପୁରାଇବେ',
+	'wikieditor-toolbar-tool-link-int' => 'ଏକ ଉଇକି ପୃଷ୍ଠାକୁ',
+	'wikieditor-toolbar-tool-link-int-target' => 'ଲକ୍ଷ ପୃଷ୍ଠା ବା URL:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'ପୃଷ୍ଠା ଶିରୋନାମା ଅବା URL',
+	'wikieditor-toolbar-tool-link-int-text' => 'ଦେଖଣା ଲେଖା:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'ଦେଖଣା ଲେଖା',
+	'wikieditor-toolbar-tool-link-ext' => 'ଏକ ବାହାର ଵେବ ପୃଷ୍ଠା ନିମନ୍ତେ',
+	'wikieditor-toolbar-tool-link-ext-target' => 'ଲିଙ୍କ URL:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'ଲିଙ୍କ ଲେଖା:',
+	'wikieditor-toolbar-tool-link-insert' => 'ଲିଙ୍କ ପୁରାଇବେ',
+	'wikieditor-toolbar-tool-link-cancel' => 'ନାକଚ',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'ପୃଷ୍ଠାଟି ଅଛି',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'ପୃଷ୍ଠାଟି ନାହିଁ',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'ଅଚଳ ଶିରୋନାମା',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'ବାହାର ଲିଙ୍କ',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'ପୃଷ୍ଠାର ସ୍ଥିତି ଦେଖୁଅଛି...',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'ଆପଣ ଦେଇଥିବା ଶିରୋନାମାଟି ଅଚଳ ଅଟେ ।',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'ଆପଣ ଦେଇଥିବା URL ଟି ଆଉ ଗୋଟେ ଉଇକି ପୃଷ୍ଠାର ଲିଙ୍କ ଭଳି ବୋଧ ହେଉଛି ।
+ଆପଣ ଏହାକୁ ଏକ ଭିତର ଲିଙ୍କ କରିବାକୁ ଚାହାନ୍ତି କି?',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'ଭିତର ଲିଙ୍କ',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'ବାହାର ଲିଙ୍କ',
+	'wikieditor-toolbar-tool-link-empty' => 'ଆପଣ କିଛି ଲିଙ୍କ ସମ୍ପର୍କିତ କରିବା ପାଇଁ ଦେଇନାହାନ୍ତି ।',
+	'wikieditor-toolbar-tool-file' => 'ଏମବେଡ଼ ହୋଇ ଥିବା ଫାଇଲ',
+	'wikieditor-toolbar-tool-file-example' => 'ଉଦାହରଣ.jpg',
+	'wikieditor-toolbar-tool-reference' => 'ଆଧାର',
+	'wikieditor-toolbar-tool-reference-example' => 'ଏଠାରେ ପାଦଟୀକାଟି ରଖିବେ',
+	'wikieditor-toolbar-tool-reference-cancel' => 'ନାକଚ',
+	'wikieditor-toolbar-tool-reference-title' => 'ଆଧାର ଦେବେ',
+	'wikieditor-toolbar-tool-reference-insert' => 'ଭରିବେ',
+	'wikieditor-toolbar-tool-reference-text' => 'ଆଧାର ଲେଖା',
+	'wikieditor-toolbar-tool-signature' => 'ସନ୍ତକ ଓ ସମୟଚିହ୍ନ',
+	'wikieditor-toolbar-section-advanced' => 'ଉନ୍ନତ',
+	'wikieditor-toolbar-tool-heading' => 'ଶିରୋନାମା',
+	'wikieditor-toolbar-tool-heading-1' => 'ସ୍ତର ୧',
+	'wikieditor-toolbar-tool-heading-2' => 'ସ୍ତର ୨',
+	'wikieditor-toolbar-tool-heading-3' => 'ସ୍ତର ୩',
+	'wikieditor-toolbar-tool-heading-4' => 'ସ୍ତର ୪',
+	'wikieditor-toolbar-tool-heading-5' => 'ସ୍ତର ୫',
+	'wikieditor-toolbar-tool-heading-example' => 'ଶିରୋନାମା ଲେଖା',
+	'wikieditor-toolbar-group-format' => 'ସଜାଣି',
+	'wikieditor-toolbar-tool-ulist' => 'ବିନ୍ଦୁ ଦିଆ ତାଲିକା',
+	'wikieditor-toolbar-tool-ulist-example' => 'ବିନ୍ଦୁ ଦିଆ ତାଲିକା ବସ୍ତୁ',
+	'wikieditor-toolbar-tool-olist' => 'ସଂଖ୍ୟାଦିଆ ତାଲିକା',
+	'wikieditor-toolbar-tool-olist-example' => 'ସଂଖ୍ୟା ଦିଆ ତାଲିକା ବସ୍ତୁ',
+	'wikieditor-toolbar-tool-indent' => 'ଅନୁଚ୍ଛେଦ ଛାଡ଼',
+	'wikieditor-toolbar-tool-indent-example' => 'ମାର୍ଜିନରୁ ଆରମ୍ଭ ଧାଡ଼ି',
+	'wikieditor-toolbar-tool-nowiki' => 'ଉଇକି ସଜାଣି ବିନା',
+	'wikieditor-toolbar-tool-nowiki-example' => 'ଅସଜଡ଼ା ଲେଖା ଏଠାରେ ଭରିବେ',
+	'wikieditor-toolbar-tool-redirect' => 'ପୁନପ୍ରେରଣ',
+	'wikieditor-toolbar-tool-redirect-example' => 'ମୁକାମ ପୃଷ୍ଠାର ନାମ',
+	'wikieditor-toolbar-tool-big' => 'ବଡ଼',
+	'wikieditor-toolbar-tool-big-example' => 'ବଡ଼ ଅକ୍ଷର',
+	'wikieditor-toolbar-tool-small' => 'ଛୋଟ',
+	'wikieditor-toolbar-tool-small-example' => 'ଛୋଟ ଅକ୍ଷର',
+	'wikieditor-toolbar-tool-superscript' => 'ଉପର ଅକ୍ଷର',
+	'wikieditor-toolbar-tool-superscript-example' => 'ଉପର ଛୋଟ ଅକ୍ଷର',
+	'wikieditor-toolbar-tool-subscript' => 'ପାଦାଙ୍କ',
+	'wikieditor-toolbar-tool-subscript-example' => 'ପାଦାଙ୍କ',
+	'wikieditor-toolbar-group-insert' => 'ଭରିବେ',
+	'wikieditor-toolbar-tool-gallery' => 'ଛବି ସମୂହ',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:ଉଦାହରଣ.jpg|ଶିରୋନାମା୧
+$1:ଉଦାହରଣ.jpg|ଶିରୋନାମା୨',
+	'wikieditor-toolbar-tool-newline' => 'ନୂଆ ଧାଡ଼ି',
+	'wikieditor-toolbar-tool-table' => 'ସାରଣୀ',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! ଶିରୋନାମା ୧
+! ଶିରୋନାମା ୨
+! ଶିରୋନାମା ୩
+|-
+| ଧାଡ଼ି ୧, କୋଷ ୧
+| ଧାଡ଼ି ୧, କୋଷ ୨
+| ଧାଡ଼ି ୧, କୋଷ ୩
+|-
+| ଧାଡ଼ି ୨, କୋଷ ୧
+| ଧାଡ଼ି ୨, କୋଷ ୨
+| ଧାଡ଼ି ୨, କୋଷ ୩',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'କୋଷ ଲେଖା',
+	'wikieditor-toolbar-tool-table-example-header' => 'ଶିରୋନାମା ଲେଖା',
+	'wikieditor-toolbar-tool-table-title' => 'ସାରଣିଟିଏ ପୁରାନ୍ତୁ',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'ଧାଡ଼ି',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'ସ୍ତମ୍ଭସବୁ',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'ଉପର ଶିରୋନାମା ଧାଡ଼ି',
+	'wikieditor-toolbar-tool-table-wikitable' => 'ସୀମା ସହିତ ସଜାଣି',
+	'wikieditor-toolbar-tool-table-sortable' => 'ଶ୍ରେଣୀ ଅନୁସାରେ ସାରଣି ତିଆରି କରିବେ',
+	'wikieditor-toolbar-tool-table-example' => 'ଉଦାହରଣ',
+	'wikieditor-toolbar-tool-table-preview' => 'ସାଇତା ଆଗରୁ ଦେଖଣା',
+	'wikieditor-toolbar-tool-table-insert' => 'ଭରିବେ',
+	'wikieditor-toolbar-tool-table-cancel' => 'ନାକଚ',
+	'wikieditor-toolbar-tool-table-toomany' => 'ଏହି ଆଦେଶରେ $1 ରୁ ଅଧିକ କୋଷ ଥିବା ସାରଣୀ ପୁରାଇବା ସମ୍ଭବପର ନୁହେଁ ।',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'ଆପଣ ଏକ ସଠିକ ଧାଡ଼ି ଓ ସ୍ତମ୍ଭ ସଂଖ୍ୟା ଦେଇ ନାହାନ୍ତି ।',
+	'wikieditor-toolbar-tool-table-zero' => 'ଆପଣ କିଛି ଧାଡ଼ି ବ ସ୍ତମ୍ଭ ନଥାଇ ସାରଣୀଟିଏ ପୁରାଇପାରିବେ ନାହିଁ ।',
+	'wikieditor-toolbar-tool-replace' => 'ଖୋଜି ବଦଳାଇବେ',
+	'wikieditor-toolbar-tool-replace-title' => 'ଖୋଜି ବଦଳାଇବେ',
+	'wikieditor-toolbar-tool-replace-search' => 'ଖୋଜିବେ:',
+	'wikieditor-toolbar-tool-replace-replace' => 'ପ୍ରତିବଦଳ:',
+	'wikieditor-toolbar-tool-replace-case' => 'ବଡ଼ ଛୋଟ ଅକ୍ଷର ମେଳାଇବେ',
+	'wikieditor-toolbar-tool-replace-regex' => 'ଏକ ସାଧାରଣ ଦେଖଣା ଭାବରେ ପ୍ରଶ୍ନଟି ଖୋଜିବେ',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'ଆଗାମୀ ଖୋଜିବେ',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'ପ୍ରତିବଦଳ',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'ସବୁ ବଦଳାଇବେ',
+	'wikieditor-toolbar-tool-replace-close' => 'ବନ୍ଦ କରିବେ',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'ଆପଣଙ୍କ ଖୋଜା କାହା ସଙ୍ଗେ ମେଳ ଖାଇଲା ନାହିଁ',
+	'wikieditor-toolbar-tool-replace-success' => '$1 ଟି ଜାଗାରେ ପ୍ରତିବଦଳ କରାଗଲା ।',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'ଆପଣ କିଛି ଖୋଜିବା ପାଇଁ ଦେଇନାହାନ୍ତି ।',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'ଆପଣ ଦେଇଥିବା ନିୟମିତ ଅଭିବ୍ୟକ୍ତି ଅବୈଧ ଅଟେ : $1',
+	'wikieditor-toolbar-section-characters' => 'ବିଶେଷ ସଙ୍କେତ',
+	'wikieditor-toolbar-characters-page-latin' => 'ଲାଟିନ',
+	'wikieditor-toolbar-characters-page-latinextended' => 'ଲାଟିନ ଅଧିକ ଅକ୍ଷର',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'ସଙ୍କେତ',
+	'wikieditor-toolbar-characters-page-greek' => 'ଗ୍ରିକ',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'ସିରିଲିକ',
+	'wikieditor-toolbar-characters-page-arabic' => 'ଆରବୀ',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'ଆରବିକ ଅଧିକ ଅକ୍ଷର',
+	'wikieditor-toolbar-characters-page-persian' => 'ପାରସିକ',
+	'wikieditor-toolbar-characters-page-hebrew' => 'ହିବୁରୁ',
+	'wikieditor-toolbar-characters-page-bangla' => 'ବଙ୍ଗଳା',
+	'wikieditor-toolbar-characters-page-telugu' => 'ତେଲୁଗୁ',
+	'wikieditor-toolbar-characters-page-sinhala' => 'ସିଂହଳି',
+	'wikieditor-toolbar-characters-page-gujarati' => 'ଗୁଜୁରାଟି',
+	'wikieditor-toolbar-characters-page-thai' => 'ଥାଇ',
+	'wikieditor-toolbar-characters-page-lao' => 'ଲାଓ',
+	'wikieditor-toolbar-characters-page-khmer' => 'କମେର ଭାଷା',
+	'wikieditor-toolbar-section-help' => 'ସହଯୋଗ',
+	'wikieditor-toolbar-help-heading-description' => 'ବିବରଣୀ',
+	'wikieditor-toolbar-help-heading-syntax' => 'ଆପଣ କଣ ଟାଇପ କରିଛନ୍ତି',
+	'wikieditor-toolbar-help-heading-result' => 'ଆପଣ କଣ ପାଇଛନ୍ତି',
+	'wikieditor-toolbar-help-page-format' => 'ସଜାଣି',
+	'wikieditor-toolbar-help-page-link' => 'ଲିଙ୍କ',
+	'wikieditor-toolbar-help-page-heading' => 'ଶିରୋନାମା',
+	'wikieditor-toolbar-help-page-list' => 'ତାଲିକା',
+	'wikieditor-toolbar-help-page-file' => 'ଫାଇଲ',
+	'wikieditor-toolbar-help-page-reference' => 'ଆଧାର',
+	'wikieditor-toolbar-help-page-discussion' => 'ଆଲୋଚନା',
+	'wikieditor-toolbar-help-content-italic-description' => 'ତେରେଛା',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''ତେରେଛା ଲେଖା''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>ତେରେଛା ଲେଖା</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'ମୋଟା ଅକ୍ଷର',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''ମୋଟା ଅକ୍ଷର'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>ମୋଟା ଲେଖା</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'ମୋଟା ଓ ତେରେଛା',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''ମୋଟା ଓ ତେରେଛା ଅକ୍ଷର'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>ମୋଟା ଓ ତେରେଛା ଅକ୍ଷର</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'ଭିତର ଲିଙ୍କ',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[ପୃଷ୍ଠା ନାମ|ଲିଙ୍କ ନାମ]]<br />[[ପୃଷ୍ଠା ନାମ]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>ଲିଙ୍କ ନାମ</a><br /><a href='#'>ପୃଷ୍ଠା ନାମ</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'ବାହାର ଲିଙ୍କ',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org ଲିଙ୍କ ନାମ]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='ବାହାର'>ଲିଙ୍କ ନାମ</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='ବାହାର'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading2-description' => '୨ୟ ସ୍ତରର ଶିରୋନାମା',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== ଶିରୋନାମା ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>ଶିରୋନାମା ଲେଖା</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => '୩ୟ ସ୍ତରର ଶିରୋନାମା',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== ଶିରୋନାମା ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>ଶିରୋନାମା ଲେଖା</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => '୪ର୍ଥ ସ୍ତରର ଶିରୋନାମା',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== ଶିରୋନାମା ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>ଶିରୋନାମା ଲେଖା</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => '୫ମ ସ୍ତରର ଶିରୋନାମା',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== ଶିରୋନାମା =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>ଶିରୋନାମା ଲେଖା</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'ବିନ୍ଦୁ ଦିଆ ତାଲିକା',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* ତାଲିକା ଚିଜ<br />* ତାଲିକା ଚିଜ',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>ତାଲିକା ଚିଜ</li><li>ତାଲିକା ଚିଜ</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'ସଂଖ୍ୟାଦିଆ ତାଲିକା',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# ତାଲିକା ଚିଜ<br /># ତାଲିକା ଚିଜ',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>ତାଲିକା ଚିଜ</li><li>ତାଲିକା ଚିଜ</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'ଏମବେଡ଼ ହୋଇ ଥିବା ଫାଇଲ',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:ଉଦାହରଣ.png|thumb|ଶିରୋନାମା ଲେଖା]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='ଶିରୋନାମା ଲେଖା' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='ବଡ଼ କରିବେ' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>ଶିରୋନାମା ଲେଖା</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'ଆଧାର',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'ପୃଷ୍ଠା ଲେଖା.&lt;ref name="test"&gt;[http://www.example.org Link text], ଅତିରିକ୍ତ ଲେଖା ।&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "ପୃଷ୍ଠା ଲେଖା ।<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'ଏକ ଆଧାରର ଅତିରିକ୍ତ ବ୍ୟବହାର',
+	'wikieditor-toolbar-help-content-rereference-result' => "ପୃଷ୍ଠା ଲେଖା ।<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'ଦେଖଣା ଆଧାରସମୂହ',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Link text</a>, ଅଧିକ ବିବରଣୀ ।</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'ସନ୍ତକ ସହିତ ସମୟଚିହ୍ନ',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>ଇଉଜର ନାମ</a> (<a href='#' title='{{#special:mytalk}}'>ଆଲୋଚନା</a>) 15:54, 10 June 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signature-description' => 'ସନ୍ତକ',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>ଇଉଜର ନାମ</a> (<a href='#' title='{{#special:mytalk}}'>ଆଲୋଚନା</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'ଅନୁଚ୍ଛେଦ ଛାଡ଼',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'ସାଧାରଣ ଲେଖା<br />:ମାର୍ଜିନ ଦିଆ ଲେଖା<br />::ମାର୍ଜିନ ଦିଆ ଲେଖା',
+	'wikieditor-toolbar-help-content-indent-result' => 'ସାଧାରଣ ଲେଖା<dl><dd>ମାର୍ଜିନ ଦିଆ ଲେଖା<dl><dd>ମାର୍ଜିନ ଦିଆ ଲେଖା</dd></dl></dd></dl>',
 );
 
 /** Deitsch (Deitsch)
@@ -17159,7 +18360,7 @@ $messages['pdc'] = array(
 	'wikieditor-toolbar-tool-reference' => 'Beweisung',
 	'wikieditor-toolbar-tool-heading' => 'Iwwerschrift',
 	'wikieditor-toolbar-tool-heading-example' => 'Iwwerschrift',
-	'wikieditor-toolbar-group-format' => 'Lischt',
+	'wikieditor-toolbar-group-format' => 'Format',
 	'wikieditor-toolbar-tool-redirect' => 'Weiderleiding',
 	'wikieditor-toolbar-tool-big' => 'Gross',
 	'wikieditor-toolbar-tool-small' => 'Glee',
@@ -17200,6 +18401,7 @@ $messages['pdc'] = array(
  * @author Leinad
  * @author Marcin Łukasz Kiejzik
  * @author Nux
+ * @author Olgak85
  * @author Sp5uhe
  * @author ToSter
  * @author Wpedzich
@@ -17345,21 +18547,22 @@ $1:Example.jpg|Podpis2',
 	'wikieditor-toolbar-tool-replace-case' => 'Uwzględnij wielkość znaków',
 	'wikieditor-toolbar-tool-replace-regex' => 'Traktuj wyszukiwany ciąg jako wyrażenie regularne',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Znajdź następne',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Zastąp następne',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Zamień',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zastąp wszystkie',
 	'wikieditor-toolbar-tool-replace-close' => 'Zamknij',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Wyszukiwanego wzorca nie odnaleziono.',
 	'wikieditor-toolbar-tool-replace-success' => 'Wykonano $1 zamian.',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'Nie określiłeś niczego do wyszukania.',
-	'wikieditor-toolbar-tool-replace-invalidregex' => 'Wyrażenie regularne jest nieprawidłowe – $1',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'Nieprawidłowe wyrażenie regularne – $1',
 	'wikieditor-toolbar-section-characters' => 'Znaki specjalne',
 	'wikieditor-toolbar-characters-page-latin' => 'Łacińskie',
-	'wikieditor-toolbar-characters-page-latinextended' => 'Łacińskie – rozszerzony',
+	'wikieditor-toolbar-characters-page-latinextended' => 'Łacińskie (rozszerzony)',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
 	'wikieditor-toolbar-characters-page-symbols' => 'Symbole',
 	'wikieditor-toolbar-characters-page-greek' => 'Greckie',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cyrylica',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabskie',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabskie (rozszerzony)',
 	'wikieditor-toolbar-characters-page-persian' => 'Perskie',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrajskie',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalski',
@@ -17577,7 +18780,7 @@ $1:Esempi.jpg|Descrission2',
 	'wikieditor-toolbar-tool-replace-case' => 'Fé corësponde majùscole e minùscole',
 	'wikieditor-toolbar-tool-replace-regex' => "Traté la sequensa d'arserca 'me n'espression regolar",
 	'wikieditor-toolbar-tool-replace-button-findnext' => "Trové col ch'a-i ven dòp",
-	'wikieditor-toolbar-tool-replace-button-replacenext' => "Rampiassé col ch'a-i ven dòp",
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Rimpiassa',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Rampiassé tut',
 	'wikieditor-toolbar-tool-replace-close' => 'Sara',
 	'wikieditor-toolbar-tool-replace-nomatch' => "Soa arserca a l'ha nen trovà 'd corëspondense.",
@@ -17592,6 +18795,7 @@ $1:Esempi.jpg|Descrission2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grech',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Sirìlich',
 	'wikieditor-toolbar-characters-page-arabic' => 'Àrabo',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Àrabo spantià',
 	'wikieditor-toolbar-characters-page-persian' => 'Persian',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Ebréo',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
@@ -17664,6 +18868,237 @@ $1:Esempi.jpg|Descrission2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Test normal<dl><dd>Test indentà<dl><dd>Test indentà</dd></dl></dd></dl>',
 );
 
+/** Western Punjabi (پنجابی)
+ * @author Khalid Mahmood
+ */
+$messages['pnb'] = array(
+	'wikieditor' => 'اگیودواں وکیٹکسٹ نوں تبدیل کرن دا سسٹم',
+	'wikieditor-desc' => 'وڈا ہون والا وکیٹیکسٹ ایڈیٹنگ  تے موڈیولز دیو۔',
+	'wikieditor-wikitext-tab' => 'وکی ٹکسٹ',
+	'wikieditor-loading' => 'لوڈنگ',
+	'wikieditor-preview-preference' => 'نال نال دتا وکھالہ قابل کرو۔',
+	'wikieditor-preview-tab' => 'کچا کم وکھاؤ',
+	'wikieditor-preview-changes-tab' => 'تبدیلیاں',
+	'wikieditor-preview-loading' => 'لوڈنگ۔۔۔',
+	'wikieditor-previewDialog-preference' => 'پریویو ڈائیلاگ قابل کرو۔',
+	'wikieditor-previewDialog-tab' => 'کچا کم وکھاؤ',
+	'wikieditor-previewDialog-loading' => 'لوڈنگ۔۔۔',
+	'wikieditor-publish-preference' => 'تھوڑی تھوڑی چھپائی قابل کرو۔',
+	'wikieditor-publish-button-publish' => 'چھاپو',
+	'wikieditor-publish-button-cancel' => 'کینسل',
+	'wikieditor-publish-dialog-title' => '{{SITENAME}} تے چھاپ دیو',
+	'wikieditor-publish-dialog-summary' => 'سمری بدلو (تھوڑے بولاں تبدیلیاں جیہڑیاں تساں کیتیاں دسو):',
+	'wikieditor-publish-dialog-minor' => 'نکی تبدیلی',
+	'wikieditor-publish-dialog-watch' => 'اس صفحے تے اکھ رکھو',
+	'wikieditor-publish-dialog-publish' => 'چھاپو',
+	'wikieditor-publish-dialog-goback' => 'واپس آؤ',
+	'wikieditor-template-editor-preference' => 'وکی ٹیمپلیٹ دیاں فارم والیاں تبدیلیں قابل کرو',
+	'wikieditor-template-editor-dialog-title' => 'سانچہ تبدیل کرو',
+	'wikieditor-template-editor-dialog-submit' => 'نواں کرو',
+	'wikieditor-template-editor-dialog-cancel' => 'کینسل',
+	'wikieditor-templates-preference' => 'ٹمپلیٹ کلیپسنگ قابل کرو۔',
+	'wikieditor-toc-preference' => 'ویکھن والے مواد نوں ویکھن قابل کرو۔',
+	'wikieditor-toc-show' => 'مال وکھاؤ',
+	'wikieditor-toc-hide' => 'مال لکاؤ',
+	'wikieditor-toolbar' => 'لکھت اوزار',
+	'wikieditor-toolbar-desc' => 'اوزار پٹی چ تبدیلی ورتن کرکے کرو۔',
+	'wikieditor-toolbar-preference' => 'ودیا اوزار پٹی نوں چالو کرو۔',
+	'wikieditor-toolbar-dialogs-preference' => 'ڈائیلاگ نوں قابل کرو جوڑ یا پعاڑے یا ہور رلان لئی۔',
+	'wikieditor-toolbar-hidesig' => 'دسخص بٹن نوں ناںتھاں صفیاں توں لکاؤ۔',
+	'wikieditor-toolbar-loading' => 'لوڈنگ۔۔۔',
+	'wikieditor-toolbar-tool-bold' => 'موٹا',
+	'wikieditor-toolbar-tool-bold-example' => 'موٹی لکھائی',
+	'wikieditor-toolbar-tool-italic' => 'ترچھی',
+	'wikieditor-toolbar-tool-italic-example' => 'ترچھی لکھائی',
+	'wikieditor-toolbar-tool-ilink' => 'اندر دا جوڑ',
+	'wikieditor-toolbar-tool-ilink-example' => 'جوڑ ناں',
+	'wikieditor-toolbar-tool-xlink' => 'بارلا جوڑ (یاد رکھو http:// prefix)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com جوڑ دا ناں',
+	'wikieditor-toolbar-tool-link' => 'جوڑ',
+	'wikieditor-toolbar-tool-link-title' => 'جوڑ پاؤ',
+	'wikieditor-toolbar-tool-link-int' => 'اک وکی صفے ول',
+	'wikieditor-toolbar-tool-link-int-target' => 'تارگٹ صفہ یا یوار ایل:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'صفہ سرخی یا یوار ایل',
+	'wikieditor-toolbar-tool-link-int-text' => 'لکھائی دکھان ل‏ی:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'وکھان والی لکھت',
+	'wikieditor-toolbar-tool-link-ext' => 'اک بارلے ویب صفے ل‏ی',
+	'wikieditor-toolbar-tool-link-ext-target' => 'جور یوآر ایل:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'جوڑ لکھائی:',
+	'wikieditor-toolbar-tool-link-insert' => 'جوڑ پاؤ',
+	'wikieditor-toolbar-tool-link-cancel' => 'واپس',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'صفہ ہیگا اے',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'صفہ نئیں ہیگا',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'ناں منی جان والی سرخی',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'بارلے جوڑ',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'صفہ ہون دی کھوج',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'صفہ جیہڑا تساں دسیا اے نئیں اے۔',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'یو آر ایل تسیں دسی اے لگدا اے کسے ہور وکی نال جوڑ اے۔ کیا تسیں اینوں کسے اندرلے جوڑ نال جوڑنا چاندے او؟',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'اندر دا جوڑ',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'بار دا جوڑ',
+	'wikieditor-toolbar-tool-link-empty' => 'جوڑ لئی تساں کوئی شے نئیں لکھی۔',
+	'wikieditor-toolbar-tool-file' => 'جوڑیا گیا لگاؤ',
+	'wikieditor-toolbar-tool-file-example' => 'Example.jpg',
+	'wikieditor-toolbar-tool-reference' => 'اتہ پتہ',
+	'wikieditor-toolbar-tool-reference-example' => 'فٹ نوٹ لکھت ایتھے لکھو',
+	'wikieditor-toolbar-tool-reference-cancel' => 'واپس',
+	'wikieditor-toolbar-tool-reference-title' => 'اتہ پتہ لکھو',
+	'wikieditor-toolbar-tool-reference-insert' => 'لکھو',
+	'wikieditor-toolbar-tool-reference-text' => 'اتہ پتہ لکھت',
+	'wikieditor-toolbar-tool-signature' => 'دسخط تے تریخ',
+	'wikieditor-toolbar-section-advanced' => 'اگے دا',
+	'wikieditor-toolbar-tool-heading' => 'سرخی',
+	'wikieditor-toolbar-tool-heading-1' => 'پدھر 1',
+	'wikieditor-toolbar-tool-heading-2' => 'پدھر 2',
+	'wikieditor-toolbar-tool-heading-3' => 'پدھر 3',
+	'wikieditor-toolbar-tool-heading-4' => 'پدھر 4',
+	'wikieditor-toolbar-tool-heading-5' => 'پدھر 5',
+	'wikieditor-toolbar-tool-heading-example' => 'سرخی شبد',
+	'wikieditor-toolbar-group-format' => 'فارمیٹ',
+	'wikieditor-toolbar-tool-ulist' => 'نشان والی لسٹ',
+	'wikieditor-toolbar-tool-ulist-example' => 'نشان والی لسٹ والی شے',
+	'wikieditor-toolbar-tool-olist' => 'نمبراں والی لسٹ',
+	'wikieditor-toolbar-tool-olist-example' => 'نمبراں والی لسٹ والی شے',
+	'wikieditor-toolbar-tool-indent' => 'انڈنٹیشن',
+	'wikieditor-toolbar-tool-indent-example' => 'انڈنٹڈ لیک',
+	'wikieditor-toolbar-tool-nowiki' => 'کوئی وکی فارمیٹنگ نئیں',
+	'wikieditor-toolbar-tool-nowiki-example' => 'ناں فارمیٹ کیتی گئی لکھت ایتھے دیو',
+	'wikieditor-toolbar-tool-redirect' => 'ریڈائرکٹ',
+	'wikieditor-toolbar-tool-redirect-example' => 'تارگٹ کیتے گۓ صفے دا ناں',
+	'wikieditor-toolbar-tool-big' => 'وڈا',
+	'wikieditor-toolbar-tool-big-example' => 'وڈی لکھت',
+	'wikieditor-toolbar-tool-small' => 'نکی',
+	'wikieditor-toolbar-tool-small-example' => 'نکی لکھت',
+	'wikieditor-toolbar-tool-superscript' => 'اتلی لکھائی',
+	'wikieditor-toolbar-tool-superscript-example' => 'اتلی لکھائی لکھت',
+	'wikieditor-toolbar-tool-subscript' => 'تھلویں لکھائی',
+	'wikieditor-toolbar-tool-subscript-example' => 'تھلویں لکھائی',
+	'wikieditor-toolbar-group-insert' => 'رلاؤ',
+	'wikieditor-toolbar-tool-gallery' => 'مورت نگری',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:ادھارن.جےپیجی|سرخی1
+$1:ادھارن.جےپیجی|سرخی2',
+	'wikieditor-toolbar-tool-newline' => 'نویں لکیر',
+	'wikieditor-toolbar-tool-table' => 'ٹیبل',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! سرخی 1
+! سرخی 2
+! سرخی 3
+|-
+| لیک 1, ڈبی 1
+| لیک 1, ڈبی 2
+| لیک 1, ڈبی 3
+|-
+| لیک 2, ڈبی 1
+| لیک 2, ڈبی 2
+| لیک 2, ڈبی 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'ڈبی لکھت',
+	'wikieditor-toolbar-tool-table-example-header' => 'سرخی شبد',
+	'wikieditor-toolbar-tool-table-title' => 'ٹیبل پاؤ',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'لیناں',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'کالم',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'سرخی لین جوڑو',
+	'wikieditor-toolbar-tool-table-wikitable' => 'بارڈر نال سٹائل',
+	'wikieditor-toolbar-tool-table-sortable' => 'ٹیبل ترتیب چ کرو',
+	'wikieditor-toolbar-tool-table-example' => 'ادھارن',
+	'wikieditor-toolbar-tool-table-preview' => 'کچا کم',
+	'wikieditor-toolbar-tool-table-insert' => 'رلاؤ',
+	'wikieditor-toolbar-tool-table-cancel' => 'واپس',
+	'wikieditor-toolbar-tool-table-toomany' => '$1 توں زیادہ ڈبیاں ایس ٹیبل چ پانا ایس کم چ نئیں ہوسکدا۔',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'تساں نیں کوئی ٹھیک کالم یا لیکاں نئیں پایاں۔',
+	'wikieditor-toolbar-tool-table-zero' => 'صفر قطار یا کالم نئیں پاا جاسکدا۔',
+	'wikieditor-toolbar-tool-replace' => 'لبو تے بدلو۔',
+	'wikieditor-toolbar-tool-replace-title' => 'لبو تے بدلو',
+	'wikieditor-toolbar-tool-replace-search' => 'ایس لئی لبو:',
+	'wikieditor-toolbar-tool-replace-replace' => 'ایدے نال بدلو:',
+	'wikieditor-toolbar-tool-replace-case' => 'آمنے سامنے رکھو',
+	'wikieditor-toolbar-tool-replace-regex' => 'کھوجی رسی نوں اک عام ہون والی گل وانکوں لو۔',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'اگلا لبو',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'سارے بدلو',
+	'wikieditor-toolbar-tool-replace-close' => 'بند کرو',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'تھاڈی کھوج کسے نال نئیں رلدی',
+	'wikieditor-toolbar-tool-replace-success' => '$1 بدلیا.',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'جوڑ لئی تساں کوئی شے نئیں لکھی۔',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'ایکسپریشن جیہڑی تساں پائی اے ٹھیک نغیں:$1',
+	'wikieditor-toolbar-section-characters' => 'خاص کیریکٹرز',
+	'wikieditor-toolbar-characters-page-latin' => 'لاطینی',
+	'wikieditor-toolbar-characters-page-latinextended' => 'ودویں لاطینی',
+	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
+	'wikieditor-toolbar-characters-page-symbols' => 'نشان',
+	'wikieditor-toolbar-characters-page-greek' => 'یونانی',
+	'wikieditor-toolbar-characters-page-cyrillic' => 'سریلیک',
+	'wikieditor-toolbar-characters-page-arabic' => 'عربی',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'عربی ودویں',
+	'wikieditor-toolbar-characters-page-persian' => 'فارسی',
+	'wikieditor-toolbar-characters-page-hebrew' => 'عبرانی',
+	'wikieditor-toolbar-characters-page-bangla' => 'بنگالی',
+	'wikieditor-toolbar-characters-page-telugu' => 'تلیگو',
+	'wikieditor-toolbar-characters-page-sinhala' => 'سنہالی',
+	'wikieditor-toolbar-characters-page-gujarati' => 'گجراتی',
+	'wikieditor-toolbar-characters-page-thai' => 'تھائی',
+	'wikieditor-toolbar-characters-page-lao' => 'لاؤ',
+	'wikieditor-toolbar-characters-page-khmer' => 'کھیمر',
+	'wikieditor-toolbar-section-help' => 'مدد',
+	'wikieditor-toolbar-help-heading-description' => 'بیان',
+	'wikieditor-toolbar-help-heading-syntax' => 'تسی کی لکھدے او',
+	'wikieditor-toolbar-help-heading-result' => 'تسانوں کی لبدا اے',
+	'wikieditor-toolbar-help-page-format' => 'فارمیٹنگ',
+	'wikieditor-toolbar-help-page-link' => 'جوڑ',
+	'wikieditor-toolbar-help-page-heading' => 'سرخیاں',
+	'wikieditor-toolbar-help-page-list' => 'لسٹاں',
+	'wikieditor-toolbar-help-page-file' => 'فاغلاں',
+	'wikieditor-toolbar-help-page-reference' => 'اتے پتے',
+	'wikieditor-toolbar-help-page-discussion' => 'گل بات',
+	'wikieditor-toolbar-help-content-italic-description' => 'ترچھا',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''ترچھی لکھت''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>ترجھی لکھت</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'موٹا',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''موٹی لکھت'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>موٹی لکھت</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'موٹی &amp; ترچھی',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''موٹی &amp; ترچھی لکھت'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>موٹی &amp; ترچھی لکھت</em></strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'اندرونی جوڑ',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[صفہ سرخی|جوڑ نشان]]<br />[[صفہ سرخی]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>جوڑ نشان</a><br /><a href='#'>صفہ سرناواں</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'بارلے جوڑ',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org جوڑ نشان]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' کلاس='بارلا'>جوڑ لیبل</a><br /><a href='#' class='بارلا آٹونمبر'>[1]</a><br /><a href='#' کلاس='بارلا'>http://www.example.org</a>",
+	'wikieditor-toolbar-help-content-heading2-description' => 'دوجی پڈھر دی سرخی',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== سرخی لکھت ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>سرخی لکھت</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'تیجی پڈھر دی سرخی',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '== سرخی لکھت ==',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>سرخی لکھت</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'چوتھی پڈھر دی سرخی',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== سرخی لکھت ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>سرخی لکھت </h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'پنجویں پدہر دی سرخی',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== سرخی لکھت =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>سرخی لکھت</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'نشان والی لسٹ',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* لسٹ آئٹم<br />* لسٹ آئٹم',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>لسٹ آئٹم</li><li>لسٹ آئٹم</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'نمبراں والی لسٹ',
+	'wikieditor-toolbar-help-content-olist-syntax' => '#لسٹ آئٹم<br />#لسٹ آئٹم',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>لسٹ آئٹم</li><li>لسٹ آئٹم</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'مورت لگی فائل',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|سرخی]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div سٹائل='چوڑائی:104px;' کلاس='تھمبنر'><اک سرخی='سرخی لکھت' کلاس='مورت' href='#'><مورت اونچائی='50' چوڑائی='100' باڈر='0' کلاس='تھمبامیج' src='ایکسٹنشن/وکیایڈیٹر/موڈیولز/مورتاں/اوزار پٹی/ادھارن-مورت.پیاینجی' alt=''/></a><ڈو کلاس='تھمبسرخی'><ڈو کلاس='وڈاکرنا'><اک سرخی='وڈا' کلاس='انٹرنل' href='#'><مورت انچائی='11' چوڑائی='15' alt='' src='$1/کامن/مورتاں/وڈا کلپ۔پیاینجی.پیاینجی'/></a></div>سرخی لکھت</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'اتے پتے',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'صفہ لکھت.&lt;ref name="test"&gt;[http://www.example.org جوڑ لکھت], ہور لکھت.&lt;/ref&gt;',
+	'wikieditor-toolbar-help-content-reference-result' => "صفا لکھت.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'ہور ورتن اوسے اتے پتے دا',
+	'wikieditor-toolbar-help-content-rereference-result' => "صفہ لکھت.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-showreferences-description' => 'اتے پتے وکھاؤ',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Link text</a>, additional text.</li></ol>",
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'تواڈے دستخط ویلے دے نال',
+	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>ورتن والے دا ناں</a> (<a href='#' title='{{#special:mytalk}}'>talk</a>) 15:54, 10 June 2009 (UTC)",
+	'wikieditor-toolbar-help-content-signature-description' => 'دسخط',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>ورتن ناں</a> (<a href='#' title='{{#special:mytalk}}'>talk</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'انڈنٹ',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'نارمل لکھت<br />:ودی لکھت<br />::ودی لکھت',
+	'wikieditor-toolbar-help-content-indent-result' => 'نارمل لکھت<dl><dd>ودی لکھت<dl><dd>ودی لکھت</dd></dl></dd></dl>',
+);
+
 /** Pontic (Ποντιακά) */
 $messages['pnt'] = array(
 	'wikieditor-toolbar-loading' => "Φορτών'...",
@@ -17768,6 +19203,7 @@ $messages['ps'] = array(
 	'wikieditor-toolbar-tool-table-title' => 'لښتيال ورټومبل',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'ليکې',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'ستنې',
+	'wikieditor-toolbar-tool-table-wikitable' => 'ډول او پولې',
 	'wikieditor-toolbar-tool-table-sortable' => 'لښتيال د اوډون وړ ګرځول',
 	'wikieditor-toolbar-tool-table-example' => 'بېلګه',
 	'wikieditor-toolbar-tool-table-preview' => 'مخليدنه',
@@ -17777,8 +19213,9 @@ $messages['ps'] = array(
 	'wikieditor-toolbar-tool-replace-title' => 'پلټل او ځايناستول',
 	'wikieditor-toolbar-tool-replace-search' => 'پلټنه د:',
 	'wikieditor-toolbar-tool-replace-replace' => 'ځايناستول سره د:',
+	'wikieditor-toolbar-tool-replace-case' => 'د کټ مټ ورته تورو مطابقت',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'بل موندل',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'راتلونکی ځايناستول',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'ځايناستول',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'ټول ځايناستول',
 	'wikieditor-toolbar-tool-replace-close' => 'تړل',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'ستاسې پلټنه د هېڅ کوم شي سره اړونده نه وه.',
@@ -17790,6 +19227,7 @@ $messages['ps'] = array(
 	'wikieditor-toolbar-characters-page-greek' => 'يوناني',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'سرېليک',
 	'wikieditor-toolbar-characters-page-arabic' => 'عربي',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'غځېدلې عربي',
 	'wikieditor-toolbar-characters-page-persian' => 'پارسي',
 	'wikieditor-toolbar-characters-page-hebrew' => 'عبراني',
 	'wikieditor-toolbar-characters-page-bangla' => 'بنګالي',
@@ -17861,8 +19299,11 @@ $messages['ps'] = array(
  * @author 555
  * @author Giro720
  * @author Hamilton Abreu
+ * @author Helder.wiki
+ * @author João Sousa
  * @author Luckas Blade
  * @author Malafaya
+ * @author MetalBrasil
  */
 $messages['pt'] = array(
 	'wikieditor' => 'Interface avançada de edição de texto wiki',
@@ -18005,7 +19446,7 @@ $1:Exemplo2.jpg|Legenda2',
 	'wikieditor-toolbar-tool-replace-case' => 'Distinguir maiúsculas de minúsculas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratar texto de busca como uma expressão regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Procurar próximo',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Substituir próximo',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Substituir',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Substituir todos',
 	'wikieditor-toolbar-tool-replace-close' => 'Fechar',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'A sua pesquisa não produziu resultados.',
@@ -18020,6 +19461,7 @@ $1:Exemplo2.jpg|Legenda2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grego',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirílico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Árabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arábico estendido',
 	'wikieditor-toolbar-characters-page-persian' => 'Persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraico',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
@@ -18053,7 +19495,7 @@ $1:Exemplo2.jpg|Legenda2',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Título da página|texto do link]]<br />[[Título da página]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Texto do link</a><br /><a href='#'>Título da página</a>",
 	'wikieditor-toolbar-help-content-xlink-description' => 'Link externo',
-	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.exemplo.org Texto do link]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Texto do link]<br />[http://www.example.org]<br />http://www.example.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Texto do link</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
 	'wikieditor-toolbar-help-content-heading2-description' => 'Subtítulo de nível 2',
 	'wikieditor-toolbar-help-content-heading2-syntax' => '== Subtítulo ==',
@@ -18102,6 +19544,8 @@ $1:Exemplo2.jpg|Legenda2',
  * @author Heldergeovane
  * @author Lijealso
  * @author Luckas Blade
+ * @author MetalBrasil
+ * @author Rafael Vargas
  */
 $messages['pt-br'] = array(
 	'wikieditor' => 'Interface avançada de edição de wikitexto',
@@ -18244,7 +19688,7 @@ $1:Exemplo.jpg|Legenda2',
 	'wikieditor-toolbar-tool-replace-case' => 'Coincidir maiúsculas e minúsculas',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratar texto da pesquisa como uma expressão regular',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Procurar próximo',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Substituir próximo',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Substituir',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Substituir todos',
 	'wikieditor-toolbar-tool-replace-close' => 'Fechar',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Não houve coincidências para a sua pesquisa.',
@@ -18259,6 +19703,7 @@ $1:Exemplo.jpg|Legenda2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grego',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirílico',
 	'wikieditor-toolbar-characters-page-arabic' => 'Árabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Árabe estendido',
 	'wikieditor-toolbar-characters-page-persian' => 'Persa',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebraico',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
@@ -18292,7 +19737,7 @@ $1:Exemplo.jpg|Legenda2',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Título da página|texto do link]]<br />[[Título da página]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Título do link</a><br /><a href='#'>Título da página</a>",
 	'wikieditor-toolbar-help-content-xlink-description' => 'Link externo',
-	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.exemplo.org Título do link]<br />[http://www.exemplo.org]<br />http://www.exemplo.org',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org Título do link]<br />[http://www.example.org]<br />http://www.example.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>Texto da ligação</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.exemplo.org</a>",
 	'wikieditor-toolbar-help-content-heading2-description' => 'Subtítulo de nível 2',
 	'wikieditor-toolbar-help-content-heading2-syntax' => '== Subtítulo ==',
@@ -18475,7 +19920,6 @@ $1:Qhawarichiy.jpg|Ch'uyanchay2",
 	'wikieditor-toolbar-tool-replace-case' => 'Hatunpas uchuypas sanampata qhawaykuy',
 	'wikieditor-toolbar-tool-replace-regex' => "Taripana qillqata allinlla nisqata hina hat'alliy",
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Qatiqta maskay',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Qatiqta huknachay',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Tukuykunata huknachay',
 	'wikieditor-toolbar-tool-replace-close' => "Wichq'ay",
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Maskayniykiwan manam imatapas taripankichu.',
@@ -18709,7 +20153,7 @@ $1:Exemplu.jpg|Descriere 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Înlocuiește doar dacă este identic',
 	'wikieditor-toolbar-tool-replace-regex' => 'Tratează sintagma ca o expresie regulată',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Găsește următorul',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Înlocuiește următorul',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Înlocuiește',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Înlocuiește toate',
 	'wikieditor-toolbar-tool-replace-close' => 'Închide',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Căutarea dumneavoastră nu a generat niciun rezultat.',
@@ -18724,6 +20168,7 @@ $1:Exemplu.jpg|Descriere 2',
 	'wikieditor-toolbar-characters-page-greek' => 'Greacă',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Chirilică',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabă',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabă extinsă',
 	'wikieditor-toolbar-characters-page-persian' => 'Persană',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Ebraică',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengaleză',
@@ -18941,7 +20386,7 @@ $1:Example.jpg|Titele2',
 	'wikieditor-toolbar-tool-replace-case' => 'Combronde maiuscole e minuscole',
 	'wikieditor-toolbar-tool-replace-regex' => "Tratte 'a stringhe de ricerche cumme a 'n'espressione regolare",
 	'wikieditor-toolbar-tool-replace-button-findnext' => "Cirche 'u prosseme",
-	'wikieditor-toolbar-tool-replace-button-replacenext' => "Sostituisce 'u teste",
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Sostituisce',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Sostituisce tutte',
 	'wikieditor-toolbar-tool-replace-close' => 'Chiude',
 	'wikieditor-toolbar-tool-replace-nomatch' => "'A ricerca toje non g'à acchiate ninde.",
@@ -18956,6 +20401,7 @@ $1:Example.jpg|Titele2',
 	'wikieditor-toolbar-characters-page-greek' => 'Greche',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirilliche',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabe',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Estenziune arabe',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiane',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Ebbrèe',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangladesciane',
@@ -19030,8 +20476,11 @@ $1:Example.jpg|Titele2',
 
 /** Russian (Русский)
  * @author Claymore
+ * @author Dim Grits
  * @author Eleferen
  * @author G0rn
+ * @author KPu3uC B Poccuu
+ * @author Kaganer
  * @author Lockal
  * @author Temuri rajavi
  * @author Александр Сигачёв
@@ -19041,7 +20490,7 @@ $messages['ru'] = array(
 	'wikieditor-desc' => 'Обеспечивает расширяемый интерфейс редактирования викитекста и многие функции, предоставляемые модулями',
 	'wikieditor-wikitext-tab' => 'Викитекст',
 	'wikieditor-loading' => 'Загрузка',
-	'wikieditor-preview-preference' => 'Включить предпросмотр бок о бок',
+	'wikieditor-preview-preference' => 'Включить предпросмотр «бок о бок»',
 	'wikieditor-preview-tab' => 'Предпросмотр',
 	'wikieditor-preview-changes-tab' => 'Изменения',
 	'wikieditor-preview-loading' => 'Загрузка…',
@@ -19066,7 +20515,7 @@ $messages['ru'] = array(
 	'wikieditor-toc-show' => 'Показать оглавление',
 	'wikieditor-toc-hide' => 'Скрыть оглавление',
 	'wikieditor-toolbar' => 'Панель редактирования',
-	'wikieditor-toolbar-desc' => 'Панель редактирования с улучшенным юзабилити',
+	'wikieditor-toolbar-desc' => 'Панель редактирования, более удобная в использовании',
 	'wikieditor-toolbar-preference' => 'Включить улучшенную панель редактирования',
 	'wikieditor-toolbar-dialogs-preference' => 'Включить диалоги для вставки ссылок, таблиц и других объектов',
 	'wikieditor-toolbar-hidesig' => 'Скрыть кнопку подписи на страницах основного пространства имён',
@@ -19167,6 +20616,7 @@ $1:Example.jpg|Описание2',
 	'wikieditor-toolbar-tool-table-preview' => 'Предпросмотр',
 	'wikieditor-toolbar-tool-table-insert' => 'Вставить',
 	'wikieditor-toolbar-tool-table-cancel' => 'Отмена',
+	'wikieditor-toolbar-tool-table-example-text' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod.',
 	'wikieditor-toolbar-tool-table-toomany' => 'Этот диалог не позволяет вставить таблицу размером более $1 ячеек.',
 	'wikieditor-toolbar-tool-table-invalidnumber' => 'Вы не указали корректное количество строк или столбцов.',
 	'wikieditor-toolbar-tool-table-zero' => 'Вы не можете вставить таблицу с нулевым количеством строк или столбцов.',
@@ -19177,7 +20627,7 @@ $1:Example.jpg|Описание2',
 	'wikieditor-toolbar-tool-replace-case' => 'Учитывать регистр',
 	'wikieditor-toolbar-tool-replace-regex' => 'Считать строку поиска регулярным выражением',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Найти следующее',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Заменить следующее',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Заменить',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Заменить все',
 	'wikieditor-toolbar-tool-replace-close' => 'Закрыть',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'По вашему запросу ничего не найдено.',
@@ -19192,6 +20642,7 @@ $1:Example.jpg|Описание2',
 	'wikieditor-toolbar-characters-page-greek' => 'Греческие',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Кириллица',
 	'wikieditor-toolbar-characters-page-arabic' => 'Арабские',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Арабские расширенные',
 	'wikieditor-toolbar-characters-page-persian' => 'Персидские',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Иврит',
 	'wikieditor-toolbar-characters-page-bangla' => 'Бенгальские',
@@ -19254,8 +20705,10 @@ $1:Example.jpg|Описание2',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'Текст страницы.&lt;ref name="test"&gt;[http://www.example.org Текст ссылки], дополнительный текст.&lt;/ref&gt;',
 	'wikieditor-toolbar-help-content-reference-result' => "Текст страницы.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-rereference-description' => 'Дополнительное использование той же ссылки',
+	'wikieditor-toolbar-help-content-rereference-syntax' => '&lt;ref name="test" /&gt;',
 	'wikieditor-toolbar-help-content-rereference-result' => "Текст страницы<sup><a href='#'>[1]</a></sup>.",
 	'wikieditor-toolbar-help-content-showreferences-description' => 'Показывать примечания',
+	'wikieditor-toolbar-help-content-showreferences-syntax' => '&lt;references /&gt;',
 	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Текст ссылки</a>, дополнительный текст.</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Подпись с отметкой времени',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Имя участника</a> (<a href='#' title='{{#special:mytalk}}'>обсуждение</a>) 15:54, 10 июня 2009 (UTC)",
@@ -19302,6 +20755,7 @@ $messages['rue'] = array(
 	'wikieditor-toolbar-desc' => 'Едітачный панел інштрументів з вылїпшенов хосновательностёв',
 	'wikieditor-toolbar-preference' => 'Запнути вылїпшеный панел інштрументів',
 	'wikieditor-toolbar-dialogs-preference' => 'Поволити діалоґы про вкладаня одказів, таблиць ітд.',
+	'wikieditor-toolbar-hidesig' => 'Скрыти клапку підпису на сторінках у головнім просторї назв',
 	'wikieditor-toolbar-loading' => 'Награваня...',
 	'wikieditor-toolbar-tool-bold' => 'Тучне',
 	'wikieditor-toolbar-tool-bold-example' => 'Тучный текст',
@@ -19409,7 +20863,6 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-tool-replace-case' => 'Розлишыти великость писмен',
 	'wikieditor-toolbar-tool-replace-regex' => 'Глядати помочов реґуларного выразу',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Найти далшый',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замінити далшый',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замінити вшытко',
 	'wikieditor-toolbar-tool-replace-close' => 'Заперти',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Заданому гляданю ніч не одповідать.',
@@ -19424,6 +20877,7 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-characters-page-greek' => 'Ґрецькы',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Кірíліця',
 	'wikieditor-toolbar-characters-page-arabic' => 'Арабськы',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Росшырїня Аравчіны',
 	'wikieditor-toolbar-characters-page-persian' => 'Перськы',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Гебрейскы',
 	'wikieditor-toolbar-characters-page-bangla' => 'Бенгалскы',
@@ -19496,7 +20950,8 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Звычайный текст<dl><dd>Текст з одступом<dl><dd>Текст з одступом</dd></dl></dd></dl>',
 );
 
-/** Sanskrit (संस्कृत)
+/** Sanskrit (संस्कृतम्)
+ * @author Ansumang
  * @author Bhawani Gautam
  */
 $messages['sa'] = array(
@@ -19506,9 +20961,13 @@ $messages['sa'] = array(
 	'wikieditor-toolbar-tool-heading-4' => 'शीर्षकम् 4',
 	'wikieditor-toolbar-tool-heading-5' => 'शीर्षकम्',
 	'wikieditor-toolbar-section-characters' => 'विशेष-वर्णानि',
+	'wikieditor-toolbar-characters-page-symbols' => 'प्रतीक',
+	'wikieditor-toolbar-characters-page-greek' => 'ग्रीक',
+	'wikieditor-toolbar-characters-page-bangla' => 'वङ्गलिपि',
+	'wikieditor-toolbar-section-help' => 'साहाय्यम्',
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -19651,7 +21110,6 @@ $1:Example.jpg|Сурук2',
 	'wikieditor-toolbar-tool-replace-case' => 'Регистрын учуоттуурга',
 	'wikieditor-toolbar-tool-replace-regex' => 'Көрдөөһүн устуруокатын регулярнай выражение курдук көрөргө',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Аныгыскыны көрдөө',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Аныгыскыны уларыт',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Барытын уларыт',
 	'wikieditor-toolbar-tool-replace-close' => 'Сап',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Эн көрдөбүлгүнэн туох да көстүбэтэ.',
@@ -19865,7 +21323,6 @@ $1:Esèmpiu.jpg|Didascalia2',
 	'wikieditor-toolbar-tool-replace-case' => 'Distinghe lìteras mannas/minores',
 	'wikieditor-toolbar-tool-replace-regex' => 'Trata sa cadena de chirca comente una espressione regulare',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Agata imbenientes',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Rimpiatza imbenientes',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Rimpiatza totu',
 	'wikieditor-toolbar-tool-replace-close' => 'Serra',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Sa chirca tua no at agatadu cointzidèntzias.',
@@ -19946,6 +21403,7 @@ $1:Esèmpiu.jpg|Didascalia2',
 );
 
 /** Sicilian (Sicilianu)
+ * @author Aushulz
  * @author Gmelfi
  */
 $messages['scn'] = array(
@@ -20101,7 +21559,7 @@ $1:Example.jpg|Didascalia2',
 	'wikieditor-toolbar-tool-replace-case' => 'Maiùsculi/minùsculi',
 	'wikieditor-toolbar-tool-replace-regex' => "Tratta la stringa comu n'esprissioni rigulari",
 	'wikieditor-toolbar-tool-replace-button-findnext' => "Trova l'àutri",
-	'wikieditor-toolbar-tool-replace-button-replacenext' => "Sustituisci l'àutri",
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Scancia',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Sustituisci tutticosi',
 	'wikieditor-toolbar-tool-replace-close' => 'Chiudi',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'La tò ricerca nun prudicìu risurtati',
@@ -20199,8 +21657,10 @@ $messages['sco'] = array(
  * @author Budhajeewa
  * @author Calcey
  * @author Pasanbhathiya2
+ * @author Singhalawap
  * @author චතුනි අලහප්පෙරුම
  * @author තඹරු විජේසේකර
+ * @author පසිඳු කාවින්ද
  * @author බිඟුවා
  */
 $messages['si'] = array(
@@ -20227,7 +21687,7 @@ $messages['si'] = array(
 	'wikieditor-template-editor-preference' => 'විකි අච්චුවල පෝරම-මූලික සංස්කරණය සක්‍රීය කරන්න',
 	'wikieditor-template-editor-dialog-title' => 'සැකිල්ල සංස්කරණය කරන්න',
 	'wikieditor-template-editor-dialog-submit' => 'යාවත්කාලීන කළ',
-	'wikieditor-template-editor-dialog-cancel' => 'අත් හරින්න',
+	'wikieditor-template-editor-dialog-cancel' => 'අවලංගු කරන්න',
 	'wikieditor-templates-preference' => 'ටෙම්ප්ලේට හැකිළුම සක්‍රීය කරන්න',
 	'wikieditor-toc-preference' => 'සංචලනය කළ හැකි පටුන සක්‍රීය කරන්න',
 	'wikieditor-toc-show' => 'අන්තර්ගතය පෙන්වන්න',
@@ -20236,6 +21696,7 @@ $messages['si'] = array(
 	'wikieditor-toolbar-desc' => 'වර්ධිත පරිශීලන හැකියාව සහිත සංස්කරණ පිටු මෙවලම් තීරුව',
 	'wikieditor-toolbar-preference' => 'වර්ධිත මෙවලම් තීරුව සක්‍රීය කරන්න',
 	'wikieditor-toolbar-dialogs-preference' => 'දියුණු කළ විකි පෙළක් ඇතුල් කිරීම ස‍ඳහා උදව් සක්‍රීය කරන්න',
+	'wikieditor-toolbar-hidesig' => 'ප්‍රධාන නාමඅවකාශයේ තිබෙන පිටුවල අත්සන් බොත්තම සඟවන්න',
 	'wikieditor-toolbar-loading' => 'ප්‍රවේශනය වෙමින් පවතී...',
 	'wikieditor-toolbar-tool-bold' => 'තද පැහැ අකුරු',
 	'wikieditor-toolbar-tool-bold-example' => 'තද පැහැති අකුරු පෙළ',
@@ -20249,34 +21710,34 @@ $messages['si'] = array(
 	'wikieditor-toolbar-tool-link-title' => 'සබැඳුමක් ඇතුල් කිරීම',
 	'wikieditor-toolbar-tool-link-int' => 'විකි පිටුවක් වෙත',
 	'wikieditor-toolbar-tool-link-int-target' => 'පිටු මාතෘකාව:',
-	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'පිටු මාතෘකාව හෝ අන්තර්ජාල ලිපිනය',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'පිටු මාතෘකාව හෝ URL',
 	'wikieditor-toolbar-tool-link-int-text' => 'සබැඳුම් පෙළ:',
-	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'ප්‍රදර්ශනය කල යුතු පෙළ',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'දර්ශනය කලයුතු පෙළ',
 	'wikieditor-toolbar-tool-link-ext' => 'බාහිර වෙබ් පිටුවක් වෙත',
 	'wikieditor-toolbar-tool-link-ext-target' => ' URL සබැඳුම:',
 	'wikieditor-toolbar-tool-link-ext-text' => 'සබැඳුම් පෙළ:',
-	'wikieditor-toolbar-tool-link-insert' => 'සබැඳුමක් ඇතුල් කරන්න',
-	'wikieditor-toolbar-tool-link-cancel' => 'අත් හරින්න',
+	'wikieditor-toolbar-tool-link-insert' => 'සබැඳුම ඇතුල්කරන්න',
+	'wikieditor-toolbar-tool-link-cancel' => 'අවලංගු කරන්න',
 	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'පිටුව පවතී',
 	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'පිටුව නොපවතී',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'වලංගු මාතෘකාවක් නොවේ',
-	'wikieditor-toolbar-tool-link-int-target-status-external' => 'භාහිර සබැඳුම',
-	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'පිටුවේ පැවැත්ම පරීක්ෂා කරමින් පවතී...',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'බාහිර සබැඳුම',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'මෙවැනි පිටුවක තිබේද යන්න පරීක්‍ෂාකරමින් පවතී...',
 	'wikieditor-toolbar-tool-link-int-invalid' => 'ඔබ සඳහන් කළ මාතෘකාව වලංගු නොවේ.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'ඔබ සඳහන් කළ URL  තවත් විකි පිටුවක සබැඳුමක් කිරීමට අදහස් කරන බව පෙනේ. ඔබට එය අභ්‍යන්තර සබැඳුමක් කිරීමට අවශයද?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'අභ්‍යන්තර සබැඳුම',
-	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'භාහිර සබැඳුම',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'බාහිර සබැඳුම',
 	'wikieditor-toolbar-tool-link-empty' => 'ඔබ සබැඳුමකට කිසිවක් ඇතුළු කර නොමැත.',
 	'wikieditor-toolbar-tool-file' => 'කා වැද්දූ ගොනුව',
 	'wikieditor-toolbar-tool-file-example' => 'උදාහරණ.jpg',
 	'wikieditor-toolbar-tool-reference' => 'යොමුව',
-	'wikieditor-toolbar-tool-reference-example' => 'මෙහි පාද සටහන් පෙළක් ඇතුල් කරන්න',
-	'wikieditor-toolbar-tool-reference-cancel' => 'අත් හරින්න',
+	'wikieditor-toolbar-tool-reference-example' => 'මෙහි footnote පෙළක් ඇතුල් කරන්න',
+	'wikieditor-toolbar-tool-reference-cancel' => 'අවලංගු කරන්න',
 	'wikieditor-toolbar-tool-reference-title' => 'යොමුවක්(Reference) ඇතුලුකරන්න',
 	'wikieditor-toolbar-tool-reference-insert' => 'ඇතුල් කරන්න',
 	'wikieditor-toolbar-tool-reference-text' => 'මූලාශ්‍ර පෙළ',
 	'wikieditor-toolbar-tool-signature' => 'අත්සන හා කාල මුද්‍රාව',
-	'wikieditor-toolbar-section-advanced' => 'දියුණු කළ',
+	'wikieditor-toolbar-section-advanced' => 'තවත් සැකසුම්',
 	'wikieditor-toolbar-tool-heading' => 'ශීර්ෂය',
 	'wikieditor-toolbar-tool-heading-1' => '1 වෙනි මට්ටම',
 	'wikieditor-toolbar-tool-heading-2' => '2 වෙනි මට්ටම',
@@ -20285,8 +21746,8 @@ $messages['si'] = array(
 	'wikieditor-toolbar-tool-heading-5' => '5 වෙනි මට්ටම',
 	'wikieditor-toolbar-tool-heading-example' => 'ශීර්ෂ පෙළ',
 	'wikieditor-toolbar-group-format' => 'ආකෘතිය',
-	'wikieditor-toolbar-tool-ulist' => 'රටා යෙදූ ලැයිස්තුව',
-	'wikieditor-toolbar-tool-ulist-example' => 'රටා යෙදූ ලැයිස්තු අයිතමය',
+	'wikieditor-toolbar-tool-ulist' => 'බුලට් යෙදූ ලැයිස්තුව',
+	'wikieditor-toolbar-tool-ulist-example' => 'බුලට් යෙදූ ලැයිස්තු අයිතමය',
 	'wikieditor-toolbar-tool-olist' => 'අංකිත ලැයිස්තුව',
 	'wikieditor-toolbar-tool-olist-example' => 'අංකිත ලැයිස්තු අයිතමය',
 	'wikieditor-toolbar-tool-indent' => 'ඉන්ඩෙන්ට් කිරීම',
@@ -20322,13 +21783,13 @@ $1:උදාහරණ.jpg| 2 යටි ලියමන',
 | 2 පේළිය,2 කොටුව
 | 2 පේළිය,3 කොටුව',
 	'wikieditor-toolbar-tool-table-example-cell-text' => 'කොටුවේ පෙළ',
-	'wikieditor-toolbar-tool-table-example-header' => 'ශීර්ෂක පෙළ',
+	'wikieditor-toolbar-tool-table-example-header' => 'මාතෘකාව',
 	'wikieditor-toolbar-tool-table-title' => 'වගුවක් ඇතුල් කිරීම',
-	'wikieditor-toolbar-tool-table-dimensions-rows' => 'පේළි',
-	'wikieditor-toolbar-tool-table-dimensions-columns' => 'තීරු',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'පේළි (Rows)',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'තීරු (Columns)',
 	'wikieditor-toolbar-tool-table-dimensions-header' => 'ශීර්ෂ පේළියක් ඇතුල් කරන්න',
-	'wikieditor-toolbar-tool-table-wikitable' => 'දාර සහිත විලාසය',
-	'wikieditor-toolbar-tool-table-sortable' => 'වර්ග කිරීමේ හැකියාව ඇති වගුවක් කරන්න',
+	'wikieditor-toolbar-tool-table-wikitable' => 'දාරයන් සහිතව',
+	'wikieditor-toolbar-tool-table-sortable' => 'ආරෝහන/අවරෝහන පිලිවෙලින් සැකසියහැකි වගුවක් සකසන්න',
 	'wikieditor-toolbar-tool-table-example' => 'කොටුවේ පෙළ',
 	'wikieditor-toolbar-tool-table-preview' => 'පූර්ව දර්ශනය',
 	'wikieditor-toolbar-tool-table-insert' => 'ඇතුල් කරන්න',
@@ -20343,7 +21804,7 @@ $1:උදාහරණ.jpg| 2 යටි ලියමන',
 	'wikieditor-toolbar-tool-replace-case' => 'අවස්ථාව ගළපන්න',
 	'wikieditor-toolbar-tool-replace-regex' => 'සොයන පදය නියත ප්‍රකාශනයක් ලෙස සලකන්න',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'මීළඟ එක සොයන්න',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'මීළඟ එක ප්‍රතිස්ථාපනය කරන්න',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'ප්‍රතිස්ථාපනය',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'සියල්ලම ප්‍රතිස්ථාපනය කරන්න',
 	'wikieditor-toolbar-tool-replace-close' => 'වසන්න',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'ඔබේ සෙවීම කිසිදු පදයක් හා නොගැළපේ.',
@@ -20358,6 +21819,7 @@ $1:උදාහරණ.jpg| 2 යටි ලියමන',
 	'wikieditor-toolbar-characters-page-greek' => 'ග්‍රීක අක්ෂර',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'සිරිලික් අක්ෂර',
 	'wikieditor-toolbar-characters-page-arabic' => 'අරාබි අක්ෂර',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'අරාබි දීර්ඝ කල',
 	'wikieditor-toolbar-characters-page-persian' => 'පර්සියානු',
 	'wikieditor-toolbar-characters-page-hebrew' => 'හෙබ්‍රෙව් අක්ෂර',
 	'wikieditor-toolbar-characters-page-bangla' => 'බංග්ලා',
@@ -20390,7 +21852,7 @@ $1:උදාහරණ.jpg| 2 යටි ලියමන',
 	'wikieditor-toolbar-help-content-ilink-description' => ' අභ්‍යන්තර සබැඳුම',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[පිටු මාතෘකාව|සබැඳුම් ලේබලය]]<br />[[පිටු මාතෘකාව]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>සබැඳුම් ලේබලය</a><br /><a href='#'>පිටු මාකෘකාව</a>",
-	'wikieditor-toolbar-help-content-xlink-description' => 'භාහිර සබැඳුම',
+	'wikieditor-toolbar-help-content-xlink-description' => 'බාහිර සබැඳුම',
 	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org සබැඳුම් ලේබලය]<br />[http://www.example.org]<br />http://www.example.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='භාහිර'>සබැඳුම් ලේබලය</a><br /><a href='#' class='භාහිර ස්වයංක්‍රීය අංකය'>[1]</a><br /><a href='#' class='භාහිර'>http://www.example.org</a>",
 	'wikieditor-toolbar-help-content-heading2-description' => '2 වෙනි මට්ටමේ ශීර්ෂය',
@@ -20405,10 +21867,10 @@ $1:උදාහරණ.jpg| 2 යටි ලියමන',
 	'wikieditor-toolbar-help-content-heading5-description' => '5 වෙනි මට්ටමේ ශීර්ෂය',
 	'wikieditor-toolbar-help-content-heading5-syntax' => '=====ශීර්ෂ පෙළ=====',
 	'wikieditor-toolbar-help-content-heading5-result' => '<h5>ශීර්ෂ පෙළ</h5>',
-	'wikieditor-toolbar-help-content-ulist-description' => 'රටා යෙදූ ලැයිස්තුව',
+	'wikieditor-toolbar-help-content-ulist-description' => 'බුලට් යෙදූ ලැයිස්තුව',
 	'wikieditor-toolbar-help-content-ulist-syntax' => '* ලැයිස්තු අයිතමය<br />* ලැයිස්තු අයිතමය',
 	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>ලැයිස්තු අයිතමය</li><li>ලැයිස්තු අයිතමය</li></ul>',
-	'wikieditor-toolbar-help-content-olist-description' => 'අංකිත ලැයිස්තුව',
+	'wikieditor-toolbar-help-content-olist-description' => 'අංක යෙදූ ලැයිස්තුව',
 	'wikieditor-toolbar-help-content-olist-syntax' => '# ලැයිස්තු අයිතමය<br /># ලැයිස්තු අයිතමය',
 	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>ලැයිස්තු අයිතමය</li><li>ලැයිස්තු අයිතමය</li></ol>',
 	'wikieditor-toolbar-help-content-file-description' => 'කා වැද්දූ ගොනුව',
@@ -20576,7 +22038,6 @@ $1:Príklad.jpg|Popis2',
 	'wikieditor-toolbar-tool-replace-case' => 'Na veľkosti písmen záleží',
 	'wikieditor-toolbar-tool-replace-regex' => 'Vyhľadávací reťazec je regulárny výraz',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Nájsť ďalší',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Nahradiť ďalší',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Nahradiť všetky',
 	'wikieditor-toolbar-tool-replace-close' => 'Zatvoriť',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Vyhľadávanie nenašlo vyhovujúce položky.',
@@ -20726,7 +22187,7 @@ $messages['sl'] = array(
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Neveljaven naslov',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Zunanja povezava',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Preverjanje obstoja strani ...',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Naslov, ki ste ga navedli ni veljaven.',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Navedeni naslov ni veljaven.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Navedeni URL izgleda kot povezava na drugo wikistran. Ali jo želite narediti notranjo povezavo?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Notranja povezava',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Zunanja povezava',
@@ -20807,7 +22268,7 @@ $1:Primer 2.jpg|Napis 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Ujemanje velikosti črk',
 	'wikieditor-toolbar-tool-replace-regex' => 'Obravnavaj iskalni niz kot regularni izraz',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Najdi naslednje',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Zamenjaj naslednje',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Zamenjaj',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zamenjaj vse',
 	'wikieditor-toolbar-tool-replace-close' => 'Zapri',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Vaše iskanje s ne ujema z ničemur.',
@@ -20822,6 +22283,7 @@ $1:Primer 2.jpg|Napis 2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grški',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Cirilica',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabski',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Razširjena arabščina',
 	'wikieditor-toolbar-characters-page-persian' => 'Perzijski',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebrejski',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalščina',
@@ -21038,7 +22500,6 @@ $messages['sq'] = array(
 	'wikieditor-toolbar-tool-replace-case' => 'Vërejë shkronjat e mëdha dhe të vogëla',
 	'wikieditor-toolbar-tool-replace-regex' => 'Trajtoni vargun e kërkimit si një shprehje të rregullt',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Kërko tjëter',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Zëvendëse tjëter',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zëvendësojnë të gjitha',
 	'wikieditor-toolbar-tool-replace-close' => 'Mbylle',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Nuk ka rezultate që përputhen me kërkesën.',
@@ -21125,7 +22586,7 @@ $messages['sq'] = array(
 	'wikieditor-toolbar-help-content-indent-result' => 'Tekst normal<dl><dd>Tekst me kryeradhë<dl><dd>Tekst me kryeradhë</dd></dl></dd></dl>',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (‪Српски (ћирилица)‬)
  * @author Charmed94
  * @author Helios13
  * @author McDutchie
@@ -21138,46 +22599,52 @@ $messages['sr-ec'] = array(
 	'wikieditor' => 'Напредно сучеље уређивања викитекста',
 	'wikieditor-wikitext-tab' => 'Викитекст',
 	'wikieditor-loading' => 'Учитавање',
+	'wikieditor-preview-preference' => 'Омогући упоредни преглед',
 	'wikieditor-preview-tab' => 'Претпреглед',
 	'wikieditor-preview-changes-tab' => 'Измене',
 	'wikieditor-preview-loading' => 'Учитавам…',
-	'wikieditor-previewDialog-tab' => 'Претпреглед',
+	'wikieditor-previewDialog-preference' => 'Омогући прозорче за преглед',
+	'wikieditor-previewDialog-tab' => 'Преглед',
 	'wikieditor-previewDialog-loading' => 'Учитавам…',
 	'wikieditor-publish-preference' => 'Омогући постепено објављивање',
 	'wikieditor-publish-button-publish' => 'Објави',
 	'wikieditor-publish-button-cancel' => 'Откажи',
 	'wikieditor-publish-dialog-title' => 'Објави на {{SITENAME}}',
 	'wikieditor-publish-dialog-summary' => 'Опис измене (укратко опишите шта сте изменили):',
-	'wikieditor-publish-dialog-minor' => 'Мала измена',
+	'wikieditor-publish-dialog-minor' => 'Мања измена',
 	'wikieditor-publish-dialog-watch' => 'Надгледај ову страницу',
 	'wikieditor-publish-dialog-publish' => 'Објави',
 	'wikieditor-publish-dialog-goback' => 'Врати се',
+	'wikieditor-template-editor-preference' => 'Омогући уређивање вики-шаблона преко обрасца',
 	'wikieditor-template-editor-dialog-title' => 'Измени шаблон',
 	'wikieditor-template-editor-dialog-submit' => 'Ажурирај',
 	'wikieditor-template-editor-dialog-cancel' => 'Откажи',
 	'wikieditor-templates-preference' => 'Омогућава размотавање шаблона',
 	'wikieditor-toc-preference' => 'Омогући навигациону табелу садржаја',
-	'wikieditor-toc-show' => 'Покажи садржај',
+	'wikieditor-toc-show' => 'Прикажи садржај',
 	'wikieditor-toc-hide' => 'Сакриј садржај',
-	'wikieditor-toolbar' => 'Уређивање алатнице',
-	'wikieditor-toolbar-preference' => 'Омогући проширено уређивање алатнице',
+	'wikieditor-toolbar' => 'Алатна трака за уређивање',
+	'wikieditor-toolbar-desc' => 'Алатна трака за уређивање с побољшаном употребљивошћу',
+	'wikieditor-toolbar-preference' => 'Омогући побољшану траку за уређивање',
+	'wikieditor-toolbar-dialogs-preference' => 'Омогући прозорчад за убацивање веза, табела и више',
+	'wikieditor-toolbar-hidesig' => 'Сакриј дугме за потпис на страницама у главном именском простору',
 	'wikieditor-toolbar-loading' => 'Учитавам…',
-	'wikieditor-toolbar-tool-bold' => 'Подебљан',
+	'wikieditor-toolbar-tool-bold' => 'Подебљано',
 	'wikieditor-toolbar-tool-bold-example' => 'Подебљан текст',
 	'wikieditor-toolbar-tool-italic' => 'Курзив',
-	'wikieditor-toolbar-tool-italic-example' => 'Курзив',
+	'wikieditor-toolbar-tool-italic-example' => 'Искошени текст',
 	'wikieditor-toolbar-tool-ilink' => 'Унутрашња веза',
 	'wikieditor-toolbar-tool-ilink-example' => 'Наслов везе',
-	'wikieditor-toolbar-tool-xlink' => 'Спољашња веза (не заборавите http:// префикс)',
-	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com наслов везе',
+	'wikieditor-toolbar-tool-xlink' => "Спољна веза (с предметком ''http://'')",
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.primer.com наслов везе',
 	'wikieditor-toolbar-tool-link' => 'Веза',
 	'wikieditor-toolbar-tool-link-title' => 'Убаци везу',
 	'wikieditor-toolbar-tool-link-int' => 'Према вики страници',
-	'wikieditor-toolbar-tool-link-int-target' => 'Наслов стране:',
+	'wikieditor-toolbar-tool-link-int-target' => 'Наслов странице:',
 	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Наслов странице или URL',
 	'wikieditor-toolbar-tool-link-int-text' => 'Текст везе:',
 	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Текст за приказ',
-	'wikieditor-toolbar-tool-link-ext' => 'Према спољашњој интернет страници',
+	'wikieditor-toolbar-tool-link-ext' => 'Према спољној страници',
 	'wikieditor-toolbar-tool-link-ext-target' => 'Адреса везе:',
 	'wikieditor-toolbar-tool-link-ext-text' => 'Текст везе:',
 	'wikieditor-toolbar-tool-link-insert' => 'Убаци везу',
@@ -21187,51 +22654,52 @@ $messages['sr-ec'] = array(
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Неисправан наслов',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => 'Спољашња веза',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'Провера постојања странице...',
-	'wikieditor-toolbar-tool-link-int-invalid' => 'Наслов који сте изабрали није валидан',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'Наведени наслов је неисправан.',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Спољашња веза коју сте унели изгледа као веза према другој вики страници. Да ли желите да је промените у унутрашњу везу?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Унутрашња веза',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Спољашња веза',
 	'wikieditor-toolbar-tool-link-empty' => 'Ниста унели ништа за повезивање.',
-	'wikieditor-toolbar-tool-file' => 'Слика',
+	'wikieditor-toolbar-tool-file' => 'Уграђена датотека',
 	'wikieditor-toolbar-tool-file-example' => 'Пример.jpg',
-	'wikieditor-toolbar-tool-reference' => 'Референца',
-	'wikieditor-toolbar-tool-reference-example' => 'Унесите текст фусноте овде',
+	'wikieditor-toolbar-tool-reference' => 'Навод',
+	'wikieditor-toolbar-tool-reference-example' => 'Овде унесите текст фусноте',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Откажи',
 	'wikieditor-toolbar-tool-reference-title' => 'Убаци референцу',
 	'wikieditor-toolbar-tool-reference-insert' => 'Убаци',
-	'wikieditor-toolbar-tool-reference-text' => 'Референца',
-	'wikieditor-toolbar-tool-signature' => 'Потпис са тренутним временом',
+	'wikieditor-toolbar-tool-reference-text' => 'Текст навода',
+	'wikieditor-toolbar-tool-signature' => 'Потпис с тренутним временом',
 	'wikieditor-toolbar-section-advanced' => 'Напредно',
-	'wikieditor-toolbar-tool-heading' => 'Одељак',
+	'wikieditor-toolbar-tool-heading' => 'Наслов',
 	'wikieditor-toolbar-tool-heading-1' => 'Ниво 1',
 	'wikieditor-toolbar-tool-heading-2' => 'Ниво 2',
 	'wikieditor-toolbar-tool-heading-3' => 'Ниво 3',
 	'wikieditor-toolbar-tool-heading-4' => 'Ниво 4',
 	'wikieditor-toolbar-tool-heading-5' => 'Ниво 5',
-	'wikieditor-toolbar-tool-heading-example' => 'Текст одељка',
-	'wikieditor-toolbar-group-format' => 'Формат',
-	'wikieditor-toolbar-tool-ulist' => 'Попис с ознакама',
+	'wikieditor-toolbar-tool-heading-example' => 'Текст наслова',
+	'wikieditor-toolbar-group-format' => 'Облик',
+	'wikieditor-toolbar-tool-ulist' => 'Списак с ознакама',
 	'wikieditor-toolbar-tool-ulist-example' => 'Ставка пописа с ознакама',
-	'wikieditor-toolbar-tool-olist' => 'Нумерисана листа',
-	'wikieditor-toolbar-tool-olist-example' => 'Ставка нумерисаног пописа',
+	'wikieditor-toolbar-tool-olist' => 'Нумерисани списак',
+	'wikieditor-toolbar-tool-olist-example' => 'Ставка нумерисаног списка',
 	'wikieditor-toolbar-tool-indent' => 'Увучени ред',
-	'wikieditor-toolbar-tool-indent-example' => 'Увучена линија',
+	'wikieditor-toolbar-tool-indent-example' => 'Увучени ред',
 	'wikieditor-toolbar-tool-nowiki' => 'Без вики обликовања',
 	'wikieditor-toolbar-tool-nowiki-example' => 'Убаците необликован текст овде',
 	'wikieditor-toolbar-tool-redirect' => 'Преусмерење',
-	'wikieditor-toolbar-tool-big' => 'Велик',
-	'wikieditor-toolbar-tool-big-example' => 'Велик текст',
-	'wikieditor-toolbar-tool-small' => 'Мали',
+	'wikieditor-toolbar-tool-redirect-example' => 'Име циљне странице',
+	'wikieditor-toolbar-tool-big' => 'Велико',
+	'wikieditor-toolbar-tool-big-example' => 'Велики текст',
+	'wikieditor-toolbar-tool-small' => 'Мало',
 	'wikieditor-toolbar-tool-small-example' => 'Мали текст',
-	'wikieditor-toolbar-tool-superscript' => 'Натпис',
-	'wikieditor-toolbar-tool-superscript-example' => 'Текст натписа',
-	'wikieditor-toolbar-tool-subscript' => 'Натпис',
-	'wikieditor-toolbar-tool-subscript-example' => 'Текст натписа',
+	'wikieditor-toolbar-tool-superscript' => 'Експонент',
+	'wikieditor-toolbar-tool-superscript-example' => 'Текст експонента',
+	'wikieditor-toolbar-tool-subscript' => 'Индекс',
+	'wikieditor-toolbar-tool-subscript-example' => 'Текст индекса',
 	'wikieditor-toolbar-group-insert' => 'Убаци',
 	'wikieditor-toolbar-tool-gallery' => 'Галерија слика',
 	'wikieditor-toolbar-tool-gallery-example' => '$1:пример1.jpg|Наслов1
 $1:пример2.jpg|Наслов2',
-	'wikieditor-toolbar-tool-newline' => 'Нова линија',
+	'wikieditor-toolbar-tool-newline' => 'Нови ред',
 	'wikieditor-toolbar-tool-table' => 'Табела',
 	'wikieditor-toolbar-tool-table-example-old' => '-
 ! наслов 1
@@ -21245,18 +22713,20 @@ $1:пример2.jpg|Наслов2',
 | ред 2, ћелија 1
 | ред 2, ћелија 2
 | ред 2, ћелија 3',
-	'wikieditor-toolbar-tool-table-example-cell-text' => 'Ред $1, ћелија $2',
-	'wikieditor-toolbar-tool-table-example-header' => 'Текст одељка',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Текст ћелије',
+	'wikieditor-toolbar-tool-table-example-header' => 'Текст наслова',
 	'wikieditor-toolbar-tool-table-title' => 'Убаци табелу',
-	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Редови',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Редова',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Колона',
-	'wikieditor-toolbar-tool-table-dimensions-header' => 'Додај ред заглавља',
-	'wikieditor-toolbar-tool-table-wikitable' => 'Стил са оквирима',
-	'wikieditor-toolbar-tool-table-sortable' => 'Могућност сортирања табеле',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Додај насловни ред',
+	'wikieditor-toolbar-tool-table-wikitable' => 'Стил с границама',
+	'wikieditor-toolbar-tool-table-sortable' => 'Сврставање табеле',
 	'wikieditor-toolbar-tool-table-example' => 'Пример',
 	'wikieditor-toolbar-tool-table-preview' => 'Преглед',
 	'wikieditor-toolbar-tool-table-insert' => 'Убаци',
 	'wikieditor-toolbar-tool-table-cancel' => 'Откажи',
+	'wikieditor-toolbar-tool-table-example-text' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod.',
+	'wikieditor-toolbar-tool-table-toomany' => 'Не можете да убацујете табеле с више од $1 ћелија с овим прозорчетом.',
 	'wikieditor-toolbar-tool-table-invalidnumber' => 'Нисте унели валидан број редова и колона',
 	'wikieditor-toolbar-tool-table-zero' => 'Не можете да унесете табелу са 0 редова или колона.',
 	'wikieditor-toolbar-tool-replace' => 'Тражи и замени',
@@ -21266,7 +22736,7 @@ $1:пример2.jpg|Наслов2',
 	'wikieditor-toolbar-tool-replace-case' => 'Пази на величину слова',
 	'wikieditor-toolbar-tool-replace-regex' => 'Поступи с нитима за претрагу као с обичним изразима',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Нађи следеће',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замени следеће',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Замени',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замени све',
 	'wikieditor-toolbar-tool-replace-close' => 'Затвори',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Претрага није пронашла резултате.',
@@ -21277,88 +22747,106 @@ $1:пример2.jpg|Наслов2',
 	'wikieditor-toolbar-characters-page-latin' => 'латиница',
 	'wikieditor-toolbar-characters-page-latinextended' => 'проширена латиница',
 	'wikieditor-toolbar-characters-page-ipa' => 'ИПА',
-	'wikieditor-toolbar-characters-page-symbols' => 'Симболи',
+	'wikieditor-toolbar-characters-page-symbols' => 'симболи',
 	'wikieditor-toolbar-characters-page-greek' => 'грчки',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'ћирилица',
 	'wikieditor-toolbar-characters-page-arabic' => 'арапски',
-	'wikieditor-toolbar-characters-page-persian' => 'Персијски',
-	'wikieditor-toolbar-characters-page-hebrew' => 'јеврејско',
-	'wikieditor-toolbar-characters-page-bangla' => 'Бангла',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'проширени арапски',
+	'wikieditor-toolbar-characters-page-persian' => 'персијски',
+	'wikieditor-toolbar-characters-page-hebrew' => 'хебрејски',
+	'wikieditor-toolbar-characters-page-bangla' => 'бенгалски',
 	'wikieditor-toolbar-characters-page-telugu' => 'телугу',
-	'wikieditor-toolbar-characters-page-sinhala' => 'Синхала',
-	'wikieditor-toolbar-characters-page-gujarati' => 'Гуџарати',
-	'wikieditor-toolbar-characters-page-thai' => 'Тајландски',
-	'wikieditor-toolbar-characters-page-lao' => 'Лаоски',
-	'wikieditor-toolbar-characters-page-khmer' => 'Кмерски',
+	'wikieditor-toolbar-characters-page-sinhala' => 'синхалски',
+	'wikieditor-toolbar-characters-page-gujarati' => 'гуџарати',
+	'wikieditor-toolbar-characters-page-thai' => 'тајландски',
+	'wikieditor-toolbar-characters-page-lao' => 'лаоски',
+	'wikieditor-toolbar-characters-page-khmer' => 'кмерски',
 	'wikieditor-toolbar-section-help' => 'Помоћ',
 	'wikieditor-toolbar-help-heading-description' => 'Опис',
 	'wikieditor-toolbar-help-heading-syntax' => 'Шта куцате',
-	'wikieditor-toolbar-help-heading-result' => 'Шта добијете',
+	'wikieditor-toolbar-help-heading-result' => 'Шта добијате',
 	'wikieditor-toolbar-help-page-format' => 'Обликовање',
 	'wikieditor-toolbar-help-page-link' => 'Везе',
 	'wikieditor-toolbar-help-page-heading' => 'Наслови',
 	'wikieditor-toolbar-help-page-list' => 'Спискови',
 	'wikieditor-toolbar-help-page-file' => 'Датотеке',
-	'wikieditor-toolbar-help-page-reference' => 'Референце',
+	'wikieditor-toolbar-help-page-reference' => 'Наводи',
 	'wikieditor-toolbar-help-page-discussion' => 'Разговор',
-	'wikieditor-toolbar-help-content-italic-description' => 'Курзив',
-	'wikieditor-toolbar-help-content-italic-syntax' => "''Курзиван текст''",
-	'wikieditor-toolbar-help-content-italic-result' => '<em>Текст у курзиву</em>',
+	'wikieditor-toolbar-help-content-italic-description' => 'Искошено',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''Искошени текст''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>Искошени текст</em>',
 	'wikieditor-toolbar-help-content-bold-description' => 'Подебљано',
 	'wikieditor-toolbar-help-content-bold-syntax' => "'''Подебљани текст'''",
-	'wikieditor-toolbar-help-content-bold-result' => '<strong>Подебљан текст</strong>',
-	'wikieditor-toolbar-help-content-bolditalic-description' => 'Подебљано &amp; искошено',
-	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Подебљани &amp; искошени текст'''''",
-	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Подебљан &amp; искошен текст</em></strong>',
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>Подебљани текст</strong>',
+	'wikieditor-toolbar-help-content-bolditalic-description' => 'Подебљано и искошено',
+	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Подебљани и искошени текст'''''",
+	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Подебљани и искошени текст</em></strong>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'Унутрашња веза',
-	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Ознака везе</a><br /><a href='#'>Наслов странице</a>",
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[Наслов странице|Наслов везе]]<br />[[Наслов странице]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Назив везе</a><br /><a href='#'>Наслов странице</a>",
 	'wikieditor-toolbar-help-content-xlink-description' => 'Спољашња веза',
-	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.пример.org Наслов везе]<br />[http://www.пример.org]<br />http://www.пример.org',
-	'wikieditor-toolbar-help-content-heading2-description' => 'Одељак другог нивоа',
-	'wikieditor-toolbar-help-content-heading2-syntax' => '== Наслов одељка ==',
-	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Наслов одељка</h2>',
-	'wikieditor-toolbar-help-content-heading3-description' => 'Одељак трећег нивоа',
-	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Наслов одељка ===',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.primer.org Назив везе]<br />[http://www.primer.org]<br />http://www.primer.org',
+	'wikieditor-toolbar-help-content-heading2-description' => 'Наслов другог нивоа',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== Текст наслова ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>Текст наслова</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'Наслов трећег нивоа',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== Текст наслова ===',
 	'wikieditor-toolbar-help-content-heading3-result' => '<h3>Наслов одељка</h3>',
-	'wikieditor-toolbar-help-content-heading4-description' => 'Одељак четвртог нивоа',
-	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Наслов одељка ====',
+	'wikieditor-toolbar-help-content-heading4-description' => 'Наслов четвртог нивоа',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== Текст наслова ====',
 	'wikieditor-toolbar-help-content-heading4-result' => '<h4>Наслов одељка</h4>',
-	'wikieditor-toolbar-help-content-heading5-description' => 'Одељак петог нивоа',
-	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Наслов одељка =====',
+	'wikieditor-toolbar-help-content-heading5-description' => 'Наслов петог нивоа',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Текст наслова =====',
 	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Наслов одељка</h5>',
-	'wikieditor-toolbar-help-content-ulist-description' => 'Попис с ознакама',
-	'wikieditor-toolbar-help-content-olist-description' => 'Нумерисана листа',
-	'wikieditor-toolbar-help-content-file-description' => 'Слика',
-	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Примјер.png|thumb|Назив слике]]',
-	'wikieditor-toolbar-help-content-reference-description' => 'Референце',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Списак с ознакама',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* Ставка<br />* Ставка',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>Ставка</li><li>Ставка</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'Нумерисани списак',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# Ставка<br /># Ставка',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>Ставка</li><li>Ставка</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'Уграђена датотека',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Пример.png|thumb|Описни текст]]',
+	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='Опис' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='Повећај' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>Опис</div></div>",
+	'wikieditor-toolbar-help-content-reference-description' => 'Навод',
+	'wikieditor-toolbar-help-content-reference-syntax' => 'Текст странице.&lt;ref name="test"&gt;[http://www.primer.org Текст везе], додатни текст.&lt;/ref&gt;',
 	'wikieditor-toolbar-help-content-reference-result' => "Текст странице.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-rereference-description' => 'Додатна употреба исте референце',
+	'wikieditor-toolbar-help-content-rereference-description' => 'Додатна употреба истог навода',
+	'wikieditor-toolbar-help-content-rereference-syntax' => '&lt;ref name="проба" /&gt;',
 	'wikieditor-toolbar-help-content-rereference-result' => "Текст странице.<sup><a href='#'>[1]</a></sup>",
-	'wikieditor-toolbar-help-content-showreferences-description' => 'Прикажи референце',
+	'wikieditor-toolbar-help-content-showreferences-description' => 'Прикажи наводе',
+	'wikieditor-toolbar-help-content-showreferences-syntax' => '&lt;наводи /&gt;',
+	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.primer.org' class='external text' href='#'>Текст везе</a>, додатни текст.</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Потпис с тренутним временом',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Корисник</a> (<a href='#' title='{{#special:mytalk}}'>разговор</a>) 15:54, 10. јун 2009. (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'Потпис',
-	'wikieditor-toolbar-help-content-indent-description' => 'Урез',
-	'wikieditor-toolbar-help-content-indent-syntax' => 'Нормалан текст<br />:Увучен текст<br />::Увучен текст',
-	'wikieditor-toolbar-help-content-indent-result' => 'Обичан текст<dl><dd>Увучени текст<dl><dd>Увучени текст</dd></dl></dd></dl>',
+	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>Корисничко име</a> (<a href='#' title='{{#special:mytalk}}'>разговор</a>)",
+	'wikieditor-toolbar-help-content-indent-description' => 'Увлачење',
+	'wikieditor-toolbar-help-content-indent-syntax' => 'Обични текст<br />:Увучени текст<br />::Увучени текст',
+	'wikieditor-toolbar-help-content-indent-result' => 'Обични текст<dl><dd>Увучени текст<dl><dd>Увучени текст</dd></dl></dd></dl>',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (‪Srpski (latinica)‬)
  * @author Liangent
  * @author McDutchie
  * @author Rancher
  * @author Жељко Тодоровић
  */
 $messages['sr-el'] = array(
+	'wikieditor' => 'Napredno sučelje uređivanja vikiteksta',
 	'wikieditor-wikitext-tab' => 'Vikitekst',
 	'wikieditor-loading' => 'Učitavanje',
 	'wikieditor-preview-tab' => 'Pretpregled',
+	'wikieditor-preview-changes-tab' => 'Izmene',
 	'wikieditor-preview-loading' => 'Učitavanje...',
+	'wikieditor-previewDialog-tab' => 'Pregled',
 	'wikieditor-previewDialog-loading' => 'Učitavanje...',
+	'wikieditor-publish-preference' => 'Omogući postepeno objavljivanje',
 	'wikieditor-publish-button-publish' => 'Objavi',
 	'wikieditor-publish-button-cancel' => 'Otkaži',
+	'wikieditor-publish-dialog-title' => 'Objavi na {{SITENAME}}',
 	'wikieditor-publish-dialog-summary' => 'Opis izmene (ukratko opišite šta ste izmenili):',
 	'wikieditor-publish-dialog-minor' => 'Mala izmena',
+	'wikieditor-publish-dialog-watch' => 'Nadgledaj ovu stranicu',
 	'wikieditor-publish-dialog-publish' => 'Objavi',
 	'wikieditor-publish-dialog-goback' => 'Vrati se',
 	'wikieditor-template-editor-dialog-title' => 'Izmeni šablon',
@@ -21368,6 +22856,8 @@ $messages['sr-el'] = array(
 	'wikieditor-toc-preference' => 'Omogući navigacionu tabelu sadržaja',
 	'wikieditor-toc-show' => 'Pokaži sadržaj',
 	'wikieditor-toc-hide' => 'Sakrij sadržaj',
+	'wikieditor-toolbar' => 'Alatna traka za uređivanje',
+	'wikieditor-toolbar-preference' => 'Omogući poboljšanu traku za uređivanje',
 	'wikieditor-toolbar-loading' => 'Učitavanje...',
 	'wikieditor-toolbar-tool-bold' => 'Podebljan',
 	'wikieditor-toolbar-tool-bold-example' => 'Podebljan tekst',
@@ -21379,9 +22869,12 @@ $messages['sr-el'] = array(
 	'wikieditor-toolbar-tool-xlink-example' => '<a href="http://www.example.com">http://www.example.com</a> naslov veze',
 	'wikieditor-toolbar-tool-link' => 'Veza',
 	'wikieditor-toolbar-tool-link-title' => 'Ubaci vezu',
+	'wikieditor-toolbar-tool-link-int' => 'Prema viki stranici',
 	'wikieditor-toolbar-tool-link-int-target' => 'Naslov strane:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'Naslov stranice ili URL',
 	'wikieditor-toolbar-tool-link-int-text' => 'Tekst veze:',
 	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'Tekst za prikaz',
+	'wikieditor-toolbar-tool-link-ext' => 'Prema spoljnoj stranici',
 	'wikieditor-toolbar-tool-link-ext-target' => 'Putanja veze (URL):',
 	'wikieditor-toolbar-tool-link-ext-text' => 'Tekst veze:',
 	'wikieditor-toolbar-tool-link-insert' => 'Ubaci vezu',
@@ -21395,12 +22888,15 @@ $messages['sr-el'] = array(
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'Spoljašnja veza koju ste uneli izgleda kao veza prema drugoj viki stranici. Da li želite da je promenite u unutrašnju vezu?',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'Unutrašnja veza',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'Spoljašnja veza',
+	'wikieditor-toolbar-tool-link-empty' => 'Nista uneli ništa za povezivanje.',
+	'wikieditor-toolbar-tool-file' => 'Ugrađena datoteka',
 	'wikieditor-toolbar-tool-file-example' => 'Primer.jpg',
 	'wikieditor-toolbar-tool-reference' => 'Referenca',
 	'wikieditor-toolbar-tool-reference-example' => 'Unesite tekst fusnote ovde',
 	'wikieditor-toolbar-tool-reference-cancel' => 'Otkaži',
 	'wikieditor-toolbar-tool-reference-title' => 'Ubaci referencu',
 	'wikieditor-toolbar-tool-reference-insert' => 'Ubaci',
+	'wikieditor-toolbar-tool-reference-text' => 'Tekst navoda',
 	'wikieditor-toolbar-tool-signature' => 'Potpis sa trenutnim vremenom',
 	'wikieditor-toolbar-section-advanced' => 'Napredno',
 	'wikieditor-toolbar-tool-heading' => 'Odeljak',
@@ -21410,12 +22906,24 @@ $messages['sr-el'] = array(
 	'wikieditor-toolbar-tool-heading-4' => 'Nivo 4',
 	'wikieditor-toolbar-tool-heading-5' => 'Nivo 5',
 	'wikieditor-toolbar-tool-heading-example' => 'Tekst odeljka',
-	'wikieditor-toolbar-group-format' => 'Spisak',
+	'wikieditor-toolbar-group-format' => 'Oblik',
+	'wikieditor-toolbar-tool-ulist' => 'Spisak s oznakama',
+	'wikieditor-toolbar-tool-ulist-example' => 'Stavka popisa s oznakama',
+	'wikieditor-toolbar-tool-olist' => 'Numerisani spisak',
+	'wikieditor-toolbar-tool-olist-example' => 'Stavka numerisanog spiska',
+	'wikieditor-toolbar-tool-indent' => 'Uvučeni red',
+	'wikieditor-toolbar-tool-indent-example' => 'Uvučeni red',
+	'wikieditor-toolbar-tool-nowiki' => 'Bez viki oblikovanja',
+	'wikieditor-toolbar-tool-nowiki-example' => 'Ubacite neoblikovan tekst ovde',
 	'wikieditor-toolbar-tool-redirect' => 'Preusmerenje',
 	'wikieditor-toolbar-tool-big' => 'Velik',
 	'wikieditor-toolbar-tool-big-example' => 'Velik tekst',
 	'wikieditor-toolbar-tool-small' => 'Mali',
 	'wikieditor-toolbar-tool-small-example' => 'Mali tekst',
+	'wikieditor-toolbar-tool-superscript' => 'Eksponent',
+	'wikieditor-toolbar-tool-superscript-example' => 'Tekst eksponenta',
+	'wikieditor-toolbar-tool-subscript' => 'Indeks',
+	'wikieditor-toolbar-tool-subscript-example' => 'Tekst indeksa',
 	'wikieditor-toolbar-group-insert' => 'Ubaci',
 	'wikieditor-toolbar-tool-gallery' => 'Galerija slika',
 	'wikieditor-toolbar-tool-gallery-example' => '$1:primer1.jpg|Naslov1
@@ -21434,17 +22942,19 @@ $1:primer2.jpg|Naslov2',
 | red 2, ćelija 1
 | red 2, ćelija 2
 | red 2, ćelija 3',
-	'wikieditor-toolbar-tool-table-example-cell-text' => 'Red $1, ćelija $2',
-	'wikieditor-toolbar-tool-table-example-header' => 'Red $1, ćelija $2 (naslov)',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'Tekst ćelije',
+	'wikieditor-toolbar-tool-table-example-header' => 'Tekst naslova',
 	'wikieditor-toolbar-tool-table-title' => 'Ubaci tabelu',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Redovi',
 	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Kolona',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'Dodaj naslovni red',
 	'wikieditor-toolbar-tool-table-wikitable' => 'Stil sa okvirima',
 	'wikieditor-toolbar-tool-table-sortable' => 'Mogućnost sortiranja tabele',
-	'wikieditor-toolbar-tool-table-example' => 'Red $1, ćelija $2',
+	'wikieditor-toolbar-tool-table-example' => 'Primer',
 	'wikieditor-toolbar-tool-table-preview' => 'Pregled',
 	'wikieditor-toolbar-tool-table-insert' => 'Ubaci',
 	'wikieditor-toolbar-tool-table-cancel' => 'Otkaži',
+	'wikieditor-toolbar-tool-table-example-text' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod.',
 	'wikieditor-toolbar-tool-table-invalidnumber' => 'Niste uneli validan broj redova i kolona',
 	'wikieditor-toolbar-tool-table-zero' => 'Ne možete da unesete tabelu sa 0 redova ili kolona.',
 	'wikieditor-toolbar-tool-replace' => 'Traži i zameni',
@@ -21452,12 +22962,14 @@ $1:primer2.jpg|Naslov2',
 	'wikieditor-toolbar-tool-replace-search' => 'Traži:',
 	'wikieditor-toolbar-tool-replace-replace' => 'Zameni sa:',
 	'wikieditor-toolbar-tool-replace-case' => 'Pazi na veličinu slova',
+	'wikieditor-toolbar-tool-replace-regex' => 'Postupi s nitima za pretragu kao s običnim izrazima',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Nađi sledeće',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Zameni sledeće',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Zameni sve',
 	'wikieditor-toolbar-tool-replace-close' => 'Zatvori',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'Pretraga nije pronašla rezultate.',
 	'wikieditor-toolbar-tool-replace-success' => 'Napravljenih zamena: $1.',
 	'wikieditor-toolbar-tool-replace-emptysearch' => 'Niste uneli ništa za pretragu.',
+	'wikieditor-toolbar-tool-replace-invalidregex' => 'Izraz koji ste uneli nije ispravan: $1',
 	'wikieditor-toolbar-section-characters' => 'Posebni znakovi',
 	'wikieditor-toolbar-characters-page-latin' => 'latinica',
 	'wikieditor-toolbar-characters-page-latinextended' => 'proširena latinica',
@@ -21466,10 +22978,16 @@ $1:primer2.jpg|Naslov2',
 	'wikieditor-toolbar-characters-page-greek' => 'grčki',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'ćirilica',
 	'wikieditor-toolbar-characters-page-arabic' => 'arapski',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'prošireni arapski',
+	'wikieditor-toolbar-characters-page-persian' => 'persijski',
 	'wikieditor-toolbar-characters-page-hebrew' => 'jevrejsko',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
 	'wikieditor-toolbar-characters-page-telugu' => 'telugu',
+	'wikieditor-toolbar-characters-page-sinhala' => 'sinhalski',
 	'wikieditor-toolbar-characters-page-gujarati' => 'Gudžarati',
+	'wikieditor-toolbar-characters-page-thai' => 'tajlandski',
+	'wikieditor-toolbar-characters-page-lao' => 'laoski',
+	'wikieditor-toolbar-characters-page-khmer' => 'kmerski',
 	'wikieditor-toolbar-section-help' => 'Pomoć',
 	'wikieditor-toolbar-help-heading-description' => 'Opis',
 	'wikieditor-toolbar-help-heading-syntax' => 'Šta kucate',
@@ -21491,6 +23009,7 @@ $1:primer2.jpg|Naslov2',
 	'wikieditor-toolbar-help-content-bolditalic-syntax' => "'''''Podebljani &amp; iskošeni tekst'''''",
 	'wikieditor-toolbar-help-content-bolditalic-result' => '<strong><em>Podebljan &amp; iskošen tekst</em></strong>',
 	'wikieditor-toolbar-help-content-ilink-description' => 'Unutrašnja veza',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>Naziv veze</a><br /><a href='#'>Naslov stranice</a>",
 	'wikieditor-toolbar-help-content-xlink-description' => 'Spoljašnja veza',
 	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.primer.org Naslov veze]<br />[http://www.primer.org]<br />http://www.primer.org',
 	'wikieditor-toolbar-help-content-heading2-description' => 'Odeljak drugog nivoa',
@@ -21505,13 +23024,23 @@ $1:primer2.jpg|Naslov2',
 	'wikieditor-toolbar-help-content-heading5-description' => 'Odeljak petog nivoa',
 	'wikieditor-toolbar-help-content-heading5-syntax' => '===== Naslov odeljka =====',
 	'wikieditor-toolbar-help-content-heading5-result' => '<h5>Naslov odeljka</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'Spisak s oznakama',
 	'wikieditor-toolbar-help-content-olist-description' => 'Numerisana lista',
+	'wikieditor-toolbar-help-content-file-description' => 'Ugrađena datoteka',
 	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Primjer.png|thumb|Naziv slike]]',
 	'wikieditor-toolbar-help-content-reference-description' => 'Reference',
+	'wikieditor-toolbar-help-content-reference-result' => "Tekst stranice.<sup><a href='#'>[1]</a></sup>",
+	'wikieditor-toolbar-help-content-rereference-description' => 'Dodatna upotreba istog navoda',
+	'wikieditor-toolbar-help-content-rereference-syntax' => '&lt;ref name="proba" /&gt;',
+	'wikieditor-toolbar-help-content-rereference-result' => "Tekst stranice.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-showreferences-description' => 'Prikaži reference',
+	'wikieditor-toolbar-help-content-showreferences-syntax' => '&lt;navodi /&gt;',
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Potpis s trenutnim vremenom',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Korisnik</a> (<a href='#' title='{{#special:mytalk}}'>razgovor</a>) 15:54, 10. jun 2009. (UTC)",
 	'wikieditor-toolbar-help-content-signature-description' => 'Potpis',
+	'wikieditor-toolbar-help-content-indent-description' => 'Uvlačenje',
 	'wikieditor-toolbar-help-content-indent-syntax' => 'Normalan tekst<br />:Uvučen tekst<br />::Uvučen tekst',
+	'wikieditor-toolbar-help-content-indent-result' => 'Obični tekst<dl><dd>Uvučeni tekst<dl><dd>Uvučeni tekst</dd></dl></dd></dl>',
 );
 
 /** Seeltersk (Seeltersk) */
@@ -21644,7 +23173,6 @@ $1:Conto.jpg|Pedaran2',
 	'wikieditor-toolbar-tool-replace-replace' => 'Ganti ku:',
 	'wikieditor-toolbar-tool-replace-case' => 'Ciples gedé/leutikna',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Téangan salajengna',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Ganti salajengna',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ganti sadayana',
 	'wikieditor-toolbar-tool-replace-close' => 'Tutup',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Taya nu cocog jeung nu ditéang.',
@@ -21731,6 +23259,7 @@ $1:Conto.jpg|Pedaran2',
  * @author Hannibal
  * @author McDutchie
  * @author Sertion
+ * @author Warrakkk
  */
 $messages['sv'] = array(
 	'wikieditor' => 'Avancerat gränssnitt för redigering av wikitext',
@@ -21873,7 +23402,7 @@ $1:Exempel.jpg|Bildtext2',
 	'wikieditor-toolbar-tool-replace-case' => 'Skilj mellan små/stora bokstäver',
 	'wikieditor-toolbar-tool-replace-regex' => 'Behandla söksträngen som ett reguljärt uttryck',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Hitta nästa',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Ersätt nästa',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Ersätt',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ersätt alla',
 	'wikieditor-toolbar-tool-replace-close' => 'Stäng',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Sökningen gav inget resultat.',
@@ -21888,6 +23417,7 @@ $1:Exempel.jpg|Bildtext2',
 	'wikieditor-toolbar-characters-page-greek' => 'Grekiska',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kyrilliskt',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabiska',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Arabiska utökade',
 	'wikieditor-toolbar-characters-page-persian' => 'Persiska',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hebreiska',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengali',
@@ -22104,7 +23634,7 @@ Idadi ya mistari au ya safu si halali.',
 	'wikieditor-toolbar-tool-replace-case' => 'Oanisha herufi kwa ukubwa wake',
 	'wikieditor-toolbar-tool-replace-regex' => 'Fanya mtindo wa tafuta kama uonyesho wa kawaida',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Tafuta maandishi yajayo',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Badilisha maandishi yajayo',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Badilisha',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Badilisha yote',
 	'wikieditor-toolbar-tool-replace-close' => 'Funga',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Maandishi ulioyatafuta hayakupatikana.',
@@ -22119,6 +23649,7 @@ Idadi ya mistari au ya safu si halali.',
 	'wikieditor-toolbar-characters-page-greek' => 'Kigiriki',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kikyrili',
 	'wikieditor-toolbar-characters-page-arabic' => 'Kiarabu',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Kiarabu kilichoongezwa',
 	'wikieditor-toolbar-characters-page-persian' => 'Kiajemi',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Kiyahudi',
 	'wikieditor-toolbar-characters-page-bangla' => 'Kibangla',
@@ -22342,7 +23873,6 @@ $1:எடுத்துக்காட்டு.jpg|படவிளக்கம
 	'wikieditor-toolbar-tool-replace-case' => 'பெரிய / சிறிய எழுத்துப் பொருத்தம்',
 	'wikieditor-toolbar-tool-replace-regex' => 'தேடப்படும் சொற்றொடரை வழக்கமானதாக எடுத்துக்கொள்ளவும்',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'அடுத்ததை கண்டுபிடி',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'அடுத்ததை மாற்றவும்',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'எல்லாவற்றையும் மாற்றவும்',
 	'wikieditor-toolbar-tool-replace-close' => 'மூடுக',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'தங்களது தேடலுக்கான முடிவு எங்கும் ஒத்துவரவில்லை.',
@@ -22595,7 +24125,7 @@ $1:Example.jpg|ఉపశీర్షిక2',
 	'wikieditor-toolbar-help-content-ilink-description' => 'అంతర్గత లింకు',
 	'wikieditor-toolbar-help-content-ilink-syntax' => '[[పేజీ శీర్షిక|లింకు పాఠ్యం]]<br />[[పేజీ శీర్షిక]]',
 	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>లింకు పాఠ్యం</a><br /><a href='#'>పేజీ శీర్షిక</a>",
-	'wikieditor-toolbar-help-content-xlink-description' => 'బయటి లింకు',
+	'wikieditor-toolbar-help-content-xlink-description' => 'బయటి లంకె',
 	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org లింకుపాఠ్యం]<br />[http://www.example.org]<br />http://www.example.org',
 	'wikieditor-toolbar-help-content-xlink-result' => "<a href='#' class='external'>లంకె పాఠ్యం</a><br /><a href='#' class='external autonumber'>[1]</a><br /><a href='#' class='external'>http://www.example.org</a>",
 	'wikieditor-toolbar-help-content-heading2-description' => '2వ స్థాయి శీర్షిక',
@@ -22629,13 +24159,13 @@ $1:Example.jpg|ఉపశీర్షిక2',
 	'wikieditor-toolbar-help-content-signature-result' => "<a href='#' title='{{#special:mypage}}'>వాడుకరిపేరు</a> (<a href='#' title='{{#special:mytalk}}'>చర్చ</a>)",
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic)) */
+/** Tajik (Cyrillic script) (Тоҷикӣ) */
 $messages['tg-cyrl'] = array(
 	'wikieditor-toolbar-tool-link' => 'Пайванд',
 	'wikieditor-toolbar-tool-link-cancel' => 'Лағв',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -22786,7 +24316,6 @@ $1:Example.jpg|คำอธิบายภาพ2',
 	'wikieditor-toolbar-tool-replace-case' => 'ค้นหาโดยคำนึงถึงตัวพิมพ์เล็ก-ใหญ่',
 	'wikieditor-toolbar-tool-replace-regex' => 'ให้วลีค้นหาเป็นคำอธิบายทั่วไป',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'ค้นหาตัวต่อไป',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'แทนที่ตัวต่อไป',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'แทนที่ทั้งหมด',
 	'wikieditor-toolbar-tool-replace-close' => 'ปิด',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'สิ่งที่คุณค้นหาไม่ตรงกับสิ่งใดเลย',
@@ -23011,7 +24540,6 @@ $1:Example.jpg|Titr2',
 	'wikieditor-toolbar-tool-replace-case' => 'Baş-setir harpa duýgur',
 	'wikieditor-toolbar-tool-replace-regex' => 'Gözleg setirine adaty aňlatma hökmünde çemeleş',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Indikini tap',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Indikini çalşyr',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ählisini çalşyr',
 	'wikieditor-toolbar-tool-replace-close' => 'Ýap',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Gözlegiňiz hiçbir zada duşmady.',
@@ -23243,7 +24771,6 @@ $1:Halimbawa.jpg|Kapsyon2',
 	'wikieditor-toolbar-tool-replace-case' => 'Itugma sa uri ng sukat ng titik',
 	'wikieditor-toolbar-tool-replace-regex' => 'Ituring ang bagting ng paghahanap bilang isang pangkaraniwang pananalita',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Susunod na hahanapin',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Susunod na papalitan',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Palitang lahat',
 	'wikieditor-toolbar-tool-replace-close' => 'Isara',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Hindi tumugma sa anuman ang paghahanap mo.',
@@ -23338,7 +24865,9 @@ $messages['tpi'] = array(
 );
 
 /** Turkish (Türkçe)
+ * @author Emperyan
  * @author Joseph
+ * @author Koc61
  * @author Manco Capac
  * @author Srhat
  * @author Vito Genovese
@@ -23376,6 +24905,7 @@ $messages['tr'] = array(
 	'wikieditor-toolbar-desc' => 'Gelişmiş kullanılabilirlik ile sayfa araç çubuğunu değiştir',
 	'wikieditor-toolbar-preference' => 'Gelişmiş düzenleme araç çubuğunu etkinleştir',
 	'wikieditor-toolbar-dialogs-preference' => 'Bağlantılar, tablolar ve daha fazlasını eklemek için iletileri etkinleştir',
+	'wikieditor-toolbar-hidesig' => 'Ana ad boşluğundaki sayfalardan imzayı saklama tuşu',
 	'wikieditor-toolbar-loading' => 'Yükleniyor...',
 	'wikieditor-toolbar-tool-bold' => 'Kalın',
 	'wikieditor-toolbar-tool-bold-example' => 'Kalın yazı',
@@ -23483,7 +25013,6 @@ $1:Örnek.jpg|Resimyazısı2',
 	'wikieditor-toolbar-tool-replace-case' => 'Büyük-küçük harf duyarlı',
 	'wikieditor-toolbar-tool-replace-regex' => 'Arama dizesine bir düzenli ifade muamelesi yap',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Sonrakini bul',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Sonrakini değiştir',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Tümünü değiştir',
 	'wikieditor-toolbar-tool-replace-close' => 'Kapat',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Aramanız hiçbir şeyle uyuşmuyor.',
@@ -23498,6 +25027,7 @@ $1:Örnek.jpg|Resimyazısı2',
 	'wikieditor-toolbar-characters-page-greek' => 'Yunan',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kiril',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arapça',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Genişletilmiş Arapça',
 	'wikieditor-toolbar-characters-page-persian' => 'Farsça',
 	'wikieditor-toolbar-characters-page-hebrew' => 'İbranice',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bengalce',
@@ -23569,7 +25099,7 @@ $1:Örnek.jpg|Resimyazısı2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Normal metin<dl><dd>Girintili metin<dl><dd>Girintili metin</dd></dl></dd></dl>',
 );
 
-/** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic))
+/** Tatar (Cyrillic script) (Татарча)
  * @author Bulatbulat
  * @author Zahidulla
  * @author Ильнар
@@ -23715,7 +25245,6 @@ $1:Мисал.jpg|Тасвирлама2',
 	'wikieditor-toolbar-tool-replace-case' => 'Зурлыкны исәпләү',
 	'wikieditor-toolbar-tool-replace-regex' => 'Эзләү тасмасын гади иттереп билгеләргә',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Бирелгәнне эзләү',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Бирелгәнне алмаштыру',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Барысында алмаштыру',
 	'wikieditor-toolbar-tool-replace-close' => 'Ябу',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Сезнең соравыгыз буенча берни дә табылмады.',
@@ -23807,6 +25336,7 @@ $1:Мисал.jpg|Тасвирлама2',
 /** Ukrainian (Українська)
  * @author AS
  * @author Ahonc
+ * @author Dim Grits
  * @author Olvin
  * @author Prima klasy4na
  * @author Тест
@@ -23942,6 +25472,7 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-tool-table-preview' => 'Попередній перегляд',
 	'wikieditor-toolbar-tool-table-insert' => 'Вставити',
 	'wikieditor-toolbar-tool-table-cancel' => 'Скасувати',
+	'wikieditor-toolbar-tool-table-example-text' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod.',
 	'wikieditor-toolbar-tool-table-toomany' => 'Цей діалог не дозволяє вставити таблицю з більш ніж $1 комірок.',
 	'wikieditor-toolbar-tool-table-invalidnumber' => 'Ви не вказали необхідного числа рядків і стовпців.',
 	'wikieditor-toolbar-tool-table-zero' => 'Ви не можете вставити таблицю з нульовою кількістю рядків або стовпців.',
@@ -23952,7 +25483,7 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-tool-replace-case' => 'Враховувати регістр',
 	'wikieditor-toolbar-tool-replace-regex' => 'Вважати рядок пошуку регулярним виразом',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Знайти наступний',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Замінити наступний',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Замінити',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Замінити всі',
 	'wikieditor-toolbar-tool-replace-close' => 'Закрити',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'За Вашим запитом нічого не знайдено.',
@@ -23967,6 +25498,7 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-characters-page-greek' => 'Грецькі',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Кирилиця',
 	'wikieditor-toolbar-characters-page-arabic' => 'Арабські',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Арабська розширена',
 	'wikieditor-toolbar-characters-page-persian' => 'Перські',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Іврит',
 	'wikieditor-toolbar-characters-page-bangla' => 'Бенгальські',
@@ -24027,8 +25559,10 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-help-content-reference-syntax' => 'Текст сторінки&lt;ref name="test"&gt;[http://www.example.org Текст посилання], додатковий текст.&lt;/ref&gt;.',
 	'wikieditor-toolbar-help-content-reference-result' => "Текст сторінки.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-rereference-description' => 'Додаткове використання тієї ж виноски',
+	'wikieditor-toolbar-help-content-rereference-syntax' => '&lt;ref name="test" /&gt;',
 	'wikieditor-toolbar-help-content-rereference-result' => "Текст сторінки.<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-showreferences-description' => 'Показати виноски',
+	'wikieditor-toolbar-help-content-showreferences-syntax' => '&lt;references /&gt;',
 	'wikieditor-toolbar-help-content-showreferences-result' => "<ol class='references'><li id='cite_note-test-0'><b><a title='' href='#'>^</a></b> <a rel='nofollow' title='http://www.example.org' class='external text' href='#'>Текст посилання</a>, додатковий текст.</li></ol>",
 	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'Підпис з часовою міткою',
 	'wikieditor-toolbar-help-content-signaturetimestamp-result' => "<a href='#' title='{{#special:mypage}}'>Ім'я користувача</a> (<a href='#' title='{{#special:mytalk}}'>обговорення</a>) 15:54, 10 червня 2009 (UTC)",
@@ -24039,10 +25573,208 @@ $1:Example.jpg|Опис2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Звичайний текст<dl><dd>Текст з відступом<dl><dd>Текст з відступом</dd></dl></dd></dl>',
 );
 
-/** Urdu (اردو) */
+/** Urdu (اردو)
+ * @author محبوب عالم
+ */
 $messages['ur'] = array(
+	'wikieditor' => 'ویکی متن کی تدوین کیلئے پیش رفتہ سطح البین',
+	'wikieditor-desc' => 'ویکی متن کیلئے تدوینی مواجہہ اور کئی خدوخال دینے والے مطبقیات فراہم کرتا ہے۔',
+	'wikieditor-wikitext-tab' => 'ویکی متن',
+	'wikieditor-loading' => 'لَدرہا ہے',
+	'wikieditor-preview-preference' => 'پہلو بہ پہلو پیش منظر فعال کرو',
+	'wikieditor-preview-tab' => 'پیش منظر',
+	'wikieditor-preview-changes-tab' => 'تبدیلیاں',
+	'wikieditor-preview-loading' => 'لادرہا ہے۔۔',
+	'wikieditor-previewDialog-preference' => 'پیش منظر خانہ فعال کرو',
+	'wikieditor-previewDialog-tab' => 'پیش منظر',
+	'wikieditor-previewDialog-loading' => 'لادرہا ہے۔۔',
+	'wikieditor-publish-preference' => 'قدم بہ قدم شائع کاری فعال کرو',
+	'wikieditor-publish-button-publish' => 'شائع کرو',
+	'wikieditor-publish-button-cancel' => 'منسوخ',
+	'wikieditor-publish-dialog-title' => 'نشر بطرف {{SITENAME}}',
+	'wikieditor-publish-dialog-summary' => 'خلاصۂ تدوین (اپنی کی گئی تبدیلیوں کی مختصر وضاحت کریں):',
+	'wikieditor-publish-dialog-minor' => 'معمولی ترمیم',
+	'wikieditor-publish-dialog-watch' => 'یہ صفحہ زیرِنظر کریں',
+	'wikieditor-publish-dialog-publish' => 'شائع کرو',
+	'wikieditor-publish-dialog-goback' => 'پیچھے جاؤ',
+	'wikieditor-template-editor-preference' => 'ویکی سانچہ جات کا شکلبندی تدوین فعال کرو',
+	'wikieditor-template-editor-dialog-title' => 'سانچہ کی تدوین',
 	'wikieditor-template-editor-dialog-cancel' => 'منسوخ',
+	'wikieditor-templates-preference' => 'سانچہ کی تہدیم فعال کرو',
+	'wikieditor-toc-show' => 'مشتملات دکھاؤ',
+	'wikieditor-toc-hide' => 'مشتملات چھپاؤ',
+	'wikieditor-toolbar' => 'تدوینی اوزارتختہ',
+	'wikieditor-toolbar-preference' => 'افزودہ تدوینی اوزارتختہ فعال کرو',
+	'wikieditor-toolbar-dialogs-preference' => 'رابطو اور جدولوں وغیرہ کے ادخال کیلئے مکالمہ جات فعال کرو',
+	'wikieditor-toolbar-loading' => 'لَدرہا ہے۔۔',
+	'wikieditor-toolbar-tool-bold' => 'جلی',
+	'wikieditor-toolbar-tool-bold-example' => 'دبیز متن',
+	'wikieditor-toolbar-tool-italic' => 'ترچھا',
+	'wikieditor-toolbar-tool-italic-example' => 'ترچھا متن',
+	'wikieditor-toolbar-tool-ilink' => 'اندرونی ربط',
+	'wikieditor-toolbar-tool-ilink-example' => 'ربط کا عنوان',
+	'wikieditor-toolbar-tool-xlink' => 'بیرونی ربط (یاد رکھئے http:// prefix)',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com ربط کا عنوان',
+	'wikieditor-toolbar-tool-link' => 'ربط',
+	'wikieditor-toolbar-tool-link-title' => 'ربط داخل کرو',
+	'wikieditor-toolbar-tool-link-int' => 'ایک ویکی صفحہ کی طرف',
+	'wikieditor-toolbar-tool-link-int-target' => 'ہدف صفحہ یا پتہ:',
+	'wikieditor-toolbar-tool-link-int-target-tooltip' => 'عنوانِ صفحہ یا پتہ:',
+	'wikieditor-toolbar-tool-link-int-text' => 'ظاہر ہونے والا متن:',
+	'wikieditor-toolbar-tool-link-int-text-tooltip' => 'متن جو دِکھایا جائے گا',
+	'wikieditor-toolbar-tool-link-ext' => 'کسی بیرونی ویب صفحہ کی طرف',
+	'wikieditor-toolbar-tool-link-ext-target' => 'پتۂ ربط:',
+	'wikieditor-toolbar-tool-link-ext-text' => 'ربط کا متن:',
+	'wikieditor-toolbar-tool-link-insert' => 'ربط داخل کرو',
+	'wikieditor-toolbar-tool-link-cancel' => 'منسوخ',
+	'wikieditor-toolbar-tool-link-int-target-status-exists' => 'صفحہ موجود ہے',
+	'wikieditor-toolbar-tool-link-int-target-status-notexists' => 'صفحہ موجود نہیں ہے',
+	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'غلط عنوان',
+	'wikieditor-toolbar-tool-link-int-target-status-external' => 'بیرونی ربط',
+	'wikieditor-toolbar-tool-link-int-target-status-loading' => 'صفحہ کی موجودگی دیکھی جارہی ہے۔۔۔',
+	'wikieditor-toolbar-tool-link-int-invalid' => 'آپ کا داخل کردہ عنوان غلط ہے۔',
+	'wikieditor-toolbar-tool-link-lookslikeinternal' => 'آپ کا داخل کردہ پتے سے لگتا ہے کہ یہ دوسرے ویکی صفحہ کی طرف رابطے کیلئے تھا۔
+کیا آپ اِسے ایک اندرونی ربط بنانا چاہتے ہیں؟',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => 'اندرونی ربط',
+	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => 'بیرونی ربط',
+	'wikieditor-toolbar-tool-link-empty' => 'آپ نے ربط کیلئے کچھ داخل نہیں کیا۔',
+	'wikieditor-toolbar-tool-file' => 'پیوستہ ملف',
+	'wikieditor-toolbar-tool-file-example' => 'مثال.jpg',
+	'wikieditor-toolbar-tool-reference' => 'حوالہ',
+	'wikieditor-toolbar-tool-reference-example' => 'حاشیہ متن یہاں داخل کرو',
 	'wikieditor-toolbar-tool-reference-cancel' => 'منسوخ',
+	'wikieditor-toolbar-tool-reference-title' => 'حوالہ داخل کرو',
+	'wikieditor-toolbar-tool-reference-insert' => 'داخل کرو',
+	'wikieditor-toolbar-tool-reference-text' => 'حوالے کا متن',
+	'wikieditor-toolbar-tool-signature' => 'دستخط اور وقت کی مُہر',
+	'wikieditor-toolbar-section-advanced' => 'پیشرفتہ',
+	'wikieditor-toolbar-tool-heading' => 'سرنامہ',
+	'wikieditor-toolbar-tool-heading-1' => 'درجہ اوّل',
+	'wikieditor-toolbar-tool-heading-2' => 'درجہ دوم',
+	'wikieditor-toolbar-tool-heading-3' => 'درجہ سوم',
+	'wikieditor-toolbar-tool-heading-4' => 'درجہ چہارم',
+	'wikieditor-toolbar-tool-heading-5' => 'درجہ پنجم',
+	'wikieditor-toolbar-tool-heading-example' => 'سرنامے کا متن',
+	'wikieditor-toolbar-group-format' => 'شکلبند',
+	'wikieditor-toolbar-tool-ulist' => 'نقاطی فہرست',
+	'wikieditor-toolbar-tool-ulist-example' => 'نقاطی فہرست کی مَد',
+	'wikieditor-toolbar-tool-olist' => 'نمبرشدہ فہرست',
+	'wikieditor-toolbar-tool-olist-example' => 'نمبرشُدہ فہرست کی مَد',
+	'wikieditor-toolbar-tool-redirect-example' => 'ہدف صفحہ کا نام',
+	'wikieditor-toolbar-tool-big' => 'بڑا',
+	'wikieditor-toolbar-tool-big-example' => 'بڑا متن',
+	'wikieditor-toolbar-tool-small' => 'چھوٹا',
+	'wikieditor-toolbar-tool-small-example' => 'چھوٹا متن',
+	'wikieditor-toolbar-tool-superscript' => 'بالا نص',
+	'wikieditor-toolbar-tool-superscript-example' => 'بالانص متن',
+	'wikieditor-toolbar-tool-subscript' => 'ذیلی نص',
+	'wikieditor-toolbar-tool-subscript-example' => 'ذیلی نص متن',
+	'wikieditor-toolbar-group-insert' => 'ادخال',
+	'wikieditor-toolbar-tool-gallery' => 'مجموعۂ تصاویر',
+	'wikieditor-toolbar-tool-gallery-example' => '$1:مثال.jpg|تعقیب1
+$1:مثال.jpg|تعقیب2',
+	'wikieditor-toolbar-tool-newline' => 'نئی لکیر',
+	'wikieditor-toolbar-tool-table' => 'جدول',
+	'wikieditor-toolbar-tool-table-example-old' => '-
+! سرنامہ 1
+! سرنامہ 2
+! سرنامہ 3
+|-
+| صف 1, خانہ 1
+| صف 1, خانہ 2
+| صف 1, خانہ 3
+|-
+| صف 2, خانہ 1
+| صف 2, خانہ 2
+| صف 2, خانہ 3',
+	'wikieditor-toolbar-tool-table-example-cell-text' => 'خانے کا متن',
+	'wikieditor-toolbar-tool-table-example-header' => 'سرنامے کا متن',
+	'wikieditor-toolbar-tool-table-title' => 'جدول کا ادخال',
+	'wikieditor-toolbar-tool-table-dimensions-rows' => 'صفیں',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'قطاریں',
+	'wikieditor-toolbar-tool-table-dimensions-header' => 'سرنامی صف کا اِضافہ کرو',
+	'wikieditor-toolbar-tool-table-wikitable' => 'سرحدی لکیریں',
+	'wikieditor-toolbar-tool-table-sortable' => 'جدول کو قابلِ ترتیب بناؤ',
+	'wikieditor-toolbar-tool-table-example' => 'مثال',
+	'wikieditor-toolbar-tool-table-preview' => 'نمائش',
+	'wikieditor-toolbar-tool-table-insert' => 'داخل',
+	'wikieditor-toolbar-tool-table-cancel' => 'منسوخ',
+	'wikieditor-toolbar-tool-table-toomany' => 'اِس مکالمہ کے ذریعے $1 سے زیادہ خانوں والے جدول کا ادخال ممکن نہیں۔',
+	'wikieditor-toolbar-tool-table-invalidnumber' => 'آپ نے قطاروں یا صفوں کا صحیح شمار داخل نہیں کیا۔',
+	'wikieditor-toolbar-tool-table-zero' => 'آپ صفر قطاروں یا صفوں کا جدول داخل نہیں کرسکتے۔',
+	'wikieditor-toolbar-tool-replace' => 'تلاش و تبدیلئ متن',
+	'wikieditor-toolbar-tool-replace-title' => 'تلاش و تبدیلئ متن',
+	'wikieditor-toolbar-tool-replace-search' => 'تلاش برائے:',
+	'wikieditor-toolbar-tool-replace-replace' => 'اِس کے ساتھ تبدیل کرو:',
+	'wikieditor-toolbar-tool-replace-button-findnext' => 'اگلی دریافت',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'بدل دو',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'سب بدل دو',
+	'wikieditor-toolbar-tool-replace-close' => 'بند کرو',
+	'wikieditor-toolbar-tool-replace-nomatch' => 'آپ کی تلاش سے کچھ ملا نہیں۔',
+	'wikieditor-toolbar-tool-replace-success' => '$1 تبدیلیاں کی گئیں۔',
+	'wikieditor-toolbar-tool-replace-emptysearch' => 'آپ نے تلاش کیلئے کچھ دیا نہیں۔',
+	'wikieditor-toolbar-section-characters' => 'خاص محارف',
+	'wikieditor-toolbar-characters-page-latin' => 'لاطینی محارف',
+	'wikieditor-toolbar-characters-page-latinextended' => 'وسیع لاطینی',
+	'wikieditor-toolbar-characters-page-symbols' => 'علامات',
+	'wikieditor-toolbar-characters-page-greek' => 'یونانی',
+	'wikieditor-toolbar-characters-page-arabic' => 'عربی',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'عربی توسیع شدہ',
+	'wikieditor-toolbar-characters-page-persian' => 'فارسی',
+	'wikieditor-toolbar-characters-page-hebrew' => 'عبرانی',
+	'wikieditor-toolbar-characters-page-bangla' => 'بنگالی',
+	'wikieditor-toolbar-characters-page-telugu' => 'تلگو',
+	'wikieditor-toolbar-characters-page-sinhala' => 'سنگھالی',
+	'wikieditor-toolbar-characters-page-gujarati' => 'گجراتی',
+	'wikieditor-toolbar-characters-page-thai' => 'سیامی',
+	'wikieditor-toolbar-characters-page-lao' => 'لاوسی',
+	'wikieditor-toolbar-characters-page-khmer' => 'کھمیری',
+	'wikieditor-toolbar-section-help' => 'مدد',
+	'wikieditor-toolbar-help-heading-description' => 'تفصیل',
+	'wikieditor-toolbar-help-heading-syntax' => 'جو آپ لکھتے ہیں',
+	'wikieditor-toolbar-help-heading-result' => 'جو آپ پاتے ہیں',
+	'wikieditor-toolbar-help-page-format' => 'شکلبندی',
+	'wikieditor-toolbar-help-page-link' => 'روابط',
+	'wikieditor-toolbar-help-page-heading' => 'سرنامے',
+	'wikieditor-toolbar-help-page-list' => 'فہارست',
+	'wikieditor-toolbar-help-page-file' => 'ملفات',
+	'wikieditor-toolbar-help-page-reference' => 'حوالہ جات',
+	'wikieditor-toolbar-help-page-discussion' => 'تبادلہٴ خیال',
+	'wikieditor-toolbar-help-content-italic-description' => 'ترچھا',
+	'wikieditor-toolbar-help-content-italic-syntax' => "''ترچھا متن''",
+	'wikieditor-toolbar-help-content-italic-result' => '<em>ترچھا متن</em>',
+	'wikieditor-toolbar-help-content-bold-description' => 'جلی',
+	'wikieditor-toolbar-help-content-bold-syntax' => "'''جلی متن'''",
+	'wikieditor-toolbar-help-content-bold-result' => '<strong>جلی متن</strong>',
+	'wikieditor-toolbar-help-content-ilink-description' => 'اندرونی ربط',
+	'wikieditor-toolbar-help-content-ilink-syntax' => '[[صفحہ کا عنوان|ربط کا نام]]<br />[[صفحہ کا عنوان]]',
+	'wikieditor-toolbar-help-content-ilink-result' => "<a href='#'>ربط کا نام</a><br /><a href='#'>صفحہ کا عنوان</a>",
+	'wikieditor-toolbar-help-content-xlink-description' => 'بیرونی ربط',
+	'wikieditor-toolbar-help-content-xlink-syntax' => '[http://www.example.org ربط کا نام]<br />[http://www.example.org]<br />http://www.example.org',
+	'wikieditor-toolbar-help-content-heading2-description' => 'درجۂ دوم کا سرنامہ',
+	'wikieditor-toolbar-help-content-heading2-syntax' => '== سرنامی متن ==',
+	'wikieditor-toolbar-help-content-heading2-result' => '<h2>سرنامی متن</h2>',
+	'wikieditor-toolbar-help-content-heading3-description' => 'درجۂ سوم کا سرنامہ',
+	'wikieditor-toolbar-help-content-heading3-syntax' => '=== سرنامی متن ===',
+	'wikieditor-toolbar-help-content-heading3-result' => '<h3>سرنامی متن</h3>',
+	'wikieditor-toolbar-help-content-heading4-description' => 'درجۂ چہارم کا سرنامہ',
+	'wikieditor-toolbar-help-content-heading4-syntax' => '==== سرنامی متن ====',
+	'wikieditor-toolbar-help-content-heading4-result' => '<h4>سرنامی متن</h4>',
+	'wikieditor-toolbar-help-content-heading5-description' => 'درجۂ پنجم کا سرنامہ',
+	'wikieditor-toolbar-help-content-heading5-syntax' => '===== سرنامی متن =====',
+	'wikieditor-toolbar-help-content-heading5-result' => '<h5>سرنامی متن</h5>',
+	'wikieditor-toolbar-help-content-ulist-description' => 'نقاط شدہ فہرست',
+	'wikieditor-toolbar-help-content-ulist-syntax' => '* فہرستی مَد<br />* فہرستی مَد',
+	'wikieditor-toolbar-help-content-ulist-result' => '<ul><li>فہرستی مد</li><li>فہرستی مد</li></ul>',
+	'wikieditor-toolbar-help-content-olist-description' => 'نمبرشدہ فہرست',
+	'wikieditor-toolbar-help-content-olist-syntax' => '# فہرستی مد<br /># فہرستی مد',
+	'wikieditor-toolbar-help-content-olist-result' => '<ol><li>فہرستی مد</li><li>فہرستی مد</li></ol>',
+	'wikieditor-toolbar-help-content-file-description' => 'پیوستہ ملف',
+	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:مثال.png|thumb|تعقیبی متن]]',
+	'wikieditor-toolbar-help-content-reference-description' => 'حوالہ',
+	'wikieditor-toolbar-help-content-showreferences-description' => 'حوالہ جات دکھاؤ',
+	'wikieditor-toolbar-help-content-signaturetimestamp-description' => 'دستخط بمع مُہرِوقت',
+	'wikieditor-toolbar-help-content-signature-description' => 'دستخط',
 );
 
 /** Vèneto (Vèneto)
@@ -24189,7 +25921,6 @@ $1:Esenpio.jpg|Didascalia2',
 	'wikieditor-toolbar-tool-replace-case' => 'Corispondensa maiuscolo/minuscolo',
 	'wikieditor-toolbar-tool-replace-regex' => 'Testo de la riserca come espression regolare',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Cata el pròssimo',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Sostituìssi el pròssimo',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Sostituìssi tuto',
 	'wikieditor-toolbar-tool-replace-close' => 'Sara',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'No gavemo catà gnente che corisponde a quel che te serchi.',
@@ -24276,8 +26007,19 @@ $1:Esenpio.jpg|Didascalia2',
 	'wikieditor-toolbar-help-content-indent-result' => 'Testo normal<dl><dd>Testo rientrà<dl><dd>Testo rientrà</dd></dl></dd></dl>',
 );
 
-/** Veps (Vepsan kel') */
+/** Veps (Vepsän kel')
+ * @author Игорь Бродский
+ */
 $messages['vep'] = array(
+	'wikieditor-wikitext-tab' => 'Vikitekst',
+	'wikieditor-preview-tab' => 'Ezikacund',
+	'wikieditor-preview-changes-tab' => 'Toižetused',
+	'wikieditor-previewDialog-tab' => 'Ezikacund',
+	'wikieditor-publish-button-publish' => 'Publikuida',
+	'wikieditor-publish-dialog-minor' => 'Penikaine redakcii',
+	'wikieditor-publish-dialog-publish' => 'Publikuida',
+	'wikieditor-publish-dialog-goback' => 'Tagaze',
+	'wikieditor-toc-show' => 'Ozutada südäiolend',
 	'wikieditor-toolbar-tool-bold' => 'Lihavoitud',
 	'wikieditor-toolbar-tool-bold-example' => 'Lihavoitud tekst',
 	'wikieditor-toolbar-tool-link' => 'Kosketuz',
@@ -24287,7 +26029,17 @@ $messages['vep'] = array(
 	'wikieditor-toolbar-tool-link-cancel' => 'Heitta',
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => 'Vär nimi',
 	'wikieditor-toolbar-tool-file' => 'Mülütadud fail',
-	'wikieditor-toolbar-group-format' => 'Nimikirjutez',
+	'wikieditor-toolbar-tool-file-example' => 'Ozutez.jpg',
+	'wikieditor-toolbar-tool-reference-insert' => 'Ližata',
+	'wikieditor-toolbar-tool-heading' => 'Pälkirjutez',
+	'wikieditor-toolbar-tool-heading-1' => 'Tazopind 1',
+	'wikieditor-toolbar-tool-heading-2' => 'Tazopind 2',
+	'wikieditor-toolbar-tool-heading-3' => 'Tazopind 3',
+	'wikieditor-toolbar-tool-heading-4' => 'Tazopind 4',
+	'wikieditor-toolbar-tool-heading-5' => 'Tazopind 5',
+	'wikieditor-toolbar-tool-heading-example' => 'Pälkirjutesen tekst',
+	'wikieditor-toolbar-group-format' => 'Format:',
+	'wikieditor-toolbar-tool-ulist' => 'Markiruidud nimikirjutez',
 	'wikieditor-toolbar-tool-ulist-example' => 'Markiruidud nimikirjutez',
 	'wikieditor-toolbar-tool-olist' => 'Nomeroitud nimikirjutez',
 	'wikieditor-toolbar-tool-big' => "Sur'",
@@ -24297,11 +26049,16 @@ $messages['vep'] = array(
 	'wikieditor-toolbar-group-insert' => 'Ližata',
 	'wikieditor-toolbar-tool-gallery' => 'Kuviden gallerei',
 	'wikieditor-toolbar-tool-newline' => "Uz' rivi",
+	'wikieditor-toolbar-tool-table' => 'Tablut',
 	'wikieditor-toolbar-tool-table-title' => 'Ližada tablut',
 	'wikieditor-toolbar-tool-table-dimensions-rows' => 'Rivid',
+	'wikieditor-toolbar-tool-table-dimensions-columns' => 'Pachid:',
+	'wikieditor-toolbar-tool-table-example' => 'Ozutez',
+	'wikieditor-toolbar-tool-table-preview' => 'Ezikacund',
 	'wikieditor-toolbar-tool-table-insert' => 'Ližata',
 	'wikieditor-toolbar-tool-table-cancel' => 'Heitta',
 	'wikieditor-toolbar-tool-replace-close' => 'Saubata',
+	'wikieditor-toolbar-section-characters' => 'Specialižed znamad',
 	'wikieditor-toolbar-characters-page-latin' => 'Latinalaine',
 	'wikieditor-toolbar-characters-page-latinextended' => 'Levitadud latinalaine',
 	'wikieditor-toolbar-characters-page-ipa' => 'IPA',
@@ -24309,9 +26066,16 @@ $messages['vep'] = array(
 	'wikieditor-toolbar-characters-page-greek' => 'Grekalaine',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kirilline',
 	'wikieditor-toolbar-characters-page-arabic' => 'Arabine',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Araban levitadud',
+	'wikieditor-toolbar-characters-page-persian' => 'Persižed',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Evrejine',
 	'wikieditor-toolbar-characters-page-telugu' => 'Telugu',
+	'wikieditor-toolbar-characters-page-gujarati' => 'Gudžarati',
+	'wikieditor-toolbar-characters-page-thai' => 'Tai',
+	'wikieditor-toolbar-characters-page-lao' => 'Lao',
+	'wikieditor-toolbar-characters-page-khmer' => 'Khmeran',
 	'wikieditor-toolbar-section-help' => 'Abu',
+	'wikieditor-toolbar-help-heading-description' => 'Ümbrikirjutand',
 	'wikieditor-toolbar-help-page-link' => 'Kosketused',
 	'wikieditor-toolbar-help-page-list' => 'Nimikirjutesed',
 	'wikieditor-toolbar-help-page-file' => 'Failad',
@@ -24460,7 +26224,7 @@ $1:Ví dụ.jpg|Chú thích 2',
 	'wikieditor-toolbar-tool-table-dimensions-header' => 'Có hàng tiêu đề',
 	'wikieditor-toolbar-tool-table-wikitable' => 'Vẽ khung',
 	'wikieditor-toolbar-tool-table-sortable' => 'Cho phép tự động xếp bảng',
-	'wikieditor-toolbar-tool-table-example' => 'Văn bản ô',
+	'wikieditor-toolbar-tool-table-example' => 'Ví dụ',
 	'wikieditor-toolbar-tool-table-preview' => 'Xem trước',
 	'wikieditor-toolbar-tool-table-insert' => 'Chèn',
 	'wikieditor-toolbar-tool-table-cancel' => 'Hủy bỏ',
@@ -24474,7 +26238,7 @@ $1:Ví dụ.jpg|Chú thích 2',
 	'wikieditor-toolbar-tool-replace-case' => 'Phân biệt hoa thường',
 	'wikieditor-toolbar-tool-replace-regex' => 'Xem chuỗi tìm kiếm là biểu thức chính quy',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Tìm tiếp',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Thay tiếp',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'Thay thế',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Thay tất cả',
 	'wikieditor-toolbar-tool-replace-close' => 'Đóng',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Không tìm thấy',
@@ -24489,6 +26253,7 @@ $1:Ví dụ.jpg|Chú thích 2',
 	'wikieditor-toolbar-characters-page-greek' => 'Hy Lạp',
 	'wikieditor-toolbar-characters-page-cyrillic' => 'Kirin',
 	'wikieditor-toolbar-characters-page-arabic' => 'Ả Rập',
+	'wikieditor-toolbar-characters-page-arabicextended' => 'Ả Rập mở rộng',
 	'wikieditor-toolbar-characters-page-persian' => 'Ba Tư',
 	'wikieditor-toolbar-characters-page-hebrew' => 'Hê-brơ',
 	'wikieditor-toolbar-characters-page-bangla' => 'Bangla',
@@ -24689,7 +26454,6 @@ $1:Misaal.jpg|Faramfacce2',
 	'wikieditor-toolbar-tool-replace-replace' => 'Wuutal ak:',
 	'wikieditor-toolbar-tool-replace-case' => 'Tollale dayoo',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Gis bi toftal',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Wuutal bi toftal',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Wuutal yépp',
 	'wikieditor-toolbar-tool-replace-close' => 'Neenal',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Sa ceet gi jurul dara',
@@ -24724,6 +26488,7 @@ $messages['yi'] = array(
 	'wikieditor-previewDialog-loading' => 'לאָדט…',
 	'wikieditor-publish-button-publish' => 'פֿאַרעפֿנטלעכן',
 	'wikieditor-publish-button-cancel' => 'אַנולירן',
+	'wikieditor-publish-dialog-title' => 'פארעפנטלעכן אויף {{SITENAME}}',
 	'wikieditor-publish-dialog-minor' => 'מינערדיקער רעדאַקטירונג',
 	'wikieditor-publish-dialog-watch' => 'אויפֿפאַסן אויף דעם בלאַט',
 	'wikieditor-publish-dialog-publish' => 'פֿאַרעפֿנטלעכן',
@@ -24737,6 +26502,7 @@ $messages['yi'] = array(
 	'wikieditor-toolbar-desc' => 'רעדאַקטירן בלאַט געצייגפאַס מיט פֿאַרברייטערטער ניצלעכקייט',
 	'wikieditor-toolbar-preference' => 'אַקטיווירן פֿאַרברייטערטן רעדאַקטירונג פאַס',
 	'wikieditor-toolbar-dialogs-preference' => 'דערמעגלעכן דיאָלאג קעסטלעך פֿאַר אַרײַנלייגן לינקען, טאַבעלעס און נאך',
+	'wikieditor-toolbar-hidesig' => 'באהאלטן דאס אונטערשריפט קנעפל פון בלעטער אין דעם הויפט נאמענטייל',
 	'wikieditor-toolbar-loading' => 'אָנלאָדן...',
 	'wikieditor-toolbar-tool-bold' => 'דיק',
 	'wikieditor-toolbar-tool-bold-example' => 'דיקער טעקסט',
@@ -24844,8 +26610,8 @@ $1:בײַשפיל.jpg|קעפל2',
 	'wikieditor-toolbar-tool-replace-case' => 'צופאַסן גרויסע און קליינע אותיות',
 	'wikieditor-toolbar-tool-replace-regex' => 'באַהאַנדלען זוכקייטל ווי א רעגולערן אויסדרוק',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'זוכן נעקסטע',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'אויסטוישן נעקסטע',
-	'wikieditor-toolbar-tool-replace-button-replaceall' => 'אויסטוישן אלץ',
+	'wikieditor-toolbar-tool-replace-button-replace' => 'אויסבײַטן',
+	'wikieditor-toolbar-tool-replace-button-replaceall' => 'אויסבײַטן אלץ',
 	'wikieditor-toolbar-tool-replace-close' => 'שליסן',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'אײַער זוך האט גאָרנישט צוגעפאַסט',
 	'wikieditor-toolbar-tool-replace-success' => '$1 אויסבײַט(ן) אַדורכגעפֿירט.',
@@ -24865,6 +26631,9 @@ $1:בײַשפיל.jpg|קעפל2',
 	'wikieditor-toolbar-characters-page-telugu' => 'טעלוגו',
 	'wikieditor-toolbar-characters-page-sinhala' => 'סינהאַלאַ',
 	'wikieditor-toolbar-characters-page-gujarati' => 'גודזשאַראַטי',
+	'wikieditor-toolbar-characters-page-thai' => 'טהאי',
+	'wikieditor-toolbar-characters-page-lao' => 'לאַאטיש',
+	'wikieditor-toolbar-characters-page-khmer' => 'כמער',
 	'wikieditor-toolbar-section-help' => 'הילף',
 	'wikieditor-toolbar-help-heading-description' => 'באַשרײַבונג',
 	'wikieditor-toolbar-help-heading-syntax' => 'וואָס איר קלאַפט אַרײַן',
@@ -24936,10 +26705,10 @@ $messages['yo'] = array(
 	'wikieditor-preview-preference' => 'Ìgbàláyè àyẹ̀wò lẹ́gbẹ̀ẹ́ ara wọn',
 	'wikieditor-preview-tab' => 'Àyẹ̀wò',
 	'wikieditor-preview-changes-tab' => 'Àwọn àtúnṣe',
-	'wikieditor-preview-loading' => 'Únrùjáde...',
+	'wikieditor-preview-loading' => 'Óúnbọ̀wá...',
 	'wikieditor-previewDialog-preference' => 'Ìgbàláyè pátákó àkíyèsí fún àyẹ̀wò',
 	'wikieditor-previewDialog-tab' => 'Àyẹ̀wò',
-	'wikieditor-previewDialog-loading' => 'Únrùjáde...',
+	'wikieditor-previewDialog-loading' => 'Óúnbọ̀wá...',
 	'wikieditor-publish-preference' => 'Ìgbàláyè ìtẹ̀jáde lẹ́sẹ-sẹ',
 	'wikieditor-publish-button-publish' => 'Ìtẹ̀jáde',
 	'wikieditor-publish-button-cancel' => 'Fagilé',
@@ -24961,7 +26730,7 @@ $messages['yo'] = array(
 	'wikieditor-toolbar-desc' => 'Àtúnṣe ojúewé pẹpẹ irinṣẹ́ pẹ̀lú ìṣeémúlò amúdára',
 	'wikieditor-toolbar-preference' => 'Ìgbàláyè pẹpẹ irinṣẹ́ àtúnṣe mímúdára',
 	'wikieditor-toolbar-dialogs-preference' => 'Ìgbàláyè àwọn pátákó àkíyèsí fún ìkìbọ̀ ìjápọ̀, tábìlì àti bẹ́ẹ̀bẹ́ẹ̀ lọ',
-	'wikieditor-toolbar-loading' => 'Únrùjáde...',
+	'wikieditor-toolbar-loading' => 'Óúnbọ̀wá...',
 	'wikieditor-toolbar-tool-bold' => 'Kedere',
 	'wikieditor-toolbar-tool-bold-example' => 'Ìkọ kedere',
 	'wikieditor-toolbar-tool-italic' => 'Awọ́lẹ́ẹ̀gbẹ́',
@@ -25068,7 +26837,6 @@ $1:Example.jpg|Àkọlé2',
 	'wikieditor-toolbar-tool-replace-case' => 'Ìbámu lẹ́tà kúkúrú-nínlá',
 	'wikieditor-toolbar-tool-replace-regex' => 'Ṣe ìkọ-ọ̀rọ̀ àwárí bíi ìṣọ̀rọ̀ dédé',
 	'wikieditor-toolbar-tool-replace-button-findnext' => 'Wá omíràn',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => 'Rọ́pò omíràn',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => 'Ìrọ́pò gbogbo wọn',
 	'wikieditor-toolbar-tool-replace-close' => 'Padé',
 	'wikieditor-toolbar-tool-replace-nomatch' => 'Àwárí yín kò bá ohun kankan mu.',
@@ -25318,7 +27086,6 @@ $1:Example.jpg|標題2',
 	'wikieditor-toolbar-tool-replace-case' => '合乎案件',
 	'wikieditor-toolbar-tool-replace-regex' => '搜索文字做一個基本運算',
 	'wikieditor-toolbar-tool-replace-button-findnext' => '下一個',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => '取代下一個',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => '取代全部',
 	'wikieditor-toolbar-tool-replace-close' => '關閉',
 	'wikieditor-toolbar-tool-replace-nomatch' => '你嘅搜尋唔配合任何野。',
@@ -25403,6 +27170,7 @@ Bangla',
 );
 
 /** Simplified Chinese (‪中文(简体)‬)
+ * @author Anakmalaysia
  * @author Bencmq
  * @author Fantasticfears
  * @author Gaoxuewei
@@ -25417,14 +27185,14 @@ $messages['zh-hans'] = array(
 	'wikieditor' => '高级维基文本编辑界面',
 	'wikieditor-desc' => '提供可扩充的维基文本编辑界面及功能组件',
 	'wikieditor-wikitext-tab' => '维基文本',
-	'wikieditor-loading' => '载入中',
+	'wikieditor-loading' => '正在载入',
 	'wikieditor-preview-preference' => '启用双列对比预览',
 	'wikieditor-preview-tab' => '预览',
-	'wikieditor-preview-changes-tab' => '修订',
-	'wikieditor-preview-loading' => '载入中……',
+	'wikieditor-preview-changes-tab' => '更改',
+	'wikieditor-preview-loading' => '正在载入...',
 	'wikieditor-previewDialog-preference' => '启用预览对话框的',
 	'wikieditor-previewDialog-tab' => '预览',
-	'wikieditor-previewDialog-loading' => '载入中……',
+	'wikieditor-previewDialog-loading' => '正在载入...',
 	'wikieditor-publish-preference' => '启用逐步发表功能',
 	'wikieditor-publish-button-publish' => '发表',
 	'wikieditor-publish-button-cancel' => '取消',
@@ -25446,7 +27214,7 @@ $messages['zh-hans'] = array(
 	'wikieditor-toolbar-desc' => '具有增强可用性的页面编辑工具',
 	'wikieditor-toolbar-preference' => '启用增强编辑工具栏',
 	'wikieditor-toolbar-dialogs-preference' => '启用对话框插入链接、表格等',
-	'wikieditor-toolbar-hidesig' => '隐藏从网页的主要命名空间中的签名按钮',
+	'wikieditor-toolbar-hidesig' => '在主名字空间中隐藏签名按钮',
 	'wikieditor-toolbar-loading' => '正在载入',
 	'wikieditor-toolbar-tool-bold' => '粗体',
 	'wikieditor-toolbar-tool-bold-example' => '粗体文字',
@@ -25455,7 +27223,7 @@ $messages['zh-hans'] = array(
 	'wikieditor-toolbar-tool-ilink' => '内部链接',
 	'wikieditor-toolbar-tool-ilink-example' => '链接标题',
 	'wikieditor-toolbar-tool-xlink' => '外部链接（注意加前缀http://）',
-	'wikieditor-toolbar-tool-xlink-example' => 'http://www.example.com 链接标题',
+	'wikieditor-toolbar-tool-xlink-example' => 'http://www.范例.com（在这里输入网址） 链接文字',
 	'wikieditor-toolbar-tool-link' => '链接',
 	'wikieditor-toolbar-tool-link-title' => '插入链接',
 	'wikieditor-toolbar-tool-link-int' => '链往wiki页面',
@@ -25473,14 +27241,14 @@ $messages['zh-hans'] = array(
 	'wikieditor-toolbar-tool-link-int-target-status-invalid' => '无效标题',
 	'wikieditor-toolbar-tool-link-int-target-status-external' => '外部链接',
 	'wikieditor-toolbar-tool-link-int-target-status-loading' => '检查页面是否存在……',
-	'wikieditor-toolbar-tool-link-int-invalid' => '您所指定的标题无效。',
+	'wikieditor-toolbar-tool-link-int-invalid' => '您指定的标题无效。',
 	'wikieditor-toolbar-tool-link-lookslikeinternal' => '您输入的网址似乎指向另一个wiki页面，是否希望将其改为内部链接？',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-int' => '内部链接',
 	'wikieditor-toolbar-tool-link-lookslikeinternal-ext' => '外部链接',
 	'wikieditor-toolbar-tool-link-empty' => '您没有输入链接内容。',
 	'wikieditor-toolbar-tool-file' => '嵌入文件',
-	'wikieditor-toolbar-tool-file-example' => 'Example.jpg',
-	'wikieditor-toolbar-tool-reference' => '注释',
+	'wikieditor-toolbar-tool-file-example' => '范例.jpg（在这里输入文件名）',
+	'wikieditor-toolbar-tool-reference' => '参考',
 	'wikieditor-toolbar-tool-reference-example' => '在此处插入注释文字',
 	'wikieditor-toolbar-tool-reference-cancel' => '取消',
 	'wikieditor-toolbar-tool-reference-title' => '插入注释内容',
@@ -25506,10 +27274,10 @@ $messages['zh-hans'] = array(
 	'wikieditor-toolbar-tool-nowiki-example' => '在此处插入非维基格式文字',
 	'wikieditor-toolbar-tool-redirect' => '重定向',
 	'wikieditor-toolbar-tool-redirect-example' => '目标页名称',
-	'wikieditor-toolbar-tool-big' => '大',
-	'wikieditor-toolbar-tool-big-example' => '大号字',
-	'wikieditor-toolbar-tool-small' => '小',
-	'wikieditor-toolbar-tool-small-example' => '小号字',
+	'wikieditor-toolbar-tool-big' => '大号',
+	'wikieditor-toolbar-tool-big-example' => '大号文字',
+	'wikieditor-toolbar-tool-small' => '小号',
+	'wikieditor-toolbar-tool-small-example' => '小号文字',
 	'wikieditor-toolbar-tool-superscript' => '上标',
 	'wikieditor-toolbar-tool-superscript-example' => '上标文字',
 	'wikieditor-toolbar-tool-subscript' => '下标',
@@ -25525,13 +27293,13 @@ $1:Example.jpg|标题2',
 ! 标题2
 ! 标题3
 |-
-| 第一行第一个单元格
-| 第一行第二个单元格
-| 第一行第三个单元格
+| 第1行第1格
+| 第1行第2格
+| 第1行第3格
 |-
-| 第二行第一个单元格
-| 第二行第二个单元格
-| 第二行第三个单元格',
+| 第2行第1格
+| 第2行第2格
+| 第2行第3格',
 	'wikieditor-toolbar-tool-table-example-cell-text' => '单元格文字',
 	'wikieditor-toolbar-tool-table-example-header' => '标题文字',
 	'wikieditor-toolbar-tool-table-title' => '插入表格',
@@ -25554,7 +27322,7 @@ $1:Example.jpg|标题2',
 	'wikieditor-toolbar-tool-replace-case' => '区分大小写',
 	'wikieditor-toolbar-tool-replace-regex' => '使用正则表达式',
 	'wikieditor-toolbar-tool-replace-button-findnext' => '查找下一个',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => '替换下一个',
+	'wikieditor-toolbar-tool-replace-button-replace' => '替换',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => '替换所有',
 	'wikieditor-toolbar-tool-replace-close' => '关闭',
 	'wikieditor-toolbar-tool-replace-nomatch' => '没有找到任何匹配项。',
@@ -25569,6 +27337,7 @@ $1:Example.jpg|标题2',
 	'wikieditor-toolbar-characters-page-greek' => '希腊字母',
 	'wikieditor-toolbar-characters-page-cyrillic' => '西里尔字母',
 	'wikieditor-toolbar-characters-page-arabic' => '阿拉伯字母',
+	'wikieditor-toolbar-characters-page-arabicextended' => '扩展阿拉伯字母',
 	'wikieditor-toolbar-characters-page-persian' => '波斯语',
 	'wikieditor-toolbar-characters-page-hebrew' => '希伯来字母',
 	'wikieditor-toolbar-characters-page-bangla' => '孟加拉',
@@ -25625,7 +27394,7 @@ $1:Example.jpg|标题2',
 	'wikieditor-toolbar-help-content-file-description' => '嵌入文件',
 	'wikieditor-toolbar-help-content-file-syntax' => '[[$1:Example.png|thumb|标题文本]]',
 	'wikieditor-toolbar-help-content-file-result' => "<div style='width:104px;' class='thumbinner'><a title='标题文本' class='image' href='#'><img height='50' width='100' border='0' class='thumbimage' src='extensions/WikiEditor/modules/images/toolbar/example-image.png' alt=''/></a><div class='thumbcaption'><div class='magnify'><a title='放大' class='internal' href='#'><img height='11' width='15' alt='' src='$1/common/images/magnify-clip.png'/></a></div>标题文本</div></div>",
-	'wikieditor-toolbar-help-content-reference-description' => '注释',
+	'wikieditor-toolbar-help-content-reference-description' => '参考',
 	'wikieditor-toolbar-help-content-reference-syntax' => '页面文本。&lt;ref name="测试"&gt;[http://www.example.org 链接文本]，附加文本。&lt;/ref&gt;',
 	'wikieditor-toolbar-help-content-reference-result' => "页面文本。<sup><a href='#'>[1]</a></sup>",
 	'wikieditor-toolbar-help-content-rereference-description' => '复用注释',
@@ -25643,6 +27412,7 @@ $1:Example.jpg|标题2',
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
+ * @author Anakmalaysia
  * @author Frankou
  * @author Gaoxuewei
  * @author Horacewai2
@@ -25817,7 +27587,7 @@ $1:Example.jpg|標題2',
 	'wikieditor-toolbar-tool-replace-case' => '區分大小寫',
 	'wikieditor-toolbar-tool-replace-regex' => '使用正則表達式',
 	'wikieditor-toolbar-tool-replace-button-findnext' => '尋找下一個',
-	'wikieditor-toolbar-tool-replace-button-replacenext' => '替換下一個',
+	'wikieditor-toolbar-tool-replace-button-replace' => '替換',
 	'wikieditor-toolbar-tool-replace-button-replaceall' => '替換所有',
 	'wikieditor-toolbar-tool-replace-close' => '關閉',
 	'wikieditor-toolbar-tool-replace-nomatch' => '沒有找到任何符合項目。',
@@ -25832,6 +27602,7 @@ $1:Example.jpg|標題2',
 	'wikieditor-toolbar-characters-page-greek' => '希臘字母',
 	'wikieditor-toolbar-characters-page-cyrillic' => '西里爾字母',
 	'wikieditor-toolbar-characters-page-arabic' => '阿拉伯字母',
+	'wikieditor-toolbar-characters-page-arabicextended' => '擴展阿拉伯字母',
 	'wikieditor-toolbar-characters-page-persian' => '波斯語',
 	'wikieditor-toolbar-characters-page-hebrew' => '希伯來字母',
 	'wikieditor-toolbar-characters-page-bangla' => '孟加拉',
diff --git a/extensions/WikiEditor/WikiEditor.php b/extensions/WikiEditor/WikiEditor.php
index 5fd7778d..0022c7b7 100644
--- a/extensions/WikiEditor/WikiEditor.php
+++ b/extensions/WikiEditor/WikiEditor.php
@@ -10,33 +10,33 @@
  * @author Nimish Gautam <nimish@wikimedia.org>
  * @author Adam Miller <amiller@wikimedia.org>
  * @license GPL v2 or later
- * @version 0.3.0
+ * @version 0.3.1
  */
 
 /* Configuration */
 
 // Each module may be configured individually to be globally on/off or user preference based
 $wgWikiEditorFeatures = array(
-	
+
 	/* Textarea / i-frame compatible (OK to deploy) */
-	
+
 	'toolbar' => array( 'global' => false, 'user' => true ),
 	// Provides interactive tools
 	'dialogs' => array( 'global' => false, 'user' => true ),
 	// Hide signature button from main namespace
 	'hidesig' => array( 'global' => true, 'user' => false ),
-	
+
 	/* Textarea / i-frame compatible, but still experimental and unstable (do not deploy!) */
-	
+
 	// Adds a tab for previewing in-line
 	'preview' => array( 'global' => false, 'user' => true ),
 	// Adds a button for previewing in a dialog
 	'previewDialog' => array( 'global' => false, 'user' => false ),
 	//  Adds a button and dialog for step-by-step publishing
 	'publish' => array( 'global' => false, 'user' => true ),
-	
+
 	/* I-frame dependent (do not deploy!) */
-	
+
 	// Failry stable table of contents
 	'toc' => array( 'global' => false, 'user' => true ),
 	// Pretty broken template collapsing/editing
@@ -52,8 +52,8 @@ $wgExtensionCredits['other'][] = array(
 	'path' => __FILE__,
 	'name' => 'WikiEditor',
 	'author' => array( 'Trevor Parscal', 'Roan Kattouw', 'Nimish Gautam', 'Adam Miller' ),
-	'version' => '0.3.0',
-	'url' => 'http://www.mediawiki.org/wiki/Extension:WikiEditor',
+	'version' => '0.3.1',
+	'url' => 'https://www.mediawiki.org/wiki/Extension:WikiEditor',
 	'descriptionmsg' => 'wikieditor-desc',
 );
 $wgAutoloadClasses['WikiEditorHooks'] = dirname( __FILE__ ) . '/WikiEditor.hooks.php';
@@ -71,13 +71,13 @@ $wikiEditorTpl = array(
 
 $wgResourceModules += array(
 	/* Third-party modules */
-	
+
 	'contentCollector' => $wikiEditorTpl + array(
 		'scripts' => 'contentCollector.js',
 	),
-	
+
 	/* WikiEditor jQuery plugin Resources */
-	
+
 	'jquery.wikiEditor' => $wikiEditorTpl + array(
 		'scripts' => 'jquery.wikiEditor.js',
 		'styles' => 'jquery.wikiEditor.css',
@@ -295,7 +295,7 @@ $wgResourceModules += array(
 			'wikieditor-toolbar-tool-replace-case',
 			'wikieditor-toolbar-tool-replace-regex',
 			'wikieditor-toolbar-tool-replace-button-findnext',
-			'wikieditor-toolbar-tool-replace-button-replacenext',
+			'wikieditor-toolbar-tool-replace-button-replace',
 			'wikieditor-toolbar-tool-replace-button-replaceall',
 			'wikieditor-toolbar-tool-replace-close',
 			'wikieditor-toolbar-tool-replace-nomatch',
@@ -392,9 +392,9 @@ $wgResourceModules += array(
 			'wikieditor-toolbar-help-content-indent-result',
 		),
 	),
-	
+
 	/* WikiEditor Resources */
-	
+
 	'ext.wikiEditor' => $wikiEditorTpl + array(
 		'scripts' => 'ext.wikiEditor.js',
 		'styles' => 'ext.wikiEditor.css',
diff --git a/extensions/WikiEditor/modules/contentCollector.js b/extensions/WikiEditor/modules/contentCollector.js
index af8d796a..2c289212 100644
--- a/extensions/WikiEditor/modules/contentCollector.js
+++ b/extensions/WikiEditor/modules/contentCollector.js
@@ -4,13 +4,13 @@
 
 /**
  * Copyright 2009 Google Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS-IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -103,7 +103,7 @@ function makeContentCollector( browser, domInterface ) {
 		},
 		// call flush only when you're done
 			flush : function(withNewline) {
-				
+
 			}
 		};
 		self.startNew();
@@ -182,7 +182,7 @@ function makeContentCollector( browser, domInterface ) {
 		state.listType = oldListType;
 	}
 	function _produceListMarker(state) {
-		
+
 	}
 	function _startNewLine(state) {
 		if (state) {
@@ -262,14 +262,14 @@ function makeContentCollector( browser, domInterface ) {
 					_produceListMarker(state);
 				}
 				lines.appendText(textify(txt2));
-				
+
 				x += consumed;
 				txt = rest;
 				if (txt.length > 0) {
 					_startNewLine(state);
 				}
 			}
-			
+
 		} else {
 			var cls = dom.nodeProp(node, "className");
 			var tname = (dom.nodeTagName(node) || "").toLowerCase();
@@ -279,7 +279,7 @@ function makeContentCollector( browser, domInterface ) {
 				// ignore
 			} else if (!isEmpty) {
 				var styl = dom.nodeAttr(node, "style");
-				
+
 				var isPre = (tname == "pre");
 				if ((!isPre) && browser.safari) {
 					isPre = (styl && /\bwhite-space:\s*pre\b/i.exec(styl));
@@ -301,7 +301,7 @@ function makeContentCollector( browser, domInterface ) {
 
 				if (isPre)
 					_decrementFlag(state, 'preMode');
-				
+
 				if (oldListTypeOrNull) {
 					_exitList(state, oldListTypeOrNull);
 				}
@@ -384,7 +384,7 @@ function makeContentCollector( browser, domInterface ) {
 						lengthToTake = lineLimit;
 						newStrings.push(oldString.substring(0, lengthToTake));
 						oldString = oldString.substring(lengthToTake);
-						
+
 					}
 					if (oldString.length > 0) {
 						newStrings.push(oldString);
@@ -414,7 +414,7 @@ function makeContentCollector( browser, domInterface ) {
 
 					newStrings.unshift(i, 1);
 					lineStrings.splice.apply(lineStrings, newStrings);
-					
+
 				}
 			}
 			return {
diff --git a/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js b/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js
index de01f34f..69fe2905 100644
--- a/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js
+++ b/extensions/WikiEditor/modules/ext.wikiEditor.tests.toolbar.js
@@ -121,7 +121,7 @@ var wikiEditorTests = {
 		'pre': 0,
 		'post': 9
 	},
-	// Add 
+	// Add
 	'add_pages_characters': {
 		'call': 'addToToolbar',
 		'data': {
@@ -141,7 +141,7 @@ var wikiEditorTests = {
 		'pre': 0,
 		'post': 1
 	},
-	// Add 
+	// Add
 	'add_characters': {
 		'call': 'addToToolbar',
 		'data': {
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js
index 4ab6ce46..0c24c368 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.config.js
@@ -72,7 +72,7 @@ replaceIcons: function( $textarea ) {
 			}
 		} );
 },
-	
+
 getDefaultConfig: function () {
 	return { 'dialogs': {
 		'insert-link': {
@@ -129,7 +129,7 @@ getDefaultConfig: function () {
 						$( '.ui-dialog:visible .ui-dialog-buttonpane button:first' )
 							.attr( 'disabled', true )
 							.addClass( 'disabled' );
-					} else { 
+					} else {
 						$( '.ui-dialog:visible .ui-dialog-buttonpane button:first' )
 							.removeAttr('disabled')
 							.removeClass('disabled');
@@ -138,7 +138,7 @@ getDefaultConfig: function () {
 				// Updates the UI to show if the page title being inputed by the user exists or not
 				// accepts parameter internal for bypassing external link detection
 				function updateExistence( internal ) {
-					// ensure the internal parameter is a boolean 
+					// ensure the internal parameter is a boolean
 					if ( internal != true ) internal = false;
 					// Abort previous request
 					var request = $( '#wikieditor-toolbar-link-int-target-status' ).data( 'request' );
@@ -259,7 +259,7 @@ getDefaultConfig: function () {
 								.data( 'tooltip-mode', true );
 						}
 					});
-				
+
 				// Automatically copy the value of the internal link page title field to the link text field unless the
 				// user has changed the link text field - this is a convenience thing since most link texts are going to
 				// be the the same as the page title - Also change the internal/external radio button accordingly
@@ -275,7 +275,7 @@ getDefaultConfig: function () {
 							updateExistence();
 						}
 						if ( $( '#wikieditor-toolbar-link-int-text' ).data( 'untouched' ) )
-							if ( $( '#wikieditor-toolbar-link-int-target' ).val() == 
+							if ( $( '#wikieditor-toolbar-link-int-target' ).val() ==
 								$( '#wikieditor-toolbar-link-int-target' ).data( 'tooltip' ) ) {
 									$( '#wikieditor-toolbar-link-int-text' )
 										.addClass( 'wikieditor-toolbar-dialog-hint' )
@@ -330,7 +330,7 @@ getDefaultConfig: function () {
 					)
 					.data( 'existencecache', {} )
 					.children().hide();
-				
+
 				$( '#wikieditor-toolbar-link-int-target' )
 					.bind( 'keyup paste cut', function() {
 						// Cancel the running timer if applicable
@@ -350,24 +350,24 @@ getDefaultConfig: function () {
 						// Fetch right now
 						updateExistence();
 					} );
-				
+
 				// Title suggestions
 				$( '#wikieditor-toolbar-link-int-target' ).data( 'suggcache', {} ).suggestions( {
 					fetch: function( query ) {
 						var that = this;
 						var title = $(this).val();
-						
+
 						if ( isExternalLink( title ) || title.indexOf( '|' ) != -1  || title == '') {
 							$(this).suggestions( 'suggestions', [] );
 							return;
 						}
-						
+
 						var cache = $(this).data( 'suggcache' );
 						if ( typeof cache[title] != 'undefined' ) {
 							$(this).suggestions( 'suggestions', cache[title] );
 							return;
 						}
-						
+
 						var request = $.ajax( {
 							url: mw.util.wikiScript( 'api' ),
 							data: {
@@ -435,7 +435,7 @@ getDefaultConfig: function () {
 								alert( mediaWiki.msg( 'wikieditor-toolbar-tool-link-int-invalid' ) );
 								return;
 							}
-							
+
 							if ( target == text || !text.length )
 								insertText = '[[' + target + ']]';
 							else
@@ -444,7 +444,7 @@ getDefaultConfig: function () {
 							// Prepend http:// if there is no protocol
 							if ( !target.match( /^[a-z]+:\/\/./ ) )
 								target = 'http://' + target;
-							
+
 							// Detect if this is really an internal link in disguise
 							var match = target.match( $(this).data( 'articlePathRegex' ) );
 							if ( match && !$(this).data( 'ignoreLooksInternal' ) ) {
@@ -468,10 +468,10 @@ getDefaultConfig: function () {
 								);
 								return;
 							}
-	
+
 							var escTarget = escapeExternalTarget( target );
 							var escText = escapeExternalText( text );
-							
+
 							if ( escTarget == escText )
 								insertText = escTarget;
 							else if ( text == '' )
@@ -488,7 +488,7 @@ getDefaultConfig: function () {
 								pre: insertText
 							}
 						}, $(this) );
-						
+
 						// Blank form
 						$( '#wikieditor-toolbar-link-int-target, #wikieditor-toolbar-link-int-text' ).val( '' );
 						$( '#wikieditor-toolbar-link-type-int, #wikieditor-toolbar-link-type-ext' )
@@ -514,7 +514,7 @@ getDefaultConfig: function () {
 					// Restore and immediately save selection state, needed for inserting stuff later
 					context.fn.restoreCursorAndScrollTop();
 					context.fn.saveCursorAndScrollTop();
-					var selection = context.$textarea.textSelection( 'getSelection' ); 
+					var selection = context.$textarea.textSelection( 'getSelection' );
 					$( '#wikieditor-toolbar-link-int-target' ).focus();
 					// Trigger the change event, so the link status indicator is up to date
 					$( '#wikieditor-toolbar-link-int-target' ).change();
@@ -549,7 +549,7 @@ getDefaultConfig: function () {
 								);
 							}
 						}
-						
+
 						// Change the value by calling val() doesn't trigger the change event, so let's do that
 						// ourselves
 						if ( typeof text != 'undefined' )
@@ -565,18 +565,18 @@ getDefaultConfig: function () {
 							$( '#wikieditor-toolbar-link-int-text' ).hasClass( 'wikieditor-toolbar-dialog-hint' )
 					);
 					$( '#wikieditor-toolbar-link-int-target' ).suggestions();
-					
+
 					//don't overwrite user's text
 					if( selection != '' ){
 						$( '#wikieditor-toolbar-link-int-text' ).data( 'untouched', false );
 					}
-					
+
 					$( '#wikieditor-toolbar-link-int-text, #wikiedit-toolbar-link-int-target' )
 						.each( function() {
 							if ( $(this).val() == '' )
 								$(this).parent().find( 'label' ).show();
 						});
-					
+
 					if ( !( $(this).data( 'dialogkeypressset' ) ) ) {
 						$(this).data( 'dialogkeypressset', true );
 						// Execute the action associated with the first button
@@ -588,7 +588,7 @@ getDefaultConfig: function () {
 								e.preventDefault();
 							}
 						});
-						
+
 						// Make tabbing to a button and pressing
 						// Enter do what people expect
 						$(this).closest( '.ui-dialog' ).find( 'button' ).focus( function() {
@@ -616,7 +616,7 @@ getDefaultConfig: function () {
 				$( this ).find( '[rel]' ).each( function() {
 					$( this ).text( mediaWiki.msg( $( this ).attr( 'rel' ) ) );
 				} );
-				
+
 			},
 			dialog: {
 				dialogClass: 'wikiEditor-toolbar-dialog',
@@ -656,7 +656,7 @@ getDefaultConfig: function () {
 					// Restore and immediately save selection state, needed for inserting stuff later
 					context.fn.restoreCursorAndScrollTop();
 					context.fn.saveCursorAndScrollTop();
-					var selection = context.$textarea.textSelection( 'getSelection' ); 
+					var selection = context.$textarea.textSelection( 'getSelection' );
 					// set focus
 					$( '#wikieditor-toolbar-reference-text' ).focus();
 					$( '#wikieditor-toolbar-reference-dialog' )
@@ -766,13 +766,13 @@ getDefaultConfig: function () {
 				});
 				// Set tabindexes on form fields
 				$.wikiEditor.modules.dialogs.fn.setTabindexes( $(this).find( 'input' ).not( '[tabindex]' ) );
-				
+
 				$( '#wikieditor-toolbar-table-dimensions-rows' ).val( 3 );
 				$( '#wikieditor-toolbar-table-dimensions-columns' ).val( 3 );
 				$( '#wikieditor-toolbar-table-wikitable' ).click( function() {
 					$( '.wikieditor-toolbar-table-preview' ).toggleClass( 'wikitable' );
 				});
-				
+
 				// Hack for sortable preview: dynamically adding
 				// sortable class doesn't work, so we use a clone
 				$( '#wikieditor-toolbar-table-preview' )
@@ -783,7 +783,7 @@ getDefaultConfig: function () {
 					.hide();
 
 				mw.loader.using( 'jquery.tablesorter', function() {
-					$( '#wikieditor-toolbar-table-preview2' ).tablesorter();
+		                       	$( '#wikieditor-toolbar-table-preview2' ).tablesorter();
 				});
 
 				$( '#wikieditor-toolbar-table-sortable' ).click( function() {
@@ -796,7 +796,7 @@ getDefaultConfig: function () {
 						.show();
 					$( '#wikieditor-toolbar-table-preview3' ).attr( 'id', 'wikieditor-toolbar-table-preview2' );
 				});
-				
+
 				$( '#wikieditor-toolbar-table-dimensions-header' ).click( function() {
 					// Instead of show/hiding, switch the HTML around
 					// We do this because the sortable tables script styles the first row,
@@ -872,7 +872,7 @@ getDefaultConfig: function () {
 							},
 							$(this)
 						);
-						
+
 						// Restore form state
 							$( '#wikieditor-toolbar-table-dimensions-rows' ).val( 3 );
 							$( '#wikieditor-toolbar-table-dimensions-columns' ).val( 3 );
@@ -902,7 +902,7 @@ getDefaultConfig: function () {
 								e.preventDefault();
 							}
 						});
-						
+
 						// Make tabbing to a button and pressing
 						// Enter do what people expect
 						$(this).closest( '.ui-dialog' ).find( 'button' ).focus( function() {
@@ -964,28 +964,35 @@ getDefaultConfig: function () {
 				});
 				// Set tabindexes on form fields
 				$.wikiEditor.modules.dialogs.fn.setTabindexes( $(this).find( 'input' ).not( '[tabindex]' ) );
-				
+
 				// TODO: Find a cleaner way to share this function
 				$(this).data( 'replaceCallback', function( mode ) {
 					$( '#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex' ).hide();
+
+					// Search string cannot be empty
 					var searchStr = $( '#wikieditor-toolbar-replace-search' ).val();
 					if ( searchStr == '' ) {
 						$( '#wikieditor-toolbar-replace-emptysearch' ).show();
 						return;
 					}
+
+					// Replace string can be empty
 					var replaceStr = $( '#wikieditor-toolbar-replace-replace' ).val();
+
+					// Prepare the regular expression flags
 					var flags = 'm';
 					var matchCase = $( '#wikieditor-toolbar-replace-case' ).is( ':checked' );
-					var isRegex = $( '#wikieditor-toolbar-replace-regex' ).is( ':checked' );
 					if ( !matchCase ) {
 						flags += 'i';
 					}
-					if ( mode == 'replaceAll' ) {
-						flags += 'g';
-					}
+					var isRegex = $( '#wikieditor-toolbar-replace-regex' ).is( ':checked' );
 					if ( !isRegex ) {
 						searchStr = $.escapeRE( searchStr );
 					}
+					if ( mode == 'replaceAll' ) {
+						flags += 'g';
+					}
+
 					try {
 						var regex = new RegExp( searchStr, flags );
 					} catch( e ) {
@@ -995,22 +1002,28 @@ getDefaultConfig: function () {
 							.show();
 						return;
 					}
+
 					var $textarea = $(this).data( 'context' ).$textarea;
 					var text = $textarea.textSelection( 'getContents' );
 					var match = false;
-					var offset, s;
+					var offset, textRemainder;
 					if ( mode != 'replaceAll' ) {
-						offset = $(this).data( 'offset' );
-						s = text.substr( offset );
-						match = s.match( regex );
+						if (mode == 'replace') {
+							offset = $(this).data( 'matchIndex' );
+						} else {
+							offset = $(this).data( 'offset' );
+						}
+						textRemainder = text.substr( offset );
+						match = textRemainder.match( regex );
 					}
 					if ( !match ) {
 						// Search hit BOTTOM, continuing at TOP
+						// TODO: Add a "Wrap around" option.
 						offset = 0;
-						s = text;
-						match = s.match( regex );
+						textRemainder = text;
+						match = textRemainder.match( regex );
 					}
-					
+
 					if ( !match ) {
 						$( '#wikieditor-toolbar-replace-nomatch' ).show();
 					} else if ( mode == 'replaceAll' ) {
@@ -1022,14 +1035,14 @@ getDefaultConfig: function () {
 						// in Firefox/Webkit, but in IE replacing the entire content once is better.
 						var index;
 						for ( var i = 0; i < match.length; i++ ) {
-							index = s.indexOf( match[i] );
+							index = textRemainder.indexOf( match[i] );
 							if ( index == -1 ) {
 								// This shouldn't happen
 								break;
 							}
-							var matchedText = s.substr( index, match[i].length );
-							s = s.substr( index + match[i].length );
-							
+							var matchedText = textRemainder.substr( index, match[i].length );
+							textRemainder = textRemainder.substr( index + match[i].length );
+
 							var start = index + offset;
 							var end = start + match[i].length;
 							// Make regex placeholder substitution ($1) work
@@ -1048,27 +1061,63 @@ getDefaultConfig: function () {
 							.show();
 						$(this).data( 'offset', 0 );
 					} else {
-						// Make regex placeholder substitution ($1) work
-						var replace = isRegex ? match[0].replace( regex, replaceStr ): replaceStr;
-						var start = match.index + offset;
-						var end = start + match[0].length;
-						var newEnd = start + replace.length;
-						var context = $( this ).data( 'context' );
-						$textarea.textSelection( 'setSelection', { 'start': start,
-							'end': end } );
+						var start, end;
+
 						if ( mode == 'replace' ) {
-							$textarea
-								.textSelection( 'encapsulateSelection', {
-									'peri': replace,
-									'replace': true } )
-								.textSelection( 'setSelection', {
-									'start': start,
-									'end': newEnd } );
+							var actualReplacement;
+
+							if (isRegex) {
+								// If backreferences (like $1) are used, the actual actual replacement string will be different
+								actualReplacement = match[0].replace( regex, replaceStr );
+							} else {
+								actualReplacement = replaceStr;
+							}
+
+							if (match) {
+								// Do the replacement
+								$textarea.textSelection( 'encapsulateSelection', {
+										'peri': actualReplacement,
+										'replace': true } );
+								// Reload the text after replacement
+								text = $textarea.textSelection( 'getContents' );
+							}
+
+							// Find the next instance
+							offset = offset + match[0].length + actualReplacement.length;
+							textRemainder = text.substr( offset );
+							match = textRemainder.match( regex );
+
+							if (match) {
+								start = offset + match.index;
+								end = start + match[0].length;
+							} else {
+								// If no new string was found, try searching from the beginning.
+								// TODO: Add a "Wrap around" option.
+								textRemainder = text;
+								match = textRemainder.match( regex );
+								if (match) {
+									start = match.index;
+									end = start + match[0].length;
+								} else {
+									// Give up
+									start = 0;
+									end = 0;
+								}
+							}
+						} else {
+							start = offset + match.index;
+							end = start + match[0].length;
 						}
+
+						$( this ).data( 'matchIndex', start);
+
+						$textarea.textSelection( 'setSelection', {
+								'start': start,
+								'end': end
+						} );
 						$textarea.textSelection( 'scrollToCaretPosition' );
-						$textarea.textSelection( 'setSelection', { 'start': start,
-							'end': mode == 'replace' ? newEnd : end } );
-						$( this ).data( 'offset', mode == 'replace' ? newEnd : end );
+						$( this ).data( 'offset', end );
+						var context = $( this ).data( 'context' );
 						var textbox = typeof context.$iframe != 'undefined' ?
 								context.$iframe[0].contentWindow : $textarea[0];
 						textbox.focus();
@@ -1083,7 +1132,7 @@ getDefaultConfig: function () {
 						$(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target );
 						$(this).data( 'replaceCallback' ).call( this, 'find' );
 					},
-					'wikieditor-toolbar-tool-replace-button-replacenext': function( e ) {
+					'wikieditor-toolbar-tool-replace-button-replace': function( e ) {
 						$(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target );
 						$(this).data( 'replaceCallback' ).call( this, 'replace' );
 					},
@@ -1097,6 +1146,8 @@ getDefaultConfig: function () {
 				},
 				open: function() {
 					$(this).data( 'offset', 0 );
+					$(this).data( 'matchIndex', 0 );
+
 					$( '#wikieditor-toolbar-replace-search' ).focus();
 					$( '#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex' ).hide();
 					if ( !( $(this).data( 'onetimeonlystuff' ) ) ) {
@@ -1121,7 +1172,7 @@ getDefaultConfig: function () {
 					var context = $(this).data( 'context' );
 					var textbox = typeof context.$iframe != 'undefined' ?
 						context.$iframe[0].contentWindow.document : context.$textarea;
-						
+
 					$( textbox )
 						.bind( 'keypress.srdialog', function( e ) {
 							if ( ( e.keyCode || e.which ) == 13 ) {
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js
index 9b291466..6f5404f5 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.dialogs.js
@@ -45,12 +45,12 @@ api: {
 				$.wikiEditor.modules.dialogs.fn.reallyCreate( context, mod, module );
 				$dialog = $( '#' + mod.id );
 			}
-			
+
 			// Workaround for bug in jQuery UI: close button in top right retains focus
 			$dialog.closest( '.ui-dialog' )
 				.find( '.ui-dialog-titlebar-close' )
 				.removeClass( 'ui-state-focus' );
-			
+
 			$dialog.dialog( 'open' );
 		}
 	},
@@ -147,7 +147,7 @@ fn: {
 		dialogDiv.bind( 'dialogclose', function() {
 			context.fn.restoreSelection();
 		} );
-		
+
 		// Let the outside world know we set up this dialog
 		context.$textarea.trigger( 'wikiEditor-dialogs-loaded-' + name );
 	},
@@ -187,7 +187,7 @@ fn: {
 		$(this).css( 'white-space', oldWS );
 		oldHidden.each( function() {
 			$(this).attr( 'style', $(this).data( 'oldstyle' ) );
-		});		
+		});
 	},
 	/**
 	 * Set the right tabindexes on elements in a dialog
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.highlight.js b/extensions/WikiEditor/modules/jquery.wikiEditor.highlight.js
index c804b3aa..48140206 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.highlight.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.highlight.js
@@ -33,7 +33,7 @@
 'fn': {
 	/**
 	 * Creates a highlight module within a wikiEditor
-	 * 
+	 *
 	 * @param config Configuration object to create module from
 	 */
 	'create': function( context, config ) {
@@ -41,7 +41,7 @@
 	},
 	/**
 	 * Scans text division for tokens
-	 * 
+	 *
 	 * @param division
 	 */
 	'scan': function( context, division ) {
@@ -82,7 +82,7 @@
 	},
 	/**
 	 * Marks up text with HTML
-	 * 
+	 *
 	 * @param division
 	 * @param tokens
 	 */
@@ -91,7 +91,7 @@
 	'mark': function( context, division, tokens ) {
 		// Reset markers
 		var markers = [];
-		
+
 		// Recycle markers that will be skipped in this run
 		if ( context.modules.highlight.markers && division != '' ) {
 			for ( var i = 0; i < context.modules.highlight.markers.length; i++ ) {
@@ -101,11 +101,11 @@
 			}
 		}
 		context.modules.highlight.markers = markers;
-		
+
 		// Get all markers
 		context.fn.trigger( 'mark' );
 		markers.sort( function( a, b ) { return a.start - b.start || a.end - b.end; } );
-		
+
 		// Serialize the markers array to a string and compare it with the one stored in the previous run - if they're
 		// equal, there's no markers to change
 		var markersStr = '';
@@ -117,15 +117,15 @@
 			return;
 		}
 		context.modules.highlight.markersStr = markersStr;
-		
+
 		// Traverse the iframe DOM, inserting markers where they're needed - store visited markers here so we know which
 		// markers should be removed
 		var visited = [], v = 0;
 		for ( var i = 0; i < markers.length; i++ ) {
-			if ( typeof markers[i].skipDivision !== 'undefined' && ( division == markers[i].skipDivision ) ) { 
+			if ( typeof markers[i].skipDivision !== 'undefined' && ( division == markers[i].skipDivision ) ) {
 				continue;
 			}
-			
+
 			// We want to isolate each marker, so we may need to split textNodes if a marker starts or ends halfway one.
 			var start = markers[i].start;
 			var s = context.fn.getOffset( start );
@@ -134,7 +134,7 @@
 				continue;
 			}
 			var startNode = s.node;
-			
+
 			// Don't wrap leading BRs, produces undesirable results
 			// FIXME: It's also possible that the offset is a bit high because getOffset() has incremented .length to
 			// fake the newline caused by startNode being in a P. In this case, prevent the textnode splitting below
@@ -144,7 +144,7 @@
 				s = context.fn.getOffset( start );
 				startNode = s.node;
 			}
-			
+
 			// The next marker starts somewhere in this textNode or at this BR
 			if ( s.offset > 0 && s.node.nodeName == '#text' ) {
 				// Split off the prefix - this leaves the prefix in the current node and puts the rest in a new node
@@ -349,7 +349,7 @@
 			}
 			context.fn.purgeOffsets();
 		});
-		
+
 	}
 }
 
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.iframe.js b/extensions/WikiEditor/modules/jquery.wikiEditor.iframe.js
index 5a0cc153..4d425012 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.iframe.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.iframe.js
@@ -2,9 +2,9 @@
 
 ( function( $ ) { $.wikiEditor.extensions.iframe = function( context ) {
 
-/* 
+/*
  * Event Handlers
- * 
+ *
  * These act as filters returning false if the event should be ignored or returning true if it should be passed
  * on to all modules. This is also where we can attach some extra information to the events.
  */
@@ -130,13 +130,13 @@ context.evt = $.extend( context.evt, {
 		var cursorPos = context.fn.getCaretPosition();
 		var oldLength = context.fn.getContents().length;
 		var positionFromEnd = oldLength - cursorPos[1];
-		
-		//give everything the wikiEditor class so that we can easily pick out things without that class as pasted 
+
+		//give everything the wikiEditor class so that we can easily pick out things without that class as pasted
 		context.$content.find( '*' ).addClass( 'wikiEditor' );
 		if ( $.layout.name !== 'webkit' ) {
 			context.$content.addClass( 'pasting' );
 		}
-		
+
 		setTimeout( function() {
 			// Kill stuff we know we don't want
 			context.$content.find( 'script,style,img,input,select,textarea,hr,button,link,meta' ).remove();
@@ -156,7 +156,7 @@ context.evt = $.extend( context.evt, {
 			} else {
 				firstDirtyNode = elementAtCursor.node;
 			}
-			
+
 			//this is ugly but seems like the best way to handle the case where we select and replace all editor contents
 			try {
 				firstDirtyNode.parentNode;
@@ -164,11 +164,11 @@ context.evt = $.extend( context.evt, {
 				context.$content.prepend( '<p class = wikiEditor></p>' );
 				firstDirtyNode 	= context.$content.children()[0];
 			}
-			
+
 			while ( firstDirtyNode != null ) {
-				//we're going to replace the contents of the entire parent node. 
-				while ( firstDirtyNode.parentNode && firstDirtyNode.parentNode.nodeName != 'BODY' 
-					 && ! $( firstDirtyNode ).hasClass( 'wikiEditor' ) 
+				//we're going to replace the contents of the entire parent node.
+				while ( firstDirtyNode.parentNode && firstDirtyNode.parentNode.nodeName != 'BODY'
+					 && ! $( firstDirtyNode ).hasClass( 'wikiEditor' )
 					) {
 					firstDirtyNode = firstDirtyNode.parentNode;
 				}
@@ -176,33 +176,33 @@ context.evt = $.extend( context.evt, {
 				while ( firstDirtyNode.previousSibling != null
 						&& ! $( firstDirtyNode.previousSibling ).hasClass( 'wikiEditor' )
 					) {
-					
+
 					if ( $( firstDirtyNode.previousSibling ).hasClass( '#comment' ) ) {
 						$( firstDirtyNode ).remove();
 					} else {
 						firstDirtyNode = firstDirtyNode.previousSibling;
 					}
 				}
-				
+
 				if ( firstDirtyNode.previousSibling != null ) {
 					$lastDirtyNode 	= $( firstDirtyNode.previousSibling );
 				} else {
 					$lastDirtyNode 	= $( firstDirtyNode );
 				}
-			
+
 				var cc = makeContentCollector( $.browser, null );
 				while ( firstDirtyNode != null ) {
 					cc.collectContent(firstDirtyNode);
-					cc.notifyNextNode(firstDirtyNode.nextSibling); 
-					
+					cc.notifyNextNode(firstDirtyNode.nextSibling);
+
 					nodeToDelete.push( firstDirtyNode );
-					
+
 					firstDirtyNode = firstDirtyNode.nextSibling;
 					if ( $( firstDirtyNode ).hasClass( 'wikiEditor' ) ) {
 						break;
 					}
 				}
-				
+
 				var ccData = cc.finish();
 				pastedContent = ccData.lines;
 				var pastedPretty = '';
@@ -216,8 +216,8 @@ context.evt = $.extend( context.evt, {
 						leadingSpace = match[0].replace(/[\s]/g, '&nbsp;');
 						pastedPretty = leadingSpace + pastedPretty.substring(index, pastedPretty.length);
 					}
-					
-					
+
+
 					if( !pastedPretty && $.browser.msie && i == 0 ) {
 						continue;
 					}
@@ -228,17 +228,17 @@ context.evt = $.extend( context.evt, {
 						$newElement.html( '<br class="wikiEditor">' );
 					}
 					$newElement.insertAfter( $lastDirtyNode );
-					
+
 					$lastDirtyNode = $newElement;
-					
+
 				}
-				
+
 				//now delete all the original nodes that we prettified already
 				while ( nodeToDelete.length > 0 ) {
 					$deleteNode = $( nodeToDelete.pop() );
 					$deleteNode.remove();
 				}
-				
+
 				//anything without wikiEditor class was pasted.
 				$selection = context.$content.find( ':not(.wikiEditor)' );
 				if  ( $selection.length == 0 ) {
@@ -248,14 +248,14 @@ context.evt = $.extend( context.evt, {
 				}
 			}
 			context.$content.find( '.wikiEditor' ).removeClass( 'wikiEditor' );
-			
+
 			//now place the cursor at the end of pasted content
 			var newLength = context.fn.getContents().length;
 			var newPos = newLength - positionFromEnd;
-			
+
 			context.fn.purgeOffsets();
 			context.fn.setSelection( { start: newPos, end: newPos } );
-			
+
 			context.fn.scrollToCaretPosition();
 		}, 0 );
 		return true;
@@ -289,7 +289,7 @@ context.fn = $.extend( context.fn, {
 			return context.htmlToTextMap[html];
 		}
 		var origHTML = html;
-		
+
 		// We use this elaborate trickery for cross-browser compatibility
 		// IE does overzealous whitespace collapsing for $( '<pre />' ).html( html );
 		// We also do <br> and easy cases for <p> conversion here, complicated cases are handled later
@@ -320,7 +320,7 @@ context.fn = $.extend( context.fn, {
 			// If this <p> is preceded by some text, add a \n at the beginning, and if
 			// it's followed by a textnode, add a \n at the end
 			// We need the traverser because there can be other weird stuff in between
-			
+
 			// Check for preceding text
 			var t = new context.fn.rawTraverser( this.firstChild, this, $pre.get( 0 ), true ).prev();
 			while ( t && t.node.nodeName != '#text' && t.node.nodeName != 'BR' && t.node.nodeName != 'P' ) {
@@ -329,7 +329,7 @@ context.fn = $.extend( context.fn, {
 			if ( t ) {
 				text = "\n" + text;
 			}
-			
+
 			// Check for following text
 			t = new context.fn.rawTraverser( this.lastChild, this, $pre.get( 0 ), true ).next();
 			while ( t && t.node.nodeName != '#text' && t.node.nodeName != 'BR' && t.node.nodeName != 'P' ) {
@@ -377,7 +377,7 @@ context.fn = $.extend( context.fn, {
 			} else {
 				return null;
 			}
-			
+
 			// When the cursor is on an empty line, Opera gives us a bogus range object with
 			// startContainer=endContainer=body and startOffset=endOffset=1
 			var body = context.$iframe[0].contentWindow.document.body;
@@ -420,7 +420,7 @@ context.fn = $.extend( context.fn, {
 			}
 			e = newE || e;
 		}
-		
+
 		// We'd normally use if( $( e ).hasClass( class ) in the while loop, but running the jQuery
 		// constructor thousands of times is very inefficient
 		var classStr = ' ' + classname + ' ';
@@ -641,18 +641,18 @@ context.fn = $.extend( context.fn, {
 	 * Update the history queue
 	 *
 	 * @param htmlChange pass true or false to inidicate if there was a text change that should potentially
-	 * 	be given a new history state. 
+	 * 	be given a new history state.
 	 */
 	'updateHistory': function( htmlChange ) {
 		var newHTML = context.$content.html();
 		var newSel = context.fn.getCaretPosition();
-		// Was text changed? Was it because of a REDO or UNDO action? 
+		// Was text changed? Was it because of a REDO or UNDO action?
 		if (
 			context.history.length == 0 ||
 			( htmlChange && context.oldDelayedHistoryPosition == context.historyPosition )
 		) {
 			context.oldDelayedSel = newSel;
-			// Do we need to trim extras from our history? 
+			// Do we need to trim extras from our history?
 			// FIXME: this should really be happing on change, not on the delay
 			if ( context.historyPosition < -1 ) {
 				//clear out the extras
@@ -753,7 +753,7 @@ context.fn = $.extend( context.fn, {
 						/&lt;span( |&nbsp;)class=("|&quot;)wikiEditor-tab("|&quot;)&gt;&lt;\/span&gt;/g,
 						'<span class="wikiEditor-tab"></span>'
 					)
-					// Empty <p> tags need <br> tags in them 
+					// Empty <p> tags need <br> tags in them
 					.replace( /<p><\/p>/g, '<p><br></p>' )
 					// Unescape &esc; stuff
 					.replace( /&amp;esc;&amp;amp;nbsp;/g, '&amp;nbsp;' )
@@ -765,7 +765,7 @@ context.fn = $.extend( context.fn, {
 					)
 					.replace( /&amp;esc;esc;/g, '&amp;esc;' );
 				context.$content.html( html );
-				
+
 				// Reflect direction of parent frame into child
 				if ( $( 'body' ).is( '.rtl' ) ) {
 					context.$content.addClass( 'rtl' ).attr( 'dir', 'rtl' );
@@ -789,7 +789,7 @@ context.fn = $.extend( context.fn, {
 					.bind( 'keydown', function( event ) {
 						event.jQueryNode = context.fn.getElementAtCursor();
 						return context.fn.trigger( 'keydown', event );
-						
+
 					} )
 					.bind( 'keyup', function( event ) {
 						event.jQueryNode = context.fn.getElementAtCursor();
@@ -828,12 +828,12 @@ context.fn = $.extend( context.fn, {
 			}
 		};
 	},
-	
-	/*
+
+	/**
 	 * Compatibility with the $.textSelection jQuery plug-in. When the iframe is in use, these functions provide
 	 * equivilant functionality to the otherwise textarea-based functionality.
 	 */
-	
+
 	'getElementAtCursor': function() {
 		if ( context.$iframe[0].contentWindow.getSelection ) {
 			// Firefox and Opera
@@ -851,7 +851,7 @@ context.fn = $.extend( context.fn, {
 			return $( selection.parentElement() );
 		}
 	},
-	
+
 	/**
 	 * Gets the complete contents of the iframe (in plain text, not HTML)
 	 */
@@ -948,8 +948,8 @@ context.fn = $.extend( context.fn, {
 		if ( context.$iframe[0].contentWindow.getSelection ) {
 			// Firefox and Opera
 			var range = context.$iframe[0].contentWindow.getSelection().getRangeAt( 0 );
-			// if our test above indicated that this was a sucessive button press, we need to collapse the 
-			// selection to the end to avoid replacing text 
+			// if our test above indicated that this was a sucessive button press, we need to collapse the
+			// selection to the end to avoid replacing text
 			if ( collapseToEnd ) {
 				// Make sure we're not collapsing ourselves into a BR tag
 				if ( range.endContainer.nodeName == 'BR' ) {
@@ -1073,7 +1073,7 @@ context.fn = $.extend( context.fn, {
 				if ( range2.text != "\r" && range2.text != "\n" && range2.text != "" ) {
 					pre = "\n" + pre;
 				}
-				
+
 				// Check if we're at the end of a line
 				// If not, append a newline
 				var range3 = context.$iframe[0].contentWindow.document.selection.createRange();
@@ -1095,7 +1095,7 @@ context.fn = $.extend( context.fn, {
 				for( var j = 0; j < selTextArr.length; j++ ) {
 					insertText = insertText + pre + selTextArr[j] + post;
 					if( j != selTextArr.length - 1 ) {
-						insertText += "\n"; 
+						insertText += "\n";
 					}
 				}
 			} else {
@@ -1113,7 +1113,7 @@ context.fn = $.extend( context.fn, {
 				range.select();
 			}
 		}
-		
+
 		if ( setSelectionTo ) {
 			context.fn.setSelection( setSelectionTo );
 		}
@@ -1154,7 +1154,7 @@ context.fn = $.extend( context.fn, {
 				ec = n;
 				eo = 0;
 			}
-			
+
 			// Make sure sc and ec are leaf nodes
 			while ( sc.firstChild ) {
 				sc = sc.firstChild;
@@ -1292,7 +1292,7 @@ context.fn = $.extend( context.fn, {
 				// Give up
 				return context.$textarea;
 			}
-			
+
 			var sel = context.$iframe[0].contentWindow.getSelection();
 			while ( sc.firstChild && sc.nodeName != '#text' ) {
 				sc = sc.firstChild;
@@ -1314,14 +1314,14 @@ context.fn = $.extend( context.fn, {
 			}
 			range.collapse();
 			range.moveEnd( 'character', options.start );
-			
+
 			var range2 = context.$iframe[0].contentWindow.document.body.createTextRange();
 			if ( ec ) {
 				range2.moveToElementText( ec );
 			}
 			range2.collapse();
 			range2.moveEnd( 'character', options.end );
-			
+
 			// IE does newline emulation for <p>s: <p>foo</p><p>bar</p> becomes foo\nbar just fine
 			// but <p>foo</p><br><br><p>bar</p> becomes foo\n\n\n\nbar , one \n too many
 			// Correct for this
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.js b/extensions/WikiEditor/modules/jquery.wikiEditor.js
index 1f3d1fa5..c2fb4094 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.js
@@ -1,12 +1,12 @@
 /**
  * This plugin provides a way to build a wiki-text editing user interface around a textarea.
- * 
+ *
  * @example To intialize without any modules:
  * 		$( 'div#edittoolbar' ).wikiEditor();
- * 
+ *
  * @example To initialize with one or more modules, or to add modules after it's already been initialized:
  * 		$( 'textarea#wpTextbox1' ).wikiEditor( 'addModule', 'toolbar', { ... config ... } );
- * 
+ *
  */
 ( function( $ ) {
 
@@ -117,7 +117,7 @@ $.wikiEditor = {
 	/**
 	 * Provides a way to extract messages from objects. Wraps the mediaWiki.msg() function, which
 	 * may eventually become a wrapper for some kind of core MW functionality.
-	 * 
+	 *
 	 * @param object Object to extract messages from
 	 * @param property String of name of property which contains the message. This should be the base name of the
 	 * property, which means that in the case of the object { this: 'that', fooMsg: 'bar' }, passing property as 'this'
@@ -152,7 +152,7 @@ $.wikiEditor = {
 	 * 'default' or 'default-rtl'. If such key doesn't exist, the object itself is considered the actual value, which
 	 * should ideally be the case so that you may use a string or object of any number of strings keyed by language
 	 * with a default.
-	 * 
+	 *
 	 * @param object Object to extract property from
 	 * @param lang Language code, defaults to wgUserLanguage
 	 */
@@ -163,7 +163,7 @@ $.wikiEditor = {
 	/**
 	 * Provides a way to extract the path of an icon in a certain language, automatically appending a version number for
 	 * caching purposes and prepending an image path when icon paths are relative.
-	 * 
+	 *
 	 * @param icon Icon object from e.g. toolbar config
 	 * @param path Default icon path, defaults to $.wikiEditor.imgPath
 	 * @param lang Language code, defaults to wgUserLanguage
@@ -214,7 +214,7 @@ if ( !$.wikiEditor.isSupported() ) {
 var context = $(this).data( 'wikiEditor-context' );
 // On first call, we need to set things up, but on all following calls we can skip right to the API handling
 if ( !context || typeof context == 'undefined' ) {
-	
+
 	// Star filling the context with useful data - any jQuery selections, as usual should be named with a preceding $
 	context = {
 		// Reference to the textarea element which the wikiEditor is being built around
@@ -248,18 +248,18 @@ if ( !context || typeof context == 'undefined' ) {
 		// List of extensions active on this context
 		'extensions': []
 	};
-	
-	/*
+
+	/**
 	 * Externally Accessible API
-	 * 
+	 *
 	 * These are available using calls to $(selection).wikiEditor( call, data ) where selection is a jQuery selection
 	 * of the textarea that the wikiEditor instance was built around.
 	 */
-	
+
 	context.api = {
 		/**
 		 * Activates a module on a specific context with optional configuration data.
-		 * 
+		 *
 		 * @param data Either a string of the name of a module to add without any additional configuration parameters,
 		 * or an object with members keyed with module names and valued with configuration objects.
 		 */
@@ -272,7 +272,7 @@ if ( !context || typeof context == 'undefined' ) {
 			}
 			for ( var module in modules ) {
 				// Check for the existance of an available / supported module with a matching name and a create function
-				if ( typeof module == 'string' && typeof $.wikiEditor.modules[module] !== 'undefined' && 
+				if ( typeof module == 'string' && typeof $.wikiEditor.modules[module] !== 'undefined' &&
 						$.wikiEditor.isSupported( $.wikiEditor.modules[module] ) )
 				{
 					// Extend the context's core API with this module's own API calls
@@ -295,20 +295,20 @@ if ( !context || typeof context == 'undefined' ) {
 			}
 		}
 	};
-	
-	/* 
+
+	/**
 	 * Event Handlers
-	 * 
+	 *
 	 * These act as filters returning false if the event should be ignored or returning true if it should be passed
 	 * on to all modules. This is also where we can attach some extra information to the events.
 	 */
-	
+
 	context.evt = {
 		/* Empty until extensions add some; see jquery.wikiEditor.iframe.js for examples. */
 	};
-	
+
 	/* Internal Functions */
-	
+
 	context.fn = {
 		/**
 		 * Executes core event filters as well as event handlers provided by modules.
@@ -322,7 +322,7 @@ if ( !context || typeof context == 'undefined' ) {
 			if ( typeof event.data == 'undefined' ) {
 				event.data = {};
 			}
-			
+
 			// Allow filtering to occur
 			if ( name in context.evt ) {
 				if ( !context.evt[name]( event ) ) {
@@ -331,7 +331,7 @@ if ( !context || typeof context == 'undefined' ) {
 			}
 			var returnFromModules = null; //they return null by default
 			// Pass the event around to all modules activated on this context
-			
+
 			for ( var module in context.modules ) {
 				if (
 					module in $.wikiEditor.modules &&
@@ -342,10 +342,10 @@ if ( !context || typeof context == 'undefined' ) {
 					if (ret != null) {
 						//if 1 returns false, the end result is false
 						if( returnFromModules == null ) {
-							returnFromModules = ret; 
+							returnFromModules = ret;
 						} else {
 							returnFromModules = returnFromModules && ret;
-						} 
+						}
 					}
 				}
 			}
@@ -460,15 +460,15 @@ if ( !context || typeof context == 'undefined' ) {
 			}
 		}
 	};
-	
-	/*
+
+	/**
 	 * Base UI Construction
-	 * 
+	 *
 	 * The UI is built from several containers, the outer-most being a div classed as "wikiEditor-ui". These containers
 	 * provide a certain amount of "free" layout, but in some situations procedural layout is needed, which is performed
 	 * as a response to the "resize" event.
 	 */
-	
+
 	// Assemble a temporary div to place over the wikiEditor while it's being constructed
 	/* Disabling our loading div for now
 	var $loader = $( '<div></div>' )
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.preview.js b/extensions/WikiEditor/modules/jquery.wikiEditor.preview.js
index 634672a8..22c6d89e 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.preview.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.preview.js
@@ -78,7 +78,7 @@ fn: {
 				);
 			}
 		} );
-		
+
 		context.$changesTab = context.fn.addView( {
 			'name': 'changes',
 			'titleMsg': 'wikieditor-preview-changes-tab',
@@ -91,7 +91,7 @@ fn: {
 				}
 				context.$changesTab.find( 'table.diff tbody' ).empty();
 				context.$changesTab.find( '.wikiEditor-preview-loading' ).show();
-				
+
 				// Call the API. First PST the input, then diff it
 				var postdata = {
 					'action': 'parse',
@@ -99,7 +99,7 @@ fn: {
 					'text': wikitext,
 					'format': 'json'
 				};
-				
+
 				$.post( mw.util.wikiScript( 'api' ), postdata, function( data ) {
 					try {
 						var postdata2 = {
@@ -114,7 +114,7 @@ fn: {
 						var section = $( '[name=wpSection]' ).val();
 						if ( section != '' )
 							postdata2['rvsection'] = section;
-						
+
 						$.post( mw.util.wikiScript( 'api' ), postdata2, function( data ) {
 								// Add diff CSS
 								mw.loader.load( 'mediawiki.action.history.diff' );
@@ -133,7 +133,7 @@ fn: {
 				}, 'json' );
 			}
 		} );
-		
+
 		var loadingMsg = mediaWiki.msg( 'wikieditor-preview-loading' );
 		context.modules.preview.$preview
 			.add( context.$changesTab )
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.previewDialog.js b/extensions/WikiEditor/modules/jquery.wikiEditor.previewDialog.js
index 72003055..ca88c79a 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.previewDialog.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.previewDialog.js
@@ -81,7 +81,7 @@ fn: {
 							if ( context.modules.preview.previewText == wikitext ) {
 								return;
 							}
-							
+
 							$dialog.find( '.wikiEditor-preview-dialog-contents' ).empty();
 							$dialog.find( '.wikiEditor-ui-loading' ).show();
 							$.post(
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js b/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js
index 5a758e43..5a3b6cd6 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.publish.js
@@ -65,7 +65,7 @@ fn: {
 						$(this).find( '[rel]' ).each( function() {
 							$(this).text( mediaWiki.msg( $(this).attr( 'rel' ) ) );
 						});
-						
+
 						/* REALLY DIRTY HACK! */
 						// Reformat the copyright warning stuff
 						var copyWarnHTML = $( '#editpage-copywarn p' ).html();
@@ -80,11 +80,11 @@ fn: {
 						}
 						newCopyWarnHTML += '</ul>';
 						// No list if there's only one element
-						$(this).find( '.wikiEditor-publish-dialog-copywarn' ).html( 
+						$(this).find( '.wikiEditor-publish-dialog-copywarn' ).html(
 								copyWarnStatements.length > 1 ? newCopyWarnHTML : copyWarnHTML
 						);
 						/* END OF REALLY DIRTY HACK */
-						
+
 						if ( $( '#wpMinoredit' ).size() == 0 )
 							$( '#wikiEditor-' + context.instance + '-dialog-minor' ).hide();
 						else if ( $( '#wpMinoredit' ).is( ':checked' ) )
@@ -95,7 +95,7 @@ fn: {
 						else if ( $( '#wpWatchthis' ).is( ':checked' ) )
 							$( '#wikiEditor-' + context.instance + '-dialog-watch' )
 								.attr( 'checked', 'checked' );
-						
+
 						$(this).find( 'form' ).submit( function( e ) {
 							$(this).closest( '.ui-dialog' ).find( 'button:first' ).click();
 							e.preventDefault();
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.templateEditor.js b/extensions/WikiEditor/modules/jquery.wikiEditor.templateEditor.js
index 794bddc7..9857b9e8 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.templateEditor.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.templateEditor.js
@@ -6,9 +6,9 @@
 'nameMappings': { //keep these all lowercase to navigate web of redirects
    "infobox skyscraper": "building_name",
    "infobox settlement": "official_name"
-},		
+},
+
 
-		
 /**
  * Compatability map
  */
@@ -36,13 +36,13 @@
  * Event handlers
  */
 evt: {
-	
+
 	mark: function( context, event ) {
 		// The markers returned by this function are skipped on realchange, so don't regenerate them in that case
 		if ( context.modules.highlight.currentScope == 'realchange' ) {
 			return;
 		}
-		
+
 		// Get references to the markers and tokens from the current context
 		var markers = context.modules.highlight.markers;
 		var tokenArray = context.modules.highlight.tokenArray;
@@ -96,10 +96,10 @@ evt: {
 								// No change
 								return;
 							}
-							
+
 							// Text changed, regenerate model
 							var model = $.wikiEditor.modules.templateEditor.fn.updateModel( $( node ) );
-							
+
 							// Update template name if needed
 							if ( $( node ).parent().hasClass( 'wikiEditor-template' ) ) {
 								var $label = $( node ).parent().find( '.wikiEditor-template-label' );
@@ -108,7 +108,7 @@ evt: {
 									$label.text( displayName );
 								}
 							}
-							
+
 							// Wrap or unwrap the template if needed
 							if ( $( node ).parent().hasClass( 'wikiEditor-template' ) &&
 									!model.isCollapsible() ) {
@@ -133,7 +133,7 @@ evt: {
 			}//if opentemplates
 		}
 	}, //mark
-	
+
 	keydown: function( context, event ) {
 		// Reset our ignoreKeypress variable if it's set to true
 		if ( context.$iframe.data( 'ignoreKeypress' ) ) {
@@ -156,7 +156,7 @@ evt: {
 				case 38:// Up
 				case 39:// Right
 				case 40: //Down
-					return true; 
+					return true;
 				default:
 					// Set the ignroreKeypress variable so we don't allow typing if the key is held
 					context.$iframe.data( 'ignoreKeypress', true );
@@ -197,7 +197,7 @@ exp: [
 	{ 'regex': /}}/, 'label': "TEMPLATE_END", 'markAfter': true }
 ],
 /**
- * Configuration 
+ * Configuration
  */
 cfg: {
 },
@@ -229,7 +229,7 @@ fn: {
 			.prepend(
 				'<span class="wikiEditor-template-expand wikiEditor-noinclude"></span>' +
 				'<span class="wikiEditor-template-name wikiEditor-noinclude">' +
-					'<span class="wikiEditor-template-label wikiEditor-noinclude">' + 
+					'<span class="wikiEditor-template-label wikiEditor-noinclude">' +
 					$.wikiEditor.modules.templateEditor.fn.getTemplateDisplayName( model ) + '</span>' +
 					'<span class="wikiEditor-template-dialog wikiEditor-noinclude"></span>' +
 				'</span>'
@@ -252,21 +252,21 @@ fn: {
 		if ( typeof ( opera ) == "undefined" ) {
 			$template.parent().attr('contentEditable', 'false');
 		}
-		
+
 		$template.click( function(event) {event.preventDefault(); return false;} );
-		
+
 		$template.find( '.wikiEditor-template-name' )
-			.click( function( event ) { 
-				$.wikiEditor.modules.templateEditor.fn.createDialog( $wrapper ); 
-				event.stopPropagation(); 
-				return false; 
+			.click( function( event ) {
+				$.wikiEditor.modules.templateEditor.fn.createDialog( $wrapper );
+				event.stopPropagation();
+				return false;
 				} )
 			.mousedown( function( event ) { event.stopPropagation(); return false; } );
 		$template.find( '.wikiEditor-template-expand' )
-			.click( function( event ) { 
-				$.wikiEditor.modules.templateEditor.fn.toggleWikiTextEditor( $wrapper ); 
+			.click( function( event ) {
+				$.wikiEditor.modules.templateEditor.fn.toggleWikiTextEditor( $wrapper );
 				event.stopPropagation();
-				return false; 
+				return false;
 				} )
 			.mousedown( function( event ) { event.stopPropagation(); return false; } );
 	},
@@ -281,22 +281,22 @@ fn: {
 		$template
 			.toggleClass( 'wikiEditor-template-expanded' )
 			.toggleClass( 'wikiEditor-template-collapsed' ) ;
-		
-		var $templateText = $template.find( '.wikiEditor-template-text' );		
+
+		var $templateText = $template.find( '.wikiEditor-template-text' );
 		$templateText.toggleClass( 'wikiEditor-template-text-shrunken' );
 		$templateText.toggleClass( 'wikiEditor-template-text-visible' );
 		if( $templateText.hasClass('wikiEditor-template-text-shrunken') ){
 			//we just closed the template
-		
+
 			// Update the model if we need to
 			if ( $templateText.html() != $templateText.data( 'oldHTML' ) ) {
 				var templateModel = $.wikiEditor.modules.templateEditor.fn.updateModel( $templateText );
-				
+
 				//this is the only place the template name can be changed; keep the template name in sync
 				var $tLabel = $template.find( '.wikiEditor-template-label' );
 				$tLabel.text( $.wikiEditor.modules.templateEditor.fn.getTemplateDisplayName( templateModel ) );
 			}
-			
+
 		}
 	},
 	/**
@@ -424,10 +424,10 @@ fn: {
 					// Remove any leftover rows
 					$rows.remove();
 					$fields.find( 'label' ).autoEllipsis();
-					// Ensure our close button doesn't recieve the ui-state-focus class 
+					// Ensure our close button doesn't recieve the ui-state-focus class
 					$( this ).parent( '.ui-dialog' ).find( '.ui-dialog-titlebar-close' )
 						.removeClass( 'ui-state-focus' );
-					
+
 					// Set tabindexes on form fields if needed
 					// First unset the tabindexes on the buttons and existing form fields
 					// so the order doesn't get messed up
@@ -470,7 +470,7 @@ fn: {
 		}
 		return model;
 	},
-	
+
 	/**
 	 * Gets template display name
 	 */
@@ -485,24 +485,24 @@ fn: {
 		}
 		return tName;
 	},
-	
+
 	/**
 	 * Builds a template model from given wikitext representation, allowing object-oriented manipulation of the contents
 	 * of the template while preserving whitespace and formatting.
-	 * 
+	 *
 	 * @param wikitext String of wikitext content
 	 */
 	model: function( wikitext ) {
-		
+
 		/* Private members */
-		
+
 		var collapsible = true;
-		
+
 		/* Private Functions */
-		
+
 		/**
 		 * Builds a Param object.
-		 * 
+		 *
 		 * @param name
 		 * @param value
 		 * @param number
@@ -520,7 +520,7 @@ fn: {
 		}
 		/**
 		 * Builds a Range object.
-		 * 
+		 *
 		 * @param begin
 		 * @param end
 		 */
@@ -530,7 +530,7 @@ fn: {
 		}
 		/**
 		 * Set 'original' to true if you want the original value irrespective of whether the model's been changed
-		 * 
+		 *
 		 * @param name
 		 * @param value
 		 * @param original
@@ -567,9 +567,9 @@ fn: {
 			}
 			return retVal;
 		};
-		
+
 		/* Public Functions */
-		
+
 		/**
 		 * Get template name
 		 */
@@ -582,7 +582,7 @@ fn: {
 		};
 		/**
 		 * Set template name (if we want to support this)
-		 * 
+		 *
 		 * @param name
 		 */
 		this.setName = function( name ) {
@@ -590,7 +590,7 @@ fn: {
 		};
 		/**
 		 * Set value for a given param name / number
-		 * 
+		 *
 		 * @param name
 		 * @param value
 		 */
@@ -599,7 +599,7 @@ fn: {
 		};
 		/**
 		 * Get value for a given param name / number
-		 * 
+		 *
 		 * @param name
 		 */
 		this.getValue = function( name ) {
@@ -607,7 +607,7 @@ fn: {
 		};
 		/**
 		 * Get original value of a param
-		 * 
+		 *
 		 * @param name
 		 */
 		this.getOriginalValue = function( name ) {
@@ -645,11 +645,11 @@ fn: {
 			}
 			return newText;
 		};
-		
+
 		this.isCollapsible = function() {
 			return collapsible;
 		};
-		
+
 		/**
 		 *  Update ranges if there's been a change in one or more 'segments' of the template.
 		 *  Removes adjustment function so adjustment is only made once ever.
@@ -668,7 +668,7 @@ fn: {
 				ranges[i].end += adjustment;
 			}
 		};
-		
+
 		// Whitespace* {{ whitespace* nonwhitespace:
 		if ( wikitext.match( /\s*{{\s*[^\s|]*:/ ) ) {
 			collapsible = false; // is a parser function
@@ -685,8 +685,8 @@ fn: {
 			sanatizedStr = sanatizedStr.substring( 0, endBraces.index ) + "  " +
 				sanatizedStr.substring( endBraces.index + 2 );
 		}
-		
-		
+
+
 		//treat HTML comments like whitespace
 		while ( sanatizedStr.indexOf( '<!' ) != -1 ) {
 			startIndex = sanatizedStr.indexOf( '<!' );
@@ -698,7 +698,7 @@ fn: {
 			sanatizedStr =
 				sanatizedStr.substring( 0, startIndex ) + sanatizedSegment + sanatizedStr.substring( endIndex );
 		}
-		
+
 		// Match the open braces we just found with equivalent closing braces note, works for any level of braces
 		while ( sanatizedStr.indexOf( '{{' ) != -1 ) {
 			startIndex = sanatizedStr.indexOf( '{{' ) + 1;
@@ -725,7 +725,7 @@ fn: {
 			sanatizedStr =
 				sanatizedStr.substring( 0, startIndex ) + sanatizedSegment + sanatizedStr.substring( endIndex );
 		}
-		
+
 		/*
 		 * Parse 1 param at a time
 		 */
@@ -771,11 +771,11 @@ fn: {
 			currentField = sanatizedStr.substring( oldDivider+1, divider );
 			if ( currentField.indexOf( '=' ) == -1 ) {
 				// anonymous field, gets a number
-				
+
 				//default values, since we'll allow empty values
 				valueBeginIndex = oldDivider + 1;
 				valueEndIndex = oldDivider + 1;
-				
+
 				valueBegin = currentField.match( /\S+/ ); //first nonwhitespace character
 				if( valueBegin != null ){
 					valueBeginIndex = valueBegin.index + oldDivider+1;
@@ -816,16 +816,16 @@ fn: {
 					continue;
 				}
 				nameEndIndex = nameEnd.index + oldDivider + 2;
-				// All the chars upto now 
+				// All the chars upto now
 				ranges.push( new Range( ranges[ranges.length-1].end, nameBeginIndex ) );
 				nameIndex = ranges.push( new Range( nameBeginIndex, nameEndIndex ) ) - 1;
 				currentValue = currentField.substring( currentField.indexOf( '=' ) + 1);
 				oldDivider += currentField.indexOf( '=' ) + 1;
-				
+
 				//default values, since we'll allow empty values
 				valueBeginIndex = oldDivider + 1;
 				valueEndIndex = oldDivider + 1;
-				
+
 				// First nonwhitespace character
 				valueBegin = currentValue.match( /\S+/ );
 				if( valueBegin != null ){
@@ -853,7 +853,7 @@ fn: {
 		}
 		// The rest of the string
 		ranges.push( new Range( valueEndIndex, wikitext.length ) );
-		
+
 		// Save vars
 		this.ranges = ranges;
 		this.wikitext = wikitext;
@@ -861,5 +861,5 @@ fn: {
 		this.paramsByName = paramsByName;
 		this.templateNameIndex = templateNameIndex;
 	} //model
-} 
+}
 }; } )( jQuery );
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js b/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js
index a01335e2..a714d253 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toc.js
@@ -70,11 +70,11 @@ evt: {
 	},
 	resize: function( context, event ) {
 		var availableWidth = context.$wikitext.width() - parseFloat( $.wikiEditor.modules.toc.cfg.textMinimumWidth ),
-			totalMinWidth = parseFloat( $.wikiEditor.modules.toc.cfg.minimumWidth ) + 
+			totalMinWidth = parseFloat( $.wikiEditor.modules.toc.cfg.minimumWidth ) +
 				parseFloat( $.wikiEditor.modules.toc.cfg.textMinimumWidth );
 		context.$ui.find( '.wikiEditor-ui-right' )
 			.resizable( 'option', 'maxWidth', availableWidth );
-		if ( context.modules.toc.$toc.data( 'positionMode' ) != 'disabled' && 
+		if ( context.modules.toc.$toc.data( 'positionMode' ) != 'disabled' &&
 			context.$wikitext.width() < totalMinWidth ) {
 				$.wikiEditor.modules.toc.fn.disable( context );
 		} else if ( context.modules.toc.$toc.data( 'positionMode' ) == 'disabled'  &&
@@ -97,7 +97,7 @@ evt: {
 		// reset the height of the TOC
 		if ( !context.modules.toc.$toc.data( 'collapsed' ) ){
 			context.modules.toc.$toc.height(
-				context.$ui.find( '.wikiEditor-ui-left' ).height() - 
+				context.$ui.find( '.wikiEditor-ui-left' ).height() -
 				context.$ui.find( '.tab-toc' ).outerHeight()
 			);
 		}
@@ -219,20 +219,20 @@ fn: {
 			// store position mode
 			context.modules.toc.$toc.data( 'positionMode', 'goofy' );
 			// store the width of the TOC, to ensure we dont allow it to be larger than this when switching back
-			context.modules.toc.$toc.data( 'positionModeChangeAt', 
+			context.modules.toc.$toc.data( 'positionModeChangeAt',
 				context.$ui.find( '.wikiEditor-ui-right' ).width() );
 			width = $.wikiEditor.modules.toc.cfg.textMinimumWidth;
 			// set our styles for goofy mode
 			context.$ui.find( '.wikiEditor-ui-left' )
 				.css( $.wikiEditor.modules.toc.cfg.flexProperty, '')
 				.css( { 'position': 'absolute', 'float': 'none',
-					'left': $.wikiEditor.modules.toc.cfg.rtl ? 'auto': 0, 
+					'left': $.wikiEditor.modules.toc.cfg.rtl ? 'auto': 0,
 					'right' : $.wikiEditor.modules.toc.cfg.rtl ? 0 : 'auto' } )
 				.children()
 				.css( $.wikiEditor.modules.toc.cfg.flexProperty, '' );
 			context.$ui.find( '.wikiEditor-ui-right' )
 				.css( { 'width': 'auto', 'position': 'absolute', 'float': 'none',
-				'right': $.wikiEditor.modules.toc.cfg.rtl ? 'auto': 0, 
+				'right': $.wikiEditor.modules.toc.cfg.rtl ? 'auto': 0,
 				'left' : $.wikiEditor.modules.toc.cfg.rtl ? 0 : 'auto' } );
 			context.$wikitext
 				.css( 'position', 'relative' );
@@ -296,7 +296,7 @@ fn: {
 	 * @param {Object} context
 	 */
 	update: function( context ) {
-		//temporarily commenting this out because it is causing all kinds of cursor 
+		//temporarily commenting this out because it is causing all kinds of cursor
 		//and text jumping issues in IE. WIll get back to this --pdhanda
 		/*
 		var div = context.fn.beforeSelection( 'wikiEditor-toc-header' );
@@ -304,16 +304,16 @@ fn: {
 			// beforeSelection couldn't figure it out, keep the old highlight state
 			return;
 		}
-		
+
 		$.wikiEditor.modules.toc.fn.unhighlight( context );
 		var section = div.data( 'section' ) || 0;
 		if ( context.data.outline.length > 0 ) {
 			var sectionLink = context.modules.toc.$toc.find( 'div.section-' + section );
 			sectionLink.addClass( 'current' );
-			
+
 			// Scroll the highlighted link into view if necessary
 			var relTop = sectionLink.offset().top - context.modules.toc.$toc.offset().top;
-			
+
 			var scrollTop = context.modules.toc.$toc.scrollTop();
 			var divHeight = context.modules.toc.$toc.height();
 			var sectionHeight = sectionLink.height();
@@ -326,14 +326,14 @@ fn: {
 		}
 		*/
 	},
-	
+
 	/**
 	 * Collapse the contents module
 	 *
 	 * @param {Object} event Event object with context as data
 	 */
 	collapse: function( event ) {
-		var $this = $( this ), 
+		var $this = $( this ),
 			context = $this.data( 'context' );
 		if( context.modules.toc.$toc.data( 'positionMode' ) == 'goofy' ) {
 			$.wikiEditor.modules.toc.fn.switchLayout( context );
@@ -348,15 +348,15 @@ fn: {
 				$( this ).css( $.wikiEditor.modules.toc.cfg.flexProperty, 0 );
 			} )
 			.children()
-			.animate( leftChildParam, 'fast',  function() { 
-				$( this ).css( $.wikiEditor.modules.toc.cfg.flexProperty, 0 ); 
+			.animate( leftChildParam, 'fast',  function() {
+				$( this ).css( $.wikiEditor.modules.toc.cfg.flexProperty, 0 );
 			} );
 		context.$ui.find( '.wikiEditor-ui-right' )
-			.css( { 
-				'marginTop' : '1px', 
-				'position' : 'absolute', 
-				'left' : $.wikiEditor.modules.toc.cfg.rtl ? 0 : 'auto', 
-				'right' : $.wikiEditor.modules.toc.cfg.rtl ? 'auto' : 0, 
+			.css( {
+				'marginTop' : '1px',
+				'position' : 'absolute',
+				'left' : $.wikiEditor.modules.toc.cfg.rtl ? 0 : 'auto',
+				'right' : $.wikiEditor.modules.toc.cfg.rtl ? 'auto' : 0,
 				'top' : pT } )
 			.fadeOut( 'fast', function() {
 				$( this ).hide()
@@ -366,11 +366,11 @@ fn: {
 				context.fn.trigger( 'tocCollapse' );
 				context.fn.trigger( 'resize' );
 			 } );
-			
+
 		$.cookie( 'wikiEditor-' + context.instance + '-toc-width', 0 );
 		return false;
 	},
-	
+
 	/**
 	 * Expand the contents module
 	 *
@@ -472,7 +472,7 @@ fn: {
 						$( this ).addClass( 'current' );
 						//$( this ).removeClass( 'current' );
 						setTimeout( function() { $.wikiEditor.modules.toc.fn.unhighlight( context ) }, 1000 );
-						
+
 						if ( typeof $.trackAction != 'undefined' )
 							$.trackAction( 'ntoc.heading' );
 						event.preventDefault();
@@ -541,7 +541,7 @@ fn: {
 				.data( 'resizableDone', true )
 				.find( '.wikiEditor-ui-right' )
 				.data( 'wikiEditor-ui-left', context.$ui.find( '.wikiEditor-ui-left' ) )
-				.resizable( { handles: 'w,e', preventPositionLeftChange: true, 
+				.resizable( { handles: 'w,e', preventPositionLeftChange: true,
 					minWidth: parseFloat( $.wikiEditor.modules.toc.cfg.minimumWidth ),
 					start: function( e, ui ) {
 						var $this = $( this );
@@ -557,7 +557,7 @@ fn: {
 								'right': 0
 							} )
 							.appendTo( context.$ui.find( '.wikiEditor-ui-left' ) );
-						$this.resizable( 'option', 'maxWidth', $this.parent().width() - 
+						$this.resizable( 'option', 'maxWidth', $this.parent().width() -
 							parseFloat( $.wikiEditor.modules.toc.cfg.textMinimumWidth ) );
 						if(context.modules.toc.$toc.data( 'positionMode' ) == 'goofy' ) {
 							$.wikiEditor.modules.toc.fn.switchLayout( context );
@@ -611,7 +611,7 @@ fn: {
 				$.wikiEditor.modules.toc.fn.redraw( context, initialWidth );
 			}
 		}
-		
+
 		// Normalize heading levels for list creation
 		// This is based on Linker::generateTOC(), so it should behave like the
 		// TOC on rendered articles does - which is considdered to be correct
@@ -640,7 +640,7 @@ fn: {
 				structure.unshift( { 'text': mw.config.get( 'wgPageName' ).replace( /_/g, ' ' ), 'level': 1, 'index': 0 } );
 			}
 			context.modules.toc.$toc.html( buildList( structure ) );
-			
+
 			if ( !context.$ui.data( 'resizableDone' ) ) {
 				buildResizeControls();
 				buildCollapseControls();
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
index ab92d173..15ecb36a 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.config.js
@@ -492,12 +492,12 @@ getDefaultConfig: function() {
 						"\u0127", "\u00cd", "\u00ed", "\u00cc", "\u00ec", "\u00ce", "\u00ee", "\u00cf", "\u00ef",
 						"\u0128", "\u0129", "\u01cf", "\u01d0", "\u012a", "\u012b", "\u012c", "\u012d", "\u0130",
 						"\u0131", "\u012e", "\u012f", "\u0134", "\u0135", "\u0136", "\u0137", "\u0139", "\u013a",
-						"\u013b", "\u013c", "\u013d", "\u013e", "\u0141", "\u0142", "\u013f", "\u0140", "\u0143",
-						"\u0144", "\u00d1", "\u00f1", "\u0145", "\u0146", "\u0147", "\u0148", "\u00d3", "\u00f3",
-						"\u00d2", "\u00f2", "\u00d4", "\u00f4", "\u00d6", "\u00f6", "\u00d5", "\u00f5", "\u01d1",
-						"\u01d2", "\u014c", "\u014d", "\u014e", "\u014f", "\u01ea", "\u01eb", "\u0150", "\u0151",
-						"\u0154", "\u0155", "\u0156", "\u0157", "\u0158", "\u0159", "\u015a", "\u015b", "\u015c",
-						"\u015d", "\u015e", "\u015f", "\u0160", "\u0161", "\u0162", "\u0163", "\u0164", "\u0165",
+						"\u013b", "\u013c", "\u013d", "\u013e", "\u0141", "\u0142", "\u0143", "\u0144", "\u00d1",
+						"\u00f1", "\u0145", "\u0146", "\u0147", "\u0148", "\u00d3", "\u00f3", "\u00d2", "\u00f2",
+						"\u00d4", "\u00f4", "\u00d6", "\u00f6", "\u00d5", "\u00f5", "\u01d1", "\u01d2", "\u014c",
+						"\u014d", "\u014e", "\u014f", "\u01ea", "\u01eb", "\u0150", "\u0151", "\u0154", "\u0155",
+						"\u0156", "\u0157", "\u0158", "\u0159", "\u015a", "\u015b", "\u015c", "\u015d", "\u015e",
+						"\u015f", "\u0160", "\u0161", "\u0218", "\u0219", "\u021a", "\u021b", "\u0164", "\u0165",
 						"\u00da", "\u00fa", "\u00d9", "\u00f9", "\u00db", "\u00fb", "\u00dc", "\u00fc", "\u0168",
 						"\u0169", "\u016e", "\u016f", "\u01d3", "\u01d4", "\u016a", "\u016b", "\u01d6", "\u01d8",
 						"\u01da", "\u01dc", "\u016c", "\u016d", "\u0172", "\u0173", "\u0170", "\u0171", "\u0174",
@@ -749,7 +749,7 @@ getDefaultConfig: function() {
 						"\u06D4", "\u06FD", "\u06FE",
 						// special digits
 						"\u06F0", "\u06F1", "\u06F2", "\u06F3", "\u06F4", "\u06F5", "\u06F6", "\u06F7",
-						"\u06F8", "\u06F9",
+						"\u06F8", "\u06F9"
 					]
 				},
 				'hebrew': {
diff --git a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js
index 7a72c923..20d8ecd9 100644
--- a/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js
+++ b/extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js
@@ -438,13 +438,13 @@ fn: {
 		}
 	},
 	buildBookmark : function( context, id, page ) {
-		var label = $.wikiEditor.autoMsg( page,
-		'label' );
+		var label = $.wikiEditor.autoMsg( page, 'label' );
 		return $( '<div/>' )
 			.text( label )
 			.attr( 'rel', id )
 			.data( 'context', context )
 			.mousedown( function( e ) {
+				context.fn.saveCursorAndScrollTop();
 				// No dragging!
 				e.preventDefault();
 				return false;
@@ -464,6 +464,7 @@ fn: {
 				if ( $.trackAction !== undefined){
 					$.trackAction(section + '.' + $(this).attr('rel'));
 				}
+				context.fn.restoreCursorAndScrollTop();
 				// No dragging!
 				event.preventDefault();
 				return false;
@@ -488,7 +489,7 @@ fn: {
 						html += $.wikiEditor.modules.toolbar.fn.buildRow( context, page.rows[i] );
 					}
 				}
-				$page.html( html );
+				$page.html( html + '</table>');
 				break;
 			case 'characters':
 				$page.addClass( 'page-characters' );
@@ -534,7 +535,7 @@ fn: {
 		for ( var i = 0; i< headings.length; i++ ) {
 			html += '<th>' + $.wikiEditor.autoMsg( headings[i], ['html', 'text'] ) + '</th>';
 		}
-		return html;
+		return html + '</tr>';
 	},
 	buildRow : function( context, row ) {
 		var html = '<tr>';
@@ -542,8 +543,7 @@ fn: {
 			html += '<td class="cell cell-' + cell + '" valign="top"><span>' +
 				$.wikiEditor.autoMsg( row[cell], ['html', 'text'] ) + '</span></td>';
 		}
-		html += '</tr>';
-		return html;
+		return html + '</tr>';
 	},
 	buildCharacter : function( character, actions ) {
 		if ( typeof character == 'string' ) {
@@ -557,7 +557,7 @@ fn: {
 					}
 				}
 			};
-		} else if ( 0 in character && 1 in character ) {
+		} else if ( character && 0 in character && 1 in character ) {
 			character = {
 				'label' : character[0],
 				'action' : {
@@ -569,10 +569,12 @@ fn: {
 				}
 			};
 		}
-		if ( 'action' in character && 'label' in character ) {
+		if ( character && 'action' in character && 'label' in character ) {
 			actions[character.label] = character.action;
 			return '<span rel="' + character.label + '">' + character.label + '</span>';
 		}
+		mw.log( "A character for the toolbar was undefined. This is not supposed to happen. Double check the config." );
+		return ""; // bug 31673; also an additional fix for bug 24208...
 	},
 	buildTab : function( context, id, section ) {
 		var selected = $.cookie( 'wikiEditor-' + context.instance + '-toolbar-section' );
@@ -580,7 +582,7 @@ fn: {
 		if ( selected !== null ) {
 			$.cookie( 'wikiEditor-' + context.instance + '-toolbar-section', selected, { expires: 30, path: '/' } );
 		}
-		var $link = 
+		var $link =
 			$( '<a/>' )
 				.addClass( selected == id ? 'current' : null )
 				.attr( 'href', '#' )
@@ -661,7 +663,7 @@ fn: {
 		var $section = $( '<div/>' ).attr( { 'class': section.type + ' section section-' + id, 'rel': id } );
 		var selected = $.cookie( 'wikiEditor-' + context.instance + '-toolbar-section' );
 		var show = selected == id;
-		
+
 		if ( section.deferLoad !== undefined && section.deferLoad && id !== 'main' && !show ) {
 			// This class shows the spinner and serves as a marker for the click handler in buildTab()
 			$section.addClass( 'loading' ).append( $( '<div/>' ).addClass( 'spinner' ) );
@@ -672,7 +674,7 @@ fn: {
 		} else {
 			$.wikiEditor.modules.toolbar.fn.reallyBuildSection( context, id, section, $section );
 		}
-		
+
 		// Show or hide section
 		if ( id !== 'main' ) {
 			$section.css( 'display', show ? 'block' : 'none' );
diff --git a/extensions/WikiEditor/tests/selenium/WikiDialogs_Links.php b/extensions/WikiEditor/tests/selenium/WikiDialogs_Links.php
index 07f1b41b..8b0ab5c0 100644
--- a/extensions/WikiEditor/tests/selenium/WikiDialogs_Links.php
+++ b/extensions/WikiEditor/tests/selenium/WikiDialogs_Links.php
@@ -4,10 +4,10 @@ require_once 'WikiDialogs_Links_Setup.php';
  * Description of WikiNewPageDialogs
  *
  * @author bhagyag, pdhanda
- * 
+ *
  * This test case is part of the WikiEditorTestSuite.
  * Configuration for these tests are dosumented as part of extensions/WikiEditor/tests/selenium/WikiEditorTestSuite.php
- * 
+ *
  */
 class WikiDialogs_Links extends WikiDialogs_Links_Setup {
     // Set up the testing environment
@@ -15,13 +15,13 @@ class WikiDialogs_Links extends WikiDialogs_Links_Setup {
         parent::setUp();
         parent::doCreateInternalTestPageIfMissing();
     }
-    
+
 	function tearDown() {
 		parent::doLogout();
         parent::tearDown();
-    }	
+    }
 
-     //Create a new page temporary
+     // Create a new page temporary
     function createNewPage() {
        parent::doOpenLink();
        parent::login();
diff --git a/extensions/WikiEditor/tests/selenium/WikiDialogs_Links_Setup.php b/extensions/WikiEditor/tests/selenium/WikiDialogs_Links_Setup.php
index 7e399a03..d7636a9a 100644
--- a/extensions/WikiEditor/tests/selenium/WikiDialogs_Links_Setup.php
+++ b/extensions/WikiEditor/tests/selenium/WikiDialogs_Links_Setup.php
@@ -1,5 +1,5 @@
 <?php
-include("WikiEditorConstants.php");
+include( "WikiEditorConstants.php" );
 /**
  * This test case will be handling the Wiki Tool bar Dialog functions
  * Date : Apr - 2010
@@ -13,9 +13,9 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 	}
 
-	//Expand advance tool bar section if its not
+	// Expand advance tool bar section if its not
 	function doExpandAdvanceSection() {
-		if ( !$this->isTextPresent( TEXT_HEADING ) ){
+		if ( !$this->isTextPresent( TEXT_HEADING ) ) {
 			$this->click( LINK_ADVANCED );
 		}
 	}
@@ -23,16 +23,16 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	// Log out from the application
 	function doLogout() {
 		$this->open( $this->getUrl() . '/index.php' );
-		if ($this->isTextPresent( TEXT_LOGOUT ) ) {
+		if ( $this->isTextPresent( TEXT_LOGOUT ) ) {
 			$this->click( LINK_LOGOUT );
 			$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-			$this->assertEquals(TEXT_LOGOUT_CONFIRM, $this->getText( LINK_LOGIN ));
+			$this->assertEquals( TEXT_LOGOUT_CONFIRM, $this->getText( LINK_LOGIN ) );
 			$this->open( $this->getUrl() . '/index.php' );
 			$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		}
 	}
 
-	//Create a temporary fixture page
+	// Create a temporary fixture page
 	function doCreateInternalTestPageIfMissing() {
 		$this->type( INPUT_SEARCH_BOX,  WIKI_INTERNAL_LINK );
 		$this->click( BUTTON_SEARCH );
@@ -40,16 +40,16 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( LINK_START . WIKI_INTERNAL_LINK );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$location =  $this->getLocation() . "\n";
-		if ( strpos( $location, '&redlink=1') !== false  ) {
+		if ( strpos( $location, '&redlink=1' ) !== false  ) {
 			$this->type( TEXT_EDITOR,  "Test fixture page. No real content here" );
 			$this->click( BUTTON_SAVE_WATCH );
 			$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-			$this->assertTrue( $this->isTextPresent( WIKI_INTERNAL_LINK ), 
+			$this->assertTrue( $this->isTextPresent( WIKI_INTERNAL_LINK ),
 				$this->getText( TEXT_PAGE_HEADING ) );
 		}
 	}
 
-	//Create a temporary new page
+	// Create a temporary new page
 	function doCreateNewPageTemporary() {
 		$this->type( INPUT_SEARCH_BOX,  WIKI_TEMP_NEWPAGE );
 		$this->click( BUTTON_SEARCH );
@@ -59,7 +59,7 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	}
 
 	// Add a internal link and verify
-	function verifyInternalLink(){
+	function verifyInternalLink() {
 		$this->type( TEXT_EDITOR, "" );
 		$this->click( LINK_ADDLINK );
 		$this->waitForPopup( 'addLink', WIKI_TEST_WAIT_TIME );
@@ -70,16 +70,16 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( ( WIKI_INTERNAL_LINK ), $this->getText( LINK_START . WIKI_INTERNAL_LINK ) );
-		$this->click( LINK_START. WIKI_INTERNAL_LINK );
+		$this->click( LINK_START . WIKI_INTERNAL_LINK );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$this->assertTrue( $this->isTextPresent( WIKI_INTERNAL_LINK ), $this->getText(TEXT_PAGE_HEADING ) );
+		$this->assertTrue( $this->isTextPresent( WIKI_INTERNAL_LINK ), $this->getText( TEXT_PAGE_HEADING ) );
 	}
 
 	// Add a internal link with different display text and verify
-	function verifyInternalLinkWithDisplayText(){
+	function verifyInternalLinkWithDisplayText() {
 		$this->type( TEXT_EDITOR, "" );
 		$this->click( LINK_ADDLINK );
-		$this->waitForPopup('addLink', WIKI_TEST_WAIT_TIME);
+		$this->waitForPopup( 'addLink', WIKI_TEST_WAIT_TIME );
 		$this->type( TEXT_LINKNAME, WIKI_INTERNAL_LINK );
 		$this->type ( TEXT_LINKDISPLAYNAME, WIKI_INTERNAL_LINK . TEXT_LINKDISPLAYNAME_APPENDTEXT );
 		$this->assertTrue( $this->isElementPresent( ICON_PAGEEXISTS ) );
@@ -87,27 +87,27 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( BUTTON_INSERTLINK );
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$this->assertEquals( WIKI_INTERNAL_LINK . TEXT_LINKDISPLAYNAME_APPENDTEXT, 
+		$this->assertEquals( WIKI_INTERNAL_LINK . TEXT_LINKDISPLAYNAME_APPENDTEXT,
 			$this->getText( LINK_START . WIKI_INTERNAL_LINK . TEXT_LINKDISPLAYNAME_APPENDTEXT ) );
 		$this->click( LINK_START . WIKI_INTERNAL_LINK . TEXT_LINKDISPLAYNAME_APPENDTEXT );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertTrue( $this->isTextPresent( WIKI_INTERNAL_LINK ), $this->getText( TEXT_PAGE_HEADING ) );
-		 
+
 	}
 
 	// Add a internal link with blank display text and verify
-	function verifyInternalLinkWithBlankDisplayText(){
+	function verifyInternalLinkWithBlankDisplayText() {
 		$this->type( TEXT_EDITOR, "" );
 		$this->click( LINK_ADDLINK );
 		$this->waitForPopup( 'addLink', WIKI_TEST_WAIT_TIME );
 		$this->type( TEXT_LINKNAME, WIKI_INTERNAL_LINK );
 		$this->type( TEXT_LINKDISPLAYNAME, "" );
 		$this->assertTrue( $this->isElementPresent( ICON_PAGEEXISTS ) );
-		$this->assertEquals("on", $this->getValue(OPT_INTERNAL));
+		$this->assertEquals( "on", $this->getValue( OPT_INTERNAL ) );
 		$this->click( BUTTON_INSERTLINK );
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$this->assertEquals( WIKI_INTERNAL_LINK, $this->getText( LINK_START. WIKI_INTERNAL_LINK ) );
+		$this->assertEquals( WIKI_INTERNAL_LINK, $this->getText( LINK_START . WIKI_INTERNAL_LINK ) );
 		$this->click( LINK_START . WIKI_INTERNAL_LINK );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( WIKI_INTERNAL_LINK, $this->getText( TEXT_PAGE_HEADING ) );
@@ -115,7 +115,7 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	}
 
 	// Add external link and verify
-	function verifyExternalLink(){
+	function verifyExternalLink() {
 		$this->type( LINK_PREVIEW, "" );
 		$this->click( LINK_ADDLINK );
 		$this->type( TEXT_LINKNAME, WIKI_EXTERNAL_LINK );
@@ -125,14 +125,14 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( WIKI_EXTERNAL_LINK, $this->getText( LINK_START . WIKI_EXTERNAL_LINK ) );
-		
+
 		$this->click( LINK_START . WIKI_EXTERNAL_LINK );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( WIKI_EXTERNAL_LINK_TITLE, $this->getTitle() );
 	}
 
 	// Add external link with different display text and verify
-	function verifyExternalLinkWithDisplayText(){
+	function verifyExternalLinkWithDisplayText() {
 		$this->type( TEXT_EDITOR, "" );
 		$this->click( LINK_ADDLINK );
 		$this->type( TEXT_LINKNAME, WIKI_EXTERNAL_LINK );
@@ -143,13 +143,13 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( WIKI_EXTERNAL_LINK_TITLE, $this->getText( LINK_START . WIKI_EXTERNAL_LINK_TITLE ) );
-		$this->click(LINK_START.(WIKI_EXTERNAL_LINK_TITLE));
+		$this->click( LINK_START . ( WIKI_EXTERNAL_LINK_TITLE ) );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( WIKI_EXTERNAL_LINK_TITLE , $this->getTitle() );
 	}
 
 	// Add external link with Blank display text and verify
-	function verifyExternalLinkWithBlankDisplayText(){
+	function verifyExternalLinkWithBlankDisplayText() {
 		$this->type( TEXT_EDITOR, "" );
 		$this->click( LINK_ADDLINK );
 		$this->type( TEXT_LINKNAME, WIKI_EXTERNAL_LINK );
@@ -159,14 +159,14 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( BUTTON_INSERTLINK );
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$this->assertEquals( "[1]", $this->getText(LINK_START . "[1]" ) );
+		$this->assertEquals( "[1]", $this->getText( LINK_START . "[1]" ) );
 		$this->click( LINK_START . "[1]" );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
 		$this->assertEquals( WIKI_EXTERNAL_LINK_TITLE, $this->getTitle() );
 	}
 
 	// Add a table and verify
-	function verifyCreateTable(){
+	function verifyCreateTable() {
 		$WIKI_TABLE_ROW = 2;
 		$WIKI_TABLE_COL = "5";
 		$this->doExpandAdvanceSection();
@@ -187,19 +187,19 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	}
 
 	// Add a table and verify only with head row
-	function verifyCreateTableWithHeadRow(){
+	function verifyCreateTableWithHeadRow() {
 		$WIKI_TABLE_ROW = 3;
 		$WIKI_TABLE_COL = "4";
 		$this->doExpandAdvanceSection();
 		$this->type( TEXT_EDITOR, "" );
 		$this->click( LINK_ADDTABLE );
-		$this->click( CHK_BOARDER);
+		$this->click( CHK_BOARDER );
 		$this->type( TEXT_ROW, $WIKI_TABLE_ROW );
 		$this->type( TEXT_COL, $WIKI_TABLE_COL );
 		$this->click( BUTTON_INSERTABLE );
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$WIKI_TABLE_ROW = $WIKI_TABLE_ROW+1;
+		$WIKI_TABLE_ROW = $WIKI_TABLE_ROW + 1;
 		$this->assertTrue( $this->isElementPresent( TEXT_TABLEID_OTHER .
 			TEXT_VALIDATE_TABLE_PART1 . $WIKI_TABLE_ROW .
 			TEXT_VALIDATE_TABLE_PART2 . $WIKI_TABLE_COL .
@@ -207,7 +207,7 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	}
 
 	// Add a table and verify only with borders
-	function verifyCreateTableWithBorders(){
+	function verifyCreateTableWithBorders() {
 		$WIKI_TABLE_ROW = "4";
 		$WIKI_TABLE_COL = "6";
 		$this->type( TEXT_EDITOR, "" );
@@ -226,7 +226,7 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	}
 
 	// Add a table and verify only with sort row
-	function verifyCreateTableWithSortRow(){
+	function verifyCreateTableWithSortRow() {
 		$WIKI_TABLE_ROW = "2";
 		$WIKI_TABLE_COL = "5";
 		$this->type( TEXT_EDITOR, "" );
@@ -242,14 +242,14 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( CHK_SORT );
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$this->assertTrue( $this->isElementPresent(TEXT_TABLEID_WITHALLFEATURES .
+		$this->assertTrue( $this->isElementPresent( TEXT_TABLEID_WITHALLFEATURES .
 			TEXT_VALIDATE_TABLE_PART1 . $WIKI_TABLE_ROW .
 			TEXT_VALIDATE_TABLE_PART2 . $WIKI_TABLE_COL .
 			TEXT_VALIDATE_TABLE_PART3 ) );
 	}
 
 	// Add a table without headers,borders and sort rows
-	function verifyCreateTableWithNoSpecialEffects(){
+	function verifyCreateTableWithNoSpecialEffects() {
 		$WIKI_TABLE_ROW = "6";
 		$WIKI_TABLE_COL = "2";
 		$this->
@@ -272,7 +272,7 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 	}
 
 	// Add a table with headers,borders and sort rows
-	function verifyCreateTableWithAllSpecialEffects(){
+	function verifyCreateTableWithAllSpecialEffects() {
 		$WIKI_TABLE_ROW = 6;
 		$WIKI_TABLE_COL = "2";
 		$this->doExpandAdvanceSection();
@@ -285,11 +285,11 @@ class WikiDialogs_Links_Setup extends SeleniumTestCase {
 		$this->click( CHK_SORT );
 		$this->click( LINK_PREVIEW );
 		$this->waitForPageToLoad( WIKI_TEST_WAIT_TIME );
-		$WIKI_TABLE_ROW = $WIKI_TABLE_ROW+1;
-		$this->assertTrue(	$this->isElementPresent(TEXT_TABLEID_WITHALLFEATURES .
+		$WIKI_TABLE_ROW = $WIKI_TABLE_ROW + 1;
+		$this->assertTrue(	$this->isElementPresent( TEXT_TABLEID_WITHALLFEATURES .
 			TEXT_VALIDATE_TABLE_PART1 . $WIKI_TABLE_ROW .
 			TEXT_VALIDATE_TABLE_PART2 . $WIKI_TABLE_COL .
-			TEXT_VALIDATE_TABLE_PART3));
+			TEXT_VALIDATE_TABLE_PART3 ) );
 	}
 
 }
diff --git a/extensions/WikiEditor/tests/selenium/WikiEditorConstants.php b/extensions/WikiEditor/tests/selenium/WikiEditorConstants.php
index 11eeb01e..090f96bf 100644
--- a/extensions/WikiEditor/tests/selenium/WikiEditorConstants.php
+++ b/extensions/WikiEditor/tests/selenium/WikiEditorConstants.php
@@ -1,84 +1,84 @@
 <?php
-define ('WIKI_TEST_WAIT_TIME', "3000"); // Waiting time
+define ( 'WIKI_TEST_WAIT_TIME', "3000" ); // Waiting time
 
 // tool bar, buttons , links
 // commonly using links
-define ('LINK_MAIN_PAGE',"link=Main page");
-define ('LINK_RANDOM_PAGE',"link=Random article");
-define ('TEXT_PAGE_HEADING',"firstHeading");
-define ('LINK_START',"link=");
-define ('LINK_EDITPAGE',"//li[@id='ca-edit']/a/span");
-define ('TEXT_EDITOR',"wpTextbox1");
-define ('LINK_PREVIEW',"wpPreview");
+define ( 'LINK_MAIN_PAGE', "link=Main page" );
+define ( 'LINK_RANDOM_PAGE', "link=Random article" );
+define ( 'TEXT_PAGE_HEADING', "firstHeading" );
+define ( 'LINK_START', "link=" );
+define ( 'LINK_EDITPAGE', "//li[@id='ca-edit']/a/span" );
+define ( 'TEXT_EDITOR', "wpTextbox1" );
+define ( 'LINK_PREVIEW', "wpPreview" );
 
-define ('WIKI_SEARCH_PAGE',"Hair (musical)"); // Page name to search
-define ('WIKI_TEXT_SEARCH',"TV"); // Text to search
-define ('WIKI_INTERNAL_LINK',"Wikieditor-Fixture-Page"); // Exisiting page name to add as an internal tag
-define ('WIKI_EXTERNAL_LINK',"www.google.com"); // External web site name
-define ('WIKI_EXTERNAL_LINK_TITLE',"Google"); // Page title of the external web site name
-define ('WIKI_CODE_PATH',getcwd()); // get the current path of the program
-define ('WIKI_SCREENSHOTS_PATH',"screenshots"); // the folder the error screen shots will be saved
-define ('WIKI_SCREENSHOTS_TYPE',"png"); // screen print type
-define ('WIKI_TEMP_NEWPAGE',"TestWikiPage"); // temporary creating new page name
+define ( 'WIKI_SEARCH_PAGE', "Hair (musical)" ); // Page name to search
+define ( 'WIKI_TEXT_SEARCH', "TV" ); // Text to search
+define ( 'WIKI_INTERNAL_LINK', "Wikieditor-Fixture-Page" ); // Exisiting page name to add as an internal tag
+define ( 'WIKI_EXTERNAL_LINK', "www.google.com" ); // External web site name
+define ( 'WIKI_EXTERNAL_LINK_TITLE', "Google" ); // Page title of the external web site name
+define ( 'WIKI_CODE_PATH', getcwd() ); // get the current path of the program
+define ( 'WIKI_SCREENSHOTS_PATH', "screenshots" ); // the folder the error screen shots will be saved
+define ( 'WIKI_SCREENSHOTS_TYPE', "png" ); // screen print type
+define ( 'WIKI_TEMP_NEWPAGE', "TestWikiPage" ); // temporary creating new page name
 // for WikiCommonFunction_TC
 
 // for WikiSearch_TC
-define ('INPUT_SEARCH_BOX', "searchInput");
-define ('BUTTON_SEARCH',"mw-searchButton");
-define ('TEXT_SEARCH_RESULT_HEADING'," - Search results - Wikipedia, the free encyclopedia");
+define ( 'INPUT_SEARCH_BOX', "searchInput" );
+define ( 'BUTTON_SEARCH', "mw-searchButton" );
+define ( 'TEXT_SEARCH_RESULT_HEADING', " - Search results - Wikipedia, the free encyclopedia" );
 
 // for WikiWatchUnWatch_TC
-define ('LINK_WATCH_PAGE',"link=Watch");
-define ('LINK_WATCH_LIST',"link=My watchlist");
-define ('LINK_WATCH_EDIT',"link=View and edit watchlist");
-define ('LINK_UNWATCH',"link=Unwatch");
-define ('BUTTON_WATCH',"wpWatchthis");
-define ('BUTTON_SAVE_WATCH',"wpSave");
-define ('TEXT_WATCH',"Watch");
-define ('TEXT_UNWATCH',"Unwatch");
+define ( 'LINK_WATCH_PAGE', "link=Watch" );
+define ( 'LINK_WATCH_LIST', "link=My watchlist" );
+define ( 'LINK_WATCH_EDIT', "link=View and edit watchlist" );
+define ( 'LINK_UNWATCH', "link=Unwatch" );
+define ( 'BUTTON_WATCH', "wpWatchthis" );
+define ( 'BUTTON_SAVE_WATCH', "wpSave" );
+define ( 'TEXT_WATCH', "Watch" );
+define ( 'TEXT_UNWATCH', "Unwatch" );
 
 // for WikiCommonFunction_TC
-define ('TEXT_LOGOUT',"Log out");
-define ('LINK_LOGOUT',"link=Log out");
-define ('LINK_LOGIN',"link=Log in / create account");
-define ('TEXT_LOGOUT_CONFIRM',"Log in / create account");
-define ('INPUT_USER_NAME', "wpName1");
-define ('INPUT_PASSWD', "wpPassword1");
-define ('BUTTON_LOGIN',"wpLoginAttempt");
-define ('TEXT_HEADING',"Heading");
-define ('LINK_ADVANCED',"link=Advanced");
+define ( 'TEXT_LOGOUT', "Log out" );
+define ( 'LINK_LOGOUT', "link=Log out" );
+define ( 'LINK_LOGIN', "link=Log in / create account" );
+define ( 'TEXT_LOGOUT_CONFIRM', "Log in / create account" );
+define ( 'INPUT_USER_NAME', "wpName1" );
+define ( 'INPUT_PASSWD', "wpPassword1" );
+define ( 'BUTTON_LOGIN', "wpLoginAttempt" );
+define ( 'TEXT_HEADING', "Heading" );
+define ( 'LINK_ADVANCED', "link=Advanced" );
 
 // for WikiDialogs_TC
-define ('LINK_ADDLINK',"//div[@id='wikiEditor-ui-toolbar']/div[1]/div[2]/span[2	]");
-define ('TEXT_LINKNAME',"wikieditor-toolbar-link-int-target");
-define ('TEXT_LINKDISPLAYNAME',"wikieditor-toolbar-link-int-text");
-define ('TEXT_LINKDISPLAYNAME_APPENDTEXT'," Test");
-define ('ICON_PAGEEXISTS',"wikieditor-toolbar-link-int-target-status-exists");
-define ('ICON_PAGEEXTERNAL',"wikieditor-toolbar-link-int-target-status-external");
-define ('OPT_INTERNAL',"wikieditor-toolbar-link-type-int");
-define ('OPT_EXTERNAL',"wikieditor-toolbar-link-type-ext");
-define ('BUTTON_INSERTLINK',"//div[10]/div[11]/button[1]");
-define ('LINK_ADDTABLE',"//div[@id='wikiEditor-ui-toolbar']/div[3]/div[1]/div[4]/span[2]");
-define ('CHK_HEADER',"wikieditor-toolbar-table-dimensions-header");
-define ('CHK_BOARDER',"wikieditor-toolbar-table-wikitable");
-define ('CHK_SORT',"wikieditor-toolbar-table-sortable");
-define ('TEXT_ROW',"wikieditor-toolbar-table-dimensions-rows");
-define ('TEXT_COL',"wikieditor-toolbar-table-dimensions-columns");
-define ('BUTTON_INSERTABLE',"//div[3]/button[1]"); 
-define ('TEXT_HEADTABLE_TEXT',"Header text");
-define ('TEXT_TABLEID_WITHALLFEATURES', "//table[@id='sortable_table_id_0']/tbody/" );
-define ('TEXT_TABLEID_OTHER', "//div[@id='wikiPreview']/table/tbody/" );
-define ('TEXT_VALIDATE_TABLE_PART1', "tr[");
-define ('TEXT_VALIDATE_TABLE_PART2',"]/td[");
-define ('TEXT_VALIDATE_TABLE_PART3',"]");
-define ('LINK_SEARCH',"//div[@id='wikiEditor-ui-toolbar']/div[3]/div[1]/div[5]/span");
-define ('INPUT_SEARCH',"wikieditor-toolbar-replace-search");
-define ('INPUT_REPLACE',"wikieditor-toolbar-replace-replace");
-define ('BUTTON_REPLACEALL',"//button[3]");
-define ('BUTTON_REPLACENEXT',"//button[2]");
-define ('BUTTON_CANCEL',"//button[4]");
-define ('TEXT_PREVIEW_TEXT1',"//div[@id='wikiPreview']/p[1]");
-define ('TEXT_PREVIEW_TEXT2',"//div[@id='wikiPreview']/p[2]");
-define ('TEXT_PREVIEW_TEXT3',"//div[@id='wikiPreview']/p[3]");
+define ( 'LINK_ADDLINK', "//div[@id='wikiEditor-ui-toolbar']/div[1]/div[2]/span[2	]" );
+define ( 'TEXT_LINKNAME', "wikieditor-toolbar-link-int-target" );
+define ( 'TEXT_LINKDISPLAYNAME', "wikieditor-toolbar-link-int-text" );
+define ( 'TEXT_LINKDISPLAYNAME_APPENDTEXT', " Test" );
+define ( 'ICON_PAGEEXISTS', "wikieditor-toolbar-link-int-target-status-exists" );
+define ( 'ICON_PAGEEXTERNAL', "wikieditor-toolbar-link-int-target-status-external" );
+define ( 'OPT_INTERNAL', "wikieditor-toolbar-link-type-int" );
+define ( 'OPT_EXTERNAL', "wikieditor-toolbar-link-type-ext" );
+define ( 'BUTTON_INSERTLINK', "//div[10]/div[11]/button[1]" );
+define ( 'LINK_ADDTABLE', "//div[@id='wikiEditor-ui-toolbar']/div[3]/div[1]/div[4]/span[2]" );
+define ( 'CHK_HEADER', "wikieditor-toolbar-table-dimensions-header" );
+define ( 'CHK_BOARDER', "wikieditor-toolbar-table-wikitable" );
+define ( 'CHK_SORT', "wikieditor-toolbar-table-sortable" );
+define ( 'TEXT_ROW', "wikieditor-toolbar-table-dimensions-rows" );
+define ( 'TEXT_COL', "wikieditor-toolbar-table-dimensions-columns" );
+define ( 'BUTTON_INSERTABLE', "//div[3]/button[1]" );
+define ( 'TEXT_HEADTABLE_TEXT', "Header text" );
+define ( 'TEXT_TABLEID_WITHALLFEATURES', "//table[@id='sortable_table_id_0']/tbody/" );
+define ( 'TEXT_TABLEID_OTHER', "//div[@id='wikiPreview']/table/tbody/" );
+define ( 'TEXT_VALIDATE_TABLE_PART1', "tr[" );
+define ( 'TEXT_VALIDATE_TABLE_PART2', "]/td[" );
+define ( 'TEXT_VALIDATE_TABLE_PART3', "]" );
+define ( 'LINK_SEARCH', "//div[@id='wikiEditor-ui-toolbar']/div[3]/div[1]/div[5]/span" );
+define ( 'INPUT_SEARCH', "wikieditor-toolbar-replace-search" );
+define ( 'INPUT_REPLACE', "wikieditor-toolbar-replace-replace" );
+define ( 'BUTTON_REPLACEALL', "//button[3]" );
+define ( 'BUTTON_REPLACENEXT', "//button[2]" );
+define ( 'BUTTON_CANCEL', "//button[4]" );
+define ( 'TEXT_PREVIEW_TEXT1', "//div[@id='wikiPreview']/p[1]" );
+define ( 'TEXT_PREVIEW_TEXT2', "//div[@id='wikiPreview']/p[2]" );
+define ( 'TEXT_PREVIEW_TEXT3', "//div[@id='wikiPreview']/p[3]" );
 
 
diff --git a/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php b/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php
index 534d1351..ad4be489 100644
--- a/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php
+++ b/extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php
@@ -1,8 +1,8 @@
 <?php
 
 class WikiEditorSeleniumConfig {
-	
-	public static function getSettings(&$includeFiles, &$globalConfigs) {
+
+	public static function getSettings( &$includeFiles, &$globalConfigs ) {
 		$includes = array(
 			'extensions/Vector/Vector.php',
 		    'extensions/WikiEditor/WikiEditor.php'
@@ -21,7 +21,7 @@ class WikiEditorSeleniumConfig {
 			)
 		);
 		$includeFiles = array_merge( $includeFiles, $includes );
-		$globalConfigs = array_merge( $globalConfigs, $configs);
-		return true; 
+		$globalConfigs = array_merge( $globalConfigs, $configs );
+		return true;
 	}
 }
 \ No newline at end of file
diff --git a/extensions/WikiEditor/tests/selenium/WikiEditorTestSuite.php b/extensions/WikiEditor/tests/selenium/WikiEditorTestSuite.php
index 90537654..b4029d3a 100644
--- a/extensions/WikiEditor/tests/selenium/WikiEditorTestSuite.php
+++ b/extensions/WikiEditor/tests/selenium/WikiEditorTestSuite.php
@@ -1,6 +1,6 @@
 <?php
 
-/* 
+/**
  * To configure MW for these tests
  * 1) If you are running multiple test suites, add the following in LocalSettings.php
  * require_once("extensions/WikiEditor/tests/selenium/WikiEditorSeleniumConfig.php");
@@ -16,14 +16,14 @@
  * $wgWikiEditorFeatures['toc'] = array( 'global' => false, 'user' => false );
  * $wgWikiEditorFeatures['highlight'] = array( 'global' => false, 'user' => false );
  * $wgWikiEditorFeatures['dialogs'] = array( 'global' => true, 'user' => true );
- * 
+ *
  */
 class WikiEditorTestSuite extends SeleniumTestSuite
 {
 	public function setUp() {
 		$this->setLoginBeforeTests( false );
 		parent::setUp();
-	} 
+	}
 	public function addTests() {
 		$testFiles = array(
 			'extensions/WikiEditor/tests/selenium/WikiDialogs_Links.php'
diff --git a/includes/CryptRand.php b/includes/CryptRand.php
index 10f379cb..e4be1b37 100644
--- a/includes/CryptRand.php
+++ b/includes/CryptRand.php
@@ -120,7 +120,7 @@ class MWCryptRand {
 	/**
 	 * Randomly hash data while mixing in clock drift data for randomness
 	 *
-	 * @param $data The data to randomly hash.
+	 * @param $data string The data to randomly hash.
 	 * @return String The hashed bytes
 	 * @author Tim Starling
 	 */
@@ -166,7 +166,7 @@ class MWCryptRand {
 
 	/**
 	 * Return a rolling random state initially build using data from unstable sources
-	 * @return A new weak random state
+	 * @return string A new weak random state
 	 */
 	protected function randomState() {
 		static $state = null;
@@ -184,6 +184,7 @@ class MWCryptRand {
 
 	/**
 	 * Decide on the best acceptable hash algorithm we have available for hash()
+	 * @throws MWException
 	 * @return String A hash algorithm
 	 */
 	protected function hashAlgo() {
@@ -227,6 +228,7 @@ class MWCryptRand {
 	 * Generate an acceptably unstable one-way-hash of some text
 	 * making use of the best hash algorithm that we have available.
 	 *
+	 * @param $data string
 	 * @return String A raw hash of the data
 	 */
 	protected function hash( $data ) {
@@ -237,6 +239,8 @@ class MWCryptRand {
 	 * Generate an acceptably unstable one-way-hmac of some text
 	 * making use of the best hash algorithm that we have available.
 	 *
+	 * @param $data string
+	 * @param $key string
 	 * @return String A raw hash of the data
 	 */
 	protected function hmac( $data, $key ) {
@@ -282,7 +286,7 @@ class MWCryptRand {
 				if ( $iv === false ) {
 					wfDebug( __METHOD__ . ": mcrypt_create_iv returned false.\n" );
 				} else {
-					$bytes .= $iv;
+					$buffer .= $iv;
 					wfDebug( __METHOD__ . ": mcrypt_create_iv generated " . strlen( $iv ) . " bytes of randomness.\n" );
 				}
 				wfProfileOut( __METHOD__ . '-mcrypt' );
@@ -409,6 +413,7 @@ class MWCryptRand {
 
 	/**
 	 * Return a singleton instance of MWCryptRand
+	 * @return MWCryptRand
 	 */
 	protected static function singleton() {
 		if ( is_null( self::$singleton ) ) {
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7cea30f6..29d98d58 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration;
 /** @endcond */
 
 /** MediaWiki version number */
-$wgVersion = '1.18.2';
+$wgVersion = '1.18.3';
 
 /** Name of the site. It must be changed in LocalSettings.php */
 $wgSitename         = 'MediaWiki';
diff --git a/includes/User.php b/includes/User.php
index 705fd291..af05926c 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3272,11 +3272,12 @@ class User {
 		global $wgUserEmailConfirmationTokenExpiry;
 		$now = time();
 		$expires = $now + $wgUserEmailConfirmationTokenExpiry;
+		$expiration = wfTimestamp( TS_MW, $expires );
 		$this->load();
 		$token = MWCryptRand::generateHex( 32 );
 		$hash = md5( $token );
 		$this->mEmailToken = $hash;
-		$this->mEmailTokenExpires = wfTimestamp( TS_MW, $expires );
+		$this->mEmailTokenExpires = $expiration;
 		return $token;
 	}
 
@@ -3863,7 +3864,7 @@ class User {
 		} elseif ( $type == ':B:' ) {
 			# Salted
 			list( $salt, $realHash ) = explode( ':', substr( $hash, 3 ), 2 );
-			return md5( $salt.'-'.md5( $password ) ) == $realHash;
+			return md5( $salt.'-'.md5( $password ) ) === $realHash;
 		} else {
 			# Old-style
 			return self::oldCrypt( $password, $userId ) === $hash;
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 30e42934..9fe96199 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1501,6 +1501,6 @@ abstract class ApiBase {
 	 * @return string
 	 */
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiBase.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index 8d718ab2..bb2bb253 100644
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -220,6 +220,6 @@ class ApiBlock extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiBlock.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index d43fa53f..59f8555b 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -125,6 +125,6 @@ class ApiComparePages extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiComparePages.php 92400 2011-07-17 16:51:11Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 58befbfe..d6cc21b3 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -281,6 +281,6 @@ class ApiDelete extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiDelete.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiDisabled.php b/includes/api/ApiDisabled.php
index 947267f3..ad731bb4 100644
--- a/includes/api/ApiDisabled.php
+++ b/includes/api/ApiDisabled.php
@@ -70,6 +70,6 @@ class ApiDisabled extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiDisabled.php 79969 2011-01-10 22:36:26Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index ffc82640..2b949ba9 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -526,6 +526,6 @@ class ApiEditPage extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiEditPage.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiEmailUser.php b/includes/api/ApiEmailUser.php
index 9ce43183..46e8d523 100644
--- a/includes/api/ApiEmailUser.php
+++ b/includes/api/ApiEmailUser.php
@@ -149,6 +149,6 @@ class ApiEmailUser extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiEmailUser.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php
index 6ec18463..dfa520a2 100644
--- a/includes/api/ApiExpandTemplates.php
+++ b/includes/api/ApiExpandTemplates.php
@@ -123,6 +123,6 @@ class ApiExpandTemplates extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiExpandTemplates.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFeedContributions.php b/includes/api/ApiFeedContributions.php
index c06b71af..c1e6ff6e 100644
--- a/includes/api/ApiFeedContributions.php
+++ b/includes/api/ApiFeedContributions.php
@@ -202,6 +202,6 @@ class ApiFeedContributions extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFeedContributions.php 95607 2011-08-27 19:28:13Z hashar $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 \ No newline at end of file
diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php
index 75ce7ca0..dd7e3d8f 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -226,6 +226,6 @@ class ApiFeedWatchlist extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFeedWatchlist.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFileRevert.php b/includes/api/ApiFileRevert.php
index 1540fe6c..5ff50512 100644
--- a/includes/api/ApiFileRevert.php
+++ b/includes/api/ApiFileRevert.php
@@ -184,6 +184,6 @@ class ApiFileRevert extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFileRevert.php 92400 2011-07-17 16:51:11Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index ce881599..8c8235b8 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -301,7 +301,7 @@ See <a href='https://www.mediawiki.org/wiki/API'>complete documentation</a>, or
 	}
 
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiFormatBase.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
@@ -370,6 +370,6 @@ class ApiFormatFeedWrapper extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatBase.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatDbg.php b/includes/api/ApiFormatDbg.php
index 00b03494..32f223d7 100644
--- a/includes/api/ApiFormatDbg.php
+++ b/includes/api/ApiFormatDbg.php
@@ -55,6 +55,6 @@ class ApiFormatDbg extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatDbg.php 78829 2010-12-22 20:52:06Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatDump.php b/includes/api/ApiFormatDump.php
index b88572e9..bde3e56d 100644
--- a/includes/api/ApiFormatDump.php
+++ b/includes/api/ApiFormatDump.php
@@ -59,6 +59,6 @@ class ApiFormatDump extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatDump.php 79969 2011-01-10 22:36:26Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php
index 92689084..e3755d73 100644
--- a/includes/api/ApiFormatJson.php
+++ b/includes/api/ApiFormatJson.php
@@ -97,6 +97,6 @@ class ApiFormatJson extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatJson.php 78829 2010-12-22 20:52:06Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php
index 010966d6..cfcc2a03 100644
--- a/includes/api/ApiFormatPhp.php
+++ b/includes/api/ApiFormatPhp.php
@@ -52,6 +52,6 @@ class ApiFormatPhp extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatPhp.php 78829 2010-12-22 20:52:06Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatRaw.php b/includes/api/ApiFormatRaw.php
index 3b0c10ea..75912871 100644
--- a/includes/api/ApiFormatRaw.php
+++ b/includes/api/ApiFormatRaw.php
@@ -73,6 +73,6 @@ class ApiFormatRaw extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatRaw.php 82429 2011-02-19 00:30:18Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatTxt.php b/includes/api/ApiFormatTxt.php
index bb5a3ba1..54a620fc 100644
--- a/includes/api/ApiFormatTxt.php
+++ b/includes/api/ApiFormatTxt.php
@@ -55,6 +55,6 @@ class ApiFormatTxt extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatTxt.php 78829 2010-12-22 20:52:06Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatWddx.php b/includes/api/ApiFormatWddx.php
index 2598cc55..f5cace21 100644
--- a/includes/api/ApiFormatWddx.php
+++ b/includes/api/ApiFormatWddx.php
@@ -117,6 +117,6 @@ class ApiFormatWddx extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatWddx.php 78829 2010-12-22 20:52:06Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php
index 3bdfdfa3..06bd9f33 100644
--- a/includes/api/ApiFormatXml.php
+++ b/includes/api/ApiFormatXml.php
@@ -226,6 +226,6 @@ class ApiFormatXml extends ApiFormatBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatXml.php 104476 2011-11-28 20:08:17Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiFormatYaml.php b/includes/api/ApiFormatYaml.php
index d62bbbba..ecf35900 100644
--- a/includes/api/ApiFormatYaml.php
+++ b/includes/api/ApiFormatYaml.php
@@ -44,6 +44,6 @@ class ApiFormatYaml extends ApiFormatJson {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatYaml.php 86302 2011-04-18 11:42:44Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 4b2ced7e..f2af822a 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -163,6 +163,6 @@ class ApiHelp extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiHelp.php 104439 2011-11-28 15:22:23Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php
index a1e5709a..ce740efc 100644
--- a/includes/api/ApiImport.php
+++ b/includes/api/ApiImport.php
@@ -170,7 +170,7 @@ class ApiImport extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiImport.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index a09f0335..1b17e43b 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -217,6 +217,6 @@ class ApiLogin extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiLogin.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiLogout.php b/includes/api/ApiLogout.php
index 3639df3b..b5dd7ac9 100644
--- a/includes/api/ApiLogout.php
+++ b/includes/api/ApiLogout.php
@@ -78,6 +78,6 @@ class ApiLogout extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiLogout.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 85a43aba..b7e118cf 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -580,8 +580,14 @@ class ApiMain extends ApiBase {
 		$moduleParams = $module->extractRequestParams();
 
 		// Die if token required, but not provided (unless there is a gettoken parameter)
+		if ( isset( $moduleParams['gettoken'] ) ) {
+			$gettoken = $moduleParams['gettoken'];
+		} else {
+			$gettoken = false;
+		}
+
 		$salt = $module->getTokenSalt();
-		if ( $salt !== false && !$moduleParams['gettoken'] ) {
+		if ( $salt !== false && !$gettoken ) {
 			if ( !isset( $moduleParams['token'] ) ) {
 				$this->dieUsageMsg( array( 'missingparam', 'token' ) );
 			} else {
@@ -988,7 +994,7 @@ class ApiMain extends ApiBase {
 	public function getVersion() {
 		$vers = array();
 		$vers[] = 'MediaWiki: ' . SpecialVersion::getVersion() . "\n    https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/";
-		$vers[] = __CLASS__ . ': $Id: ApiMain.php 104449 2011-11-28 15:52:04Z reedy $';
+		$vers[] = __CLASS__ . ': $Id$';
 		$vers[] = ApiBase::getBaseVersion();
 		$vers[] = ApiFormatBase::getBaseVersion();
 		$vers[] = ApiQueryBase::getBaseVersion();
diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index f15a086c..a0b7bcbe 100644
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -265,6 +265,6 @@ class ApiMove extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiMove.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index 084c9860..65ee0db9 100644
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -130,6 +130,6 @@ class ApiOpenSearch extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiOpenSearch.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index cf10a9ac..4718221d 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -775,6 +775,6 @@ class ApiPageSet extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiPageSet.php 89574 2011-06-06 15:58:55Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 5670b041..ad098920 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -255,6 +255,6 @@ class ApiParamInfo extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiParamInfo.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index fbbd881b..a3159186 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -595,6 +595,6 @@ class ApiParse extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiParse.php 109694 2012-01-21 21:44:21Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiPatrol.php b/includes/api/ApiPatrol.php
index 8066e655..8e6e8738 100644
--- a/includes/api/ApiPatrol.php
+++ b/includes/api/ApiPatrol.php
@@ -115,6 +115,6 @@ class ApiPatrol extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiPatrol.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index 5556262e..ac1e0736 100644
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -229,6 +229,6 @@ class ApiProtect extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiProtect.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiPurge.php b/includes/api/ApiPurge.php
index bdf911cb..ac5f0207 100644
--- a/includes/api/ApiPurge.php
+++ b/includes/api/ApiPurge.php
@@ -147,6 +147,6 @@ class ApiPurge extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiPurge.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 49fd8569..717b43b4 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -713,7 +713,7 @@ class ApiQuery extends ApiBase {
 	public function getVersion() {
 		$psModule = new ApiPageSet( $this );
 		$vers = array();
-		$vers[] = __CLASS__ . ': $Id: ApiQuery.php 104449 2011-11-28 15:52:04Z reedy $';
+		$vers[] = __CLASS__ . ': $Id$';
 		$vers[] = $psModule->getVersion();
 		return $vers;
 	}
diff --git a/includes/api/ApiQueryAllCategories.php b/includes/api/ApiQueryAllCategories.php
index c7f4b0aa..fc56965e 100644
--- a/includes/api/ApiQueryAllCategories.php
+++ b/includes/api/ApiQueryAllCategories.php
@@ -208,6 +208,6 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllCategories.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryAllLinks.php b/includes/api/ApiQueryAllLinks.php
index 90620e91..822d0136 100644
--- a/includes/api/ApiQueryAllLinks.php
+++ b/includes/api/ApiQueryAllLinks.php
@@ -232,6 +232,6 @@ class ApiQueryAllLinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllLinks.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index c0984d95..0443269e 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -373,6 +373,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllUsers.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index cafff871..f0fc39e3 100644
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -265,6 +265,6 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllimages.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryAllmessages.php b/includes/api/ApiQueryAllmessages.php
index a26011bc..d636c613 100644
--- a/includes/api/ApiQueryAllmessages.php
+++ b/includes/api/ApiQueryAllmessages.php
@@ -258,6 +258,6 @@ class ApiQueryAllmessages extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllmessages.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 42928418..4a216670 100644
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -330,6 +330,6 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllpages.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index 472406ac..8e2639f3 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -535,6 +535,6 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBacklinks.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 69e0a893..130d0403 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -555,7 +555,7 @@ abstract class ApiQueryBase extends ApiBase {
 	 * @return string
 	 */
 	public static function getBaseVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBase.php 103029 2011-11-14 20:58:30Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index 503af7c7..cfcaf0b3 100644
--- a/includes/api/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -307,6 +307,6 @@ class ApiQueryBlocks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryBlocks.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php
index c2942493..a6bca698 100644
--- a/includes/api/ApiQueryCategories.php
+++ b/includes/api/ApiQueryCategories.php
@@ -255,6 +255,6 @@ class ApiQueryCategories extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategories.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryCategoryInfo.php b/includes/api/ApiQueryCategoryInfo.php
index dd3bc391..3130140f 100644
--- a/includes/api/ApiQueryCategoryInfo.php
+++ b/includes/api/ApiQueryCategoryInfo.php
@@ -124,6 +124,6 @@ class ApiQueryCategoryInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategoryInfo.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index e48789fc..c916f5c1 100644
--- a/includes/api/ApiQueryCategoryMembers.php
+++ b/includes/api/ApiQueryCategoryMembers.php
@@ -406,6 +406,6 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryCategoryMembers.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index f58b9ee5..e226070c 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -403,6 +403,6 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryDeletedrevs.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryDisabled.php b/includes/api/ApiQueryDisabled.php
index c9edd2e4..ab08042a 100644
--- a/includes/api/ApiQueryDisabled.php
+++ b/includes/api/ApiQueryDisabled.php
@@ -68,6 +68,6 @@ class ApiQueryDisabled extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryDisabled.php 79969 2011-01-10 22:36:26Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php
index 4c7c1fc2..a68e178d 100644
--- a/includes/api/ApiQueryDuplicateFiles.php
+++ b/includes/api/ApiQueryDuplicateFiles.php
@@ -173,6 +173,6 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryDuplicateFiles.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryExtLinksUsage.php b/includes/api/ApiQueryExtLinksUsage.php
index 89928372..a2b2e318 100644
--- a/includes/api/ApiQueryExtLinksUsage.php
+++ b/includes/api/ApiQueryExtLinksUsage.php
@@ -258,6 +258,6 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryExtLinksUsage.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryExternalLinks.php b/includes/api/ApiQueryExternalLinks.php
index ca1efbb1..95297628 100644
--- a/includes/api/ApiQueryExternalLinks.php
+++ b/includes/api/ApiQueryExternalLinks.php
@@ -160,6 +160,6 @@ class ApiQueryExternalLinks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryExternalLinks.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index 541b25fc..e746a6c4 100644
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -294,6 +294,6 @@ class ApiQueryFilearchive extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryFilearchive.php 91246 2011-07-01 02:25:19Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryIWBacklinks.php b/includes/api/ApiQueryIWBacklinks.php
index 1a8e9720..8b3c8af1 100644
--- a/includes/api/ApiQueryIWBacklinks.php
+++ b/includes/api/ApiQueryIWBacklinks.php
@@ -215,6 +215,6 @@ class ApiQueryIWBacklinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryIWBacklinks.php 84257 2011-03-18 19:15:33Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryIWLinks.php b/includes/api/ApiQueryIWLinks.php
index 3215a96e..30e44ae4 100644
--- a/includes/api/ApiQueryIWLinks.php
+++ b/includes/api/ApiQueryIWLinks.php
@@ -174,6 +174,6 @@ class ApiQueryIWLinks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryIWLinks.php 96475 2011-09-07 19:37:56Z catrope $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 5bacd636..ab179b9f 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -580,6 +580,6 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryImageInfo.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php
index 9dfdf341..5fbdc895 100644
--- a/includes/api/ApiQueryImages.php
+++ b/includes/api/ApiQueryImages.php
@@ -190,6 +190,6 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryImages.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index fef1c6fc..c2f4dc92 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -733,6 +733,6 @@ class ApiQueryInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryInfo.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryLangBacklinks.php b/includes/api/ApiQueryLangBacklinks.php
index e09384e5..959ee789 100644
--- a/includes/api/ApiQueryLangBacklinks.php
+++ b/includes/api/ApiQueryLangBacklinks.php
@@ -215,6 +215,6 @@ class ApiQueryLangBacklinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLangBacklinks.php 88429 2011-05-19 21:13:03Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryLangLinks.php b/includes/api/ApiQueryLangLinks.php
index b2a974ad..942655f4 100644
--- a/includes/api/ApiQueryLangLinks.php
+++ b/includes/api/ApiQueryLangLinks.php
@@ -171,6 +171,6 @@ class ApiQueryLangLinks extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLangLinks.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index fa2495a9..55217e2f 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -245,6 +245,6 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLinks.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index 1420e0a7..669ab71f 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -456,6 +456,6 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryLogEvents.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php
index 64b8511d..56213fa3 100644
--- a/includes/api/ApiQueryPageProps.php
+++ b/includes/api/ApiQueryPageProps.php
@@ -153,6 +153,6 @@ class ApiQueryPageProps extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryPageProps.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php
index 14df7446..ff703cda 100644
--- a/includes/api/ApiQueryProtectedTitles.php
+++ b/includes/api/ApiQueryProtectedTitles.php
@@ -235,6 +235,6 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryProtectedTitles.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php
index e22cf8eb..b38df6b6 100644
--- a/includes/api/ApiQueryQueryPage.php
+++ b/includes/api/ApiQueryQueryPage.php
@@ -193,6 +193,6 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryQueryPage.php 99989 2011-10-16 22:24:58Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index b144a7cf..9ce6688e 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -644,6 +644,6 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryRecentChanges.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index de7d2c2d..401406bb 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -673,6 +673,6 @@ class ApiQueryRevisions extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryRevisions.php 108687 2012-01-11 21:59:55Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 42bed93a..5c133b7d 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -306,6 +306,6 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQuerySearch.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index b6cedc6c..56743189 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -619,6 +619,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQuerySiteinfo.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php
index 9a6e8530..b1903025 100644
--- a/includes/api/ApiQueryStashImageInfo.php
+++ b/includes/api/ApiQueryStashImageInfo.php
@@ -130,7 +130,7 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryStashImageInfo.php 92459 2011-07-18 19:31:38Z raindrift $';
+		return __CLASS__ . ': $Id$';
 	}
 
 }
diff --git a/includes/api/ApiQueryTags.php b/includes/api/ApiQueryTags.php
index 14ca14b7..4ab0c3d1 100644
--- a/includes/api/ApiQueryTags.php
+++ b/includes/api/ApiQueryTags.php
@@ -185,6 +185,6 @@ class ApiQueryTags extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryTags.php 90542 2011-06-21 20:05:00Z ialex $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php
index e958c729..f6a9fe46 100644
--- a/includes/api/ApiQueryUserContributions.php
+++ b/includes/api/ApiQueryUserContributions.php
@@ -475,6 +475,6 @@ class ApiQueryContributions extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUserContributions.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 8a8ce118..2411bee9 100644
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -250,6 +250,6 @@ class ApiQueryUserInfo extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUserInfo.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 6eee1331..31437827 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -331,6 +331,6 @@ class ApiQueryUsers extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryUsers.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index a5eb23eb..77ecb90a 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -454,6 +454,6 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryWatchlist.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiQueryWatchlistRaw.php b/includes/api/ApiQueryWatchlistRaw.php
index b008eab2..126f6d89 100644
--- a/includes/api/ApiQueryWatchlistRaw.php
+++ b/includes/api/ApiQueryWatchlistRaw.php
@@ -205,6 +205,6 @@ class ApiQueryWatchlistRaw extends ApiQueryGeneratorBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryWatchlistRaw.php 88416 2011-05-19 17:51:16Z hashar $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index f7ea0045..a8ca6046 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -372,6 +372,6 @@ class ApiResult extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiResult.php 91144 2011-06-29 23:46:39Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index a149fcaf..154e5dfb 100644
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -196,6 +196,6 @@ class ApiRollback extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiRollback.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiRsd.php b/includes/api/ApiRsd.php
index f9a4d285..e4410379 100644
--- a/includes/api/ApiRsd.php
+++ b/includes/api/ApiRsd.php
@@ -161,7 +161,7 @@ class ApiRsd extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiRsd.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
 
@@ -176,6 +176,6 @@ class ApiFormatXmlRsd extends ApiFormatXml {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiRsd.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php
index 51ee0241..9c3bcf69 100644
--- a/includes/api/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -153,6 +153,6 @@ class ApiUnblock extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUnblock.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index c2aa2a00..2be70108 100644
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -164,6 +164,6 @@ class ApiUndelete extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUndelete.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 1dab0310..e9598378 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -566,6 +566,6 @@ class ApiUpload extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUpload.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index 93d4ef25..74948ce0 100644
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -144,6 +144,6 @@ class ApiUserrights extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiUserrights.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/api/ApiWatch.php b/includes/api/ApiWatch.php
index 6fc55905..27846ab7 100644
--- a/includes/api/ApiWatch.php
+++ b/includes/api/ApiWatch.php
@@ -130,6 +130,6 @@ class ApiWatch extends ApiBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiWatch.php 104449 2011-11-28 15:52:04Z reedy $';
+		return __CLASS__ . ': $Id$';
 	}
 }
diff --git a/includes/json/Services_JSON.php b/includes/json/Services_JSON.php
index 72bd616e..29cc3617 100644
--- a/includes/json/Services_JSON.php
+++ b/includes/json/Services_JSON.php
@@ -51,7 +51,7 @@
 * @author Matt Knapp <mdknapp[at]gmail[dot]com>
 * @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
 * @copyright 2005 Michal Migurski
-* @version CVS: $Id: Services_JSON.php 95607 2011-08-27 19:28:13Z hashar $
+* @version CVS: $Id$
 * @license http://www.opensource.org/licenses/bsd-license.php
 * @see http://pear.php.net/pepr/pepr-proposal-show.php?id=198
 */
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 080da602..5dffd978 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -141,7 +141,11 @@ class CoreParserFunctions {
 	}
 
 	static function nse( $parser, $part1 = '' ) {
-		return wfUrlencode( str_replace( ' ', '_', self::ns( $parser, $part1 ) ) );
+		$ret = self::ns( $parser, $part1 );
+		if ( is_string( $ret ) ) {
+			$ret = wfUrlencode( str_replace( ' ', '_', $ret ) );
+		}
+		return $ret;
 	}
 
 	/**
diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 1caa2c51..db5268d6 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -194,18 +194,19 @@ class SpecialPasswordReset extends FormSpecialPage {
 			? 'passwordreset-emailtext-ip'
 			: 'passwordreset-emailtext-user';
 
+		// Send in the user's language; which should hopefully be the same
+		$userLanguage = $firstUser->getOption( 'language' );
+
 		$passwords = array();
 		foreach ( $users as $user ) {
 			$password = $user->randomPassword();
 			$user->setNewpassword( $password );
 			$user->saveSettings();
-			$passwords[] = wfMessage( 'passwordreset-emailelement', $user->getName(), $password );
+			$passwords[] = wfMessage( 'passwordreset-emailelement', $user->getName(), $password
+				)->inLanguage( $userLanguage )->plain(); // We'll escape the whole thing later
 		}
 		$passwordBlock = implode( "\n\n", $passwords );
 
-		// Send in the user's language; which should hopefully be the same
-		$userLanguage = $firstUser->getOption( 'language' );
-
 		$body = wfMessage( $msg )->inLanguage( $userLanguage );
 		$body->params(
 			$username,
@@ -270,4 +271,4 @@ class SpecialPasswordReset extends FormSpecialPage {
 
 		return false;
 	}
-}
-\ No newline at end of file
+}
diff --git a/maintenance/dtrace/counts.d b/maintenance/dtrace/counts.d
index 13725d99..bedb4547 100644
--- a/maintenance/dtrace/counts.d
+++ b/maintenance/dtrace/counts.d
@@ -1,7 +1,7 @@
 /*
  * This software is in the public domain.
  *
- * $Id: counts.d 10510 2005-08-15 01:46:19Z kateturner $
+ * $Id$
  */
 
 #pragma D option quiet
diff --git a/maintenance/dtrace/tree.d b/maintenance/dtrace/tree.d
index 2f16e41d..a799cb12 100644
--- a/maintenance/dtrace/tree.d
+++ b/maintenance/dtrace/tree.d
@@ -1,7 +1,7 @@
 /*
  * This software is in the public domain.
  *
- * $Id: tree.d 10510 2005-08-15 01:46:19Z kateturner $
+ * $Id$
  */
 
 #pragma D option quiet
diff --git a/maintenance/postgres/mediawiki_mysql2postgres.pl b/maintenance/postgres/mediawiki_mysql2postgres.pl
index 16012762..9133477e 100644
--- a/maintenance/postgres/mediawiki_mysql2postgres.pl
+++ b/maintenance/postgres/mediawiki_mysql2postgres.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ## Convert data from a MySQL mediawiki database into a Postgres mediawiki database
-## svn: $Id: mediawiki_mysql2postgres.pl 86721 2011-04-22 18:47:17Z mah $
+## svn: $Id$
 
 ## NOTE: It is probably easier to dump your wiki using maintenance/dumpBackup.php
 ## and then import it with maintenance/importDump.php
@@ -181,7 +181,7 @@ $MYSQLSOCKET and $conninfo .= "\n--   socket    $MYSQLSOCKET";
 print qq{
 -- Dump of MySQL Mediawiki tables for import into a Postgres Mediawiki schema
 -- Performed by the program: $0
--- Version: $VERSION (subversion }.q{$LastChangedRevision: 86721 $}.qq{)
+-- Version: $VERSION (subversion }.q{$LastChangedRevision$}.qq{)
 -- Author: Greg Sabino Mullane <greg\@turnstep.com> Comments welcome
 --
 -- This file was created: $now
diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index 51b36160..e7bb98ac 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -44,6 +44,7 @@ class TitleTest extends MediaWikiTestCase {
 	 * @param string $source
 	 * @param string $target
 	 * @param array|string|true $requiredErrors
+	 * @group Database
 	 * @dataProvider dataTestIsValidMoveOperation
 	 */
 	function testIsValidMoveOperation( $source, $target, $expected ) {
diff --git a/tests/phpunit/includes/upload/UploadStashTest.php b/tests/phpunit/includes/upload/UploadStashTest.php
index 9c39bc61..e644a259 100644
--- a/tests/phpunit/includes/upload/UploadStashTest.php
+++ b/tests/phpunit/includes/upload/UploadStashTest.php
@@ -28,7 +28,10 @@ class UploadStashTest extends MediaWikiTestCase {
 			)
 		);
 	}
-	
+
+	/**
+	 * @group Database
+	 */
 	public function testBug29408() {
 		global $wgUser;
 		$wgUser = self::$users['uploader']->user;
diff --git a/tests/phpunit/skins/SideBarTest.php b/tests/phpunit/skins/SideBarTest.php
index a9f56900..bf79e760 100644
--- a/tests/phpunit/skins/SideBarTest.php
+++ b/tests/phpunit/skins/SideBarTest.php
@@ -105,7 +105,10 @@ class SideBarTest extends MediaWikiLangTestCase {
 		);
 
 	}
-	/** bug 33321 */
+	/**
+	 * bug 33321
+	 * @group Database
+	 */
 	function testTrickyPipe() {
 		$this->assertSidebar(
 		array( 'Title' => array(
author	Pierre Schmitz <pierre@archlinux.de>	2012-04-26 18:23:31 +0200
committer	Pierre Schmitz <pierre@archlinux.de>	2012-04-26 18:23:31 +0200
commit	c4372dd38a4d109b4f3881ea63b667e33adbe503 (patch)
tree	e8e6dae1229a68c26b7a348c73dc0c8c77da97e5
parent	cf566324cfb218f0c7323d97d2a103bbb8d60ba4 (diff)