From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 maintenance/language/StatOutputs.php            |  25 ++
 maintenance/language/checkDupeMessages.php      |  28 +-
 maintenance/language/checkExtensions.php        |  15 +
 maintenance/language/checkLanguage.inc          |  23 +-
 maintenance/language/checkLanguage.php          |  15 +
 maintenance/language/function-list.php          |  15 +
 maintenance/language/generateCollationData.php  |  11 +-
 maintenance/language/generateNormalizerData.php |  21 ++
 maintenance/language/languages.inc              |  19 +-
 maintenance/language/messageTypes.inc           | 228 ++++++++++++--
 maintenance/language/messages.inc               | 394 ++++++++++++++++++++----
 maintenance/language/rebuildLanguage.php        |  26 +-
 maintenance/language/transstat.php              |  20 +-
 maintenance/language/validate.php               |  17 +
 maintenance/language/writeMessagesArray.inc     |  15 +
 15 files changed, 763 insertions(+), 109 deletions(-)

(limited to 'maintenance/language')

diff --git a/maintenance/language/StatOutputs.php b/maintenance/language/StatOutputs.php
index b8e28302..c6d03641 100644
--- a/maintenance/language/StatOutputs.php
+++ b/maintenance/language/StatOutputs.php
@@ -3,6 +3,21 @@ if ( !defined( 'MEDIAWIKI' ) ) die();
 /**
  * Statistic output classes.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ -31,10 +46,20 @@ class statsOutput {
 /** Outputs WikiText */
 class wikiStatsOutput extends statsOutput {
 	function heading() {
+		global $wgDummyLanguageCodes, $wgContLang;
 		$version = SpecialVersion::getVersion( 'nodb' );
 		echo "'''Statistics are based on:''' <code>" . $version . "</code>\n\n";
 		echo "'''Note:''' These statistics can be generated by running <code>php maintenance/language/transstat.php</code>.\n\n";
 		echo "For additional information on specific languages (the message names, the actual problems, etc.), run <code>php maintenance/language/checkLanguage.php --lang=foo</code>.\n\n";
+		echo 'English (en) is excluded because it is the default localization';
+		if( is_array( $wgDummyLanguageCodes ) ) {
+			$dummyCodes = array();
+			foreach( $wgDummyLanguageCodes as $dummyCode ) {
+				$dummyCodes[] = $wgContLang->getLanguageName( $dummyCode ) . ' (' . $dummyCode . ')';
+			}
+			echo ', as well as the following languages that are not intended for system message translations, usually because they redirect to other language codes: ' . implode( ', ', $dummyCodes );
+		}
+		echo ".\n\n"; # dot to end sentence
 		echo '{| class="sortable wikitable" border="2" cellpadding="4" cellspacing="0" style="background-color: #F9F9F9; border: 1px #AAAAAA solid; border-collapse: collapse; clear:both;" width="100%"' . "\n";
 	}
 	function footer() {
diff --git a/maintenance/language/checkDupeMessages.php b/maintenance/language/checkDupeMessages.php
index ea9d5fb7..ea5b1870 100644
--- a/maintenance/language/checkDupeMessages.php
+++ b/maintenance/language/checkDupeMessages.php
@@ -1,6 +1,22 @@
 <?php
 /**
- * @todo document
+ * Script to print out duplicates in message array
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
@@ -18,9 +34,9 @@ if ( isset( $options['lang'] ) && isset( $options['clang'] ) ) {
 	} else {
 		if ( !strcmp( $options['mode'], 'wiki' ) ) {
 			$runMode = 'wiki';
-		} else if ( !strcmp( $options['mode'], 'php' ) ) {
+		} elseif ( !strcmp( $options['mode'], 'php' ) ) {
 			$runMode = 'php';
-		} else if ( !strcmp( $options['mode'], 'raw' ) ) {
+		} elseif ( !strcmp( $options['mode'], 'raw' ) ) {
 			$runMode = 'raw';
 		} else {
 		}
@@ -61,7 +77,7 @@ if ( $runTest ) {
 if ( $run ) {
 	if ( !strcmp( $runMode, 'wiki' ) ) {
 		$runMode = 'wiki';
-	} else if ( !strcmp( $runMode, 'raw' ) ) {
+	} elseif ( !strcmp( $runMode, 'raw' ) ) {
 		$runMode = 'raw';
 	}
 	include( $messagesFile );
@@ -86,9 +102,9 @@ if ( $run ) {
 					if ( ( !strcmp( $key, $ckey ) ) && ( !strcmp( $value, $cvalue ) ) ) {
 						if ( !strcmp( $runMode, 'raw' ) ) {
 							print( "$key\n" );
-						} else if ( !strcmp( $runMode, 'php' ) ) {
+						} elseif ( !strcmp( $runMode, 'php' ) ) {
 							print( "'$key' => '',\n" );
-						} else if ( !strcmp( $runMode, 'wiki' ) ) {
+						} elseif ( !strcmp( $runMode, 'wiki' ) ) {
 							$uKey = ucfirst( $key );
 							print( "* MediaWiki:$uKey/$langCode\n" );
 						} else {
diff --git a/maintenance/language/checkExtensions.php b/maintenance/language/checkExtensions.php
index c05cf193..a58a8f5c 100644
--- a/maintenance/language/checkExtensions.php
+++ b/maintenance/language/checkExtensions.php
@@ -2,6 +2,21 @@
 /**
  * Check the extensions language files.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc
index d8480c0f..1e4b94a2 100644
--- a/maintenance/language/checkLanguage.inc
+++ b/maintenance/language/checkLanguage.inc
@@ -1,4 +1,25 @@
 <?php
+/**
+ * Helper class for checkLanguage.php script.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup MaintenanceLanguage
+ */
 
 /**
  * @ingroup MaintenanceLanguage
@@ -97,7 +118,7 @@ class CheckLanguageCLI {
 
 	/**
 	 * Get the checks that can easily be treated by non-speakers of the language.
-	 * @return A list of the easy checks.
+	 * @return Array A list of the easy checks.
 	 */
 	protected function easyChecks() {
 		return array(
diff --git a/maintenance/language/checkLanguage.php b/maintenance/language/checkLanguage.php
index 9396e8c1..69f61084 100644
--- a/maintenance/language/checkLanguage.php
+++ b/maintenance/language/checkLanguage.php
@@ -2,6 +2,21 @@
 /**
  * Check a language file.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
diff --git a/maintenance/language/function-list.php b/maintenance/language/function-list.php
index 7985f37d..7b0e57c2 100644
--- a/maintenance/language/function-list.php
+++ b/maintenance/language/function-list.php
@@ -1,5 +1,20 @@
 <?php
 /**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
diff --git a/maintenance/language/generateCollationData.php b/maintenance/language/generateCollationData.php
index 68ad2ddf..2c3ffedc 100644
--- a/maintenance/language/generateCollationData.php
+++ b/maintenance/language/generateCollationData.php
@@ -68,9 +68,12 @@ class GenerateCollationData extends Maintenance {
 	}
 
 	function charCallback( $data ) {
-		// Skip non-printable characters
+		// Skip non-printable characters,
+		// but do not skip a normal space (U+0020) since
+		// people like to use that as a fake no header symbol.
 		$category = substr( $data['gc'], 0, 1 );
-		if ( strpos( 'LNPS', $category ) === false ) {
+		if ( strpos( 'LNPS', $category ) === false 
+			&& $data['cp'] !== '0020' ) {
 			return;
 		}
 		$cp = hexdec( $data['cp'] );
@@ -193,7 +196,7 @@ class GenerateCollationData extends Maintenance {
 		// portion equal to the first character, then remove the second 
 		// character. This avoids having characters like U+A732 (double A)
 		// polluting the basic latin sort area.
-		$prevWeights = array();
+
 		foreach ( $this->groups as $weight => $group ) {
 			if ( preg_match( '/(\.[0-9A-F]*)\./', $weight, $m ) ) {
 				if ( isset( $this->groups[$m[1]] ) ) {
@@ -377,5 +380,5 @@ class UcdXmlReader {
 }
 
 $maintClass = 'GenerateCollationData';
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 
diff --git a/maintenance/language/generateNormalizerData.php b/maintenance/language/generateNormalizerData.php
index cb9910f3..a958abf1 100644
--- a/maintenance/language/generateNormalizerData.php
+++ b/maintenance/language/generateNormalizerData.php
@@ -1,4 +1,25 @@
 <?php
+/**
+ * Generates normalizer data files for Arabic and Malayalam.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup MaintenanceLanguage
+ */
 
 require_once( dirname( __FILE__ ) . '/../Maintenance.php' );
 
diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc
index c5c9f650..60b1112f 100644
--- a/maintenance/language/languages.inc
+++ b/maintenance/language/languages.inc
@@ -2,6 +2,21 @@
 /**
  * Handle messages in the language files.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
@@ -73,7 +88,7 @@ class languages {
 	/**
 	 * Load the language file.
 	 *
-	 * @param $code The language code.
+	 * @param $code string The language code.
 	 */
 	protected function loadFile( $code ) {
 		if ( isset( $this->mRawMessages[$code] ) &&
@@ -190,7 +205,7 @@ class languages {
 	 *
 	 * @param $code The language code.
 	 *
-	 * @return The messages in this language.
+	 * @return string The messages in this language.
 	 */
 	public function getMessages( $code ) {
 		$this->loadMessages( $code );
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index 9baf7e76..62374500 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -2,6 +2,21 @@
 /**
  * Several types of messages.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
@@ -86,9 +101,11 @@ $wgIgnoredMessages = array(
 	'exif-make-value',
 	'exif-model-value',
 	'exif-software-value',
+	'exif-software-version-value',
 	'history_copyright',
 	'licenses',
 	'loginstart',
+	'loginend-https',
 	'loginend',
 	'loginlanguagelinks',
 	'pear-mail-error',
@@ -96,6 +113,7 @@ $wgIgnoredMessages = array(
 	'markaspatrolledlink',
 	'newarticletextanon',
 	'newsectionheaderdefaultlevel',
+	'mainpage-nstab',
 	'newtalkseparator',
 	'noarticletextanon',
 	'number_of_watching_users_RCview',
@@ -111,6 +129,7 @@ $wgIgnoredMessages = array(
 	'signature-anon',
 	'signupstart',
 	'signupend',
+	'signupend-https',
 	'sitenotice',
 	'sitesubtitle',
 	'sitetitle',
@@ -125,7 +144,7 @@ $wgIgnoredMessages = array(
 	'allpages-summary',
 	'booksources-summary',
 	'categories-summary',
-	'ipblocklist-summary',
+	'blocklist-summary',
 	'protectedtitles-summary',
 	'listusers-summary',
 	'longpages-summary',
@@ -183,7 +202,6 @@ $wgOptionalMessages = array(
 	'userrights-irreversible-marker',
 	'tog-nolangconversion',
 	'tog-noconvertlink',
-	'yourvariant',
 	'variantname-zh-hans',
 	'variantname-zh-hant',
 	'variantname-zh-cn',
@@ -212,6 +230,9 @@ $wgOptionalMessages = array(
 	'variantname-tg-cyrl',
 	'variantname-tg-latn',
 	'variantname-tg',
+	'variantname-ike-cans',
+	'variantname-ike-latn',
+	'variantname-iu',
 	'rc-change-size',
 	'resetpass_text',
 	'image_sample',
@@ -237,6 +258,11 @@ $wgOptionalMessages = array(
 	'vector.css',
 	'print.css',
 	'handheld.css',
+	'noscript.css',
+	'group-autoconfirmed.css',
+	'group-bot.css',
+	'group-sysop.css',
+	'group-bureaucrat.css',
 	'common.js',
 	'standard.js',
 	'nostalgia.js',
@@ -247,26 +273,39 @@ $wgOptionalMessages = array(
 	'simple.js',
 	'modern.js',
 	'vector.js',
+	'group-autoconfirmed.js',
+	'group-bot.js',
+	'group-sysop.js',
+	'group-bureaucrat.js',
 	'widthheight',
 	'exif-fnumber-format',
 	'exif-focallength-format',
+	'exif-compression-5',
 	'exif-compression-6',
+	'exif-compression-7',
+	'exif-compression-8',
+	'exif-compression-32773',
+	'exif-compression-32946',
+	'exif-compression-34712',
 	'exif-photometricinterpretation-2',
 	'exif-photometricinterpretation-6',
 	'exif-xyresolution-i',
 	'exif-xyresolution-c',
 	'exif-colorspace-1',
-	'exif-colorspace-ffff.h',
 	'exif-componentsconfiguration-1',
 	'exif-componentsconfiguration-2',
 	'exif-componentsconfiguration-3',
 	'exif-componentsconfiguration-4',
 	'exif-componentsconfiguration-5',
 	'exif-componentsconfiguration-6',
+	'exif-contact-value',
+	'exif-coordinate-format',
 	'exif-lightsource-20',
 	'exif-lightsource-21',
 	'exif-lightsource-22',
 	'exif-lightsource-23',
+	'exif-maxaperturevalue-value',
+	'exif-subjectnewscode-value',
 	'booksources-isbn',
 	'sp-contributions-explain',
 	'sorbs',
@@ -274,14 +313,15 @@ $wgOptionalMessages = array(
 	'seconds-abbrev',
 	'minutes-abbrev',
 	'hours-abbrev',
+	'days-abbrev',
 	'filerevert-backlink',
 	'filedelete-backlink',
 	'delete-backlink',
-	'move-page-backlink',
 	'protect-backlink',
 	'pagetitle',
 	'filename-prefix-blacklist',
 	'edittools',
+	'edittools-upload',
 	'size-bytes',
 	'size-kilobytes',
 	'size-megabytes',
@@ -338,8 +378,8 @@ $wgOptionalMessages = array(
 	'hebrew-calendar-m10-gen',
 	'hebrew-calendar-m11-gen',
 	'hebrew-calendar-m12-gen',
+	'version-api',
 	'version-svn-revision',
-	'catseparator',
 	'semicolon-separator',
 	'comma-separator',
 	'colon-separator',
@@ -364,6 +404,9 @@ $wgOptionalMessages = array(
 	'shared-repo-name-wikimediacommons',
 	'usermessage-template',
 	'filepage.css',
+	'metadata-langitem',
+	'metadata-langitem-default',
+	'nocookiesforlogin',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
@@ -380,13 +423,11 @@ $wgEXIFMessages = array(
 	'exif-ycbcrpositioning',
 	'exif-xresolution',
 	'exif-yresolution',
-	'exif-resolutionunit',
 	'exif-stripoffsets',
 	'exif-rowsperstrip',
 	'exif-stripbytecounts',
 	'exif-jpeginterchangeformat',
 	'exif-jpeginterchangeformatlength',
-	'exif-transferfunction',
 	'exif-whitepoint',
 	'exif-primarychromaticities',
 	'exif-ycbcrcoefficients',
@@ -405,7 +446,6 @@ $wgEXIFMessages = array(
 	'exif-compressedbitsperpixel',
 	'exif-pixelydimension',
 	'exif-pixelxdimension',
-	'exif-makernote',
 	'exif-usercomment',
 	'exif-relatedsoundfile',
 	'exif-datetimeoriginal',
@@ -416,10 +456,10 @@ $wgEXIFMessages = array(
 	'exif-exposuretime',
 	'exif-exposuretime-format',
 	'exif-fnumber',
+	'exif-fnumber-format',
 	'exif-exposureprogram',
 	'exif-spectralsensitivity',
 	'exif-isospeedratings',
-	'exif-oecf',
 	'exif-shutterspeedvalue',
 	'exif-aperturevalue',
 	'exif-brightnessvalue',
@@ -430,9 +470,9 @@ $wgEXIFMessages = array(
 	'exif-lightsource',
 	'exif-flash',
 	'exif-focallength',
+	'exif-focallength-format',
 	'exif-subjectarea',
 	'exif-flashenergy',
-	'exif-spatialfrequencyresponse',
 	'exif-focalplanexresolution',
 	'exif-focalplaneyresolution',
 	'exif-focalplaneresolutionunit',
@@ -441,7 +481,6 @@ $wgEXIFMessages = array(
 	'exif-sensingmethod',
 	'exif-filesource',
 	'exif-scenetype',
-	'exif-cfapattern',
 	'exif-customrendered',
 	'exif-exposuremode',
 	'exif-whitebalance',
@@ -486,7 +525,92 @@ $wgEXIFMessages = array(
 	'exif-gpsareainformation',
 	'exif-gpsdatestamp',
 	'exif-gpsdifferential',
+	'exif-coordinate-format',
+	'exif-jpegfilecomment',
+	'exif-keywords',
+	'exif-worldregioncreated',
+	'exif-countrycreated',
+	'exif-countrycodecreated',
+	'exif-provinceorstatecreated',
+	'exif-citycreated',
+	'exif-sublocationcreated',
+	'exif-worldregiondest',
+	'exif-countrydest',
+	'exif-countrycodedest',
+	'exif-provinceorstatedest',
+	'exif-citydest',
+	'exif-sublocationdest',
+	'exif-objectname',
+	'exif-specialinstructions',
+	'exif-headline',
+	'exif-credit',
+	'exif-source',
+	'exif-editstatus',
+	'exif-urgency',
+	'exif-fixtureidentifier',
+	'exif-locationdest',
+	'exif-locationdestcode',
+	'exif-objectcycle',
+	'exif-contact',
+	'exif-writer',
+	'exif-languagecode',
+	'exif-iimversion',
+	'exif-iimcategory',
+	'exif-iimsupplementalcategory',
+	'exif-datetimeexpires',
+	'exif-datetimereleased',
+	'exif-originaltransmissionref',
+	'exif-identifier',
+	'exif-lens',
+	'exif-serialnumber',
+	'exif-cameraownername',
+	'exif-label',
+	'exif-datetimemetadata',
+	'exif-nickname',
+	'exif-rating',
+	'exif-rightscertificate',
+	'exif-copyrighted',
+	'exif-copyrightowner',
+	'exif-usageterms',
+	'exif-webstatement',
+	'exif-originaldocumentid',
+	'exif-licenseurl',
+	'exif-morepermissionsurl',
+	'exif-attributionurl',
+	'exif-preferredattributionname',
+	'exif-pngfilecomment',
+	'exif-disclaimer',
+	'exif-contentwarning',
+	'exif-giffilecomment',
+	'exif-intellectualgenre',
+	'exif-subjectnewscode',
+	'exif-scenecode',
+	'exif-event',
+	'exif-organisationinimage',
+	'exif-personinimage',
+	'exif-originalimageheight',
+	'exif-originalimagewidth',
+	'exif-make-value',
+	'exif-model-value',
+	'exif-software-value',
+	'exif-software-version-value',
+	'exif-contact-value',
+	'exif-subjectnewscode-value',
 	'exif-compression-1',
+	'exif-compression-2',
+	'exif-compression-3',
+	'exif-compression-4',
+	'exif-compression-5',
+	'exif-compression-6',
+	'exif-compression-7',
+	'exif-compression-8',
+	'exif-compression-32773',
+	'exif-compression-32946',
+	'exif-compression-34712',
+	'exif-copyrighted-true',
+	'exif-copyrighted-false',
+	'exif-photometricinterpretation-2',
+	'exif-photometricinterpretation-6',
 	'exif-unknowndate',
 	'exif-orientation-1',
 	'exif-orientation-2',
@@ -498,7 +622,17 @@ $wgEXIFMessages = array(
 	'exif-orientation-8',
 	'exif-planarconfiguration-1',
 	'exif-planarconfiguration-2',
+	'exif-xyresolution-i',
+	'exif-xyresolution-c',
+	'exif-colorspace-1',
+	'exif-colorspace-65535',
 	'exif-componentsconfiguration-0',
+	'exif-componentsconfiguration-1',
+	'exif-componentsconfiguration-2',
+	'exif-componentsconfiguration-3',
+	'exif-componentsconfiguration-4',
+	'exif-componentsconfiguration-5',
+	'exif-componentsconfiguration-6',
 	'exif-exposureprogram-0',
 	'exif-exposureprogram-1',
 	'exif-exposureprogram-2',
@@ -532,18 +666,22 @@ $wgEXIFMessages = array(
 	'exif-lightsource-17',
 	'exif-lightsource-18',
 	'exif-lightsource-19',
+	'exif-lightsource-20',
+	'exif-lightsource-21',
+	'exif-lightsource-22',
+	'exif-lightsource-23',
 	'exif-lightsource-24',
 	'exif-lightsource-255',
-	'exif-flash-fired-0' ,
-	'exif-flash-fired-1' ,
-	'exif-flash-return-0' ,
-	'exif-flash-return-2' ,
-	'exif-flash-return-3' ,
-	'exif-flash-mode-1' ,
-	'exif-flash-mode-2' ,
-	'exif-flash-mode-3' ,
-	'exif-flash-function-1' ,
-	'exif-flash-redeye-1' ,
+	'exif-flash-fired-0',
+	'exif-flash-fired-1',
+	'exif-flash-return-0',
+	'exif-flash-return-2',
+	'exif-flash-return-3',
+	'exif-flash-mode-1',
+	'exif-flash-mode-2',
+	'exif-flash-mode-3',
+	'exif-flash-function-1',
+	'exif-flash-redeye-1',
 	'exif-focalplaneresolutionunit-2',
 	'exif-sensingmethod-1',
 	'exif-sensingmethod-2',
@@ -552,6 +690,7 @@ $wgEXIFMessages = array(
 	'exif-sensingmethod-5',
 	'exif-sensingmethod-7',
 	'exif-sensingmethod-8',
+	'exif-filesource-3',
 	'exif-scenetype-1',
 	'exif-customrendered-0',
 	'exif-customrendered-1',
@@ -586,8 +725,8 @@ $wgEXIFMessages = array(
 	'exif-gpslatitude-s',
 	'exif-gpslongitude-e',
 	'exif-gpslongitude-w',
-	'exif-gpsaltitude-0',
-	'exif-gpsaltitude-1',
+	'exif-gpsaltitude-above-sealevel',
+	'exif-gpsaltitude-below-sealevel',
 	'exif-gpsstatus-a',
 	'exif-gpsstatus-v',
 	'exif-gpsmeasuremode-2',
@@ -598,7 +737,48 @@ $wgEXIFMessages = array(
 	'exif-gpsdestdistance-k',
 	'exif-gpsdestdistance-m',
 	'exif-gpsdestdistance-n',
+	'exif-gpsdop-excellent',
+	'exif-gpsdop-good',
+	'exif-gpsdop-moderate',
+	'exif-gpsdop-fair',
+	'exif-gpsdop-poor',
+	'exif-objectcycle-a',
+	'exif-objectcycle-p',
+	'exif-objectcycle-b',
 	'exif-gpsdirection-t',
 	'exif-gpsdirection-m',
-	'exif-objectname',
+	'exif-ycbcrpositioning-1',
+	'exif-ycbcrpositioning-2',
+	'exif-dc-contributor',
+	'exif-dc-coverage',
+	'exif-dc-date',
+	'exif-dc-publisher',
+	'exif-dc-relation',
+	'exif-dc-rights',
+	'exif-dc-source',
+	'exif-dc-type',
+	'exif-rating-rejected',
+	'exif-isospeedratings-overflow',
+	'exif-maxaperturevalue-value',
+	'exif-iimcategory-ace',
+	'exif-iimcategory-clj',
+	'exif-iimcategory-dis',
+	'exif-iimcategory-fin',
+	'exif-iimcategory-edu',
+	'exif-iimcategory-evn',
+	'exif-iimcategory-hth',
+	'exif-iimcategory-hum',
+	'exif-iimcategory-lab',
+	'exif-iimcategory-lif',
+	'exif-iimcategory-pol',
+	'exif-iimcategory-rel',
+	'exif-iimcategory-sci',
+	'exif-iimcategory-soi',
+	'exif-iimcategory-spo',
+	'exif-iimcategory-war',
+	'exif-iimcategory-wea',
+	'exif-urgency-normal',
+	'exif-urgency-low',
+	'exif-urgency-high',
+	'exif-urgency-other',
 );
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index a0b19ac6..d707cf5d 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2,6 +2,21 @@
 /**
  * Define the messages structure in the messages file, for an automated rewriting.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
@@ -142,11 +157,10 @@ $wgMessageStructure = array(
 		'listingcontinuesabbrev',
 		'index-category',
 		'noindex-category',
+		'broken-file-category',
 	),
 	'mainpage' => array(
 		'linkprefix',
-		'mainpagetext',
-		'mainpagedocfooter',
 	),
 	'miscellaneous1' => array(
 		'about',
@@ -202,10 +216,10 @@ $wgMessageStructure = array(
 		'history',
 		'history_short',
 		'updatedmarker',
-		'info_short',
 		'printableversion',
 		'permalink',
 		'print',
+		'view',
 		'edit',
 		'create',
 		'editthispage',
@@ -213,6 +227,7 @@ $wgMessageStructure = array(
 		'delete',
 		'deletethispage',
 		'undelete_short',
+		'viewdeleted_short',
 		'protect',
 		'protect_change',
 		'protectthispage',
@@ -302,6 +317,8 @@ $wgMessageStructure = array(
 		'toc',
 		'showtoc',
 		'hidetoc',
+		'collapsible-collapse',
+		'collapsible-expand',
 		'thisisdeleted',
 		'viewdeleted',
 		'restorelink',
@@ -318,6 +335,9 @@ $wgMessageStructure = array(
 		'anonnotice',
 		'newsectionheaderdefaultlevel',
 		'red-link-title',
+		'sort-descending',
+		'sort-ascending',
+
 	),
 	'nstab' => array(
 		'nstab-main',
@@ -330,6 +350,7 @@ $wgMessageStructure = array(
 		'nstab-template',
 		'nstab-help',
 		'nstab-category',
+		'mainpage-nstab',
 	),
 	'main' => array(
 		'nosuchaction',
@@ -381,7 +402,8 @@ $wgMessageStructure = array(
 		'sqlhidden',
 		'cascadeprotected',
 		'namespaceprotected',
-		'customcssjsprotected',
+		'customcssprotected',
+		'customjsprotected',
 		'ns-specialprotected',
 		'titleprotected',
 	),
@@ -413,6 +435,7 @@ $wgMessageStructure = array(
 		'createaccount',
 		'gotaccount',
 		'gotaccountlink',
+		'userlogin-resetlink',
 		'createaccountmail',
 		'createaccountreason',
 		'badretype',
@@ -421,6 +444,8 @@ $wgMessageStructure = array(
 		'createaccounterror',
 		'nocookiesnew',
 		'nocookieslogin',
+		'nocookiesfornew',
+		'nocookiesforlogin',
 		'noname',
 		'loginsuccesstitle',
 		'loginsuccess',
@@ -444,8 +469,10 @@ $wgMessageStructure = array(
 		'throttled-mailpassword',
 		'loginstart',
 		'loginend',
+		'loginend-https',
 		'signupstart',
 		'signupend',
+		'signupend-https',
 		'mailerror',
 		'acct_creation_throttle_hit',
 		'emailauthenticated',
@@ -459,6 +486,7 @@ $wgMessageStructure = array(
 		'createaccount-text',
 		'usernamehasherror',
 		'login-throttled',
+		'login-abort-generic',
 		'loginlanguagelabel',
 		'loginlanguagelinks',
 		'suspicious-userlogout',
@@ -485,6 +513,21 @@ $wgMessageStructure = array(
 		'resetpass-wrong-oldpass',
 		'resetpass-temp-password',
 	),
+	'passwordreset' => array(
+		'passwordreset',
+		'passwordreset-text',
+		'passwordreset-legend',
+		'passwordreset-disabled',
+		'passwordreset-pretext',
+		'passwordreset-username',
+		'passwordreset-domain',
+		'passwordreset-email',
+		'passwordreset-emailtitle',
+		'passwordreset-emailtext-ip',
+		'passwordreset-emailtext-user',
+		'passwordreset-emailelement',
+		'passwordreset-emailsent',
+	),
 	'toolbar' => array(
 		'bold_sample',
 		'bold_tip',
@@ -496,8 +539,6 @@ $wgMessageStructure = array(
 		'extlink_tip',
 		'headline_sample',
 		'headline_tip',
-		'math_sample',
-		'math_tip',
 		'nowiki_sample',
 		'nowiki_tip',
 		'image_sample',
@@ -566,6 +607,7 @@ $wgMessageStructure = array(
 		'session_fail_preview',
 		'session_fail_preview_html',
 		'token_suffix_mismatch',
+		'edit_form_incomplete',
 		'editing',
 		'editingsection',
 		'editingcomment',
@@ -593,6 +635,7 @@ $wgMessageStructure = array(
 		'template-semiprotected',
 		'hiddencategories',
 		'edittools',
+		'edittools-upload',
 		'nocreatetitle',
 		'nocreatetext',
 		'nocreate-loggedin',
@@ -869,6 +912,7 @@ $wgMessageStructure = array(
 		'qbsettings-fixedright',
 		'qbsettings-floatingleft',
 		'qbsettings-floatingright',
+		'qbsettings-directionality',
 	),
 	'preferences' => array(
 		'preferences',
@@ -880,9 +924,10 @@ $wgMessageStructure = array(
 		'changepassword',
 		'prefs-skin',
 		'skin-preview',
-		'prefs-math',
 		'datedefault',
+		'prefs-beta',
 		'prefs-datetime',
+		'prefs-labs',
 		'prefs-personal',
 		'prefs-rc',
 		'prefs-watchlist',
@@ -904,8 +949,6 @@ $wgMessageStructure = array(
 		'columns',
 		'searchresultshead',
 		'resultsperpage',
-		'contextlines',
-		'contextchars',
 		'stub-threshold',
 		'stub-threshold-disabled',
 		'recentchangesdays',
@@ -965,8 +1008,12 @@ $wgMessageStructure = array(
 		'prefs-help-gender',
 		'email',
 		'prefs-help-realname',
+
+		# 3 messages depending upon wgEmailConfirmToEdit and $wgEnableUserEmail
 		'prefs-help-email',
+		'prefs-help-email-others',
 		'prefs-help-email-required',
+
 		'prefs-info',
 		'prefs-i18n',
 		'prefs-signature',
@@ -1091,7 +1138,6 @@ $wgMessageStructure = array(
 		'right-userrights',
 		'right-userrights-interwiki',
 		'right-siteadmin',
-		'right-reset-passwords',
 		'right-override-export-depth',
 		'right-sendemail',
 	),
@@ -1099,6 +1145,7 @@ $wgMessageStructure = array(
 		'rightslog',
 		'rightslogtext',
 		'rightslogentry',
+		'rightslogentry-autopromote',
 		'rightsnone',
 	),
 	'action' => array(
@@ -1239,6 +1286,7 @@ $wgMessageStructure = array(
 		'large-file',
 		'largefileserver',
 		'emptyfile',
+		'windows-nonascii-filename',
 		'fileexists',
 		'filepageexists',
 		'fileexists-extension',
@@ -1260,6 +1308,7 @@ $wgMessageStructure = array(
 		'php-uploaddisabledtext',
 		'uploadscripted',
 		'uploadvirus',
+		'uploadjava',
 		'upload-source',
 		'sourcefilename',
 		'sourceurl',
@@ -1269,7 +1318,6 @@ $wgMessageStructure = array(
 		'upload-options',
 		'watchthisupload',
 		'filewasdeleted',
-		'upload-wasdeleted',
 		'filename-bad-prefix',
 		'filename-prefix-blacklist',
 		'upload-success-subj',
@@ -1291,6 +1339,23 @@ $wgMessageStructure = array(
 		'upload-http-error',
 	),
 
+	'zip' => array(
+		'zip-file-open-error',
+		'zip-wrong-format',
+		'zip-bad',
+		'zip-unsupported'
+	),
+
+	'uploadstash' => array(
+		'uploadstash',
+		'uploadstash-summary',
+		'uploadstash-clear',
+		'uploadstash-nofiles',
+		'uploadstash-badtoken',
+		'uploadstash-errclear',
+		'uploadstash-refresh',
+	),
+
 	'img-auth' => array(
 		'img-auth-accessdenied',
 		'img-auth-desc',
@@ -1367,7 +1432,7 @@ $wgMessageStructure = array(
 		'linkstoimage-more',
 		'nolinkstoimage',
 		'morelinkstoimage',
-		'redirectstofile',
+		'linkstoimage-redirect',
 		'duplicatesoffile',
 		'sharedupload',
 		'sharedupload-desc-there',
@@ -1473,6 +1538,7 @@ $wgMessageStructure = array(
 		'doubleredirects-summary',
 		'doubleredirectstext',
 		'double-redirect-fixed-move',
+		'double-redirect-fixed-maintenance',
 		'double-redirect-fixer',
 	),
 	'brokenredirects' => array(
@@ -1580,6 +1646,7 @@ $wgMessageStructure = array(
 		'pager-newer-n',
 		'pager-older-n',
 		'suppress',
+		'querypage-disabled',
 	),
 	'booksources' => array(
 		'booksources',
@@ -1703,6 +1770,10 @@ $wgMessageStructure = array(
 		'noemailtext',
 		'nowikiemailtitle',
 		'nowikiemailtext',
+		'emailnotarget',
+		'emailtarget',
+		'emailusername',
+		'emailusernamesubmit',
 		'email-legend',
 		'emailfrom',
 		'emailto',
@@ -1728,9 +1799,9 @@ $wgMessageStructure = array(
 		'watchlistanontext',
 		'watchnologin',
 		'watchnologintext',
-		'addedwatch',
+		'addwatch',
 		'addedwatchtext',
-		'removedwatch',
+		'removewatch',
 		'removedwatchtext',
 		'watch',
 		'watchthispage',
@@ -1753,6 +1824,7 @@ $wgMessageStructure = array(
 	'watching' => array(
 		'watching',
 		'unwatching',
+		'watcherrortext',
 	),
 	'enotif' => array(
 		'enotif_mailer',
@@ -1911,6 +1983,9 @@ $wgMessageStructure = array(
 	'nsform' => array(
 		'namespace',
 		'invert',
+		'tooltip-invert',
+		'namespace_association',
+		'tooltip-namespace_association',
 		'blanknamespace',
 	),
 	'contributions' => array(
@@ -1965,17 +2040,19 @@ $wgMessageStructure = array(
 		'whatlinkshere-filters',
 	),
 	'block' => array(
+		'autoblockid',
+		'block',
+		'unblock',
 		'blockip',
 		'blockip-title',
 		'blockip-legend',
 		'blockiptext',
-		'ipaddress',
 		'ipadressorusername',
 		'ipbexpiry',
 		'ipbreason',
 		'ipbreasonotherlist',
 		'ipbreason-dropdown',
-		'ipbanononly',
+		'ipb-hardblock',
 		'ipbcreateaccount',
 		'ipbemailban',
 		'ipbenableautoblock',
@@ -1986,11 +2063,14 @@ $wgMessageStructure = array(
 		'ipbotherreason',
 		'ipbhidename',
 		'ipbwatchuser',
-		'ipballowusertalk',
+		'ipb-disableusertalk',
 		'ipb-change-block',
+		'ipb-confirm',
 		'badipaddress',
 		'blockipsuccesssub',
 		'blockipsuccesstext',
+		'ipb-blockingself',
+		'ipb-confirmhideuser',
 		'ipb-edit-dropdown',
 		'ipb-unblock-addr',
 		'ipb-unblock',
@@ -2000,18 +2080,25 @@ $wgMessageStructure = array(
 		'unblockiptext',
 		'ipusubmit',
 		'unblocked',
+		'unblocked-range',
 		'unblocked-id',
+		'blocklist',
 		'ipblocklist',
 		'ipblocklist-legend',
-		'ipblocklist-username',
-		'ipblocklist-sh-userblocks',
-		'ipblocklist-sh-tempblocks',
-		'ipblocklist-sh-addressblocks',
-		'ipblocklist-summary',
+		'blocklist-userblocks',
+		'blocklist-tempblocks',
+		'blocklist-addressblocks',
+		'blocklist-timestamp',
+		'blocklist-target',
+		'blocklist-expiry',
+		'blocklist-by',
+		'blocklist-params',
+		'blocklist-reason',
+		'blocklist-summary',
 		'ipblocklist-submit',
 		'ipblocklist-localblock',
 		'ipblocklist-otherblocks',
-		'blocklistline',
+
 		'infiniteblock',
 		'expiringblock',
 		'anononlyblock',
@@ -2047,6 +2134,7 @@ $wgMessageStructure = array(
 		'ipb_already_blocked',
 		'ipb-needreblock',
 		'ipb-otherblocks-header',
+		'unblock-hideuser',
 		'ipb_cant_unblock',
 		'ipb_blocked_as_range',
 		'ip_range_invalid',
@@ -2080,10 +2168,10 @@ $wgMessageStructure = array(
 		'unlockdbsuccesstext',
 		'lockfilenotwritable',
 		'databasenotlocked',
+		'lockedbyandtime',
 	),
 	'movepage' => array(
 		'move-page',
-		'move-page-backlink',
 		'move-page-legend',
 		'movepagetext',
 		'movepagetext-noredirectfixer',
@@ -2382,6 +2470,11 @@ $wgMessageStructure = array(
 		'vector.css',
 		'print.css',
 		'handheld.css',
+		'noscript.css',
+		'group-autoconfirmed.css',
+		'group-bot.css',
+		'group-sysop.css',
+		'group-bureaucrat.css',
 	),
 	'scripts' => array(
 		'common.js',
@@ -2394,10 +2487,12 @@ $wgMessageStructure = array(
 		'simple.js',
 		'modern.js',
 		'vector.js',
+		'group-autoconfirmed.js',
+		'group-bot.js',
+		'group-sysop.js',
+		'group-bureaucrat.js',
 	),
 	'metadata_cc' => array(
-		'nodublincore',
-		'nocreativecommons',
 		'notacceptable',
 	),
 	'attribution' => array(
@@ -2421,12 +2516,17 @@ $wgMessageStructure = array(
 		'spam_blanking',
 	),
 	'info' => array(
-		'infosubtitle',
-		'numedits',
-		'numtalkedits',
-		'numwatchers',
-		'numauthors',
-		'numtalkauthors',
+		'pageinfo-title',
+		'pageinfo-header-edits',
+		'pageinfo-header-watchlist',
+		'pageinfo-header-views',
+		'pageinfo-subjectpage',
+		'pageinfo-talkpage',
+		'pageinfo-watchers',
+		'pageinfo-edits',
+		'pageinfo-authors',
+		'pageinfo-views',
+		'pageinfo-viewsperedit',
 	),
 	'skin' => array(
 		'skinname-standard',
@@ -2439,25 +2539,6 @@ $wgMessageStructure = array(
 		'skinname-modern',
 		'skinname-vector',
 	),
-	'math' => array(
-		'mw_math_png',
-		'mw_math_simple',
-		'mw_math_html',
-		'mw_math_source',
-		'mw_math_modern',
-		'mw_math_mathml',
-	),
-	'matherrors' => array(
-		'math_failure',
-		'math_unknown_error',
-		'math_unknown_function',
-		'math_lexing_error',
-		'math_syntax_error',
-		'math_image_error',
-		'math_bad_tmpdir',
-		'math_bad_output',
-		'math_notexvc',
-	),
 	'patrolling' => array(
 		'markaspatrolleddiff',
 		'markaspatrolledlink',
@@ -2499,10 +2580,13 @@ $wgMessageStructure = array(
 		'widthheightpage',
 		'file-info',
 		'file-info-size',
+		'file-info-size-pages',
 		'file-nohires',
 		'svg-long-desc',
 		'show-big-image',
-		'show-big-image-thumb',
+		'show-big-image-preview',
+		'show-big-image-other',
+		'show-big-image-size',
 		'file-info-gif-looped',
 		'file-info-gif-frames',
 		'file-info-png-looped',
@@ -2526,6 +2610,7 @@ $wgMessageStructure = array(
 		'seconds-abbrev',
 		'minutes-abbrev',
 		'hours-abbrev',
+		'days-abbrev',
 	),
 	'badimagelist' => array(
 		'bad_image_list',
@@ -2570,12 +2655,19 @@ $wgMessageStructure = array(
 		'variantname-tg-latn',
 		'variantname-tg',
 	),
+	'variantname-iu' => array(
+		'variantname-ike-cans',
+		'variantname-ike-latn',
+		'variantname-iu',
+	),
 	'metadata' => array(
 		'metadata',
 		'metadata-help',
 		'metadata-expand',
 		'metadata-collapse',
 		'metadata-fields',
+		'metadata-langitem',
+		'metadata-langitem-default',
 	),
 	'exif' => array(
 		'exif-imagewidth',
@@ -2596,7 +2688,6 @@ $wgMessageStructure = array(
 		'exif-stripbytecounts',
 		'exif-jpeginterchangeformat',
 		'exif-jpeginterchangeformatlength',
-		'exif-transferfunction',
 		'exif-whitepoint',
 		'exif-primarychromaticities',
 		'exif-ycbcrcoefficients',
@@ -2615,7 +2706,6 @@ $wgMessageStructure = array(
 		'exif-compressedbitsperpixel',
 		'exif-pixelydimension',
 		'exif-pixelxdimension',
-		'exif-makernote',
 		'exif-usercomment',
 		'exif-relatedsoundfile',
 		'exif-datetimeoriginal',
@@ -2630,7 +2720,6 @@ $wgMessageStructure = array(
 		'exif-exposureprogram',
 		'exif-spectralsensitivity',
 		'exif-isospeedratings',
-		'exif-oecf',
 		'exif-shutterspeedvalue',
 		'exif-aperturevalue',
 		'exif-brightnessvalue',
@@ -2644,7 +2733,6 @@ $wgMessageStructure = array(
 		'exif-focallength-format',
 		'exif-subjectarea',
 		'exif-flashenergy',
-		'exif-spatialfrequencyresponse',
 		'exif-focalplanexresolution',
 		'exif-focalplaneyresolution',
 		'exif-focalplaneresolutionunit',
@@ -2653,7 +2741,6 @@ $wgMessageStructure = array(
 		'exif-sensingmethod',
 		'exif-filesource',
 		'exif-scenetype',
-		'exif-cfapattern',
 		'exif-customrendered',
 		'exif-exposuremode',
 		'exif-whitebalance',
@@ -2698,16 +2785,96 @@ $wgMessageStructure = array(
 		'exif-gpsareainformation',
 		'exif-gpsdatestamp',
 		'exif-gpsdifferential',
+		'exif-coordinate-format',
+		'exif-jpegfilecomment',
+		'exif-keywords',
+		'exif-worldregioncreated',
+		'exif-countrycreated',
+		'exif-countrycodecreated',
+		'exif-provinceorstatecreated',
+		'exif-citycreated',
+		'exif-sublocationcreated',
+		'exif-worldregiondest',
+		'exif-countrydest',
+		'exif-countrycodedest',
+		'exif-provinceorstatedest',
+		'exif-citydest',
+		'exif-sublocationdest',
 		'exif-objectname',
+		'exif-specialinstructions',
+		'exif-headline',
+		'exif-credit',
+		'exif-source',
+		'exif-editstatus',
+		'exif-urgency',
+		'exif-fixtureidentifier',
+		'exif-locationdest',
+		'exif-locationdestcode',
+		'exif-objectcycle',
+		'exif-contact',
+		'exif-writer',
+		'exif-languagecode',
+		'exif-iimversion',
+		'exif-iimcategory',
+		'exif-iimsupplementalcategory',
+		'exif-datetimeexpires',
+		'exif-datetimereleased',
+		'exif-originaltransmissionref',
+		'exif-identifier',
+		'exif-lens',
+		'exif-serialnumber',
+		'exif-cameraownername',
+		'exif-label',
+		'exif-datetimemetadata',
+		'exif-nickname',
+		'exif-rating',
+		'exif-rightscertificate',
+		'exif-copyrighted',
+		'exif-copyrightowner',
+		'exif-usageterms',
+		'exif-webstatement',
+		'exif-originaldocumentid',
+		'exif-licenseurl',
+		'exif-morepermissionsurl',
+		'exif-attributionurl',
+		'exif-preferredattributionname',
+		'exif-pngfilecomment',
+		'exif-disclaimer',
+		'exif-contentwarning',
+		'exif-giffilecomment',
+		'exif-intellectualgenre',
+		'exif-subjectnewscode',
+		'exif-scenecode',
+		'exif-event',
+		'exif-organisationinimage',
+		'exif-personinimage',
+		'exif-originalimageheight',
+		'exif-originalimagewidth',
 	),
 	'exif-values' => array(
 		'exif-make-value',
 		'exif-model-value',
 		'exif-software-value',
+		'exif-software-version-value',
+		'exif-contact-value',
+		'exif-subjectnewscode-value',
 	),
 	'exif-compression' => array(
 		'exif-compression-1',
+		'exif-compression-2',
+		'exif-compression-3',
+		'exif-compression-4',
+		'exif-compression-5',
 		'exif-compression-6',
+		'exif-compression-7',
+		'exif-compression-8',
+		'exif-compression-32773',
+		'exif-compression-32946',
+		'exif-compression-34712',
+	),
+	'exif-copyrighted' => array(
+		'exif-copyrighted-true',
+		'exif-copyrighted-false',
 	),
 	'exif-photometricinterpretation' => array(
 		'exif-photometricinterpretation-2',
@@ -2736,7 +2903,7 @@ $wgMessageStructure = array(
 	),
 	'exif-colorspace' => array(
 		'exif-colorspace-1',
-		'exif-colorspace-ffff.h',
+		'exif-colorspace-65535',
 	),
 	'exif-componentsconfiguration' => array(
 		'exif-componentsconfiguration-0',
@@ -2879,6 +3046,10 @@ $wgMessageStructure = array(
 		'exif-gpslongitude-e',
 		'exif-gpslongitude-w',
 	),
+	'exif-altituderef' => array(
+		'exif-gpsaltitude-above-sealevel',
+		'exif-gpsaltitude-below-sealevel',
+	),
 	'exif-gpsstatus' => array(
 		'exif-gpsstatus-a',
 		'exif-gpsstatus-v',
@@ -2892,17 +3063,80 @@ $wgMessageStructure = array(
 		'exif-gpsspeed-m',
 		'exif-gpsspeed-n',
 	),
+	'exif-gpsdestdistanceref' => array(
+		'exif-gpsdestdistance-k',
+		'exif-gpsdestdistance-m',
+		'exif-gpsdestdistance-n',
+	),
+	'exif-gdop' => array(
+		'exif-gpsdop-excellent',
+		'exif-gpsdop-good',
+		'exif-gpsdop-moderate',
+		'exif-gpsdop-fair',
+		'exif-gpsdop-poor',
+	),
+	'exif-objectcycle' => array(
+		'exif-objectcycle-a',
+		'exif-objectcycle-p',
+		'exif-objectcycle-b',
+	),
 	'exif-gpsdirection' => array(
 		'exif-gpsdirection-t',
 		'exif-gpsdirection-m',
 	),
+	'exif-ycbcrpositioning' => array(
+		'exif-ycbcrpositioning-1',
+		'exif-ycbcrpositioning-2',
+	),
+	'exif-dc' => array(
+		'exif-dc-contributor',
+		'exif-dc-coverage',
+		'exif-dc-date',
+		'exif-dc-publisher',
+		'exif-dc-relation',
+		'exif-dc-rights',
+		'exif-dc-source',
+		'exif-dc-type',
+	),
+	'exif-rating' => array(
+		'exif-rating-rejected',
+	),
+	'exif-isospeedratings' => array(
+		'exif-isospeedratings-overflow',
+	),
+	'exif-maxaperturevalue' => array(
+		'exif-maxaperturevalue-value',
+	),
+	'exif-iimcategory' => array(
+		'exif-iimcategory-ace',
+		'exif-iimcategory-clj',
+		'exif-iimcategory-dis',
+		'exif-iimcategory-fin',
+		'exif-iimcategory-edu',
+		'exif-iimcategory-evn',
+		'exif-iimcategory-hth',
+		'exif-iimcategory-hum',
+		'exif-iimcategory-lab',
+		'exif-iimcategory-lif',
+		'exif-iimcategory-pol',
+		'exif-iimcategory-rel',
+		'exif-iimcategory-sci',
+		'exif-iimcategory-soi',
+		'exif-iimcategory-spo',
+		'exif-iimcategory-war',
+		'exif-iimcategory-wea',
+	),
+	'exif-urgency' => array(
+		'exif-urgency-normal',
+		'exif-urgency-low',
+		'exif-urgency-high',
+		'exif-urgency-other',
+	),
 	'edit-externally' => array(
 		'edit-externally',
 		'edit-externally-help',
 	),
 	'all' => array(
-		'recentchangesall',
-		'imagelistall',
 		'watchlistall2',
 		'namespacesall',
 		'monthsall',
@@ -2945,6 +3179,7 @@ $wgMessageStructure = array(
 	'deleteconflict' => array(
 		'deletedwhileediting',
 		'confirmrecreate',
+		'confirmrecreate-noreason',
 		'recreate',
 	),
 	'unit-pixel' => array(
@@ -2955,8 +3190,13 @@ $wgMessageStructure = array(
 		'confirm-purge-top',
 		'confirm-purge-bottom',
 	),
+	'watch-unwatch' => array(
+		'confirm-watch-button',
+		'confirm-watch-top',
+		'confirm-unwatch-button',
+		'confirm-unwatch-top',
+	),
 	'separators' => array(
-		'catseparator',
 		'semicolon-separator',
 		'comma-separator',
 		'colon-separator',
@@ -3010,6 +3250,9 @@ $wgMessageStructure = array(
 		'lag-warn-normal',
 		'lag-warn-high',
 	),
+	'watch' => array(
+		'confirm-watch-button',
+	),
 	'watchlisteditor' => array(
 		'watchlistedit-numitems',
 		'watchlistedit-noitems',
@@ -3105,14 +3348,15 @@ $wgMessageStructure = array(
 		'version-specialpages',
 		'version-parserhooks',
 		'version-variables',
+		'version-antispam',
 		'version-skins',
+		'version-api',
 		'version-other',
 		'version-mediahandlers',
 		'version-hooks',
 		'version-extension-functions',
 		'version-parser-extensiontags',
 		'version-parser-function-hooks',
-		'version-skin-extension-functions',
 		'version-hook-name',
 		'version-hook-subscribedby',
 		'version-version',
@@ -3140,6 +3384,7 @@ $wgMessageStructure = array(
 		'fileduplicatesearch-info',
 		'fileduplicatesearch-result-1',
 		'fileduplicatesearch-result-n',
+		'fileduplicatesearch-noresults',
 	),
 	'special-specialpages' => array(
 		'specialpages',
@@ -3212,6 +3457,9 @@ $wgMessageStructure = array(
 		'sqlite-has-fts',
 		'sqlite-no-fts',
 	),
+	'unwatch' => array(
+		'confirm-unwatch-button',
+	),
 );
 
 /** Comments for each block */
@@ -3243,7 +3491,8 @@ XHTML id names.",
 	'login'               => 'Login and logout pages',
 	'mail'                => 'E-mail sending',
 	'passwordstrength'    => 'JavaScript password checks',
-	'resetpass'           => 'Password reset dialog',
+	'resetpass'           => 'Change password dialog',
+	'passwordreset'       => 'Special:PasswordReset',
 	'toolbar'             => 'Edit page toolbar',
 	'edit'                => 'Edit pages',
 	'parserwarnings'      => 'Parser/template warnings',
@@ -3271,7 +3520,9 @@ XHTML id names.",
 	'recentchanges'       => 'Recent changes',
 	'recentchangeslinked' => 'Recent changes linked',
 	'upload'              => 'Upload',
+	'zip'                 => 'ZipDirectoryReader',
 	'upload-errors'       => '',
+	'uploadstash'         => 'Special:UploadStash',
 	'img-auth'            => 'img_auth script messages',
 	'http-errors'         => 'HTTP errors',
 	'upload-curl-errors'  => 'Some likely curl errors. More could be added from <http://curl.haxx.se/libcurl/c/libcurl-errors.html>',
@@ -3337,8 +3588,6 @@ XHTML id names.",
 	'spamprotection'      => 'Spam protection',
 	'info'                => 'Info page',
 	'skin'                => 'Skin names',
-	'math'                => 'Math options',
-	'matherrors'          => 'Math errors',
 	'patrolling'          => 'Patrolling',
 	'patrol-log'          => 'Patrol log',
 	'imagedeletion'       => 'Image deletion',
@@ -3355,11 +3604,13 @@ Variants for Chinese language",
 	'variantname-kk'      => 'Variants for Kazakh language',
 	'variantname-ku'      => 'Variants for Kurdish language',
 	'variantname-tg'      => 'Variants for Tajiki language',
+	'variantname-iu'      => 'Variants for Inuktitut language',
 	'media-info'          => 'Media information',
 	'metadata'            => 'Metadata',
 	'exif'                           => 'EXIF tags',
 	'exif-values'                    => 'Make & model, can be wikified in order to link to the camera and model name',
 	'exif-compression'               => 'EXIF attributes',
+	'exif-copyrighted'               => '',
 	'exif-unknowndate'               => '',
 	'exif-photometricinterpretation' => '',
 	'exif-orientation'               => '',
@@ -3387,10 +3638,21 @@ Variants for Chinese language",
 	'exif-subjectdistancerange'      => '',
 	'exif-gpslatitude'               => 'Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef',
 	'exif-gpslongitude'              => 'Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef',
+	'exif-altituderef'               => 'Pseudotags used for GPSAltitudeRef',
 	'exif-gpsstatus'                 => '',
 	'exif-gpsmeasuremode'            => '',
 	'exif-gpsspeed'                  => 'Pseudotags used for GPSSpeedRef',
+	'exif-gpsdestdistanceref'        => 'Pseudotags used for GPSDestDistanceRef',
+	'exif-gdop'                      => '',
+	'exif-objectcycle'               => '',
 	'exif-gpsdirection'              => 'Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef',
+	'exif-ycbcrpositioning'          => '',
+	'exif-dc'                        => '',
+	'exif-rating'                    => '',
+	'exif-isospeedratings'           => '',
+	'exif-maxaperturevalue'          => '',
+	'exif-iimcategory'               => '',
+	'exif-urgency'                   => '',
 	'edit-externally'       => 'External editor support',
 	'all'                   => "'all' in various places, this might be different for inflected languages",
 	'confirmemail'          => 'E-mail address confirmation',
@@ -3399,6 +3661,7 @@ Variants for Chinese language",
 	'deleteconflict'        => 'Delete conflict',
 	'unit-pixel'            => '',
 	'purge'                 => 'action=purge',
+	'watch-unwatch'         => 'action=watch/unwatch',
 	'separators'            => 'Separators for various lists, etc.',
 	'imgmulti'              => 'Multipage image navigation',
 	'tablepager'            => 'Table pager',
@@ -3425,4 +3688,5 @@ Variants for Chinese language",
 	'db-error-messages'     => 'Database error messages',
 	'html-forms'            => 'HTML forms',
 	'sqlite'                => 'SQLite database support',
+	'ajax-category'         => 'Add categories per AJAX',
 );
diff --git a/maintenance/language/rebuildLanguage.php b/maintenance/language/rebuildLanguage.php
index fd8d62ee..9b3a4b9d 100644
--- a/maintenance/language/rebuildLanguage.php
+++ b/maintenance/language/rebuildLanguage.php
@@ -2,6 +2,21 @@
 /**
  * Rewrite the messages array in the files languages/messages/MessagesXx.php.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  * @defgroup MaintenanceLanguage MaintenanceLanguage
@@ -14,11 +29,12 @@ require_once( 'writeMessagesArray.inc' );
 /**
  * Rewrite a messages array.
  *
+ * @param $languages
  * @param $code The language code.
- * @param $write Write to the messages file?
- * @param $listUnknown List the unknown messages?
- * @param $removeUnknown Remove the unknown messages?
- * @param $removeDupes Remove the duplicated messages?
+ * @param bool $write Write to the messages file?
+ * @param bool $listUnknown List the unknown messages?
+ * @param bool $removeUnknown Remove the unknown messages?
+ * @param bool $removeDupes Remove the duplicated messages?
  * @param $dupeMsgSource The source file intended to remove from the array.
  */
 function rebuildLanguage( $languages, $code, $write, $listUnknown, $removeUnknown, $removeDupes, $dupeMsgSource ) {
@@ -35,7 +51,7 @@ function rebuildLanguage( $languages, $code, $write, $listUnknown, $removeUnknow
  *
  * @param $oldMsgArray The input message array.
  * @param $dupeMsgSource The source file path for duplicates.
- * @return $newMsgArray The output message array, with duplicates removed.
+ * @return Array $newMsgArray The output message array, with duplicates removed.
  */
 function removeDupes( $oldMsgArray, $dupeMsgSource ) {
 	if ( file_exists( $dupeMsgSource ) ) {
diff --git a/maintenance/language/transstat.php b/maintenance/language/transstat.php
index c2144eb6..a3213266 100644
--- a/maintenance/language/transstat.php
+++ b/maintenance/language/transstat.php
@@ -2,6 +2,21 @@
 /**
  * Statistics about the localisation.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  *
@@ -80,8 +95,9 @@ $wgGeneralMessages = $wgLanguages->getGeneralMessages();
 $wgRequiredMessagesNumber = count( $wgGeneralMessages['required'] );
 
 foreach ( $wgLanguages->getLanguages() as $code ) {
-	# Don't check English or RTL English
-	if ( $code == 'en' || $code == 'enRTL' ) {
+	# Don't check English, RTL English or dummy language codes
+	if ( $code == 'en' || $code == 'enRTL' || (is_array( $wgDummyLanguageCodes ) &&
+		in_array( $code, $wgDummyLanguageCodes ) ) ) {
 		continue;
 	}
 
diff --git a/maintenance/language/validate.php b/maintenance/language/validate.php
index d897e467..57517644 100644
--- a/maintenance/language/validate.php
+++ b/maintenance/language/validate.php
@@ -1,5 +1,22 @@
 <?php
 /**
+ * Check language files for unrecognised variables.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc
index e3a48abd..093359ca 100644
--- a/maintenance/language/writeMessagesArray.inc
+++ b/maintenance/language/writeMessagesArray.inc
@@ -2,6 +2,21 @@
 /**
  * Write a messages array as a PHP text.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup MaintenanceLanguage
  */
-- 
cgit v1.2.3-54-g00ecf