From ad39f5905352ce51206194c16fd940c06e12e8b1 Mon Sep 17 00:00:00 2001
From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
Date: Wed, 22 Jan 2020 16:33:26 +0100
Subject: [PATCH] Update units.txt to latest
 macchiati/CLDR-13488-add-unit-conversions as source.

---
 icu4c/source/data/misc/units.txt | 92 +++++++++++++++++++++++++-------
 1 file changed, 74 insertions(+), 18 deletions(-)

diff --git a/icu4c/source/data/misc/units.txt b/icu4c/source/data/misc/units.txt
index b98e467e287..07e877dc4e9 100644
--- a/icu4c/source/data/misc/units.txt
+++ b/icu4c/source/data/misc/units.txt
@@ -4,7 +4,7 @@ units:table(nofallback){
     cldrVersion{"36.1"}
     convertUnits{
         acre{
-            factor{"f2m^2 * 43560"}
+            factor{"ft2m^2 * 43560"}
             target{"square-meter"}
         }
         acre-foot{
@@ -35,6 +35,10 @@ units:table(nofallback){
             factor{"cup2m3 * 672"}
             target{"cubic-meter"}
         }
+        british-thermal-unit{
+            factor{"1055.06"}
+            target{"kilogram-square-meter-per-square-second"}
+        }
         bushel{
             factor{"0.03523907"}
             target{"cubic-meter"}
@@ -55,6 +59,10 @@ units:table(nofallback){
             factor{"1/100"}
             target{"meter"}
         }
+        century{
+            factor{"100"}
+            target{"year"}
+        }
         cup{
             factor{"cup2m3"}
             target{"cubic-meter"}
@@ -63,6 +71,10 @@ units:table(nofallback){
             factor{"0.00025"}
             target{"cubic-meter"}
         }
+        dalton{
+            factor{"1.49241808560E-10"}
+            target{"kilogram-square-meter-per-square-second"}
+        }
         day{
             factor{"86400"}
             target{"second"}
@@ -71,10 +83,26 @@ units:table(nofallback){
             factor{"86400"}
             target{"second"}
         }
+        decade{
+            factor{"10"}
+            target{"year"}
+        }
+        dot{
+            factor{"100"}
+            target{"pixel"}
+        }
         dunam{
             factor{"1000"}
             target{"square-meter"}
         }
+        earth-mass{
+            factor{"5.9722E+24"}
+            target{"kilogram"}
+        }
+        earth-radius{
+            factor{"6.3781E6"}
+            target{"meter"}
+        }
         electronvolt{
             factor{"1.602177E-19"}
             target{"kilogram-square-meter-per-square-second"}
@@ -85,7 +113,7 @@ units:table(nofallback){
             target{"celsius"}
         }
         fathom{
-            factor{"f2m * 6"}
+            factor{"ft2m * 6"}
             target{"meter"}
         }
         fluid-ounce{
@@ -101,11 +129,11 @@ units:table(nofallback){
             target{"kilogram-square-meter-per-square-second"}
         }
         foot{
-            factor{"f2m"}
+            factor{"ft2m"}
             target{"meter"}
         }
         furlong{
-            factor{"f2m*660"}
+            factor{"ft2m*660"}
             target{"meter"}
         }
         g-force{
@@ -141,7 +169,7 @@ units:table(nofallback){
             target{"second"}
         }
         inch{
-            factor{"f2m/12"}
+            factor{"ft2m/12"}
             target{"meter"}
         }
         inch-hg{
@@ -173,19 +201,18 @@ units:table(nofallback){
             factor{"0.001"}
             target{"cubic-meter"}
         }
+        meter-per-mercury{
+            factor{"10132500/760"}
+            target{"kilogram-per-meter-square-second"}
+        }
         metric-ton{
             factor{"1000"}
             target{"kilogram"}
         }
         mile{
-            factor{"f2m*5280"}
+            factor{"ft2m*5280"}
             target{"meter"}
         }
-        mile-per-gallon{
-            factor{"235.215"}
-            reciprocal{"TRUE"}
-            target{"liter-per-kilometer"}
-        }
         mile-scandinavian{
             factor{"10000"}
             target{"meter"}
@@ -198,6 +225,14 @@ units:table(nofallback){
             factor{"6.02214076E+23"}
             target{"one"}
         }
+        month{
+            factor{"12"}
+            target{"year"}
+        }
+        month-person{
+            factor{"12"}
+            target{"year"}
+        }
         nautical-mile{
             factor{"1852"}
             target{"meter"}
@@ -210,10 +245,6 @@ units:table(nofallback){
             factor{"1"}
             target{"kilogram-square-meter-per-cubic-second-square-ampere"}
         }
-        one{
-            factor{"1"}
-            target{"one"}
-        }
         ounce{
             factor{"lb2kg/16"}
             target{"kilogram"}
@@ -238,6 +269,10 @@ units:table(nofallback){
             factor{"1/1000"}
             target{"one-per-one"}
         }
+        permillion{
+            factor{"1/1000000"}
+            target{"one-per-one"}
+        }
         permyriad{
             factor{"1/10000"}
             target{"one-per-one"}
@@ -250,6 +285,10 @@ units:table(nofallback){
             factor{"0.0005"}
             target{"cubic-meter"}
         }
+        point{
+            factor{"ft2m/864"}
+            target{"meter"}
+        }
         pound{
             factor{"lb2kg"}
             target{"kilogram"}
@@ -270,6 +309,18 @@ units:table(nofallback){
             factor{"360"}
             target{"degree"}
         }
+        solar-luminosity{
+            factor{"3.828E+26"}
+            target{"kilogram-square-meter-per-cubic-second"}
+        }
+        solar-mass{
+            factor{"1.98847E+30"}
+            target{"kilogram"}
+        }
+        solar-radius{
+            factor{"1.3271244E20/G"}
+            target{"meter"}
+        }
         stone{
             factor{"lb2kg*14"}
             target{"kilogram"}
@@ -307,14 +358,19 @@ units:table(nofallback){
             target{"second"}
         }
         yard{
-            factor{"f2m*3"}
+            factor{"ft2m*3"}
             target{"meter"}
         }
+        year-person{
+            factor{"1"}
+            target{"year"}
+        }
     }
     unitConstants{
+        G{"6.67408E-11"}
         PI{"3.1415926535897932384626433832795"}
-        cup2m3{"231*f2m*f2m*f2m/16*12*12*12"}
-        f2m{"0.3048"}
+        cup2m3{"231*ft2m*ft2m*ft2m/16*12*12*12"}
+        ft2m{"0.3048"}
         gravity{"9.80665"}
         lb2kg{"0.45359237"}
     }
-- 
2.40.0