ICU-66108.tar.gz

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

diff --git a/icuSources/data/unit/fi.txt b/icuSources/data/unit/fi.txt
index 1f008c45a7e89e30397f295fd0ded4947efaad39..a7e6cde2d7a905ac9692d358dab08a1c67b276fd 100644 (file)
--- a/icuSources/data/unit/fi.txt
+++ b/icuSources/data/unit/fi.txt
@@ -1,7 +1,7 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 fi{
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 fi{

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

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


@@ -635,6 +635,11 @@ fi{
                 one{"{0} normaali-ilmakehä"}
                 other{"{0} normaali-ilmakehää"}
             }
                 one{"{0} normaali-ilmakehä"}
                 other{"{0} normaali-ilmakehää"}
             }

+            bar{
+                dnam{"baarit"}
+                one{"{0} baari"}
+                other{"{0} baaria"}
+            }

             hectopascal{
                 dnam{"hehtopascalit"}
                 one{"{0} hehtopascal"}
             hectopascal{
                 dnam{"hehtopascalit"}
                 one{"{0} hehtopascal"}


@@ -665,6 +670,11 @@ fi{
                 one{"{0} millimetri elohopeaa"}
                 other{"{0} millimetriä elohopeaa"}
             }
                 one{"{0} millimetri elohopeaa"}
                 other{"{0} millimetriä elohopeaa"}
             }

+            pascal{
+                dnam{"pascalit"}
+                one{"{0} pascal"}
+                other{"{0} pascalia"}
+            }

             pound-per-square-inch{
                 dnam{"paunat / neliötuuma"}
                 one{"{0} pauna / neliötuuma"}
             pound-per-square-inch{
                 dnam{"paunat / neliötuuma"}
                 one{"{0} pauna / neliötuuma"}


@@ -916,6 +926,10 @@ fi{
                 one{"{0}ac"}
                 other{"{0}ac"}
             }
                 one{"{0}ac"}
                 other{"{0}ac"}
             }

+            dunam{
+                one{"{0}dunam"}
+                other{"{0}dunam"}
+            }

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


@@ -981,6 +995,11 @@ fi{
                 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"}


@@ -990,6 +1009,15 @@ fi{
                 one{"{0} %"}
                 other{"{0} %"}
             }
                 one{"{0} %"}
                 other{"{0} %"}
             }

+            permille{
+                one{"{0}‰"}
+                other{"{0}‰"}
+            }
+            permyriad{
+                dnam{"‱"}
+                one{"{0}‱"}
+                other{"{0}‱"}
+            }

         }
         consumption{
             liter-per-100kilometers{
         }
         consumption{
             liter-per-100kilometers{


@@ -1085,55 +1113,59 @@ fi{
             }
             day{
                 dnam{"pv"}
             }
             day{
                 dnam{"pv"}

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

                 per{"{0}/pv"}
             }
             hour{
                 dnam{"t"}
                 per{"{0}/pv"}
             }
             hour{
                 dnam{"t"}

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

                 per{"{0}/t"}
             }
             microsecond{
                 per{"{0}/t"}
             }
             microsecond{

-                one{"{0}μs"}
-                other{"{0}μs"}
+                dnam{"μ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}min"}
-                other{"{0}min"}
+                one{"{0} min"}
+                other{"{0} min"}
+                per{"{0}/min"}

             }
             month{
                 dnam{"kk"}
             }
             month{
                 dnam{"kk"}

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

                 per{"{0}/kk"}
             }
             nanosecond{
                 per{"{0}/kk"}
             }
             nanosecond{

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

             }
             second{
                 dnam{"s"}
             }
             second{
                 dnam{"s"}

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

             }
             week{
                 dnam{"vk"}
             }
             week{
                 dnam{"vk"}

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

                 per{"{0}/vk"}
             }
             year{
                 dnam{"v"}
                 per{"{0}/vk"}
             }
             year{
                 dnam{"v"}

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

                 per{"{0}/v"}
             }
         }
                 per{"{0}/v"}
             }
         }


@@ -1160,11 +1192,20 @@ fi{
             }
         }
         energy{
             }
         }
         energy{

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

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

+            electronvolt{
+                dnam{"eV"}
+                one{"{0}eV"}
+                other{"{0}eV"}
+            }

             foodcalorie{
                 dnam{"kcal"}
                 one{"{0}kcal"}
             foodcalorie{
                 dnam{"kcal"}
                 one{"{0}kcal"}


@@ -1191,6 +1232,18 @@ fi{
                 other{"{0}kWh"}
             }
         }
                 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"}
         frequency{
             gigahertz{
                 dnam{"GHz"}


@@ -1213,6 +1266,36 @@ fi{
                 other{"{0}MHz"}
             }
         }
                 other{"{0}MHz"}
             }
         }

+        graphics{
+            dot-per-centimeter{
+                one{"{0}dpcm"}
+                other{"{0}dpcm"}
+            }
+            dot-per-inch{
+                one{"{0}dpi"}
+                other{"{0}dpi"}
+            }
+            em{
+                one{"{0}em"}
+                other{"{0}em"}
+            }
+            megapixel{
+                one{"{0}MP"}
+                other{"{0}MP"}
+            }
+            pixel{
+                one{"{0}px"}
+                other{"{0}px"}
+            }
+            pixel-per-centimeter{
+                one{"{0}ppcm"}
+                other{"{0}ppcm"}
+            }
+            pixel-per-inch{
+                one{"{0}ppi"}
+                other{"{0}ppi"}
+            }
+        }

         length{
             astronomical-unit{
                 dnam{"au"}
         length{
             astronomical-unit{
                 dnam{"au"}


@@ -1309,6 +1392,15 @@ fi{
                 one{"{0}pm"}
                 other{"{0}pm"}
             }
                 one{"{0}pm"}
                 other{"{0}pm"}
             }

+            point{
+                one{"{0}pt"}
+                other{"{0}pt"}
+            }
+            solar-radius{
+                dnam{"R☉"}
+                one{"{0}R☉"}
+                other{"{0}R☉"}
+            }

             yard{
                 dnam{"yd"}
                 one{"{0}yd"}
             yard{
                 dnam{"yd"}
                 one{"{0}yd"}


@@ -1321,6 +1413,11 @@ fi{
                 one{"{0}lx"}
                 other{"{0}lx"}
             }
                 one{"{0}lx"}
                 other{"{0}lx"}
             }

+            solar-luminosity{
+                dnam{"L☉"}
+                one{"{0}L☉"}
+                other{"{0}L☉"}
+            }

         }
         mass{
             carat{
         }
         mass{
             carat{


@@ -1328,6 +1425,16 @@ fi{
                 one{"{0}ka"}
                 other{"{0}ka"}
             }
                 one{"{0}ka"}
                 other{"{0}ka"}
             }

+            dalton{
+                dnam{"Da"}
+                one{"{0}Da"}
+                other{"{0}Da"}
+            }
+            earth-mass{
+                dnam{"M⊕"}
+                one{"{0}M⊕"}
+                other{"{0}M⊕"}
+            }

             gram{
                 dnam{"g"}
                 one{"{0}g"}
             gram{
                 dnam{"g"}
                 one{"{0}g"}


@@ -1372,6 +1479,11 @@ fi{
                 other{"{0}lb"}
                 per{"{0}/lb"}
             }
                 other{"{0}lb"}
                 per{"{0}/lb"}
             }

+            solar-mass{
+                dnam{"M☉"}
+                one{"{0}M☉"}
+                other{"{0}M☉"}
+            }

             stone{
                 dnam{"st"}
                 one{"{0}st"}
             stone{
                 dnam{"st"}
                 one{"{0}st"}


@@ -1402,7 +1514,7 @@ fi{
             megawatt{
                 dnam{"MW"}
                 one{"{0}MW"}
             megawatt{
                 dnam{"MW"}
                 one{"{0}MW"}

-                other{"{0} MW"}
+                other{"{0}MW"}

             }
             milliwatt{
                 dnam{"mW"}
             }
             milliwatt{
                 dnam{"mW"}


@@ -1416,6 +1528,15 @@ fi{
             }
         }
         pressure{
             }
         }
         pressure{

+            atmosphere{
+                one{"{0}atm"}
+                other{"{0}atm"}
+            }
+            bar{
+                dnam{"bar"}
+                one{"{0}bar"}
+                other{"{0}bar"}
+            }

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


@@ -1426,6 +1547,14 @@ fi{
                 one{"{0}″ Hg"}
                 other{"{0}″ Hg"}
             }
                 one{"{0}″ Hg"}
                 other{"{0}″ Hg"}
             }

+            kilopascal{
+                one{"{0}kPa"}
+                other{"{0}kPa"}
+            }
+            megapascal{
+                one{"{0}MPa"}
+                other{"{0}MPa"}
+            }

             millibar{
                 dnam{"mbar"}
                 one{"{0}mbar"}
             millibar{
                 dnam{"mbar"}
                 one{"{0}mbar"}


@@ -1436,6 +1565,10 @@ fi{
                 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"}


@@ -1492,6 +1625,11 @@ fi{
                 one{"{0}ac ft"}
                 other{"{0}ac ft"}
             }
                 one{"{0}ac ft"}
                 other{"{0}ac ft"}
             }

+            barrel{
+                dnam{"bbl"}
+                one{"{0}bbl"}
+                other{"{0}bbl"}
+            }

             bushel{
                 dnam{"bu"}
                 one{"{0}bu"}
             bushel{
                 dnam{"bu"}
                 one{"{0}bu"}


@@ -1524,6 +1662,7 @@ fi{
                 other{"{0}km³"}
             }
             cubic-meter{
                 other{"{0}km³"}
             }
             cubic-meter{

+                dnam{"m³"}

                 one{"{0}m³"}
                 other{"{0}m³"}
                 per{"{0}/m³"}
                 one{"{0}m³"}
                 other{"{0}m³"}
                 per{"{0}/m³"}


@@ -1558,6 +1697,9 @@ fi{
                 one{"{0}fl oz"}
                 other{"{0}fl oz"}
             }
                 one{"{0}fl oz"}
                 other{"{0}fl oz"}
             }

+            fluid-ounce-imperial{
+                dnam{"Imp. fl oz"}
+            }

             gallon{
                 dnam{"am.gal"}
                 one{"{0}am.gal"}
             gallon{
                 dnam{"am.gal"}
                 one{"{0}am.gal"}


@@ -1975,8 +2117,6 @@ fi{
         force{
             newton{
                 dnam{"newton"}
         force{
             newton{
                 dnam{"newton"}

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

             }
             pound-force{
                 dnam{"pauna-voima"}
             }
             pound-force{
                 dnam{"pauna-voima"}


@@ -2025,7 +2165,7 @@ fi{
             }
             fathom{
                 dnam{"fm"}
             }
             fathom{
                 dnam{"fm"}

-                one{"{0} fth"}
+                one{"{0} fm"}

                 other{"{0} fth"}
             }
             foot{
                 other{"{0} fth"}
             }
             foot{


@@ -2109,8 +2249,6 @@ fi{
             }
             solar-radius{
                 dnam{"auringon säteet"}
             }
             solar-radius{
                 dnam{"auringon säteet"}

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

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


@@ -2138,13 +2276,9 @@ fi{
             }
             dalton{
                 dnam{"atomimassayksiköt"}
             }
             dalton{
                 dnam{"atomimassayksiköt"}

-                one{"{0} Da"}
-                other{"{0} Da"}

             }
             earth-mass{
                 dnam{"Maan massat"}
             }
             earth-mass{
                 dnam{"Maan massat"}

-                one{"{0} M⊕"}
-                other{"{0} M⊕"}

             }
             gram{
                 dnam{"g"}
             }
             gram{
                 dnam{"g"}


@@ -2249,16 +2383,6 @@ fi{
                 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"}


@@ -2339,8 +2463,6 @@ fi{
             }
             barrel{
                 dnam{"barrelit"}
             }
             barrel{
                 dnam{"barrelit"}

-                one{"{0} bbl"}
-                other{"{0} bbl"}

             }
             bushel{
                 dnam{"bu"}
             }
             bushel{
                 dnam{"bu"}


@@ -2411,8 +2533,6 @@ fi{
             }
             fluid-ounce-imperial{
                 dnam{"imp. nesteunssi"}
             }
             fluid-ounce-imperial{
                 dnam{"imp. nesteunssi"}

-                one{"{0} fl oz Imp."}
-                other{"{0} fl oz Imp."}

             }
             gallon{
                 dnam{"am. gal"}
             }
             gallon{
                 dnam{"am. gal"}