Update to MediaWiki 1.18.3

9 files changed, 2789 insertions, 1723 deletions

diff --git a/extensions/ParserFunctions/Convert.php b/extensions/ParserFunctions/Convert.php
index 2ae54d19..cdfd2232 100644
--- a/extensions/ParserFunctions/Convert.php
+++ b/extensions/ParserFunctions/Convert.php
@@ -54,6 +54,8 @@ class ConvertParser {
 	# The last value converted, which will be used for PLURAL evaluation
 	protected $lastValue;
 
+	protected $precision;
+
 	/**
 	 * Reset the parser so it isn't contaminated by the results of previous parses
 	 */
@@ -182,6 +184,19 @@ class ConvertParser {
 			);
 		}
 
+		# If the Language hasn't been deliberately specified, get it from the wiki's
+		# content language, but run it through a configurable map first
+		if( $this->language === true ){
+			global $wgContLang, $wgPFUnitLanguageVariants;
+			$code = $wgContLang->getCode();
+			if( isset( $wgPFUnitLanguageVariants[$code] ) ){
+				$this->language = Language::factory( $wgPFUnitLanguageVariants[$code] );
+			} else {
+				# Ok, actually *do* use $wgContLang
+				$this->language = true;
+			}
+		}
+
 		return $this->processString( $string );
 	}
 
@@ -217,13 +232,13 @@ class ConvertParser {
 		if( $this->raw ){
 			return trim( $string );
 		} else {
-			$unit = $this->targetUnit->getText(
+			return $this->targetUnit->getText(
+				$string,
 				$this->lastValue,
 				$this->link,
 				$this->abbreviate,
 				$this->language
 			);
-			return  $string . $unit;
 		}
 	}
 
@@ -791,13 +806,14 @@ class ConvertUnit {
 
 	/**
 	 * Get the text of the unit
+	 * @param $string String Original text, with the number converted
 	 * @param $value String number for PLURAL support
 	 * @param $link Bool
 	 * @param $abbreviate Bool
 	 * @param $language Language
 	 * @return String
 	 */
-	public function getText( $value, $link=false, $abbreviate=false, $language=null ){
+	public function getText( $string, $value, $link=false, $abbreviate=false, $language=null ){
 		global $wgContLang;
 		$value = $wgContLang->formatNum( $value );
 
@@ -806,7 +822,7 @@ class ConvertUnit {
 				$this->dimension->getName(),
 				$this->unitName,
 				$this->prefix,
-				$value, $link, $abbreviate, $language
+				$string, $value, $link, $abbreviate, $language
 			);
 
 		} elseif( !wfEmptyMsg( "pfunc-convert-unit-{$this->dimension->getName(true)}-{$this->unitName[0]}-{$this->unitName[1]}" ) ){
@@ -817,7 +833,7 @@ class ConvertUnit {
 				$this->dimension->getName(true),
 				"{$this->unitName[0]}-{$this->unitName[1]}",
 				$this->prefix, # This will probably be rubbish, but it's the wiki users' problem, not ours
-				$value, $link, $abbreviate, $language
+				$string, $value, $link, $abbreviate, $language
 			);
 
 		} else {
@@ -826,12 +842,13 @@ class ConvertUnit {
 				$dimensionNames[0],
 				$this->unitName[0],
 				$this->prefix[0],
-				$value, $link, $abbreviate, $language
+				$string, $value, $link, $abbreviate, $language
 			);
 			$msg2Text = $this->getTextFromMessage(
 				$dimensionNames[1],
 				$this->unitName[1],
 				$this->prefix[1],
+				'',
 				1, # Singular for denominator
 				$link, $abbreviate, $language
 			);
@@ -862,6 +879,7 @@ class ConvertUnit {
 		$text = wfMsgExt(
 			"pfunc-convert-unit-$dimension-$unit$abbr",
 			array( 'parsemag', 'language' => $language ),
+			$string,
 			$number,
 			$prefix
 		);
diff --git a/extensions/ParserFunctions/Expr.php b/extensions/ParserFunctions/Expr.php
index 299d382d..ee646021 100644
--- a/extensions/ParserFunctions/Expr.php
+++ b/extensions/ParserFunctions/Expr.php
@@ -157,6 +157,8 @@ class ExprParser {
 	 * The algorithm here is based on the infix to RPN algorithm given in
 	 * http://montcs.bloomu.edu/~bobmon/Information/RPN/infix2rpn.shtml
 	 * It's essentially the same as Dijkstra's shunting yard algorithm.
+	 * @param $expr string
+	 * @return string
 	 */
 	function doExpression( $expr ) {
 		$operands = array();
@@ -371,181 +373,260 @@ class ExprParser {
 		return implode( "<br />\n", $operands );
 	}
 
+	/**
+	 * @param $op int
+	 * @param $stack array
+	 * @throws ExprError
+	 */
 	function doOperation( $op, &$stack ) {
 		switch ( $op ) {
 			case EXPR_NEGATIVE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = -$arg;
 				break;
 			case EXPR_POSITIVE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				break;
 			case EXPR_TIMES:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left * $right;
 					break;
 			case EXPR_DIVIDE:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
-				if ( $right == 0 ) throw new ExprError( 'division_by_zero', $this->names[$op] );
+				if ( $right == 0 ) {
+					throw new ExprError( 'division_by_zero', $this->names[$op] );
+				}
 				$stack[] = $left / $right;
 				break;
 			case EXPR_MOD:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
-				if ( $right == 0 ) throw new ExprError( 'division_by_zero', $this->names[$op] );
+				if ( $right == 0 ) {
+					throw new ExprError( 'division_by_zero', $this->names[$op] );
+				}
 				$stack[] = $left % $right;
 				break;
 			case EXPR_PLUS:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left + $right;
 				break;
 			case EXPR_MINUS:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left - $right;
 				break;
 			case EXPR_AND:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left && $right ) ? 1 : 0;
 				break;
 			case EXPR_OR:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left || $right ) ? 1 : 0;
 				break;
 			case EXPR_EQUALITY:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left == $right ) ? 1 : 0;
 				break;
 			case EXPR_NOT:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = ( !$arg ) ? 1 : 0;
 				break;
 			case EXPR_ROUND:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$digits = intval( array_pop( $stack ) );
 				$value = array_pop( $stack );
 				$stack[] = round( $value, $digits );
 				break;
 			case EXPR_LESS:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left < $right ) ? 1 : 0;
 				break;
 			case EXPR_GREATER:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left > $right ) ? 1 : 0;
 				break;
 			case EXPR_LESSEQ:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left <= $right ) ? 1 : 0;
 				break;
 			case EXPR_GREATEREQ:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left >= $right ) ? 1 : 0;
 				break;
 			case EXPR_NOTEQ:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = ( $left != $right ) ? 1 : 0;
 				break;
 			case EXPR_EXPONENT:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
 				$stack[] = $left * pow( 10, $right );
 				break;
 			case EXPR_SINE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = sin( $arg );
 				break;
 			case EXPR_COSINE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = cos( $arg );
 				break;
 			case EXPR_TANGENS:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = tan( $arg );
 				break;
 			case EXPR_ARCSINE:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
-				if ( $arg < -1 || $arg > 1 ) throw new ExprError( 'invalid_argument', $this->names[$op] );
+				if ( $arg < -1 || $arg > 1 ) {
+					throw new ExprError( 'invalid_argument', $this->names[$op] );
+				}
 				$stack[] = asin( $arg );
 				break;
 			case EXPR_ARCCOS:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
-				if ( $arg < -1 || $arg > 1 ) throw new ExprError( 'invalid_argument', $this->names[$op] );
+				if ( $arg < -1 || $arg > 1 ) {
+					throw new ExprError( 'invalid_argument', $this->names[$op] );
+				}
 				$stack[] = acos( $arg );
 				break;
 			case EXPR_ARCTAN:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = atan( $arg );
 				break;
 			case EXPR_EXP:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = exp( $arg );
 				break;
 			case EXPR_LN:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
-				if ( $arg <= 0 ) throw new ExprError( 'invalid_argument_ln', $this->names[$op] );
+				if ( $arg <= 0 ) {
+					throw new ExprError( 'invalid_argument_ln', $this->names[$op] );
+				}
 				$stack[] = log( $arg );
 				break;
 			case EXPR_ABS:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = abs( $arg );
 				break;
 			case EXPR_FLOOR:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = floor( $arg );
 				break;
 			case EXPR_TRUNC:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = (int)$arg;
 				break;
 			case EXPR_CEIL:
-				if ( count( $stack ) < 1 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 1 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$arg = array_pop( $stack );
 				$stack[] = ceil( $arg );
 				break;
 			case EXPR_POW:
-				if ( count( $stack ) < 2 ) throw new ExprError( 'missing_operand', $this->names[$op] );
+				if ( count( $stack ) < 2 ) {
+					throw new ExprError( 'missing_operand', $this->names[$op] );
+				}
 				$right = array_pop( $stack );
 				$left = array_pop( $stack );
-				if ( false === ( $stack[] = pow( $left, $right ) ) ) throw new ExprError( 'division_by_zero', $this->names[$op] );
+				if ( false === ( $stack[] = pow( $left, $right ) ) ) {
+					throw new ExprError( 'division_by_zero', $this->names[$op] );
+				}
 				break;
 			default:
 				// Should be impossible to reach here.
diff --git a/extensions/ParserFunctions/ParserFunctions.i18n.magic.php b/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
index 78ba7747..0dda0911 100644
--- a/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
+++ b/extensions/ParserFunctions/ParserFunctions.i18n.magic.php
@@ -246,7 +246,7 @@ $magicWords['ig'] = array(
 
 /** Italian (Italiano) */
 $magicWords['it'] = array(
-	'ifexist' => array( 0, 'ifexists' ),
+	'ifexist' => array( 0, 'ifexist' ),
 	'language' => array( 0, '#LINGUA' ),
 );
 
diff --git a/extensions/ParserFunctions/ParserFunctions.i18n.php b/extensions/ParserFunctions/ParserFunctions.i18n.php
index 1fa3892d..2e8c8ad4 100644
--- a/extensions/ParserFunctions/ParserFunctions.i18n.php
+++ b/extensions/ParserFunctions/ParserFunctions.i18n.php
@@ -10,31 +10,31 @@ $messages = array();
 
 $messages['en'] = array(
 	'pfunc_desc'                            => 'Enhance parser with logical functions',
-	'pfunc_time_error'                      => 'Error: invalid time',
-	'pfunc_time_too_long'                   => 'Error: too many #time calls',
-	'pfunc_time_too_big'                    => 'Error: #time only supports years up to 9999',
-	'pfunc_rel2abs_invalid_depth'           => 'Error: Invalid depth in path: "$1" (tried to access a node above the root node)',
-	'pfunc_expr_stack_exhausted'            => 'Expression error: Stack exhausted',
-	'pfunc_expr_unexpected_number'          => 'Expression error: Unexpected number',
-	'pfunc_expr_preg_match_failure'         => 'Expression error: Unexpected preg_match failure',
-	'pfunc_expr_unrecognised_word'          => 'Expression error: Unrecognised word "$1"',
-	'pfunc_expr_unexpected_operator'        => 'Expression error: Unexpected $1 operator',
-	'pfunc_expr_missing_operand'            => 'Expression error: Missing operand for $1',
-	'pfunc_expr_unexpected_closing_bracket' => 'Expression error: Unexpected closing bracket',
-	'pfunc_expr_unrecognised_punctuation'   => 'Expression error: Unrecognised punctuation character "$1"',
-	'pfunc_expr_unclosed_bracket'           => 'Expression error: Unclosed bracket',
-	'pfunc_expr_division_by_zero'           => 'Division by zero',
-	'pfunc_expr_invalid_argument'           => 'Invalid argument for $1: < -1 or > 1',
-	'pfunc_expr_invalid_argument_ln'        => 'Invalid argument for ln: <= 0',
-	'pfunc_expr_unknown_error'              => 'Expression error: Unknown error ($1)',
-	'pfunc_expr_not_a_number'               => 'In $1: result is not a number',
-	'pfunc_string_too_long'                 => 'Error: string exceeds $1 character limit',
-	'pfunc-convert-dimensionmismatch'       => 'Error: cannot convert between units of "$1" and "$2"',
-	'pfunc-convert-unknownunit'             => 'Error: unknown unit "$1"',
-	'pfunc-convert-unknowndimension'        => 'Error: unknown dimension "$1"',
-	'pfunc-convert-invalidcompoundunit'     => 'Error: invalid compound unit "$1"',
-	'pfunc-convert-nounit'                  => 'Error: no source unit given',
-	'pfunc-convert-doublecompoundunit'      => 'Error: cannot parse double compound units like "$1"',
+	'pfunc_time_error'                      => 'Error: Invalid time.',
+	'pfunc_time_too_long'                   => 'Error: Too many #time calls.',
+	'pfunc_time_too_big'                    => 'Error: #time only supports years up to 9999.',
+	'pfunc_rel2abs_invalid_depth'           => 'Error: Invalid depth in path: "$1" (tried to access a node above the root node).',
+	'pfunc_expr_stack_exhausted'            => 'Expression error: Stack exhausted.',
+	'pfunc_expr_unexpected_number'          => 'Expression error: Unexpected number.',
+	'pfunc_expr_preg_match_failure'         => 'Expression error: Unexpected preg_match failure.',
+	'pfunc_expr_unrecognised_word'          => 'Expression error: Unrecognised word "$1".',
+	'pfunc_expr_unexpected_operator'        => 'Expression error: Unexpected $1 operator.',
+	'pfunc_expr_missing_operand'            => 'Expression error: Missing operand for $1.',
+	'pfunc_expr_unexpected_closing_bracket' => 'Expression error: Unexpected closing bracket.',
+	'pfunc_expr_unrecognised_punctuation'   => 'Expression error: Unrecognised punctuation character "$1".',
+	'pfunc_expr_unclosed_bracket'           => 'Expression error: Unclosed bracket.',
+	'pfunc_expr_division_by_zero'           => 'Division by zero.',
+	'pfunc_expr_invalid_argument'           => 'Invalid argument for $1: < -1 or > 1.',
+	'pfunc_expr_invalid_argument_ln'        => 'Invalid argument for ln: <= 0.',
+	'pfunc_expr_unknown_error'              => 'Expression error: Unknown error ($1).',
+	'pfunc_expr_not_a_number'               => 'In $1: Result is not a number.',
+	'pfunc_string_too_long'                 => 'Error: String exceeds $1 character limit.',
+	'pfunc-convert-dimensionmismatch'       => 'Error: Cannot convert between units of "$1" and "$2".',
+	'pfunc-convert-unknownunit'             => 'Error: Unknown unit "$1".',
+	'pfunc-convert-unknowndimension'        => 'Error: Unknown dimension "$1".',
+	'pfunc-convert-invalidcompoundunit'     => 'Error: Invalid compound unit "$1".',
+	'pfunc-convert-nounit'                  => 'Error: No source unit given.',
+	'pfunc-convert-doublecompoundunit'      => 'Error: Cannot parse double compound units like "$1".',
 
 	# DIMENSION NAMES
 	'pfunc-convert-dimension-length'                 => 'length',
@@ -100,175 +100,176 @@ $messages['en'] = array(
 	'pfunc-convert-prefix-yocto-abbr' => 'y',
 
 	# LENGTH
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2meter|$2meters}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstroms}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|mile|miles}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlongs}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|chain|chains}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|rod|rods}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|fathom|fathoms}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yard|yards}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|foot|feet}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|hand|hands}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|inch|inches}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|nautical mile|nautical miles}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|nautical mile (pre-1970 British)|nautical miles (pre-1970 British)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|nautical mile (pre-1954 US)|nautical miles (pre-1954 US)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsec|$2parsecs}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2lightyear|$2lightyears}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomical unit|astronomical units}}',
-
-	'pfunc-convert-unit-length-metre-abbr' => '$2m',
-	'pfunc-convert-unit-length-angstrom-abbr' => 'Å',
-	'pfunc-convert-unit-length-mile-abbr' => 'mi',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fathom',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Brit)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (pre-1954 US)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2ly',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AU',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3meter|$3meters}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstroms}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mile|miles}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chain|chains}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|rod|rods}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|fathom|fathoms}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|foot|feet}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|hand|hands}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|inch|inches}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautical mile|nautical miles}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|nautical mile (pre-1970 British)|nautical miles (pre-1970 British)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|nautical mile (pre-1954 US)|nautical miles (pre-1954 US)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3lightyear|$3lightyears}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomical unit|astronomical units}}',
+
+	'pfunc-convert-unit-length-metre-abbr' => '$1$3m',
+	'pfunc-convert-unit-length-angstrom-abbr' => '$1Å',
+	'pfunc-convert-unit-length-mile-abbr' => '$1mi',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fathom',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (pre-1954 US)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
 
 	# AREA #
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|square kilometer|square kilometers}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|square meter|square meters}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|square centimeter|square centimeters}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|square millimeter|square millimeters}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hectare|hectares}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|square mile|square miles}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|acre|acres}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|square yard|square yards}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|square foot|square feet}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|square inch|square inches}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|square nautical mile|square nautical miles}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunams}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'sq mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'acre',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'sq yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'sq ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'sq in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'sq nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|square kilometer|square kilometers}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|square meter|square meters}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|square centimeter|square centimeters}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|square millimeter|square millimeters}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectare|hectares}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|square mile|square miles}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|acre|acres}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|square yard|square yards}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|square foot|square feet}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|square inch|square inches}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|square nautical mile|square nautical miles}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunams}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1sq mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1sq yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1sq ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1sq in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sq nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
 
 	# TIME #
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|second|seconds}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2year|$2years}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|day|days}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|hour|hours}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minute|minutes}}',
-
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2yr',
-	'pfunc-convert-unit-time-day-abbr' => 'day',
-	'pfunc-convert-unit-time-hour-abbr' => 'hr',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|second|seconds}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3year|$3years}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|day|days}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|hour|hours}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minute|minutes}}',
+
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3yr',
+	'pfunc-convert-unit-time-day-abbr' => '$1day',
+	'pfunc-convert-unit-time-hour-abbr' => '$1hr',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
 	
 	# VOLUME #
-	'pfunc-convert-unit-volume-cubicmetre'      => '{{PLURAL:$1|cubic meter|cubic meters}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|cubic centimeter|cubic centimeters}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|cubic millimeter|cubic millimeters}}',
-	'pfunc-convert-unit-volume-kilolitre'       => '{{PLURAL:$1|kiloliter|kiloliters}}',
-	'pfunc-convert-unit-volume-litre'           => '{{PLURAL:$1|liter|liters}}',
-	'pfunc-convert-unit-volume-centilitre'      => '{{PLURAL:$1|centiliter|centiliters}}',
-	'pfunc-convert-unit-volume-millilitre'      => '{{PLURAL:$1|milliliter|milliliters}}',
-	'pfunc-convert-unit-volume-cubicyard'       => '{{PLURAL:$1|cubic yard|cubic yards}}',
-	'pfunc-convert-unit-volume-cubicfoot'       => '{{PLURAL:$1|cubic foot|cubic feet}}',
-	'pfunc-convert-unit-volume-cubicinch'       => '{{PLURAL:$1|cubic inch|cubic inches}}',
-	'pfunc-convert-unit-volume-barrel'          => '{{PLURAL:$1|barrel|barrels}}',
-	'pfunc-convert-unit-volume-bushel'          => '{{PLURAL:$1|bushel|bushels}}',
-	'pfunc-convert-unit-volume-gallon'          => '{{PLURAL:$1|gallon|gallons}}',
-	'pfunc-convert-unit-volume-quart'           => '{{PLURAL:$1|quart|quarts}}',
-	'pfunc-convert-unit-volume-pint'            => '{{PLURAL:$1|pint|pints}}',
-	'pfunc-convert-unit-volume-fluidounce'      => '{{PLURAL:$1|fluid ounce|fluid ounces}}',
-	'pfunc-convert-unit-volume-barrelus'        => '{{PLURAL:$1|US barrel|US barrels}}',
-	'pfunc-convert-unit-volume-barreloil'       => '{{PLURAL:$1|barrel|barrel}}',
-	'pfunc-convert-unit-volume-barrelbeer'      => '{{PLURAL:$1|barrel|barrel}}',
-	'pfunc-convert-unit-volume-usgallon'        => '{{PLURAL:$1|US gallon|US gallons}}',
-	'pfunc-convert-unit-volume-usquart'         => '{{PLURAL:$1|US quart|US quarts}}',
-	'pfunc-convert-unit-volume-uspint'          => '{{PLURAL:$1|US pint|US pints}}',
-	'pfunc-convert-unit-volume-usfluidounce'    => '{{PLURAL:$1|US fluid ounce|US fluid ounces}}',
-	'pfunc-convert-unit-volume-usdrybarrel'     => '{{PLURAL:$1|US dry barrel|US dry barrels}}',
-	'pfunc-convert-unit-volume-usbushel'        => '{{PLURAL:$1|US bushel|US bushels}}',
-	'pfunc-convert-unit-volume-usdrygallon'     => '{{PLURAL:$1|US dry gallon|US dry gallons}}',
-	'pfunc-convert-unit-volume-usdryquart'      => '{{PLURAL:$1|US dry quart|US dry quarts}}',
-	'pfunc-convert-unit-volume-usdrypint'       => '{{PLURAL:$1|US dry pint|US dry pints}}',
-
-	'pfunc-convert-unit-volume-cubicmetre-abbr'      => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr'           => '$2l',
-	'pfunc-convert-unit-volume-cubicyard-abbr'       => 'cu yd',
-	'pfunc-convert-unit-volume-cubicfoot-abbr'       => 'cu ft',
-	'pfunc-convert-unit-volume-cubicinch-abbr'       => 'cu in',
-	'pfunc-convert-unit-volume-barrel-abbr'          => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr'          => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr'          => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr'           => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr'            => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr'      => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr'        => 'US bbl',
-	'pfunc-convert-unit-volume-barreloil-abbr'       => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr'      => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr'        => 'US gal',
-	'pfunc-convert-unit-volume-usquart-abbr'         => 'US qt',
-	'pfunc-convert-unit-volume-uspint-abbr'          => 'US pt',
-	'pfunc-convert-unit-volume-usfluidounce-abbr'    => 'US fl oz',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr'     => 'US bbl',
-	'pfunc-convert-unit-volume-usbushel-abbr'        => 'US bsh',
-	'pfunc-convert-unit-volume-usdrygallon-abbr'     => 'US dry gal',
-	'pfunc-convert-unit-volume-usdryquart-abbr'      => 'US dry qt',
-	'pfunc-convert-unit-volume-usdrypint-abbr'       => 'US dry pt',
+	'pfunc-convert-unit-volume-cubicmetre'      => '$1{{PLURAL:$2|cubic meter|cubic meters}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|cubic centimeter|cubic centimeters}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|cubic millimeter|cubic millimeters}}',
+	'pfunc-convert-unit-volume-kilolitre'       => '$1{{PLURAL:$2|kiloliter|kiloliters}}',
+	'pfunc-convert-unit-volume-litre'           => '$1{{PLURAL:$2|liter|liters}}',
+	'pfunc-convert-unit-volume-centilitre'      => '$1{{PLURAL:$2|centiliter|centiliters}}',
+	'pfunc-convert-unit-volume-millilitre'      => '$1{{PLURAL:$2|milliliter|milliliters}}',
+	'pfunc-convert-unit-volume-cubicyard'       => '$1{{PLURAL:$2|cubic yard|cubic yards}}',
+	'pfunc-convert-unit-volume-cubicfoot'       => '$1{{PLURAL:$2|cubic foot|cubic feet}}',
+	'pfunc-convert-unit-volume-cubicinch'       => '$1{{PLURAL:$2|cubic inch|cubic inches}}',
+	'pfunc-convert-unit-volume-barrel'          => '$1{{PLURAL:$2|barrel|barrels}}',
+	'pfunc-convert-unit-volume-bushel'          => '$1{{PLURAL:$2|bushel|bushels}}',
+	'pfunc-convert-unit-volume-gallon'          => '$1{{PLURAL:$2|gallon|gallons}}',
+	'pfunc-convert-unit-volume-quart'           => '$1{{PLURAL:$2|quart|quarts}}',
+	'pfunc-convert-unit-volume-pint'            => '$1{{PLURAL:$2|pint|pints}}',
+	'pfunc-convert-unit-volume-fluidounce'      => '$1{{PLURAL:$2|fluid ounce|fluid ounces}}',
+	'pfunc-convert-unit-volume-barrelus'        => '$1{{PLURAL:$2|US barrel|US barrels}}',
+	'pfunc-convert-unit-volume-barreloil'       => '$1{{PLURAL:$2|barrel|barrel}}',
+	'pfunc-convert-unit-volume-barrelbeer'      => '$1{{PLURAL:$2|barrel|barrel}}',
+	'pfunc-convert-unit-volume-usgallon'        => '$1{{PLURAL:$2|US gallon|US gallons}}',
+	'pfunc-convert-unit-volume-usquart'         => '$1{{PLURAL:$2|US quart|US quarts}}',
+	'pfunc-convert-unit-volume-uspint'          => '$1{{PLURAL:$2|US pint|US pints}}',
+	'pfunc-convert-unit-volume-usfluidounce'    => '$1{{PLURAL:$2|US fluid ounce|US fluid ounces}}',
+	'pfunc-convert-unit-volume-usdrybarrel'     => '$1{{PLURAL:$2|US dry barrel|US dry barrels}}',
+	'pfunc-convert-unit-volume-usbushel'        => '$1{{PLURAL:$2|US bushel|US bushels}}',
+	'pfunc-convert-unit-volume-usdrygallon'     => '$1{{PLURAL:$2|US dry gallon|US dry gallons}}',
+	'pfunc-convert-unit-volume-usdryquart'      => '$1{{PLURAL:$2|US dry quart|US dry quarts}}',
+	'pfunc-convert-unit-volume-usdrypint'       => '$1{{PLURAL:$2|US dry pint|US dry pints}}',
+
+	'pfunc-convert-unit-volume-cubicmetre-abbr'      => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr'           => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr'       => '$1cu yd',
+	'pfunc-convert-unit-volume-cubicfoot-abbr'       => '$1cu ft',
+	'pfunc-convert-unit-volume-cubicinch-abbr'       => '$1cu in',
+	'pfunc-convert-unit-volume-barrel-abbr'          => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr'          => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr'          => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr'           => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr'            => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr'      => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr'        => '$1US bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr'       => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr'      => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr'        => '$1US gal',
+	'pfunc-convert-unit-volume-usquart-abbr'         => '$1US qt',
+	'pfunc-convert-unit-volume-uspint-abbr'          => '$1US pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr'    => '$1US fl oz',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr'     => '$1US bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr'        => '$1US bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr'     => '$1US dry gal',
+	'pfunc-convert-unit-volume-usdryquart-abbr'      => '$1US dry qt',
+	'pfunc-convert-unit-volume-usdrypint-abbr'       => '$1US dry pt',
 
 	# SPEED
-	'pfunc-convert-unit-speed-mile-hour'             => 'miles per hour',
-	'pfunc-convert-unit-speed-speedoflight'          => 'c',
+	'pfunc-convert-unit-speed-mile-hour'             => '$1miles per hour',
+	'pfunc-convert-unit-speed-speedoflight'          => '$1c',
 
-	'pfunc-convert-unit-speed-mile-hour-abbr'        => 'mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr'     => 'c',
+	'pfunc-convert-unit-speed-mile-hour-abbr'        => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr'     => '$1c',
 	
 	# PRESSURE
-	'pfunc-convert-unit-pressure-pascal'            => '{{PLURAL:$1|$2pascal|$2pascals}}',
-	'pfunc-convert-unit-pressure-bar'               => 'bar',
-	'pfunc-convert-unit-pressure-decibar'           => 'decibar',
-	'pfunc-convert-unit-pressure-millibar'          => 'millibar',
-	'pfunc-convert-unit-pressure-kilobarye'         => 'kilobarye',
-	'pfunc-convert-unit-pressure-barye'             => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere'        => '{{PLURAL:$1|atmosphere|atmospheres}}',
-	'pfunc-convert-unit-pressure-torr'              => '{{PLURAL:$1|Torr|Torr}}',
-	'pfunc-convert-unit-pressure-mmhg'              => '{{PLURAL:$1|millimeter of mercury|millimeters of mercury}}',
-	'pfunc-convert-unit-pressure-inhg'              => '{{PLURAL:$1|inch of mercury|inches of mercury}}',
-	'pfunc-convert-unit-pressure-psi'               => '{{PLURAL:$1|pound per square-inch|pounds per square-inch}}',
-
-	'pfunc-convert-unit-pressure-pascal-abbr'            => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr'               => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr'           => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr'           => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr'         => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr'             => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr'        => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr'              => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr'              => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr'              => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr'               => 'psi',
+	'pfunc-convert-unit-pressure-pascal'            => '$1{{PLURAL:$2|$3pascal|$3pascals}}',
+	'pfunc-convert-unit-pressure-bar'               => '$1bar',
+	'pfunc-convert-unit-pressure-decibar'           => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar'          => '$1millibar',
+	'pfunc-convert-unit-pressure-kilobarye'         => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye'             => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere'        => '$1{{PLURAL:$2|atmosphere|atmospheres}}',
+	'pfunc-convert-unit-pressure-torr'              => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg'              => '$1{{PLURAL:$2|millimeter of mercury|millimeters of mercury}}',
+	'pfunc-convert-unit-pressure-inhg'              => '$1{{PLURAL:$2|inch of mercury|inches of mercury}}',
+	'pfunc-convert-unit-pressure-psi'               => '$1{{PLURAL:$2|pound per square-inch|pounds per square-inch}}',
+
+	'pfunc-convert-unit-pressure-pascal-abbr'            => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr'               => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr'           => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr'          => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr'         => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr'             => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr'        => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr'              => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr'              => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr'              => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr'               => '$1psi',
 );
 
 /** Message documentation (Message documentation)
  * @author Jon Harald Søby
+ * @author Kghbln
  * @author Meno25
  * @author Siebrand
  * @author The Evil IP address
@@ -277,6 +278,8 @@ $messages['qqq'] = array(
 	'pfunc_desc' => '{{desc}}',
 	'pfunc_expr_division_by_zero' => '{{Identical|Divizion by zero}}',
 	'pfunc_string_too_long' => 'PLURAL is supported for $1.',
+	'pfunc-convert-unit-length-parsec-abbr' => 'The $3 is directly connected to the abbreviated unit to hold abbreviations like "kilo", "milli", "pico", etc.',
+	'pfunc-convert-unit-length-lightyear-abbr' => 'The $3 is directly connected to the abbreviated unit to hold abbreviations like "kilo", "milli", "pico", etc.',
 );
 
 /** Afrikaans (Afrikaans)
@@ -775,17 +778,29 @@ $messages['cs'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metr|$2metry|$2metrů}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|míle|míle|mil}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|stopa|stopy|stop}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|palec|palce|palců}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsek|$2parseky|$2parseků}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomická jednotka|astronomické jednotky|astronomických jednotek}}',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kilometr čtvereční|kilometry čtvereční|kilometrů čtverečních}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektary|hektarů}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|akr|akry|akrů}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|čtvereční stopa|čtvereční stopy|čtverečních stop}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|čtvereční palec|čtvereční palce|čtverečních palců}}',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metr|$3metry|$3metrů}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|míle|míle|mil}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|stopa|stopy|stop}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|palec|palce|palců}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsek|$3parseky|$3parseků}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomická jednotka|astronomické jednotky|astronomických jednotek}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilometr čtvereční|kilometry čtvereční|kilometrů čtverečních}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektary|hektarů}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|akr|akry|akrů}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|čtvereční stopa|čtvereční stopy|čtverečních stop}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|čtvereční palec|čtvereční palce|čtverečních palců}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km²',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m²',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm²',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm²',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m³',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm³',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascaly|$3pascalů}}',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosféra|atmosféry|atmosfér}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torry|torrů}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
 );
 
 /** Danish (Dansk)
@@ -821,6 +836,8 @@ $messages['da'] = array(
  * @author LWChris
  * @author Metalhead64
  * @author Raimond Spekking
+ * @author Rentenirer
+ * @author Rillke
  */
 $messages['de'] = array(
 	'pfunc_desc' => 'Erweitert den Parser um logische Funktionen',
@@ -843,6 +860,196 @@ $messages['de'] = array(
 	'pfunc_expr_unknown_error' => 'Expression-Fehler: Unbekannter Fehler ($1)',
 	'pfunc_expr_not_a_number' => 'In $1: Ergebnis ist keine Zahl',
 	'pfunc_string_too_long' => 'Fehler: Zeichenkette überschreitet Zeichenlimit von $1',
+	'pfunc-convert-dimensionmismatch' => 'Fehler: Die Einheiten „$1“ und „$2“ sind nicht untereinander konvertierbar',
+	'pfunc-convert-unknownunit' => 'Fehler: Unbekannte Einheit „$1“',
+	'pfunc-convert-unknowndimension' => 'Fehler: Unbekannte Dimension „$1“',
+	'pfunc-convert-invalidcompoundunit' => 'Fehler: Ungültige Einheitenkombination „$1“',
+	'pfunc-convert-nounit' => 'Fehler: Ausgangseinheit fehlt',
+	'pfunc-convert-doublecompoundunit' => 'Fehler: Doppelte Einheitenkombinationen wie „$1“ können nicht verarbeitet werden',
+	'pfunc-convert-dimension-length' => 'Länge',
+	'pfunc-convert-dimension-area' => 'Fläche',
+	'pfunc-convert-dimension-volume' => 'Volumen',
+	'pfunc-convert-dimension-time' => 'Zeit',
+	'pfunc-convert-dimension-timesquared' => 'Zeit<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'Masse',
+	'pfunc-convert-dimension-speed' => 'Geschwindigkeit',
+	'pfunc-convert-dimension-temperature' => 'Temperatur',
+	'pfunc-convert-dimension-acceleration' => 'Beschleunigung',
+	'pfunc-convert-dimension-force' => 'Kraft',
+	'pfunc-convert-dimension-torque' => 'Drehmoment',
+	'pfunc-convert-dimension-energy' => 'Energie',
+	'pfunc-convert-dimension-power' => 'Leistung',
+	'pfunc-convert-dimension-pressure' => 'Druck',
+	'pfunc-convert-dimension-density' => 'Dichte',
+	'pfunc-convert-dimension-fuelefficiencypositive' => 'Positive Kraftstoffeffizienz',
+	'pfunc-convert-dimension-fuelefficiencynegative' => 'Negative Kraftstoffeffizienz',
+	'pfunc-convert-prefix-yotta' => 'Yotta',
+	'pfunc-convert-prefix-zetta' => 'Zetta',
+	'pfunc-convert-prefix-exa' => 'Exa',
+	'pfunc-convert-prefix-peta' => 'Peta',
+	'pfunc-convert-prefix-tera' => 'Tera',
+	'pfunc-convert-prefix-giga' => 'Giga',
+	'pfunc-convert-prefix-mega' => 'Mega',
+	'pfunc-convert-prefix-kilo' => 'Kilo',
+	'pfunc-convert-prefix-hecto' => 'Hekto',
+	'pfunc-convert-prefix-deca' => 'Deka',
+	'pfunc-convert-prefix-deci' => 'Dezi',
+	'pfunc-convert-prefix-centi' => 'Zenti',
+	'pfunc-convert-prefix-milli' => 'Milli',
+	'pfunc-convert-prefix-micro' => 'Mikro',
+	'pfunc-convert-prefix-nano' => 'Nano',
+	'pfunc-convert-prefix-pico' => 'Piko',
+	'pfunc-convert-prefix-femto' => 'Femto',
+	'pfunc-convert-prefix-atto' => 'Atto',
+	'pfunc-convert-prefix-zepto' => 'Zepto',
+	'pfunc-convert-prefix-yocto' => 'Yokto',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|Meter|Meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|Ångström|Ångström}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|Meile|Meilen}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|Furlong|Furlong}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|Chain|Chain}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|Rute|Ruten}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|Fathom|Fathom}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|Yard|Yard}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|Fuß|Fuß}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|Hand|Hand}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|Zoll|Zoll}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|Seemeile|Seemeilen}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|britische Seemeile (vor 1970)|britische Seemeilen (vor 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|US-Seemeile (vor 1954)|US-Seemeilen (vor 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsec}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 Lichtjahr|$3 Lichtjahre}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomische Einheit|astronomische Einheiten}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1Chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1Faden',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1″',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (US, vor 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3lj',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AE',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|Quadratkilometer|Quadratkilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|Quadratmeter|Quadratmeter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|Quadratzentimeter|Quadratzentimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|Quadratmillimeter|Quadratmillimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|Hektar|Hektar}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|Quadratmeile|Quadratmeilen}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|Acre|Acre}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|Quadratyard|Quadratyard}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|Quadratfuß|Quadratfuß}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|Quadratzoll|Quadratzoll}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|Quadratseemeilen|Quadratseemeilen}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|Dunam|Dunam}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|Tsubo|Tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mi²',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1yd²',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ft²',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1inch²',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sm<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|Sekunde|Sekunden}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3 Jahr|$3 Jahre}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|Tag|Tage}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|Stunde|Stunden}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|Minute|Minuten}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1sek',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3a',
+	'pfunc-convert-unit-time-day-abbr' => '$1d',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|Kubikmeter|Kubikmeter}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|Kubikzentimeter|Kubikzentimeter}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|Kubikmillimeter|Kubikmillimeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|Kiloliter|Kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|Liter|Liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|Zentiliter|Zentiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|Milliliter|Milliliter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|Kubikyard|Kubikyard}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|Kubikfuß|Kubikfuß}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|Kubikzoll|Kubikzoll}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|Barrel|Barrel}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|Bushel|Bushel}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|Gallone|Gallonen}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|Quart|Quart}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|Pinte|Pinten}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|Flüssigunze|Flüssigunzen}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|US-Barrel|US-Barrel}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|Barrel|Barrel}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|Barrel|Barrel}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|US-Gallone|US-Gallonen}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|US-Quart|US-Quart}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|US-Pinte|US-Pinten}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|US-Flüssigunze|US-Flüssigunzen}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|US-Trockenbarrel|US-Trockenbarrel}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|US-Bushel|US-Bushel}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|US-Trockengallone|US-Trockengallonen}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|US-Trockenquart|US-Trockenquart}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|US-Trockenpinte|US-Trockenpinten}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1yd<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ft<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1in<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl.',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh.',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal.',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt.',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt.',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl.oz.',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1US bbl.',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl.',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl.',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1US gal.',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1US qt.',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1US pt.',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1US fl.oz.',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1US bbl.',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1US bsh.',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1US dry gal.',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1US dry qt.',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1US dry pt.',
+	'pfunc-convert-unit-speed-mile-hour' => '$1Meilen pro Stunde',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3 Pascal|$3 Pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1Bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1Dezibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1Millibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1Kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1Barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|Atmosphäre|Atmosphären}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|Millimeter-Quecksilbersäule|Millimeter-Quecksilbersäule}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|Zoll Quecksilber|Zoll Quecksilber}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|Pfund pro Quadratzoll|Pfund pro Quadratzoll}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3 Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1Bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Swiss High German (Schweizer Hochdeutsch)
@@ -930,28 +1137,20 @@ $messages['el'] = array(
 	'pfunc_string_too_long' => 'Σφάλμα: ο ορμαθός υπερβαίνει $1 το όριο χαρακτήρων',
 );
 
-/**
- * British english
+/** British English (British English)
  * @author Happy-melon
  */
 $messages['en-gb'] = array(
-	# LENGTH
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metre|$2metres}}',
-	
-	# AREA #
-	'pfunc-convert-unit-area-squarekilometre'  => '{{PLURAL:$1|square kilometre|square kilometres}}',
-	'pfunc-convert-unit-area-squaremetre'      => '{{PLURAL:$1|square metre|square metres}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|square centimetre|square centimetres}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|square millimetre|square millimetres}}',
-	
-	# VOLUME #
-	'pfunc-convert-unit-volume-cubicmetre'      => '{{PLURAL:$1|cubic metre|cubic metres}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|cubic centimetre|cubic centimetres}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|cubic millimetre|cubic millimetres}}',
-	'pfunc-convert-unit-volume-litre'           => '{{PLURAL:$1|$2litre|$2litres}}',
-
-	# PRESSURE
-	'pfunc-convert-unit-pressure-mmhg'              => '{{PLURAL:$1|millimetre of mercury|millimetres of mercury}}',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metre|$3metres}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|square kilometre|square kilometres}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|square metre|square metres}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|square centimetre|square centimetres}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|square millimetre|square millimetres}}',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|cubic metre|cubic metres}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|cubic centimetre|cubic centimetres}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|cubic millimetre|cubic millimetres}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|$3litre|$3litres}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimetre of mercury|millimetres of mercury}}',
 );
 
 /** Esperanto (Esperanto)
@@ -1012,6 +1211,7 @@ $messages['es'] = array(
  */
 $messages['et'] = array(
 	'pfunc_desc' => 'Laiendab parserit loogiliste funktsioonidega.',
+	'pfunc_time_error' => 'Tõrge: Vigane aeg',
 	'pfunc_expr_division_by_zero' => 'Nulliga jagamine',
 );
 
@@ -1095,8 +1295,11 @@ $messages['fi'] = array(
 
 /** French (Français)
  * @author Crochet.david
+ * @author Gomoko
  * @author Grondin
+ * @author Hashar
  * @author IAlex
+ * @author Od1n
  * @author Sherbrooke
  * @author Urhixidur
  * @author Verdy p
@@ -1122,8 +1325,12 @@ $messages['fr'] = array(
 	'pfunc_expr_unknown_error' => 'Erreur d’expression : erreur inconnue ($1).',
 	'pfunc_expr_not_a_number' => 'Dans $1 : le résultat n’est pas un nombre.',
 	'pfunc_string_too_long' => 'Erreur : La chaîne dépasse la limite maximale de $1 caractère{{PLURAL:$1||s}}.',
+	'pfunc-convert-dimensionmismatch' => 'Erreur: Impossible de faire une conversion entre les unités de "$1" et "$2".',
 	'pfunc-convert-unknownunit' => 'Erreur : "$1" est une unité inconnue.',
 	'pfunc-convert-unknowndimension' => 'Erreur : "$1" est une dimension inconnue.',
+	'pfunc-convert-invalidcompoundunit' => 'Erreur: Unité composée "$1" invalide.',
+	'pfunc-convert-nounit' => 'Erreur: Aucune unité source fournie.',
+	'pfunc-convert-doublecompoundunit' => 'Erreur: Impossible d\'analyser des unités doublement composées comme "$1".',
 	'pfunc-convert-dimension-length' => 'longueur',
 	'pfunc-convert-dimension-area' => 'aire',
 	'pfunc-convert-dimension-volume' => 'volume',
@@ -1139,6 +1346,8 @@ $messages['fr'] = array(
 	'pfunc-convert-dimension-power' => 'puissance',
 	'pfunc-convert-dimension-pressure' => 'pression',
 	'pfunc-convert-dimension-density' => 'densité',
+	'pfunc-convert-dimension-fuelefficiencypositive' => 'fuelefficiencypositive',
+	'pfunc-convert-dimension-fuelefficiencynegative' => 'fuelefficiencynegative',
 	'pfunc-convert-prefix-yotta' => 'yotta',
 	'pfunc-convert-prefix-zetta' => 'zetta',
 	'pfunc-convert-prefix-exa' => 'exa',
@@ -1151,7 +1360,7 @@ $messages['fr'] = array(
 	'pfunc-convert-prefix-deca' => 'deca',
 	'pfunc-convert-prefix-deci' => 'deci',
 	'pfunc-convert-prefix-centi' => 'centi',
-	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-milli' => 'mili',
 	'pfunc-convert-prefix-micro' => 'micro',
 	'pfunc-convert-prefix-nano' => 'nano',
 	'pfunc-convert-prefix-pico' => 'pico',
@@ -1159,38 +1368,153 @@ $messages['fr'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|brasse|brasses}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|pied|pieds}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|main|mains}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|pouce|pouces}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|unité astronomique|unités astronomiques}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hectare|hectares}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|seconde|secondes}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|jour|jours}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|heure|heures}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minute|minutes}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2an',
-	'pfunc-convert-unit-time-day-abbr' => 'j',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'm',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|litre|litres}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centilitre|centilitres}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|millilitre|millilitres}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|boisseau|boisseaux}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-speed-mile-hour' => 'miles par heure',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'millibar',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3 mètre|$3 mètres}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angström|angströms}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mile|miles}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chaîne|chaînes}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|tige|tiges}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|brasse|brasses}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|pied|pieds}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|main|mains}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|pouce|pouces}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|mile nautique|miles nautiques}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|mile nautique (britannique, avant 1970)|miles nautiques (britanniques, avant 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|mile nautique (États-Unis, avant 1954)|miles nautiques (États-Unis, avant 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 année-lumière|$3 années-lumière}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unité astronomique|unités astronomiques}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chaîne',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1brasse',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit.)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (États-Unis avant 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilomètre carré|kilomètres carrés}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|mètre carré|mètres carrés}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|centimètre carré|centimètres carrés}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|millimètre carré|millimètres carrés}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectare|hectares}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|mile carré|miles carrés}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|acre|acres}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|yard carré|yards carrés}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|pied carré|pieds carrés}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|pouce carré|pouces carrés}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|mile nautique carré|miles nautiques carrés}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunams}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubos}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mi^2',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1yd^2',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ft^2',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1in^2',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1nmi^2',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|seconde|secondes}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3 an|$3 ans}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|jour|jours}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|heure|heures}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minute|minutes}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3an',
+	'pfunc-convert-unit-time-day-abbr' => '$1j',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1m',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|mètre cube|mètres cubes}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|centimètre cube|centimètres cubes}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|millimètre cube|millimètres cubes}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kilolitre|kilolitres}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litre|litres}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centilitre|centilitres}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|millilitre|millilitres}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|yard cube|yards cubes}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|pied cube|pieds cubes}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|pouce cube|pouces cubes}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|baril|barils}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|boisseau|boisseaux}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gallon|gallons}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|litre|litres}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pinte|pintes}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|once liquide|onces liquides}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|baril US|barils US}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|baril|barils}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|baril|barils}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|gallon US|gallons US}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|litre US|litres US}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|pinte US|pintes US}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|once liquide US|onces liquides US}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|baril sec US|barils secs US}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|boisseau US|boisseaux US}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|gallon sec US|gallons secs US}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|litre sec US|litres secs US}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|pinte sèche US|pintes sèches US}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1yd^3',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ft^3',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1in^3',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1US bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1US gal',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1US qt',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1US pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1US fl oz',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1US bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1US bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1US gal sec',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1US qt sec',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1US pt sec',
+	'pfunc-convert-unit-speed-mile-hour' => '$1miles par heure',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1m/h',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3 pascal|$3 pascals}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobar',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosphère|atmosphères}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torrs}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimètre de mercure|millimètres de mercure}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|pouce de mercure|pouces de mercure}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|livre par pouce carré|livres par pouce carré}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3 Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Franco-Provençal (Arpetan)
@@ -1216,6 +1540,126 @@ $messages['frp'] = array(
 	'pfunc_expr_unknown_error' => 'Èrror d’èxprèssion : èrror encognua ($1)',
 	'pfunc_expr_not_a_number' => 'Dens $1 : lo rèsultat est pas un nombro',
 	'pfunc_string_too_long' => 'Èrror : la chêna dèpâsse la limita d’amont de $1 caractèro{{PLURAL:$1||s}}',
+	'pfunc-convert-unknownunit' => 'Èrror : « $1 » est una unitât encognua.',
+	'pfunc-convert-unknowndimension' => 'Èrror : « $1 » est una dimension encognua.',
+	'pfunc-convert-dimension-length' => 'longior',
+	'pfunc-convert-dimension-area' => 'surface',
+	'pfunc-convert-dimension-volume' => 'cubâjo',
+	'pfunc-convert-dimension-time' => 'temps',
+	'pfunc-convert-dimension-timesquared' => 'temps<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'massa',
+	'pfunc-convert-dimension-speed' => 'vitèsse',
+	'pfunc-convert-dimension-temperature' => 'tempèratura',
+	'pfunc-convert-dimension-acceleration' => 'accèlèracion',
+	'pfunc-convert-dimension-force' => 'fôrce',
+	'pfunc-convert-dimension-torque' => 'cobla',
+	'pfunc-convert-dimension-energy' => 'nèrf',
+	'pfunc-convert-dimension-power' => 'pouessience',
+	'pfunc-convert-dimension-pressure' => 'prèssion',
+	'pfunc-convert-dimension-density' => 'densitât',
+	'pfunc-convert-prefix-yotta' => 'yota',
+	'pfunc-convert-prefix-zetta' => 'zèta',
+	'pfunc-convert-prefix-exa' => 'ègza',
+	'pfunc-convert-prefix-peta' => 'pèta',
+	'pfunc-convert-prefix-tera' => 'tèra',
+	'pfunc-convert-prefix-giga' => 'giga',
+	'pfunc-convert-prefix-mega' => 'mèga',
+	'pfunc-convert-prefix-kilo' => 'kilo',
+	'pfunc-convert-prefix-hecto' => 'hècto',
+	'pfunc-convert-prefix-deca' => 'dèca',
+	'pfunc-convert-prefix-deci' => 'dèci',
+	'pfunc-convert-prefix-centi' => 'centi',
+	'pfunc-convert-prefix-milli' => 'mili',
+	'pfunc-convert-prefix-micro' => 'micro',
+	'pfunc-convert-prefix-nano' => 'nano',
+	'pfunc-convert-prefix-pico' => 'pico',
+	'pfunc-convert-prefix-femto' => 'femto',
+	'pfunc-convert-prefix-atto' => 'ato',
+	'pfunc-convert-prefix-zepto' => 'zèpto',
+	'pfunc-convert-prefix-yocto' => 'yocto',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1$3mètre{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-angstrom' => '$1ångström{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-mile' => '$1mile{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-furlong' => '$1furlong{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-chain' => '$1chên{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-length-rod' => '$1pèrche{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-fathom' => '$1braciê{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-yard' => '$1vèrge{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-foot' => '$1pied{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-hand' => '$1man{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-inch' => '$1pôjo{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|mile marin|miles marins}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|mile marin (prè-1970 britanico)|miles marins (prè-1970 britanicos)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|mile marin (prè-1954 des Ètats-Unis)|miles marins (prè-1954 des Ètats-Unis)}}',
+	'pfunc-convert-unit-length-parsec' => '$1$3parsec{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3an|$3ans}}-lumiére',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unitât astronomica|unitâts astronomiques}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chêna',
+	'pfunc-convert-unit-length-rod-abbr' => '$1pèrche',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1braciê',
+	'pfunc-convert-unit-length-yard-abbr' => '$1vg',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1po',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3al',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1UA',
+	'pfunc-convert-unit-area-hectare' => '$1hèctâre{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|mile carrâ|miles carrâs}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|vèrge carrâ|vèrges carrâs}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|pôjo carrâ|pôjos carrâs}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mi<sup>2</sup>',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1vg<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1po<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1nmi<sup>2</sup>',
+	'pfunc-convert-unit-time-second' => '$1second{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-time-year' => '$1$3an{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-time-day' => '$1jorn{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-time-hour' => '$1hor{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-time-minute' => '$1menut{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3a',
+	'pfunc-convert-unit-time-day-abbr' => '$1j',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-speed-mile-hour' => '$1miles per hora',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascâl|$3pascâls}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1dècibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1atmosfér{{PLURAL:$2|a|es}}',
+	'pfunc-convert-unit-pressure-torr' => '$1torr{{PLURAL:$2||s}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1milimètre{{PLURAL:$2||s}} de mèrcure',
+	'pfunc-convert-unit-pressure-inhg' => '$1pôjo{{PLURAL:$2||s}} de mèrcure',
+	'pfunc-convert-unit-pressure-psi' => '$1livr{{PLURAL:$2|a|es}} per pôjo carrâ',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Galician (Galego)
@@ -1245,6 +1689,12 @@ $messages['gl'] = array(
 	'pfunc_expr_unknown_error' => 'Erro de expresión: Erro descoñecido ($1).',
 	'pfunc_expr_not_a_number' => 'En $1: O resultado non é un número.',
 	'pfunc_string_too_long' => 'Erro: A cadea excede o límite de $1 caracteres.',
+	'pfunc-convert-dimensionmismatch' => 'Erro: Non se pode converter entre as unidades "$1" e "$2".',
+	'pfunc-convert-unknownunit' => 'Erro: Descoñécese a unidade "$1".',
+	'pfunc-convert-unknowndimension' => 'Erro: Descoñécese a dimensión "$1".',
+	'pfunc-convert-invalidcompoundunit' => 'Erro: A unidade composta "$1" é inválida.',
+	'pfunc-convert-nounit' => 'Erro: Non se deu ningunha unidade de orixe.',
+	'pfunc-convert-doublecompoundunit' => 'Erro: Non se poden analizar as unidades compostas dobres como "$1".',
 	'pfunc-convert-dimension-length' => 'lonxitude',
 	'pfunc-convert-dimension-area' => 'área',
 	'pfunc-convert-dimension-volume' => 'volume',
@@ -1272,7 +1722,7 @@ $messages['gl'] = array(
 	'pfunc-convert-prefix-deca' => 'deca',
 	'pfunc-convert-prefix-deci' => 'deci',
 	'pfunc-convert-prefix-centi' => 'centi',
-	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-milli' => 'mili',
 	'pfunc-convert-prefix-micro' => 'micro',
 	'pfunc-convert-prefix-nano' => 'nano',
 	'pfunc-convert-prefix-pico' => 'pico',
@@ -1280,8 +1730,80 @@ $messages['gl'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metro|$3metros}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstroms}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|milla|millas}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|cadea|cadeas}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|rod|rods}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|braza|brazas}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|iarda|iardas}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|pé|pés}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|palmo|palmos}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|polgada|polgadas}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|milla náutica|millas náuticas}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3ano luz|$3anos luz}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unidade astronómica|unidades astronómicas}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1cadea',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rod',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1braza',
+	'pfunc-convert-unit-length-yard-abbr' => '$1iarda',
+	'pfunc-convert-unit-length-foot-abbr' => '$1pé',
+	'pfunc-convert-unit-length-hand-abbr' => '$1palmo',
+	'pfunc-convert-unit-length-inch-abbr' => '$1polgada',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1milla náutica',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3parsec',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ano luz',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1UA',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|quilómetro cadrado|quilómetros cadrados}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|metro cadrado|metros cadrados}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|centímetro cadrado|centímetros cadrados}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|milímetro cadrado|milímetros cadrados}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectárea|hectáreas}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|segundo|segundos}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3ano|$3anos}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|día|días}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|hora|horas}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuto|minutos}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3ano',
+	'pfunc-convert-unit-time-day-abbr' => '$1día',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|metro cúbico|metros cúbicos}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|centímetro cúbico|centímetros cúbicos}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|milímetro cúbico|milímetros cúbicos}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|quilolitro|quilolitros}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litro|litros}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centilitro|centilitros}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|mililitro|mililitros}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3L',
+	'pfunc-convert-unit-speed-mile-hour' => '$1millas por hora',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascais}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosferas}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milímetro de mercurio|milímetros de mercurio}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
 );
 
 /** Ancient Greek (Ἀρχαία ἑλληνικὴ)
@@ -1382,81 +1904,81 @@ $messages['he'] = array(
 	'pfunc-convert-prefix-atto' => 'אטו',
 	'pfunc-convert-prefix-zepto' => 'זפטו',
 	'pfunc-convert-prefix-yocto' => 'יוקטו',
-	'pfunc-convert-unit-length-furlong-abbr' => 'פרלונג',
-	'pfunc-convert-unit-length-chain-abbr' => 'שלשלת',
-	'pfunc-convert-unit-length-rod-abbr' => 'מַטֶּה',
-	'pfunc-convert-unit-length-fathom-abbr' => 'פאתום',
-	'pfunc-convert-unit-length-yard-abbr' => 'יארד',
-	'pfunc-convert-unit-length-foot-abbr' => 'רגל',
-	'pfunc-convert-unit-length-hand-abbr' => 'כף־יד',
-	'pfunc-convert-unit-length-inch-abbr' => 'אינץ׳',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'מיל ימי',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'מיל ימי (אנגלי)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'מיל ימי (ארה״ב לפני 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 פארסק',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 שנות אור',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'יחידה אסטרונומית',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'קמ״ר',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'מ״ר',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'סמ״ר',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'ממ״ר',
-	'pfunc-convert-unit-area-hectare-abbr' => 'הקטאר',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'מיל רבוע',
-	'pfunc-convert-unit-area-acre-abbr' => 'אקר',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'יארד רבוע',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'רגל רבועה',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'אינץ׳ רבוע',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'מיל ימי רבוע',
-	'pfunc-convert-unit-area-dunam-abbr' => 'דונם',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'צובו',
-	'pfunc-convert-unit-time-second-abbr' => 'שנייה',
-	'pfunc-convert-unit-time-day-abbr' => 'יום',
-	'pfunc-convert-unit-time-hour-abbr' => 'שעה',
-	'pfunc-convert-unit-time-minute-abbr' => 'דקה',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'מטר מעוקב',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'ס״מ מעוקב',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'מ״מ מעוקב',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 ל׳',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'יארד מעוקב',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'רגל מעוקבת',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'אינץ׳ מעוקב',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'חבית',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'בושל',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'גלון',
-	'pfunc-convert-unit-volume-quart-abbr' => 'קווארטה',
-	'pfunc-convert-unit-volume-pint-abbr' => 'פיינט',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'אונקייה',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'חבית אמריקאית',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'חבית',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'חבית',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'גלון אמריקאי',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'קווארטה אמריקאית',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'פיינט אמריקאי',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'אונקייה אמריקאית',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'חבית אמריקאית',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'בושל אמריקאי',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'גלון יבש אמריקאי',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'קווארטה יבשה אמריקאית',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'פיינט יבש אמריקאי',
-	'pfunc-convert-unit-speed-mile-hour' => 'מיל לשעה',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'מיל לשעה',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-bar' => 'בר',
-	'pfunc-convert-unit-pressure-decibar' => 'דציבר',
-	'pfunc-convert-unit-pressure-millibar' => 'מיליבר',
-	'pfunc-convert-unit-pressure-kilobarye' => 'קילובָּרְיֶה',
-	'pfunc-convert-unit-pressure-barye' => 'בָּרְיֶה',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'בר',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'דציבר',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'מיליבר',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'קילובָּרְיֶה',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'בָּרְיֶה',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'אטמ׳',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'טור',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'מ״מ כספית',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'אינץ׳ כספית',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1פרלונג',
+	'pfunc-convert-unit-length-chain-abbr' => '$1שלשלת',
+	'pfunc-convert-unit-length-rod-abbr' => '$1מַטֶּה',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1פאתום',
+	'pfunc-convert-unit-length-yard-abbr' => '$1יארד',
+	'pfunc-convert-unit-length-foot-abbr' => '$1רגל',
+	'pfunc-convert-unit-length-hand-abbr' => '$1כף־יד',
+	'pfunc-convert-unit-length-inch-abbr' => '$1אינץ׳',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1מיל ימי',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1מיל ימי (אנגלי)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1מיל ימי (ארה״ב לפני 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 פארסק',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 שנות אור',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1יחידה אסטרונומית',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1קמ״ר',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1מ״ר',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1סמ״ר',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1ממ״ר',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1הקטאר',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1מיל רבוע',
+	'pfunc-convert-unit-area-acre-abbr' => '$1אקר',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1יארד רבוע',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1רגל רבועה',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1אינץ׳ רבוע',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1מיל ימי רבוע',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1דונם',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1צובו',
+	'pfunc-convert-unit-time-second-abbr' => '$1שנייה',
+	'pfunc-convert-unit-time-day-abbr' => '$1יום',
+	'pfunc-convert-unit-time-hour-abbr' => '$1שעה',
+	'pfunc-convert-unit-time-minute-abbr' => '$1דקה',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1מטר מעוקב',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1ס״מ מעוקב',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1מ״מ מעוקב',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 ל׳',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1יארד מעוקב',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1רגל מעוקבת',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1אינץ׳ מעוקב',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1חבית',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1בושל',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1גלון',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1קווארטה',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1פיינט',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1אונקייה',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1חבית אמריקאית',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1חבית',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1חבית',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1גלון אמריקאי',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1קווארטה אמריקאית',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1פיינט אמריקאי',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1אונקייה אמריקאית',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1חבית אמריקאית',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1בושל אמריקאי',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1גלון יבש אמריקאי',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1קווארטה יבשה אמריקאית',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1פיינט יבש אמריקאי',
+	'pfunc-convert-unit-speed-mile-hour' => '$1מיל לשעה',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1מיל לשעה',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-bar' => '$1בר',
+	'pfunc-convert-unit-pressure-decibar' => '$1דציבר',
+	'pfunc-convert-unit-pressure-millibar' => '$1מיליבר',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1קילובָּרְיֶה',
+	'pfunc-convert-unit-pressure-barye' => '$1בָּרְיֶה',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1בר',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1דציבר',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1מיליבר',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1קילובָּרְיֶה',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1בָּרְיֶה',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1אטמ׳',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1טור',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1מ״מ כספית',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1אינץ׳ כספית',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Hindi (हिन्दी)
@@ -1535,6 +2057,51 @@ $messages['hsb'] = array(
 	'pfunc_expr_unknown_error' => 'Wurazowy zmylk: Njeznaty zmylk ($1)',
 	'pfunc_expr_not_a_number' => 'W $1: Wuslědk ličba njeje',
 	'pfunc_string_too_long' => 'Zmylk: Znamješkowy slěd překročuje limit $1 znamješkow',
+	'pfunc-convert-dimensionmismatch' => 'Zmylk: Konwertowanje mjez "$1" a "$2" njemóžno',
+	'pfunc-convert-unknownunit' => 'Zmylk: Njeznata jednotka "$1"',
+	'pfunc-convert-unknowndimension' => 'Zmylk: Njeznata dimensija "$1"',
+	'pfunc-convert-nounit' => 'Zmylk: žórłowa jednotka faluje',
+	'pfunc-convert-dimension-length' => 'Dołhosć',
+	'pfunc-convert-dimension-area' => 'přestrjeń',
+	'pfunc-convert-dimension-volume' => 'wolumen',
+	'pfunc-convert-dimension-time' => 'čas',
+	'pfunc-convert-dimension-timesquared' => 'čas <sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'Masa',
+	'pfunc-convert-dimension-speed' => 'spěšnosć',
+	'pfunc-convert-dimension-temperature' => 'temperatura',
+	'pfunc-convert-dimension-acceleration' => 'pospěšenje',
+	'pfunc-convert-dimension-force' => 'móc',
+	'pfunc-convert-dimension-torque' => 'wjertny moment',
+	'pfunc-convert-dimension-energy' => 'energija',
+	'pfunc-convert-dimension-power' => 'wukon',
+	'pfunc-convert-dimension-pressure' => 'ćišć',
+	'pfunc-convert-dimension-density' => 'hustota',
+	'pfunc-convert-dimension-fuelefficiencypositive' => 'Pozitiwna ćěriwowa eficienca',
+	'pfunc-convert-dimension-fuelefficiencynegative' => 'Negatiwna ćěriwowa eficienca',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|meter|metraj|metry|metrow}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomiska jednotka|astronomiskej jednotce|astronomiske jednotki|astronomiskich jednotkow}}',
+	'pfunc-convert-unit-length-metre-abbr' => '$1m',
+	'pfunc-convert-unit-length-angstrom-abbr' => '$1Å',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sm<sup>2</sup>',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekunda|sekundźe|sekundy|sekundow}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|lěto|lěće|lěta|lět}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dźeń|dnjej|dny|dnjow}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|hodźina|hodźinje|hodźiny|hodźin}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|mjeńšina|mjeńšinje|mjeńšiny|mjeńšin}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1lěto',
+	'pfunc-convert-unit-time-day-abbr' => '$1dźeń',
+	'pfunc-convert-unit-time-hour-abbr' => '$1hodź.',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1l',
 );
 
 /** Hungarian (Magyar)
@@ -1561,6 +2128,50 @@ $messages['hu'] = array(
 	'pfunc_expr_unknown_error' => 'Hiba a kifejezésben: ismeretlen hiba ($1)',
 	'pfunc_expr_not_a_number' => '$1: az eredmény nem szám',
 	'pfunc_string_too_long' => 'Hiba: a sztring túllépte a(z) $1 karakteres határt',
+	'pfunc-convert-dimensionmismatch' => 'Hiba: „$1” és „$2” mértékegységek között nem lehet átváltani.',
+	'pfunc-convert-unknownunit' => 'Hiba: ismeretlen mértékegység: „$1”',
+	'pfunc-convert-nounit' => 'Hiba: nincs megadva a forrásmértékegység.',
+	'pfunc-convert-dimension-length' => 'hossz',
+	'pfunc-convert-dimension-area' => 'terület',
+	'pfunc-convert-dimension-volume' => 'térfogat',
+	'pfunc-convert-dimension-time' => 'idő',
+	'pfunc-convert-dimension-timesquared' => 'idő<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'tömeg',
+	'pfunc-convert-dimension-speed' => 'sebesség',
+	'pfunc-convert-dimension-temperature' => 'hőmérséklet',
+	'pfunc-convert-dimension-acceleration' => 'gyorsulás',
+	'pfunc-convert-dimension-force' => 'erő',
+	'pfunc-convert-dimension-torque' => 'nyomaték',
+	'pfunc-convert-dimension-energy' => 'energia',
+	'pfunc-convert-dimension-pressure' => 'nyomás',
+	'pfunc-convert-dimension-density' => 'sűrűség',
+	'pfunc-convert-prefix-yotta' => 'yotta',
+	'pfunc-convert-prefix-zetta' => 'zetta',
+	'pfunc-convert-prefix-exa' => 'exa',
+	'pfunc-convert-prefix-peta' => 'peta',
+	'pfunc-convert-prefix-tera' => 'tera',
+	'pfunc-convert-prefix-giga' => 'giga',
+	'pfunc-convert-prefix-mega' => 'mega',
+	'pfunc-convert-prefix-kilo' => 'kilo',
+	'pfunc-convert-prefix-hecto' => 'hekto',
+	'pfunc-convert-prefix-deca' => 'deka',
+	'pfunc-convert-prefix-deci' => 'deci',
+	'pfunc-convert-prefix-centi' => 'centi',
+	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-micro' => 'mikro',
+	'pfunc-convert-prefix-nano' => 'nano',
+	'pfunc-convert-prefix-pico' => 'piko',
+	'pfunc-convert-prefix-femto' => 'femto',
+	'pfunc-convert-prefix-atto' => 'atto',
+	'pfunc-convert-prefix-zepto' => 'zepto',
+	'pfunc-convert-prefix-yocto' => 'yokto',
+	'pfunc-convert-unit-length-metre' => '$1$3méter',
+	'pfunc-convert-unit-length-mile' => '$1mérföld',
+	'pfunc-convert-unit-length-foot' => '$1láb',
+	'pfunc-convert-unit-length-nauticalmile' => '$1tengeri mérföld',
+	'pfunc-convert-unit-length-lightyear' => '$1$3fényév',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1csillagászati egység',
+	'pfunc-convert-unit-area-hectare' => '$1hektár',
 );
 
 /** Interlingua (Interlingua)
@@ -1630,12 +2241,12 @@ $messages['ia'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2metro|$2metros}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ångström|ångströmes}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|millia|millias}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlongs}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|catena|catenas}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|pertica|perticas}}',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metro|$3metros}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ångström|ångströmes}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|millia|millias}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongs}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|catena|catenas}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|pertica|perticas}}',
 );
 
 /** Indonesian (Bahasa Indonesia)
@@ -1701,6 +2312,73 @@ $messages['it'] = array(
 	'pfunc_expr_unknown_error' => "Errore nell'espressione: errore sconosciuto ($1)",
 	'pfunc_expr_not_a_number' => 'In $1: il risultato non è un numero',
 	'pfunc_string_too_long' => 'Errore: la stringa supera il limite di $1 {{PLURAL:$1|carattere|caratteri}}',
+	'pfunc-convert-unknownunit' => 'Errore: Unità sconosciuta "$1".',
+	'pfunc-convert-unknowndimension' => 'Errore: Dimensione sconosciuta "$1".',
+	'pfunc-convert-dimension-length' => 'lunghezza',
+	'pfunc-convert-dimension-area' => 'area',
+	'pfunc-convert-dimension-volume' => 'volume',
+	'pfunc-convert-dimension-time' => 'tempo',
+	'pfunc-convert-dimension-timesquared' => 'tempo<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'massa',
+	'pfunc-convert-dimension-speed' => 'velocità',
+	'pfunc-convert-dimension-temperature' => 'temperatura',
+	'pfunc-convert-dimension-acceleration' => 'accelerazione',
+	'pfunc-convert-dimension-force' => 'forza',
+	'pfunc-convert-dimension-torque' => 'coppia',
+	'pfunc-convert-dimension-energy' => 'energia',
+	'pfunc-convert-dimension-power' => 'potenza',
+	'pfunc-convert-dimension-pressure' => 'pressione',
+	'pfunc-convert-dimension-density' => 'densità',
+	'pfunc-convert-prefix-yotta' => 'yotta',
+	'pfunc-convert-prefix-zetta' => 'zetta',
+	'pfunc-convert-prefix-exa' => 'exa',
+	'pfunc-convert-prefix-peta' => 'peta',
+	'pfunc-convert-prefix-tera' => 'tera',
+	'pfunc-convert-prefix-giga' => 'giga',
+	'pfunc-convert-prefix-mega' => 'mega',
+	'pfunc-convert-prefix-hecto' => 'etto',
+	'pfunc-convert-prefix-deca' => 'deca',
+	'pfunc-convert-prefix-deci' => 'deci',
+	'pfunc-convert-prefix-centi' => 'centi',
+	'pfunc-convert-prefix-milli' => 'milli',
+	'pfunc-convert-prefix-micro' => 'micro',
+	'pfunc-convert-prefix-nano' => 'nano',
+	'pfunc-convert-prefix-pico' => 'pico',
+	'pfunc-convert-prefix-femto' => 'femto',
+	'pfunc-convert-prefix-atto' => 'atto',
+	'pfunc-convert-prefix-zepto' => 'zepto',
+	'pfunc-convert-prefix-yocto' => 'yocto',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3metro|$3metri}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|piede|piedi}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|pollice|pollici}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3anno luce|$3anni luce}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|secondo|secondi}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3anno|$3anni}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|giorno|giorni}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|ora|ore}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuto|minuti}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|metro cubo|metri cubi}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litro|litri}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimetro di mercurio|millimetri di mercurio}}',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
 );
 
 /** Japanese (日本語)
@@ -1869,6 +2547,7 @@ $messages['ko'] = array(
 
 /** Colognian (Ripoarisch)
  * @author Purodha
+ * @author Rentenirer
  */
 $messages['ksh'] = array(
 	'pfunc_desc' => 'Deit em Wiki Funxione för Entscheidunge un esu dobei.',
@@ -1918,11 +2597,11 @@ $messages['ksh'] = array(
 	'pfunc-convert-prefix-atto' => 'Atto',
 	'pfunc-convert-prefix-zepto' => 'Zäpto',
 	'pfunc-convert-prefix-yocto' => 'Jokto',
-	'pfunc-convert-unit-length-metre' => 'Meeter',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|Meil|Meile|Meile}}',
-	'pfunc-convert-unit-area-squarekilometre' => 'Quadraatkillomeetere',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm²',
+	'pfunc-convert-unit-length-metre' => '$1Meeter',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|Meil|Meile|Meile}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1Quadraatkillomeetere',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m²',
 );
 
 /** Luxembourgish (Lëtzebuergesch)
@@ -1947,6 +2626,46 @@ $messages['lb'] = array(
 	'pfunc_expr_unknown_error' => 'Expression-Feeler: Onbekannte Feeler ($1)',
 	'pfunc_expr_not_a_number' => "An $1: D'Resultat ass keng Zuel",
 	'pfunc_string_too_long' => "Feeler: D'Zeecheketten ass méi laang wéi d'Limit vu(n) $1 Zeechen",
+	'pfunc-convert-dimensionmismatch' => 'Feeler: Et kann net vun der Eenheet "$1" an d\'Eenheet "$2" konvertéiert ginn',
+	'pfunc-convert-unknownunit' => 'Feeler: Onbekannten Eenheet "$1".',
+	'pfunc-convert-unknowndimension' => 'Feeler: Onbekannten Dimensioun "$1".',
+	'pfunc-convert-dimension-length' => 'Längt',
+	'pfunc-convert-dimension-area' => 'Fläch',
+	'pfunc-convert-dimension-volume' => 'Volume',
+	'pfunc-convert-dimension-time' => 'Zäit',
+	'pfunc-convert-dimension-mass' => 'Mass',
+	'pfunc-convert-dimension-speed' => 'Vitesse',
+	'pfunc-convert-dimension-temperature' => 'Temperatur',
+	'pfunc-convert-dimension-acceleration' => 'Beschleunegung',
+	'pfunc-convert-dimension-force' => 'Kraaft',
+	'pfunc-convert-dimension-torque' => 'Dréimoment',
+	'pfunc-convert-dimension-energy' => 'Energie',
+	'pfunc-convert-dimension-power' => 'Leeschtung',
+	'pfunc-convert-dimension-pressure' => 'Drock',
+	'pfunc-convert-dimension-density' => 'Densitéit',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|Meter|Meter}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|Meil|Meilen}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|Fouss|Féiss}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautesch Meil|nautesch Meilen}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 Liichtjoer|$3 Liichtjoer}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomesch Eenheet|astronomesch Eenheeten}}',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|Quadratkilometer|Quadratkilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|Quadratmeter|Quadratmeter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|Quadratzentimeter|Quadratzentimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|Quadratmillimeter|Quadratmillimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|Hektar|Hektar}}',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|Sekonn|Sekonnen}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|Joer|Joer}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|Dag|Deeg}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|Stonn|Stonnen}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|Minutt|Minutten}}',
+	'pfunc-convert-unit-time-day-abbr' => '$1Dag',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|Kubikmeter|Kubikmeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|Fudder|Fudder}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|Liter|Liter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|Milliliter|Milliliter}}',
+	'pfunc-convert-unit-speed-mile-hour' => '$1Meile pro Stonn',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|Atmosphäre|Atmosphären}}',
 );
 
 /** Limburgish (Limburgs)
@@ -2079,154 +2798,154 @@ $messages['mk'] = array(
 	'pfunc-convert-prefix-atto-abbr' => 'а',
 	'pfunc-convert-prefix-zepto-abbr' => 'з',
 	'pfunc-convert-prefix-yocto-abbr' => 'ј',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|метар|метри}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ангстрем|ангстреми}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|милја|милји}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|фурлонг|фурлонзи}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|ланец|ланци}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|прачка|прачки}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|фатом|фатоми}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|јарда|јарди}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|стапка|стапки}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|дланка|дланки}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|инч|инчи}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|наутичка милја|наутички милји}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|наутичка милја (британска, пред 1970)|наутички милји (британска, пред 1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{PLURAL:$1|наутичка милја (американска, пред 1954)|наутички милји (американски, пред 1954)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2 парсек|$2 парсеци}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|светлосна година|светлосни години}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|астрономска единица|астрономски единици}}',
-	'pfunc-convert-unit-length-metre-abbr' => '$2 м',
-	'pfunc-convert-unit-length-mile-abbr' => 'ми',
-	'pfunc-convert-unit-length-furlong-abbr' => 'фурлонг',
-	'pfunc-convert-unit-length-chain-abbr' => 'ланец',
-	'pfunc-convert-unit-length-rod-abbr' => 'пр',
-	'pfunc-convert-unit-length-fathom-abbr' => 'фатом',
-	'pfunc-convert-unit-length-yard-abbr' => 'јд',
-	'pfunc-convert-unit-length-foot-abbr' => 'ст',
-	'pfunc-convert-unit-length-hand-abbr' => 'дл',
-	'pfunc-convert-unit-length-inch-abbr' => 'ин',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'нми',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'нми (брит)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'нми (амер. пред 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 пс',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 сг',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'ae',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|квадратен километар|квадратни километри}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|квадратен метар|квадратни метри}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|квадратен сантиметар|квадратни сантиметри}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|квадратен милиметар|квадратни милиметри}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|хектар|хектари}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|квадратна милја|квадратни милји}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|акр|акри}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|квадратна јарда|квадратни јарди}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|квадратна стапка|квадратни стапки}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|квадратен инч|квадратни инчи}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|квадратна наутичка милја|квадратни наутички милји}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|дунум|дунуми}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|цубо|цуба}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'км<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'м<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'см<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'мм<msup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ха',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'ми<sup>2</sup>',
-	'pfunc-convert-unit-area-acre-abbr' => 'акр',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'јд<sup>2</sup>',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'ст<sup>2</sup>',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'ин<sup>2</sup>',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'нми<sup>2</sup>',
-	'pfunc-convert-unit-area-dunam-abbr' => 'дунум',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'цубо',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|секунда|секунди}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|година|години}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|ден|дена}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|час|часа}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|минута|минути}}',
-	'pfunc-convert-unit-time-second-abbr' => 'с',
-	'pfunc-convert-unit-time-year-abbr' => '$2 г',
-	'pfunc-convert-unit-time-day-abbr' => 'ден',
-	'pfunc-convert-unit-time-hour-abbr' => 'ч',
-	'pfunc-convert-unit-time-minute-abbr' => 'мин',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|кубен метар|кубни метри}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|кубен сантиметар|кубни сантиметри}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|кубен милиметар|кубни милиметри}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|килолитар|килолитри}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|литар|литри}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|центилитар|центилитри}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|милилитар|милилитри}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|кубна јарда|кубни јарди}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|кубна стапка|кубни стапки}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|кубен инч|кубни инчи}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|барел|барели}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|бушел|бушели}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|галон|галони}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|кварта|кварти}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|пинта|пинти}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|течна унца|течни унци}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|американски барел|американски барели}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|барел|барели}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|барел|барели}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|американски галон|американски галони}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|американска кварта|американски кварти}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|американска пинта|американски пинти}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|американска течна унца|американски течни унци}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|американски сув барел|американски суви барели}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|американски бушел|американски бушели}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|американски сув галон|американски суви галони}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|американска сува кварта|американски суви кварти}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|американска сува пинта|американски суви пинти}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'м<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'см<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'мм<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 л',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'јд<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'ст<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'ин<sup>3</sup>',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'ббл',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'бш',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'гал',
-	'pfunc-convert-unit-volume-quart-abbr' => 'кт',
-	'pfunc-convert-unit-volume-pint-abbr' => 'пт',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'тч уц',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'ббл (САД)',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'ббл',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'ббл',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'гал (САД)',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'кт (САД)',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'пт (САД)',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'тч уц (САД)',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'ббл (САД)',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'бш (САД)',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'сув гал (САД)',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'сув кт (САД)',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'сув пт (САД)',
-	'pfunc-convert-unit-speed-mile-hour' => 'милји на час',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'ми/ч',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|паскал|паскали}}',
-	'pfunc-convert-unit-pressure-bar' => 'бар',
-	'pfunc-convert-unit-pressure-decibar' => 'децибар',
-	'pfunc-convert-unit-pressure-millibar' => 'милибар',
-	'pfunc-convert-unit-pressure-kilobarye' => 'килобарија',
-	'pfunc-convert-unit-pressure-barye' => 'барија',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|атмосфера|атмосфери}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|тор|тора}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|милиметар живин столб|милиметри живин столб}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|инч живин столб|инчи живин столб}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|фунта на квадратен инч|фунти на квадратен инч}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2 Па',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'бар',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'дбар',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'мбар',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'кБа',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ба',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'атм',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'тор',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'ммHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'инHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|метар|метри}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ангстрем|ангстреми}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|милја|милји}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|фурлонг|фурлонзи}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|ланец|ланци}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|прачка|прачки}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|фатом|фатоми}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|јарда|јарди}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|стапка|стапки}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|дланка|дланки}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|инч|инчи}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|наутичка милја|наутички милји}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|наутичка милја (британска, пред 1970)|наутички милји (британска, пред 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{PLURAL:$2|наутичка милја (американска, пред 1954)|наутички милји (американски, пред 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3 парсек|$3 парсеци}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|светлосна година|светлосни години}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|астрономска единица|астрономски единици}}',
+	'pfunc-convert-unit-length-metre-abbr' => '$1$3 м',
+	'pfunc-convert-unit-length-mile-abbr' => '$1ми',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1фурлонг',
+	'pfunc-convert-unit-length-chain-abbr' => '$1ланец',
+	'pfunc-convert-unit-length-rod-abbr' => '$1пр',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1фатом',
+	'pfunc-convert-unit-length-yard-abbr' => '$1јд',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ст',
+	'pfunc-convert-unit-length-hand-abbr' => '$1дл',
+	'pfunc-convert-unit-length-inch-abbr' => '$1ин',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1нми',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1нми (брит)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1нми (амер. пред 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 пс',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 сг',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1ae',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|квадратен километар|квадратни километри}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|квадратен метар|квадратни метри}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|квадратен сантиметар|квадратни сантиметри}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|квадратен милиметар|квадратни милиметри}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|хектар|хектари}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|квадратна милја|квадратни милји}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|акр|акри}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|квадратна јарда|квадратни јарди}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|квадратна стапка|квадратни стапки}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|квадратен инч|квадратни инчи}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|квадратна наутичка милја|квадратни наутички милји}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|дунум|дунуми}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|цубо|цуба}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1км<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1м<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1см<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1мм<msup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ха',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1ми<sup>2</sup>',
+	'pfunc-convert-unit-area-acre-abbr' => '$1акр',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1јд<sup>2</sup>',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ст<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1ин<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1нми<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1дунум',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1цубо',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|секунда|секунди}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|година|години}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|ден|дена}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|час|часа}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|минута|минути}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1с',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3 г',
+	'pfunc-convert-unit-time-day-abbr' => '$1ден',
+	'pfunc-convert-unit-time-hour-abbr' => '$1ч',
+	'pfunc-convert-unit-time-minute-abbr' => '$1мин',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|кубен метар|кубни метри}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|кубен сантиметар|кубни сантиметри}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|кубен милиметар|кубни милиметри}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|килолитар|килолитри}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|литар|литри}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|центилитар|центилитри}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|милилитар|милилитри}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|кубна јарда|кубни јарди}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|кубна стапка|кубни стапки}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|кубен инч|кубни инчи}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|барел|барели}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|бушел|бушели}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|галон|галони}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|кварта|кварти}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|пинта|пинти}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|течна унца|течни унци}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|американски барел|американски барели}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|барел|барели}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|барел|барели}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|американски галон|американски галони}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|американска кварта|американски кварти}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|американска пинта|американски пинти}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|американска течна унца|американски течни унци}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|американски сув барел|американски суви барели}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|американски бушел|американски бушели}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|американски сув галон|американски суви галони}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|американска сува кварта|американски суви кварти}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|американска сува пинта|американски суви пинти}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1м<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1см<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1мм<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 л',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1јд<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ст<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1ин<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1ббл',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1бш',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1гал',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1кт',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1пт',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1тч уц',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1ббл (САД)',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1ббл',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1ббл',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1гал (САД)',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1кт (САД)',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1пт (САД)',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1тч уц (САД)',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1ббл (САД)',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1бш (САД)',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1сув гал (САД)',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1сув кт (САД)',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1сув пт (САД)',
+	'pfunc-convert-unit-speed-mile-hour' => '$1милји на час',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1ми/ч',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|паскал|паскали}}',
+	'pfunc-convert-unit-pressure-bar' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar' => '$1децибар',
+	'pfunc-convert-unit-pressure-millibar' => '$1милибар',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1килобарија',
+	'pfunc-convert-unit-pressure-barye' => '$1барија',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|атмосфера|атмосфери}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|тор|тора}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|милиметар живин столб|милиметри живин столб}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|инч живин столб|инчи живин столб}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|фунта на квадратен инч|фунти на квадратен инч}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3 Па',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1дбар',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1мбар',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1кБа',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ба',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1атм',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1тор',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1ммHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1инHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Malayalam (മലയാളം)
@@ -2254,6 +2973,124 @@ $messages['ml'] = array(
 	'pfunc_expr_unknown_error' => 'പ്രയോഗരീതിയിൽ പിഴവ്: കാരണം അജ്ഞാതമായ പിഴവ് ($1)',
 	'pfunc_expr_not_a_number' => '$1-ൽ: ഫലം ഒരു സംഖ്യയല്ല',
 	'pfunc_string_too_long' => 'പിഴവ്: പദം ലിപികളുടെ പരിധിയായ $1 അതിലംഘിക്കുന്നു',
+	'pfunc-convert-dimensionmismatch' => 'പിഴവ്: "$1", "$2" എന്നീ ഏകകങ്ങൾ തമ്മിൽ പരിവർത്തിപ്പിക്കാനാവില്ല.',
+	'pfunc-convert-unknownunit' => 'പിഴവ്: അപരിചിതമായ ഏകകം "$1".',
+	'pfunc-convert-unknowndimension' => 'പിഴവ്: അപരിചിതമായ പരിമാണം "$1".',
+	'pfunc-convert-invalidcompoundunit' => 'പിഴവ്: അസാധുവായ സംയുക്ത ഏകകം "$1".',
+	'pfunc-convert-nounit' => 'പിഴവ്: സ്രോതസ്സ് ഏകകം നൽകിയിട്ടില്ല.',
+	'pfunc-convert-dimension-length' => 'നീളം',
+	'pfunc-convert-dimension-area' => 'വിസ്തീർണ്ണം',
+	'pfunc-convert-dimension-volume' => 'വ്യാപ്തം',
+	'pfunc-convert-dimension-time' => 'സമയം',
+	'pfunc-convert-dimension-timesquared' => 'സമയം<sup>2</sup>',
+	'pfunc-convert-dimension-mass' => 'പിണ്ഡം',
+	'pfunc-convert-dimension-speed' => 'വേഗം',
+	'pfunc-convert-dimension-temperature' => 'താപനില',
+	'pfunc-convert-dimension-acceleration' => 'ത്വരണം',
+	'pfunc-convert-dimension-force' => 'ബലം',
+	'pfunc-convert-dimension-torque' => 'ടോർക്ക്',
+	'pfunc-convert-dimension-energy' => 'ഊർജ്ജം',
+	'pfunc-convert-dimension-power' => 'ശക്തി',
+	'pfunc-convert-dimension-pressure' => 'മർദ്ദം',
+	'pfunc-convert-dimension-density' => 'സാന്ദ്രത',
+	'pfunc-convert-prefix-yotta' => 'യോട്ട',
+	'pfunc-convert-prefix-zetta' => 'സീറ്റ',
+	'pfunc-convert-prefix-exa' => 'എക്സാ',
+	'pfunc-convert-prefix-peta' => 'പെറ്റാ',
+	'pfunc-convert-prefix-tera' => 'ടെറാ',
+	'pfunc-convert-prefix-giga' => 'ഗിഗാ',
+	'pfunc-convert-prefix-mega' => 'മെഗാ',
+	'pfunc-convert-prefix-kilo' => 'കിലോ',
+	'pfunc-convert-prefix-hecto' => 'ഹെക്ടോ',
+	'pfunc-convert-prefix-deca' => 'ഡെക്കാ',
+	'pfunc-convert-prefix-deci' => 'ഡെസി',
+	'pfunc-convert-prefix-centi' => 'സെന്റി',
+	'pfunc-convert-prefix-milli' => 'മില്ലി',
+	'pfunc-convert-prefix-micro' => 'മൈക്രോ',
+	'pfunc-convert-prefix-nano' => 'നാനോ',
+	'pfunc-convert-prefix-pico' => 'പൈകോ',
+	'pfunc-convert-prefix-femto' => 'ഫെംറ്റോ',
+	'pfunc-convert-prefix-atto' => 'അറ്റോ',
+	'pfunc-convert-prefix-zepto' => 'സെപ്റ്റോ',
+	'pfunc-convert-prefix-yocto' => 'യോക്റ്റോ',
+	'pfunc-convert-prefix-milli-abbr' => 'മി.',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3മീറ്റർ|$3 മീറ്ററുകൾ}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ആംസ്ട്രോം|ആംസ്ട്രോം}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|മൈൽ|മൈൽ}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|ഗജം|ഗജം}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|അടി|അടി}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|ഇഞ്ച്|ഇഞ്ച്}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|നോട്ടിക്കൽ മൈൽ|നോട്ടിക്കൽ മൈൽ}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3പാർസെക്|$3പാർസെക്}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3പ്രകാശവർഷം|$3പ്രകാശവർഷങ്ങൾ}}',
+	'pfunc-convert-unit-length-yard-abbr' => '$1ഗജം',
+	'pfunc-convert-unit-length-foot-abbr' => '$1അടി',
+	'pfunc-convert-unit-length-inch-abbr' => '$1ഇഞ്ച്',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3പാ.സെ.',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3പ്ര.വ.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|ചതുരശ്ര കിലോമീറ്റർ|ചതുരശ്ര കിലോമീറ്റർ}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|ചതുരശ്ര മീറ്റർ|ചതുരശ്ര മീറ്റർ}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|ചതുരശ്ര സെന്റീമീറ്റർ|ചതുരശ്ര സെന്റീമീറ്റർ}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|ചതുരശ്ര മില്ലിമീറ്റർ|ചതുരശ്ര മില്ലിമീറ്റർ}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|ഹെക്ടർ|ഹെക്ടർ}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|ചതുരശ്ര മൈൽ|ചതുരശ്ര മൈൽ}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|ഏക്കർ|ഏക്കർ}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|ചതുരശ്ര ഗജം|ചതുരശ്ര ഗജം}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|ചതുരശ്ര അടി|ചതുരശ്ര അടി}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|ചതുരശ്ര ഇഞ്ച്|ചതുരശ്ര ഇഞ്ച്}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|ചതുരശ്ര നോട്ടിക്കൽ മൈൽ|ചതുരശ്ര നോട്ടിക്കൽ മൈൽ}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1കി.മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1സെ.മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1മി.മീ.<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ഹെ.',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1ചതു.മൈൽ',
+	'pfunc-convert-unit-area-acre-abbr' => '$1ഏക്കർ',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1ചതു.വാര',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1ചതു.അടി',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1ചതു.ഇഞ്ച്',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|സെക്കന്റ്|സെക്കന്റ്}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|ഒരു വർഷം|$3 വർഷം}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|ദിവസം|ദിവസം}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|മണിക്കൂർ|മണിക്കൂർ}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|മിനിറ്റ്|മിനിറ്റ്}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1സെ.',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3വർഷം',
+	'pfunc-convert-unit-time-day-abbr' => '$1ദിവസം',
+	'pfunc-convert-unit-time-hour-abbr' => '$1മണി.',
+	'pfunc-convert-unit-time-minute-abbr' => '$1മിനി.',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|ഘന മീറ്റർ|ഘന മീറ്റർ}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|ഘന സെന്റീമീറ്റർ|ഘന സെന്റീമീറ്റർ}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|ഘന മില്ലീമീറ്റർ|ഘന മില്ലീമീറ്റർ}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|കിലോലിറ്റർ|കിലോലിറ്റർ}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|ലിറ്റർ|ലിറ്റർ}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|സെന്റിലിറ്റർ|സെന്റിലിറ്റർ}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|മില്ലിലിറ്റർ|മില്ലിലിറ്റർ}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|ഘന ഗജം|ഘന ഗജം}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|ഘന അടി|ഘന അടി}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|ഘന ഇഞ്ച്|ഘന ഇഞ്ച്}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|ബാരൽ|ബാരൽ}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|ബാരൽ|ബാരൽ}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|ബാരൽ|ബാരൽ}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1മീ.<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1സെ.മീ.<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1മി.മീ.<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3ലി.',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1ഘന ഗജം',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ഘ. അടി.',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1ഘ. ഇഞ്ച്.',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1ബാരൽ',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1ഗാലൺ',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1ബാരൽ',
+	'pfunc-convert-unit-speed-mile-hour' => '$1മൈൽ/മണിക്കൂർ',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1മൈ./മണി.',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3പാസ്കൽ|$3പാസ്കൽ}}',
+	'pfunc-convert-unit-pressure-bar' => '$1ബാർ',
+	'pfunc-convert-unit-pressure-decibar' => '$1ഡെസിബാർ',
+	'pfunc-convert-unit-pressure-millibar' => '$1മില്ലിബാർ',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|രസം മില്ലിമീറ്ററിൽ|രസം മില്ലിമീറ്ററിൽ}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|രസം ഇഞ്ചിൽ|രസം ഇഞ്ചിൽ}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3പാസ്ക.',
 );
 
 /** Marathi (मराठी)
@@ -2352,152 +3189,153 @@ $messages['ms'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2meter|$2meter}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstrom}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|batu|batu}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlong}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|rantai|rantai}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|pol|pol}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|fatom|fatom}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|ela|ela}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|kaki|kaki}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|tangan|tangan}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|inci|inci}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|batu nautika|batu nautika}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|batu nautika (British pra-1970)|batu nautika (British pra-1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|batu nautika (AS pra-1954)|batu nautika (AS pra-1954)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsek|$2parsek}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2tahun cahaya|$2tahun cahaya}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|unit astronomi|unit astronomi}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'rantai',
-	'pfunc-convert-unit-length-rod-abbr' => 'pol',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fatom',
-	'pfunc-convert-unit-length-yard-abbr' => 'ela',
-	'pfunc-convert-unit-length-foot-abbr' => 'kaki',
-	'pfunc-convert-unit-length-hand-abbr' => 'tgn',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'batu n',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'batu n (Brit)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'batu n (AS pra-1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2tc',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AU',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kilometer persegi|kilometer persegi}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|meter persegi|meter persegi}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|sentimeter persegi|sentimeter persegi}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|milimeter persegi|milimeter persegi}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektar}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|batu persegi|batu persegi}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|ekar|ekar}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|ela persegi|ela persegi}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|kaki persegi|kaki persegi}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|inci persegi|inci persegi}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|batu nautika persegi|batu nautika persegi}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunam}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'batu<sup>2</sup>',
-	'pfunc-convert-unit-area-acre-abbr' => 'ekar',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'ela<sup>2</sup>',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'kaki<sup>2</sup>',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'inci<sup>2</sup>',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'batu n<sup>2</sup>',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL: $1|saat|saat}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL: $1|$2tahun|$2tahun}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|hari|hari}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|jam|jam}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minit|minit}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2thn',
-	'pfunc-convert-unit-time-day-abbr' => 'hari',
-	'pfunc-convert-unit-time-hour-abbr' => 'jam',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|meter padu|meter padu}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|sentimeter padu|sentimeter padu}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|milimeter padu|milimeter padu}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kilolite|kiloliter}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|liter}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|sentiliter|sentiliter}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|mililiter|mililiter}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|ela padu|ela padu}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kaki padu|kaki padu}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|inci padu|inci padu}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|tong|tong}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|busyel|busyel}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|gelen|gelen}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|kuart|kuart}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pain|pain}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|auns bendalir|auns bendalir}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|tong AS|tong AS}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|tong|tong}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|tong|tong}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|gelen AS|gelen AS}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|kuart AS|kuart AS}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|pain AS|pain AS}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|auns bendalir AS|auns bendalir AS}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|tong kering AS|tong kering AS}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|busyel AS|busyel AS}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|gelen kering AS|gelen kering AS}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|kuart kering AS|kuart kering AS}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|pain kering AS|pain kering AS}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'ela<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'kaki<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'inci<sup>3</sup>',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'tong',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'tong AS',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'tong',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'tong',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'gal AS',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'qt AS',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'pt AS',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'fl oz AS',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'tong AS',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'bsh AS',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'gal kering AS',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'qt kering AS',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'pt kering AS',
-	'pfunc-convert-unit-speed-mile-hour' => 'batu sejam',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'bsj',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascal}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'desibar',
-	'pfunc-convert-unit-pressure-millibar' => 'milibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarye',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfera|atmosfera}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|Torr|Torr}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|milimeter raksa|milimeter raksa}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|inci raksa|inci raksa}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|paun seinci persegi|paun seinci persegi}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3meter|$3meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstrom}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|batu|batu}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlong}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|rantai|rantai}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|pol|pol}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|fatom|fatom}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|ela|ela}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|kaki|kaki}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|tangan|tangan}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|inci|inci}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|batu nautika|batu nautika}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|batu nautika (British pra-1970)|batu nautika (British pra-1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|batu nautika (AS pra-1954)|batu nautika (AS pra-1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsek|$3parsek}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3tahun cahaya|$3tahun cahaya}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|unit astronomi|unit astronomi}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1rantai',
+	'pfunc-convert-unit-length-rod-abbr' => '$1pol',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fatom',
+	'pfunc-convert-unit-length-yard-abbr' => '$1ela',
+	'pfunc-convert-unit-length-foot-abbr' => '$1kaki',
+	'pfunc-convert-unit-length-hand-abbr' => '$1tgn',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1batu n',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1batu n (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1batu n (AS pra-1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3tc',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilometer persegi|kilometer persegi}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|meter persegi|meter persegi}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|sentimeter persegi|sentimeter persegi}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|milimeter persegi|milimeter persegi}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektar}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|batu persegi|batu persegi}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|ekar|ekar}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|ela persegi|ela persegi}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|kaki persegi|kaki persegi}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|inci persegi|inci persegi}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|batu nautika persegi|batu nautika persegi}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunam}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1batu<sup>2</sup>',
+	'pfunc-convert-unit-area-acre-abbr' => '$1ekar',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1ela<sup>2</sup>',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1kaki<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1inci<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1batu n<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL: $2|saat|saat}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL: $2|$3tahun|$3tahun}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|hari|hari}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|jam|jam}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minit|minit}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3thn',
+	'pfunc-convert-unit-time-day-abbr' => '$1hari',
+	'pfunc-convert-unit-time-hour-abbr' => '$1jam',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|meter padu|meter padu}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|sentimeter padu|sentimeter padu}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|milimeter padu|milimeter padu}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kilolite|kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|sentiliter|sentiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|mililiter|mililiter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|ela padu|ela padu}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kaki padu|kaki padu}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|inci padu|inci padu}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|tong|tong}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|busyel|busyel}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gelen|gelen}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|kuart|kuart}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pain|pain}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|auns bendalir|auns bendalir}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|tong AS|tong AS}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|tong|tong}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|tong|tong}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|gelen AS|gelen AS}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|kuart AS|kuart AS}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|pain AS|pain AS}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|auns bendalir AS|auns bendalir AS}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|tong kering AS|tong kering AS}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|busyel AS|busyel AS}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|gelen kering AS|gelen kering AS}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|kuart kering AS|kuart kering AS}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|pain kering AS|pain kering AS}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1ela<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1kaki<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1inci<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1tong',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1tong AS',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1tong',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1tong',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1gal AS',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1qt AS',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1pt AS',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1fl oz AS',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1tong AS',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1bsh AS',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1gal kering AS',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1qt kering AS',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1pt kering AS',
+	'pfunc-convert-unit-speed-mile-hour' => '$1batu sejam',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1bsj',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1desibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosfera}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milimeter raksa|milimeter raksa}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|inci raksa|inci raksa}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|paun seinci persegi|paun seinci persegi}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Erzya (Эрзянь)
@@ -2615,152 +3453,153 @@ $messages['nl'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yocto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|meter|meter}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrom|angstrom}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|mijl|mijl}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlong}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|chain|chains}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|roede|roede}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|vadem|vadem}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yard|yards}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|voet|voet}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|hand|handen}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|inch|inches}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|nautische mijl|nautische mijlen}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|nautische mijl (Brits, voor 1970)|nautische mijlen (Brits, voor 1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|nautische mijl (VS, voor 1954)|nautische mijlen (VS, voor 1954)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2 parsec|$2 parsecs}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2 lichtjaar|$2 lichtjaren}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomische eenheid|astronomische eenheden}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fath',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'NM',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'MN (Brits)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'MN (VS voor 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2lj',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AE',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|vierkante kilometer|vierkante kilometer}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|vierkante meter|vierkante meter}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|vierkante centimeter|vierkante centimeter}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|vierkante millimeter|vierkante millimeter}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hectare|hectare}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|vierkante mijl|vierkante mijl}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|acre|acres}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|vierkante yard|vierkante yards}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|voerkante foot|vierkante foot}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|vierkante inch|vierkante inches}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|vierkante nautische mijl|vierkante nautische mijlen}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunams}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'sq mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'acre',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'sq yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'sq ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'sq in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'vierkante mijl',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|seconde|seconden}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2jaar|$2jaren}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dag|dagen}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|uur|uur}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minuut|minuten}}',
-	'pfunc-convert-unit-time-second-abbr' => 'sec.',
-	'pfunc-convert-unit-time-year-abbr' => '$2jaar',
-	'pfunc-convert-unit-time-day-abbr' => 'dag',
-	'pfunc-convert-unit-time-hour-abbr' => 'uur',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1| kubieke meter|kubieke meter}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|kubieke centimeter|kubieke centimeter}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|kubieke millimeter|kubieke millimeter}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kiloliter|kiloliter}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|liter}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centiliters|centiliter}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|milliliter|milliliter}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|kubieke yard|kubieke yard}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kubieke voet|kubieke voet}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|kubieke inch|kubieke inch}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|vat|vaten}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|bushel|bushels}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|gallon|gallon}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|quart|quart}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pint|pints}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|fluid ounce|fluid ounces}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|VS-vat|VS-vaten}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|vat|vaten}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|vat|vaten}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|VS-gallon|VS-gallon}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|VS-quart|VS-quart}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|VS-pint|VS-pints}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|VS-fluid ounce|VS-fluid ounces}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|VS-droog vat|VS-droge vaten}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|VS-bushel|VS-bushels}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|VS-droge gallon|VS-droge gallon}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|VS-droge quart|VS-droge quart}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|VS-droge pint|VS-droge pints}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => 'l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'yd<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'ft<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'in<sup>3</sup>',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl.oz.',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'VS bbl',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'VS gal',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'VS qt',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'VS pt',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'VS fl.oz.',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'VS bbl',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'VS bsh',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'VS drg.gal',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'VS drg.qt',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'VS drg.pt',
-	'pfunc-convert-unit-speed-mile-hour' => 'mijl per uur',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mpu',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascal}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'millibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarn',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfeer|atmosfeer}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|Torr|Torr}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|millimeter kwik|millimeter kwik}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|duim kwik|duimen kwik}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|pond per vierkante inch|pond per vierkante inch}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|meter|meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrom|angstrom}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mijl|mijl}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlong}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chain|chains}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|roede|roede}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|vadem|vadem}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|voet|voet}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|hand|handen}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|inch|inches}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautische mijl|nautische mijlen}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|nautische mijl (Brits, voor 1970)|nautische mijlen (Brits, voor 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|nautische mijl (VS, voor 1954)|nautische mijlen (VS, voor 1954)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3 parsec|$3 parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 lichtjaar|$3 lichtjaren}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomische eenheid|astronomische eenheden}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fath',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1NM',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1MN (Brits)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1MN (VS voor 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3lj',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AE',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|vierkante kilometer|vierkante kilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|vierkante meter|vierkante meter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|vierkante centimeter|vierkante centimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|vierkante millimeter|vierkante millimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hectare|hectare}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|vierkante mijl|vierkante mijl}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|acre|acres}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|vierkante yard|vierkante yards}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|voerkante foot|vierkante foot}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|vierkante inch|vierkante inches}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|vierkante nautische mijl|vierkante nautische mijlen}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunams}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1sq mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1acre',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1sq yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1sq ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1sq in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1vierkante mijl',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|seconde|seconden}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3jaar|$3jaren}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dag|dagen}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|uur|uur}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuut|minuten}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1sec.',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3jaar',
+	'pfunc-convert-unit-time-day-abbr' => '$1dag',
+	'pfunc-convert-unit-time-hour-abbr' => '$1uur',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2| kubieke meter|kubieke meter}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|kubieke centimeter|kubieke centimeter}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|kubieke millimeter|kubieke millimeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kiloliter|kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centiliters|centiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|milliliter|milliliter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|kubieke yard|kubieke yard}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kubieke voet|kubieke voet}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|kubieke inch|kubieke inch}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|vat|vaten}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|bushel|bushels}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gallon|gallon}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|quart|quart}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pint|pints}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|fluid ounce|fluid ounces}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|VS-vat|VS-vaten}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|vat|vaten}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|vat|vaten}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|VS-gallon|VS-gallon}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|VS-quart|VS-quart}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|VS-pint|VS-pints}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|VS-fluid ounce|VS-fluid ounces}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|VS-droog vat|VS-droge vaten}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|VS-bushel|VS-bushels}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|VS-droge gallon|VS-droge gallon}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|VS-droge quart|VS-droge quart}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|VS-droge pint|VS-droge pints}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1yd<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1ft<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1in<sup>3</sup>',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl.oz.',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1VS bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1VS gal',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1VS qt',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1VS pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1VS fl.oz.',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1VS bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1VS bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1VS drg.gal',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1VS drg.qt',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1VS drg.pt',
+	'pfunc-convert-unit-speed-mile-hour' => '$1mijl per uur',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mpu',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarn',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfeer|atmosfeer}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimeter kwik|millimeter kwik}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|duim kwik|duimen kwik}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|pond per vierkante inch|pond per vierkante inch}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Norwegian Nynorsk (‪Norsk (nynorsk)‬)
@@ -2792,10 +3631,11 @@ $messages['nn'] = array(
 );
 
 /** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+ * @author Event
  * @author Jon Harald Søby
  * @author Laaknor
  */
-$messages['no'] = array(
+$messages['nb'] = array(
 	'pfunc_desc' => 'Utvid parser med logiske funksjoner',
 	'pfunc_time_error' => 'Feil: ugyldig tid',
 	'pfunc_time_too_long' => 'Feil: #time brukt for mange ganger',
@@ -2816,6 +3656,12 @@ $messages['no'] = array(
 	'pfunc_expr_unknown_error' => 'Uttrykksfeil: Ukjent feil ($1)',
 	'pfunc_expr_not_a_number' => 'I $1: resultat er ikke et tall',
 	'pfunc_string_too_long' => 'Feil: Strengen går over grensen på $1 tegn',
+	'pfunc-convert-unit-pressure-bar' => 'bar',
+	'pfunc-convert-unit-pressure-decibar' => 'decibar',
+	'pfunc-convert-unit-pressure-millibar' => 'millibar',
+	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfære|atmosfærer}',
+	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|Torr|Torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|mmHg|mmHg}}',
 );
 
 /** Occitan (Occitan)
@@ -2845,7 +3691,9 @@ $messages['oc'] = array(
 
 /** Polish (Polski)
  * @author Derbeth
+ * @author Grzechooo
  * @author Sp5uhe
+ * @author Woytecr
  */
 $messages['pl'] = array(
 	'pfunc_desc' => 'Rozszerza analizator składni o funkcje logiczne',
@@ -2911,99 +3759,101 @@ $messages['pl'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'jokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2 metr|$2 metry|$2 metrów}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrem|angstremy|angstremów}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|mila|mile|mil}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlongi|furlongów}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|łańcuch|łańcuchy|łańcuchów}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|pręt|pręty|prętów}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|sążeń|sążnie|sążni}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|jard|jardy|jardów}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|stopa|stopy|stóp}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|dłoń|dłonie|dłoni}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|cal|cale|cali}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|mila morska|mile morskie|mil morskich}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|mila morska brytyjska|mile morskie brytyjskie|mil morskich brytyjskich}} sprzed 1970 roku',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|mila morska amerykańska|mile morskie amerykańskie|mil morskich amerykańskich}} sprzed 1954 roku',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2 parsek|$2 parseki|$2 parseków}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2 rok świetlny|$2 lata świetlne|$2 lat świetlnych}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|jednostka astronomiczna|jednostki astronomiczne|jednostek astronomicznych}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'łańcuch',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'sążeń',
-	'pfunc-convert-unit-length-yard-abbr' => 'jard',
-	'pfunc-convert-unit-length-foot-abbr' => 'stopa',
-	'pfunc-convert-unit-length-hand-abbr' => 'dłoń',
-	'pfunc-convert-unit-length-inch-abbr' => 'cal',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'INM',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'angielska mila morska',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'amerykańska mila morska sprzed 1954 roku',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 lat świetlnych',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'j.a.',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kilometr kwadratowy|kilometry kwadratowe|kilometrów kwadratowych}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|metr kwadratowy|metry kwadratowe|metrów kwadratowych}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|centymetr kwadratowy|centymetry kwadratowe|centymetrów kwadratowych}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|milimetr kwadratowy|milimetry kwadratowe|milimetrów kwadratowych}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektary|hektarów}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|mila kwadratowa|mile kwadratowe|mil kwadratowych}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|akr|akry|akrów}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|jard kwadratowy|jardy kwadratowe|jardów kwadratowych}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|stopa kwadratowa|stopy kwadratowe|stóp kwadratowych}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|cal kwadratowy|cale kwadratowe|cali kwadratowych}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|mila morska kwadratowa|mile morskie kwadratowe|mil morskich kwadratowych}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunamy|dunamów}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'mila<sup>2</sup>',
-	'pfunc-convert-unit-area-acre-abbr' => 'akr',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'jard<sup>2</sup>',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'stopa<sup>2</sup>',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'cal<sup>2</sup>',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'mila morska<sup>2</sup>',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|sekunda|sekundy|sekund}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2 rok|$2 lata|$2 lat}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dzień|dni}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|godzina|godziny|godzin}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minuta|minuty|minut}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2 jard',
-	'pfunc-convert-unit-time-day-abbr' => 'doba',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|metr sześcienny|metry sześcienne|metrów sześciennych}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|centymetr sześcienny|centymetry sześcienne|centymetrów sześciennych}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|milimetr sześcienny|milimetry sześcienne|milimetrów sześciennych}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|tysiąc litrów|tysiące litrów|tysięcy litrów}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|litr|litry|litrów}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|dziesiąta część|dziesiąte części|dziesiątych części}} litra',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|mililitr|mililitry|mililitrów}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|jard|jardów}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 l',
-	'pfunc-convert-unit-speed-mile-hour' => 'mil na godzinę',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2paskal|$2paskali}}',
-	'pfunc-convert-unit-pressure-bar' => 'barów',
-	'pfunc-convert-unit-pressure-decibar' => 'decybarów',
-	'pfunc-convert-unit-pressure-millibar' => 'millibarów',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarów',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfera|atmosfer}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|milimtr słupka rtęci|milimetrów słupka rtęci}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|cal słupka rtęci|cali słupka rtęci}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar.',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3 metr|$3 metry|$3 metrów}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrem|angstremy|angstremów}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|mila|mile|mil}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlongi|furlongów}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|łańcuch|łańcuchy|łańcuchów}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|pręt|pręty|prętów}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|sążeń|sążnie|sążni}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|jard|jardy|jardów}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|stopa|stopy|stóp}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|dłoń|dłonie|dłoni}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|cal|cale|cali}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|mila morska|mile morskie|mil morskich}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|mila morska brytyjska|mile morskie brytyjskie|mil morskich brytyjskich}} sprzed 1970 roku',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|mila morska amerykańska|mile morskie amerykańskie|mil morskich amerykańskich}} sprzed 1954 roku',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3 parsek|$3 parseki|$3 parseków}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 rok świetlny|$3 lata świetlne|$3 lat świetlnych}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|jednostka astronomiczna|jednostki astronomiczne|jednostek astronomicznych}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1łańcuch',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1sążeń',
+	'pfunc-convert-unit-length-yard-abbr' => '$1jard',
+	'pfunc-convert-unit-length-foot-abbr' => '$1stopa',
+	'pfunc-convert-unit-length-hand-abbr' => '$1dłoń',
+	'pfunc-convert-unit-length-inch-abbr' => '$1cal',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1INM',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1angielska mila morska',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1amerykańska mila morska sprzed 1954 roku',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 lat świetlnych',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1j.a.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kilometr kwadratowy|kilometry kwadratowe|kilometrów kwadratowych}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|metr kwadratowy|metry kwadratowe|metrów kwadratowych}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|centymetr kwadratowy|centymetry kwadratowe|centymetrów kwadratowych}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|milimetr kwadratowy|milimetry kwadratowe|milimetrów kwadratowych}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektary|hektarów}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|mila kwadratowa|mile kwadratowe|mil kwadratowych}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|akr|akry|akrów}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|jard kwadratowy|jardy kwadratowe|jardów kwadratowych}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|stopa kwadratowa|stopy kwadratowe|stóp kwadratowych}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|cal kwadratowy|cale kwadratowe|cali kwadratowych}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|mila morska kwadratowa|mile morskie kwadratowe|mil morskich kwadratowych}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunamy|dunamów}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1mila<sup>2</sup>',
+	'pfunc-convert-unit-area-acre-abbr' => '$1akr',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1jard<sup>2</sup>',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1stopa<sup>2</sup>',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1cal<sup>2</sup>',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1mila morska<sup>2</sup>',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekunda|sekundy|sekund}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3 rok|$3 lata|$3 lat}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dzień|dni}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|godzina|godziny|godzin}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuta|minuty|minut}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3 jard',
+	'pfunc-convert-unit-time-day-abbr' => '$1doba',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|metr sześcienny|metry sześcienne|metrów sześciennych}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|centymetr sześcienny|centymetry sześcienne|centymetrów sześciennych}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|milimetr sześcienny|milimetry sześcienne|milimetrów sześciennych}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|tysiąc litrów|tysiące litrów|tysięcy litrów}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|litr|litry|litrów}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|dziesiąta część|dziesiąte części|dziesiątych części}} litra',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|mililitr|mililitry|mililitrów}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|jard|jardów}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 l',
+	'pfunc-convert-unit-speed-mile-hour' => '$1mil na godzinę',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3paskal|$3paskali}}',
+	'pfunc-convert-unit-pressure-bar' => '$1barów',
+	'pfunc-convert-unit-pressure-decibar' => '$1decybarów',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibarów',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarów',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosfer}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milimtr słupka rtęci|milimetrów słupka rtęci}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|cal słupka rtęci|cali słupka rtęci}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar.',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
 );
 
 /** Piedmontese (Piemontèis)
@@ -3037,6 +3887,8 @@ $messages['pms'] = array(
  * @author Khalid Mahmood
  */
 $messages['pnb'] = array(
+	'pfunc_time_error' => 'غلطی: ویلہ ٹھیک نئیں۔',
+	'pfunc_time_too_long' => 'غلطی: بعوت ساریاں # کالاں',
 	'pfunc-convert-dimension-length' => 'لمبائی',
 	'pfunc-convert-dimension-area' => 'تھاں',
 	'pfunc-convert-dimension-volume' => 'والیوم',
@@ -3072,93 +3924,93 @@ $messages['pnb'] = array(
 	'pfunc-convert-prefix-atto' => 'اٹو',
 	'pfunc-convert-prefix-zepto' => 'زپٹو',
 	'pfunc-convert-prefix-yocto' => 'یوکٹو',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2میٹر}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'فرلانگ',
-	'pfunc-convert-unit-length-chain-abbr' => 'زنجیر',
-	'pfunc-convert-unit-length-rod-abbr' => 'رداس',
-	'pfunc-convert-unit-length-fathom-abbr' => 'فیدم',
-	'pfunc-convert-unit-length-yard-abbr' => 'گز',
-	'pfunc-convert-unit-length-foot-abbr' => 'فٹ',
-	'pfunc-convert-unit-length-hand-abbr' => 'کینٹہ',
-	'pfunc-convert-unit-length-inch-abbr' => 'انچ',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'سمندری میل',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'سمندری میل (برطانیہ)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'سمندری میل (امریکہ 1954 توں پہلے)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2کمپیوٹر',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2ly',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'اسمانی ناپ',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|مربع کلومیٹر|مربع کلومیٹر}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|مربع میٹر|مربع میٹر}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|مربع میلیمیٹر|مربع میلیمیٹر}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|ہیکٹر|ہیکٹر}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|مربع میلیمیٹر|مربع میل}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|ایکڑ|ایکڑ}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|مربع گز|مربع گز}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|مربع فٹ|مربع فٹ}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|مربع انچ|مربع انچ}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|مربع سمندری میل|مربع سمندری میل}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|ڈنام|ڈنام}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|زوبو|زوبو}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'کلومیٹر<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ہیکٹر',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'مربع میل',
-	'pfunc-convert-unit-area-acre-abbr' => 'ایکڑ',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'مربع گز',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'مربع فٹ',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'مربع انچ',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'مربع سمندری میل',
-	'pfunc-convert-unit-area-dunam-abbr' => 'دونام',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'سوبو',
-	'pfunc-convert-unit-time-second' => '$1 {{PLURAL:$1|سکنٹ|سکنٹاں}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2ورہ|$2ورے}}',
-	'pfunc-convert-unit-time-day' => ' {{PLURAL:$1|دن|دناں}}',
-	'pfunc-convert-unit-time-hour' => ' {{PLURAL:$1|کینٹا|کینٹے}}',
-	'pfunc-convert-unit-time-minute' => ' {{PLURAL:$1|منٹ|منٹاں}}',
-	'pfunc-convert-unit-time-second-abbr' => 'سکنث',
-	'pfunc-convert-unit-time-year-abbr' => '$2ورہ',
-	'pfunc-convert-unit-time-day-abbr' => 'دیاڑھ',
-	'pfunc-convert-unit-time-hour-abbr' => 'کینٹہ',
-	'pfunc-convert-unit-time-minute-abbr' => 'منٹ',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|مربع میٹر|مربع میٹر}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|مربع میلیمیٹر|مربع میلیمیٹر}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|کلولٹر|کلولٹر}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|لٹر|لٹر}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|سینٹیلٹر}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|ملیلٹر}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|مربع گز}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|مربع فٹ}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|مربع انچ}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|بشل}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|گیلن}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|کوارٹز}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|پنٹ}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|پانیسر اونس}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|گیلن}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|کوارٹز}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|پنٹ}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|پانیسر اونس}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|بیرل}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|بشل}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|گیلن}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|کوارٹز}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|پنٹ}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'سینٹی میٹر<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'ملی میٹر<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2ly',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'مربع گز',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'مربع فٹ',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'مکعب انچ',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3میٹر}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1فرلانگ',
+	'pfunc-convert-unit-length-chain-abbr' => '$1زنجیر',
+	'pfunc-convert-unit-length-rod-abbr' => '$1رداس',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1فیدم',
+	'pfunc-convert-unit-length-yard-abbr' => '$1گز',
+	'pfunc-convert-unit-length-foot-abbr' => '$1فٹ',
+	'pfunc-convert-unit-length-hand-abbr' => '$1کینٹہ',
+	'pfunc-convert-unit-length-inch-abbr' => '$1انچ',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1سمندری میل',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1سمندری میل (برطانیہ)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1سمندری میل (امریکہ 1954 توں پہلے)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3کمپیوٹر',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1اسمانی ناپ',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|مربع کلومیٹر|مربع کلومیٹر}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|مربع میٹر|مربع میٹر}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|مربع میلیمیٹر|مربع میلیمیٹر}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|ہیکٹر|ہیکٹر}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|مربع میلیمیٹر|مربع میل}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|ایکڑ|ایکڑ}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|مربع گز|مربع گز}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|مربع فٹ|مربع فٹ}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|مربع انچ|مربع انچ}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|مربع سمندری میل|مربع سمندری میل}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|ڈنام|ڈنام}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|زوبو|زوبو}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1کلومیٹر<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ہیکٹر',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1مربع میل',
+	'pfunc-convert-unit-area-acre-abbr' => '$1ایکڑ',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1مربع گز',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1مربع فٹ',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1مربع انچ',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1مربع سمندری میل',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1دونام',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1سوبو',
+	'pfunc-convert-unit-time-second' => '$1$2 {{PLURAL:$2|سکنٹ|سکنٹاں}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3ورہ|$3ورے}}',
+	'pfunc-convert-unit-time-day' => '$1 {{PLURAL:$2|دن|دناں}}',
+	'pfunc-convert-unit-time-hour' => '$1 {{PLURAL:$2|کینٹا|کینٹے}}',
+	'pfunc-convert-unit-time-minute' => '$1 {{PLURAL:$2|منٹ|منٹاں}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1سکنث',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3ورہ',
+	'pfunc-convert-unit-time-day-abbr' => '$1دیاڑھ',
+	'pfunc-convert-unit-time-hour-abbr' => '$1کینٹہ',
+	'pfunc-convert-unit-time-minute-abbr' => '$1منٹ',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|مربع میٹر|مربع میٹر}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|مربع سینٹیمیٹر|مربع سینٹیمیٹر}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|مربع میلیمیٹر|مربع میلیمیٹر}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|کلولٹر|کلولٹر}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|لٹر|لٹر}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|سینٹیلٹر}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|ملیلٹر}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|مربع گز}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|مربع فٹ}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|مربع انچ}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|بشل}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|گیلن}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|کوارٹز}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|پنٹ}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|پانیسر اونس}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|گیلن}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|کوارٹز}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|پنٹ}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|پانیسر اونس}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|بیرل}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|بشل}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|گیلن}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|کوارٹز}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|پنٹ}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1سینٹی میٹر<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1ملی میٹر<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3ly',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1مربع گز',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1مربع فٹ',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1مکعب انچ',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
 );
 
 /** Pashto (پښتو)
@@ -3221,6 +4073,29 @@ $messages['pt-br'] = array(
 	'pfunc_expr_unknown_error' => 'Erro de expressão: Erro desconhecido ($1)',
 	'pfunc_expr_not_a_number' => 'Em $1: resultado não é um número',
 	'pfunc_string_too_long' => 'Erro: cadeia de caracteres excede o limite de $1 caracteres',
+	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1| $2 metros | $2 metros}}',
+	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1| ångström | ångströms}}',
+	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|milhas| milhas}}',
+	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1| furlong | estádios}}',
+	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1| corrente | correntes}}',
+	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1| vara | varas}}',
+	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1| fathom | braças}}',
+	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|jarda|jardas}}',
+	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1| pé | pés}}',
+	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1| mão | mãos}}',
+	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1| polegada | polegadas}}',
+	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1| milha náutica | milhas náuticas}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1| milhas náuticas (pré-1970 britânico) | milhas náuticas (pré-1970 britânico)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1| milhas náuticas (pré-1954 dos EUA) | milhas náuticas (pré-1954 dos EUA)}}',
+	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1| $2 parsec | $2 parsecs}}',
+	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1| $2 ano-luz | $2 anos-luz}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1| unidade astronômica | UA}}',
+	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
+	'pfunc-convert-unit-length-chain-abbr' => 'corrente',
+	'pfunc-convert-unit-length-rod-abbr' => 'rd',
+	'pfunc-convert-unit-length-fathom-abbr' => 'fathom',
+	'pfunc-convert-unit-length-yard-abbr' => 'yd',
+	'pfunc-convert-unit-length-foot-abbr' => 'ft',
 );
 
 /** Quechua (Runa Simi)
@@ -3255,14 +4130,15 @@ $messages['qu'] = array(
  * @author Stelistcristi
  */
 $messages['ro'] = array(
-	'pfunc_desc' => 'Îmbunătățiți parser-ul cu funcții logice',
+	'pfunc_desc' => 'Îmbunătățește parserul cu funcții logice',
 	'pfunc_time_error' => 'Eroare: timp incorect',
 	'pfunc_time_too_long' => 'Eroare: prea multe apeluri #time',
-	'pfunc_rel2abs_invalid_depth' => 'Eroare: adâncime incorectă în cale: "$1" (încercat accesarea unui nod deasupra nodului rădăcină)',
-	'pfunc_expr_stack_exhausted' => 'Eroare de expresie: Stivă epuizată',
+	'pfunc_time_too_big' => 'Eroare: #time acceptă doar ani până la 9999',
+	'pfunc_rel2abs_invalid_depth' => 'Eroare: adâncime incorectă în cale: „$1” (încercat accesarea unui nod deasupra nodului rădăcină)',
+	'pfunc_expr_stack_exhausted' => 'Eroare de expresie: stivă epuizată',
 	'pfunc_expr_unexpected_number' => 'Eroare de expresie: număr neașteptat',
 	'pfunc_expr_preg_match_failure' => 'Eroare de expresie: eșuare preg_match neașteptată',
-	'pfunc_expr_unrecognised_word' => 'Eroare de expresie: "$1" este cuvânt necunoscut',
+	'pfunc_expr_unrecognised_word' => 'Eroare de expresie: „$1” este un cuvânt nerecunoscut',
 	'pfunc_expr_unexpected_operator' => 'Eroare de expresie: operator $1 neașteptat',
 	'pfunc_expr_missing_operand' => 'Eroare de expresie: operand lipsă pentru $1',
 	'pfunc_expr_unexpected_closing_bracket' => 'Eroare de expresie: paranteză închisă neașteptată',
@@ -3273,7 +4149,7 @@ $messages['ro'] = array(
 	'pfunc_expr_invalid_argument_ln' => 'Argument incorect pentru ln: <= 0',
 	'pfunc_expr_unknown_error' => 'Eroare de expresie: eroare necunoscută ($1)',
 	'pfunc_expr_not_a_number' => 'În $1: rezultatul nu este un număr',
-	'pfunc_string_too_long' => 'Eroare: Şirul depășește limita de caractere de $1',
+	'pfunc_string_too_long' => 'Eroare: șirul depășește limita de caractere de $1',
 );
 
 /** Tarandíne (Tarandíne)
@@ -3283,6 +4159,7 @@ $messages['roa-tara'] = array(
 	'pfunc_desc' => "L'analizzatore avanzate cu le funziune loggeche",
 	'pfunc_time_error' => 'Errore: Orarie invalide',
 	'pfunc_time_too_long' => 'Errore: stonne troppe #time chiamate',
+	'pfunc_time_too_big' => "Errore: #time vole sulamende valore de anne 'mbonde a 9999",
 	'pfunc_rel2abs_invalid_depth' => "Errore: Profondità invalide jndr'à 'u percorse: \"\$1\" (s'à pruvate a pigghià 'nu node sus a 'u node radice)",
 	'pfunc_expr_stack_exhausted' => 'Espressione in errore: Stack anghiute',
 	'pfunc_expr_unexpected_number' => 'Espressione in errore: Numere inaspettate',
@@ -3369,152 +4246,153 @@ $messages['ru'] = array(
 	'pfunc-convert-prefix-atto' => 'атто',
 	'pfunc-convert-prefix-zepto' => 'зепто',
 	'pfunc-convert-prefix-yocto' => 'йокто',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2метр|$2метра|$2метров}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ангстрем|ангстрема|ангстрем}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|миля|мили|миль}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|фурлонг|фурлонга|фурлонгов}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|чейн|чейна|чейнов}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|род|рода|родов}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|фатом|фатома|фатомов}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|ярд|ярда|ярдов}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|фут|фута|футов}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|хэнд|хэнда|хэндов}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|дюйм|дюйма|дюймов}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|морская миля|морские мили|морских милей}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|морская миля (британская до 1970)|морские мили (британских до 1970)|морских миль (британских до 1970)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|морская миля (США до 1970)|морские мили (США до 1970)|морских миль (США до 1970)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2парсек|$2парсека|$2парсек}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2 световой год|$2 световых года|$2 световых лет}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|астрономическая единица|астрономические единицы|астрономических единиц}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'фурлонг',
-	'pfunc-convert-unit-length-chain-abbr' => 'чейн',
-	'pfunc-convert-unit-length-rod-abbr' => 'род',
-	'pfunc-convert-unit-length-fathom-abbr' => 'фатом',
-	'pfunc-convert-unit-length-yard-abbr' => 'ярд',
-	'pfunc-convert-unit-length-foot-abbr' => 'фут',
-	'pfunc-convert-unit-length-hand-abbr' => 'хэнд',
-	'pfunc-convert-unit-length-inch-abbr' => 'дюйм',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'морская миля',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'брит. морская миля',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'морская миля (США до 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 пк',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 св. г.',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'а. е.',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|квадратный километр|квадратных километра|квадратных километров}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|квадратный метр|квадратных метра|квадратных метров}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|квадратный сантиметр|квадратных сантиметра|квадратных сантиметров}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|квадратный миллиметр|квадратных миллиметра|квадратных миллиметров}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|гектар|гектара|гектар}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|квадратная миля|квадратных мили|квадратных миль}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|акр|акра|акров}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|квадратный ярд|квадратных ярда|квадратных ярдов}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|квадратный фут|квадратных фута|квадратных футов}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|квадратный дюйм|квадратных дюйма|квадратных дюймов}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|квадратная морская миля|квадратные морские мили|квадратных морских миль}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|дунам|дунама|дунамов}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|цубо|цубо|цубо}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'км<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'м<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'см<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'мм<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'га',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'кв. ми',
-	'pfunc-convert-unit-area-acre-abbr' => 'акр',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'кв. ярд',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'кв. м',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'кв. дюйм',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'кв. м. ми',
-	'pfunc-convert-unit-area-dunam-abbr' => 'дунам',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'цубо',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|секунда|секунды|секунд}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2год|$2года|$2лет}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|день|дня|дней}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|час|часа|часов}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|минута|минуты|минут}}',
-	'pfunc-convert-unit-time-second-abbr' => 'с',
-	'pfunc-convert-unit-time-year-abbr' => '$2 г',
-	'pfunc-convert-unit-time-day-abbr' => 'дн',
-	'pfunc-convert-unit-time-hour-abbr' => 'ч.',
-	'pfunc-convert-unit-time-minute-abbr' => 'м.',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|кубический метр|кубических метра|кубических метров}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|кубический сантиметр|кубических сантиметра|кубических сантиметров}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|кубический миллиметр|кубических миллиметра|кубических миллиметров}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|килолитр|килолитра|килолитров}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|литр|литра|литров}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|сантилитр|сантилитра|сантилитров}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|миллилитр|миллилитра|миллилитров}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|кубический ярд|кубических ярда|кубических ярдов}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|кубический фут|кубических фута|кубических футов}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|кубический дюйм|кубических дюйма|кубических дюймов}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|баррель|барреля|баррелей}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|бушель|бушеля|бушелей}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|галлон|галлона|галлонов}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|кварта|кварты|кварт}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|пинта|пинты|пинт}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|жидкая унция|жидких унции|жидких унций}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|баррель США|барреля США|баррелей США}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|баррель|барреля|баррелей}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|баррель|барреля|баррелей}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|галлон США|галлона США|галлонов США}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|кварта США|кварты США|кварт США}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|пинта США|пинты США|пинт США}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|жидкая унция США|жидких унции США|жидких унций США}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|сухой баррель США|сухих барреля США|сухих баррелей США}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|бушель США|бушеля США|бушелей США}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|сухой галлон США|сухих галлона США|сухих галлонов США}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|сухая кварта США|сухие кварты США|сухих кварт США}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|сухая пинта США|сухих пинты США|сухих пинт США}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'м<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'см<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'мм<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 л',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'куб. ярд',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'куб. фут',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'куб. дюйм',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'бр.',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'бш.',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'гал.',
-	'pfunc-convert-unit-volume-quart-abbr' => 'кв.',
-	'pfunc-convert-unit-volume-pint-abbr' => 'пт.',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'жид. унц.',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'бр. США',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'бр.',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'бр.',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'гал. США',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'кт. США',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'пт. США',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'жид. унц. США',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'бр. США',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'вш. США',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'сух. гал. США',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'сух. кт. США',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'сух. пт. США',
-	'pfunc-convert-unit-speed-mile-hour' => 'миль/час',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'миль/ч',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2паскаль|$2паскаля|$2паскалей}}',
-	'pfunc-convert-unit-pressure-bar' => 'бар',
-	'pfunc-convert-unit-pressure-decibar' => 'децибар',
-	'pfunc-convert-unit-pressure-millibar' => 'миллибар',
-	'pfunc-convert-unit-pressure-kilobarye' => 'килобария',
-	'pfunc-convert-unit-pressure-barye' => 'бария',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|атмосфера|атмосферы|атмосфер}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|торр|торра|торр}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|миллиметр ртутного столба|миллиметра ртутного столба|миллиметров ртутного столба}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|дюйм ртутного столба|дюйма ртутного столба|дюймов ртутного столба}}',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|фунт на квадратный дюйм|фунта на квадратный дюйм|фунтов на квадратный дюйм}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Па',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'бар',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'дбар',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'мбар',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'КБа',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ба',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'атм',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'торр',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'мм рт. ст.',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'дюйм. рт. ст.',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'фунт. на кв. дюйм',
+	'pfunc-convert-prefix-milli-abbr' => 'м',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3метр|$3метра|$3метров}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ангстрем|ангстрема|ангстрем}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|миля|мили|миль}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|фурлонг|фурлонга|фурлонгов}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|чейн|чейна|чейнов}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|род|рода|родов}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|фатом|фатома|фатомов}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|ярд|ярда|ярдов}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|фут|фута|футов}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|хэнд|хэнда|хэндов}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|дюйм|дюйма|дюймов}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|морская миля|морские мили|морских милей}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|морская миля (британская до 1970)|морские мили (британских до 1970)|морских миль (британских до 1970)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|морская миля (США до 1970)|морские мили (США до 1970)|морских миль (США до 1970)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3парсек|$3парсека|$3парсек}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3 световой год|$3 световых года|$3 световых лет}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|астрономическая единица|астрономические единицы|астрономических единиц}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1фурлонг',
+	'pfunc-convert-unit-length-chain-abbr' => '$1чейн',
+	'pfunc-convert-unit-length-rod-abbr' => '$1род',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1фатом',
+	'pfunc-convert-unit-length-yard-abbr' => '$1ярд',
+	'pfunc-convert-unit-length-foot-abbr' => '$1фут',
+	'pfunc-convert-unit-length-hand-abbr' => '$1хэнд',
+	'pfunc-convert-unit-length-inch-abbr' => '$1дюйм',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1морская миля',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1брит. морская миля',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1морская миля (США до 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 пк',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 св. г.',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1а. е.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|квадратный километр|квадратных километра|квадратных километров}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|квадратный метр|квадратных метра|квадратных метров}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|квадратный сантиметр|квадратных сантиметра|квадратных сантиметров}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|квадратный миллиметр|квадратных миллиметра|квадратных миллиметров}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|гектар|гектара|гектар}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|квадратная миля|квадратных мили|квадратных миль}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|акр|акра|акров}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|квадратный ярд|квадратных ярда|квадратных ярдов}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|квадратный фут|квадратных фута|квадратных футов}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|квадратный дюйм|квадратных дюйма|квадратных дюймов}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|квадратная морская миля|квадратные морские мили|квадратных морских миль}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|дунам|дунама|дунамов}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|цубо|цубо|цубо}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1км<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1м<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1см<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1мм<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1га',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1кв. ми',
+	'pfunc-convert-unit-area-acre-abbr' => '$1акр',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1кв. ярд',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1кв. м',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1кв. дюйм',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1кв. м. ми',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1дунам',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1цубо',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|секунда|секунды|секунд}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3год|$3года|$3лет}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|день|дня|дней}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|час|часа|часов}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|минута|минуты|минут}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1с',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3 г',
+	'pfunc-convert-unit-time-day-abbr' => '$1дн',
+	'pfunc-convert-unit-time-hour-abbr' => '$1ч.',
+	'pfunc-convert-unit-time-minute-abbr' => '$1м.',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|кубический метр|кубических метра|кубических метров}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|кубический сантиметр|кубических сантиметра|кубических сантиметров}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|кубический миллиметр|кубических миллиметра|кубических миллиметров}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|килолитр|килолитра|килолитров}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|литр|литра|литров}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|сантилитр|сантилитра|сантилитров}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|миллилитр|миллилитра|миллилитров}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|кубический ярд|кубических ярда|кубических ярдов}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|кубический фут|кубических фута|кубических футов}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|кубический дюйм|кубических дюйма|кубических дюймов}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|баррель|барреля|баррелей}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|бушель|бушеля|бушелей}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|галлон|галлона|галлонов}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|кварта|кварты|кварт}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|пинта|пинты|пинт}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|жидкая унция|жидких унции|жидких унций}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|баррель США|барреля США|баррелей США}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|баррель|барреля|баррелей}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|баррель|барреля|баррелей}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|галлон США|галлона США|галлонов США}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|кварта США|кварты США|кварт США}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|пинта США|пинты США|пинт США}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|жидкая унция США|жидких унции США|жидких унций США}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|сухой баррель США|сухих барреля США|сухих баррелей США}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|бушель США|бушеля США|бушелей США}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|сухой галлон США|сухих галлона США|сухих галлонов США}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|сухая кварта США|сухие кварты США|сухих кварт США}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|сухая пинта США|сухих пинты США|сухих пинт США}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1м<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1см<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1мм<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 л',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1куб. ярд',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1куб. фут',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1куб. дюйм',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1бр.',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1бш.',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1гал.',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1кв.',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1пт.',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1жид. унц.',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1бр. США',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1бр.',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1бр.',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1гал. США',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1кт. США',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1пт. США',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1жид. унц. США',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1бр. США',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1вш. США',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1сух. гал. США',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1сух. кт. США',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1сух. пт. США',
+	'pfunc-convert-unit-speed-mile-hour' => '$1миль/час',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1миль/ч',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3паскаль|$3паскаля|$3паскалей}}',
+	'pfunc-convert-unit-pressure-bar' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar' => '$1децибар',
+	'pfunc-convert-unit-pressure-millibar' => '$1миллибар',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1килобария',
+	'pfunc-convert-unit-pressure-barye' => '$1бария',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|атмосфера|атмосферы|атмосфер}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|торр|торра|торр}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|миллиметр ртутного столба|миллиметра ртутного столба|миллиметров ртутного столба}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|дюйм ртутного столба|дюйма ртутного столба|дюймов ртутного столба}}',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|фунт на квадратный дюйм|фунта на квадратный дюйм|фунтов на квадратный дюйм}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Па',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1бар',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1дбар',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1мбар',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1КБа',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ба',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1атм',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1торр',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1мм рт. ст.',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1дюйм. рт. ст.',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1фунт. на кв. дюйм',
 );
 
 /** Rusyn (Русиньскый)
@@ -3542,7 +4420,7 @@ $messages['rue'] = array(
 	'pfunc_string_too_long' => 'Хыба: Ланц є довшый як $1 {{PLURAL:$1|знак|знакы|знаків}}, што є ліміт',
 );
 
-/** Yakut (Саха тыла)
+/** Sakha (Саха тыла)
  * @author HalanTul
  */
 $messages['sah'] = array(
@@ -3712,154 +4590,155 @@ $messages['sl'] = array(
 	'pfunc-convert-prefix-atto' => 'ato',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'jokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|meter|metra|metri|metrov}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|angstrem|angstrema|angstremi|angstremov}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|milja|milji|milje|milj}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlonga|furlongi|furlongov}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|veriga|verigi|verige|verig}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|palica|palici|palice|palic}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|seženj|sežnja|sežnji|sežnjev}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|jard|jarda|jardi|jardov}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|čevelj|čevlja|čevlji|čeljev}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|dlan|dlani}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|palec|palca|palci|palcev}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|navtična milja|navtični milji|navtične milje|navtičnih milj}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|navtična milja|navtični milji|navtične milje|navtičnih milj}} (britanska, pred 1970)',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|navtična milja|navtični milji|navtične milje|navtičnih milj}} (ZDA, pred 1954)',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|parsek|parseka|parseki|persekov}}',
-	'pfunc-convert-unit-length-lightyear' => '$2 {{PLURAL:$1|svetlobno leto|svetlobni leti|svetlobna leta|svetlobnih let}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomska enota|astronomski enoti|astronomske enote|astronomskih enot}}',
-	'pfunc-convert-unit-length-metre-abbr' => 'm',
-	'pfunc-convert-unit-length-angstrom-abbr' => 'Å',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'veriga',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'seženj',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Brit)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (ZDA, pred 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2 pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2 sv. l.',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'a.e.',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kvadratni kilometer|kvadratna kilometra|kvadratni kilometri|kvadratnih kilometrov}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|kvadratni meter|kvadratna metra|kvadratni metri|kvadratnih metrov}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|kvadratni centimeter|kvadratna centimetra|kvadratni centimetri|kvadratnih centimetrov}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|kvadratni milimeter|kvadratna milimetra|kvadratni milimetri|kvadratnih milimetrov}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektara|hektare|hektarov}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|kvadratna milja|kvadratni milji|kvadratne milje|kvadratnih milj}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|aker|akra|akri|akrov}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|kvadratni jard|kvadratna jarda|kvadratni jardi|kvadratnih jardov}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|kvadratni čevelj|kvadratna čevlja|kvadratni čevlji|kvadratnih čevljev}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|kvadratni palec|kvadratna palca|kvadratni palci|kvadratnih palcev}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|kvadratna navtična milja|kvadratni navtični milji|kvadratne navtične milje|kvadratnih navtičnih milj}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunama|dunami|dunamov}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsuba|tsubi|tsubov}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'kv. mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'aker',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'kv. yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'kv. ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'kv. in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'kv nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|sekunda|sekundi|sekunde|sekund}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|leto|leti|leta|let}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dan|dneva|dnevi|dni}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|ura|uri|ure|ur}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minuta|minuti|minute|minut}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => 'leto',
-	'pfunc-convert-unit-time-day-abbr' => 'dan',
-	'pfunc-convert-unit-time-hour-abbr' => 'ura',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|kubični meter|kubična metra|kubični metri|kubičnih metrov}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|kubični centimeter|kubična centimetra|kubični centimetri|kubičnih centimetrov}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|kubični milimeter|kubična milimetra|kubični milimetri|kubičnih milimetrov}}',
-	'pfunc-convert-unit-volume-kilolitre' => 'kilo{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-centilitre' => 'centi{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-millilitre' => 'mili{{PLURAL:$1|liter|litra|litri|litrov}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|kubični jard|kubična jarda|kubični jardi|kubičnih jardov}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kubični čevelj|kubična čevlja|kubični čevlji|kubičnih čevljev}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|kubični palec|kubična palca|kubični palci|kubičnih palcev}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|sod|soda|sodi|sodov}}',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1|bušel|bušla|bušli|bušlov}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|galona|galoni|galone|galon}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|kvart|kvarta|kvarti|kvartov}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pint|pinta|pinti|pintov}}',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1|tekočinska unča|tekočinski unči|tekočinske unče|tekočinskih unč}}',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1|ameriški sod|ameriška soda|ameriški sodi|ameriških sodov}}',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1|sod|soda|sodi|sodov}}',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1|sod|soda|sodi|sodov}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|ameriška galona|ameriški galoni|ameriške galone|ameriških galon}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|ameriški kvart|ameriška kvarta|ameriški kvarti|ameriških kvartov}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|ameriški pint|ameriška pinta|ameriški pinti|ameriških pintov}}',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1|ameriška tekočinska unča|ameriški tekočinski unči|ameriške tekočinske unče|ameriških tekočinskih unč}}',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1|ameriški suhi sod|ameriška suha soda|ameriški suhi sodi|ameriških suhih sodov}}',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1|ameriški bušel|ameriška bušla|ameriški bušli|ameriških bušlov}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|ameriška suha galona|ameriški suhi galoni|ameriške suhe galone|ameriških suhih galon}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|ameriški suhi kvart|ameriška suha kvarta|ameriški suhi kvarti|ameriških suhih kvartov}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|ameriški suhi pint|ameriška suha pinta|ameriški suhi pinti|ameriških suhih pintov}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2 l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'kub. yd',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'kub. ft',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'kub. in',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'am. bbl',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'am. gal',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'am. qt',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'am. pt',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'am. fl oz',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'am. bbl',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'am. bsh',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'am. suha gal',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'am. suhi qt',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'am. suhi pt',
-	'pfunc-convert-unit-speed-mile-hour' => 'milje na uro',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|paskal|paskala|paskali|paskalov}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-decibar' => 'decibar',
-	'pfunc-convert-unit-pressure-millibar' => 'milibar',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilobarye',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfera|atmosferi|atmosfere|atmosfer}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|torr|torra|torri|torrov}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|milimeter|milimetra|milimetri|milimetrov}} živega srebra',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|palec|palca|palci|palcev}} živega srebra',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1|funt|funta|funti|funtov}} na kvadratni palec',
-	'pfunc-convert-unit-pressure-pascal-abbr' => 'Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|meter|metra|metri|metrov}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|angstrem|angstrema|angstremi|angstremov}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|milja|milji|milje|milj}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlonga|furlongi|furlongov}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|veriga|verigi|verige|verig}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|palica|palici|palice|palic}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|seženj|sežnja|sežnji|sežnjev}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|jard|jarda|jardi|jardov}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|čevelj|čevlja|čevlji|čeljev}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|dlan|dlani}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|palec|palca|palci|palcev}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|navtična milja|navtični milji|navtične milje|navtičnih milj}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|navtična milja|navtični milji|navtične milje|navtičnih milj}} (britanska, pred 1970)',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|navtična milja|navtični milji|navtične milje|navtičnih milj}} (ZDA, pred 1954)',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|parsek|parseka|parseki|persekov}}',
+	'pfunc-convert-unit-length-lightyear' => '$1$3 {{PLURAL:$2|svetlobno leto|svetlobni leti|svetlobna leta|svetlobnih let}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomska enota|astronomski enoti|astronomske enote|astronomskih enot}}',
+	'pfunc-convert-unit-length-metre-abbr' => '$1m',
+	'pfunc-convert-unit-length-angstrom-abbr' => '$1Å',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1veriga',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1seženj',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Brit)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (ZDA, pred 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3 pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3 sv. l.',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1a.e.',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kvadratni kilometer|kvadratna kilometra|kvadratni kilometri|kvadratnih kilometrov}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|kvadratni meter|kvadratna metra|kvadratni metri|kvadratnih metrov}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|kvadratni centimeter|kvadratna centimetra|kvadratni centimetri|kvadratnih centimetrov}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|kvadratni milimeter|kvadratna milimetra|kvadratni milimetri|kvadratnih milimetrov}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektara|hektare|hektarov}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|kvadratna milja|kvadratni milji|kvadratne milje|kvadratnih milj}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|aker|akra|akri|akrov}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|kvadratni jard|kvadratna jarda|kvadratni jardi|kvadratnih jardov}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|kvadratni čevelj|kvadratna čevlja|kvadratni čevlji|kvadratnih čevljev}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|kvadratni palec|kvadratna palca|kvadratni palci|kvadratnih palcev}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|kvadratna navtična milja|kvadratni navtični milji|kvadratne navtične milje|kvadratnih navtičnih milj}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunama|dunami|dunamov}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsuba|tsubi|tsubov}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1kv. mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1aker',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1kv. yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1kv. ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1kv. in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1kv nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekunda|sekundi|sekunde|sekund}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|leto|leti|leta|let}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dan|dneva|dnevi|dni}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|ura|uri|ure|ur}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minuta|minuti|minute|minut}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1leto',
+	'pfunc-convert-unit-time-day-abbr' => '$1dan',
+	'pfunc-convert-unit-time-hour-abbr' => '$1ura',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|kubični meter|kubična metra|kubični metri|kubičnih metrov}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|kubični centimeter|kubična centimetra|kubični centimetri|kubičnih centimetrov}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|kubični milimeter|kubična milimetra|kubični milimetri|kubičnih milimetrov}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1kilo{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1centi{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1mili{{PLURAL:$2|liter|litra|litri|litrov}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|kubični jard|kubična jarda|kubični jardi|kubičnih jardov}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kubični čevelj|kubična čevlja|kubični čevlji|kubičnih čevljev}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|kubični palec|kubična palca|kubični palci|kubičnih palcev}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|sod|soda|sodi|sodov}}',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2|bušel|bušla|bušli|bušlov}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|galona|galoni|galone|galon}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|kvart|kvarta|kvarti|kvartov}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pint|pinta|pinti|pintov}}',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2|tekočinska unča|tekočinski unči|tekočinske unče|tekočinskih unč}}',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2|ameriški sod|ameriška soda|ameriški sodi|ameriških sodov}}',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2|sod|soda|sodi|sodov}}',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2|sod|soda|sodi|sodov}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|ameriška galona|ameriški galoni|ameriške galone|ameriških galon}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|ameriški kvart|ameriška kvarta|ameriški kvarti|ameriških kvartov}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|ameriški pint|ameriška pinta|ameriški pinti|ameriških pintov}}',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2|ameriška tekočinska unča|ameriški tekočinski unči|ameriške tekočinske unče|ameriških tekočinskih unč}}',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2|ameriški suhi sod|ameriška suha soda|ameriški suhi sodi|ameriških suhih sodov}}',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2|ameriški bušel|ameriška bušla|ameriški bušli|ameriških bušlov}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|ameriška suha galona|ameriški suhi galoni|ameriške suhe galone|ameriških suhih galon}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|ameriški suhi kvart|ameriška suha kvarta|ameriški suhi kvarti|ameriških suhih kvartov}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|ameriški suhi pint|ameriška suha pinta|ameriški suhi pinti|ameriških suhih pintov}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3 l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1kub. yd',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1kub. ft',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1kub. in',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1am. bbl',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1am. gal',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1am. qt',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1am. pt',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1am. fl oz',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1am. bbl',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1am. bsh',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1am. suha gal',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1am. suhi qt',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1am. suhi pt',
+	'pfunc-convert-unit-speed-mile-hour' => '$1milje na uro',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|paskal|paskala|paskali|paskalov}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar' => '$1decibar',
+	'pfunc-convert-unit-pressure-millibar' => '$1milibar',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilobarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfera|atmosferi|atmosfere|atmosfer}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torra|torri|torrov}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|milimeter|milimetra|milimetri|milimetrov}} živega srebra',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|palec|palca|palci|palcev}} živega srebra',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2|funt|funta|funti|funtov}} na kvadratni palec',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Albanian (Shqip)
@@ -3977,8 +4856,10 @@ $messages['su'] = array(
 /** Swedish (Svenska)
  * @author Ainali
  * @author Lejonel
+ * @author Lokal Profil
  * @author M.M.S.
  * @author Najami
+ * @author WikiPhoenix
  */
 $messages['sv'] = array(
 	'pfunc_desc' => 'Lägger till logiska funktioner i parsern',
@@ -4038,110 +4919,110 @@ $messages['sv'] = array(
 	'pfunc-convert-prefix-atto' => 'atto',
 	'pfunc-convert-prefix-zepto' => 'zepto',
 	'pfunc-convert-prefix-yocto' => 'yokto',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1|$2meter|$2meter}}',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1|ångström|ångström}}',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1|engelsk mil|engelska mil}}',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1|furlong|furlonger}}',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1|chain|chains}}',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1|stång|stänger}}',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1|famn|famnar}}',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1|yard|yards}}',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1|fot|fot}}',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1|hand|händer}}',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1|tum|tum}}',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1|nautisk mil|nautiska mil}}',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1|nautisk mil (innan 1970, brittisk)|nautiska mil (innan 1970, brittisk)}}',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1|nautisk mil (innan 1954, USA)|nautiska mil (innan 1954, USA)}}',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1|$2parsec|$2parsec}}',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1|$2ljusår|$2ljusår}}',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1|astronomisk enhet|astronomiska enheter}}',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-fathom-abbr' => 'famn',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Storbr.)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (innan 1954, USA)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'AU',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1|kvadratkilometer|kvadratkilometer}}',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1|kvadratmeter|kvadratmeter}}',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1|kvadratcentimeter|kvadratcentimeter}}',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1|kvadratmillimeter|kvadratmillimeter}}',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1|hektar|hektar}}',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1|kvadratmil|kvadratmil}}',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1|tunnland|tunnland}}',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1|kvadratyard|kvadratyard}}',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1|kvadratfot|kvadratfötter}}',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1|kvadrattum|kvadrattum}}',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1|kvadratisk nautisk mil|kvadratiska nautiska mil}}',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1|dunam|dunam}}',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1|tsubo|tsubo}}',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm<sup>2</sup>',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm<sup>2</sup>',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm<sup>2</sup>',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'kv mil',
-	'pfunc-convert-unit-area-acre-abbr' => 'tunnland',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'kv yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'kv ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'kv in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'kv nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1|sekund|sekunder}}',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1|$2år|$2år}}',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1|dag|dagar}}',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1|timme|timmar}}',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1|minut|minuter}}',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-day-abbr' => 'dag',
-	'pfunc-convert-unit-time-hour-abbr' => 'tim',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1|kubikmeter|kubikmeter}}',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1|kubikcentimeter|kubikcentimeter}}',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1|kubikmillimeter|kubikmillimeter}}',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1|kiloliter|kiloliter}}',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1|liter|liter}}',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1|centiliter|centiliter}}',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1|milliliter|milliliter}}',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1|kubikyard|kubikyards}}',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1|kubikfot|kubikfötter}}',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1|kubiktum|kubiktum}}',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1|fat|fat}}',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1|gallon|gallons}}',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1|quart|quarts}}',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1|pint|pints}}',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1|gallon (USA, våt)|gallon (USA, våt)}}',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1|quart (USA, våt)|quart (USA, våt)}}',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1|pint (USA, våt)|pint (USA, våt)}}',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1|gallon (USA, torr)|gallon (USA, torr)}}',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1|quart (USA, torr)|quart (USA, torr)}}',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1|pint (USA, torr)|pint (USA, torr)}}',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm<sup>3</sup>',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm<sup>3</sup>',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-speed-mile-hour' => 'miles per timme',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mph',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1|$2pascal|$2pascal}}',
-	'pfunc-convert-unit-pressure-bar' => 'bar',
-	'pfunc-convert-unit-pressure-millibar' => 'millibar',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1|atmosfär|atmosfärer}}',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1|torr|torr}}',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1|millimeter kvicksilver|millimeter kvicksilver}}',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1|tum kvicksilver|tum kvicksilver}}',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2|$3meter|$3meter}}',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2|ångström|ångström}}',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2|engelsk mil|engelska mil}}',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2|furlong|furlonger}}',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2|chain|chains}}',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2|stång|stänger}}',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2|famn|famnar}}',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2|yard|yards}}',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2|fot|fot}}',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2|hand|händer}}',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2|tum|tum}}',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2|nautisk mil|nautiska mil}}',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2|nautisk mil (innan 1970, brittisk)|nautiska mil (innan 1970, brittisk)}}',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2|nautisk mil (innan 1954, USA)|nautiska mil (innan 1954, USA)}}',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2|$3parsec|$3parsec}}',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2|$3ljusår|$3ljusår}}',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2|astronomisk enhet|astronomiska enheter}}',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1famn',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Storbr.)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (innan 1954, USA)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1AU',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2|kvadratkilometer|kvadratkilometer}}',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2|kvadratmeter|kvadratmeter}}',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2|kvadratcentimeter|kvadratcentimeter}}',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2|kvadratmillimeter|kvadratmillimeter}}',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2|hektar|hektar}}',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2|kvadratmil|kvadratmil}}',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2|tunnland|tunnland}}',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2|kvadratyard|kvadratyard}}',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2|kvadratfot|kvadratfötter}}',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2|kvadrattum|kvadrattum}}',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2|kvadratisk nautisk mil|kvadratiska nautiska mil}}',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2|dunam|dunam}}',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2|tsubo|tsubo}}',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m<sup>2</sup>',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm<sup>2</sup>',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm<sup>2</sup>',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1kv mil',
+	'pfunc-convert-unit-area-acre-abbr' => '$1tunnland',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1kv yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1kv ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1kv in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1kv nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2|sekund|sekunder}}',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2|$3år|$3år}}',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2|dag|dagar}}',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2|timme|timmar}}',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2|minut|minuter}}',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-day-abbr' => '$1dag',
+	'pfunc-convert-unit-time-hour-abbr' => '$1tim',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2|kubikmeter|kubikmeter}}',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2|kubikcentimeter|kubikcentimeter}}',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2|kubikmillimeter|kubikmillimeter}}',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2|kiloliter|kiloliter}}',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2|liter|liter}}',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2|centiliter|centiliter}}',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2|milliliter|milliliter}}',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2|kubikyard|kubikyards}}',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2|kubikfot|kubikfötter}}',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2|kubiktum|kubiktum}}',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2|fat|fat}}',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2|gallon|gallons}}',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2|quart|quarts}}',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2|pint|pints}}',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2|gallon (USA, våt)|gallon (USA, våt)}}',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2|quart (USA, våt)|quart (USA, våt)}}',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2|pint (USA, våt)|pint (USA, våt)}}',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2|gallon (USA, torr)|gallon (USA, torr)}}',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2|quart (USA, torr)|quart (USA, torr)}}',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2|pint (USA, torr)|pint (USA, torr)}}',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm<sup>3</sup>',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm<sup>3</sup>',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-speed-mile-hour' => '$1miles per timme',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2|$3pascal|$3pascal}}',
+	'pfunc-convert-unit-pressure-bar' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar' => '$1millibar',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2|atmosfär|atmosfärer}}',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2|torr|torr}}',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2|millimeter kvicksilver|millimeter kvicksilver}}',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2|tum kvicksilver|tum kvicksilver}}',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Telugu (తెలుగు)
@@ -4434,152 +5315,153 @@ $messages['vi'] = array(
 	'pfunc-convert-prefix-atto' => 'atô',
 	'pfunc-convert-prefix-zepto' => 'zéptô',
 	'pfunc-convert-prefix-yocto' => 'yóctô',
-	'pfunc-convert-unit-length-metre' => '{{PLURAL:$1}}$2mét',
-	'pfunc-convert-unit-length-angstrom' => '{{PLURAL:$1}}ångström',
-	'pfunc-convert-unit-length-mile' => '{{PLURAL:$1}}dặm',
-	'pfunc-convert-unit-length-furlong' => '{{PLURAL:$1}}furlong',
-	'pfunc-convert-unit-length-chain' => '{{PLURAL:$1}}chain',
-	'pfunc-convert-unit-length-rod' => '{{PLURAL:$1}}rod',
-	'pfunc-convert-unit-length-fathom' => '{{PLURAL:$1}}fathom',
-	'pfunc-convert-unit-length-yard' => '{{PLURAL:$1}}yard',
-	'pfunc-convert-unit-length-foot' => '{{PLURAL:$1}}foot',
-	'pfunc-convert-unit-length-hand' => '{{PLURAL:$1}}hand',
-	'pfunc-convert-unit-length-inch' => '{{PLURAL:$1}}inch',
-	'pfunc-convert-unit-length-nauticalmile' => '{{PLURAL:$1}}hải lý',
-	'pfunc-convert-unit-length-nauticalmileuk' => '{{PLURAL:$1}}hải lý (Anh trước 1970)',
-	'pfunc-convert-unit-length-nauticalmileus' => '{{PLURAL:$1}}hải lý (Mỹ trước 1954)',
-	'pfunc-convert-unit-length-parsec' => '{{PLURAL:$1}}$2parsec',
-	'pfunc-convert-unit-length-lightyear' => '{{PLURAL:$1}}$2 năm ánh sáng',
-	'pfunc-convert-unit-length-astronomicalunit' => '{{PLURAL:$1}}đơn vị thiên văn',
-	'pfunc-convert-unit-length-furlong-abbr' => 'furlong',
-	'pfunc-convert-unit-length-chain-abbr' => 'chain',
-	'pfunc-convert-unit-length-rod-abbr' => 'rd',
-	'pfunc-convert-unit-length-fathom-abbr' => 'fathom',
-	'pfunc-convert-unit-length-yard-abbr' => 'yd',
-	'pfunc-convert-unit-length-foot-abbr' => 'ft',
-	'pfunc-convert-unit-length-hand-abbr' => 'h',
-	'pfunc-convert-unit-length-inch-abbr' => 'in',
-	'pfunc-convert-unit-length-nauticalmile-abbr' => 'nmi',
-	'pfunc-convert-unit-length-nauticalmileuk-abbr' => 'nmi (Anh)',
-	'pfunc-convert-unit-length-nauticalmileus-abbr' => 'nmi (Mỹ trước 1954)',
-	'pfunc-convert-unit-length-parsec-abbr' => '$2pc',
-	'pfunc-convert-unit-length-lightyear-abbr' => '$2ly',
-	'pfunc-convert-unit-length-astronomicalunit-abbr' => 'ua',
-	'pfunc-convert-unit-area-squarekilometre' => '{{PLURAL:$1}}kilômét vuông',
-	'pfunc-convert-unit-area-squaremetre' => '{{PLURAL:$1}}mét vuông',
-	'pfunc-convert-unit-area-squarecentimetre' => '{{PLURAL:$1}}xentimét vuông',
-	'pfunc-convert-unit-area-squaremillimetre' => '{{PLURAL:$1}}millimét vuông',
-	'pfunc-convert-unit-area-hectare' => '{{PLURAL:$1}}hecta',
-	'pfunc-convert-unit-area-squaremile' => '{{PLURAL:$1}}dặm vuông',
-	'pfunc-convert-unit-area-acre' => '{{PLURAL:$1}}mẫu Anh',
-	'pfunc-convert-unit-area-squareyard' => '{{PLURAL:$1}}yard vuông',
-	'pfunc-convert-unit-area-squarefoot' => '{{PLURAL:$1}}foot vuông',
-	'pfunc-convert-unit-area-squareinch' => '{{PLURAL:$1}}inch vuông',
-	'pfunc-convert-unit-area-squarenauticalmile' => '{{PLURAL:$1}}hải lý vuông',
-	'pfunc-convert-unit-area-dunam' => '{{PLURAL:$1}}dunam',
-	'pfunc-convert-unit-area-tsubo' => '{{PLURAL:$1}}tsubo',
-	'pfunc-convert-unit-area-squarekilometre-abbr' => 'km²',
-	'pfunc-convert-unit-area-squaremetre-abbr' => 'm²',
-	'pfunc-convert-unit-area-squarecentimetre-abbr' => 'cm²',
-	'pfunc-convert-unit-area-squaremillimetre-abbr' => 'mm²',
-	'pfunc-convert-unit-area-hectare-abbr' => 'ha',
-	'pfunc-convert-unit-area-squaremile-abbr' => 'sq mi',
-	'pfunc-convert-unit-area-acre-abbr' => 'mẫu',
-	'pfunc-convert-unit-area-squareyard-abbr' => 'sq yd',
-	'pfunc-convert-unit-area-squarefoot-abbr' => 'sq ft',
-	'pfunc-convert-unit-area-squareinch-abbr' => 'sq in',
-	'pfunc-convert-unit-area-squarenauticalmile-abbr' => 'sq nmi',
-	'pfunc-convert-unit-area-dunam-abbr' => 'dunam',
-	'pfunc-convert-unit-area-tsubo-abbr' => 'tsubo',
-	'pfunc-convert-unit-time-second' => '{{PLURAL:$1}}giây',
-	'pfunc-convert-unit-time-year' => '{{PLURAL:$1}}$2 năm',
-	'pfunc-convert-unit-time-day' => '{{PLURAL:$1}}ngày',
-	'pfunc-convert-unit-time-hour' => '{{PLURAL:$1}}giờ',
-	'pfunc-convert-unit-time-minute' => '{{PLURAL:$1}}phút',
-	'pfunc-convert-unit-time-second-abbr' => 's',
-	'pfunc-convert-unit-time-year-abbr' => '$2yr',
-	'pfunc-convert-unit-time-day-abbr' => 'ngày',
-	'pfunc-convert-unit-time-hour-abbr' => 'h',
-	'pfunc-convert-unit-time-minute-abbr' => 'min',
-	'pfunc-convert-unit-volume-cubicmetre' => '{{PLURAL:$1}}mét khối',
-	'pfunc-convert-unit-volume-cubiccentimetre' => '{{PLURAL:$1}}xentimét khối',
-	'pfunc-convert-unit-volume-cubicmillimetre' => '{{PLURAL:$1}}milimét khối',
-	'pfunc-convert-unit-volume-kilolitre' => '{{PLURAL:$1}}kilôlít',
-	'pfunc-convert-unit-volume-litre' => '{{PLURAL:$1}}lít',
-	'pfunc-convert-unit-volume-centilitre' => '{{PLURAL:$1}}xentilít',
-	'pfunc-convert-unit-volume-millilitre' => '{{PLURAL:$1}}mililít',
-	'pfunc-convert-unit-volume-cubicyard' => '{{PLURAL:$1}}yard khối',
-	'pfunc-convert-unit-volume-cubicfoot' => '{{PLURAL:$1}}foot khối',
-	'pfunc-convert-unit-volume-cubicinch' => '{{PLURAL:$1}}inch khối',
-	'pfunc-convert-unit-volume-barrel' => '{{PLURAL:$1}}thùng',
-	'pfunc-convert-unit-volume-bushel' => '{{PLURAL:$1}}giạ',
-	'pfunc-convert-unit-volume-gallon' => '{{PLURAL:$1}}gallon',
-	'pfunc-convert-unit-volume-quart' => '{{PLURAL:$1}}quart',
-	'pfunc-convert-unit-volume-pint' => '{{PLURAL:$1}}pint',
-	'pfunc-convert-unit-volume-fluidounce' => '{{PLURAL:$1}}aoxơ chất lỏng',
-	'pfunc-convert-unit-volume-barrelus' => '{{PLURAL:$1}}thùng Mỹ',
-	'pfunc-convert-unit-volume-barreloil' => '{{PLURAL:$1}}thùng',
-	'pfunc-convert-unit-volume-barrelbeer' => '{{PLURAL:$1}}thùng',
-	'pfunc-convert-unit-volume-usgallon' => '{{PLURAL:$1}}gallon Mỹ',
-	'pfunc-convert-unit-volume-usquart' => '{{PLURAL:$1}}quart Mỹ',
-	'pfunc-convert-unit-volume-uspint' => '{{PLURAL:$1}}pint Mỹ',
-	'pfunc-convert-unit-volume-usfluidounce' => '{{PLURAL:$1}}aoxơ chất lỏng Mỹ',
-	'pfunc-convert-unit-volume-usdrybarrel' => '{{PLURAL:$1}}thùng chất khô Mỹ',
-	'pfunc-convert-unit-volume-usbushel' => '{{PLURAL:$1}}thùng Mỹ',
-	'pfunc-convert-unit-volume-usdrygallon' => '{{PLURAL:$1}}gallon chất khô Mỹ',
-	'pfunc-convert-unit-volume-usdryquart' => '{{PLURAL:$1}}quart chất khô Mỹ',
-	'pfunc-convert-unit-volume-usdrypint' => '{{PLURAL:$1}}pint chất khô Mỹ',
-	'pfunc-convert-unit-volume-cubicmetre-abbr' => 'm³',
-	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => 'cm³',
-	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => 'mm³',
-	'pfunc-convert-unit-volume-litre-abbr' => '$2l',
-	'pfunc-convert-unit-volume-cubicyard-abbr' => 'cu yd',
-	'pfunc-convert-unit-volume-cubicfoot-abbr' => 'cu ft',
-	'pfunc-convert-unit-volume-cubicinch-abbr' => 'cu in',
-	'pfunc-convert-unit-volume-barrel-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-bushel-abbr' => 'bsh',
-	'pfunc-convert-unit-volume-gallon-abbr' => 'gal',
-	'pfunc-convert-unit-volume-quart-abbr' => 'qt',
-	'pfunc-convert-unit-volume-pint-abbr' => 'pt',
-	'pfunc-convert-unit-volume-fluidounce-abbr' => 'fl oz',
-	'pfunc-convert-unit-volume-barrelus-abbr' => 'bbl Mỹ',
-	'pfunc-convert-unit-volume-barreloil-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-barrelbeer-abbr' => 'bbl',
-	'pfunc-convert-unit-volume-usgallon-abbr' => 'gal Mỹ',
-	'pfunc-convert-unit-volume-usquart-abbr' => 'qt Mỹ',
-	'pfunc-convert-unit-volume-uspint-abbr' => 'pt Mỹ',
-	'pfunc-convert-unit-volume-usfluidounce-abbr' => 'fl oz Mỹ',
-	'pfunc-convert-unit-volume-usdrybarrel-abbr' => 'bbl Mỹ',
-	'pfunc-convert-unit-volume-usbushel-abbr' => 'bsh Mỹ',
-	'pfunc-convert-unit-volume-usdrygallon-abbr' => 'dry gal Mỹ',
-	'pfunc-convert-unit-volume-usdryquart-abbr' => 'dry qt Mỹ',
-	'pfunc-convert-unit-volume-usdrypint-abbr' => 'dry pt Mỹ',
-	'pfunc-convert-unit-speed-mile-hour' => 'dặm một giờ',
-	'pfunc-convert-unit-speed-speedoflight' => 'c',
-	'pfunc-convert-unit-speed-mile-hour-abbr' => 'mph',
-	'pfunc-convert-unit-speed-speedoflight-abbr' => 'c',
-	'pfunc-convert-unit-pressure-pascal' => '{{PLURAL:$1}}$2pascal',
-	'pfunc-convert-unit-pressure-bar' => 'ba',
-	'pfunc-convert-unit-pressure-decibar' => 'đêxiba',
-	'pfunc-convert-unit-pressure-millibar' => 'miliba',
-	'pfunc-convert-unit-pressure-kilobarye' => 'kilôbarye',
-	'pfunc-convert-unit-pressure-barye' => 'barye',
-	'pfunc-convert-unit-pressure-atmosphere' => '{{PLURAL:$1}}atmôtphe',
-	'pfunc-convert-unit-pressure-torr' => '{{PLURAL:$1}}torr',
-	'pfunc-convert-unit-pressure-mmhg' => '{{PLURAL:$1}}milimét thủy ngân',
-	'pfunc-convert-unit-pressure-inhg' => '{{PLURAL:$1}}inch thủy ngân',
-	'pfunc-convert-unit-pressure-psi' => '{{PLURAL:$1}}pound một inch vuông',
-	'pfunc-convert-unit-pressure-pascal-abbr' => '$2Pa',
-	'pfunc-convert-unit-pressure-bar-abbr' => 'bar',
-	'pfunc-convert-unit-pressure-decibar-abbr' => 'dbar',
-	'pfunc-convert-unit-pressure-millibar-abbr' => 'mbar',
-	'pfunc-convert-unit-pressure-kilobarye-abbr' => 'kBa',
-	'pfunc-convert-unit-pressure-barye-abbr' => 'Ba',
-	'pfunc-convert-unit-pressure-atmosphere-abbr' => 'atm',
-	'pfunc-convert-unit-pressure-torr-abbr' => 'Torr',
-	'pfunc-convert-unit-pressure-mmhg-abbr' => 'mmHg',
-	'pfunc-convert-unit-pressure-inhg-abbr' => 'inHg',
-	'pfunc-convert-unit-pressure-psi-abbr' => 'psi',
+	'pfunc-convert-prefix-milli-abbr' => 'm',
+	'pfunc-convert-unit-length-metre' => '$1{{PLURAL:$2}}$3mét',
+	'pfunc-convert-unit-length-angstrom' => '$1{{PLURAL:$2}}ångström',
+	'pfunc-convert-unit-length-mile' => '$1{{PLURAL:$2}}dặm',
+	'pfunc-convert-unit-length-furlong' => '$1{{PLURAL:$2}}furlong',
+	'pfunc-convert-unit-length-chain' => '$1{{PLURAL:$2}}chain',
+	'pfunc-convert-unit-length-rod' => '$1{{PLURAL:$2}}rod',
+	'pfunc-convert-unit-length-fathom' => '$1{{PLURAL:$2}}fathom',
+	'pfunc-convert-unit-length-yard' => '$1{{PLURAL:$2}}yard',
+	'pfunc-convert-unit-length-foot' => '$1{{PLURAL:$2}}foot',
+	'pfunc-convert-unit-length-hand' => '$1{{PLURAL:$2}}hand',
+	'pfunc-convert-unit-length-inch' => '$1{{PLURAL:$2}}inch',
+	'pfunc-convert-unit-length-nauticalmile' => '$1{{PLURAL:$2}}hải lý',
+	'pfunc-convert-unit-length-nauticalmileuk' => '$1{{PLURAL:$2}}hải lý (Anh trước 1970)',
+	'pfunc-convert-unit-length-nauticalmileus' => '$1{{PLURAL:$2}}hải lý (Mỹ trước 1954)',
+	'pfunc-convert-unit-length-parsec' => '$1{{PLURAL:$2}}$3parsec',
+	'pfunc-convert-unit-length-lightyear' => '$1{{PLURAL:$2}}$3 năm ánh sáng',
+	'pfunc-convert-unit-length-astronomicalunit' => '$1{{PLURAL:$2}}đơn vị thiên văn',
+	'pfunc-convert-unit-length-furlong-abbr' => '$1furlong',
+	'pfunc-convert-unit-length-chain-abbr' => '$1chain',
+	'pfunc-convert-unit-length-rod-abbr' => '$1rd',
+	'pfunc-convert-unit-length-fathom-abbr' => '$1fathom',
+	'pfunc-convert-unit-length-yard-abbr' => '$1yd',
+	'pfunc-convert-unit-length-foot-abbr' => '$1ft',
+	'pfunc-convert-unit-length-hand-abbr' => '$1h',
+	'pfunc-convert-unit-length-inch-abbr' => '$1in',
+	'pfunc-convert-unit-length-nauticalmile-abbr' => '$1nmi',
+	'pfunc-convert-unit-length-nauticalmileuk-abbr' => '$1nmi (Anh)',
+	'pfunc-convert-unit-length-nauticalmileus-abbr' => '$1nmi (Mỹ trước 1954)',
+	'pfunc-convert-unit-length-parsec-abbr' => '$1$3pc',
+	'pfunc-convert-unit-length-lightyear-abbr' => '$1$3ly',
+	'pfunc-convert-unit-length-astronomicalunit-abbr' => '$1ua',
+	'pfunc-convert-unit-area-squarekilometre' => '$1{{PLURAL:$2}}kilômét vuông',
+	'pfunc-convert-unit-area-squaremetre' => '$1{{PLURAL:$2}}mét vuông',
+	'pfunc-convert-unit-area-squarecentimetre' => '$1{{PLURAL:$2}}xentimét vuông',
+	'pfunc-convert-unit-area-squaremillimetre' => '$1{{PLURAL:$2}}millimét vuông',
+	'pfunc-convert-unit-area-hectare' => '$1{{PLURAL:$2}}hecta',
+	'pfunc-convert-unit-area-squaremile' => '$1{{PLURAL:$2}}dặm vuông',
+	'pfunc-convert-unit-area-acre' => '$1{{PLURAL:$2}}mẫu Anh',
+	'pfunc-convert-unit-area-squareyard' => '$1{{PLURAL:$2}}yard vuông',
+	'pfunc-convert-unit-area-squarefoot' => '$1{{PLURAL:$2}}foot vuông',
+	'pfunc-convert-unit-area-squareinch' => '$1{{PLURAL:$2}}inch vuông',
+	'pfunc-convert-unit-area-squarenauticalmile' => '$1{{PLURAL:$2}}hải lý vuông',
+	'pfunc-convert-unit-area-dunam' => '$1{{PLURAL:$2}}dunam',
+	'pfunc-convert-unit-area-tsubo' => '$1{{PLURAL:$2}}tsubo',
+	'pfunc-convert-unit-area-squarekilometre-abbr' => '$1km²',
+	'pfunc-convert-unit-area-squaremetre-abbr' => '$1m²',
+	'pfunc-convert-unit-area-squarecentimetre-abbr' => '$1cm²',
+	'pfunc-convert-unit-area-squaremillimetre-abbr' => '$1mm²',
+	'pfunc-convert-unit-area-hectare-abbr' => '$1ha',
+	'pfunc-convert-unit-area-squaremile-abbr' => '$1sq mi',
+	'pfunc-convert-unit-area-acre-abbr' => '$1mẫu',
+	'pfunc-convert-unit-area-squareyard-abbr' => '$1sq yd',
+	'pfunc-convert-unit-area-squarefoot-abbr' => '$1sq ft',
+	'pfunc-convert-unit-area-squareinch-abbr' => '$1sq in',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1sq nmi',
+	'pfunc-convert-unit-area-dunam-abbr' => '$1dunam',
+	'pfunc-convert-unit-area-tsubo-abbr' => '$1tsubo',
+	'pfunc-convert-unit-time-second' => '$1{{PLURAL:$2}}giây',
+	'pfunc-convert-unit-time-year' => '$1{{PLURAL:$2}}$3 năm',
+	'pfunc-convert-unit-time-day' => '$1{{PLURAL:$2}}ngày',
+	'pfunc-convert-unit-time-hour' => '$1{{PLURAL:$2}}giờ',
+	'pfunc-convert-unit-time-minute' => '$1{{PLURAL:$2}}phút',
+	'pfunc-convert-unit-time-second-abbr' => '$1s',
+	'pfunc-convert-unit-time-year-abbr' => '$1$3yr',
+	'pfunc-convert-unit-time-day-abbr' => '$1ngày',
+	'pfunc-convert-unit-time-hour-abbr' => '$1h',
+	'pfunc-convert-unit-time-minute-abbr' => '$1min',
+	'pfunc-convert-unit-volume-cubicmetre' => '$1{{PLURAL:$2}}mét khối',
+	'pfunc-convert-unit-volume-cubiccentimetre' => '$1{{PLURAL:$2}}xentimét khối',
+	'pfunc-convert-unit-volume-cubicmillimetre' => '$1{{PLURAL:$2}}milimét khối',
+	'pfunc-convert-unit-volume-kilolitre' => '$1{{PLURAL:$2}}kilôlít',
+	'pfunc-convert-unit-volume-litre' => '$1{{PLURAL:$2}}lít',
+	'pfunc-convert-unit-volume-centilitre' => '$1{{PLURAL:$2}}xentilít',
+	'pfunc-convert-unit-volume-millilitre' => '$1{{PLURAL:$2}}mililít',
+	'pfunc-convert-unit-volume-cubicyard' => '$1{{PLURAL:$2}}yard khối',
+	'pfunc-convert-unit-volume-cubicfoot' => '$1{{PLURAL:$2}}foot khối',
+	'pfunc-convert-unit-volume-cubicinch' => '$1{{PLURAL:$2}}inch khối',
+	'pfunc-convert-unit-volume-barrel' => '$1{{PLURAL:$2}}thùng',
+	'pfunc-convert-unit-volume-bushel' => '$1{{PLURAL:$2}}giạ',
+	'pfunc-convert-unit-volume-gallon' => '$1{{PLURAL:$2}}gallon',
+	'pfunc-convert-unit-volume-quart' => '$1{{PLURAL:$2}}quart',
+	'pfunc-convert-unit-volume-pint' => '$1{{PLURAL:$2}}pint',
+	'pfunc-convert-unit-volume-fluidounce' => '$1{{PLURAL:$2}}aoxơ chất lỏng',
+	'pfunc-convert-unit-volume-barrelus' => '$1{{PLURAL:$2}}thùng Mỹ',
+	'pfunc-convert-unit-volume-barreloil' => '$1{{PLURAL:$2}}thùng',
+	'pfunc-convert-unit-volume-barrelbeer' => '$1{{PLURAL:$2}}thùng',
+	'pfunc-convert-unit-volume-usgallon' => '$1{{PLURAL:$2}}gallon Mỹ',
+	'pfunc-convert-unit-volume-usquart' => '$1{{PLURAL:$2}}quart Mỹ',
+	'pfunc-convert-unit-volume-uspint' => '$1{{PLURAL:$2}}pint Mỹ',
+	'pfunc-convert-unit-volume-usfluidounce' => '$1{{PLURAL:$2}}aoxơ chất lỏng Mỹ',
+	'pfunc-convert-unit-volume-usdrybarrel' => '$1{{PLURAL:$2}}thùng chất khô Mỹ',
+	'pfunc-convert-unit-volume-usbushel' => '$1{{PLURAL:$2}}thùng Mỹ',
+	'pfunc-convert-unit-volume-usdrygallon' => '$1{{PLURAL:$2}}gallon chất khô Mỹ',
+	'pfunc-convert-unit-volume-usdryquart' => '$1{{PLURAL:$2}}quart chất khô Mỹ',
+	'pfunc-convert-unit-volume-usdrypint' => '$1{{PLURAL:$2}}pint chất khô Mỹ',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m³',
+	'pfunc-convert-unit-volume-cubiccentimetre-abbr' => '$1cm³',
+	'pfunc-convert-unit-volume-cubicmillimetre-abbr' => '$1mm³',
+	'pfunc-convert-unit-volume-litre-abbr' => '$1$3l',
+	'pfunc-convert-unit-volume-cubicyard-abbr' => '$1cu yd',
+	'pfunc-convert-unit-volume-cubicfoot-abbr' => '$1cu ft',
+	'pfunc-convert-unit-volume-cubicinch-abbr' => '$1cu in',
+	'pfunc-convert-unit-volume-barrel-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-bushel-abbr' => '$1bsh',
+	'pfunc-convert-unit-volume-gallon-abbr' => '$1gal',
+	'pfunc-convert-unit-volume-quart-abbr' => '$1qt',
+	'pfunc-convert-unit-volume-pint-abbr' => '$1pt',
+	'pfunc-convert-unit-volume-fluidounce-abbr' => '$1fl oz',
+	'pfunc-convert-unit-volume-barrelus-abbr' => '$1bbl Mỹ',
+	'pfunc-convert-unit-volume-barreloil-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-barrelbeer-abbr' => '$1bbl',
+	'pfunc-convert-unit-volume-usgallon-abbr' => '$1gal Mỹ',
+	'pfunc-convert-unit-volume-usquart-abbr' => '$1qt Mỹ',
+	'pfunc-convert-unit-volume-uspint-abbr' => '$1pt Mỹ',
+	'pfunc-convert-unit-volume-usfluidounce-abbr' => '$1fl oz Mỹ',
+	'pfunc-convert-unit-volume-usdrybarrel-abbr' => '$1bbl Mỹ',
+	'pfunc-convert-unit-volume-usbushel-abbr' => '$1bsh Mỹ',
+	'pfunc-convert-unit-volume-usdrygallon-abbr' => '$1dry gal Mỹ',
+	'pfunc-convert-unit-volume-usdryquart-abbr' => '$1dry qt Mỹ',
+	'pfunc-convert-unit-volume-usdrypint-abbr' => '$1dry pt Mỹ',
+	'pfunc-convert-unit-speed-mile-hour' => '$1dặm một giờ',
+	'pfunc-convert-unit-speed-speedoflight' => '$1c',
+	'pfunc-convert-unit-speed-mile-hour-abbr' => '$1mph',
+	'pfunc-convert-unit-speed-speedoflight-abbr' => '$1c',
+	'pfunc-convert-unit-pressure-pascal' => '$1{{PLURAL:$2}}$3pascal',
+	'pfunc-convert-unit-pressure-bar' => '$1ba',
+	'pfunc-convert-unit-pressure-decibar' => '$1đêxiba',
+	'pfunc-convert-unit-pressure-millibar' => '$1miliba',
+	'pfunc-convert-unit-pressure-kilobarye' => '$1kilôbarye',
+	'pfunc-convert-unit-pressure-barye' => '$1barye',
+	'pfunc-convert-unit-pressure-atmosphere' => '$1{{PLURAL:$2}}atmôtphe',
+	'pfunc-convert-unit-pressure-torr' => '$1{{PLURAL:$2}}torr',
+	'pfunc-convert-unit-pressure-mmhg' => '$1{{PLURAL:$2}}milimét thủy ngân',
+	'pfunc-convert-unit-pressure-inhg' => '$1{{PLURAL:$2}}inch thủy ngân',
+	'pfunc-convert-unit-pressure-psi' => '$1{{PLURAL:$2}}pound một inch vuông',
+	'pfunc-convert-unit-pressure-pascal-abbr' => '$1$3Pa',
+	'pfunc-convert-unit-pressure-bar-abbr' => '$1bar',
+	'pfunc-convert-unit-pressure-decibar-abbr' => '$1dbar',
+	'pfunc-convert-unit-pressure-millibar-abbr' => '$1mbar',
+	'pfunc-convert-unit-pressure-kilobarye-abbr' => '$1kBa',
+	'pfunc-convert-unit-pressure-barye-abbr' => '$1Ba',
+	'pfunc-convert-unit-pressure-atmosphere-abbr' => '$1atm',
+	'pfunc-convert-unit-pressure-torr-abbr' => '$1Torr',
+	'pfunc-convert-unit-pressure-mmhg-abbr' => '$1mmHg',
+	'pfunc-convert-unit-pressure-inhg-abbr' => '$1inHg',
+	'pfunc-convert-unit-pressure-psi-abbr' => '$1psi',
 );
 
 /** Volapük (Volapük)
@@ -4637,14 +5519,18 @@ $messages['yue'] = array(
 );
 
 /** Simplified Chinese (‪中文(简体)‬)
+ * @author Hydra
  * @author Liangent
+ * @author PhiLiP
  * @author Philip
  * @author Shinjiman
+ * @author 阿pp
  */
 $messages['zh-hans'] = array(
 	'pfunc_desc' => '用逻辑函数加强解析器',
 	'pfunc_time_error' => '错误：无效时间',
 	'pfunc_time_too_long' => '错误：#time调用次数过多',
+	'pfunc_time_too_big' => '错误：#time只支持到9999年',
 	'pfunc_rel2abs_invalid_depth' => '错误：无效路径深度：“$1”（尝试访问根节点以上节点）',
 	'pfunc_expr_stack_exhausted' => '表达式错误：堆栈耗尽',
 	'pfunc_expr_unexpected_number' => '表达式错误：未预料的数字',
@@ -4661,6 +5547,11 @@ $messages['zh-hans'] = array(
 	'pfunc_expr_unknown_error' => '表达式错误：未知错误（$1）',
 	'pfunc_expr_not_a_number' => '在$1中：结果不是数字',
 	'pfunc_string_too_long' => '错误：字符串超过$1字符限制',
+	'pfunc-convert-dimension-time' => '时间',
+	'pfunc-convert-dimension-mass' => '重量',
+	'pfunc-convert-dimension-speed' => '速度',
+	'pfunc-convert-unit-area-squarenauticalmile-abbr' => '$1平方海里',
+	'pfunc-convert-unit-volume-cubicmetre-abbr' => '$1m<sup>3</sup>',
 );
 
 /** Traditional Chinese (‪中文(繁體)‬)
diff --git a/extensions/ParserFunctions/ParserFunctions.php b/extensions/ParserFunctions/ParserFunctions.php
index da9f3bbe..fc28ece8 100644
--- a/extensions/ParserFunctions/ParserFunctions.php
+++ b/extensions/ParserFunctions/ParserFunctions.php
@@ -50,8 +50,8 @@ $wgPFUnitLanguageVariants = array(
 $wgExtensionCredits['parserhook'][] = array(
 	'path' => __FILE__,
 	'name' => 'ParserFunctions',
-	'version' => '1.4.0',
-	'url' => 'http://www.mediawiki.org/wiki/Extension:ParserFunctions',
+	'version' => '1.4.1',
+	'url' => 'https://www.mediawiki.org/wiki/Extension:ParserFunctions',
 	'author' => array( 'Tim Starling', 'Robert Rohde', 'Ross McClure', 'Juraj Simlovic' ),
 	'descriptionmsg' => 'pfunc_desc',
 );
@@ -69,25 +69,20 @@ $wgParserTestFiles[] = dirname( __FILE__ ) . "/convertTests.txt";
 
 $wgHooks['ParserFirstCallInit'][] = 'wfRegisterParserFunctions';
 
+/**
+ * @param $parser Parser
+ * @return bool
+ */
 function wfRegisterParserFunctions( $parser ) {
 	global $wgPFEnableStringFunctions, $wgPFEnableConvert;
 
-	if ( defined( get_class( $parser ) . '::SFH_OBJECT_ARGS' ) ) {
-		// These functions accept DOM-style arguments
-		$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeqObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexistObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexprObj', SFH_OBJECT_ARGS );
-		$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferrorObj', SFH_OBJECT_ARGS );
-	} else {
-		$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifHook' );
-		$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeq' );
-		$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchHook' );
-		$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexist' );
-		$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexpr' );
-		$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferror' );
-	}
+	// These functions accept DOM-style arguments
+	$parser->setFunctionHook( 'if', 'ExtParserFunctions::ifObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'ifeq', 'ExtParserFunctions::ifeqObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'switch', 'ExtParserFunctions::switchObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'ifexist', 'ExtParserFunctions::ifexistObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'ifexpr', 'ExtParserFunctions::ifexprObj', SFH_OBJECT_ARGS );
+	$parser->setFunctionHook( 'iferror', 'ExtParserFunctions::iferrorObj', SFH_OBJECT_ARGS );
 
 	$parser->setFunctionHook( 'expr', 'ExtParserFunctions::expr' );
 	$parser->setFunctionHook( 'time', 'ExtParserFunctions::time' );
diff --git a/extensions/ParserFunctions/ParserFunctions_body.php b/extensions/ParserFunctions/ParserFunctions_body.php
index 13611510..d68ed8b7 100644
--- a/extensions/ParserFunctions/ParserFunctions_body.php
+++ b/extensions/ParserFunctions/ParserFunctions_body.php
@@ -7,6 +7,10 @@ class ExtParserFunctions {
 	static $mTimeChars = 0;
 	static $mMaxTimeChars = 6000; # ~10 seconds
 
+	/**
+	 * @param $parser Parser
+	 * @return bool
+	 */
 	public static function clearState( $parser ) {
 		self::$mTimeChars = 0;
 		$parser->pf_ifexist_breakdown = array();
@@ -30,6 +34,8 @@ class ExtParserFunctions {
 
 	/**
 	 * Get the marker regex. Cached.
+	 * @param $parser Parser
+	 * @return
 	 */
 	public static function getMarkerRegex( $parser ) {
 		self::registerClearHook();
@@ -41,16 +47,7 @@ class ExtParserFunctions {
 
 		$prefix = preg_quote( $parser->uniqPrefix(), '/' );
 
-		// The first line represents Parser from release 1.12 forward.
-		// subsequent lines are hacks to accomodate old Mediawiki versions.
-		if ( defined( 'Parser::MARKER_SUFFIX' ) )
-			$suffix = preg_quote( Parser::MARKER_SUFFIX, '/' );
-		elseif ( isset( $parser->mMarkerSuffix ) )
-			$suffix = preg_quote( $parser->mMarkerSuffix, '/' );
-		elseif ( defined( 'MW_PARSER_VERSION' ) &&
-				strcmp( MW_PARSER_VERSION, '1.6.1' ) > 0 )
-			$suffix = "QINU\x07";
-		else $suffix = 'QINU';
+		$suffix = preg_quote( Parser::MARKER_SUFFIX, '/' );
 
 		$parser->pf_markerRegex = '/' . $prefix . '(?:(?!' . $suffix . ').)*' . $suffix . '/us';
 
@@ -58,7 +55,11 @@ class ExtParserFunctions {
 		return $parser->pf_markerRegex;
 	}
 
-	// Removes unique markers from passed parameters, used by string functions.
+	/**
+	 * @param $parser Parser
+	 * @param $text string
+	 * @return string
+	 */
 	private static function killMarkers ( $parser, $text ) {
 		return preg_replace( self::getMarkerRegex( $parser ), '' , $text );
 	}
@@ -73,6 +74,11 @@ class ExtParserFunctions {
 		return self::$mExprParser;
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $expr string
+	 * @return string
+	 */
 	public static function expr( $parser, $expr = '' ) {
 		try {
 			return self::getExprParser()->doExpression( $expr );
@@ -81,6 +87,13 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $expr string
+	 * @param $then string
+	 * @param $else string
+	 * @return string
+	 */
 	public static function ifexpr( $parser, $expr = '', $then = '', $else = '' ) {
 		try {
 			$ret = self::getExprParser()->doExpression( $expr );
@@ -97,6 +110,12 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifexprObj( $parser, $frame, $args ) {
 		$expr = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$then = isset( $args[1] ) ? $args[1] : '';
@@ -108,14 +127,12 @@ class ExtParserFunctions {
 		return $result;
 	}
 
-	public static function ifHook( $parser, $test = '', $then = '', $else = '' ) {
-		if ( $test !== '' ) {
-			return $then;
-		} else {
-			return $else;
-		}
-	}
-
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifObj( $parser, $frame, $args ) {
 		$test = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		if ( $test !== '' ) {
@@ -125,14 +142,12 @@ class ExtParserFunctions {
 		}
 	}
 
-	public static function ifeq( $parser, $left = '', $right = '', $then = '', $else = '' ) {
-		if ( $left == $right ) {
-			return $then;
-		} else {
-			return $else;
-		}
-	}
-
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifeqObj( $parser, $frame, $args ) {
 		$left = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$right = isset( $args[1] ) ? trim( $frame->expand( $args[1] ) ) : '';
@@ -143,6 +158,13 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $test string
+	 * @param $then string
+	 * @param $else bool
+	 * @return bool|string
+	 */
 	public static function iferror( $parser, $test = '', $then = '', $else = false ) {
 		if ( preg_match( '/<(?:strong|span|p|div)\s(?:[^\s>]*\s+)*?class="(?:[^"\s>]*\s+)*?error(?:\s[^">]*)?"/', $test ) ) {
 			return $then;
@@ -153,6 +175,12 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function iferrorObj( $parser, $frame, $args ) {
 		$test = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$then = isset( $args[1] ) ? $args[1] : false;
@@ -165,47 +193,7 @@ class ExtParserFunctions {
 		}
 	}
 
-	public static function switchHook( $parser /*,...*/ ) {
-		$args = func_get_args();
-		array_shift( $args );
-		$primary = trim( array_shift( $args ) );
-		$found = $defaultFound = false;
-		$parts = null;
-		$default = null;
-		$mwDefault =& MagicWord::get( 'default' );
-		foreach ( $args as $arg ) {
-			$parts = array_map( 'trim', explode( '=', $arg, 2 ) );
-			if ( count( $parts ) == 2 ) {
-				# Found "="
-				if ( $found || $parts[0] == $primary ) {
-					# Found a match, return now
-					return $parts[1];
-				} elseif ( $defaultFound || $mwDefault->matchStartAndRemove( $parts[0] ) ) {
-					$default = $parts[1];
-				} # else wrong case, continue
-			} elseif ( count( $parts ) == 1 ) {
-				# Multiple input, single output
-				# If the value matches, set a flag and continue
-				if ( $parts[0] == $primary ) {
-					$found = true;
-				} elseif ( $mwDefault->matchStartAndRemove( $parts[0] ) ) {
-					$defaultFound = true;
-				}
-			} # else RAM corruption due to cosmic ray?
-		}
-		# Default case
-		# Check if the last item had no = sign, thus specifying the default case
-		if ( count( $parts ) == 1 ) {
-			return $parts[0];
-		} elseif ( !is_null( $default ) ) {
-			return $default;
-		} else {
-			return '';
-		}
-	}
-
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param $frame PPFrame
 	 * @param $args
@@ -272,6 +260,10 @@ class ExtParserFunctions {
 	 * initial slash is treated as a relative path, and vice versa.
 	 *
 	 * @param $parser Parser
+	 * @param $to string
+	 * @param $from string
+	 *
+	 * @return string
 	 */
 	public static function rel2abs( $parser , $to = '' , $from = '' ) {
 
@@ -328,7 +320,6 @@ class ExtParserFunctions {
 	}
 
 	/**
-	 * @static
 	 * @param $parser Parser
 	 * @param $frame PPFrame
 	 * @return bool
@@ -348,10 +339,15 @@ class ExtParserFunctions {
 		return $parser->mExpensiveFunctionCount <= $wgExpensiveParserFunctionLimit;
 	}
 
-	public static function ifexist( $parser, $title = '', $then = '', $else = '' ) {
-		return self::ifexistCommon( $parser, false, $title, $then, $else );
-	}
-
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $titletext string
+	 * @param $then string
+	 * @param $else string
+	 *
+	 * @return string
+	 */
 	public static function ifexistCommon( $parser, $frame, $titletext = '', $then = '', $else = '' ) {
 		global $wgContLang;
 		$title = Title::newFromText( $titletext );
@@ -385,11 +381,12 @@ class ExtParserFunctions {
 				return $else;
 			} else {
 				$pdbk = $title->getPrefixedDBkey();
-				$lc = LinkCache::singleton();
 				if ( !self::incrementIfexistCount( $parser, $frame ) ) {
 					return $else;
 				}
-				if ( 0 != ( $id = $lc->getGoodLinkID( $pdbk ) ) ) {
+				$lc = LinkCache::singleton();
+				$id = $lc->getGoodLinkID( $pdbk );
+				if ( $id != 0 ) {
 					$parser->mOutput->addLink( $title, $id );
 					return $then;
 				} elseif ( $lc->isBadLink( $pdbk ) ) {
@@ -406,6 +403,12 @@ class ExtParserFunctions {
 		return $else;
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $frame PPFrame
+	 * @param $args array
+	 * @return string
+	 */
 	public static function ifexistObj( $parser, $frame, $args ) {
 		$title = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) ) : '';
 		$then = isset( $args[1] ) ? $args[1] : null;
@@ -419,81 +422,65 @@ class ExtParserFunctions {
 		}
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $format string
+	 * @param $date string
+	 * @param $language string
+	 * @param $local string|bool
+	 * @return string
+	 */
 	public static function time( $parser, $format = '', $date = '', $language = '', $local = false ) {
-		global $wgLang, $wgContLang, $wgLocaltimezone;
+		global $wgLocaltimezone;
 		self::registerClearHook();
-		if ( isset( self::$mTimeCache[$format][$date][$language][$local] ) ) {
-			return self::$mTimeCache[$format][$date][$language][$local];
+		if ( $date === '' ) {
+			$cacheKey = $parser->getOptions()->getTimestamp();
+			$date = wfTimestamp( TS_ISO_8601, $cacheKey );
+		} else {
+			$cacheKey = $date;
+		}
+		if ( isset( self::$mTimeCache[$format][$cacheKey][$language][$local] ) ) {
+			return self::$mTimeCache[$format][$cacheKey][$language][$local];
 		}
 
 		# compute the timestamp string $ts
 		# PHP >= 5.2 can handle dates before 1970 or after 2038 using the DateTime object
-		# PHP < 5.2 is limited to dates between 1970 and 2038
 
 		$invalidTime = false;
 
-		if ( class_exists( 'DateTime' ) ) { # PHP >= 5.2
-			# the DateTime constructor must be used because it throws exceptions
-			# when errors occur, whereas date_create appears to just output a warning
-			# that can't really be detected from within the code
-			try {
-				# Determine timezone
-				if ( $local ) {
-					 # convert to MediaWiki local timezone if set
-					if ( isset( $wgLocaltimezone ) ) {
-						$tz = new DateTimeZone( $wgLocaltimezone );
-					} else {
-						$tz = new DateTimeZone( date_default_timezone_get() );
-					}
-				} else {
-					# if local time was not requested, convert to UTC
-					$tz = new DateTimeZone( 'UTC' );
-				}
-				
-				# Correct for DateTime interpreting 'XXXX' as XX:XX o'clock
-				if ( preg_match( '/^[0-9]{4}$/', $date ) ) {
-					$date = '00:00 '.$date;
-				}
+		# the DateTime constructor must be used because it throws exceptions
+		# when errors occur, whereas date_create appears to just output a warning
+		# that can't really be detected from within the code
+		try {
 
-				# Parse date
-				if ( $date !== '' ) {
-					$dateObject = new DateTime( $date, $tz );
-				} else {
-					# use current date and time
-					$dateObject = new DateTime( 'now', $tz );
-				}
+			# Default input timezone is UTC.
+			$utc = new DateTimeZone( 'UTC' );
 
-				# Generate timestamp
-				$ts = $dateObject->format( 'YmdHis' );
-			} catch ( Exception $ex ) {
-				$invalidTime = true;
-			}
-		} else { # PHP < 5.2
-			if ( $date !== '' ) {
-				$unix = @strtotime( $date );
-			} else {
-				$unix = time();
+			# Correct for DateTime interpreting 'XXXX' as XX:XX o'clock
+			if ( preg_match( '/^[0-9]{4}$/', $date ) ) {
+				$date = '00:00 '.$date;
 			}
 
-			if ( $unix == -1 || $unix == false ) {
-				$invalidTime = true;
-			} else {
-				if ( $local ) {
-					# Use the time zone
-					if ( isset( $wgLocaltimezone ) ) {
-						$oldtz = getenv( 'TZ' );
-						putenv( 'TZ=' . $wgLocaltimezone );
-					}
-					wfSuppressWarnings(); // E_STRICT system time bitching
-					$ts = date( 'YmdHis', $unix );
-					wfRestoreWarnings();
-					if ( isset( $wgLocaltimezone ) ) {
-						putenv( 'TZ=' . $oldtz );
-					}
+			# Parse date
+			# UTC is a default input timezone.
+			$dateObject = new DateTime( $date, $utc );
+
+			# Set output timezone.
+			if ( $local ) {
+				if ( isset( $wgLocaltimezone ) ) {
+					$tz = new DateTimeZone( $wgLocaltimezone );
 				} else {
-					$ts = wfTimestamp( TS_MW, $unix );
+					$tz = new DateTimeZone( date_default_timezone_get() );
 				}
+				$dateObject->setTimezone( $tz );
+			} else {
+				$dateObject->setTimezone( $utc );
 			}
+			# Generate timestamp
+			$ts = $dateObject->format( 'YmdHis' );
+
+		} catch ( Exception $ex ) {
+			$invalidTime = true;
 		}
 
 		# format the timestamp and return the result
@@ -518,10 +505,17 @@ class ExtParserFunctions {
 				}
 			}
 		}
-		self::$mTimeCache[$format][$date][$language][$local] = $result;
+		self::$mTimeCache[$format][$cacheKey][$language][$local] = $result;
 		return $result;
 	}
 
+	/**
+	 * @param $parser Parser
+	 * @param $format string
+	 * @param $date string
+	 * @param $language string
+	 * @return string
+	 */
 	public static function localTime( $parser, $format = '', $date = '', $language = '' ) {
 		return self::time( $parser, $format, $date, $language, true );
 	}
@@ -530,10 +524,10 @@ class ExtParserFunctions {
 	 * Obtain a specified number of slash-separated parts of a title,
 	 * e.g. {{#titleparts:Hello/World|1}} => "Hello"
 	 *
-	 * @param Parser $parser Parent parser
-	 * @param string $title Title to split
-	 * @param int $parts Number of parts to keep
-	 * @param int $offset Offset starting at 1
+	 * @param $parser Parent parser
+	 * @param $title string Title to split
+	 * @param $parts int Number of parts to keep
+	 * @param $offset int Offset starting at 1
 	 * @return string
 	 */
 	public static function titleparts( $parser, $title = '', $parts = 0, $offset = 0 ) {
@@ -570,6 +564,9 @@ class ExtParserFunctions {
 		return self::$mConvertParser;
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function convert( /*...*/ ) {
 		try {
 			$args = func_get_args();
@@ -579,13 +576,20 @@ class ExtParserFunctions {
 		}
 	}
 
-	// Verifies parameter is less than max string length.
+	/**
+	 *  Verifies parameter is less than max string length.
+	 * @param $text
+	 * @return bool
+	 */
 	private static function checkLength( $text ) {
 		global $wgPFStringLengthLimit;
 		return ( mb_strlen( $text ) < $wgPFStringLengthLimit );
 	}
 
-	// Generates error message.  Called when string is too long.
+	/**
+	 * Generates error message.  Called when string is too long.
+	 * @return string
+	 */
 	private static function tooLongError() {
 		global $wgPFStringLengthLimit, $wgContLang;
 		return '<strong class="error">' .
@@ -599,6 +603,9 @@ class ExtParserFunctions {
 	 * {{#len:string}}
 	 *
 	 * Reports number of characters in string.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @return int
 	 */
 	public static function runLen ( $parser, $inStr = '' ) {
 		wfProfileIn( __METHOD__ );
@@ -617,6 +624,11 @@ class ExtParserFunctions {
 	 *
 	 * Note: If the needle is an empty string, single space is used instead.
 	 * Note: If the needle is not found, empty string is returned.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inNeedle int
+	 * @param $inOffset int
+	 * @return int|string
 	 */
 	public static function runPos ( $parser, $inStr = '', $inNeedle = '', $inOffset = 0 ) {
 		wfProfileIn( __METHOD__ );
@@ -625,7 +637,7 @@ class ExtParserFunctions {
 		$inNeedle = self::killMarkers( $parser, (string)$inNeedle );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inNeedle ) ) {
+			!self::checkLength( $inNeedle ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -646,6 +658,10 @@ class ExtParserFunctions {
 	 *
 	 * Note: If the needle is an empty string, single space is used instead.
 	 * Note: If the needle is not found, -1 is returned.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inNeedle int
+	 * @return int|string
 	 */
 	public static function runRPos ( $parser, $inStr = '', $inNeedle = '' ) {
 		wfProfileIn( __METHOD__ );
@@ -654,7 +670,7 @@ class ExtParserFunctions {
 		$inNeedle = self::killMarkers( $parser, (string)$inNeedle );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inNeedle ) ) {
+			!self::checkLength( $inNeedle ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -679,6 +695,12 @@ class ExtParserFunctions {
 	 *   "string".
 	 * Note: A negative value for "length" returns a string reduced in
 	 *   length by that amount.
+	 *
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inStart int
+	 * @param $inLength int
+	 * @return string
 	 */
 	public static function runSub ( $parser, $inStr = '', $inStart = 0, $inLength = 0 ) {
 		wfProfileIn( __METHOD__ );
@@ -693,7 +715,7 @@ class ExtParserFunctions {
 		if ( intval( $inLength ) == 0 ) {
 			$result = mb_substr( $inStr, $inStart );
 		} else {
-			$result = mb_substr( $inStr, $inStart, $inLength );
+			$result = mb_substr( $inStr, intval( $inStart ), intval( $inLength ) );
 		}
 
 		wfProfileOut( __METHOD__ );
@@ -706,6 +728,10 @@ class ExtParserFunctions {
 	 * Returns number of occurrences of "substr" in "string".
 	 *
 	 * Note: If "substr" is empty, a single space is used.
+	 * @param $parser
+	 * @param $inStr string
+	 * @param $inSubStr string
+	 * @return int|string
 	 */
 	public static function runCount ( $parser, $inStr = '', $inSubStr = '' ) {
 		wfProfileIn( __METHOD__ );
@@ -714,12 +740,14 @@ class ExtParserFunctions {
 		$inSubStr = self::killMarkers( $parser, (string)$inSubStr );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inSubStr ) ) {
+			!self::checkLength( $inSubStr ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
 
-		if ( $inSubStr == '' ) { $inSubStr = ' '; }
+		if ( $inSubStr == '' ) {
+			$inSubStr = ' ';
+		}
 
 		$result = mb_substr_count( $inStr, $inSubStr );
 
@@ -735,6 +763,12 @@ class ExtParserFunctions {
 	 *
 	 * Note: Armored against replacements that would generate huge strings.
 	 * Note: If "from" is an empty string, single space is used instead.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inReplaceFrom string
+	 * @param $inReplaceTo string
+	 * @param $inLimit int
+	 * @return mixed|string
 	 */
 	public static function runReplace( $parser, $inStr = '',
 			$inReplaceFrom = '', $inReplaceTo = '', $inLimit = -1 ) {
@@ -746,8 +780,8 @@ class ExtParserFunctions {
 		$inReplaceTo = self::killMarkers( $parser, (string)$inReplaceTo );
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inReplaceFrom ) ||
-		    !self::checkLength( $inReplaceTo ) ) {
+			!self::checkLength( $inReplaceFrom ) ||
+			!self::checkLength( $inReplaceTo ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -793,6 +827,12 @@ class ExtParserFunctions {
 	 * Note: Negative position can be used to specify tokens from the end.
 	 * Note: If the divider is an empty string, single space is used instead.
 	 * Note: Empty string is returned if there are not enough exploded chunks.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @param $inDiv string
+	 * @param $inPos int
+	 * @param $inLim int|null
+	 * @return string
 	 */
 	public static function runExplode ( $parser, $inStr = '', $inDiv = '', $inPos = 0, $inLim = null ) {
 		wfProfileIn( __METHOD__ );
@@ -800,10 +840,12 @@ class ExtParserFunctions {
 		$inStr = self::killMarkers( $parser, (string)$inStr );
 		$inDiv = self::killMarkers( $parser, (string)$inDiv );
 
-		if ( $inDiv == '' ) { $inDiv = ' '; }
+		if ( $inDiv == '' ) {
+			$inDiv = ' ';
+		}
 
 		if ( !self::checkLength( $inStr ) ||
-		    !self::checkLength( $inDiv ) ) {
+			!self::checkLength( $inDiv ) ) {
 			wfProfileOut( __METHOD__ );
 			return self::tooLongError();
 		}
@@ -828,6 +870,9 @@ class ExtParserFunctions {
 	 * {{#urldecode:string}}
 	 *
 	 * Decodes URL-encoded (like%20that) strings.
+	 * @param $parser Parser
+	 * @param $inStr string
+	 * @return string
 	 */
 	public static function runUrlDecode( $parser, $inStr = '' ) {
 		wfProfileIn( __METHOD__ );
diff --git a/extensions/ParserFunctions/convertTests.txt b/extensions/ParserFunctions/convertTests.txt
index dc09c45a..b9d84f31 100644
--- a/extensions/ParserFunctions/convertTests.txt
+++ b/extensions/ParserFunctions/convertTests.txt
@@ -172,13 +172,13 @@ Errors
 *{{#convert: 25 km/s/l }}
 *{{#convert: 25 km/m3 }}
 !! result
-<ul><li><strong class="error">Error: no source unit given</strong>
-</li><li><strong class="error">Error: unknown unit "foobars"</strong>
-</li><li><strong class="error">Error: unknown unit "foobar"</strong>
-</li><li><strong class="error">Error: cannot convert between units of "length" and "time"</strong>
-</li><li><strong class="error">Error: invalid compound unit "length/pressure"</strong>
-</li><li><strong class="error">Error: cannot parse double compound units like "km/s/l"</strong>
-</li><li><strong class="error">Error: invalid compound unit "length/volume"</strong>
+<ul><li><strong class="error">Error: No source unit given.</strong>
+</li><li><strong class="error">Error: Unknown unit "foobars".</strong>
+</li><li><strong class="error">Error: Unknown unit "foobar".</strong>
+</li><li><strong class="error">Error: Cannot convert between units of "length" and "time".</strong>
+</li><li><strong class="error">Error: Invalid compound unit "length/pressure".</strong>
+</li><li><strong class="error">Error: Cannot parse double compound units like "km/s/l".</strong>
+</li><li><strong class="error">Error: Invalid compound unit "length/volume".</strong>
 </li></ul>
 
 !! end
@@ -225,7 +225,7 @@ Case sensitivity
 </li><li>10,000,000 metres
 </li><li>0.01 megametres
 </li><li>0.1 millimetres of mercury
-</li><li><strong class="error">Error: unknown unit "pa"</strong>
+</li><li><strong class="error">Error: Unknown unit "pa".</strong>
 </li></ul>
 
 !! end
diff --git a/extensions/ParserFunctions/funcsParserTests.txt b/extensions/ParserFunctions/funcsParserTests.txt
index ef2c1f38..a741836a 100644
--- a/extensions/ParserFunctions/funcsParserTests.txt
+++ b/extensions/ParserFunctions/funcsParserTests.txt
@@ -22,7 +22,7 @@ blah blah
 !! endarticle
 
 !! test
-Input times should probably be UTC, not local time
+Input times are UTC, not local time
 !! input
 {{#time:c|15 January 2001}}
 !!result
@@ -58,6 +58,42 @@ Time test after the 2038 32-bit Apocalype
 !! end
 
 !! test
+Explicitly specified timezone: UTC
+!! input
+{{#time:Y-m-d H:i| 2011-11-12 23:00 UTC }}
+!! result
+<p>2011-11-12 23:00
+</p>
+!! end
+
+!! test
+Explicitly specified timezone: Europe/Paris (UTC+1)
+!! input
+{{#time:Y-m-d H:i| 2011-11-12 23:00 Europe/Paris }}
+!! result
+<p>2011-11-12 22:00
+</p>
+!! end
+
+!! test
+Explicitly specified timezone: America/New_York (UTC-5)
+!! input
+{{#time:Y-m-d H:i| 2011-11-12 23:00 America/New_York }}
+!! result
+<p>2011-11-13 04:00
+</p>
+!! end
+
+!! test
+Explicitely specified output language (Dutch)
+!! input
+{{#time:d F Y|1988-02-28|nl}}
+!! result
+<p>28 februari 1988
+</p>
+!! end
+
+!! test
 Bug 19093: Default values don't fall through in switch
 !! input
 <{{#switch: foo | bar | #default = DEF }}>
diff --git a/extensions/ParserFunctions/testExpr.php b/extensions/ParserFunctions/testExpr.php
index 4a941737..b3336c53 100644
--- a/extensions/ParserFunctions/testExpr.php
+++ b/extensions/ParserFunctions/testExpr.php
@@ -13,7 +13,7 @@ $pass = $fail = 0;
 $parser = new ExprParser;
 foreach ( $tests as $test ) {
 	$test = trim( $test );
-	if ( in_string( ';', $test ) )
+	if ( strpos( $test, ';' ) !== false )
 		list( $input, $expected ) = explode( ';', $test );
 	else {
 		$input = $test;