ICU-66108.tar.gz

[apple/icu.git] / icuSources / data / unit / nb.txt

diff --git a/icuSources/data/unit/nb.txt b/icuSources/data/unit/nb.txt
index 4bf35a87e6629e4a29974f3c40b22c96d26b1303..5c40db718b394d4a0aec3b566a32264a5fd432fb 100644 (file)
--- 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{
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 nb{

-    Version{"2.1.48.42"}
+    Version{"36.1"}

     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}


@@ -53,11 +53,6 @@ nb{
                 one{"{0} acre"}
                 other{"{0} acre"}
             }
                 one{"{0} acre"}
                 other{"{0} acre"}
             }

-            dunam{
-                dnam{"dunam"}
-                one{"{0} dunam"}
-                other{"{0} dunam"}
-            }

             hectare{
                 dnam{"hektar"}
                 one{"{0} hektar"}
             hectare{
                 dnam{"hektar"}
                 one{"{0} hektar"}


@@ -123,11 +118,6 @@ nb{
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }
                 one{"{0} millimol per liter"}
                 other{"{0} millimol per liter"}
             }

-            mole{
-                dnam{"mol"}
-                one{"{0} mol"}
-                other{"{0} mol"}
-            }

             part-per-million{
                 dnam{"deler per million"}
                 one{"{0} del per million"}
             part-per-million{
                 dnam{"deler per million"}
                 one{"{0} del per million"}


@@ -247,6 +237,11 @@ nb{
                 other{"{0} døgn"}
                 per{"{0} per døgn"}
             }
                 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"}
             hour{
                 dnam{"timer"}
                 one{"{0} time"}


@@ -324,8 +319,6 @@ nb{
         energy{
             british-thermal-unit{
                 dnam{"British thermal unit"}
         energy{
             british-thermal-unit{
                 dnam{"British thermal unit"}

-                one{"{0} Btu"}
-                other{"{0} Btu"}

             }
             calorie{
                 dnam{"kalorier"}
             }
             calorie{
                 dnam{"kalorier"}


@@ -362,6 +355,11 @@ nb{
                 one{"{0} kilowattime"}
                 other{"{0} kilowattimer"}
             }
                 one{"{0} kilowattime"}
                 other{"{0} kilowattimer"}
             }

+            therm-us{
+                dnam{"therm"}
+                one{"{0} therm"}
+                other{"{0} therm"}
+            }

         }
         force{
             newton{
         }
         force{
             newton{


@@ -397,6 +395,43 @@ nb{
                 other{"{0} megahertz"}
             }
         }
                 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"}
         length{
             astronomical-unit{
                 dnam{"astronomiske enheter"}


@@ -490,8 +525,6 @@ nb{
             }
             solar-radius{
                 dnam{"solradius"}
             }
             solar-radius{
                 dnam{"solradius"}

-                one{"{0} R☉"}
-                other{"{0} R☉"}

             }
             yard{
                 dnam{"yard"}
             }
             yard{
                 dnam{"yard"}


@@ -507,8 +540,6 @@ nb{
             }
             solar-luminosity{
                 dnam{"solluminositet"}
             }
             solar-luminosity{
                 dnam{"solluminositet"}

-                one{"{0} L☉"}
-                other{"{0} L☉"}

             }
         }
         mass{
             }
         }
         mass{


@@ -650,6 +681,11 @@ nb{
                 one{"{0} millimeter kvikksølv"}
                 other{"{0} millimeter kvikksølv"}
             }
                 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"}
             pound-per-square-inch{
                 dnam{"pund per kvadrattomme"}
                 one{"{0} pund per kvadrattomme"}


@@ -708,8 +744,6 @@ nb{
             }
             pound-foot{
                 dnam{"pound-foot"}
             }
             pound-foot{
                 dnam{"pound-foot"}

-                one{"{0} lbf⋅ft"}
-                other{"{0} lbf⋅ft"}

             }
         }
         volume{
             }
         }
         volume{


@@ -934,30 +968,30 @@ nb{
             }
             day{
                 dnam{"døgn"}
             }
             day{
                 dnam{"døgn"}

-                one{"{0}d"}
-                other{"{0}d"}
+                one{"{0} d"}
+                other{"{0} d"}

                 per{"{0}/d"}
             }
             hour{
                 dnam{"time"}
                 per{"{0}/d"}
             }
             hour{
                 dnam{"time"}

-                one{"{0}t"}
-                other{"{0}t"}
+                one{"{0} t"}
+                other{"{0} t"}

                 per{"{0}/t"}
             }
             microsecond{
                 dnam{"μs"}
                 per{"{0}/t"}
             }
             microsecond{
                 dnam{"μs"}

-                one{"{0}μs"}
-                other{"{0}μs"}
+                one{"{0} μs"}
+                other{"{0} μs"}

             }
             millisecond{
                 dnam{"ms"}
             }
             millisecond{
                 dnam{"ms"}

-                one{"{0}ms"}
-                other{"{0}ms"}
+                one{"{0} ms"}
+                other{"{0} ms"}

             }
             minute{
                 dnam{"min"}
             }
             minute{
                 dnam{"min"}

-                one{"{0}m"}
-                other{"{0}m"}
+                one{"{0} m"}
+                other{"{0} m"}

                 per{"{0}/m"}
             }
             month{
                 per{"{0}/m"}
             }
             month{


@@ -968,13 +1002,13 @@ nb{
             }
             nanosecond{
                 dnam{"ns"}
             }
             nanosecond{
                 dnam{"ns"}

-                one{"{0}ns"}
-                other{"{0}ns"}
+                one{"{0} ns"}
+                other{"{0} ns"}

             }
             second{
                 dnam{"sek"}
             }
             second{
                 dnam{"sek"}

-                one{"{0}s"}
-                other{"{0}s"}
+                one{"{0} s"}
+                other{"{0} s"}

                 per{"{0}/s"}
             }
             week{
                 per{"{0}/s"}
             }
             week{


@@ -1011,9 +1045,9 @@ nb{
             }
             inch{
                 dnam{"to"}
             }
             inch{
                 dnam{"to"}

-                one{"{0} tomme"}
-                other{"{0} tommer"}
-                per{"{0}to"}
+                one{"{0} to"}
+                other{"{0} to"}
+                per{"{0}/to"}

             }
             kilometer{
                 dnam{"km"}
             }
             kilometer{
                 dnam{"km"}


@@ -1241,11 +1275,6 @@ nb{
                 one{"{0} ac"}
                 other{"{0} ac"}
             }
                 one{"{0} ac"}
                 other{"{0} ac"}
             }

-            dunam{
-                dnam{"dunam"}
-                one{"{0} dunam"}
-                other{"{0} dunam"}
-            }

             hectare{
                 dnam{"hektar"}
                 one{"{0} ha"}
             hectare{
                 dnam{"hektar"}
                 one{"{0} ha"}


@@ -1311,11 +1340,6 @@ nb{
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }
                 one{"{0} mmol/l"}
                 other{"{0} mmol/l"}
             }

-            mole{
-                dnam{"mol"}
-                one{"{0} mol"}
-                other{"{0} mol"}
-            }

             part-per-million{
                 dnam{"ppm"}
                 one{"{0} ppm"}
             part-per-million{
                 dnam{"ppm"}
                 one{"{0} ppm"}


@@ -1435,6 +1459,11 @@ nb{
                 other{"{0} d"}
                 per{"{0}/d"}
             }
                 other{"{0} d"}
                 per{"{0}/d"}
             }

+            decade{
+                dnam{"tiår"}
+                one{"{0} tiår"}
+                other{"{0} tiår"}
+            }

             hour{
                 dnam{"timer"}
                 one{"{0} t"}
             hour{
                 dnam{"timer"}
                 one{"{0} t"}


@@ -1510,11 +1539,6 @@ nb{
             }
         }
         energy{
             }
         }
         energy{

-            british-thermal-unit{
-                dnam{"Btu"}
-                one{"{0} Btu"}
-                other{"{0} Btu"}
-            }

             calorie{
                 dnam{"cal"}
                 one{"{0} cal"}
             calorie{
                 dnam{"cal"}
                 one{"{0} cal"}


@@ -1550,12 +1574,15 @@ nb{
                 one{"{0} kWh"}
                 other{"{0} kWh"}
             }
                 one{"{0} kWh"}
                 other{"{0} kWh"}
             }

+            therm-us{
+                dnam{"therm"}
+                one{"{0} therm"}
+                other{"{0} therm"}
+            }

         }
         force{
             newton{
                 dnam{"newton"}
         }
         force{
             newton{
                 dnam{"newton"}

-                one{"{0} N"}
-                other{"{0} N"}

             }
             pound-force{
                 dnam{"poundforce"}
             }
             pound-force{
                 dnam{"poundforce"}


@@ -1585,6 +1612,35 @@ nb{
                 other{"{0} MHz"}
             }
         }
                 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"}
         length{
             astronomical-unit{
                 dnam{"au"}


@@ -1610,9 +1666,9 @@ nb{
             }
             inch{
                 dnam{"tommer"}
             }
             inch{
                 dnam{"tommer"}

-                one{"{0} tomme"}
-                other{"{0} tommer"}
-                per{"{0}/tomme"}
+                one{"{0} to"}
+                other{"{0} to"}
+                per{"{0}/to"}

             }
             kilometer{
                 dnam{"km"}
             }
             kilometer{
                 dnam{"km"}


@@ -1678,8 +1734,6 @@ nb{
             }
             solar-radius{
                 dnam{"solradius"}
             }
             solar-radius{
                 dnam{"solradius"}

-                one{"{0} R☉"}
-                other{"{0} R☉"}

             }
             yard{
                 dnam{"yard"}
             }
             yard{
                 dnam{"yard"}


@@ -1695,8 +1749,6 @@ nb{
             }
             solar-luminosity{
                 dnam{"solluminositet"}
             }
             solar-luminosity{
                 dnam{"solluminositet"}

-                one{"{0} L☉"}
-                other{"{0} L☉"}

             }
         }
         mass{
             }
         }
         mass{


@@ -1808,6 +1860,10 @@ nb{
                 one{"{0} atm"}
                 other{"{0} atm"}
             }
                 one{"{0} atm"}
                 other{"{0} atm"}
             }

+            bar{
+                one{"{0} bar"}
+                other{"{0} bar"}
+            }

             hectopascal{
                 dnam{"hPa"}
                 one{"{0} hPa"}
             hectopascal{
                 dnam{"hPa"}
                 one{"{0} hPa"}


@@ -1818,16 +1874,6 @@ nb{
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
                 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"}
             millibar{
                 dnam{"mbar"}
                 one{"{0} mbar"}


@@ -1838,6 +1884,10 @@ nb{
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }
                 one{"{0} mmHg"}
                 other{"{0} mmHg"}
             }

+            pascal{
+                one{"{0} Pa"}
+                other{"{0} Pa"}
+            }

             pound-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}
             pound-per-square-inch{
                 dnam{"psi"}
                 one{"{0} psi"}


@@ -1869,13 +1919,13 @@ nb{
         temperature{
             celsius{
                 dnam{"°C"}
         temperature{
             celsius{
                 dnam{"°C"}

-                one{"{0} °C"}
-                other{"{0} °C"}
+                one{"{0} °C"}
+                other{"{0} °C"}

             }
             fahrenheit{
                 dnam{"°F"}
             }
             fahrenheit{
                 dnam{"°F"}

-                one{"{0} °F"}
-                other{"{0} °F"}
+                one{"{0} °F"}
+                other{"{0} °F"}

             }
             generic{
                 dnam{"°"}
             }
             generic{
                 dnam{"°"}


@@ -1894,11 +1944,6 @@ nb{
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }
                 one{"{0} Nm"}
                 other{"{0} Nm"}
             }

-            pound-foot{
-                dnam{"lbf⋅ft"}
-                one{"{0} lbf⋅ft"}
-                other{"{0} lbf⋅ft"}
-            }

         }
         volume{
             acre-foot{
         }
         volume{
             acre-foot{