X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/2ca993e82fb37b597a3c73ecd1586a139a6579c5..3d1f044b704633e2e541231cd17ae9ecf9ad5c7a:/icuSources/data/unit/root.txt

diff --git a/icuSources/data/unit/root.txt b/icuSources/data/unit/root.txt
old mode 100755
new mode 100644
index 4bb0aa29..7c4dc76c
--- a/icuSources/data/unit/root.txt
+++ b/icuSources/data/unit/root.txt
@@ -1,16 +1,10 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2016 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/root.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 /**
  * ICU <specials> source: <path>/common/main/root.xml
  */
 root{
-    Version{"2.1.22.93"}
+    Version{"2.1.49.82"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -56,6 +50,10 @@ root{
                 dnam{"acre"}
                 other{"{0} ac"}
             }
+            dunam{
+                dnam{"dunam"}
+                other{"{0} dunam"}
+            }
             hectare{
                 dnam{"hectare"}
                 other{"{0} ha"}
@@ -77,6 +75,7 @@ root{
             square-kilometer{
                 dnam{"km²"}
                 other{"{0} km²"}
+                per{"{0}/km²"}
             }
             square-meter{
                 dnam{"m²"}
@@ -86,6 +85,7 @@ root{
             square-mile{
                 dnam{"mi²"}
                 other{"{0} mi²"}
+                per{"{0}/mi²"}
             }
             square-yard{
                 dnam{"yd²"}
@@ -108,10 +108,26 @@ root{
                 dnam{"mmol/L"}
                 other{"{0} mmol/L"}
             }
+            mole{
+                dnam{"mol"}
+                other{"{0} mol"}
+            }
             part-per-million{
                 dnam{"ppm"}
                 other{"{0} ppm"}
             }
+            percent{
+                dnam{"%"}
+                other{"{0}%"}
+            }
+            permille{
+                dnam{"‰"}
+                other{"{0}‰"}
+            }
+            permyriad{
+                dnam{"‱"}
+                other{"{0}‱"}
+            }
         }
         consumption{
             liter-per-100kilometers{
@@ -132,6 +148,7 @@ root{
             }
         }
         coordinate{
+            dnam{"direction"}
             east{"{0}E"}
             north{"{0}N"}
             south{"{0}S"}
@@ -170,6 +187,10 @@ root{
                 dnam{"MB"}
                 other{"{0} MB"}
             }
+            petabyte{
+                dnam{"PB"}
+                other{"{0} PB"}
+            }
             terabit{
                 dnam{"Tb"}
                 other{"{0} Tb"}
@@ -189,6 +210,7 @@ root{
                 other{"{0} d"}
                 per{"{0}/d"}
             }
+            day-person:alias{"/LOCALE/unitsShort/duration/day"}
             hour{
                 dnam{"hr"}
                 other{"{0} h"}
@@ -212,6 +234,7 @@ root{
                 other{"{0} m"}
                 per{"{0}/m"}
             }
+            month-person:alias{"/LOCALE/unitsShort/duration/month"}
             nanosecond{
                 dnam{"ns"}
                 other{"{0} ns"}
@@ -226,11 +249,13 @@ root{
                 other{"{0} w"}
                 per{"{0}/w"}
             }
+            week-person:alias{"/LOCALE/unitsShort/duration/week"}
             year{
                 dnam{"yr"}
                 other{"{0} y"}
                 per{"{0}/y"}
             }
+            year-person:alias{"/LOCALE/unitsShort/duration/year"}
         }
         electric{
             ampere{
@@ -251,10 +276,18 @@ root{
             }
         }
         energy{
+            british-thermal-unit{
+                dnam{"Btu"}
+                other{"{0} Btu"}
+            }
             calorie{
                 dnam{"cal"}
                 other{"{0} cal"}
             }
+            electronvolt{
+                dnam{"eV"}
+                other{"{0} eV"}
+            }
             foodcalorie{
                 dnam{"Cal"}
                 other{"{0} Cal"}
@@ -276,6 +309,16 @@ root{
                 other{"{0} kWh"}
             }
         }
+        force{
+            newton{
+                dnam{"N"}
+                other{"{0} N"}
+            }
+            pound-force{
+                dnam{"lbf"}
+                other{"{0} lbf"}
+            }
+        }
         frequency{
             gigahertz{
                 dnam{"GHz"}
@@ -310,7 +353,7 @@ root{
             }
             fathom{
                 dnam{"fm"}
-                other{"{0} fm"}
+                other{"{0} fth"}
             }
             foot{
                 dnam{"ft"}
@@ -372,6 +415,14 @@ root{
                 dnam{"pm"}
                 other{"{0} pm"}
             }
+            point{
+                dnam{"pt"}
+                other{"{0} pt"}
+            }
+            solar-radius{
+                dnam{"R☉"}
+                other{"{0} R☉"}
+            }
             yard{
                 dnam{"yd"}
                 other{"{0} yd"}
@@ -382,12 +433,24 @@ root{
                 dnam{"lx"}
                 other{"{0} lx"}
             }
+            solar-luminosity{
+                dnam{"L☉"}
+                other{"{0} L☉"}
+            }
         }
         mass{
             carat{
                 dnam{"CD"}
                 other{"{0} CD"}
             }
+            dalton{
+                dnam{"Da"}
+                other{"{0} Da"}
+            }
+            earth-mass{
+                dnam{"M⊕"}
+                other{"{0} M⊕"}
+            }
             gram{
                 dnam{"gram"}
                 other{"{0} g"}
@@ -424,6 +487,10 @@ root{
                 other{"{0} lb"}
                 per{"{0}/lb"}
             }
+            solar-mass{
+                dnam{"M☉"}
+                other{"{0} M☉"}
+            }
             stone{
                 dnam{"st"}
                 other{"{0} st"}
@@ -460,6 +527,10 @@ root{
             }
         }
         pressure{
+            atmosphere{
+                dnam{"atm"}
+                other{"{0} atm"}
+            }
             hectopascal{
                 dnam{"hPa"}
                 other{"{0} hPa"}
@@ -468,6 +539,14 @@ root{
                 dnam{"inHg"}
                 other{"{0} inHg"}
             }
+            kilopascal{
+                dnam{"kPa"}
+                other{"{0} kPa"}
+            }
+            megapascal{
+                dnam{"MPa"}
+                other{"{0} MPa"}
+            }
             millibar{
                 dnam{"mbar"}
                 other{"{0} mbar"}
@@ -517,11 +596,25 @@ root{
                 other{"{0} K"}
             }
         }
+        torque{
+            newton-meter{
+                dnam{"N⋅m"}
+                other{"{0} N⋅m"}
+            }
+            pound-foot{
+                dnam{"lbf⋅ft"}
+                other{"{0} lbf⋅ft"}
+            }
+        }
         volume{
             acre-foot{
                 dnam{"ac ft"}
                 other{"{0} ac ft"}
             }
+            barrel{
+                dnam{"bbl"}
+                other{"{0} bbl"}
+            }
             bushel{
                 dnam{"bu"}
                 other{"{0} bu"}
@@ -573,8 +666,12 @@ root{
                 other{"{0} dL"}
             }
             fluid-ounce{
-                dnam{"fl oz"}
-                other{"{0} fl oz"}
+                dnam{"US fl oz"}
+                other{"{0} fl oz US"}
+            }
+            fluid-ounce-imperial{
+                dnam{"Imp. fl oz"}
+                other{"{0} fl oz Imp."}
             }
             gallon{
                 dnam{"US gal"}