X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/0f5d89e82340278ed3d7d50029f37cab2c41a57e..3d1f044b704633e2e541231cd17ae9ecf9ad5c7a:/icuSources/data/unit/ca.txt

diff --git a/icuSources/data/unit/ca.txt b/icuSources/data/unit/ca.txt
index 0f861768..3bfba96b 100644
--- a/icuSources/data/unit/ca.txt
+++ b/icuSources/data/unit/ca.txt
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 ca{
-    Version{"2.1.41.97"}
+    Version{"2.1.48.42"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -37,7 +37,7 @@ ca{
                 other{"{0} graus"}
             }
             radian{
-                dnam{"radiant"}
+                dnam{"radiants"}
                 one{"{0} radiant"}
                 other{"{0} radiants"}
             }
@@ -53,6 +53,11 @@ ca{
                 one{"{0} acre"}
                 other{"{0} acres"}
             }
+            dunam{
+                dnam{"dúnams"}
+                one{"{0} dúnam"}
+                other{"{0} dúnams"}
+            }
             hectare{
                 dnam{"hectàrees"}
                 one{"{0} hectàrea"}
@@ -118,11 +123,31 @@ ca{
                 one{"{0} mil·limol per litre"}
                 other{"{0} mil·limols per litre"}
             }
+            mole{
+                dnam{"mols"}
+                one{"{0} mol"}
+                other{"{0} mols"}
+            }
             part-per-million{
                 dnam{"parts per milió"}
                 one{"{0} part per milió"}
                 other{"{0} parts per milió"}
             }
+            percent{
+                dnam{"per cent"}
+                one{"{0} per cent"}
+                other{"{0} per cent"}
+            }
+            permille{
+                dnam{"per mil"}
+                one{"{0} per mil"}
+                other{"{0} per mil"}
+            }
+            permyriad{
+                dnam{"per deu mil"}
+                one{"{0} per deu mil"}
+                other{"{0} per deu mil"}
+            }
         }
         consumption{
             liter-per-100kilometers{
@@ -147,14 +172,15 @@ ca{
             }
         }
         coordinate{
-            east{"{0}E"}
-            north{"{0}N"}
-            south{"{0}S"}
-            west{"{0}O"}
+            dnam{"punt cardinal"}
+            east{"{0} est"}
+            north{"{0} nord"}
+            south{"{0} sud"}
+            west{"{0} oest"}
         }
         digital{
             bit{
-                dnam{"bit"}
+                dnam{"bits"}
                 one{"{0} bit"}
                 other{"{0} bits"}
             }
@@ -184,15 +210,20 @@ ca{
                 other{"{0} quilobytes"}
             }
             megabit{
-                dnam{"megabit"}
+                dnam{"megabits"}
                 one{"{0} megabit"}
                 other{"{0} megabits"}
             }
             megabyte{
-                dnam{"megabyte"}
+                dnam{"megabytes"}
                 one{"{0} megabyte"}
                 other{"{0} megabytes"}
             }
+            petabyte{
+                dnam{"petabytes"}
+                one{"{0} petabyte"}
+                other{"{0} petabytes"}
+            }
             terabit{
                 dnam{"terabits"}
                 one{"{0} terabit"}
@@ -223,7 +254,7 @@ ca{
                 per{"{0} per hora"}
             }
             microsecond{
-                dnam{"microsegon"}
+                dnam{"microsegons"}
                 one{"{0} microsegon"}
                 other{"{0} microsegons"}
             }
@@ -270,12 +301,12 @@ ca{
         }
         electric{
             ampere{
-                dnam{"ampere"}
+                dnam{"amperes"}
                 one{"{0} ampere"}
                 other{"{0} amperes"}
             }
             milliampere{
-                dnam{"mil·liampere"}
+                dnam{"mil·liamperes"}
                 one{"{0} mil·liampere"}
                 other{"{0} mil·liamperes"}
             }
@@ -285,17 +316,27 @@ ca{
                 other{"{0} ohms"}
             }
             volt{
-                dnam{"volt"}
+                dnam{"volts"}
                 one{"{0} volt"}
                 other{"{0} volts"}
             }
         }
         energy{
+            british-thermal-unit{
+                dnam{"unitats tèrmiques britàniques"}
+                one{"{0} unitat tèrmica britànica"}
+                other{"{0} unitats tèrmiques britàniques"}
+            }
             calorie{
                 dnam{"calories"}
                 one{"{0} caloria"}
                 other{"{0} calories"}
             }
+            electronvolt{
+                dnam{"electrons-volt"}
+                one{"{0} electró-volt"}
+                other{"{0} electrons-volt"}
+            }
             foodcalorie{
                 dnam{"quilocalories"}
                 one{"{0} quilocaloria"}
@@ -322,6 +363,18 @@ ca{
                 other{"{0} quilowatts hora"}
             }
         }
+        force{
+            newton{
+                dnam{"newtons"}
+                one{"{0} newton"}
+                other{"{0} newtons"}
+            }
+            pound-force{
+                dnam{"lliures de força"}
+                one{"{0} lliura de força"}
+                other{"{0} lliures de força"}
+            }
+        }
         frequency{
             gigahertz{
                 dnam{"gigahertz"}
@@ -435,6 +488,11 @@ ca{
                 one{"{0} punt"}
                 other{"{0} punts"}
             }
+            solar-radius{
+                dnam{"radis solars"}
+                one{"{0} radi solar"}
+                other{"{0} radis solars"}
+            }
             yard{
                 dnam{"iardes"}
                 one{"{0} iarda"}
@@ -445,23 +503,38 @@ ca{
             lux{
                 dnam{"lux"}
                 one{"{0} lux"}
-                other{"{0} lux"}
+                other{"{0} luxs"}
+            }
+            solar-luminosity{
+                dnam{"lluminositats solars"}
+                one{"{0} lluminositat solar"}
+                other{"{0} lluminositats solars"}
             }
         }
         mass{
             carat{
-                dnam{"quirat"}
+                dnam{"quirats"}
                 one{"{0} quirat"}
                 other{"{0} quirats"}
             }
+            dalton{
+                dnam{"daltons"}
+                one{"{0} dalton"}
+                other{"{0} daltons"}
+            }
+            earth-mass{
+                dnam{"masses de la Terra"}
+                one{"{0} massa de la Terra"}
+                other{"{0} masses de la Terra"}
+            }
             gram{
-                dnam{"gram"}
+                dnam{"grams"}
                 one{"{0} gram"}
                 other{"{0} grams"}
                 per{"{0} per gram"}
             }
             kilogram{
-                dnam{"quilogram"}
+                dnam{"quilograms"}
                 one{"{0} quilogram"}
                 other{"{0} quilograms"}
                 per{"{0} per quilogram"}
@@ -477,27 +550,32 @@ ca{
                 other{"{0} micrograms"}
             }
             milligram{
-                dnam{"mil·ligram"}
+                dnam{"mil·ligrams"}
                 one{"{0} mil·ligram"}
                 other{"{0} mil·ligrams"}
             }
             ounce{
-                dnam{"unça"}
+                dnam{"unces"}
                 one{"{0} unça"}
                 other{"{0} unces"}
                 per{"{0} per unça"}
             }
             ounce-troy{
-                dnam{"unça troy"}
+                dnam{"unces troy"}
                 one{"{0} unça troy"}
                 other{"{0} unces troy"}
             }
             pound{
-                dnam{"lliura"}
+                dnam{"lliures"}
                 one{"{0} lliura"}
                 other{"{0} lliures"}
                 per{"{0} per lliura"}
             }
+            solar-mass{
+                dnam{"masses solars"}
+                one{"{0} massa solar"}
+                other{"{0} masses solars"}
+            }
             ton{
                 dnam{"tones"}
                 one{"{0} tona"}
@@ -526,9 +604,9 @@ ca{
                 other{"{0} megawatts"}
             }
             milliwatt{
-                dnam{"miliwatts"}
-                one{"{0} miliwatt"}
-                other{"{0} miliwatts"}
+                dnam{"mil·liwatts"}
+                one{"{0} mil·liwatt"}
+                other{"{0} mil·liwatts"}
             }
             watt{
                 dnam{"watts"}
@@ -537,6 +615,11 @@ ca{
             }
         }
         pressure{
+            atmosphere{
+                dnam{"atmosferes"}
+                one{"{0} atmosfera"}
+                other{"{0} atmosferes"}
+            }
             hectopascal{
                 dnam{"hectopascals"}
                 one{"{0} hectopascal"}
@@ -547,6 +630,16 @@ ca{
                 one{"{0} polzada de mercuri"}
                 other{"{0} polzades de mercuri"}
             }
+            kilopascal{
+                dnam{"quilopascals"}
+                one{"{0} quilopascal"}
+                other{"{0} quilopascals"}
+            }
+            megapascal{
+                dnam{"megapascals"}
+                one{"{0} megapascal"}
+                other{"{0} megapascals"}
+            }
             millibar{
                 dnam{"mil·libars"}
                 one{"{0} mil·libar"}
@@ -607,12 +700,29 @@ ca{
                 other{"{0} Kelvin"}
             }
         }
+        torque{
+            newton-meter{
+                dnam{"newtons-metre"}
+                one{"{0} newton-metre"}
+                other{"{0} newtons-metre"}
+            }
+            pound-foot{
+                dnam{"lliures-peu"}
+                one{"{0} lliura-peu"}
+                other{"{0} lliures-peu"}
+            }
+        }
         volume{
             acre-foot{
                 dnam{"acre-peu"}
                 one{"{0} acre-peu"}
                 other{"{0} acres-peus"}
             }
+            barrel{
+                dnam{"barrils"}
+                one{"{0} barril"}
+                other{"{0} barrils"}
+            }
             centiliter{
                 dnam{"centilitres"}
                 one{"{0} centilitre"}
@@ -675,6 +785,11 @@ ca{
                 one{"{0} unça líquida"}
                 other{"{0} unces líquides"}
             }
+            fluid-ounce-imperial{
+                dnam{"unces líquides imperials"}
+                one{"{0} unça líquida imperial"}
+                other{"{0} unces líquides imperials"}
+            }
             gallon{
                 dnam{"galons"}
                 one{"{0} galó"}
@@ -683,7 +798,7 @@ ca{
             }
             gallon-imperial{
                 dnam{"galons imperials"}
-                one{"{0} galons imperials"}
+                one{"{0} galó imperial"}
                 other{"{0} galons imperials"}
                 per{"{0} per galó imperial"}
             }
@@ -742,11 +857,6 @@ ca{
                 one{"{0}G"}
                 other{"{0}G"}
             }
-            meter-per-second-squared{
-                dnam{"m/s²"}
-                one{"{0} m/s²"}
-                other{"{0} m/s²"}
-            }
         }
         angle{
             arc-minute{
@@ -771,10 +881,6 @@ ca{
                 one{"{0}ha"}
                 other{"{0}ha"}
             }
-            square-centimeter{
-                one{"{0} cm²"}
-                other{"{0} cm²"}
-            }
             square-foot{
                 one{"{0}ft²"}
                 other{"{0}ft²"}
@@ -795,6 +901,13 @@ ca{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            percent{
+                dnam{"%"}
+                one{"{0} %"}
+                other{"{0} %"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"l/100 km"}
@@ -803,17 +916,12 @@ ca{
             }
         }
         coordinate{
+            dnam{"punt"}
             east{"{0}E"}
             north{"{0}N"}
             south{"{0}S"}
             west{"{0}O"}
         }
-        digital{
-            megabyte{
-                one{"{0} MB"}
-                other{"{0} MB"}
-            }
-        }
         duration{
             century{
                 dnam{"s."}
@@ -856,8 +964,8 @@ ca{
             }
             nanosecond{
                 dnam{"ns"}
-                one{"{0} ns"}
-                other{"{0} ns"}
+                one{"{0}ns"}
+                other{"{0}ns"}
             }
             second{
                 dnam{"s"}
@@ -867,9 +975,9 @@ ca{
             }
             week{
                 dnam{"setm."}
-                one{"{0}s"}
-                other{"{0}s"}
-                per{"{0}/setm."}
+                one{"{0}setm"}
+                other{"{0}setm"}
+                per{"{0}/setm"}
             }
             year{
                 dnam{"anys"}
@@ -878,12 +986,6 @@ ca{
                 per{"{0}/any"}
             }
         }
-        frequency{
-            hertz{
-                one{"{0} Hz"}
-                other{"{0} Hz"}
-            }
-        }
         length{
             astronomical-unit{
                 dnam{"ua"}
@@ -898,8 +1000,8 @@ ca{
             }
             decimeter{
                 dnam{"dm"}
-                one{"{0} dm"}
-                other{"{0} dm"}
+                one{"{0}dm"}
+                other{"{0}dm"}
             }
             foot{
                 dnam{"peus"}
@@ -932,8 +1034,8 @@ ca{
             }
             micrometer{
                 dnam{"µm"}
-                one{"{0} µm"}
-                other{"{0} µm"}
+                one{"{0}µm"}
+                other{"{0}µm"}
             }
             mile{
                 dnam{"milles"}
@@ -947,8 +1049,8 @@ ca{
             }
             nanometer{
                 dnam{"nm"}
-                one{"{0} nm"}
-                other{"{0} nm"}
+                one{"{0}nm"}
+                other{"{0}nm"}
             }
             nautical-mile{
                 one{"{0}nmi"}
@@ -956,8 +1058,8 @@ ca{
             }
             parsec{
                 dnam{"parsecs"}
-                one{"{0} pc"}
-                other{"{0} pc"}
+                one{"{0}pc"}
+                other{"{0}pc"}
             }
             picometer{
                 dnam{"pm"}
@@ -997,33 +1099,11 @@ ca{
                 one{"{0} t mètr."}
                 other{"{0} t mètr."}
             }
-            microgram{
-                dnam{"µg"}
-                one{"{0} µg"}
-                other{"{0} µg"}
-            }
-            milligram{
-                dnam{"mg"}
-                one{"{0} mg"}
-                other{"{0} mg"}
-            }
-            ounce{
-                dnam{"oz"}
-                one{"{0} oz"}
-                other{"{0} oz"}
-                per{"{0}/oz"}
-            }
             ounce-troy{
                 dnam{"ozt"}
                 one{"{0} ozt"}
                 other{"{0} ozt"}
             }
-            pound{
-                dnam{"lb"}
-                one{"{0} lb"}
-                other{"{0} lb"}
-                per{"{0}/lb"}
-            }
             ton{
                 dnam{"t"}
                 one{"{0} t"}
@@ -1050,26 +1130,11 @@ ca{
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
-            inch-hg{
-                dnam{"inHg"}
-                one{"{0} inHg"}
-                other{"{0} inHg"}
-            }
             millibar{
                 dnam{"mbar"}
                 one{"{0} mb"}
                 other{"{0} mb"}
             }
-            millimeter-of-mercury{
-                dnam{"mm Hg"}
-                one{"{0} mm Hg"}
-                other{"{0} mm Hg"}
-            }
-            pound-per-square-inch{
-                dnam{"psi"}
-                one{"{0} psi"}
-                other{"{0} psi"}
-            }
         }
         speed{
             kilometer-per-hour{
@@ -1077,11 +1142,6 @@ ca{
                 one{"{0} km/h"}
                 other{"{0} km/h"}
             }
-            knot{
-                dnam{"kn"}
-                one{"{0} kn"}
-                other{"{0} kn"}
-            }
             meter-per-second{
                 dnam{"m/s"}
                 one{"{0}m/s"}
@@ -1104,30 +1164,12 @@ ca{
                 one{"{0}°F"}
                 other{"{0}°F"}
             }
-            generic{
-                dnam{"°"}
-                one{"{0}°"}
-                other{"{0}°"}
-            }
-            kelvin{
-                dnam{"K"}
-                one{"{0} K"}
-                other{"{0} K"}
-            }
         }
         volume{
-            cubic-centimeter{
-                one{"{0} cm³"}
-                other{"{0} cm³"}
-            }
             cubic-kilometer{
                 one{"{0}km³"}
                 other{"{0}km³"}
             }
-            cubic-meter{
-                one{"{0} m³"}
-                other{"{0} m³"}
-            }
             cubic-mile{
                 one{"{0}mi³"}
                 other{"{0}mi³"}
@@ -1154,14 +1196,14 @@ ca{
         }
         angle{
             arc-minute{
-                dnam{"´"}
-                one{"{0} min"}
-                other{"{0} min"}
+                dnam{"arcmin"}
+                one{"{0} arcmin"}
+                other{"{0} arcmin"}
             }
             arc-second{
-                dnam{"segons"}
-                one{"{0} s"}
-                other{"{0} s"}
+                dnam{"arcsec"}
+                one{"{0} arcsec"}
+                other{"{0} arcsec"}
             }
             degree{
                 dnam{"º"}
@@ -1169,7 +1211,7 @@ ca{
                 other{"{0}°"}
             }
             radian{
-                dnam{"radiant"}
+                dnam{"rad"}
                 one{"{0} rad"}
                 other{"{0} rad"}
             }
@@ -1185,6 +1227,11 @@ ca{
                 one{"{0} ac"}
                 other{"{0} ac"}
             }
+            dunam{
+                dnam{"dúnams"}
+                one{"{0} dúnam"}
+                other{"{0} dúnams"}
+            }
             hectare{
                 dnam{"hectàrees"}
                 one{"{0} ha"}
@@ -1250,11 +1297,31 @@ ca{
                 one{"{0} mM/l"}
                 other{"{0} mM/l"}
             }
+            mole{
+                dnam{"mol"}
+                one{"{0} mol"}
+                other{"{0} mol"}
+            }
             part-per-million{
                 dnam{"ppm"}
                 one{"{0} ppm"}
                 other{"{0} ppm"}
             }
+            percent{
+                dnam{"per cent"}
+                one{"{0} %"}
+                other{"{0} %"}
+            }
+            permille{
+                dnam{"per mil"}
+                one{"{0} ‰"}
+                other{"{0} ‰"}
+            }
+            permyriad{
+                dnam{"per deu mil"}
+                one{"{0}‱"}
+                other{"{0}‱"}
+            }
         }
         consumption{
             liter-per-100kilometers{
@@ -1279,6 +1346,7 @@ ca{
             }
         }
         coordinate{
+            dnam{"punt"}
             east{"{0}E"}
             north{"{0}N"}
             south{"{0}S"}
@@ -1325,6 +1393,11 @@ ca{
                 one{"{0} MB"}
                 other{"{0} MB"}
             }
+            petabyte{
+                dnam{"PB"}
+                one{"{0} PB"}
+                other{"{0} PB"}
+            }
             terabit{
                 dnam{"Tb"}
                 one{"{0} Tb"}
@@ -1423,11 +1496,21 @@ ca{
             }
         }
         energy{
+            british-thermal-unit{
+                dnam{"Btu"}
+                one{"{0} Btu"}
+                other{"{0} Btu"}
+            }
             calorie{
                 dnam{"cal"}
                 one{"{0} cal"}
                 other{"{0} cal"}
             }
+            electronvolt{
+                dnam{"eV"}
+                one{"{0} eV"}
+                other{"{0} eV"}
+            }
             foodcalorie{
                 dnam{"kcal"}
                 one{"{0} kcal"}
@@ -1454,6 +1537,18 @@ ca{
                 other{"{0} kWh"}
             }
         }
+        force{
+            newton{
+                dnam{"N"}
+                one{"{0} N"}
+                other{"{0} N"}
+            }
+            pound-force{
+                dnam{"lbf"}
+                one{"{0} lbf"}
+                other{"{0} lbf"}
+            }
+        }
         frequency{
             gigahertz{
                 dnam{"GHz"}
@@ -1501,8 +1596,8 @@ ca{
             }
             inch{
                 dnam{"polzades"}
-                one{"{0} polz."}
-                other{"{0} polz."}
+                one{"{0} in"}
+                other{"{0} in"}
                 per{"{0}/in"}
             }
             kilometer{
@@ -1548,9 +1643,9 @@ ca{
                 other{"{0} nm"}
             }
             nautical-mile{
-                dnam{"nmi"}
-                one{"{0} nmi"}
-                other{"{0} nmi"}
+                dnam{"NM"}
+                one{"{0} NM"}
+                other{"{0} NM"}
             }
             parsec{
                 dnam{"parsecs"}
@@ -1567,6 +1662,11 @@ ca{
                 one{"{0} pt"}
                 other{"{0} pt"}
             }
+            solar-radius{
+                dnam{"R☉"}
+                one{"{0} R☉"}
+                other{"{0} R☉"}
+            }
             yard{
                 dnam{"iardes"}
                 one{"{0} yd"}
@@ -1579,6 +1679,11 @@ ca{
                 one{"{0} lx"}
                 other{"{0} lx"}
             }
+            solar-luminosity{
+                dnam{"L☉"}
+                one{"{0} L☉"}
+                other{"{0} L☉"}
+            }
         }
         mass{
             carat{
@@ -1586,8 +1691,18 @@ ca{
                 one{"{0} ct"}
                 other{"{0} ct"}
             }
+            dalton{
+                dnam{"Da"}
+                one{"{0} Da"}
+                other{"{0} Da"}
+            }
+            earth-mass{
+                dnam{"M⊕"}
+                one{"{0} M⊕"}
+                other{"{0} M⊕"}
+            }
             gram{
-                dnam{"gram"}
+                dnam{"grams"}
                 one{"{0} g"}
                 other{"{0} g"}
                 per{"{0}/g"}
@@ -1600,7 +1715,7 @@ ca{
             }
             metric-ton{
                 dnam{"t mètriques"}
-                one{"{0} t mètrica"}
+                one{"{0} t mètr."}
                 other{"{0} t mètr."}
             }
             microgram{
@@ -1630,6 +1745,11 @@ ca{
                 other{"{0} lb"}
                 per{"{0}/lb"}
             }
+            solar-mass{
+                dnam{"M☉"}
+                one{"{0} M☉"}
+                other{"{0} M☉"}
+            }
             ton{
                 dnam{"t"}
                 one{"{0} t"}
@@ -1669,6 +1789,11 @@ ca{
             }
         }
         pressure{
+            atmosphere{
+                dnam{"atm"}
+                one{"{0} atm"}
+                other{"{0} atm"}
+            }
             hectopascal{
                 dnam{"hPa"}
                 one{"{0} hPa"}
@@ -1679,15 +1804,25 @@ ca{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
+            kilopascal{
+                dnam{"kPa"}
+                one{"{0} kPa"}
+                other{"{0} kPa"}
+            }
+            megapascal{
+                dnam{"MPa"}
+                one{"{0} MPa"}
+                other{"{0} MPa"}
+            }
             millibar{
                 dnam{"mbar"}
                 one{"{0} mbar"}
                 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"}
@@ -1739,12 +1874,29 @@ ca{
                 other{"{0} K"}
             }
         }
+        torque{
+            newton-meter{
+                dnam{"N⋅m"}
+                one{"{0} N⋅m"}
+                other{"{0} N⋅m"}
+            }
+            pound-foot{
+                dnam{"lbf⋅ft"}
+                one{"{0} lbf⋅ft"}
+                other{"{0} lbf⋅ft"}
+            }
+        }
         volume{
             acre-foot{
                 dnam{"ac ft"}
                 one{"{0} ac ft"}
                 other{"{0} ac ft"}
             }
+            barrel{
+                dnam{"bbl"}
+                one{"{0} bbl"}
+                other{"{0} bbl"}
+            }
             centiliter{
                 dnam{"cl"}
                 one{"{0} cl"}
@@ -1807,6 +1959,11 @@ ca{
                 one{"{0} fl oz"}
                 other{"{0} fl oz"}
             }
+            fluid-ounce-imperial{
+                dnam{"fl oz imp."}
+                one{"{0} fl oz imp."}
+                other{"{0} fl oz imp."}
+            }
             gallon{
                 dnam{"gal"}
                 one{"{0} gal"}