| Index: source/data/unit/en.txt
|
| diff --git a/source/data/unit/en.txt b/source/data/unit/en.txt
|
| old mode 100755
|
| new mode 100644
|
| index d55df06ad25bc939b80fc2e189294b6e4f0c3143..c13bfe030952b700e44500af9a3f57767a8ab4bf
|
| --- a/source/data/unit/en.txt
|
| +++ b/source/data/unit/en.txt
|
| @@ -1,13 +1,7 @@
|
| -// ***************************************************************************
|
| -// *
|
| -// * Copyright (C) 2015 International Business Machines
|
| -// * Corporation and others. All Rights Reserved.
|
| -// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
|
| -// * Source File: <path>/common/main/en.xml
|
| -// *
|
| -// ***************************************************************************
|
| +// © 2016 and later: Unicode, Inc. and others.
|
| +// License & terms of use: http://www.unicode.org/copyright.html#License
|
| en{
|
| - Version{"2.1.19.72"}
|
| + Version{"2.1.29.81"}
|
| units{
|
| acceleration{
|
| g-force{
|
| @@ -80,6 +74,7 @@ en{
|
| dnam{"square kilometers"}
|
| one{"{0} square kilometer"}
|
| other{"{0} square kilometers"}
|
| + per{"{0} per square kilometer"}
|
| }
|
| square-meter{
|
| dnam{"square meters"}
|
| @@ -91,6 +86,7 @@ en{
|
| dnam{"square miles"}
|
| one{"{0} square mile"}
|
| other{"{0} square miles"}
|
| + per{"{0} per square mile"}
|
| }
|
| square-yard{
|
| dnam{"square yards"}
|
| @@ -101,6 +97,28 @@ en{
|
| compound{
|
| per{"{0} per {1}"}
|
| }
|
| + concentr{
|
| + karat{
|
| + dnam{"karats"}
|
| + one{"{0} karat"}
|
| + other{"{0} karats"}
|
| + }
|
| + milligram-per-deciliter{
|
| + dnam{"milligrams per deciliter"}
|
| + one{"{0} milligram per deciliter"}
|
| + other{"{0} milligrams per deciliter"}
|
| + }
|
| + millimole-per-liter{
|
| + dnam{"millimoles per liter"}
|
| + one{"{0} millimole per liter"}
|
| + other{"{0} millimoles per liter"}
|
| + }
|
| + part-per-million{
|
| + dnam{"parts per million"}
|
| + one{"{0} part per million"}
|
| + other{"{0} parts per million"}
|
| + }
|
| + }
|
| consumption{
|
| liter-per-100kilometers{
|
| dnam{"liters per 100 kilometers"}
|
| @@ -117,6 +135,11 @@ en{
|
| one{"{0} mile per gallon"}
|
| other{"{0} miles per gallon"}
|
| }
|
| + mile-per-gallon-imperial{
|
| + dnam{"miles per Imp. gallon"}
|
| + one{"{0} mile per Imp. gallon"}
|
| + other{"{0} miles per Imp. gallon"}
|
| + }
|
| }
|
| digital{
|
| bit{
|
| @@ -539,13 +562,6 @@ en{
|
| other{"{0} pounds per square inch"}
|
| }
|
| }
|
| - proportion{
|
| - karat{
|
| - dnam{"karats"}
|
| - one{"{0} karat"}
|
| - other{"{0} karats"}
|
| - }
|
| - }
|
| speed{
|
| kilometer-per-hour{
|
| dnam{"kilometers per hour"}
|
| @@ -664,6 +680,12 @@ en{
|
| other{"{0} gallons"}
|
| per{"{0} per gallon"}
|
| }
|
| + gallon-imperial{
|
| + dnam{"Imp. gallons"}
|
| + one{"{0} Imp. gallon"}
|
| + other{"{0} Imp. gallons"}
|
| + per{"{0} per Imp. gallon"}
|
| + }
|
| hectoliter{
|
| dnam{"hectoliters"}
|
| one{"{0} hectoliter"}
|
| @@ -782,6 +804,7 @@ en{
|
| dnam{"mi²"}
|
| one{"{0}mi²"}
|
| other{"{0}mi²"}
|
| + per{"{0}/mi²"}
|
| }
|
| square-yard{
|
| dnam{"yd²"}
|
| @@ -789,6 +812,28 @@ en{
|
| other{"{0}yd²"}
|
| }
|
| }
|
| + concentr{
|
| + karat{
|
| + dnam{"karat"}
|
| + one{"{0}kt"}
|
| + other{"{0}kt"}
|
| + }
|
| + milligram-per-deciliter{
|
| + dnam{"mg/dL"}
|
| + one{"{0}mg/dL"}
|
| + other{"{0}mg/dL"}
|
| + }
|
| + millimole-per-liter{
|
| + dnam{"mmol/L"}
|
| + one{"{0}mmol/L"}
|
| + other{"{0}mmol/L"}
|
| + }
|
| + part-per-million{
|
| + dnam{"ppm"}
|
| + one{"{0}ppm"}
|
| + other{"{0}ppm"}
|
| + }
|
| + }
|
| consumption{
|
| liter-per-100kilometers{
|
| dnam{"L/100km"}
|
| @@ -805,6 +850,11 @@ en{
|
| one{"{0}mpg"}
|
| other{"{0}mpg"}
|
| }
|
| + mile-per-gallon-imperial{
|
| + dnam{"mpg UK"}
|
| + one{"{0}m/gUK"}
|
| + other{"{0}m/gUK"}
|
| + }
|
| }
|
| digital{
|
| bit{
|
| @@ -1033,7 +1083,7 @@ en{
|
| other{"{0}ly"}
|
| }
|
| meter{
|
| - dnam{"meter"}
|
| + dnam{"m"}
|
| one{"{0}m"}
|
| other{"{0}m"}
|
| }
|
| @@ -1196,9 +1246,9 @@ en{
|
| other{"{0}mb"}
|
| }
|
| millimeter-of-mercury{
|
| - dnam{"mm Hg"}
|
| - one{"{0}mm Hg"}
|
| - other{"{0}mm Hg"}
|
| + dnam{"mmHg"}
|
| + one{"{0}mmHg"}
|
| + other{"{0}mmHg"}
|
| }
|
| pound-per-square-inch{
|
| dnam{"psi"}
|
| @@ -1206,13 +1256,6 @@ en{
|
| other{"{0}psi"}
|
| }
|
| }
|
| - proportion{
|
| - karat{
|
| - dnam{"karat"}
|
| - one{"{0}kt"}
|
| - other{"{0}kt"}
|
| - }
|
| - }
|
| speed{
|
| kilometer-per-hour{
|
| dnam{"km/hr"}
|
| @@ -1331,6 +1374,12 @@ en{
|
| other{"{0}gal"}
|
| per{"{0}/gal"}
|
| }
|
| + gallon-imperial{
|
| + dnam{"Imp gal"}
|
| + one{"{0}galIm"}
|
| + other{"{0}galIm"}
|
| + per{"{0}/galIm"}
|
| + }
|
| hectoliter{
|
| dnam{"hL"}
|
| one{"{0}hL"}
|
| @@ -1451,6 +1500,7 @@ en{
|
| dnam{"km²"}
|
| one{"{0} km²"}
|
| other{"{0} km²"}
|
| + per{"{0}/km²"}
|
| }
|
| square-meter{
|
| dnam{"meters²"}
|
| @@ -1462,6 +1512,7 @@ en{
|
| dnam{"sq miles"}
|
| one{"{0} sq mi"}
|
| other{"{0} sq mi"}
|
| + per{"{0}/mi²"}
|
| }
|
| square-yard{
|
| dnam{"yards²"}
|
| @@ -1472,6 +1523,28 @@ en{
|
| compound{
|
| per{"{0}/{1}"}
|
| }
|
| + concentr{
|
| + karat{
|
| + dnam{"karats"}
|
| + one{"{0} kt"}
|
| + other{"{0} kt"}
|
| + }
|
| + milligram-per-deciliter{
|
| + dnam{"mg/dL"}
|
| + one{"{0} mg/dL"}
|
| + other{"{0} mg/dL"}
|
| + }
|
| + millimole-per-liter{
|
| + dnam{"millimol/liter"}
|
| + one{"{0} mmol/L"}
|
| + other{"{0} mmol/L"}
|
| + }
|
| + part-per-million{
|
| + dnam{"parts/million"}
|
| + one{"{0} ppm"}
|
| + other{"{0} ppm"}
|
| + }
|
| + }
|
| consumption{
|
| liter-per-100kilometers{
|
| dnam{"L/100 km"}
|
| @@ -1488,6 +1561,11 @@ en{
|
| one{"{0} mpg"}
|
| other{"{0} mpg"}
|
| }
|
| + mile-per-gallon-imperial{
|
| + dnam{"miles/gal Imp."}
|
| + one{"{0} mpg Imp."}
|
| + other{"{0} mpg Imp."}
|
| + }
|
| }
|
| digital{
|
| bit{
|
| @@ -1732,7 +1810,7 @@ en{
|
| other{"{0} ly"}
|
| }
|
| meter{
|
| - dnam{"meters"}
|
| + dnam{"m"}
|
| one{"{0} m"}
|
| other{"{0} m"}
|
| per{"{0}/m"}
|
| @@ -1890,7 +1968,7 @@ en{
|
| other{"{0} hPa"}
|
| }
|
| inch-hg{
|
| - dnam{"in Hg"}
|
| + dnam{"inHg"}
|
| one{"{0} inHg"}
|
| other{"{0} inHg"}
|
| }
|
| @@ -1900,9 +1978,9 @@ en{
|
| other{"{0} mbar"}
|
| }
|
| millimeter-of-mercury{
|
| - dnam{"mm Hg"}
|
| - one{"{0} mm Hg"}
|
| - other{"{0} mm Hg"}
|
| + dnam{"mmHg"}
|
| + one{"{0} mmHg"}
|
| + other{"{0} mmHg"}
|
| }
|
| pound-per-square-inch{
|
| dnam{"psi"}
|
| @@ -1910,13 +1988,6 @@ en{
|
| other{"{0} psi"}
|
| }
|
| }
|
| - proportion{
|
| - karat{
|
| - dnam{"karats"}
|
| - one{"{0} kt"}
|
| - other{"{0} kt"}
|
| - }
|
| - }
|
| speed{
|
| kilometer-per-hour{
|
| dnam{"km/hour"}
|
| @@ -2032,6 +2103,11 @@ en{
|
| one{"{0} gal"}
|
| other{"{0} gal"}
|
| }
|
| + gallon-imperial{
|
| + dnam{"Imp. gal"}
|
| + one{"{0} gal Imp."}
|
| + other{"{0} gal Imp."}
|
| + }
|
| hectoliter{
|
| dnam{"hL"}
|
| one{"{0} hL"}
|
| @@ -2041,6 +2117,7 @@ en{
|
| dnam{"liters"}
|
| one{"{0} L"}
|
| other{"{0} L"}
|
| + per{"{0}/L"}
|
| }
|
| megaliter{
|
| dnam{"ML"}
|
|
|