]> git.saurik.com Git - apple/icu.git/blobdiff - icuSources/data/unit/et.txt
ICU-62107.0.1.tar.gz
[apple/icu.git] / icuSources / data / unit / et.txt
old mode 100755 (executable)
new mode 100644 (file)
index 3de6736..e995f9a
@@ -1,13 +1,7 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2015 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/common/main/et.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 et{
-    Version{"2.1.12.94"}
+    Version{"2.1.41.97"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -16,9 +10,9 @@ et{
     units{
         acceleration{
             g-force{
-                dnam{"maa gravitatsioon"}
-                one{"{0} maa gravitatsiooni"}
-                other{"{0} maa gravitatsiooni"}
+                dnam{"Maa raskuskiirendus"}
+                one{"{0} Maa raskuskiirendus"}
+                other{"{0} Maa raskuskiirendust"}
             }
             meter-per-second-squared{
                 dnam{"meetrid sekundi ruudu kohta"}
@@ -28,17 +22,17 @@ et{
         }
         angle{
             arc-minute{
-                dnam{"kaareminut"}
+                dnam{"kaareminutid"}
                 one{"{0} kaareminut"}
-                other{"{0} kaareminut"}
+                other{"{0} kaareminutit"}
             }
             arc-second{
-                dnam{"kaaresekund"}
+                dnam{"kaaresekundid"}
                 one{"{0} kaaresekund"}
-                other{"{0} kaaresekund"}
+                other{"{0} kaaresekundit"}
             }
             degree{
-                dnam{"kraadi"}
+                dnam{"kraadid"}
                 one{"{0} kraad"}
                 other{"{0} kraadi"}
             }
@@ -47,6 +41,11 @@ et{
                 one{"{0} radiaan"}
                 other{"{0} radiaani"}
             }
+            revolution{
+                dnam{"täispööre"}
+                one{"{0} täispööre"}
+                other{"{0} täispööret"}
+            }
         }
         area{
             acre{
@@ -63,6 +62,7 @@ et{
                 dnam{"ruutsentimeetrid"}
                 one{"{0} ruutsentimeeter"}
                 other{"{0} ruutsentimeetrit"}
+                per{"{0} ruutsentimeetri kohta"}
             }
             square-foot{
                 dnam{"ruutjalad"}
@@ -73,21 +73,25 @@ et{
                 dnam{"ruuttollid"}
                 one{"{0} ruuttoll"}
                 other{"{0} ruuttolli"}
+                per{"{0} ruuttolli kohta"}
             }
             square-kilometer{
                 dnam{"ruutkilomeetrid"}
                 one{"{0} ruutkilomeeter"}
                 other{"{0} ruutkilomeetrit"}
+                per{"{0} ruutkilomeetri kohta"}
             }
             square-meter{
                 dnam{"ruutmeetrid"}
                 one{"{0} ruutmeeter"}
                 other{"{0} ruutmeetrit"}
+                per{"{0} ruutmeetri kohta"}
             }
             square-mile{
-                dnam{"ruutmiili"}
+                dnam{"ruutmiilid"}
                 one{"{0} ruutmiil"}
                 other{"{0} ruutmiili"}
+                per{"{0} ruutmiili kohta"}
             }
             square-yard{
                 dnam{"ruutjardid"}
@@ -98,17 +102,55 @@ et{
         compound{
             per{"{0} {1} kohta"}
         }
+        concentr{
+            karat{
+                dnam{"karaadid"}
+                one{"{0} karaat"}
+                other{"{0} karaati"}
+            }
+            milligram-per-deciliter{
+                dnam{"milligrammid detsiliitri kohta"}
+                one{"{0} milligramm detsiliitri kohta"}
+                other{"{0} milligrammi detsiliitri kohta"}
+            }
+            millimole-per-liter{
+                dnam{"millimoolid liitri kohta"}
+                one{"{0} millimool liitri kohta"}
+                other{"{0} millimooli liitri kohta"}
+            }
+            part-per-million{
+                dnam{"osa miljoni kohta"}
+                one{"{0} osa miljoni kohta"}
+                other{"{0} osa miljoni kohta"}
+            }
+        }
         consumption{
+            liter-per-100kilometers{
+                dnam{"liitrid 100 kilomeetri kohta"}
+                one{"liiter 100 kilomeetri kohta"}
+                other{"{0} liitrit 100 kilomeetri kohta"}
+            }
             liter-per-kilometer{
-                dnam{"liitreid kilomeetri kohta"}
+                dnam{"liitrid kilomeetri kohta"}
                 one{"{0} liiter kilomeetri kohta"}
                 other{"{0} liitrit kilomeetri kohta"}
             }
             mile-per-gallon{
-                dnam{"miili galloni kohta"}
+                dnam{"miilid galloni kohta"}
                 one{"{0} miil galloni kohta"}
                 other{"{0} miili galloni kohta"}
             }
+            mile-per-gallon-imperial{
+                dnam{"miilid inglise galloni kohta"}
+                one{"{0} miil inglise galloni kohta"}
+                other{"{0} miili inglise galloni kohta"}
+            }
+        }
+        coordinate{
+            east{"{0} idapikkust"}
+            north{"{0} põhjalaiust"}
+            south{"{0} lõunalaiust"}
+            west{"{0} läänepikkust"}
         }
         digital{
             bit{
@@ -163,16 +205,22 @@ et{
             }
         }
         duration{
+            century{
+                dnam{"sajandid"}
+                one{"{0} sajand"}
+                other{"{0} sajandit"}
+            }
             day{
-                dnam{"ööpäeva"}
+                dnam{"ööpäevad"}
                 one{"{0} ööpäev"}
                 other{"{0} ööpäeva"}
+                per{"{0} ööpäevas"}
             }
             hour{
-                dnam{"tundi"}
+                dnam{"tunnid"}
                 one{"{0} tund"}
                 other{"{0} tundi"}
-                per{"{0}/h"}
+                per{"{0} tunnis"}
             }
             microsecond{
                 dnam{"mikrosekundid"}
@@ -188,11 +236,13 @@ et{
                 dnam{"minutid"}
                 one{"{0} minut"}
                 other{"{0} minutit"}
+                per{"{0} minutis"}
             }
             month{
                 dnam{"kuud"}
                 one{"{0} kuu"}
                 other{"{0} kuud"}
+                per{"{0} kuus"}
             }
             nanosecond{
                 dnam{"nanosekundid"}
@@ -203,17 +253,19 @@ et{
                 dnam{"sekundid"}
                 one{"{0} sekund"}
                 other{"{0} sekundit"}
-                per{"{0}/s"}
+                per{"{0} sekundis"}
             }
             week{
                 dnam{"nädalad"}
                 one{"{0} nädal"}
                 other{"{0} nädalat"}
+                per{"{0} nädalas"}
             }
             year{
                 dnam{"aastad"}
                 one{"{0} aasta"}
                 other{"{0} aastat"}
+                per{"{0} aastas"}
             }
         }
         electric{
@@ -245,7 +297,7 @@ et{
                 other{"{0} kalorit"}
             }
             foodcalorie{
-                dnam{"Toidukalorid"}
+                dnam{"toidukalorid"}
                 one{"{0} toidukalor"}
                 other{"{0} toidukalorit"}
             }
@@ -272,22 +324,22 @@ et{
         }
         frequency{
             gigahertz{
-                dnam{"gigaherts"}
+                dnam{"gigahertsid"}
                 one{"{0} gigaherts"}
                 other{"{0} gigahertsi"}
             }
             hertz{
-                dnam{"herts"}
+                dnam{"hertsid"}
                 one{"{0} herts"}
                 other{"{0} hertsi"}
             }
             kilohertz{
-                dnam{"kiloherts"}
+                dnam{"kilohertsid"}
                 one{"{0} kiloherts"}
                 other{"{0} kilohertsi"}
             }
             megahertz{
-                dnam{"megaherts"}
+                dnam{"megahertsid"}
                 one{"{0} megaherts"}
                 other{"{0} megahertsi"}
             }
@@ -302,26 +354,40 @@ et{
                 dnam{"sentimeetrid"}
                 one{"{0} sentimeeter"}
                 other{"{0} sentimeetrit"}
+                per{"{0} sentimeetri kohta"}
             }
             decimeter{
                 dnam{"detsimeetrid"}
                 one{"{0} detsimeeter"}
                 other{"{0} detsimeetrit"}
             }
+            fathom{
+                dnam{"süllad"}
+                one{"{0} süld"}
+                other{"{0} sülda"}
+            }
             foot{
-                dnam{"jalg"}
+                dnam{"jalad"}
                 one{"{0} jalg"}
                 other{"{0} jalga"}
+                per{"{0} jala kohta"}
+            }
+            furlong{
+                dnam{"furlongid"}
+                one{"{0} furlong"}
+                other{"{0} furlongi"}
             }
             inch{
-                dnam{"tolli"}
+                dnam{"tollid"}
                 one{"{0} toll"}
                 other{"{0} tolli"}
+                per{"{0} tolli kohta"}
             }
             kilometer{
                 dnam{"kilomeetrid"}
                 one{"{0} kilomeeter"}
                 other{"{0} kilomeetrit"}
+                per{"{0} kilomeetri kohta"}
             }
             light-year{
                 dnam{"valgusaastad"}
@@ -332,6 +398,7 @@ et{
                 dnam{"meetrid"}
                 one{"{0} meeter"}
                 other{"{0} meetrit"}
+                per{"{0} meetri kohta"}
             }
             micrometer{
                 dnam{"mikromeetrid"}
@@ -339,10 +406,15 @@ et{
                 other{"{0} mikromeetrit"}
             }
             mile{
-                dnam{"miili"}
+                dnam{"miilid"}
                 one{"{0} miil"}
                 other{"{0} miili"}
             }
+            mile-scandinavian{
+                dnam{"Skandinaavia miilid"}
+                one{"{0} Skandinaavia miil"}
+                other{"{0} Skandinaavia miili"}
+            }
             millimeter{
                 dnam{"millimeetrid"}
                 one{"{0} millimeeter"}
@@ -368,8 +440,13 @@ et{
                 one{"{0} pikomeeter"}
                 other{"{0} pikomeetrit"}
             }
+            point{
+                dnam{"punktid"}
+                one{"{0} punkt"}
+                other{"{0} punkti"}
+            }
             yard{
-                dnam{"jardi"}
+                dnam{"jardid"}
                 one{"{0} jard"}
                 other{"{0} jardi"}
             }
@@ -388,14 +465,16 @@ et{
                 other{"{0} karaati"}
             }
             gram{
-                dnam{"grammi"}
+                dnam{"grammid"}
                 one{"{0} gramm"}
                 other{"{0} grammi"}
+                per{"{0} grammi kohta"}
             }
             kilogram{
-                dnam{"kilogrammi"}
+                dnam{"kilogrammid"}
                 one{"{0} kilogramm"}
                 other{"{0} kilogrammi"}
+                per{"{0} kilogrammi kohta"}
             }
             metric-ton{
                 dnam{"tonnid"}
@@ -404,7 +483,7 @@ et{
             }
             microgram{
                 dnam{"mikrogrammid"}
-                one{"mikrogramm"}
+                one{"{0} mikrogramm"}
                 other{"{0} mikrogrammi"}
             }
             milligram{
@@ -413,23 +492,30 @@ et{
                 other{"{0} milligrammi"}
             }
             ounce{
-                dnam{"untsi"}
+                dnam{"untsid"}
                 one{"{0} unts"}
                 other{"{0} untsi"}
+                per{"{0} untsi kohta"}
             }
             ounce-troy{
-                dnam{"trooja untsid"}
-                one{"{0} trooja unts"}
-                other{"{0} trooja untsi"}
+                dnam{"troiuntsid"}
+                one{"{0} troiunts"}
+                other{"{0} troiuntsi"}
             }
             pound{
-                dnam{"naela"}
+                dnam{"naelad"}
                 one{"{0} nael"}
                 other{"{0} naela"}
+                per{"{0} naela kohta"}
+            }
+            stone{
+                dnam{"kivid"}
+                one{"{0} kivi"}
+                other{"{0} kivi"}
             }
             ton{
                 dnam{"lühikesed tonnid"}
-                one{"{0} lühikene tonn"}
+                one{"{0} lühike tonn"}
                 other{"{0} lühikest tonni"}
             }
         }
@@ -472,72 +558,80 @@ et{
                 other{"{0} hektopaskalit"}
             }
             inch-hg{
-                dnam{"tolli elavhõbedasammast"}
+                dnam{"tollid elavhõbedasammast"}
                 one{"{0} toll elavhõbedasammast"}
                 other{"{0} tolli elavhõbedasammast"}
             }
             millibar{
-                dnam{"millibaari"}
+                dnam{"millibaarid"}
                 one{"{0} millibaar"}
                 other{"{0} millibaari"}
             }
             millimeter-of-mercury{
-                dnam{"millimeetrit elavhõbedasammast"}
+                dnam{"millimeetrid elavhõbedasammast"}
                 one{"{0} millimeeter elavhõbedasammast"}
                 other{"{0} millimeetrit elavhõbedasammast"}
             }
             pound-per-square-inch{
-                dnam{"naela ruuttolli kohta"}
+                dnam{"naelad ruuttolli kohta"}
                 one{"{0} nael ruuttolli kohta"}
                 other{"{0} naela ruuttolli kohta"}
             }
         }
-        proportion{
-            karat{
-                dnam{"karaadid"}
-                one{"{0} karaat"}
-                other{"{0} karaati"}
-            }
-        }
         speed{
             kilometer-per-hour{
                 dnam{"kilomeetrid tunnis"}
                 one{"{0} kilomeeter tunnis"}
                 other{"{0} kilomeetrit tunnis"}
             }
+            knot{
+                dnam{"sõlm"}
+                one{"{0} sõlm"}
+                other{"{0} sõlme"}
+            }
             meter-per-second{
                 dnam{"meetrid sekundis"}
                 one{"{0} meeter sekundis"}
                 other{"{0} meetrit sekundis"}
             }
             mile-per-hour{
-                dnam{"miili tunnis"}
+                dnam{"miilid tunnis"}
                 one{"{0} miil tunnis"}
                 other{"{0} miili tunnis"}
             }
         }
         temperature{
             celsius{
-                dnam{"Celsiuse kraadi"}
+                dnam{"Celsiuse kraadid"}
                 one{"{0} Celsiuse kraad"}
                 other{"{0} Celsiuse kraadi"}
             }
             fahrenheit{
-                dnam{"Fahrenheiti kraadi"}
+                dnam{"Fahrenheiti kraadid"}
                 one{"{0} Fahrenheiti kraad"}
                 other{"{0} Fahrenheiti kraadi"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
             kelvin{
-                dnam{"kelvinit"}
+                dnam{"kelvinid"}
                 one{"{0} kelvin"}
                 other{"{0} kelvinit"}
             }
         }
         volume{
             acre-foot{
-                dnam{"aaker-jalg"}
-                one{"{0} aaker-jalg"}
-                other{"{0} aaker-jalga"}
+                dnam{"aakerjalad"}
+                one{"{0} aakerjalg"}
+                other{"{0} aakerjalga"}
+            }
+            bushel{
+                dnam{"buššelid"}
+                one{"{0} buššel"}
+                other{"{0} buššelit"}
             }
             centiliter{
                 dnam{"sentiliitrid"}
@@ -548,9 +642,10 @@ et{
                 dnam{"kuupsentimeetrid"}
                 one{"{0} kuupsentimeeter"}
                 other{"{0} kuupsentimeetrit"}
+                per{"{0} kuupsentimeetri kohta"}
             }
             cubic-foot{
-                dnam{"kuupjalg"}
+                dnam{"kuupjalad"}
                 one{"{0} kuupjalg"}
                 other{"{0} kuupjalga"}
             }
@@ -568,9 +663,10 @@ et{
                 dnam{"kuupmeetrid"}
                 one{"{0} kuupmeeter"}
                 other{"{0} kuupmeetrit"}
+                per{"{0} kuupmeetri kohta"}
             }
             cubic-mile{
-                dnam{"kuupmiili"}
+                dnam{"kuupmiilid"}
                 one{"{0} kuupmiil"}
                 other{"{0} kuupmiili"}
             }
@@ -584,20 +680,32 @@ et{
                 one{"{0} tass"}
                 other{"{0} tassi"}
             }
+            cup-metric{
+                dnam{"meetrilised tassid"}
+                one{"{0} meetriline tass"}
+                other{"{0} meetrilist tassi"}
+            }
             deciliter{
                 dnam{"detsiliitrid"}
                 one{"{0} detsiliiter"}
                 other{"{0} detsiliitrit"}
             }
             fluid-ounce{
-                dnam{"vedelikuntsid"}
-                one{"{0} vedelikunts"}
-                other{"{0} vedelikuntsi"}
+                dnam{"vedelikuuntsid"}
+                one{"{0} vedelikuunts"}
+                other{"{0} vedelikuuntsi"}
             }
             gallon{
                 dnam{"gallonid"}
                 one{"{0} gallon"}
                 other{"{0} gallonit"}
+                per{"{0} galloni kohta"}
+            }
+            gallon-imperial{
+                dnam{"inglise gallonid"}
+                one{"{0} inglise gallon"}
+                other{"{0} inglise gallonit"}
+                per{"{0} inglise galloni kohta"}
             }
             hectoliter{
                 dnam{"hektoliitrid"}
@@ -608,6 +716,7 @@ et{
                 dnam{"liitrid"}
                 one{"{0} liiter"}
                 other{"{0} liitrit"}
+                per{"{0} liitri kohta"}
             }
             megaliter{
                 dnam{"megaliitrid"}
@@ -624,29 +733,40 @@ et{
                 one{"{0} pint"}
                 other{"{0} pinti"}
             }
+            pint-metric{
+                dnam{"meetrilised pindid"}
+                one{"{0} meetriline pint"}
+                other{"{0} meetrilist pinti"}
+            }
             quart{
                 dnam{"kvardid"}
                 one{"{0} kvart"}
                 other{"{0} kvarti"}
             }
             tablespoon{
-                dnam{"supilusikatäis"}
-                one{"{0} supilusikatäis"}
-                other{"{0} supilusikatäit"}
+                dnam{"supilusikad"}
+                one{"{0} supilusikas"}
+                other{"{0} supilusikat"}
             }
             teaspoon{
-                dnam{"teelusikatäis"}
-                one{"{0} teelusikatäis"}
-                other{"{0} teelusikatäit"}
+                dnam{"teelusikad"}
+                one{"{0} teelusikas"}
+                other{"{0} teelusikat"}
             }
         }
     }
     unitsNarrow{
         acceleration{
             g-force{
+                dnam{"Maa raskuskiirendus"}
                 one{"{0}G"}
                 other{"{0}G"}
             }
+            meter-per-second-squared{
+                dnam{"m/s²"}
+                one{"{0} m/s²"}
+                other{"{0} m/s²"}
+            }
         }
         angle{
             arc-minute{
@@ -668,20 +788,20 @@ et{
                 other{"{0} aakrit"}
             }
             hectare{
-                one{"{0}ha"}
-                other{"{0}ha"}
+                one{"{0} ha"}
+                other{"{0} ha"}
             }
             square-foot{
                 one{"{0} ft²"}
                 other{"{0} ft²"}
             }
             square-kilometer{
-                one{"{0}km²"}
-                other{"{0}km²"}
+                one{"{0} km²"}
+                other{"{0} km²"}
             }
             square-meter{
-                one{"{0}m²"}
-                other{"{0}m²"}
+                one{"{0} m²"}
+                other{"{0} m²"}
             }
             square-mile{
                 one{"{0} mi²"}
@@ -691,39 +811,76 @@ et{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            karat{
+                one{"{0} kt"}
+                other{"{0} kt"}
+            }
+        }
+        consumption{
+            liter-per-100kilometers{
+                dnam{"l/100 km"}
+                one{"{0} l/100km"}
+                other{"{0} l/100km"}
+            }
+        }
+        coordinate{
+            east{"{0} E"}
+            north{"{0} N"}
+            south{"{0} S"}
+            west{"{0} W"}
+        }
+        digital{
+            byte{
+                one{"{0} B"}
+                other{"{0} B"}
+            }
+        }
         duration{
             day{
-                dnam{"ööpäeva"}
+                dnam{"päev"}
                 one{"{0} p"}
                 other{"{0} p"}
             }
             hour{
-                dnam{"h"}
-                one{"{0} h"}
-                other{"{0} h"}
+                dnam{"t"}
+                one{"{0} t"}
+                other{"{0} t"}
+            }
+            microsecond{
+                dnam{"μs"}
+                one{"{0} μs"}
+                other{"{0} μs"}
             }
             millisecond{
-                dnam{"millisekundit"}
-                one{"{0}ms"}
-                other{"{0}ms"}
+                dnam{"ms"}
+                one{"{0} ms"}
+                other{"{0} ms"}
             }
             minute{
                 dnam{"min"}
                 one{"{0} min"}
                 other{"{0} min"}
+                per{"{0}/min"}
             }
             month{
                 dnam{"kuud"}
                 one{"{0} k"}
                 other{"{0} k"}
             }
+            nanosecond{
+                dnam{"ns"}
+                one{"{0} ns"}
+                other{"{0} ns"}
+            }
             second{
                 dnam{"s"}
                 one{"{0} s"}
                 other{"{0} s"}
+                per{"{0}/s"}
             }
             week{
-                dnam{"nädalad"}
+                dnam{"n"}
                 one{"{0} n"}
                 other{"{0} n"}
             }
@@ -733,26 +890,58 @@ et{
                 other{"{0} a"}
             }
         }
+        energy{
+            kilowatt-hour{
+                dnam{"kWh"}
+            }
+        }
         length{
+            astronomical-unit{
+                dnam{"aü"}
+                one{"{0} aü"}
+                other{"{0} aü"}
+            }
             centimeter{
                 dnam{"cm"}
                 one{"{0} cm"}
                 other{"{0} cm"}
+                per{"{0}/cm"}
+            }
+            decimeter{
+                dnam{"dm"}
+                one{"{0} dm"}
+                other{"{0} dm"}
+            }
+            fathom{
+                dnam{"süllad"}
+                one{"{0} fm"}
+                other{"{0} fm"}
             }
             foot{
+                dnam{"ft"}
                 one{"{0} jalg"}
                 other{"{0} jalga"}
+                per{"{0}/ft"}
+            }
+            furlong{
+                dnam{"furlongid"}
+                one{"{0} fur"}
+                other{"{0} fur"}
             }
             inch{
+                dnam{"tollid"}
                 one{"{0} toll"}
                 other{"{0} tolli"}
+                per{"{0}/in"}
             }
             kilometer{
                 dnam{"km"}
                 one{"{0} km"}
                 other{"{0} km"}
+                per{"{0}/km"}
             }
             light-year{
+                dnam{"valgusaastad"}
                 one{"{0} valgusa."}
                 other{"{0} valgusa."}
             }
@@ -760,49 +949,118 @@ et{
                 dnam{"m"}
                 one{"{0} m"}
                 other{"{0} m"}
+                per{"{0}/m"}
+            }
+            micrometer{
+                dnam{"µm"}
+                one{"{0} µm"}
+                other{"{0} µm"}
             }
             mile{
+                dnam{"mi"}
                 one{"{0} miil"}
                 other{"{0} miili"}
             }
+            mile-scandinavian{
+                dnam{"smi"}
+                one{"{0} smi"}
+                other{"{0} smi"}
+            }
             millimeter{
                 dnam{"mm"}
                 one{"{0} mm"}
                 other{"{0} mm"}
             }
+            nanometer{
+                dnam{"nm"}
+                one{"{0} nm"}
+                other{"{0} nm"}
+            }
+            nautical-mile{
+                dnam{"nmi"}
+                one{"{0} nmi"}
+                other{"{0} nmi"}
+            }
+            parsec{
+                dnam{"parsekid"}
+                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{"jardid"}
                 one{"{0} jard"}
                 other{"{0} jardi"}
             }
         }
         mass{
+            carat{
+                dnam{"ct"}
+                one{"{0} ct"}
+                other{"{0} ct"}
+            }
             gram{
                 dnam{"gramm"}
                 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"}
             }
             ounce{
+                dnam{"oz"}
                 one{"{0} oz"}
                 other{"{0} oz"}
+                per{"{0}/oz"}
+            }
+            ounce-troy{
+                dnam{"oz t"}
+                one{"{0} oz t"}
+                other{"{0} oz t"}
             }
             pound{
+                dnam{"naelad"}
                 one{"{0} lb"}
                 other{"{0} lb"}
+                per{"{0}/lb"}
+            }
+            stone{
+                dnam{"kivid"}
+                one{"{0} st"}
+                other{"{0} st"}
             }
             ton{
-                dnam{"lüh. tonnid"}
-                one{"{0} lüh. t"}
-                other{"{0} lüh. t"}
+                dnam{"lüh t"}
+                one{"{0} lüh t"}
+                other{"{0} lüh t"}
             }
         }
         power{
@@ -821,29 +1079,49 @@ et{
         }
         pressure{
             hectopascal{
+                dnam{"hPa"}
                 one{"{0} hPa"}
                 other{"{0} hPa"}
             }
             inch-hg{
+                dnam{"″ Hg"}
                 one{"{0} toll Hg"}
                 other{"{0} tolli Hg"}
             }
             millibar{
+                dnam{"mbar"}
                 one{"{0} mbar"}
                 other{"{0} mbar"}
             }
+            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{
                 dnam{"km/h"}
-                one{"{0}km/h"}
-                other{"{0}km/h"}
+                one{"{0} km/h"}
+                other{"{0} km/h"}
+            }
+            knot{
+                dnam{"kn"}
+                one{"{0} kn"}
+                other{"{0} kn"}
             }
             meter-per-second{
-                one{"{0}m/s"}
-                other{"{0}m/s"}
+                dnam{"m/s"}
+                one{"{0} m/s"}
+                other{"{0} m/s"}
             }
             mile-per-hour{
+                dnam{"mi/h"}
                 one{"{0} mi/h"}
                 other{"{0} mi/h"}
             }
@@ -851,14 +1129,24 @@ et{
         temperature{
             celsius{
                 dnam{"°C"}
-                one{"{0} °"}
-                other{"{0} °"}
+                one{"{0} °C"}
+                other{"{0} °C"}
             }
             fahrenheit{
                 dnam{"°F"}
                 one{"{0} °F"}
                 other{"{0} °F"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
+            kelvin{
+                dnam{"K"}
+                one{"{0} K"}
+                other{"{0} K"}
+            }
         }
         volume{
             cubic-kilometer{
@@ -879,7 +1167,7 @@ et{
     unitsShort{
         acceleration{
             g-force{
-                dnam{"maa gravitatsioon"}
+                dnam{"Maa raskuskiirendus"}
                 one{"{0} G"}
                 other{"{0} G"}
             }
@@ -896,12 +1184,12 @@ et{
                 other{"{0}′"}
             }
             arc-second{
-                dnam{"kaaresekund"}
+                dnam{""}
                 one{"{0}″"}
                 other{"{0}″"}
             }
             degree{
-                dnam{"kraadi"}
+                dnam{"kraadid"}
                 one{"{0}°"}
                 other{"{0}°"}
             }
@@ -910,12 +1198,17 @@ et{
                 one{"{0} rad"}
                 other{"{0} rad"}
             }
+            revolution{
+                dnam{"pööre"}
+                one{"{0} pööre"}
+                other{"{0} pööret"}
+            }
         }
         area{
             acre{
                 dnam{"aakrid"}
-                one{"{0} aaker"}
-                other{"{0} aakrit"}
+                one{"{0} ac"}
+                other{"{0} ac"}
             }
             hectare{
                 dnam{"hektarid"}
@@ -926,9 +1219,10 @@ et{
                 dnam{"cm²"}
                 one{"{0} cm²"}
                 other{"{0} cm²"}
+                per{"{0}/cm²"}
             }
             square-foot{
-                dnam{"ruutjalga"}
+                dnam{"ruutjalad"}
                 one{"{0} ft²"}
                 other{"{0} ft²"}
             }
@@ -936,21 +1230,25 @@ et{
                 dnam{"ruuttollid"}
                 one{"{0} in²"}
                 other{"{0} in²"}
+                per{"{0}/in²"}
             }
             square-kilometer{
                 dnam{"km²"}
                 one{"{0} km²"}
                 other{"{0} km²"}
+                per{"{0}/km²"}
             }
             square-meter{
                 dnam{"m²"}
                 one{"{0} m²"}
                 other{"{0} m²"}
+                per{"{0}/m²"}
             }
             square-mile{
                 dnam{"mi²"}
                 one{"{0} mi²"}
                 other{"{0} mi²"}
+                per{"{0}/mi²"}
             }
             square-yard{
                 dnam{"ruutjardid"}
@@ -961,17 +1259,55 @@ et{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            karat{
+                dnam{"karaat"}
+                one{"{0} ct"}
+                other{"{0} ct"}
+            }
+            milligram-per-deciliter{
+                dnam{"mg/dl"}
+                one{"{0} mg/dl"}
+                other{"{0} mg/dl"}
+            }
+            millimole-per-liter{
+                dnam{"mmol/l"}
+                one{"{0} mmol/l"}
+                other{"{0} mmol/l"}
+            }
+            part-per-million{
+                dnam{"osa/miljon"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
+        }
         consumption{
+            liter-per-100kilometers{
+                dnam{"l/100 km"}
+                one{"{0} l/100 km"}
+                other{"{0} l/100 km"}
+            }
             liter-per-kilometer{
-                dnam{"liitrit/km"}
-                one{"{0} L/km"}
-                other{"{0} L/km"}
+                dnam{"l/km"}
+                one{"{0} l/km"}
+                other{"{0} l/km"}
             }
             mile-per-gallon{
                 dnam{"miil/gallon"}
                 one{"{0} mpg"}
                 other{"{0} mpg"}
             }
+            mile-per-gallon-imperial{
+                dnam{"miil/gal imp."}
+                one{"{0} mpg imp."}
+                other{"{0} mpg imp."}
+            }
+        }
+        coordinate{
+            east{"{0} ip"}
+            north{"{0} pl"}
+            south{"{0} ll"}
+            west{"{0} lp"}
         }
         digital{
             bit{
@@ -1026,16 +1362,22 @@ et{
             }
         }
         duration{
+            century{
+                dnam{"saj"}
+                one{"{0} saj"}
+                other{"{0} saj"}
+            }
             day{
-                dnam{"ööpäeva"}
+                dnam{"päevad"}
                 one{"{0} päev"}
                 other{"{0} päeva"}
+                per{"{0}/ööp"}
             }
             hour{
-                dnam{"h"}
-                one{"{0} h"}
-                other{"{0} h"}
-                per{"{0}/h"}
+                dnam{"t"}
+                one{"{0} t"}
+                other{"{0} t"}
+                per{"{0}/t"}
             }
             microsecond{
                 dnam{"μs"}
@@ -1043,7 +1385,7 @@ et{
                 other{"{0} μs"}
             }
             millisecond{
-                dnam{"millisekundit"}
+                dnam{"ms"}
                 one{"{0} ms"}
                 other{"{0} ms"}
             }
@@ -1051,11 +1393,13 @@ et{
                 dnam{"min"}
                 one{"{0} min"}
                 other{"{0} min"}
+                per{"{0}/min"}
             }
             month{
                 dnam{"kuud"}
                 one{"{0} kuu"}
                 other{"{0} kuud"}
+                per{"{0}/k"}
             }
             nanosecond{
                 dnam{"ns"}
@@ -1063,20 +1407,22 @@ et{
                 other{"{0} ns"}
             }
             second{
-                dnam{"s"}
-                one{"{0} s"}
-                other{"{0} s"}
-                per{"{0}/s"}
+                dnam{"sek"}
+                one{"{0} sek"}
+                other{"{0} sek"}
+                per{"{0}/sek"}
             }
             week{
-                dnam{"nädalad"}
-                one{"{0} nädal"}
-                other{"{0} nädalat"}
+                dnam{"näd"}
+                one{"{0} näd"}
+                other{"{0} näd"}
+                per{"{0}/näd"}
             }
             year{
                 dnam{"aastad"}
                 one{"{0} a"}
                 other{"{0} a"}
+                per{"{0}/a"}
             }
         }
         electric{
@@ -1165,26 +1511,40 @@ et{
                 dnam{"cm"}
                 one{"{0} cm"}
                 other{"{0} cm"}
+                per{"{0}/cm"}
             }
             decimeter{
                 dnam{"dm"}
                 one{"{0} dm"}
                 other{"{0} dm"}
             }
+            fathom{
+                dnam{"süllad"}
+                one{"{0} fm"}
+                other{"{0} fm"}
+            }
             foot{
                 dnam{"ft"}
-                one{"{0} jalg"}
-                other{"{0} jalga"}
+                one{"{0} ft"}
+                other{"{0} ft"}
+                per{"{0}/ft"}
+            }
+            furlong{
+                dnam{"furlongid"}
+                one{"{0} fur"}
+                other{"{0} fur"}
             }
             inch{
-                dnam{"in"}
-                one{"{0} toll"}
-                other{"{0} tolli"}
+                dnam{"tollid"}
+                one{"{0} in"}
+                other{"{0} in"}
+                per{"{0}/in"}
             }
             kilometer{
                 dnam{"km"}
                 one{"{0} km"}
                 other{"{0} km"}
+                per{"{0}/km"}
             }
             light-year{
                 dnam{"valgusaastad"}
@@ -1192,9 +1552,10 @@ et{
                 other{"{0} valgusa."}
             }
             meter{
-                dnam{"meetrid"}
+                dnam{"m"}
                 one{"{0} m"}
                 other{"{0} m"}
+                per{"{0}/m"}
             }
             micrometer{
                 dnam{"µm"}
@@ -1203,8 +1564,13 @@ et{
             }
             mile{
                 dnam{"mi"}
-                one{"{0} miil"}
-                other{"{0} miili"}
+                one{"{0} mi"}
+                other{"{0} mi"}
+            }
+            mile-scandinavian{
+                dnam{"smi"}
+                one{"{0} smi"}
+                other{"{0} smi"}
             }
             millimeter{
                 dnam{"mm"}
@@ -1231,10 +1597,15 @@ et{
                 one{"{0} pm"}
                 other{"{0} pm"}
             }
+            point{
+                dnam{"punktid"}
+                one{"{0} pt"}
+                other{"{0} pt"}
+            }
             yard{
-                dnam{"jardi"}
-                one{"{0} jard"}
-                other{"{0} jardi"}
+                dnam{"jardid"}
+                one{"{0} yd"}
+                other{"{0} yd"}
             }
         }
         light{
@@ -1246,19 +1617,21 @@ et{
         }
         mass{
             carat{
-                dnam{"karaat"}
+                dnam{"ct"}
                 one{"{0} ct"}
                 other{"{0} ct"}
             }
             gram{
-                dnam{"grammi"}
+                dnam{"grammid"}
                 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"}
@@ -1279,6 +1652,7 @@ et{
                 dnam{"oz"}
                 one{"{0} oz"}
                 other{"{0} oz"}
+                per{"{0}/oz"}
             }
             ounce-troy{
                 dnam{"oz t"}
@@ -1286,14 +1660,20 @@ et{
                 other{"{0} oz t"}
             }
             pound{
-                dnam{"lb"}
+                dnam{"naelad"}
                 one{"{0} lb"}
                 other{"{0} lb"}
+                per{"{0}/lb"}
+            }
+            stone{
+                dnam{"kivid"}
+                one{"{0} st"}
+                other{"{0} st"}
             }
             ton{
-                dnam{"lüh. tonnid"}
-                one{"{0} lüh. t"}
-                other{"{0} lüh. t"}
+                dnam{"lüh t"}
+                one{"{0} lüh t"}
+                other{"{0} lüh t"}
             }
         }
         power{
@@ -1335,9 +1715,9 @@ et{
                 other{"{0} hPa"}
             }
             inch-hg{
-                dnam{"tolli elavhõbedasammast"}
-                one{"{0} toll Hg"}
-                other{"{0} tolli Hg"}
+                dnam{"in Hg"}
+                one{"{0} in Hg"}
+                other{"{0} in Hg"}
             }
             millibar{
                 dnam{"mbar"}
@@ -1355,19 +1735,17 @@ et{
                 other{"{0} psi"}
             }
         }
-        proportion{
-            karat{
-                dnam{"karaat"}
-                one{"{0} ct"}
-                other{"{0} ct"}
-            }
-        }
         speed{
             kilometer-per-hour{
                 dnam{"km/h"}
                 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"}
@@ -1390,6 +1768,11 @@ et{
                 one{"{0} °F"}
                 other{"{0} °F"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
             kelvin{
                 dnam{"K"}
                 one{"{0} K"}
@@ -1398,10 +1781,13 @@ et{
         }
         volume{
             acre-foot{
-                dnam{"aaker ft"}
+                dnam{"aakerjalg"}
                 one{"{0} ac ft"}
                 other{"{0} ac ft"}
             }
+            bushel{
+                dnam{"buššelid"}
+            }
             centiliter{
                 dnam{"cl"}
                 one{"{0} cl"}
@@ -1411,6 +1797,7 @@ et{
                 dnam{"cm³"}
                 one{"{0} cm³"}
                 other{"{0} cm³"}
+                per{"{0}/cm³"}
             }
             cubic-foot{
                 dnam{"ft³"}
@@ -1419,8 +1806,8 @@ et{
             }
             cubic-inch{
                 dnam{"kuuptollid"}
-                one{"{0} toll³"}
-                other{"{0} tolli³"}
+                one{"{0} in³"}
+                other{"{0} in³"}
             }
             cubic-kilometer{
                 dnam{"km³"}
@@ -1431,9 +1818,10 @@ et{
                 dnam{"m³"}
                 one{"{0} m³"}
                 other{"{0} m³"}
+                per{"{0}/m³"}
             }
             cubic-mile{
-                dnam{"kuupmiili"}
+                dnam{"kuupmiilid"}
                 one{"{0} mi³"}
                 other{"{0} mi³"}
             }
@@ -1444,8 +1832,13 @@ et{
             }
             cup{
                 dnam{"tass"}
-                one{"{0} tass"}
-                other{"{0} tassi"}
+                one{"{0} c"}
+                other{"{0} c"}
+            }
+            cup-metric{
+                dnam{"mcup"}
+                one{"{0} mc"}
+                other{"{0} mc"}
             }
             deciliter{
                 dnam{"dl"}
@@ -1461,6 +1854,13 @@ et{
                 dnam{"gal"}
                 one{"{0} gal"}
                 other{"{0} gal"}
+                per{"{0}/gal"}
+            }
+            gallon-imperial{
+                dnam{"Imp. gal"}
+                one{"{0} gal Imp."}
+                other{"{0} gal Imp."}
+                per{"{0}/gal Imp."}
             }
             hectoliter{
                 dnam{"hl"}
@@ -1471,6 +1871,7 @@ et{
                 dnam{"liitrid"}
                 one{"{0} l"}
                 other{"{0} l"}
+                per{"{0}/l"}
             }
             megaliter{
                 dnam{"Ml"}
@@ -1487,6 +1888,11 @@ et{
                 one{"{0} pt"}
                 other{"{0} pt"}
             }
+            pint-metric{
+                dnam{"mpt"}
+                one{"{0} mpt"}
+                other{"{0} mpt"}
+            }
             quart{
                 dnam{"kvart"}
                 one{"{0} qt"}