Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024

8 files changed, 204 insertions, 4556 deletions

diff --git a/extensions/ParserFunctions/.gitreview b/extensions/ParserFunctions/.gitreview
deleted file mode 100644
index decb9867..00000000
--- a/extensions/ParserFunctions/.gitreview
+++ /dev/null
@@ -1,5 +0,0 @@
-[gerrit]
-host=gerrit.wikimedia.org
-port=29418
-project=mediawiki/extensions/ParserFunctions.git
-defaultbranch=master
diff --git a/extensions/ParserFunctions/Convert.php b/extensions/ParserFunctions/Convert.php
deleted file mode 100644
index cdfd2232..00000000
--- a/extensions/ParserFunctions/Convert.php
+++ /dev/null
@@ -1,907 +0,0 @@
-<?php
-
-if ( !defined( 'MEDIAWIKI' ) ) {
-	die( 'This file is a MediaWiki extension, it is not a valid entry point' );
-}
-
-class ConvertError extends MWException {
-	public function __construct( $msg /*...*/ ) {
-		$args = func_get_args();
-		array_shift( $args );
-		array_map( 'htmlspecialchars', $args );
-		$this->message = '<strong class="error">' . wfMsgForContent( "pfunc-convert-$msg", $args ) . '</strong>';
-	}
-}
-
-class ConvertParser {
-
-	# A regex which matches the body of the string and the source unit separately
-	const UNITS_REGEX = '/^(.+?)([a-z]+\^?\d?(?:\/\w+\^?\d?)*)$/i';
-
-	# A regex which matches a number
-	const NUM_REGEX = '/\b((?:\+|\-|&minus;|\x{2212})?(\d+(?:\.\d+)?)(?:E(?:\+|\-|&minus;|\x{2212})?\d+)?)\b/iu';
-
-	# A regex *FRAGMENT* which matches SI prefixes
-	const PREFIX_REGEX = '[YZEPTGMkh(da)dcm\x{03BC}\x{00B5}npfazy]?';
-
-	/**
-	 * @var ConvertUnit
-	 */
-	protected $sourceUnit;
-
-	/**
-	 * @var ConvertUnit
-	 */
-	protected $targetUnit;
-
-	# Whether to abbreviate the output unit
-	protected $abbreviate;
-
-	# Whether to link the output unit, if possible
-	protected $link;
-
-	# If set, don't output the unit or format the number
-	protected $raw;
-
-	# What precision to round to.
-	protected $decimalPlaces;
-	protected $significantFigures;
-
-	# What language to display the units in
-	# @var Language
-	protected $language;
-
-	# 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
-	 */
-	public function clearState(){
-		# Make sure we break any references set up in the parameter passing below
-		unset( $this->sourceUnit );
-		unset( $this->targetUnit );
-		$this->sourceUnit = null;
-		$this->targetUnit = null;
-		
-		$this->lastValue
-			= $this->link
-			= $this->precision
-			= $this->abbreviate
-			= $this->raw
-			= $this->significantFigures
-			= $this->decimalPlaces
-			= null;
-
-		$this->language = true; # prompts wfGetLangObj() to use $wgContLang
-	}
-
-	/**
-	 * Evaluate a convert expression
-	 * @param $args Array of the parameters passed to the original tag function
-	 * @return String
-	 * @throws ConvertError
-	 */
-	public function execute( $args ) {
-		$this->clearState();
-		array_shift( $args ); # Dump Parser object
-
-		if( count( $args ) == 0 ){
-			# that was easy
-			return '';
-		}
-		$string = trim( array_shift( $args ) );
-
-		# Process the rest of the args
-		static $magicWords = array(
-			'sourceunit' => null,
-			'targetunit' => null,
-			'linkunit' => null,
-			'decimalplaces' => null,
-			'significantfigures' => null,
-			'abbreviate' => null,
-			'rawsuffix' => null,
-			'language' => null,
-		);
-		if( !is_object( $magicWords ) ){
-			foreach( $magicWords as $key => &$val ){
-				$magicWords[$key] =& MagicWord::get( $key );
-			}
-			# The $magicWords[key]->function() syntax doesn't work, so cast to
-			# object so we can use $magicWords->key->function() instead
-			$magicWords = (object)$magicWords;
-		}
-
-		$n = 0; # Count of unnamed parameters
-		foreach ( $args as $arg ) {
-			$parts = array_map( 'trim', explode( '=', $arg, 2 ) );
-			if ( count( $parts ) == 2 ) {
-				# Found "="
-				if ( $magicWords->sourceunit->matchStartAndRemove( $parts[0] ) ) {
-					if( $magicWords->targetunit->matchStartAndRemove( $parts[1] ) ){
-						$this->targetUnit =& $this->sourceUnit;
-					} else {
-						$this->sourceUnit = new ConvertUnit( $parts[1] );
-					}
-
-				} elseif ( $magicWords->targetunit->matchStartAndRemove( $parts[0] ) ) {
-					if( $magicWords->sourceunit->matchStartAndRemove( $parts[1] ) ){
-						$this->targetUnit =& $this->sourceUnit;
-					} else {
-						$this->targetUnit = new ConvertUnit( $parts[1] );
-					}
-
-				} elseif( $magicWords->decimalplaces->matchStartAndRemove( $parts[0] ) ) {
-					$this->decimalPlaces = intval( $parts[1] );
-
-				} elseif( $magicWords->significantfigures->matchStartAndRemove( $parts[0] ) ) {
-					# It doesn't make any sense to have negative sig-figs
-					if( intval( $parts[1] ) > 0 ){
-						$this->significantFigures = intval( $parts[1] );
-					}
-
-				} elseif( $magicWords->language->matchStartAndRemove( $parts[0] ) ) {
-					# if this is an invalid code we'll get $wgContLang back
-					$this->language = Language::factory( $parts[1] );
-				}
-
-			} elseif( $magicWords->linkunit->matchStartAndRemove( $parts[0] ) ) {
-				$this->link = true;
-
-			} elseif( $magicWords->abbreviate->matchStartAndRemove( $parts[0] ) ) {
-				$this->abbreviate = true;
-
-			} elseif( $magicWords->rawsuffix->matchStartAndRemove( $parts[0] ) ) {
-				$this->raw = true;
-
-			} elseif( $parts[0] != '' && !$n++ && !$this->targetUnit instanceof ConvertUnit ){
-				# First unnamed parameter = output unit
-				$this->targetUnit = new ConvertUnit( $parts[0] );
-			}
-		}
-
-		# Get the source unit, if not already set.  This throws ConvertError on failure
-		if ( !$this->sourceUnit instanceof ConvertUnit ){
-			$this->deduceSourceUnit( $string );
-		} else {
-			# The string has no unit on the end, so it's been trimmed to the end of the
-			# last digit, meaning the unit specified by #sourceunit won't have any space
-			$string .= ' ';
-		}
-
-		# Use the default unit (SI usually)
-		if( !$this->targetUnit instanceof ConvertUnit ){
-			$this->targetUnit = $this->sourceUnit->getDefaultUnit();
-		}
-
-		if( $this->targetUnit->dimension->value != $this->sourceUnit->dimension->value ){
-			throw new ConvertError(
-				'dimensionmismatch',
-				$this->sourceUnit->dimension->getLocalisedName(true),
-				$this->targetUnit->dimension->getLocalisedName(true)
-			);
-		}
-
-		# 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 );
-	}
-
-	/**
-	 * Find the unit at the end of the string and load $this->sourceUnit with an appropriate
-	 * ConvertUnit, or throw an exception if the unit is unrecognised.
-	 * @param  $string
-	 */
-	protected function deduceSourceUnit( $string ){
-		# Get the unit from the end of the string
-		$matches = array();
-		preg_match( self::UNITS_REGEX, $string, $matches );
-
-		if( count( $matches ) == 3 ){
-			$this->sourceUnit = new ConvertUnit( $matches[2] );
-		} else {
-			throw new ConvertError( 'nounit' );
-		}
-	}
-
-	/**
-	 * Identify the values to be converted, and convert them
-	 * @param  $string String
-	 * @return String
-	 */
-	protected function processString( $string ){
-		# Replace values
-		$string = preg_replace_callback(
-			self::NUM_REGEX,
-			array( $this, 'convert' ),
-			ltrim( preg_replace( self::UNITS_REGEX, '$1', $string ) )
-		);
-		if( $this->raw ){
-			return trim( $string );
-		} else {
-			return $this->targetUnit->getText(
-				$string,
-				$this->lastValue,
-				$this->link,
-				$this->abbreviate,
-				$this->language
-			);
-		}
-	}
-
-	/**
-	 * Express a value in the $sourceUnit in terms of the $targetUnit, preserving
-	 * an appropriate degree of accuracy.
-	 * @param  $value String
-	 * @return String
-	 */
-	public function convert( $value ){
-		global $wgContLang;
-		$valueFloat = floatval( $value[1] );
-		$newValue = $valueFloat
-			* $this->sourceUnit->getConversion()
-			/ $this->targetUnit->getConversion();
-		if( $this->decimalPlaces !== null && $this->significantFigures !== null ){
-			# round to the required number of decimal places, or the required number
-			# of significant figures, whichever is the least precise
-			$dp = floor( $this->significantFigures - log10( abs( $newValue ) ) ); # Convert SF to DP
-			$newValue = round( $newValue, max( $dp, $this->decimalPlaces ) );
-
-		} elseif( $this->decimalPlaces !== null ){
-			$newValue = round( $newValue, $this->decimalPlaces );
-
-		} elseif( $this->significantFigures !== null ){
-			$dp = floor( $this->significantFigures - log10( abs( $newValue ) ) ); # Convert SF to DP
-			$newValue = round( $newValue, $dp );
-
-		} else {
-			# Need to round to a similar accuracy as the original value.  To do that we
-			# select the accuracy which will as closely as possible preserve the maximum
-			# percentage error in the value.  So 36ft = 36 ± 0.5 ft, so the uncertainty
-			# is ±0.5/36 = ±1.4%.  In metres this is 10.9728 ± 1.4%, or 10.9728 ± 0.154
-			# we take the stance of choosing the limit which is *more* precise than the
-			# original value.
-
-			# Strip sign and exponent
-			$num = preg_replace( self::NUM_REGEX, '$2', $value[1] );
-
-			if( strpos( $num, '.' ) !== false ){
-				# If there is a decimal point, this is the number of digits after it.
-				$dpAfter = strlen( $num ) - strpos( $num, '.' ) - 1;
-				$error = pow( 10, -$dpAfter - 1 ) * 5;
-
-			} elseif( $num == 0 ) {
-				# The logarithms below will be unhappy, and it doesn't actually matter
-				# what error we come up with, zero is still zero
-				$error = 1;
-
-			} else {
-				# Number of digits before the point
-				$dpBefore = floor( log10( abs( $num ) ) );
-
-				# Number of digits if we reverse the string = number
-				# of digits excluding trailing zeros
-				$dpAfter = floor( log10( abs( strrev( $num ) ) ) );
-
-				# How many significant figures to consider numbers like "35000" to have
-				# is a tricky question.  We say 2 here because if people want to ensure
-				# that the zeros are included, they could write it as 3.500E4
-				$error = pow( 10, $dpBefore - $dpAfter - 1 ) * 5;
-			}
-
-			$errorFraction = $error / $num;
-
-			$i = 10;
-			while( $i > -10 && ( round( $newValue, $i - 1 ) != 0 ) &&
-				# Rounding to 10dp avoids floating point errors in exact conversions,
-				# which are on the order of 1E-16
-				( round( 5 * pow( 10, -$i ) / round( $newValue, $i - 1 ), 10 ) <= round( $errorFraction, 10 ) ) )
-			{
-				$i--;
-			}
-
-			$newValue = round( $newValue, $i );
-			# We may need to stick significant zeros back onto the number
-			if( $i > 0 ){
-				if( strpos( $newValue, '.' ) !== false ){
-					$newValue = str_pad( $newValue, $i + strpos( $newValue, '.' ) + 1, '0' );
-				} else {
-					$newValue .= '.' . str_repeat( '0', $i );
-				}
-			}
-		}
-
-		# Store the last value for use in PLURAL later
-		$this->lastValue = $newValue;
-
-		return $this->raw
-			? $newValue
-			: $wgContLang->formatNum( $newValue );
-	}
-
-}
-
-/**
- * A dimension
- */
-class ConvertDimension {
-
-	const MASS = 1;          # KILOGRAM
-	const LENGTH = 10;       # METRE
-	const TIME = 100;        # SECOND
-	const TEMPERATURE = 1E3; # KELVIN
-	const QUANTITY = 1E4;    # MOLE
-	const CURRENT = 1E5;     # AMPERE
-	const INTENSITY = 1E6;   # CANDELA
-
-	# fuel efficiencies are ugly and horrible and dimensionally confused, and have the
-	# same dimensions as LENGTH or 1/LENGTH.  But someone wanted to include them... so
-	# we have up to ten dimensions which can be identified by values of this.
-	# 0 = sane unit
-	# 1 = some sort of fuel efficiency
-	const UGLY_HACK_VALUE = 1E7;
-
-	/**
-	 * Dimension constants.  These are the values you'd get if you added the SI
-	 * base units together with the weighting given above, also the output from
-	 * getDimensionHash().  Cool thing is, you can add these together to get new
-	 * compound dimensions.
-	 */
-	const DIM_DIMENSIONLESS = 0; # Numbers etc
-	const DIM_LENGTH        = 10;
-	const DIM_AREA          = 20;
-	const DIM_VOLUME        = 30;
-	const DIM_TIME          = 100;
-	const DIM_TIME_SQ       = 200;
-	const DIM_MASS          = 1;
-	const DIM_TEMPERATURE   = 1000;
-	const DIM_SPEED         = -90;  # LENGTH / TIME
-	const DIM_ACCELERATION  = -190; # LENGTH / TIME_SQ
-	const DIM_FORCE         = -189; # MASS * LENGTH / TIME_SQ
-	const DIM_TORQUE        = -179; # also MASS * AREA / TIME_SQ, but all units are single
-	const DIM_ENERGY        = -179; # MASS * AREA / TIME_SQ, all units are compound
-	const DIM_PRESSURE      = -209; # MASS / ( LENGTH * TIME_SQ )
-	const DIM_POWER         = -79;  # MASS * AREA / TIME
-	const DIM_DENSITY       = -29;  # MASS / VOLUME
-	const DIM_FUELEFFICIENCY_PVE = 10000020; # fuel efficiency in VOLUME / LENGTH
-	const DIM_FUELEFFICIENCY_NVE = 99999990; # fuel efficiency in LENGTH / VOLUME
-
-	# Map of dimension names to message keys. This also serves as a list of what
-	# dimensions will not throw an error when encountered.
-	public static $legalDimensions = array(
-		self::DIM_LENGTH => 'length',
-		self::DIM_AREA => 'area',
-		self::DIM_VOLUME => 'volume',
-		self::DIM_TIME => 'time',
-		self::DIM_TIME_SQ => 'timesquared',
-		self::DIM_MASS => 'mass',
-		self::DIM_TEMPERATURE => 'temperature',
-		self::DIM_SPEED => 'speed',
-		self::DIM_ACCELERATION => 'acceleration',
-		self::DIM_FORCE => 'force',
-		self::DIM_TORQUE => 'torque',
-		self::DIM_ENERGY => 'energy',
-		self::DIM_PRESSURE => 'pressure',
-		self::DIM_POWER => 'power',
-		self::DIM_DENSITY => 'density',
-		self::DIM_FUELEFFICIENCY_PVE => 'fuelefficiencypositive',
-		self::DIM_FUELEFFICIENCY_NVE => 'fuelefficiencynegative',
-	);
-
-	public $value;
-	protected $name;
-
-	/**
-	 * Constructor
-	 * @param  $var ConvertDimension|Int a dimension constant or existing unit
-	 * @param  $var2 ConvertDimension|Int optionally another dimension constant for a compound unit $var/$var2
-	 */
-	public function __construct( $var, $var2=null ){
-		static $legalDimensionsFlip;
-
-		if( is_string( $var ) ){
-			if( $legalDimensionsFlip === null ){
-				$legalDimensionsFlip = array_flip( self::$legalDimensions );
-			}
-			if( isset( $legalDimensionsFlip[$var] ) ){
-				$dim = $legalDimensionsFlip[$var];
-			} else {
-				# Should be unreachable
-				throw new ConvertError( 'unknowndimension' );
-			}
-		} elseif( $var instanceof self ){
-			$dim = $var->value;
-		} else {
-			$dim = intval( $var );
-		}
-
-		if( $var2 === null ){
-			$this->value = $dim;
-			$this->name = $this->compoundName = self::$legalDimensions[$this->value];
-
-		} else {
-			if( is_string( $var2 ) ){
-				if( $legalDimensionsFlip === null ){
-					$legalDimensionsFlip = array_flip( self::$legalDimensions );
-				}
-				if( isset( $legalDimensionsFlip[$var2] ) ){
-					$dim2 = $legalDimensionsFlip[$var2];
-				} else {
-					# Should be unreachable
-					throw new ConvertError( 'unknowndimension' );
-				}
-			} elseif( $var2 instanceof self ){
-				$dim2 = $var2->value;
-			} else {
-				$dim2 = intval( $var2 );
-			}
-
-			$this->value = $dim - $dim2;
-			if( in_array( $this->value, array_keys( self::$legalDimensions ) ) ){
-				$this->name = self::$legalDimensions[$this->value];
-				$this->compoundName = array(
-					self::$legalDimensions[$dim],
-					self::$legalDimensions[$dim2],
-				);
-			} else {
-				# Some combinations of units are fine (carats per bushel is a perfectly good,
-				# if somewhat bizarre, measure of density, for instance).  But others (like
-				# carats per miles-per-gallon) are definitely not.
-				# TODO: this allows compound units like <gigawatthours>/<pascal> as a unit
-				# of volume; is that a good thing or a bad thing?
-				throw new ConvertError( 'invalidcompoundunit', "$var/$var2" );
-			}
-		}
-	}
-
-	/**
-	 * Convert to string.  Magic in PHP 5.1 and above.
-	 * @return String
-	 */
-	public function __toString(){
-		return strval( $this->name );
-	}
-
-	/**
-	 * Get the name, or names, of the dimension
-	 * @param $expandCompound Bool Whether to return a string instead of an array of strings in
-	 *     case of a compound unit
-	 * @return String|Array of String
-	 */
-	public function getName( $expandCompound = false ){
-		return $expandCompound
-			? $this->name
-			: $this->compoundName;
-	}
-
-	/**
-	 * Get the localised name of the dimension.  Output is unescaped
-	 * @return String
-	 */
-	public function getLocalisedName(){
-		return wfMsg( "pfunc-convert-dimension-{$this->name}" );
-	}
-
-}
-
-class ConvertUnit {
-
-	/**
-	 * array(
-	 *     DIMENSION => array(
-	 *         UNIT => array(
-	 *             CONVERSION,
-	 *             REGEX,
-	 *             TAKES_SI_PREFIXES,
-	 *         )
-	 *     )
-	 * )
-	 */
-	protected static $units = array(
-		ConvertDimension::DIM_LENGTH => array(
-			'metre'            => array( 1, 'm', true ),
-			'angstrom'         => array( 0.00000001, '\x{00C5}', false ),
-
-			'mile'             => array( 1609.344, 'mi|miles?', false ),
-			'furlong'          => array( 201.168, 'furlong', false ),
-			'chain'            => array( 20.1168 , 'chain', false ),
-			'rod'              => array( 5.0292, 'rod|pole|perch', false ),
-			'fathom'           => array( 1.8288, 'fathom', false ),
-			'yard'             => array( 0.9144, 'yards?|yd', false ),
-			'foot'             => array( 0.3048, 'foot|feet|ft', false ),
-			'hand'             => array( 0.1016, 'hands?', false ),
-			'inch'             => array( 0.0254, 'inch|inches|in', false ),
-
-			'nauticalmile'     => array( 1852, 'nauticalmiles?|nmi', false ),
-			'nauticalmileuk'   => array( 1853.184, 'old[Uu][Kk]nmi|[Bb]rnmi|admi', false ),
-			'nauticalmileus'   => array( 1853.24496, 'old[Uu][Ss]nmi', false ),
-
-			'parsec'           => array( 3.0856775813057E16, 'parsecs?|pc', true ),
-			'lightyear'        => array( 9.4607304725808E15, 'lightyears?|ly', true ),
-			'astronomicalunit' => array( 149597870700, 'astronomicalunits?|AU|au', false ),
-		),
-
-		ConvertDimension::DIM_AREA => array(
-			'squarekilometre'    => array( 1E6, 'km2|km\^2', false ),
-			'squaremetre'        => array( 1, 'm2|m\^2', false ),
-			'squarecentimetre'   => array( 1E-4, 'cm2|cm\^2', false ),
-			'squaremillimetre'   => array( 1E-6, 'mm2|mm\^2', false ),
-			'hectare'            => array( 1E4, 'hectares?|ha', false ),
-
-			'squaremile'         => array( 2589988.110336, 'sqmi|mi2|mi\^2', false ),
-			'acre'               => array( 4046.856422, 'acres?', false ),
-			'squareyard'         => array( 0.83612736, 'sqyd|yd2|yd\^2', false ),
-			'squarefoot'         => array( 0.09290304, 'sqft|ft2|ft\^2', false ),
-			'squareinch'         => array( 0.00064516, 'sqin|in2|in\^2', false ),
-
-			'squarenauticalmile' => array( 3429904, 'sqnmi|nmi2|nmi\^2', false ),
-			'dunam'              => array( 1000, 'dunam', false ),
-			'tsubo'              => array( 3.305785, 'tsubo', false ),
-		),
-
-		ConvertDimension::DIM_VOLUME => array(
-			'cubicmetre'      => array( 1, 'm3|m\^3', false ),
-			'cubiccentimetre' => array( 1E-6, 'cm3|cm\^3', false ),
-			'cubicmillimetre' => array( 1E-9, 'mm3|mm\^3', false ),
-			'litre'           => array( 1E-3 , 'l', true ),
-
-			'cubicyard'       => array( 0.764554857984, 'cuyd|yd3|yd\^3', false ),
-			'cubicfoot'       => array( 0.028316846592, 'cuft|ft3|ft\^3', false ),
-			'cubicinch'       => array( 0.000016387064, 'cuin|in3|in\^3', false ),
-			'barrel'          => array( 0.16365924, 'bbl|barrels?|impbbl', false ),
-			'bushel'          => array( 0.03636872, 'bsh|bushels?|impbsh', false ),
-			'gallon'          => array( 0.00454609, 'gal|gallons?|impgal', false ),
-			'quart'           => array( 0.0011365225, 'qt|quarts?|impqt', false ),
-			'pint'            => array( 0.00056826125, 'pt|pints?|imppt', false ),
-			'fluidounce'      => array( 0.0000284130625, 'floz|impfloz', false ),
-
-			'barrelus'        => array( 0.119240471196, 'usbbl', false ),
-			'barreloil'       => array( 0.158987294928, 'oilbbl', false ),
-			'barrelbeer'      => array( 0.117347765304, 'beerbbl', false ),
-			'usgallon'        => array( 0.003785411784, 'usgal', false ),
-			'usquart'         => array( 0.000946352946, 'usqt', false ),
-			'uspint'          => array( 0.000473176473, 'uspt', false ),
-			'usfluidounce'    => array( 0.0000295735295625, 'usfloz', false ),
-			'usdrybarrel'     => array( 0.11562819898508, 'usdrybbl', false ),
-			'usbushel'        => array( 0.03523907016688, 'usbsh', false ),
-			'usdrygallon'     => array( 0.00440488377086, 'usdrygal', false ),
-			'usdryquart'      => array( 0.001101220942715, 'usdryqt', false ),
-			'usdrypint'       => array( 0.0005506104713575, 'usdrypt', false ),
-		),
-
-		ConvertDimension::DIM_TIME => array(
-			'year'   => array( 31557600, 'yr', true ),
-			'day'    => array( 86400, 'd|days?', false ),
-			'hour'   => array( 3600, 'hours?|hr|h', false ),
-			'minute' => array( 60, 'minutes?|mins?', false ),
-			'second' => array( 1, 's', false ),
-		),
-
-		ConvertDimension::DIM_SPEED => array(
-			'knot' => array( 0.514444444, 'knot|kn', false ),
-			'speedoflight' => array( 2.9979E8, 'c', false ),
-		),
-
-		ConvertDimension::DIM_PRESSURE => array(
-			'pascal'            => array( 1, 'Pa', true ),
-
-			'bar'               => array( 100000, 'bar', false ),
-			'decibar'           => array( 10000, 'dbar', false ),
-			'millibar'          => array( 100 , 'mbar|mb', false ),
-			'kilobarye'         => array( 100, 'kba', false ),
-			'barye'             => array( 0.1, 'ba', false ),
-			
-			'atmosphere'        => array( 101325, 'atm|atmospheres?', false ),
-			'torr'              => array( 133.32237, 'torr', false ),
-			'mmhg'              => array( 133.322387415, 'mmHg', false ),
-			'inhg'              => array( 3386.38864034, 'inHg', false ),
-			'psi'               => array( 6894.757293, 'psi', false ),
-		),
-		# TODO: other dimensions as needed
-	);
-
-	/**
-	 * array(
-	 *     PREFIX => array(
-	 *         CONVERSION,
-	 *         REGEX,
-	 *     )
-	 * )
-	 * They're out of order because this is the order in which they are tested, and
-	 * some prefixes are much more likely to occur than others
-	 */
-	protected static $prefixes = array(
-		'kilo'  => array( 1E3,  'k' ),
-		'milli' => array( 1E-3, 'm' ),
-		'centi' => array( 1E-2, 'c' ),
-		'giga'  => array( 1E9,  'G' ),
-		'micro' => array( 1E-6, '(?:\x{03BC}|\x{00B5})' ), # There are two similar mu characters
-		'mega'  => array( 1E6,  'M' ),
-		'nano'  => array( 1E-9, 'n' ),
-		'hecto' => array( 1E2,  'h' ),
-		'deca'  => array( 1E1,  'da' ),
-		'deci'  => array( 1E-1, 'd' ),
-		'yotta' => array( 1E24, 'Y' ),
-		'zetta' => array( 1E21, 'Z' ),
-		'exa'   => array( 1E18, 'E' ),
-		'peta'  => array( 1E15, 'P' ),
-		'tera'  => array( 1E12, 'T' ),
-		'pico'  => array( 1E-12, 'p' ),
-		'femto' => array( 1E-15, 'f' ),
-		'atto'  => array( 1E-18, 'a' ),
-		'zepto' => array( 1E-21, 'z' ),
-		'yocto' => array( 1E-24, 'y' ),
-	);
-
-	# Default units for each dimension
-	# TODO: this should ideally be localisable
-	protected static $defaultUnit = array(
-		ConvertDimension::DIM_LENGTH => 'metre',
-		ConvertDimension::DIM_AREA => 'squaremetre',
-		ConvertDimension::DIM_VOLUME => 'cubicmetre',
-		ConvertDimension::DIM_TIME => 'second',
-		ConvertDimension::DIM_SPEED => 'metre/second',
-		ConvertDimension::DIM_PRESSURE => 'pascal',
-	);
-
-	# An array of preprocessing conversions to apply to units
-	protected static $unitConversions = array(
-		'/^mph$/u' => 'mi/h',
-	);
-
-	# Map of UNIT => DIMENSION, created on construct
-	protected static $dimensionMap = false;
-
-	/***************** MEMBER VARIABLES *****************/
-
-	/**
-	 * @var ConvertDimension
-	 */
-	public $dimension;
-
-	# What number you need to multiply this unit by to get the equivalent
-	# value in SI base units
-	protected $conversion = 1;
-
-	# A regex which matches the unit
-	protected $regex;
-
-	# The name of the unit (key into $units[$dimension] above
-	protected $unitName;
-
-	# The SI prefix, if applicable
-	protected $prefix = null;
-
-	/***************** MEMBER FUNCTIONS *****************/
-
-	/**
-	 * Constructor
-	 * @param  $rawUnit String
-	 */
-	public function __construct( $rawUnit ){
-		if( self::$dimensionMap === false ){
-			self::$dimensionMap = array();
-			foreach( self::$units as $dimension => $arr ){
-				foreach( $arr as $unit => $val ){
-					self::$dimensionMap[$unit] = $dimension;
-				}
-			}
-		}
-
-		$this->parseUnit( $rawUnit );
-	}
-
-	/**
-	 * Parse a raw unit string, and populate member variables
-	 * @param  $rawUnit String
-	 */
-	protected function parseUnit( $rawUnit ){
-
-		# Do mappings like 'mph' --> 'mi/h'
-		$rawUnit = preg_replace(
-			array_keys( self::$unitConversions ),
-			array_values( self::$unitConversions ),
-			$rawUnit
-		);
-
-		$parts = explode( '/', $rawUnit );
-		array_map( 'trim', $parts );
-		if( count( $parts ) == 1 ){
-			# Single unit
-			foreach( self::$units as $dimension => $units ){
-				foreach( $units as $unit => $data ){
-					if( $rawUnit == $unit
-						|| ( !$data[2] && preg_match( "/^({$data[1]})$/u", $parts[0] ) )
-						|| (  $data[2] && preg_match( "/^(" . ConvertParser::PREFIX_REGEX . ")(" . $data[1] . ")$/u", $parts[0] ) ) )
-					{
-						$this->dimension = new ConvertDimension( self::$dimensionMap[$unit] );
-						$this->conversion = $data[0];
-						$this->regex = $data[1];
-						$this->unitName = $unit;
-
-						# Grab the SI prefix, if it's allowed and there is one
-						if( $data[2] && !preg_match( "/^({$data[1]})$/u", $parts[0] ) ){
-							foreach( self::$prefixes as $prefix => $pdata ){
-								if( preg_match( "/^({$pdata[1]})({$data[1]})$/u", $parts[0] ) ){
-									$this->prefix = $prefix;
-									break;
-								}
-							}
-						}
-
-						return;
-					}
-				}
-			}
-
-			# Unknown unit
-			throw new ConvertError( 'unknownunit', $rawUnit );
-
-		} elseif( count( $parts ) == 2 ){
-			# Compound unit.
-			$top = new self( $parts[0] );
-			$bottom = new self( $parts[1] );
-			$this->dimension = new ConvertDimension( $top->dimension, $bottom->dimension );
-			$this->conversion = $top->conversion / $bottom->conversion;
-			$this->regex = "(?:{$top->regex})/(?:{$bottom->regex})";
-			$this->unitName = array( $top->unitName, $bottom->unitName );
-			$this->prefix = array( $top->prefix, $bottom->prefix );
-			return;
-
-		} else {
-			# Whaaat?  Too many parts
-			throw new ConvertError( 'doublecompoundunit', $rawUnit );
-		}
-	}
-
-	/**
-	 * Get the mathematical factor which will convert a measurement in this unit into a
-	 * measurement in the SI base unit for the dimension
-	 * @return double
-	 */
-	public function getConversion(){
-		return $this->conversion * $this->getPrefixConversion();
-	}
-
-	/**
-	 * Get the conversion factor associated with the prefix(es) in the unit
-	 * @return double
-	 */
-	public function getPrefixConversion(){
-		if( !$this->prefix ){
-			return 1;
-		} elseif( is_array( $this->prefix ) ){
-			$x = $this->prefix[0] !== null
-				? self::$prefixes[$this->prefix[0]][0]
-				: 1;
-			if( $this->prefix[1] !== null ){
-				$x *= self::$prefixes[$this->prefix[1]][0];
-			}
-			return $x;
-		} else {
-			return self::$prefixes[$this->prefix][0];
-		}
-	}
-
-	/**
-	 * Get a regular expression which will match keywords for this unit
-	 * @return String
-	 */
-	public function getRegex(){
-		return $this->regex;
-	}
-
-	/**
-	 * 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( $string, $value, $link=false, $abbreviate=false, $language=null ){
-		global $wgContLang;
-		$value = $wgContLang->formatNum( $value );
-
-		if( !is_array( $this->unitName ) ){
-			$msgText = $this->getTextFromMessage(
-				$this->dimension->getName(),
-				$this->unitName,
-				$this->prefix,
-				$string, $value, $link, $abbreviate, $language
-			);
-
-		} elseif( !wfEmptyMsg( "pfunc-convert-unit-{$this->dimension->getName(true)}-{$this->unitName[0]}-{$this->unitName[1]}" ) ){
-			# A wiki has created, say, [[MediaWiki:pfunc-convert-unit-speed-metres-second]]
-			# so they can have it display "<metres per second>" rather than
-			# "<metres>/<second>"
-			$msgText = $this->getTextFromMessage(
-				$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
-				$string, $value, $link, $abbreviate, $language
-			);
-
-		} else {
-			$dimensionNames = $this->dimension->getName();
-			$msgText = $this->getTextFromMessage(
-				$dimensionNames[0],
-				$this->unitName[0],
-				$this->prefix[0],
-				$string, $value, $link, $abbreviate, $language
-			);
-			$msg2Text = $this->getTextFromMessage(
-				$dimensionNames[1],
-				$this->unitName[1],
-				$this->prefix[1],
-				'',
-				1, # Singular for denominator
-				$link, $abbreviate, $language
-			);
-			$msgText = "$msgText/$msg2Text";
-		}
-
-		return trim( $msgText );
-	}
-
-	/**
-	 * Retrieve the unit text from actual messages
-	 * @param  $dimension String
-	 * @param  $unit String
-	 * @param  $prefix String
-	 * @param  $string String
-	 * @param  $number String the actual value (for {{PLURAL}} etc)
-	 * @param  $link Bool
-	 * @param  $abbreviate Bool
-	 * @param  $language Language|Bool|null
-	 * @return String
-	 */
-	protected function getTextFromMessage( $dimension, $unit, $prefix, $string, $number, $link, $abbreviate, $language ){
-		$abbr = $abbreviate ? '-abbr' : '';
-		$prefix = $prefix === null
-			? ''
-			: wfMsgExt( "pfunc-convert-prefix-$prefix$abbr", array( 'parsemag', 'language' => $language ) );
-
-		$text = wfMsgExt(
-			"pfunc-convert-unit-$dimension-$unit$abbr",
-			array( 'parsemag', 'language' => $language ),
-			$string,
-			$number,
-			$prefix
-		);
-
-		if( $link && !wfEmptyMsg( "pfunc-convert-unit-$dimension-$unit-link" ) ){
-			$title = Title::newFromText(
-				wfMsgForContentNoTrans( "pfunc-convert-unit-$dimension-$unit-link" ),
-				$prefix
-			);
-			if( $title instanceof Title ){
-				$text = "[[{$title->getFullText()}|$text]]";
-			}
-		}
-		
-		return $text;
-	}
-
-	/**
-	 * Get the default (usually SI) unit associated with this particular dimension
-	 * @return ConvertUnit
-	 */
-	public function getDefaultUnit(){
-		return new ConvertUnit( self::$defaultUnit[$this->dimension->value] );
-	}
-}
diff --git a/extensions/ParserFunctions/Expr.php b/extensions/ParserFunctions/Expr.php
index ee646021..8597f1f7 100644
--- a/extensions/ParserFunctions/Expr.php
+++ b/extensions/ParserFunctions/Expr.php
@@ -47,8 +47,13 @@ define( 'EXPR_POW', 35 );
 define( 'EXPR_PI', 36 );
 
 class ExprError extends MWException {
+	/**
+	 * @param $msg string
+	 * @param $parameter string
+	 */
 	public function __construct( $msg, $parameter = '' ) {
-		$this->message = '<strong class="error">' . wfMsgForContent( "pfunc_expr_$msg", htmlspecialchars( $parameter ) ) . '</strong>';
+		$msg = wfMessage( "pfunc_expr_$msg", $parameter )->inContentLanguage()->escaped();
+		$this->message = '<strong class="error">' . $msg . '</strong>';
 	}
 }
 
@@ -158,6 +163,7 @@ class ExprParser {
 	 * http://montcs.bloomu.edu/~bobmon/Information/RPN/infix2rpn.shtml
 	 * It's essentially the same as Dijkstra's shunting yard algorithm.
 	 * @param $expr string
+	 * @throws ExprError
 	 * @return string
 	 */
 	function doExpression( $expr ) {
diff --git a/extensions/ParserFunctions/ParserFunctions.i18n.magic.php b/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
index 0dda0911..640dd7aa 100644
--- a/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
+++ b/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
@@ -22,14 +22,6 @@ $magicWords['en'] = array(
 	'timel' => array( 0, 'timel' ),
 	'rel2abs' => array( 0, 'rel2abs' ),
 	'titleparts' => array( 0, 'titleparts' ),
-	'convert' => array( 0, 'convert' ),
-	'sourceunit' => array( 0, '#sourceunit' ),
-	'targetunit' => array( 0, '#targetunit' ),
-	'linkunit' => array( 0, '#linkunit' ),
-	'decimalplaces' => array( 0, '#dp' ),
-	'significantfigures' => array( 0, '#sf' ),
-	'abbreviate' => array( 0, '#abbreviate' ),
-	'language' => array( 0, '#language' ),
 	'len' => array( 0, 'len' ),
 	'pos' => array( 0, 'pos' ),
 	'rpos' => array( 0, 'rpos' ),
@@ -54,7 +46,6 @@ $magicWords['ar'] = array(
 	'timel' => array( 0, 'تيمل' ),
 	'rel2abs' => array( 0, 'ريلتوآبس' ),
 	'titleparts' => array( 0, 'أجزاء_العنوان' ),
-	'language' => array( 0, '#لغة:' ),
 	'len' => array( 0, 'لين' ),
 	'pos' => array( 0, 'بوس' ),
 	'rpos' => array( 0, 'آربوس' ),
@@ -65,11 +56,6 @@ $magicWords['ar'] = array(
 	'urldecode' => array( 0, 'فك_مسار' ),
 );
 
-/** Aramaic (ܐܪܡܝܐ) */
-$magicWords['arc'] = array(
-	'language' => array( 0, '#ܠܫܢܐ:' ),
-);
-
 /** Egyptian Spoken Arabic (مصرى) */
 $magicWords['arz'] = array(
 	'expr' => array( 0, 'تعبير', 'expr' ),
@@ -93,26 +79,20 @@ $magicWords['arz'] = array(
 	'explode' => array( 0, 'انفجار', 'explode' ),
 );
 
-/** Breton (Brezhoneg) */
+/** Breton (brezhoneg) */
 $magicWords['br'] = array(
 	'time' => array( 0, 'amzer' ),
-	'convert' => array( 0, 'amdreiñ' ),
 	'count' => array( 0, 'kontañ' ),
 	'replace' => array( 0, 'erlec\'hiañ' ),
 );
 
-/** Bosnian (Bosanski) */
-$magicWords['bs'] = array(
-	'language' => array( 0, '#JEZIK:' ),
-);
-
-/** Chechen (Нохчийн) */
+/** Chechen (нохчийн) */
 $magicWords['ce'] = array(
 	'time' => array( 0, 'хан', 'time' ),
 	'replace' => array( 0, 'хийцарна', 'замена', 'replace' ),
 );
 
-/** Czech (Česky) */
+/** Czech (česky) */
 $magicWords['cs'] = array(
 	'expr' => array( 0, 'výraz', 'expr' ),
 	'if' => array( 0, 'když', 'if' ),
@@ -123,6 +103,15 @@ $magicWords['cs'] = array(
 	'replace' => array( 0, 'nahradit', 'replace' ),
 );
 
+/** German (Deutsch) */
+$magicWords['de'] = array(
+	'switch' => array( 0, 'wechsle' ),
+	'default' => array( 0, '#standard' ),
+	'count' => array( 0, 'zähle' ),
+	'replace' => array( 0, 'ersetze' ),
+	'urldecode' => array( 0, 'dekodiereurl', 'dekodiere_url' ),
+);
+
 /** Esperanto (Esperanto) */
 $magicWords['eo'] = array(
 	'expr' => array( 0, 'espr', 'esprimo' ),
@@ -135,25 +124,19 @@ $magicWords['eo'] = array(
 	'ifexist' => array( 0, 'seekzistas' ),
 	'time' => array( 0, 'tempo' ),
 	'timel' => array( 0, 'tempoo' ),
-	'language' => array( 0, '#LINGVO:' ),
 );
 
-/** Spanish (Español) */
+/** Spanish (español) */
 $magicWords['es'] = array(
-	'if' => array( 0, 'si', 'if' ),
-	'ifexpr' => array( 0, 'siexpr', 'ifexpr' ),
-	'iferror' => array( 0, 'sierror', 'iferror' ),
-	'switch' => array( 0, 'según', 'switch' ),
-	'ifexist' => array( 0, 'siexiste', 'ifexist' ),
-	'time' => array( 0, 'tiempo', 'time' ),
-	'len' => array( 0, 'long', 'longitud', 'len' ),
-	'replace' => array( 0, 'reemplazar', 'replace' ),
-	'explode' => array( 0, 'separar', 'explode' ),
-);
-
-/** Estonian (Eesti) */
-$magicWords['et'] = array(
-	'language' => array( 0, '#KEEL:' ),
+	'if' => array( 0, 'si' ),
+	'ifexpr' => array( 0, 'siexpr' ),
+	'iferror' => array( 0, 'sierror' ),
+	'switch' => array( 0, 'según' ),
+	'ifexist' => array( 0, 'siexiste' ),
+	'time' => array( 0, 'tiempo' ),
+	'len' => array( 0, 'long', 'longitud' ),
+	'replace' => array( 0, 'reemplazar' ),
+	'explode' => array( 0, 'separar' ),
 );
 
 /** Persian (فارسی) */
@@ -170,7 +153,6 @@ $magicWords['fa'] = array(
 	'timel' => array( 0, 'زمان‌بلند' ),
 	'rel2abs' => array( 0, 'نسبی‌به‌مطلق' ),
 	'titleparts' => array( 0, 'پاره‌عنوان' ),
-	'language' => array( 0, '#زبان' ),
 	'len' => array( 0, 'طول' ),
 	'pos' => array( 0, 'جا' ),
 	'rpos' => array( 0, 'جار' ),
@@ -181,16 +163,6 @@ $magicWords['fa'] = array(
 	'urldecode' => array( 0, 'نشانی‌بی‌کد' ),
 );
 
-/** Finnish (Suomi) */
-$magicWords['fi'] = array(
-	'language' => array( 0, '#KIELI:' ),
-);
-
-/** Galician (Galego) */
-$magicWords['gl'] = array(
-	'language' => array( 0, '#LINGUA:', '#IDIOMA:' ),
-);
-
 /** Hebrew (עברית) */
 $magicWords['he'] = array(
 	'expr' => array( 0, 'חשב', 'expr' ),
@@ -207,7 +179,7 @@ $magicWords['he'] = array(
 	'titleparts' => array( 0, 'חלק בכותרת', 'titleparts' ),
 );
 
-/** Hungarian (Magyar) */
+/** Hungarian (magyar) */
 $magicWords['hu'] = array(
 	'expr' => array( 0, 'kif', 'expr' ),
 	'if' => array( 0, 'ha', 'if' ),
@@ -244,10 +216,9 @@ $magicWords['ig'] = array(
 	'timel' => array( 0, 'ógèl', 'timel' ),
 );
 
-/** Italian (Italiano) */
+/** Italian (italiano) */
 $magicWords['it'] = array(
 	'ifexist' => array( 0, 'ifexist' ),
-	'language' => array( 0, '#LINGUA' ),
 );
 
 /** Japanese (日本語) */
@@ -264,7 +235,6 @@ $magicWords['ja'] = array(
 	'timel' => array( 0, '時間地方' ),
 	'rel2abs' => array( 0, '参照から絶対' ),
 	'titleparts' => array( 0, 'タイトル部分' ),
-	'language' => array( 0, '#言語:', '＃言語：' ),
 	'len' => array( 0, '長さ' ),
 	'pos' => array( 0, '位置' ),
 	'rpos' => array( 0, '最後の位置' ),
@@ -275,27 +245,28 @@ $magicWords['ja'] = array(
 	'urldecode' => array( 0, 'URLデコード' ),
 );
 
-/** Khmer (ភាសាខ្មែរ) */
-$magicWords['km'] = array(
-	'language' => array( 0, '#ភាសា:' ),
-);
-
 /** Korean (한국어) */
 $magicWords['ko'] = array(
 	'expr' => array( 0, '수식' ),
+	'if' => array( 0, '만약' ),
+	'ifeq' => array( 0, '만약일치' ),
+	'ifexpr' => array( 0, '만약계산' ),
+	'iferror' => array( 0, '만약오류' ),
 	'switch' => array( 0, '스위치' ),
 	'default' => array( 0, '#기본값' ),
+	'ifexist' => array( 0, '만약존재' ),
 	'time' => array( 0, '시간' ),
 	'timel' => array( 0, '지역시간' ),
-	'language' => array( 0, '#언어:' ),
 	'len' => array( 0, '길이' ),
+	'pos' => array( 0, '위치' ),
+	'rpos' => array( 0, '오른위치' ),
 	'count' => array( 0, '개수' ),
 	'replace' => array( 0, '교체' ),
 	'explode' => array( 0, '분리' ),
 	'urldecode' => array( 0, '주소디코딩:' ),
 );
 
-/** ‪Kurdî (latînî)‬ (‪Kurdî (latînî)‬) */
+/** Kurdish (Latin script) (Kurdî (latînî)‎) */
 $magicWords['ku-latn'] = array(
 	'len' => array( 0, '#ziman' ),
 );
@@ -316,7 +287,7 @@ $magicWords['mg'] = array(
 	'time' => array( 0, 'lera', 'time' ),
 );
 
-/** Macedonian (Македонски) */
+/** Macedonian (македонски) */
 $magicWords['mk'] = array(
 	'expr' => array( 0, 'израз' ),
 	'if' => array( 0, 'ако' ),
@@ -330,11 +301,6 @@ $magicWords['mk'] = array(
 	'timel' => array( 0, 'времел' ),
 	'rel2abs' => array( 0, 'релдоапс' ),
 	'titleparts' => array( 0, 'насловделови' ),
-	'convert' => array( 0, 'претвори' ),
-	'sourceunit' => array( 0, '#изворнаединица' ),
-	'targetunit' => array( 0, '#целнаединица' ),
-	'linkunit' => array( 0, '#врскаединица' ),
-	'abbreviate' => array( 0, '#скрати' ),
 	'len' => array( 0, 'долж' ),
 	'pos' => array( 0, 'пол' ),
 	'rpos' => array( 0, 'впол' ),
@@ -356,7 +322,6 @@ $magicWords['ml'] = array(
 	'ifexist' => array( 0, 'ഉണ്ടെങ്കിൽ' ),
 	'time' => array( 0, 'സമയം' ),
 	'timel' => array( 0, 'സമയം|' ),
-	'language' => array( 0, '#ഭാഷ:' ),
 	'sub' => array( 0, 'ഉപം' ),
 	'count' => array( 0, 'എണ്ണുക' ),
 	'replace' => array( 0, 'മാറ്റിച്ചേർക്കുക' ),
@@ -385,11 +350,6 @@ $magicWords['mr'] = array(
 	'explode' => array( 0, 'एकफोड', 'explode' ),
 );
 
-/** Erzya (Эрзянь) */
-$magicWords['myv'] = array(
-	'language' => array( 0, '#КЕЛЕСЬ:' ),
-);
-
 /** Nedersaksisch (Nedersaksisch) */
 $magicWords['nds-nl'] = array(
 	'if' => array( 0, 'as', 'als', 'if' ),
@@ -417,19 +377,13 @@ $magicWords['nl'] = array(
 	'timel' => array( 0, 'tijdl' ),
 	'rel2abs' => array( 0, 'relatiefnaarabsoluut' ),
 	'titleparts' => array( 0, 'paginanaamdelen' ),
-	'convert' => array( 0, 'converteren' ),
-	'sourceunit' => array( 0, '#broneenheid' ),
-	'targetunit' => array( 0, '#doeleenheid' ),
-	'linkunit' => array( 0, '#verbindingseenheid' ),
-	'abbreviate' => array( 0, '#afkorten' ),
-	'language' => array( 0, '#TAAL:' ),
 	'count' => array( 0, 'telling' ),
 	'replace' => array( 0, 'vervangen' ),
 	'explode' => array( 0, 'exploderen' ),
 	'urldecode' => array( 0, 'urldecoderen' ),
 );
 
-/** Norwegian Nynorsk (‪Norsk (nynorsk)‬) */
+/** Norwegian Nynorsk (norsk (nynorsk)‎) */
 $magicWords['nn'] = array(
 	'expr' => array( 0, 'uttrykk', 'expr' ),
 	'if' => array( 0, 'om', 'if' ),
@@ -449,12 +403,6 @@ $magicWords['nn'] = array(
 /** Oriya (ଓଡ଼ିଆ) */
 $magicWords['or'] = array(
 	'time' => array( 0, 'ସମୟ' ),
-	'convert' => array( 0, 'ବଦଳାଇବା' ),
-);
-
-/** Polish (Polski) */
-$magicWords['pl'] = array(
-	'language' => array( 0, '#JĘZYK:' ),
 );
 
 /** Pashto (پښتو) */
@@ -464,7 +412,7 @@ $magicWords['ps'] = array(
 	'count' => array( 0, 'شمېرل', 'count' ),
 );
 
-/** Portuguese (Português) */
+/** Portuguese (português) */
 $magicWords['pt'] = array(
 	'if' => array( 0, 'se', 'if' ),
 	'ifeq' => array( 0, 'seigual', 'ifeq' ),
@@ -476,31 +424,21 @@ $magicWords['pt'] = array(
 	'len' => array( 0, 'comprimento', 'len' ),
 );
 
-/** Russian (Русский) */
+/** Russian (русский) */
 $magicWords['ru'] = array(
 	'replace' => array( 0, 'замена' ),
 );
 
-/** Albanian (Shqip) */
-$magicWords['sq'] = array(
-	'language' => array( 0, '#GJUHA:' ),
-);
-
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬) */
+/** Serbian (Cyrillic script) (српски (ћирилица)‎) */
 $magicWords['sr-ec'] = array(
 	'default' => array( 0, '#подразумевано' ),
 	'time' => array( 0, 'време' ),
-	'convert' => array( 0, 'претвори' ),
-	'sourceunit' => array( 0, '#изворнајединица', '#изворна_јединица' ),
-	'targetunit' => array( 0, '#крајњајединица', '#крајња_јединица' ),
-	'linkunit' => array( 0, '#везајединице', '#веза_јединице' ),
-	'abbreviate' => array( 0, '#скрати' ),
 	'pos' => array( 0, 'поз' ),
 	'count' => array( 0, 'број' ),
 	'replace' => array( 0, 'замени' ),
 );
 
-/** Swedish (Svenska) */
+/** Swedish (svenska) */
 $magicWords['sv'] = array(
 	'expr' => array( 0, 'utr', 'expr' ),
 	'if' => array( 0, 'om', 'if' ),
@@ -529,12 +467,7 @@ $magicWords['tr'] = array(
 	'default' => array( 0, '#vas' ),
 );
 
-/** Татарча (Татарча) */
-$magicWords['tt-cyrl'] = array(
-	'language' => array( 0, '#ТЕЛ:' ),
-);
-
-/** Ukrainian (Українська) */
+/** Ukrainian (українська) */
 $magicWords['uk'] = array(
 	'expr' => array( 0, 'вираз', 'expr' ),
 	'if' => array( 0, 'якщо', 'if' ),
@@ -549,7 +482,6 @@ $magicWords['uk'] = array(
 /** Vietnamese (Tiếng Việt) */
 $magicWords['vi'] = array(
 	'expr' => array( 0, 'côngthức' ),
-	'language' => array( 0, '#NGÔNNGỮ:' ),
 );
 
 /** Yiddish (ייִדיש) */
@@ -563,4 +495,4 @@ $magicWords['yi'] = array(
 	'ifexist' => array( 0, 'עקזיסט' ),
 	'time' => array( 0, 'צייט' ),
 	'timel' => array( 0, 'צייטל' ),
-);
+);
\ No newline at end of file
diff --git a/extensions/ParserFunctions/ParserFunctions.i18n.php b/extensions/ParserFunctions/ParserFunctions.i18n.php
index 2e8c8ad4..75f6fcd2 100644
--- a/extensions/ParserFunctions/ParserFunctions.i18n.php
+++ b/extensions/ParserFunctions/ParserFunctions.i18n.php
@@ -29,242 +29,6 @@ $messages['en'] = array(
 	'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',
-	'pfunc-convert-dimension-area'                   => 'area',
-	'pfunc-convert-dimension-volume'                 => 'volume',
-	'pfunc-convert-dimension-time'                   => 'time',
-	'pfunc-convert-dimension-timesquared'            => 'time<sup>2</sup>',
-	'pfunc-convert-dimension-mass'                   => 'mass',
-	'pfunc-convert-dimension-speed'                  => 'speed',
-	'pfunc-convert-dimension-temperature'            => 'temperature',
-	'pfunc-convert-dimension-acceleration'           => 'acceleration',
-	'pfunc-convert-dimension-force'                  => 'force',
-	'pfunc-convert-dimension-torque'                 => 'torque',
-	'pfunc-convert-dimension-energy'                 => 'energy',
-	'pfunc-convert-dimension-power'                  => 'power',
-	'pfunc-convert-dimension-pressure'               => 'pressure',
-	'pfunc-convert-dimension-density'                => 'density',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'fuelefficiencypositive',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'fuelefficiencynegative',
-
-	# SI PREFIXES
-
-	'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' => 'hecto',
-	'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-yotta-abbr' => 'Y',
-	'pfunc-convert-prefix-zetta-abbr' => 'Z',
-	'pfunc-convert-prefix-exa-abbr'   => 'E',
-	'pfunc-convert-prefix-peta-abbr'  => 'P',
-	'pfunc-convert-prefix-tera-abbr'  => 'T',
-	'pfunc-convert-prefix-giga-abbr'  => 'G',
-	'pfunc-convert-prefix-mega-abbr'  => 'M',
-	'pfunc-convert-prefix-kilo-abbr'  => 'k',
-	'pfunc-convert-prefix-hecto-abbr' => 'h',
-	'pfunc-convert-prefix-deca-abbr'  => 'da',
-	'pfunc-convert-prefix-deci-abbr'  => 'd',
-	'pfunc-convert-prefix-centi-abbr' => 'c',
-	'pfunc-convert-prefix-milli-abbr'  => 'm',
-	'pfunc-convert-prefix-micro-abbr' => 'μ',
-	'pfunc-convert-prefix-nano-abbr'  => 'n',
-	'pfunc-convert-prefix-pico-abbr'  => 'p',
-	'pfunc-convert-prefix-femto-abbr' => 'f',
-	'pfunc-convert-prefix-atto-abbr'  => 'a',
-	'pfunc-convert-prefix-zepto-abbr' => 'z',
-	'pfunc-convert-prefix-yocto-abbr' => 'y',
-
-	# LENGTH
-	'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' => '$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' => '$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'      => '$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'             => '$1miles per hour',
-	'pfunc-convert-unit-speed-speedoflight'          => '$1c',
-
-	'pfunc-convert-unit-speed-mile-hour-abbr'        => '$1mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr'     => '$1c',
-	
-	# PRESSURE
-	'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)
@@ -278,8 +42,6 @@ $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)
@@ -319,7 +81,7 @@ $messages['aln'] = array(
 	'pfunc_expr_unexpected_number' => 'gabim Shprehja: Numri i papritur',
 );
 
-/** Aragonese (Aragonés)
+/** Aragonese (aragonés)
  * @author Juanpabl
  */
 $messages['an'] = array(
@@ -410,7 +172,7 @@ $messages['as'] = array(
 	'pfunc_time_error' => 'ভুল: অযোগ্য সময়',
 );
 
-/** Asturian (Asturianu)
+/** Asturian (asturianu)
  * @author Esbardu
  * @author Xuacu
  */
@@ -418,6 +180,7 @@ $messages['ast'] = array(
 	'pfunc_desc' => "Ameyora l'análisis sintáuticu con funciones llóxiques",
 	'pfunc_time_error' => 'Error: tiempu non válidu',
 	'pfunc_time_too_long' => 'Error: demasiaes llamaes #time',
+	'pfunc_time_too_big' => 'Error: #time sólo almite años fasta 9999.',
 	'pfunc_rel2abs_invalid_depth' => 'Error: Nivel de subdireutoriu non válidu: "$1" (intentu d\'accesu penriba del direutoriu raíz)',
 	'pfunc_expr_stack_exhausted' => "Error d'espresión: Pila escosada",
 	'pfunc_expr_unexpected_number' => "Error d'espresión: Númberu inesperáu",
@@ -434,64 +197,16 @@ $messages['ast'] = array(
 	'pfunc_expr_unknown_error' => "Error d'espresión: Error desconocíu ($1)",
 	'pfunc_expr_not_a_number' => 'En $1: el resultáu nun ye un númberu',
 	'pfunc_string_too_long' => 'Error: la cadena pasa la llende de $1 caráuteres',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metru|$2metros}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstroms}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|milla|milles}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yarda|yardes}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|pie|pies}}',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|quilómetru cuadráu|quilómetros cuadraos}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|metru cuadráu|metros cuadraos}}',
-	'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-time-second' => '{{PLURAL:$1|segundu|segundos}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2añu|$2años}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|día|díes}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|hora|hores}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minutu|minutos}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2añ',
-	'pfunc-convert-unit-time-day-abbr' => 'día',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|metru cúbicu|metros cúbicos}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|centímetru cúbicu|centímetros cúbicos}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|milímetru cúbicu|milímetros cúbicos}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kilollitru|kilollitros}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|llitru|llitros}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centillitru|centillitros}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|milillitru|milillitros}}',
-	'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' => 'milles por hora',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascales}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'milibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobario',
-	'pfunc-convert-unit-pressure-barye' => 'bario',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmósfera|atmósferes}}',
-	'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',
 );
 
-/** Azerbaijani (Azərbaycanca)
+/** Azerbaijani (azərbaycanca)
  * @author Cekli829
  */
 $messages['az'] = array(
 	'pfunc_time_error' => 'Xəta: yanlış zaman',
 );
 
-/** Bashkir (Башҡортса)
+/** Bashkir (башҡортса)
  * @author Assele
  */
 $messages['ba'] = array(
@@ -540,7 +255,7 @@ $messages['bcc'] = array(
 	'pfunc_expr_not_a_number' => 'ته $1: نتیجه یک عددی نهنت',
 );
 
-/** Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
+/** Belarusian (Taraškievica orthography) (беларуская (тарашкевіца)‎)
  * @author EugeneZelenko
  * @author Jim-by
  * @author Red Winged Duck
@@ -568,7 +283,7 @@ $messages['be-tarask'] = array(
 	'pfunc_string_too_long' => 'Памылка: у радку перавышаны ліміт $1 {{PLURAL:$1|сымбаль|сымбалі|сымбаляў}}',
 );
 
-/** Bulgarian (Български)
+/** Bulgarian (български)
  * @author DCLXVI
  * @author Spiritia
  */
@@ -619,7 +334,7 @@ $messages['bn'] = array(
 	'pfunc_expr_not_a_number' => '$1: এ ফলাফল কোন সংখ্যা নয়',
 );
 
-/** Breton (Brezhoneg)
+/** Breton (brezhoneg)
  * @author Fulup
  */
 $messages['br'] = array(
@@ -645,7 +360,7 @@ $messages['br'] = array(
 	'pfunc_string_too_long' => "Fazi : Dreist d'ar vevenn uhelañ a $1 arouezenn eo an neudennad",
 );
 
-/** Bosnian (Bosanski)
+/** Bosnian (bosanski)
  * @author CERminator
  * @author Seha
  */
@@ -672,7 +387,7 @@ $messages['bs'] = array(
 	'pfunc_string_too_long' => 'Greška: Niz prelazi limit od $1 znakova',
 );
 
-/** Catalan (Català)
+/** Catalan (català)
  * @author Jordi Roqué
  * @author Qllach
  * @author SMP
@@ -699,7 +414,7 @@ $messages['ca'] = array(
 	'pfunc_string_too_long' => 'Error: La cadena és $1 caràcters massa llarga',
 );
 
-/** Chechen (Нохчийн)
+/** Chechen (нохчийн)
  * @author Sasan700
  */
 $messages['ce'] = array(
@@ -708,7 +423,7 @@ $messages['ce'] = array(
 	'pfunc_expr_unrecognised_word' => 'Яздарехь гlалат ду: дойзуш доцу дош «$1»',
 );
 
-/** Czech (Česky)
+/** Czech (česky)
  * @author Danny B.
  * @author Li-sung
  * @author Matěj Grabovský
@@ -736,74 +451,9 @@ $messages['cs'] = array(
 	'pfunc_expr_unknown_error' => 'Chyba ve výrazu: Neznámá chyba ($1)',
 	'pfunc_expr_not_a_number' => 'V $1: výsledkem není číslo',
 	'pfunc_string_too_long' => 'Chyba: Řetězec je delší než $1 {{PLURAL:$1|znak|znaky|znaků}}, což je limit',
-	'pfunc-convert-dimensionmismatch' => 'Chyba: Nelze převést mezi jednotkami „$1“ a „$2“.',
-	'pfunc-convert-unknownunit' => 'Chyba: Neznámá jednotka „$1“.',
-	'pfunc-convert-unknowndimension' => 'Chyba: Neznámý rozměr „$1“',
-	'pfunc-convert-invalidcompoundunit' => 'Chyba: Neplatná složená jednotka „$1“.',
-	'pfunc-convert-nounit' => 'Chyba: Nebyla zadána zdrojová jednotka.',
-	'pfunc-convert-doublecompoundunit' => 'Chyba: Nelze zpracovat dvojitě složené jednotky, jako je „$1“.',
-	'pfunc-convert-dimension-length' => 'délka',
-	'pfunc-convert-dimension-area' => 'plocha',
-	'pfunc-convert-dimension-volume' => 'objem',
-	'pfunc-convert-dimension-time' => 'čas',
-	'pfunc-convert-dimension-timesquared' => 'čas²',
-	'pfunc-convert-dimension-mass' => 'hmotnost',
-	'pfunc-convert-dimension-speed' => 'rychlost',
-	'pfunc-convert-dimension-temperature' => 'teplota',
-	'pfunc-convert-dimension-acceleration' => 'zrychlení',
-	'pfunc-convert-dimension-force' => 'síla',
-	'pfunc-convert-dimension-torque' => 'točivý moment',
-	'pfunc-convert-dimension-energy' => 'energie',
-	'pfunc-convert-dimension-power' => 'výkon',
-	'pfunc-convert-dimension-pressure' => 'tlak',
-	'pfunc-convert-dimension-density' => 'hustota',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'spotřeba',
-	'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' => 'mili',
-	'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|$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)
+/** Danish (dansk)
  * @author Byrial
  * @author Morten LJ
  * @author Peter Alberti
@@ -840,7 +490,7 @@ $messages['da'] = array(
  * @author Rillke
  */
 $messages['de'] = array(
-	'pfunc_desc' => 'Erweitert den Parser um logische Funktionen',
+	'pfunc_desc' => 'Ergänzt Parserfunktionen, die logische Funktionen auf Wikiseiten ermöglichen',
 	'pfunc_time_error' => 'Fehler: Ungültige Zeitangabe',
 	'pfunc_time_too_long' => 'Fehler: Zu viele #time-Aufrufe',
 	'pfunc_time_too_big' => 'Fehler: #time unterstützt nur Jahre bis 9999',
@@ -860,196 +510,6 @@ $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)
@@ -1061,11 +521,13 @@ $messages['de-ch'] = array(
 
 /** Zazaki (Zazaki)
  * @author Aspar
+ * @author Erdemaslancan
  */
 $messages['diq'] = array(
-	'pfunc_desc' => 'Enhance parser with logical functions',
+	'pfunc_desc' => 'Peserkerden fonksiyanane mantıxin weş kere',
 	'pfunc_time_error' => 'xeta: zemano nemeqbul',
 	'pfunc_time_too_long' => 'xeta:zaf zêd mesajê #timeyi',
+	'pfunc_time_too_big' => 'Xırabin: #time honke qebuliya cı hetana 9999.',
 	'pfunc_rel2abs_invalid_depth' => 'Hata: Yolda geçersiz derinlik: "$1" (kök düğümünün üstünde bir düğüme erişmeye çalıştı)',
 	'pfunc_expr_stack_exhausted' => 'xetaya ifadeyi: stack qediya',
 	'pfunc_expr_unexpected_number' => 'xetaya ifadeyi: amaro bêtexmin',
@@ -1077,14 +539,14 @@ $messages['diq'] = array(
 	'pfunc_expr_unrecognised_punctuation' => 'xetaya ifadeyi: karakterê noqtakerdışê "$1"i yo ke nêşınasiyeno',
 	'pfunc_expr_unclosed_bracket' => 'xetaya ifadeyi: parantezo nêqefelnaye',
 	'pfunc_expr_division_by_zero' => 'pê sıfır teqsim ker',
-	'pfunc_expr_invalid_argument' => 'Invalid argument for $1: < -1 or > 1',
-	'pfunc_expr_invalid_argument_ln' => 'Invalid argument for ln: <= 0',
+	'pfunc_expr_invalid_argument' => 'Qande $1 vurnayeno xoser: : < -1 or > 1.',
+	'pfunc_expr_invalid_argument_ln' => 'Qande Ln vurnayeno xoser: < = 0.',
 	'pfunc_expr_unknown_error' => 'xetaya ifadeyi: neticeya ke nêzaniyena ($1)',
 	'pfunc_expr_not_a_number' => '$1 de: netice yew amar niyo',
 	'pfunc_string_too_long' => 'xeta: rêze heddê karakteri yo $1i veciyaya',
 );
 
-/** Lower Sorbian (Dolnoserbski)
+/** Lower Sorbian (dolnoserbski)
  * @author Michawiki
  */
 $messages['dsb'] = array(
@@ -1112,6 +574,7 @@ $messages['dsb'] = array(
 /** Greek (Ελληνικά)
  * @author Consta
  * @author Dead3y3
+ * @author Lou
  * @author Omnipaedista
  * @author Απεργός
  */
@@ -1127,7 +590,7 @@ $messages['el'] = array(
 	'pfunc_expr_unexpected_operator' => 'Σφάλμα έκφρασης: Μη αναμενόμενος τελεστής $1',
 	'pfunc_expr_missing_operand' => 'Σφάλμα έκφρασης: Λείπει ο τελεστέος για την έκφραση $1',
 	'pfunc_expr_unexpected_closing_bracket' => 'Σφάλμα έκφρασης: Μη αναμενόμενη αγκύλη κλεισίματος',
-	'pfunc_expr_unrecognised_punctuation' => 'Σφάλμα έκφρασης: Μη αναγνρίσμος χαρακτήρας στίξης "$1"',
+	'pfunc_expr_unrecognised_punctuation' => 'Σφάλμα έκφρασης: Μη αναγνωρίσμος χαρακτήρας στίξης "$1"',
 	'pfunc_expr_unclosed_bracket' => 'Σφάλμα έκφρασης: Αγκύλη χωρίς κλείσιμο',
 	'pfunc_expr_division_by_zero' => 'Διαίρεση με το μηδέν',
 	'pfunc_expr_invalid_argument' => 'Άκυρη παράμετρος για το $1: < -1 ή > 1',
@@ -1137,22 +600,6 @@ $messages['el'] = array(
 	'pfunc_string_too_long' => 'Σφάλμα: ο ορμαθός υπερβαίνει $1 το όριο χαρακτήρων',
 );
 
-/** British English (British English)
- * @author Happy-melon
- */
-$messages['en-gb'] = array(
-	'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)
  * @author Yekrats
  */
@@ -1178,7 +625,8 @@ $messages['eo'] = array(
 	'pfunc_string_too_long' => 'Eraro: Ĉeno preterpasas signo-limon $1',
 );
 
-/** Spanish (Español)
+/** Spanish (español)
+ * @author Bernardom
  * @author Crazymadlover
  * @author Muro de Aguas
  * @author Remember the dot
@@ -1188,6 +636,7 @@ $messages['es'] = array(
 	'pfunc_desc' => 'Mejora el analizador lógico con funciones.',
 	'pfunc_time_error' => 'Error con la expresión: Tiempo no válido',
 	'pfunc_time_too_long' => 'Error con la expresión: se están utilizando demasiados "#time"',
+	'pfunc_time_too_big' => 'Error: #time solo admite años hasta 9999.',
 	'pfunc_rel2abs_invalid_depth' => 'Error: Profundidad no válida en la ruta: «$1» (trataste de acceder a un nodo por encima de la raíz)',
 	'pfunc_expr_stack_exhausted' => 'Error de expresión: Pila agotada',
 	'pfunc_expr_unexpected_number' => 'Error con la expresión: Número no esperado',
@@ -1206,7 +655,7 @@ $messages['es'] = array(
 	'pfunc_string_too_long' => 'Error: la cadena excede el límite de $1 caracteres',
 );
 
-/** Estonian (Eesti)
+/** Estonian (eesti)
  * @author Pikne
  */
 $messages['et'] = array(
@@ -1215,7 +664,7 @@ $messages['et'] = array(
 	'pfunc_expr_division_by_zero' => 'Nulliga jagamine',
 );
 
-/** Basque (Euskara)
+/** Basque (euskara)
  * @author An13sa
  * @author Kobazulo
  */
@@ -1266,7 +715,7 @@ $messages['fa'] = array(
 	'pfunc_string_too_long' => 'خطا: رشته از محدودیت نویسه‌ای $1 تجاوز می‌کند',
 );
 
-/** Finnish (Suomi)
+/** Finnish (suomi)
  * @author Agony
  * @author Cimon Avaro
  * @author Nike
@@ -1293,7 +742,7 @@ $messages['fi'] = array(
 	'pfunc_string_too_long' => 'Virhe: Merkkijono ylittää $1 merkin ylärajan',
 );
 
-/** French (Français)
+/** French (français)
  * @author Crochet.david
  * @author Gomoko
  * @author Grondin
@@ -1305,7 +754,7 @@ $messages['fi'] = array(
  * @author Verdy p
  */
 $messages['fr'] = array(
-	'pfunc_desc' => 'Améliore le parseur avec des fonctions logiques',
+	'pfunc_desc' => 'Améliore l’analyseur syntaxique avec des fonctions logiques',
 	'pfunc_time_error' => 'Erreur : durée invalide.',
 	'pfunc_time_too_long' => 'Erreur : appels trop nombreux à <code>#time</code>.',
 	'pfunc_time_too_big' => 'Erreur : #time prend uniquement en charge des années jusqu’à 9999.',
@@ -1325,199 +774,9 @@ $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',
-	'pfunc-convert-dimension-time' => 'temps',
-	'pfunc-convert-dimension-timesquared' => 'temps<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'masse',
-	'pfunc-convert-dimension-speed' => 'vitesse',
-	'pfunc-convert-dimension-temperature' => 'température',
-	'pfunc-convert-dimension-acceleration' => 'accélération',
-	'pfunc-convert-dimension-force' => 'force',
-	'pfunc-convert-dimension-torque' => 'couple',
-	'pfunc-convert-dimension-energy' => 'énergie',
-	'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',
-	'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' => 'hecto',
-	'pfunc-convert-prefix-deca' => 'deca',
-	'pfunc-convert-prefix-deci' => 'deci',
-	'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' => '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|$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)
+/** Franco-Provençal (arpetan)
  * @author ChrisPtDe
  */
 $messages['frp'] = array(
@@ -1540,129 +799,9 @@ $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)
+/** Galician (galego)
  * @author Alma
  * @author Elisardojm
  * @author Toliño
@@ -1689,121 +828,6 @@ $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',
-	'pfunc-convert-dimension-time' => 'tempo',
-	'pfunc-convert-dimension-timesquared' => 'tempo<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'masa',
-	'pfunc-convert-dimension-speed' => 'velocidade',
-	'pfunc-convert-dimension-temperature' => 'temperatura',
-	'pfunc-convert-dimension-acceleration' => 'aceleración',
-	'pfunc-convert-dimension-force' => 'forza',
-	'pfunc-convert-dimension-torque' => 'torque',
-	'pfunc-convert-dimension-energy' => 'enerxía',
-	'pfunc-convert-dimension-power' => 'potencia',
-	'pfunc-convert-dimension-pressure' => 'presión',
-	'pfunc-convert-dimension-density' => 'densidade',
-	'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' => 'xiga',
-	'pfunc-convert-prefix-mega' => 'mega',
-	'pfunc-convert-prefix-kilo' => 'quilo',
-	'pfunc-convert-prefix-hecto' => 'hecto',
-	'pfunc-convert-prefix-deca' => 'deca',
-	'pfunc-convert-prefix-deci' => 'deci',
-	'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' => '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|$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 (Ἀρχαία ἑλληνικὴ)
@@ -1863,122 +887,6 @@ $messages['he'] = 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-doublecompoundunit' => 'שגיאה: לא ניתן לפענח יחידות מורכבות כפולות כמו "$1".',
-	'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-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 (हिन्दी)
@@ -2006,41 +914,43 @@ $messages['hi'] = array(
 	'pfunc_expr_not_a_number' => '$1 में: रिज़ल्ट संख्यामें नहीं हैं',
 );
 
-/** Croatian (Hrvatski)
+/** Croatian (hrvatski)
  * @author Dalibor Bosits
  * @author Dnik
  * @author Ex13
+ * @author Roberta F.
  * @author SpeedyGonsales
  */
 $messages['hr'] = array(
 	'pfunc_desc' => 'Mogućnost proširivanja parsera logičkim funkcijama',
-	'pfunc_time_error' => 'Greška: oblik vremena nije valjan',
-	'pfunc_time_too_long' => 'Greška: prevelik broj #time (vremenskih) poziva',
-	'pfunc_rel2abs_invalid_depth' => 'Greška: Nevaljana dubina putanje: "$1" (pokušaj pristupanja čvoru iznad korijenskog)',
-	'pfunc_expr_stack_exhausted' => 'Greška u predlošku: prepunjen stog',
-	'pfunc_expr_unexpected_number' => 'Greška u predlošku: Neočekivan broj',
-	'pfunc_expr_preg_match_failure' => 'Greška u predlošku: Neočekivana preg_match greška',
-	'pfunc_expr_unrecognised_word' => 'Greška u predlošku: Nepoznata riječ "$1"',
-	'pfunc_expr_unexpected_operator' => 'Greška u predlošku: Neočekivani operator $1',
-	'pfunc_expr_missing_operand' => 'Greška u predlošku: Operator $1 nedostaje',
-	'pfunc_expr_unexpected_closing_bracket' => 'Greška u predlošku: Neočekivana zatvorena zagrada',
-	'pfunc_expr_unrecognised_punctuation' => 'Greška u predlošku: Nepoznat interpunkcijski znak "$1"',
-	'pfunc_expr_unclosed_bracket' => 'Greška u predlošku: Nezatvorene zagrade',
+	'pfunc_time_error' => 'Pogrješka: oblik vremena nije valjan',
+	'pfunc_time_too_long' => 'Pogrješka: prevelik broj #time (vremenskih) poziva',
+	'pfunc_rel2abs_invalid_depth' => 'Pogrješka: Nevaljana dubina putanje: "$1" (pokušaj pristupanja čvoru iznad korijenskog)',
+	'pfunc_expr_stack_exhausted' => 'Pogrješka u predlošku: prepunjen stog',
+	'pfunc_expr_unexpected_number' => 'Pogrješka u predlošku: Neočekivan broj',
+	'pfunc_expr_preg_match_failure' => 'Pogrješka u predlošku: Neočekivana preg_match pogrješka',
+	'pfunc_expr_unrecognised_word' => 'Pogrješka u predlošku: Nepoznata riječ "$1"',
+	'pfunc_expr_unexpected_operator' => 'Pogrješka u predlošku: Neočekivani operator $1',
+	'pfunc_expr_missing_operand' => 'Pogrješka u predlošku: Operator $1 nedostaje',
+	'pfunc_expr_unexpected_closing_bracket' => 'Pogrješka u predlošku: Neočekivana zatvorena zagrada',
+	'pfunc_expr_unrecognised_punctuation' => 'Pogrješka u predlošku: Nepoznat interpunkcijski znak "$1"',
+	'pfunc_expr_unclosed_bracket' => 'Pogrješka u predlošku: Nezatvorene zagrade',
 	'pfunc_expr_division_by_zero' => 'Dijeljenje s nulom',
 	'pfunc_expr_invalid_argument' => 'Nevaljani argumenti za $1: < -1 ili > 1',
 	'pfunc_expr_invalid_argument_ln' => 'Nevaljani argument za ln: <= 0',
-	'pfunc_expr_unknown_error' => 'Greška u predlošku: Nepoznata greška ($1)',
+	'pfunc_expr_unknown_error' => 'Pogrješka u predlošku: Nepoznata pogrješka ($1)',
 	'pfunc_expr_not_a_number' => 'U $1: rezultat nije broj',
-	'pfunc_string_too_long' => 'Greška: Niz prelazi ograničenje od $1 znakova',
+	'pfunc_string_too_long' => 'Pogrješka: Niz prelazi ograničenje od $1 znakova',
 );
 
-/** Upper Sorbian (Hornjoserbsce)
+/** Upper Sorbian (hornjoserbsce)
  * @author Michawiki
  */
 $messages['hsb'] = array(
 	'pfunc_desc' => 'Parser wo logiske funkcije rozšěrić',
 	'pfunc_time_error' => 'Zmylk: njepłaćiwe časowe podaće',
 	'pfunc_time_too_long' => 'Zmylk: přewjele zawołanjow #time',
+	'pfunc_time_too_big' => 'Zmylk: #time jenož lěta hač do 9999 podpěruje.',
 	'pfunc_rel2abs_invalid_depth' => 'Zmylk: Njepłaćiwa hłubokosć w pućiku: "$1" (Pospyt, zo by na suk wyše hłowneho suka dohrabnyło)',
 	'pfunc_expr_stack_exhausted' => 'Wurazowy zmylk: Staplowy skład wučerpany',
 	'pfunc_expr_unexpected_number' => 'Wurazowy zmylk: Njewočakowana ličba',
@@ -2057,54 +967,9 @@ $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)
+/** Hungarian (magyar)
  * @author Dani
  */
 $messages['hu'] = array(
@@ -2128,53 +993,9 @@ $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)
+/** Interlingua (interlingua)
  * @author McDutchie
  */
 $messages['ia'] = array(
@@ -2198,55 +1019,6 @@ $messages['ia'] = array(
 	'pfunc_expr_unknown_error' => 'Error de expression: Error incognite ($1)',
 	'pfunc_expr_not_a_number' => 'In $1: le resultato non es un numero',
 	'pfunc_string_too_long' => 'Error: Le catena excede le limite de $1 {{PLURAL:$1|character|characteres}}',
-	'pfunc-convert-dimensionmismatch' => 'Error: Impossibile converter inter unitates de "$1" e "$2".',
-	'pfunc-convert-unknownunit' => 'Error: Unitate "$1" incognite.',
-	'pfunc-convert-unknowndimension' => 'Error: Dimension "$1" incognite.',
-	'pfunc-convert-invalidcompoundunit' => 'Error: Unitate composite "$1" invalide.',
-	'pfunc-convert-nounit' => 'Error: Nulle unitate de origine specificate.',
-	'pfunc-convert-doublecompoundunit' => 'Error: Non pote processar unitates composite duplice como "$1".',
-	'pfunc-convert-dimension-length' => 'longitude',
-	'pfunc-convert-dimension-area' => 'area',
-	'pfunc-convert-dimension-volume' => 'volumine',
-	'pfunc-convert-dimension-time' => 'tempore',
-	'pfunc-convert-dimension-timesquared' => 'tempore<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'massa',
-	'pfunc-convert-dimension-speed' => 'velocitate',
-	'pfunc-convert-dimension-temperature' => 'temperatura',
-	'pfunc-convert-dimension-acceleration' => 'acceleration',
-	'pfunc-convert-dimension-force' => 'fortia',
-	'pfunc-convert-dimension-torque' => 'torsion',
-	'pfunc-convert-dimension-energy' => 'energia',
-	'pfunc-convert-dimension-power' => 'potentia',
-	'pfunc-convert-dimension-pressure' => 'pression',
-	'pfunc-convert-dimension-density' => 'densitate',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'efficientiaenergeticpositive',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'efficientiaenergeticnegative',
-	'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' => 'hecto',
-	'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-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)
@@ -2285,7 +1057,7 @@ $messages['io'] = array(
 	'pfunc_expr_division_by_zero' => 'Divido per zero',
 );
 
-/** Italian (Italiano)
+/** Italian (italiano)
  * @author Beta16
  * @author BrokenArrow
  * @author Darth Kule
@@ -2312,73 +1084,6 @@ $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 (日本語)
@@ -2386,29 +1091,30 @@ $messages['it'] = array(
  * @author Fryed-peach
  * @author JtFuruhata
  * @author Ohgi
+ * @author Shirayuki
  * @author 青子守歌
  */
 $messages['ja'] = 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' => '構文エラー: 予期せぬ数字です',
-	'pfunc_expr_preg_match_failure' => '構文エラー: 予期せぬ形で preg_match に失敗しました',
-	'pfunc_expr_unrecognised_word' => '構文エラー: "$1" は認識できません',
-	'pfunc_expr_unexpected_operator' => '構文エラー: 予期せぬ演算子 $1 があります',
-	'pfunc_expr_missing_operand' => '構文エラー: $1 の演算対象がありません',
-	'pfunc_expr_unexpected_closing_bracket' => '構文エラー: 予期せぬ閉じ括弧です',
-	'pfunc_expr_unrecognised_punctuation' => '構文エラー: 認識できない区切り文字 "$1" があります',
-	'pfunc_expr_unclosed_bracket' => '構文エラー: 括弧が閉じられていません',
-	'pfunc_expr_division_by_zero' => '0で除算しました',
-	'pfunc_expr_invalid_argument' => '$1の引数が無効です: < -1 または > 1',
+	'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' => '構文エラー: 予期しない数字です。',
+	'pfunc_expr_preg_match_failure' => '構文エラー: preg_match で予期しない失敗をしました。',
+	'pfunc_expr_unrecognised_word' => '構文エラー: 「$1」を認識できません。',
+	'pfunc_expr_unexpected_operator' => '構文エラー: 予期しない演算子 $1 です。',
+	'pfunc_expr_missing_operand' => '構文エラー: $1 の演算対象がありません。',
+	'pfunc_expr_unexpected_closing_bracket' => '構文エラー: 予期しない閉じ括弧です。',
+	'pfunc_expr_unrecognised_punctuation' => '構文エラー: 認識できない区切り文字「$1」です。',
+	'pfunc_expr_unclosed_bracket' => '構文エラー: 括弧が閉じられていません。',
+	'pfunc_expr_division_by_zero' => '0 で除算しました。',
+	'pfunc_expr_invalid_argument' => '$1 の引数が無効です: < -1 または > 1',
 	'pfunc_expr_invalid_argument_ln' => 'ln の引数が無効です: <= 0',
-	'pfunc_expr_unknown_error' => '構文エラー: 予期せぬエラー($1)',
-	'pfunc_expr_not_a_number' => '$1: 結果が数字ではありません',
-	'pfunc_string_too_long' => 'エラー: 文字列が文字数制限 $1 を超えました',
+	'pfunc_expr_unknown_error' => '構文エラー: 不明なエラー ($1) です。',
+	'pfunc_expr_not_a_number' => '$1: 結果が数値ではありません。',
+	'pfunc_string_too_long' => 'エラー: 文字列の長さが上限の $1 文字を超えています。',
 );
 
 /** Javanese (Basa Jawa)
@@ -2448,7 +1154,7 @@ $messages['ka'] = array(
 	'pfunc_string_too_long' => 'შეცდომა: სტრიქონის ზომა აღემატება $1 სიმბოლოს ლიმიტს',
 );
 
-/** Kazakh (Arabic script) (‫قازاقشا (تٴوتە)‬) */
+/** Kazakh (Arabic script) (قازاقشا (تٴوتە)‏) */
 $messages['kk-arab'] = array(
 	'pfunc_time_error' => 'قاتە: جارامسىز ۋاقىت',
 	'pfunc_time_too_long' => 'قاتە: #time شاقىرۋى تىم كوپ',
@@ -2467,7 +1173,7 @@ $messages['kk-arab'] = array(
 	'pfunc_expr_not_a_number' => '$1 دەگەندە: ناتىيجە سان ەمەس',
 );
 
-/** Kazakh (Cyrillic) (Қазақша (Cyrillic)) */
+/** Kazakh (Cyrillic script) (қазақша (кирил)‎) */
 $messages['kk-cyrl'] = array(
 	'pfunc_time_error' => 'Қате: жарамсыз уақыт',
 	'pfunc_time_too_long' => 'Қате: #time шақыруы тым көп',
@@ -2486,7 +1192,7 @@ $messages['kk-cyrl'] = array(
 	'pfunc_expr_not_a_number' => '$1 дегенде: нәтиже сан емес',
 );
 
-/** Kazakh (Latin) (Қазақша (Latin)) */
+/** Kazakh (Latin script) (qazaqşa (latın)‎) */
 $messages['kk-latn'] = array(
 	'pfunc_time_error' => 'Qate: jaramsız waqıt',
 	'pfunc_time_too_long' => 'Qate: #time şaqırwı tım köp',
@@ -2550,7 +1256,7 @@ $messages['ko'] = array(
  * @author Rentenirer
  */
 $messages['ksh'] = array(
-	'pfunc_desc' => 'Deit em Wiki Funxione för Entscheidunge un esu dobei.',
+	'pfunc_desc' => 'Deit em Wiki Funxione för Entscheidunge un esu jät dobei.',
 	'pfunc_time_error' => 'Fähler: Onjöltijje Zick.',
 	'pfunc_time_too_long' => 'Fähler: <code>#time</code> weed zo öff jebruch.',
 	'pfunc_time_too_big' => 'Ene Fähleres opjefalle: <code lang="en">#time</code> kann bloß bes nohm Johr 9999 jonn.',
@@ -2570,38 +1276,6 @@ $messages['ksh'] = array(
 	'pfunc_expr_unknown_error' => 'Fähler en enem Ußdrock: Unbikannt ($1)',
 	'pfunc_expr_not_a_number' => 'Fähler en enem Ußdrock: En <code>$1</code> es dat wat erus kütt kein Zahl.',
 	'pfunc_string_too_long' => 'Fähler en enem Ußdrock: En Zeijshereih es länger wi $1 Zeijshe.',
-	'pfunc-convert-dimension-length' => 'Längemohß',
-	'pfunc-convert-dimension-area' => 'Flächemohß',
-	'pfunc-convert-dimension-volume' => 'Hohlmohß',
-	'pfunc-convert-dimension-time' => 'Ziggmohß',
-	'pfunc-convert-dimension-timesquared' => 'Zigg<sup>2</sup>-Mohß',
-	'pfunc-convert-dimension-mass' => 'Mohß för de  Mass',
-	'pfunc-convert-dimension-speed' => 'Jeschwendechkeit',
-	'pfunc-convert-dimension-pressure' => 'Drock',
-	'pfunc-convert-prefix-yotta' => 'Yotta',
-	'pfunc-convert-prefix-zetta' => 'Zetta',
-	'pfunc-convert-prefix-exa' => 'Exa',
-	'pfunc-convert-prefix-tera' => 'Tera',
-	'pfunc-convert-prefix-giga' => 'Giga',
-	'pfunc-convert-prefix-mega' => 'Mega',
-	'pfunc-convert-prefix-kilo' => 'Killo',
-	'pfunc-convert-prefix-hecto' => 'Häkto',
-	'pfunc-convert-prefix-deca' => 'Dekka',
-	'pfunc-convert-prefix-deci' => 'Dezi',
-	'pfunc-convert-prefix-centi' => 'Cänti',
-	'pfunc-convert-prefix-milli' => 'Milli',
-	'pfunc-convert-prefix-micro' => 'Mikro',
-	'pfunc-convert-prefix-nano' => 'Nanno',
-	'pfunc-convert-prefix-pico' => 'Picko',
-	'pfunc-convert-prefix-femto' => 'Fämto',
-	'pfunc-convert-prefix-atto' => 'Atto',
-	'pfunc-convert-prefix-zepto' => 'Zäpto',
-	'pfunc-convert-prefix-yocto' => 'Jokto',
-	'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)
@@ -2626,46 +1300,6 @@ $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)
@@ -2694,14 +1328,14 @@ $messages['li'] = array(
 	'pfunc_string_too_long' => 'Fout: De teks is lenger es de limiet van $1 {{PLURAL:$1|teike|teikes}}',
 );
 
-/** Lithuanian (Lietuvių)
+/** Lithuanian (lietuvių)
  * @author Hugo.arg
  */
 $messages['lt'] = array(
 	'pfunc_time_error' => 'Klaida: neteisingas laikas',
 );
 
-/** Latvian (Latviešu)
+/** Latvian (latviešu)
  * @author Papuass
  */
 $messages['lv'] = array(
@@ -2710,7 +1344,7 @@ $messages['lv'] = array(
 	'pfunc_expr_division_by_zero' => 'Dalīšana ar nulli',
 );
 
-/** Macedonian (Македонски)
+/** Macedonian (македонски)
  * @author Bjankuloski06
  * @author Brest
  */
@@ -2735,217 +1369,6 @@ $messages['mk'] = 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-doublecompoundunit' => 'Грешка: не можам да парсирам двојни мешовити единици како „$1“',
-	'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-dimension-fuelefficiencypositive' => 'позитивна горивна ефикасност',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'негативна горивна ефикасност',
-	'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-yotta-abbr' => 'Ј',
-	'pfunc-convert-prefix-zetta-abbr' => 'З',
-	'pfunc-convert-prefix-exa-abbr' => 'Е',
-	'pfunc-convert-prefix-peta-abbr' => 'П',
-	'pfunc-convert-prefix-tera-abbr' => 'Т',
-	'pfunc-convert-prefix-giga-abbr' => 'Г',
-	'pfunc-convert-prefix-mega-abbr' => 'М',
-	'pfunc-convert-prefix-kilo-abbr' => 'к',
-	'pfunc-convert-prefix-hecto-abbr' => 'х',
-	'pfunc-convert-prefix-deca-abbr' => 'да',
-	'pfunc-convert-prefix-deci-abbr' => 'д',
-	'pfunc-convert-prefix-centi-abbr' => 'с',
-	'pfunc-convert-prefix-milli-abbr' => 'м',
-	'pfunc-convert-prefix-micro-abbr' => 'μ',
-	'pfunc-convert-prefix-nano-abbr' => 'н',
-	'pfunc-convert-prefix-pico-abbr' => 'п',
-	'pfunc-convert-prefix-femto-abbr' => 'ф',
-	'pfunc-convert-prefix-atto-abbr' => 'а',
-	'pfunc-convert-prefix-zepto-abbr' => 'з',
-	'pfunc-convert-prefix-yocto-abbr' => 'ј',
-	'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 (മലയാളം)
@@ -2973,124 +1396,6 @@ $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 (मराठी)
@@ -3146,199 +1451,9 @@ $messages['ms'] = array(
 	'pfunc_expr_unknown_error' => 'Ralat ungkapan: Ralat tidak diketahui ($1)',
 	'pfunc_expr_not_a_number' => 'Dalam $1: hasil bukan nombor',
 	'pfunc_string_too_long' => 'Ralat: Rentetan melampaui batas aksara $1',
-	'pfunc-convert-dimensionmismatch' => 'Ralat: Tidak boleh menukar antara unit-unit "$1" dan "$2".',
-	'pfunc-convert-unknownunit' => 'Ralat: Unit "$1" tidak dikenali.',
-	'pfunc-convert-unknowndimension' => 'Ralat: Matra "$1" tidak dikenali.',
-	'pfunc-convert-invalidcompoundunit' => 'Ralat: Unit majmuk "$1" tidak sah.',
-	'pfunc-convert-nounit' => 'Ralat: Tiada unit sumber yang diberikan.',
-	'pfunc-convert-doublecompoundunit' => 'Ralat: Unit majmuk berganda seperti "$1" tidak boleh dihuraikan.',
-	'pfunc-convert-dimension-length' => 'panjang',
-	'pfunc-convert-dimension-area' => 'luas',
-	'pfunc-convert-dimension-volume' => 'isipadu',
-	'pfunc-convert-dimension-time' => 'masa',
-	'pfunc-convert-dimension-timesquared' => 'masa<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'jisim',
-	'pfunc-convert-dimension-speed' => 'kelajuan',
-	'pfunc-convert-dimension-temperature' => 'suhu',
-	'pfunc-convert-dimension-acceleration' => 'pecutan',
-	'pfunc-convert-dimension-force' => 'daya',
-	'pfunc-convert-dimension-torque' => 'tork',
-	'pfunc-convert-dimension-energy' => 'tenaga',
-	'pfunc-convert-dimension-power' => 'kuasa',
-	'pfunc-convert-dimension-pressure' => 'tekanan',
-	'pfunc-convert-dimension-density' => 'ketumpatan',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'kecekapanbahanapipositif',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'kecekapanbahanapinegatif',
-	'pfunc-convert-prefix-yotta' => 'yotta',
-	'pfunc-convert-prefix-zetta' => 'zetta',
-	'pfunc-convert-prefix-exa' => 'eksa',
-	'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' => 'desi',
-	'pfunc-convert-prefix-centi' => 'senti',
-	'pfunc-convert-prefix-milli' => 'mili',
-	'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|$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 (Эрзянь)
+/** Erzya (эрзянь)
  * @author Botuzhaleny-sodamo
  */
 $messages['myv'] = array(
@@ -3354,6 +1469,33 @@ $messages['nah'] = array(
 	'pfunc_time_error' => 'Ahcuallōtl: ahcualli cāhuitl',
 );
 
+/** Norwegian Bokmål (norsk (bokmål)‎)
+ * @author Event
+ * @author Laaknor
+ */
+$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',
+	'pfunc_time_too_big' => 'Feil: #time støtter kun år opp til 9999',
+	'pfunc_rel2abs_invalid_depth' => 'Feil: Ugyldig dybde i sti: «$1» (prøvde å få tilgang til en node over rotnoden)',
+	'pfunc_expr_stack_exhausted' => 'Uttrykksfeil: Stakk utbrukt',
+	'pfunc_expr_unexpected_number' => 'Uttrykksfeil: Uventet nummer',
+	'pfunc_expr_preg_match_failure' => 'Uttrykksfeil: Uventet preg_match-feil',
+	'pfunc_expr_unrecognised_word' => 'Uttrykksfeil: Ugjenkjennelig ord «$1»',
+	'pfunc_expr_unexpected_operator' => 'Uttrykksfeil: Uventet $1-operator',
+	'pfunc_expr_missing_operand' => 'Uttrykksfeil: Mangler operand for $1',
+	'pfunc_expr_unexpected_closing_bracket' => 'Uttrykksfeil: Uventet lukkende parentes',
+	'pfunc_expr_unrecognised_punctuation' => 'Uttrykksfeil: Ugjenkjennelig tegn «$1»',
+	'pfunc_expr_unclosed_bracket' => 'Uttrykksfeil: Åpen parentes',
+	'pfunc_expr_division_by_zero' => 'Deling på null',
+	'pfunc_expr_invalid_argument' => 'Ugyldig argument for $1: < -1 eller > 1',
+	'pfunc_expr_invalid_argument_ln' => 'Ugyldig argument for ln: <= 0',
+	'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',
+);
+
 /** Low German (Plattdüütsch)
  * @author Slomox
  */
@@ -3378,11 +1520,13 @@ $messages['nds'] = array(
 	'pfunc_expr_not_a_number' => 'In $1: wat rutkamen is, is kene Tall',
 );
 
-/** Nepali (नेपाली) */
+/** Nepali (नेपाली)
+ * @author RajeshPandey
+ */
 $messages['ne'] = array(
 	'pfunc_time_error' => 'त्रुटी: गलत/वा हुदैनहुने समय',
 	'pfunc_time_too_long' => 'त्रुटी: एकदम धेरै #time callहरु',
-	'pfunc_rel2abs_invalid_depth' => 'त्रुटी: पाथमा (इनभ्यालिड)गलत गहिराइ(डेप्थ) भयो: "$1" (ले रुट नोड भन्दापनि माथिको नोडलाइ चलाउन(एकसेस) गर्न खोज्यो)',
+	'pfunc_rel2abs_invalid_depth' => 'त्रुटी: पाथमा (इनभ्यालिड)गलत गहिराइ(डेप्थ) भयो: "$1" (ले रुट नोड भन्दापनि माथिको नोडलाइ चलाउन(एकसेस गर्न) खोज्यो)',
 );
 
 /** Dutch (Nederlands)
@@ -3410,203 +1554,14 @@ $messages['nl'] = array(
 	'pfunc_expr_unknown_error' => 'Fout in uitdrukking: onbekende fout ($1)',
 	'pfunc_expr_not_a_number' => 'In $1: resultaat is geen getal',
 	'pfunc_string_too_long' => 'Fout: De tekst is langer dan de limiet van $1 {{PLURAL:$1|karakter|karakters}}',
-	'pfunc-convert-dimensionmismatch' => 'Fout: het is niet mogelijk te converteren tussen de eenheden van "$1" en "$2".',
-	'pfunc-convert-unknownunit' => 'Fout: onbekende eenheid "$1".',
-	'pfunc-convert-unknowndimension' => 'Fout: Onbekende afmeting "$1".',
-	'pfunc-convert-invalidcompoundunit' => 'Fout: Ongeldige samengestelde eenheid "$1".',
-	'pfunc-convert-nounit' => 'Fout: Geen broneenheid opgegeven.',
-	'pfunc-convert-doublecompoundunit' => 'Fout: het is niet mogelijk samengestelde eenheden zoals "$1" te verwerken.',
-	'pfunc-convert-dimension-length' => 'lengte',
-	'pfunc-convert-dimension-area' => 'oppervlakte',
-	'pfunc-convert-dimension-volume' => 'inhoud',
-	'pfunc-convert-dimension-time' => 'tijd',
-	'pfunc-convert-dimension-timesquared' => 'tijd<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'massa',
-	'pfunc-convert-dimension-speed' => 'snelheid',
-	'pfunc-convert-dimension-temperature' => 'temperatuur',
-	'pfunc-convert-dimension-acceleration' => 'versnelling',
-	'pfunc-convert-dimension-force' => 'kracht',
-	'pfunc-convert-dimension-torque' => 'koppel',
-	'pfunc-convert-dimension-energy' => 'energie',
-	'pfunc-convert-dimension-power' => 'vermogen',
-	'pfunc-convert-dimension-pressure' => 'druk',
-	'pfunc-convert-dimension-density' => 'dichtheid',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'brandstofefficientiepositief',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'brandstofefficientienegatief',
-	'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' => 'hecto',
-	'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|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)‬)
+/** Norwegian Nynorsk (norsk (nynorsk)‎)
  * @author Eirik
  * @author Frokor
  * @author Gunnernett
  * @author Harald Khan
+ * @author Njardarlogar
  */
 $messages['nn'] = array(
 	'pfunc_desc' => 'Legg til logiske funksjonar i parseren.',
@@ -3630,42 +1585,9 @@ $messages['nn'] = array(
 	'pfunc_string_too_long' => 'Feil: Strengen går over grensa på $1 teikn',
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
- * @author Event
- * @author Jon Harald Søby
- * @author Laaknor
- */
-$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',
-	'pfunc_time_too_big' => 'Feil: #time støtter kun år opp til 9999',
-	'pfunc_rel2abs_invalid_depth' => 'Feil: Ugyldig dybde i sti: «$1» (prøvde å få tilgang til en node over rotnoden)',
-	'pfunc_expr_stack_exhausted' => 'Uttrykksfeil: Stakk utbrukt',
-	'pfunc_expr_unexpected_number' => 'Uttrykksfeil: Uventet nummer',
-	'pfunc_expr_preg_match_failure' => 'Uttrykksfeil: Uventet preg_match-feil',
-	'pfunc_expr_unrecognised_word' => 'Uttrykksfeil: Ugjenkjennelig ord «$1»',
-	'pfunc_expr_unexpected_operator' => 'Uttrykksfeil: Uventet $1-operator',
-	'pfunc_expr_missing_operand' => 'Uttrykksfeil: Mangler operand for $1',
-	'pfunc_expr_unexpected_closing_bracket' => 'Uttrykksfeil: Uventet lukkende parentes',
-	'pfunc_expr_unrecognised_punctuation' => 'Uttrykksfeil: Ugjenkjennelig tegn «$1»',
-	'pfunc_expr_unclosed_bracket' => 'Uttrykksfeil: Åpen parentes',
-	'pfunc_expr_division_by_zero' => 'Deling på null',
-	'pfunc_expr_invalid_argument' => 'Ugyldig argument for $1: < -1 eller > 1',
-	'pfunc_expr_invalid_argument_ln' => 'Ugyldig argument for ln: <= 0',
-	'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)
+/** Occitan (occitan)
  * @author Cedric31
+ * @author Jfblanc
  */
 $messages['oc'] = array(
 	'pfunc_desc' => 'Augmenta lo parser amb de foncions logicas',
@@ -3677,7 +1599,7 @@ $messages['oc'] = array(
 	'pfunc_expr_preg_match_failure' => 'Expression erronèa : una expression pas compresa a pas capitat',
 	'pfunc_expr_unrecognised_word' => "Error d'expression : lo mot '''$1''' es pas reconegut",
 	'pfunc_expr_unexpected_operator' => "Error d'expression : l'operador '''$1''' es pas reconegut",
-	'pfunc_expr_missing_operand' => "Error d'expression : l'operanda '''$1''' es pas reconeguda",
+	'pfunc_expr_missing_operand' => "Error d'expression : l'operand '''$1''' es pas reconegut",
 	'pfunc_expr_unexpected_closing_bracket' => "Error d'expression : parentèsi tampanta pas prevista",
 	'pfunc_expr_unrecognised_punctuation' => "Error d'expression : caractèr de ponctuacion « $1 » pas reconegut",
 	'pfunc_expr_unclosed_bracket' => 'Error d’expression : parentèsi pas tampada',
@@ -3689,7 +1611,7 @@ $messages['oc'] = array(
 	'pfunc_string_too_long' => 'Error : La cadena depassa lo limit maximal de $1 caractèr{{PLURAL:$1||s}}',
 );
 
-/** Polish (Polski)
+/** Polish (polski)
  * @author Derbeth
  * @author Grzechooo
  * @author Sp5uhe
@@ -3716,147 +1638,10 @@ $messages['pl'] = array(
 	'pfunc_expr_unknown_error' => 'Błąd w wyrażeniu – nieznany błąd ($1)',
 	'pfunc_expr_not_a_number' => 'W $1 – wynik nie jest liczbą',
 	'pfunc_string_too_long' => 'Błąd – długość ciągu znaków przekracza dopuszczalne $1',
-	'pfunc-convert-dimensionmismatch' => 'Błąd – nie można konwertować pomiędzy jednostkami „$1” i „$2”',
-	'pfunc-convert-unknownunit' => 'Błąd – nieznana jednostka „$1”',
-	'pfunc-convert-unknowndimension' => 'Błąd – nieznana jednostka „$1”',
-	'pfunc-convert-invalidcompoundunit' => 'Błąd – nieprawidłowa jednostka złożona „$1”',
-	'pfunc-convert-nounit' => 'Błąd – brak jednostki źródłowej',
-	'pfunc-convert-doublecompoundunit' => 'Błąd – nie można przetworzyć jednostki podwójnie złożonej jak „$1”',
-	'pfunc-convert-dimension-length' => 'długość',
-	'pfunc-convert-dimension-area' => 'powierzchnia',
-	'pfunc-convert-dimension-volume' => 'objętość',
-	'pfunc-convert-dimension-time' => 'czas',
-	'pfunc-convert-dimension-timesquared' => 'czas<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'masa',
-	'pfunc-convert-dimension-speed' => 'prędkość',
-	'pfunc-convert-dimension-temperature' => 'temperatura',
-	'pfunc-convert-dimension-acceleration' => 'przyspieszenie',
-	'pfunc-convert-dimension-force' => 'siła',
-	'pfunc-convert-dimension-torque' => 'moment obrotowy',
-	'pfunc-convert-dimension-energy' => 'energia',
-	'pfunc-convert-dimension-power' => 'moc',
-	'pfunc-convert-dimension-pressure' => 'ciśnienie',
-	'pfunc-convert-dimension-density' => 'gęstość',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'bezwzględne zużycie paliwa',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'nieprawidłowe zużycie paliwa',
-	'pfunc-convert-prefix-yotta' => 'jotta',
-	'pfunc-convert-prefix-zetta' => 'zetta',
-	'pfunc-convert-prefix-exa' => 'eksa',
-	'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' => 'decy',
-	'pfunc-convert-prefix-centi' => 'centy',
-	'pfunc-convert-prefix-milli' => 'mili',
-	'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' => 'jokto',
-	'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)
+ * @author Borichèt
  * @author Bèrto 'd Sèra
  * @author Dragonòt
  */
@@ -3864,7 +1649,7 @@ $messages['pms'] = array(
 	'pfunc_desc' => 'Mijora ël parse con funsion lògiche',
 	'pfunc_time_error' => 'Eror: temp nen bon',
 	'pfunc_time_too_long' => 'Eror: #time a ven ciamà tròpe vire',
-	'pfunc_time_too_big' => 'Eror: #time a përmëtt mach agn fin al 9999',
+	'pfunc_time_too_big' => "Eror: #time a përmët mach j'agn fin al 9999.",
 	'pfunc_rel2abs_invalid_depth' => 'Eror: profondità nen bon-a ant ël përcors: "$1" (a l\'é provasse a ciamé un grop dzora a la rèis)',
 	'pfunc_expr_stack_exhausted' => "Eror ëd l'espression: stach esaurìa",
 	'pfunc_expr_unexpected_number' => "Eror ëd l'espression: nùmer pa spetà",
@@ -3889,128 +1674,6 @@ $messages['pms'] = array(
 $messages['pnb'] = array(
 	'pfunc_time_error' => 'غلطی: ویلہ ٹھیک نئیں۔',
 	'pfunc_time_too_long' => 'غلطی: بعوت ساریاں # کالاں',
-	'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-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 (پښتو)
@@ -4021,7 +1684,7 @@ $messages['ps'] = array(
 	'pfunc_expr_division_by_zero' => 'وېش په صفر',
 );
 
-/** Portuguese (Português)
+/** Portuguese (português)
  * @author Hamilton Abreu
  * @author Malafaya
  */
@@ -4048,7 +1711,7 @@ $messages['pt'] = array(
 	'pfunc_string_too_long' => 'Erro: Texto excede o limite de $1 caracteres',
 );
 
-/** Brazilian Portuguese (Português do Brasil)
+/** Brazilian Portuguese (português do Brasil)
  * @author Eduardo.mps
  * @author Giro720
  */
@@ -4073,29 +1736,6 @@ $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)
@@ -4124,7 +1764,7 @@ $messages['qu'] = array(
 	'pfunc_string_too_long' => 'Pantasqa: Qillqa tiwlliqa $1 sanampa saywatam llallin',
 );
 
-/** Romanian (Română)
+/** Romanian (română)
  * @author KlaudiuMihaila
  * @author Minisarm
  * @author Stelistcristi
@@ -4152,7 +1792,7 @@ $messages['ro'] = array(
 	'pfunc_string_too_long' => 'Eroare: șirul depășește limita de caractere de $1',
 );
 
-/** Tarandíne (Tarandíne)
+/** tarandíne (tarandíne)
  * @author Joetaras
  */
 $messages['roa-tara'] = array(
@@ -4178,7 +1818,7 @@ $messages['roa-tara'] = array(
 	'pfunc_string_too_long' => "Errore: 'A stringhe supranesce 'u limite de $1 carattere",
 );
 
-/** Russian (Русский)
+/** Russian (русский)
  * @author G0rn
  * @author Александр Сигачёв
  */
@@ -4203,199 +1843,9 @@ $messages['ru'] = 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-doublecompoundunit' => 'Ошибка. Невозможно разобрать двойные составные единицы вида «$1».',
-	'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-dimension-fuelefficiencypositive' => 'позитивная топливная эффективность',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'негативная топливная эффективность',
-	'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метра|$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 (Русиньскый)
+/** Rusyn (русиньскый)
  * @author Gazeb
  */
 $messages['rue'] = array(
@@ -4420,7 +1870,7 @@ $messages['rue'] = array(
 	'pfunc_string_too_long' => 'Хыба: Ланц є довшый як $1 {{PLURAL:$1|знак|знакы|знаків}}, што є ліміт',
 );
 
-/** Sakha (Саха тыла)
+/** Sakha (саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -4446,7 +1896,7 @@ $messages['sah'] = array(
 	'pfunc_string_too_long' => 'Алҕас: Устуруока уһуна $1 бэлиэннэн хааччахха баппат',
 );
 
-/** Sicilian (Sicilianu)
+/** Sicilian (sicilianu)
  * @author Melos
  * @author Santu
  */
@@ -4498,7 +1948,7 @@ $messages['si'] = array(
 	'pfunc_string_too_long' => 'Error: වදන් පෙළ අකුරු $1 සීමාව ඉක්මවයි',
 );
 
-/** Slovak (Slovenčina)
+/** Slovak (slovenčina)
  * @author Helix84
  */
 $messages['sk'] = array(
@@ -4523,7 +1973,7 @@ $messages['sk'] = array(
 	'pfunc_string_too_long' => 'Chyba: Reťazec prekračuje limit $1 znakov',
 );
 
-/** Slovenian (Slovenščina)
+/** Slovenian (slovenščina)
  * @author Dbc334
  */
 $messages['sl'] = array(
@@ -4547,201 +1997,9 @@ $messages['sl'] = array(
 	'pfunc_expr_unknown_error' => 'Napaka v izrazu: Neznana napaka ($1)',
 	'pfunc_expr_not_a_number' => 'V $1: rezultat ni število',
 	'pfunc_string_too_long' => 'Napaka: Niz presega omejitev $1 {{PLURAL:$1|znaka|znakov}}',
-	'pfunc-convert-dimensionmismatch' => 'Napaka: Ne morem pretvoriti med enotama »$1« in »$2«.',
-	'pfunc-convert-unknownunit' => 'Napaka: Neznana enota »$1«.',
-	'pfunc-convert-unknowndimension' => 'Napaka: Neznana razsežnost »$1«.',
-	'pfunc-convert-invalidcompoundunit' => 'Napaka: Neveljavna sestavljena enota »$1«.',
-	'pfunc-convert-nounit' => 'Napaka: Izvirna enota ni podana.',
-	'pfunc-convert-doublecompoundunit' => 'Napaka: Ne morem razčleniti dvojne sestavljene enote, kot je »$1«.',
-	'pfunc-convert-dimension-length' => 'dolžina',
-	'pfunc-convert-dimension-area' => 'ploščina',
-	'pfunc-convert-dimension-volume' => 'prostornina',
-	'pfunc-convert-dimension-time' => 'čas',
-	'pfunc-convert-dimension-timesquared' => 'čas<sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'masa',
-	'pfunc-convert-dimension-speed' => 'hitrost',
-	'pfunc-convert-dimension-temperature' => 'temperatura',
-	'pfunc-convert-dimension-acceleration' => 'pospešek',
-	'pfunc-convert-dimension-force' => 'sila',
-	'pfunc-convert-dimension-torque' => 'navor',
-	'pfunc-convert-dimension-energy' => 'energija',
-	'pfunc-convert-dimension-power' => 'moč',
-	'pfunc-convert-dimension-pressure' => 'tlak',
-	'pfunc-convert-dimension-density' => 'gostota',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'pozitivna učinkovitost goriva',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'negativna učinkovitost goriva',
-	'pfunc-convert-prefix-yotta' => 'jota',
-	'pfunc-convert-prefix-zetta' => 'zeta',
-	'pfunc-convert-prefix-exa' => 'eksa',
-	'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' => 'mili',
-	'pfunc-convert-prefix-micro' => 'mikro',
-	'pfunc-convert-prefix-nano' => 'nano',
-	'pfunc-convert-prefix-pico' => 'piko',
-	'pfunc-convert-prefix-femto' => 'femto',
-	'pfunc-convert-prefix-atto' => 'ato',
-	'pfunc-convert-prefix-zepto' => 'zepto',
-	'pfunc-convert-prefix-yocto' => 'jokto',
-	'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)
+/** Albanian (shqip)
  * @author Olsi
  * @author Vinie007
  */
@@ -4768,7 +2026,7 @@ $messages['sq'] = array(
 	'pfunc_string_too_long' => 'Gabim: string kalon limit $1 karakter',
 );
 
-/** Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+/** Serbian (Cyrillic script) (српски (ћирилица)‎)
  * @author Millosh
  * @author Rancher
  * @author Verlor
@@ -4794,7 +2052,7 @@ $messages['sr-ec'] = array(
 	'pfunc_string_too_long' => 'Грешка: реч прекорачује $1  слова, што је постављено ограничење',
 );
 
-/** Serbian Latin ekavian (‪Srpski (latinica)‬)
+/** Serbian (Latin script) (srpski (latinica)‎)
  * @author Michaello
  */
 $messages['sr-el'] = array(
@@ -4853,7 +2111,7 @@ $messages['su'] = array(
 	'pfunc_expr_division_by_zero' => 'Pambagi ku nol',
 );
 
-/** Swedish (Svenska)
+/** Swedish (svenska)
  * @author Ainali
  * @author Lejonel
  * @author Lokal Profil
@@ -4882,147 +2140,6 @@ $messages['sv'] = array(
 	'pfunc_expr_unknown_error' => 'Fel i uttryck: Okänt fel ($1)',
 	'pfunc_expr_not_a_number' => 'I $1: resultatet är inte ett tal',
 	'pfunc_string_too_long' => 'Fel: Strängen överskrider gränsen på $1 tecken',
-	'pfunc-convert-dimensionmismatch' => 'Fel: Kan inte konvertera mellan enheterna "$1" och "$2".',
-	'pfunc-convert-unknownunit' => 'Fel: Okänd enhet "$1".',
-	'pfunc-convert-unknowndimension' => 'Fel: Okänd dimension "$1".',
-	'pfunc-convert-dimension-length' => 'längd',
-	'pfunc-convert-dimension-area' => 'area',
-	'pfunc-convert-dimension-volume' => 'volym',
-	'pfunc-convert-dimension-time' => 'tid',
-	'pfunc-convert-dimension-timesquared' => 'tid <sup>2</sup>',
-	'pfunc-convert-dimension-mass' => 'massa',
-	'pfunc-convert-dimension-speed' => 'hastighet',
-	'pfunc-convert-dimension-temperature' => 'temperatur',
-	'pfunc-convert-dimension-acceleration' => 'acceleration',
-	'pfunc-convert-dimension-force' => 'kraft',
-	'pfunc-convert-dimension-torque' => 'vridmoment',
-	'pfunc-convert-dimension-energy' => 'energi',
-	'pfunc-convert-dimension-pressure' => 'tryck',
-	'pfunc-convert-dimension-density' => 'densitet',
-	'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{{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 (తెలుగు)
@@ -5047,7 +2164,7 @@ $messages['te'] = array(
 	'pfunc_expr_not_a_number' => '$1లో: వచ్చిన ఫలితం సంఖ్య కాదు',
 );
 
-/** Tajik (Cyrillic) (Тоҷикӣ (Cyrillic))
+/** Tajik (Cyrillic script) (тоҷикӣ)
  * @author Ibrahim
  */
 $messages['tg-cyrl'] = array(
@@ -5069,7 +2186,7 @@ $messages['tg-cyrl'] = array(
 	'pfunc_expr_not_a_number' => 'Дар $1: натиҷа адад нест',
 );
 
-/** Tajik (Latin) (Тоҷикӣ (Latin))
+/** Tajik (Latin script) (tojikī)
  * @author Liangent
  */
 $messages['tg-latn'] = array(
@@ -5189,7 +2306,7 @@ $messages['tr'] = array(
 	'pfunc_string_too_long' => 'Hata: Dize $1 karakter sınırını geçiyor',
 );
 
-/** Ukrainian (Українська)
+/** Ukrainian (українська)
  * @author AS
  * @author Ahonc
  */
@@ -5215,7 +2332,7 @@ $messages['uk'] = array(
 	'pfunc_string_too_long' => 'Помилка: довжина рядка перевищує межу в {{PLURAL:$1|$1 символ|$1 символи|$1 символів}}',
 );
 
-/** Vèneto (Vèneto)
+/** vèneto (vèneto)
  * @author Candalua
  */
 $messages['vec'] = array(
@@ -5240,7 +2357,7 @@ $messages['vec'] = array(
 	'pfunc_string_too_long' => 'Eròr: la stringa la va fora dal limite de {{PLURAL:$1|1 caràtere|$1 caràteri}}',
 );
 
-/** Veps (Vepsan kel')
+/** Veps (vepsän kel’)
  * @author Игорь Бродский
  */
 $messages['vep'] = array(
@@ -5272,196 +2389,6 @@ $messages['vi'] = array(
 	'pfunc_expr_unknown_error' => 'Lỗi biểu thức: Lỗi không rõ nguyên nhân ($1)',
 	'pfunc_expr_not_a_number' => 'Trong $1: kết quả không phải là kiểu số',
 	'pfunc_string_too_long' => 'Lỗi: Chuỗi vượt quá giới hạn $1 ký tự',
-	'pfunc-convert-dimensionmismatch' => 'Lỗi: Không thể chuyển đổi giữa các đơn vị “$1” và “$2”.',
-	'pfunc-convert-unknownunit' => 'Lỗi: Không hiểu đơn vị “$1”.',
-	'pfunc-convert-unknowndimension' => 'Lỗi: Không hiểu kích thước “$1”.',
-	'pfunc-convert-invalidcompoundunit' => 'Lỗi: Đơn vị ghép “$1” không hợp lệ.',
-	'pfunc-convert-nounit' => 'Lỗi: Không đưa vào đơn vị nguồn.',
-	'pfunc-convert-doublecompoundunit' => 'Lỗi: Không thể phân tích các đơn vị ghép đúp như “$1”.',
-	'pfunc-convert-dimension-length' => 'chiều dài',
-	'pfunc-convert-dimension-area' => 'diện tích',
-	'pfunc-convert-dimension-volume' => 'thể tích',
-	'pfunc-convert-dimension-time' => 'thời gian',
-	'pfunc-convert-dimension-timesquared' => 'thời gian²',
-	'pfunc-convert-dimension-mass' => 'khối lượng',
-	'pfunc-convert-dimension-speed' => 'tốc độ',
-	'pfunc-convert-dimension-temperature' => 'nhiệt độ',
-	'pfunc-convert-dimension-acceleration' => 'gia tốc',
-	'pfunc-convert-dimension-force' => 'lực lượng',
-	'pfunc-convert-dimension-torque' => 'mô men lực',
-	'pfunc-convert-dimension-energy' => 'năng lượng',
-	'pfunc-convert-dimension-power' => 'công suất',
-	'pfunc-convert-dimension-pressure' => 'áp suất',
-	'pfunc-convert-dimension-density' => 'mật độ',
-	'pfunc-convert-dimension-fuelefficiencypositive' => 'hiệu quả nhiên liệu dương',
-	'pfunc-convert-dimension-fuelefficiencynegative' => 'hiệu quả nhiên liệu âm',
-	'pfunc-convert-prefix-yotta' => 'yôta',
-	'pfunc-convert-prefix-zetta' => 'zêta',
-	'pfunc-convert-prefix-exa' => 'exa',
-	'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' => 'kilô',
-	'pfunc-convert-prefix-hecto' => 'hêctô',
-	'pfunc-convert-prefix-deca' => 'đềca',
-	'pfunc-convert-prefix-deci' => 'đêxi',
-	'pfunc-convert-prefix-centi' => 'xenti',
-	'pfunc-convert-prefix-milli' => 'mili',
-	'pfunc-convert-prefix-micro' => 'micrô',
-	'pfunc-convert-prefix-nano' => 'nanô',
-	'pfunc-convert-prefix-pico' => 'picô',
-	'pfunc-convert-prefix-femto' => 'femtô',
-	'pfunc-convert-prefix-atto' => 'atô',
-	'pfunc-convert-prefix-zepto' => 'zéptô',
-	'pfunc-convert-prefix-yocto' => 'yóctô',
-	'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)
@@ -5518,7 +2445,7 @@ $messages['yue'] = array(
 	'pfunc_expr_not_a_number' => '響 $1: 結果唔係數字',
 );
 
-/** Simplified Chinese (‪中文(简体)‬)
+/** Simplified Chinese (中文（简体）‎)
  * @author Hydra
  * @author Liangent
  * @author PhiLiP
@@ -5547,14 +2474,9 @@ $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 (‪中文(繁體)‬)
+/** Traditional Chinese (中文（繁體）‎)
  * @author Gaoxuewei
  * @author Liangent
  * @author Mark85296341
diff --git a/extensions/ParserFunctions/ParserFunctions.php b/extensions/ParserFunctions/ParserFunctions.php
index fc28ece8..ef2ad8d3 100644
--- a/extensions/ParserFunctions/ParserFunctions.php
+++ b/extensions/ParserFunctions/ParserFunctions.php
@@ -29,23 +29,6 @@ $wgPFStringLengthLimit = 1000;
  */
 $wgPFEnableStringFunctions = false;
 
-/**
- * Enable Convert parser for converting between units of measurement
- */
-$wgPFEnableConvert = false;
-
-/**
- * The language for 'en' is actually 'en-us', which insists on using non-canonical translations
- * of the SI base units ("meter" rather than "metre" and "liter" rather than "litre").  We
- * can avoid contaminatng dialects by internally mapping languages by default; this is
- * configurable so you can remove it if you like, or add other maps if that's useful.
- * Essentially, if your wiki's $wgContLang appears as a key in this array, the value is
- * what is used as the default language for {{#convert}} output.
- */
-$wgPFUnitLanguageVariants = array(
-   'en' => 'en-gb'
-);
-
 /** REGISTRATION */
 $wgExtensionCredits['parserhook'][] = array(
 	'path' => __FILE__,
@@ -58,14 +41,12 @@ $wgExtensionCredits['parserhook'][] = array(
 
 $wgAutoloadClasses['ExtParserFunctions'] = dirname( __FILE__ ) . '/ParserFunctions_body.php';
 $wgAutoloadClasses['ExprParser'] = dirname( __FILE__ ) . '/Expr.php';
-$wgAutoloadClasses['ConvertParser'] = dirname( __FILE__ ) . '/Convert.php';
 
 $wgExtensionMessagesFiles['ParserFunctions'] = dirname( __FILE__ ) . '/ParserFunctions.i18n.php';
 $wgExtensionMessagesFiles['ParserFunctionsMagic'] = dirname( __FILE__ ) . '/ParserFunctions.i18n.magic.php';
 
 $wgParserTestFiles[] = dirname( __FILE__ ) . "/funcsParserTests.txt";
 $wgParserTestFiles[] = dirname( __FILE__ ) . "/stringFunctionTests.txt";
-$wgParserTestFiles[] = dirname( __FILE__ ) . "/convertTests.txt";
 
 $wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
 
@@ -74,7 +55,7 @@ $wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
  * @return bool
  */
 function wfRegisterParserFunctions( $parser ) {
-	global $wgPFEnableStringFunctions, $wgPFEnableConvert;
+	global $wgPFEnableStringFunctions;
 
 	// These functions accept DOM-style arguments
 	$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
@@ -102,9 +83,5 @@ function wfRegisterParserFunctions( $parser ) {
 		$parser->setFunctionHook( 'urldecode', 'ExtParserFunctions::runUrlDecode' );
 	}
 
-	if( $wgPFEnableConvert ) {
-		$parser->setFunctionHook( 'convert', 'ExtParserFunctions::convert' );
-	}
-
 	return true;
 }
diff --git a/extensions/ParserFunctions/ParserFunctions_body.php b/extensions/ParserFunctions/ParserFunctions_body.php
index d68ed8b7..879b7a15 100644
--- a/extensions/ParserFunctions/ParserFunctions_body.php
+++ b/extensions/ParserFunctions/ParserFunctions_body.php
@@ -2,7 +2,6 @@
 
 class ExtParserFunctions {
 	static $mExprParser;
-	static $mConvertParser;
 	static $mTimeCache = array();
 	static $mTimeChars = 0;
 	static $mMaxTimeChars = 6000; # ~10 seconds
@@ -13,7 +12,6 @@ class ExtParserFunctions {
 	 */
 	public static function clearState( $parser ) {
 		self::$mTimeChars = 0;
-		$parser->pf_ifexist_breakdown = array();
 		$parser->pf_markerRegex = null;
 		return true;
 	}
@@ -305,7 +303,8 @@ class ExtParserFunctions {
 			if ( $current == '..' ) { // removing one level
 				if ( !count( $newExploded ) ) {
 					// attempted to access a node above root node
-					return '<strong class="error">' . wfMsgForContent( 'pfunc_rel2abs_invalid_depth', $fullPath ) . '</strong>';
+					$msg = wfMessage( 'pfunc_rel2abs_invalid_depth', $fullPath )->inContentLanguage()->escaped();
+					return '<strong class="error">' . $msg . '</strong>';
 				}
 				// remove last level from the stack
 				array_pop( $newExploded );
@@ -322,26 +321,6 @@ class ExtParserFunctions {
 	/**
 	 * @param $parser Parser
 	 * @param $frame PPFrame
-	 * @return bool
-	 */
-	public static function incrementIfexistCount( $parser, $frame ) {
-		// Don't let this be called more than a certain number of times. It tends to make the database explode.
-		global $wgExpensiveParserFunctionLimit;
-		self::registerClearHook();
-		$parser->mExpensiveFunctionCount++;
-		if ( $frame ) {
-			$pdbk = $frame->getPDBK( 1 );
-			if ( !isset( $parser->pf_ifexist_breakdown[$pdbk] ) ) {
-				$parser->pf_ifexist_breakdown[$pdbk] = 0;
-			}
-			$parser->pf_ifexist_breakdown[$pdbk] ++;
-		}
-		return $parser->mExpensiveFunctionCount <= $wgExpensiveParserFunctionLimit;
-	}
-
-	/**
-	 * @param $parser Parser
-	 * @param $frame PPFrame
 	 * @param $titletext string
 	 * @param $then string
 	 * @param $else string
@@ -357,7 +336,7 @@ class ExtParserFunctions {
 				/* If namespace is specified as NS_MEDIA, then we want to
 				 * check the physical file, not the "description" page.
 				 */
-				if ( !self::incrementIfexistCount( $parser, $frame ) ) {
+				if ( !$parser->incrementExpensiveFunctionCount() ) {
 					return $else;
 				}
 				$file = wfFindFile( $title );
@@ -372,7 +351,7 @@ class ExtParserFunctions {
 				 * since their existence can be checked without
 				 * accessing the database.
 				 */
-				return SpecialPage::exists( $title->getDBkey() ) ? $then : $else;
+				return SpecialPageFactory::exists( $title->getDBkey() ) ? $then : $else;
 			} elseif ( $title->isExternal() ) {
 				/* Can't check the existence of pages on other sites,
 				 * so just return $else.  Makes a sort of sense, since
@@ -381,7 +360,7 @@ class ExtParserFunctions {
 				return $else;
 			} else {
 				$pdbk = $title->getPrefixedDBkey();
-				if ( !self::incrementIfexistCount( $parser, $frame ) ) {
+				if ( !$parser->incrementExpensiveFunctionCount() ) {
 					return $else;
 				}
 				$lc = LinkCache::singleton();
@@ -435,7 +414,8 @@ class ExtParserFunctions {
 		self::registerClearHook();
 		if ( $date === '' ) {
 			$cacheKey = $parser->getOptions()->getTimestamp();
-			$date = wfTimestamp( TS_ISO_8601, $cacheKey );
+			$timestamp = new MWTimestamp( $cacheKey );
+			$date = $timestamp->getTimestamp( TS_ISO_8601 );
 		} else {
 			$cacheKey = $date;
 		}
@@ -485,11 +465,11 @@ class ExtParserFunctions {
 
 		# format the timestamp and return the result
 		if ( $invalidTime ) {
-			$result = '<strong class="error">' . wfMsgForContent( 'pfunc_time_error' ) . '</strong>';
+			$result = '<strong class="error">' . wfMessage( 'pfunc_time_error' )->inContentLanguage()->escaped() . '</strong>';
 		} else {
 			self::$mTimeChars += strlen( $format );
 			if ( self::$mTimeChars > self::$mMaxTimeChars ) {
-				return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>';
+				return '<strong class="error">' . wfMessage( 'pfunc_time_too_long' )->inContentLanguage()->escaped() . '</strong>';
 			} else {
 				if ( $ts < 100000000000000 ) { // Language can't deal with years after 9999
 					if ( $language !== '' && Language::isValidBuiltInCode( $language ) ) {
@@ -501,7 +481,7 @@ class ExtParserFunctions {
 						$result = $parser->getFunctionLang()->sprintfDate( $format, $ts );
 					}
 				} else {
-					return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_big' ) . '</strong>';
+					return '<strong class="error">' . wfMessage( 'pfunc_time_too_big' )->inContentLanguage()->escaped() . '</strong>';
 				}
 			}
 		}
@@ -524,7 +504,7 @@ class ExtParserFunctions {
 	 * Obtain a specified number of slash-separated parts of a title,
 	 * e.g. {{#titleparts:Hello/World|1}} => "Hello"
 	 *
-	 * @param $parser Parent parser
+	 * @param $parser Parser Parent parser
 	 * @param $title string Title to split
 	 * @param $parts int Number of parts to keep
 	 * @param $offset int Offset starting at 1
@@ -554,29 +534,6 @@ class ExtParserFunctions {
 	}
 
 	/**
-	 * Get a ConvertParser object
-	 * @return ConvertParser
-	 */
-	protected static function &getConvertParser() {
-		if ( !isset( self::$mConvertParser ) ) {
-			self::$mConvertParser = new ConvertParser;
-		}
-		return self::$mConvertParser;
-	}
-
-	/**
-	 * @return string
-	 */
-	public static function convert( /*...*/ ) {
-		try {
-			$args = func_get_args();
-			return self::getConvertParser()->execute( $args );
-		} catch ( ConvertError $e ) {
-			return $e->getMessage();
-		}
-	}
-
-	/**
 	 *  Verifies parameter is less than max string length.
 	 * @param $text
 	 * @return bool
@@ -591,12 +548,9 @@ class ExtParserFunctions {
 	 * @return string
 	 */
 	private static function tooLongError() {
-		global $wgPFStringLengthLimit, $wgContLang;
-		return '<strong class="error">' .
-			wfMsgExt( 'pfunc_string_too_long',
-				array( 'escape', 'parsemag', 'content' ),
-				$wgContLang->formatNum( $wgPFStringLengthLimit ) ) .
-			'</strong>';
+		global $wgPFStringLengthLimit;
+		$msg = wfMessage( 'pfunc_string_too_long' )->numParams( $wgPFStringLengthLimit );
+		return '<strong class="error">' . $msg->inContentLanguage()->escaped() . '</strong>';
 	}
 
 	/**
@@ -626,7 +580,7 @@ class ExtParserFunctions {
 	 * Note: If the needle is not found, empty string is returned.
 	 * @param $parser Parser
 	 * @param $inStr string
-	 * @param $inNeedle int
+	 * @param $inNeedle int|string
 	 * @param $inOffset int
 	 * @return int|string
 	 */
@@ -660,7 +614,7 @@ class ExtParserFunctions {
 	 * Note: If the needle is not found, -1 is returned.
 	 * @param $parser Parser
 	 * @param $inStr string
-	 * @param $inNeedle int
+	 * @param $inNeedle int|string
 	 * @return int|string
 	 */
 	public static function runRPos ( $parser, $inStr = '', $inNeedle = '' ) {
diff --git a/extensions/ParserFunctions/convertTests.txt b/extensions/ParserFunctions/convertTests.txt
deleted file mode 100644
index b9d84f31..00000000
--- a/extensions/ParserFunctions/convertTests.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-!! functionhooks
-convert
-!! endfunctionhooks
-
-!! test
-Simple conversion
-!! input
-{{#convert: 10 m | km }}
-!!result
-<p>0.01 kilometres
-</p>
-!! end
-
-!! test
-Position and formatting of numbers and units
-!! input
-*{{#convert: 10  m | km }}
-*{{#convert: 10m | km }}
-*{{#convert: 10 km | m }}
-*{{#convert: 10-km | m }}
-*{{#convert: 10E2 km | m }}
-*{{#convert: 10E-2 km | m }}
-*{{#convert: 10.0E2 km | m }}
-*{{#convert: 10.0E2.5 km | m }}
-!! result
-<ul><li>0.01  kilometres
-</li><li>0.01kilometres
-</li><li>10,000 metres
-</li><li>10,000-metres
-</li><li>1,000,000 metres
-</li><li>100 metres
-</li><li>1,000,000 metres
-</li><li>1,000,000.5,000 metres
-</li></ul>
-
-!! end
-
-!! test
-Precision 1
-!! input
-*{{#convert: 10 m | km }}
-*{{#convert: 11 m | km }}
-*{{#convert: 12 m | km }}
-*{{#convert: 13 m | km }}
-*{{#convert: 14 m | km }}
-*{{#convert: 15 m | km }}
-*{{#convert: 16 m | km }}
-*{{#convert: 17 m | km }}
-*{{#convert: 18 m | km }}
-*{{#convert: 19 m | km }}
-*{{#convert: 20 m | km }}
-!! result
-<ul><li>0.01 kilometres
-</li><li>0.011 kilometres
-</li><li>0.012 kilometres
-</li><li>0.013 kilometres
-</li><li>0.014 kilometres
-</li><li>0.015 kilometres
-</li><li>0.016 kilometres
-</li><li>0.017 kilometres
-</li><li>0.018 kilometres
-</li><li>0.019 kilometres
-</li><li>0.02 kilometres
-</li></ul>
-
-!! end
-
-!! test
-Precision 2
-!! input
-*{{#convert: 10.0 m | km }}
-*{{#convert: 10.1 m | km }}
-*{{#convert: 10.2 m | km }}
-*{{#convert: 10.3 m | km }}
-*{{#convert: 10.4 m | km }}
-*{{#convert: 10.5 m | km }}
-*{{#convert: 10.6 m | km }}
-*{{#convert: 10.7 m | km }}
-!! result
-<ul><li>0.0100 kilometres
-</li><li>0.0101 kilometres
-</li><li>0.0102 kilometres
-</li><li>0.0103 kilometres
-</li><li>0.0104 kilometres
-</li><li>0.0105 kilometres
-</li><li>0.0106 kilometres
-</li><li>0.0107 kilometres
-</li></ul>
-
-!! end
-
-!! test
-String interpolation
-!! input
-{{#convert: 25, 26, 27, 28, 29, and 30 km }}
-!! result
-<p>25,000, 26,000, 27,000, 28,000, 29,000, and 30,000 metres
-</p>
-!! end
-
-!! test
-Precision 3
-!! input
-{{#convert: 25, 26, 27, 28, 29, and 30 miles }}
-!! result
-<p>40,000, 42,000, 43,000, 45,000, 47,000, and 50,000 metres
-</p>
-!! end
-
-!! test
-Precision 4
-!! input
-{{#convert:35000, 35E3, 35.0E3, 350E2, 3.500E4, 35000E0, 350000E-1 m | km }}
-!! result
-<p>35, 35, 35.0, 35, 35.00, 35, 35 kilometres
-</p>
-!! end
-
-!! test
-#sourceunit
-!!input
-*{{#convert: 25 | #sourceunit = km }}
-*{{#convert: 25 | #sourceunit=km }}
-*{{#convert: 25 | #sourceunit = km | #sourceunit = mm }}
-*{{#convert: 25 | #sourceunit = km | cm }}
-!! result
-<ul><li>25,000 metres
-</li><li>25,000 metres
-</li><li>0.025 metres
-</li><li>2,500,000 centimetres
-</li></ul>
-
-!! end
-
-!! test
-Precision overrides
-!!input
-*{{#convert: 1 mi | #dp = 0 }}
-*{{#convert: 1 mi | #dp=1 }}
-*{{#convert: 1 mi | #dp = -2 }}
-*{{#convert: 1 mi | #dp = 5 }}
-*{{#convert: 1 mi | #dp = -8 }}
-*{{#convert: 1 mi | #sf = 0 }}
-*{{#convert: 1 mi | #sf=1 }}
-*{{#convert: 1 mi | #sf = 3 }}
-*{{#convert: 1 mi | #sf = 5 }}
-*{{#convert: 1 mi | #sf = -8 }}
-!! result
-<ul><li>1,609 metres
-</li><li>1,609.3 metres
-</li><li>1,600 metres
-</li><li>1,609.344 metres
-</li><li>0 metres
-</li><li>2,000 metres
-</li><li>2,000 metres
-</li><li>1,610 metres
-</li><li>1,609.3 metres
-</li><li>2,000 metres
-</li></ul>
-
-!! end
-
-
-!! test
-Errors
-!! input
-*{{#convert: 25 | km }}
-*{{#convert: 25 foobars | mi }}
-*{{#convert: 25 mi | #sourceunit = foobar }}
-*{{#convert: 25 km | s }}
-*{{#convert: 25 km/Pa | m/Pa }}
-*{{#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>
-</li></ul>
-
-!! end
-
-
-!! test
-#sourceunit = #targetunit
-!! input
-*{{#convert: 25 km | #targetunit = #sourceunit }}
-*{{#convert: 25 km | #sourceunit = #targetunit }}
-!! result
-<ul><li>25 kilometres
-</li><li>25 kilometres
-</li></ul>
-
-!! end
-
-!! test
-#language
-!! input
-*{{#convert: 10  m | km | #language=en-gb }}
-*{{#convert: 10m | km | #language = en }}
-*{{#convert: 10 km | m |#language=en}}
-*{{#convert: 10 Pa | mmHg | #language = fr }}
-!! result
-<ul><li>0.01  kilometres
-</li><li>0.01kilometers
-</li><li>10,000 meters
-</li><li>0.1 millimètre de mercure
-</li></ul>
-
-!! end
-
-!! test
-Case sensitivity
-!! input
-*{{#convert: 10 mm | m }}
-*{{#convert: 10 Mm | m }}
-*{{#convert: 10 km | Mm }}
-*{{#convert: 10 Pa | mmHg }}
-*{{#convert: 10 pa | mmHg  }}
-!! result
-<ul><li>0.01 metres
-</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></ul>
-
-!! end