X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/0f5d89e82340278ed3d7d50029f37cab2c41a57e..340931cb2e044a2141d11567dd0f782524e32994:/icuSources/data/unit/nb.txt

diff --git a/icuSources/data/unit/nb.txt b/icuSources/data/unit/nb.txt
index 3d3b52b2..5c40db71 100644
--- a/icuSources/data/unit/nb.txt
+++ b/icuSources/data/unit/nb.txt
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 nb{
-    Version{"2.1.41.97"}
+    Version{"36.1"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -123,6 +123,21 @@ nb{
                 one{"{0} del per million"}
                 other{"{0} deler per million"}
             }
+            percent{
+                dnam{"prosent"}
+                one{"{0} prosent"}
+                other{"{0} prosent"}
+            }
+            permille{
+                dnam{"promille"}
+                one{"{0} promille"}
+                other{"{0} promille"}
+            }
+            permyriad{
+                dnam{"promyriade"}
+                one{"{0} promyriade"}
+                other{"{0} promyriade"}
+            }
         }
         consumption{
             liter-per-100kilometers{
@@ -147,6 +162,7 @@ nb{
             }
         }
         coordinate{
+            dnam{"himmelretning"}
             east{"{0} øst"}
             north{"{0} nord"}
             south{"{0} sør"}
@@ -193,6 +209,11 @@ nb{
                 one{"{0} megabyte"}
                 other{"{0} megabyte"}
             }
+            petabyte{
+                dnam{"petabyte"}
+                one{"{0} petabyte"}
+                other{"{0} petabyte"}
+            }
             terabit{
                 dnam{"terabit"}
                 one{"{0} terabit"}
@@ -216,6 +237,11 @@ nb{
                 other{"{0} døgn"}
                 per{"{0} per døgn"}
             }
+            decade{
+                dnam{"tiår"}
+                one{"{0} tiår"}
+                other{"{0} tiår"}
+            }
             hour{
                 dnam{"timer"}
                 one{"{0} time"}
@@ -291,11 +317,19 @@ nb{
             }
         }
         energy{
+            british-thermal-unit{
+                dnam{"British thermal unit"}
+            }
             calorie{
                 dnam{"kalorier"}
                 one{"{0} kalori"}
                 other{"{0} kalorier"}
             }
+            electronvolt{
+                dnam{"elektronvolt"}
+                one{"{0} elektronvolt"}
+                other{"{0} elektronvolt"}
+            }
             foodcalorie{
                 dnam{"kalorier"}
                 one{"{0} kalori"}
@@ -321,6 +355,23 @@ nb{
                 one{"{0} kilowattime"}
                 other{"{0} kilowattimer"}
             }
+            therm-us{
+                dnam{"therm"}
+                one{"{0} therm"}
+                other{"{0} therm"}
+            }
+        }
+        force{
+            newton{
+                dnam{"newton"}
+                one{"{0} newton"}
+                other{"{0} newton"}
+            }
+            pound-force{
+                dnam{"poundforce"}
+                one{"{0} poundforce"}
+                other{"{0} poundforce"}
+            }
         }
         frequency{
             gigahertz{
@@ -344,6 +395,43 @@ nb{
                 other{"{0} megahertz"}
             }
         }
+        graphics{
+            dot-per-centimeter{
+                dnam{"punkter per centimeter"}
+                one{"{0} punkt per centimeter"}
+                other{"{0} punkter per centimeter"}
+            }
+            dot-per-inch{
+                dnam{"punkter per tomme"}
+                one{"{0} punkt per tomme"}
+                other{"{0} punkter per tomme"}
+            }
+            em{
+                dnam{"gefirt"}
+                one{"{0} gefirt"}
+                other{"{0} gefirt"}
+            }
+            megapixel{
+                dnam{"megapiksler"}
+                one{"{0} megapiksel"}
+                other{"{0} megapiksler"}
+            }
+            pixel{
+                dnam{"piksler"}
+                one{"{0} piksel"}
+                other{"{0} piksler"}
+            }
+            pixel-per-centimeter{
+                dnam{"piksler per centimeter"}
+                one{"{0} piksel per centimeter"}
+                other{"{0} piksler per centimeter"}
+            }
+            pixel-per-inch{
+                dnam{"piksler per tomme"}
+                one{"{0} piksel per tomme"}
+                other{"{0} piksler per tomme"}
+            }
+        }
         length{
             astronomical-unit{
                 dnam{"astronomiske enheter"}
@@ -435,6 +523,9 @@ nb{
                 one{"{0} punkt"}
                 other{"{0} punkter"}
             }
+            solar-radius{
+                dnam{"solradius"}
+            }
             yard{
                 dnam{"yard"}
                 one{"{0} yard"}
@@ -447,6 +538,9 @@ nb{
                 one{"{0} lux"}
                 other{"{0} lux"}
             }
+            solar-luminosity{
+                dnam{"solluminositet"}
+            }
         }
         mass{
             carat{
@@ -454,6 +548,16 @@ nb{
                 one{"{0} karat"}
                 other{"{0} karat"}
             }
+            dalton{
+                dnam{"dalton"}
+                one{"{0} dalton"}
+                other{"{0} dalton"}
+            }
+            earth-mass{
+                dnam{"jordmasser"}
+                one{"{0} jordmasse"}
+                other{"{0} jordmasser"}
+            }
             gram{
                 dnam{"gram"}
                 one{"{0} gram"}
@@ -498,6 +602,11 @@ nb{
                 other{"{0} pund"}
                 per{"{0} per pund"}
             }
+            solar-mass{
+                dnam{"solmasser"}
+                one{"{0} solmasse"}
+                other{"{0} solmasser"}
+            }
             ton{
                 dnam{"amerikanske tonn"}
                 one{"{0} amerikansk tonn"}
@@ -537,6 +646,11 @@ nb{
             }
         }
         pressure{
+            atmosphere{
+                dnam{"atmosfærer"}
+                one{"{0} atmosfære"}
+                other{"{0} atmosfærer"}
+            }
             hectopascal{
                 dnam{"hektopascal"}
                 one{"{0} hektopascal"}
@@ -547,6 +661,16 @@ nb{
                 one{"{0} tomme kvikksølv"}
                 other{"{0} tommer kvikksølv"}
             }
+            kilopascal{
+                dnam{"kilopascal"}
+                one{"{0} kilopascal"}
+                other{"{0} kilopascal"}
+            }
+            megapascal{
+                dnam{"megapascal"}
+                one{"{0} megapascal"}
+                other{"{0} megapascal"}
+            }
             millibar{
                 dnam{"millibar"}
                 one{"{0} millibar"}
@@ -557,6 +681,11 @@ nb{
                 one{"{0} millimeter kvikksølv"}
                 other{"{0} millimeter kvikksølv"}
             }
+            pascal{
+                dnam{"pascal"}
+                one{"{0} pascal"}
+                other{"{0} pascal"}
+            }
             pound-per-square-inch{
                 dnam{"pund per kvadrattomme"}
                 one{"{0} pund per kvadrattomme"}
@@ -607,12 +736,27 @@ nb{
                 other{"{0} kelvin"}
             }
         }
+        torque{
+            newton-meter{
+                dnam{"newtonmeter"}
+                one{"{0} Nm"}
+                other{"{0} Nm"}
+            }
+            pound-foot{
+                dnam{"pound-foot"}
+            }
+        }
         volume{
             acre-foot{
                 dnam{"acre-fot"}
                 one{"{0} acre-fot"}
                 other{"{0} acre-fot"}
             }
+            barrel{
+                dnam{"fat"}
+                one{"{0} fat"}
+                other{"{0} fat"}
+            }
             centiliter{
                 dnam{"centiliter"}
                 one{"{0} centiliter"}
@@ -675,6 +819,11 @@ nb{
                 one{"{0} væskeunse"}
                 other{"{0} væskeunser"}
             }
+            fluid-ounce-imperial{
+                dnam{"imp. fluid ounce"}
+                one{"{0} imp. fluid ounce"}
+                other{"{0} imp. fluid ounce"}
+            }
             gallon{
                 dnam{"gallon"}
                 one{"{0} gallon"}
@@ -743,7 +892,6 @@ nb{
                 other{"{0}G"}
             }
             meter-per-second-squared{
-                dnam{"m/s²"}
                 one{"{0}m/s²"}
                 other{"{0}m/s²"}
             }
@@ -791,6 +939,13 @@ nb{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            percent{
+                dnam{"%"}
+                one{"{0} %"}
+                other{"{0} %"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"l/100km"}
@@ -799,6 +954,7 @@ nb{
             }
         }
         coordinate{
+            dnam{"retning"}
             east{"{0}Ø"}
             north{"{0}N"}
             south{"{0}S"}
@@ -812,30 +968,30 @@ nb{
             }
             day{
                 dnam{"døgn"}
-                one{"{0}d"}
-                other{"{0}d"}
+                one{"{0} d"}
+                other{"{0} d"}
                 per{"{0}/d"}
             }
             hour{
                 dnam{"time"}
-                one{"{0}t"}
-                other{"{0}t"}
+                one{"{0} t"}
+                other{"{0} t"}
                 per{"{0}/t"}
             }
             microsecond{
                 dnam{"μs"}
-                one{"{0}μs"}
-                other{"{0}μs"}
+                one{"{0} μs"}
+                other{"{0} μs"}
             }
             millisecond{
                 dnam{"ms"}
-                one{"{0}ms"}
-                other{"{0}ms"}
+                one{"{0} ms"}
+                other{"{0} ms"}
             }
             minute{
                 dnam{"min"}
-                one{"{0}m"}
-                other{"{0}m"}
+                one{"{0} m"}
+                other{"{0} m"}
                 per{"{0}/m"}
             }
             month{
@@ -846,13 +1002,13 @@ nb{
             }
             nanosecond{
                 dnam{"ns"}
-                one{"{0}ns"}
-                other{"{0}ns"}
+                one{"{0} ns"}
+                other{"{0} ns"}
             }
             second{
                 dnam{"sek"}
-                one{"{0}s"}
-                other{"{0}s"}
+                one{"{0} s"}
+                other{"{0} s"}
                 per{"{0}/s"}
             }
             week{
@@ -870,7 +1026,6 @@ nb{
         }
         length{
             astronomical-unit{
-                dnam{"au"}
                 one{"{0}au"}
                 other{"{0}au"}
             }
@@ -878,10 +1033,8 @@ nb{
                 dnam{"cm"}
                 one{"{0}cm"}
                 other{"{0}cm"}
-                per{"{0}/cm"}
             }
             decimeter{
-                dnam{"dm"}
                 one{"{0}dm"}
                 other{"{0}dm"}
             }
@@ -892,18 +1045,16 @@ nb{
             }
             inch{
                 dnam{"to"}
-                one{"{0} tomme"}
-                other{"{0} tommer"}
-                per{"{0}to"}
+                one{"{0} to"}
+                other{"{0} to"}
+                per{"{0}/to"}
             }
             kilometer{
                 dnam{"km"}
                 one{"{0}km"}
                 other{"{0}km"}
-                per{"{0}/km"}
             }
             light-year{
-                dnam{"ly"}
                 one{"{0} lysår"}
                 other{"{0} lysår"}
             }
@@ -911,17 +1062,15 @@ nb{
                 dnam{"m"}
                 one{"{0}m"}
                 other{"{0}m"}
-                per{"{0}/m"}
             }
             micrometer{
-                dnam{"µm"}
                 one{"{0}µm"}
                 other{"{0}µm"}
             }
             mile{
                 dnam{"mile"}
-                one{"{0} eng mil"}
-                other{"{0} eng mil"}
+                one{"{0} mile"}
+                other{"{0} mile"}
             }
             mile-scandinavian{
                 dnam{"mil"}
@@ -934,32 +1083,26 @@ nb{
                 other{"{0}mm"}
             }
             nanometer{
-                dnam{"nm"}
                 one{"{0}nm"}
                 other{"{0}nm"}
             }
             nautical-mile{
-                dnam{"nmi"}
                 one{"{0}nmi"}
                 other{"{0}nmi"}
             }
             parsec{
-                dnam{"pc"}
                 one{"{0}pc"}
                 other{"{0}pc"}
             }
             picometer{
-                dnam{"pm"}
                 one{"{0}pm"}
                 other{"{0}pm"}
             }
             point{
-                dnam{"pt"}
                 one{"{0}pt"}
                 other{"{0}pt"}
             }
             yard{
-                dnam{"yd"}
                 one{"{0} yard"}
                 other{"{0} yard"}
             }
@@ -969,26 +1112,21 @@ nb{
                 dnam{"gram"}
                 one{"{0}g"}
                 other{"{0}g"}
-                per{"{0}/g"}
             }
             kilogram{
                 dnam{"kg"}
                 one{"{0}kg"}
                 other{"{0}kg"}
-                per{"{0}/kg"}
             }
             metric-ton{
-                dnam{"t"}
                 one{"{0}t"}
                 other{"{0}t"}
             }
             microgram{
-                dnam{"µg"}
                 one{"{0}µg"}
                 other{"{0}µg"}
             }
             milligram{
-                dnam{"mg"}
                 one{"{0}mg"}
                 other{"{0}mg"}
             }
@@ -1020,17 +1158,14 @@ nb{
         }
         pressure{
             hectopascal{
-                dnam{"hPa"}
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
             inch-hg{
-                dnam{"inHg"}
                 one{"{0}ʹʹ Hg"}
                 other{"{0}ʹʹ Hg"}
             }
             millibar{
-                dnam{"mbar"}
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
@@ -1050,19 +1185,17 @@ nb{
                 other{"{0}km/t"}
             }
             knot{
-                dnam{"kn"}
                 one{"{0}kn"}
                 other{"{0}kn"}
             }
             meter-per-second{
-                dnam{"m/s"}
                 one{"{0}m/s"}
                 other{"{0}m/s"}
             }
             mile-per-hour{
                 dnam{"mile/t"}
-                one{"{0} eng mil/t"}
-                other{"{0} eng mil/t"}
+                one{"{0} mile/t"}
+                other{"{0} mile/t"}
             }
         }
         temperature{
@@ -1072,12 +1205,10 @@ nb{
                 other{"{0}°C"}
             }
             fahrenheit{
-                dnam{"°F"}
                 one{"{0}°F"}
                 other{"{0}°F"}
             }
             kelvin{
-                dnam{"K"}
                 one{"{0}K"}
                 other{"{0}K"}
             }
@@ -1214,6 +1345,21 @@ nb{
                 one{"{0} ppm"}
                 other{"{0} ppm"}
             }
+            percent{
+                dnam{"prosent"}
+                one{"{0} %"}
+                other{"{0} %"}
+            }
+            permille{
+                dnam{"promille"}
+                one{"{0} ‰"}
+                other{"{0} ‰"}
+            }
+            permyriad{
+                dnam{"promyriade"}
+                one{"{0} ‱"}
+                other{"{0} ‱"}
+            }
         }
         consumption{
             liter-per-100kilometers{
@@ -1238,6 +1384,7 @@ nb{
             }
         }
         coordinate{
+            dnam{"retning"}
             east{"{0} Ø"}
             north{"{0} N"}
             south{"{0} S"}
@@ -1284,6 +1431,11 @@ nb{
                 one{"{0} MB"}
                 other{"{0} MB"}
             }
+            petabyte{
+                dnam{"PB"}
+                one{"{0} PB"}
+                other{"{0} PB"}
+            }
             terabit{
                 dnam{"Tb"}
                 one{"{0} Tb"}
@@ -1307,6 +1459,11 @@ nb{
                 other{"{0} d"}
                 per{"{0}/d"}
             }
+            decade{
+                dnam{"tiår"}
+                one{"{0} tiår"}
+                other{"{0} tiår"}
+            }
             hour{
                 dnam{"timer"}
                 one{"{0} t"}
@@ -1387,6 +1544,11 @@ nb{
                 one{"{0} cal"}
                 other{"{0} cal"}
             }
+            electronvolt{
+                dnam{"elektronvolt"}
+                one{"{0} eV"}
+                other{"{0} eV"}
+            }
             foodcalorie{
                 dnam{"cal"}
                 one{"{0} cal"}
@@ -1412,6 +1574,21 @@ nb{
                 one{"{0} kWh"}
                 other{"{0} kWh"}
             }
+            therm-us{
+                dnam{"therm"}
+                one{"{0} therm"}
+                other{"{0} therm"}
+            }
+        }
+        force{
+            newton{
+                dnam{"newton"}
+            }
+            pound-force{
+                dnam{"poundforce"}
+                one{"{0} lbf"}
+                other{"{0} lbf"}
+            }
         }
         frequency{
             gigahertz{
@@ -1435,6 +1612,35 @@ nb{
                 other{"{0} MHz"}
             }
         }
+        graphics{
+            dot-per-centimeter{
+                dnam{"dpcm"}
+            }
+            em{
+                dnam{"gefirt"}
+                one{"{0} gefirt"}
+                other{"{0} gefirt"}
+            }
+            megapixel{
+                dnam{"megapiksler"}
+                one{"{0} MP"}
+                other{"{0} MP"}
+            }
+            pixel{
+                dnam{"piksler"}
+                one{"{0} px"}
+                other{"{0} px"}
+            }
+            pixel-per-centimeter{
+                one{"{0} ppcm"}
+                other{"{0} ppcm"}
+            }
+            pixel-per-inch{
+                dnam{"ppi"}
+                one{"{0} ppi"}
+                other{"{0} ppi"}
+            }
+        }
         length{
             astronomical-unit{
                 dnam{"au"}
@@ -1460,9 +1666,9 @@ nb{
             }
             inch{
                 dnam{"tommer"}
-                one{"{0} tomme"}
-                other{"{0} tommer"}
-                per{"{0}/tomme"}
+                one{"{0} to"}
+                other{"{0} to"}
+                per{"{0}/to"}
             }
             kilometer{
                 dnam{"km"}
@@ -1526,6 +1732,9 @@ nb{
                 one{"{0} pt"}
                 other{"{0} pt"}
             }
+            solar-radius{
+                dnam{"solradius"}
+            }
             yard{
                 dnam{"yard"}
                 one{"{0} yard"}
@@ -1538,6 +1747,9 @@ nb{
                 one{"{0} lx"}
                 other{"{0} lx"}
             }
+            solar-luminosity{
+                dnam{"solluminositet"}
+            }
         }
         mass{
             carat{
@@ -1545,6 +1757,16 @@ nb{
                 one{"{0} c"}
                 other{"{0} c"}
             }
+            dalton{
+                dnam{"dalton"}
+                one{"{0} Da"}
+                other{"{0} Da"}
+            }
+            earth-mass{
+                dnam{"jordmasser"}
+                one{"{0} M⊕"}
+                other{"{0} M⊕"}
+            }
             gram{
                 dnam{"gram"}
                 one{"{0} g"}
@@ -1589,6 +1811,11 @@ nb{
                 other{"{0} pund"}
                 per{"{0}/pund"}
             }
+            solar-mass{
+                dnam{"solmasser"}
+                one{"{0} M☉"}
+                other{"{0} M☉"}
+            }
             ton{
                 dnam{"am. tonn"}
                 one{"{0} am. tonn"}
@@ -1628,6 +1855,15 @@ nb{
             }
         }
         pressure{
+            atmosphere{
+                dnam{"atm"}
+                one{"{0} atm"}
+                other{"{0} atm"}
+            }
+            bar{
+                one{"{0} bar"}
+                other{"{0} bar"}
+            }
             hectopascal{
                 dnam{"hPa"}
                 one{"{0} hPa"}
@@ -1648,6 +1884,10 @@ nb{
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
+            pascal{
+                one{"{0} Pa"}
+                other{"{0} Pa"}
+            }
             pound-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
@@ -1679,13 +1919,13 @@ nb{
         temperature{
             celsius{
                 dnam{"°C"}
-                one{"{0} °C"}
-                other{"{0} °C"}
+                one{"{0} °C"}
+                other{"{0} °C"}
             }
             fahrenheit{
                 dnam{"°F"}
-                one{"{0} °F"}
-                other{"{0} °F"}
+                one{"{0} °F"}
+                other{"{0} °F"}
             }
             generic{
                 dnam{"°"}
@@ -1698,12 +1938,24 @@ nb{
                 other{"{0} K"}
             }
         }
+        torque{
+            newton-meter{
+                dnam{"Nm"}
+                one{"{0} Nm"}
+                other{"{0} Nm"}
+            }
+        }
         volume{
             acre-foot{
                 dnam{"acre-fot"}
                 one{"{0} ac-fot"}
                 other{"{0} ac-fot"}
             }
+            barrel{
+                dnam{"fat"}
+                one{"{0} fat"}
+                other{"{0} fat"}
+            }
             centiliter{
                 dnam{"cl"}
                 one{"{0} cl"}
@@ -1766,6 +2018,11 @@ nb{
                 one{"{0} fl oz"}
                 other{"{0} fl oz"}
             }
+            fluid-ounce-imperial{
+                dnam{"imp. fl oz"}
+                one{"{0} imp. fl oz"}
+                other{"{0} imp. fl oz"}
+            }
             gallon{
                 dnam{"gal"}
                 one{"{0} gal"}