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

diff --git a/icuSources/data/unit/sw.txt b/icuSources/data/unit/sw.txt
old mode 100755
new mode 100644
index ddf6d713..97fcdd89
--- a/icuSources/data/unit/sw.txt
+++ b/icuSources/data/unit/sw.txt
@@ -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/sw.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 sw{
-    Version{"2.1.12.94"}
+    Version{"2.1.41.97"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -16,9 +10,9 @@ sw{
     units{
         acceleration{
             g-force{
-                dnam{"Mvuto wa graviti"}
-                one{"Mvuto wa graviti {0}"}
-                other{"Mvuto wa graviti {0}"}
+                dnam{"mvuto wa graviti"}
+                one{"mvuto wa graviti {0}"}
+                other{"mvuto wa graviti {0}"}
             }
             meter-per-second-squared{
                 dnam{"mita kwa kila sekunde mraba"}
@@ -47,47 +41,57 @@ sw{
                 one{"radiani {0}"}
                 other{"radiani {0}"}
             }
+            revolution{
+                dnam{"mzunguko"}
+                one{"mzunguko {0}"}
+                other{"mizunguko {0}"}
+            }
         }
         area{
             acre{
-                dnam{"Ekari"}
-                one{"Ekari {0}"}
-                other{"Ekari {0}"}
+                dnam{"ekari"}
+                one{"ekari {0}"}
+                other{"ekari {0}"}
             }
             hectare{
-                dnam{"Hektari"}
-                one{"Hektari {0}"}
-                other{"Hektari {0}"}
+                dnam{"hekta"}
+                one{"hekta {0}"}
+                other{"hekta {0}"}
             }
             square-centimeter{
                 dnam{"sentimita mraba"}
                 one{"sentimita mraba {0}"}
                 other{"sentimita mraba {0}"}
+                per{"{0} kwa kila sentimita mraba"}
             }
             square-foot{
                 dnam{"futi za mraba"}
-                one{"Futi {0} ya mraba"}
-                other{"Futi {0} za mraba"}
+                one{"futi {0} ya mraba"}
+                other{"futi {0} za mraba"}
             }
             square-inch{
                 dnam{"inchi za mraba"}
                 one{"inchi {0} ya mraba"}
                 other{"inchi {0} za mraba"}
+                per{"{0} kwa kila inchi mraba"}
             }
             square-kilometer{
                 dnam{"kilomita za mraba"}
-                one{"Kilomita {0} ya mraba"}
-                other{"Kilomita {0} za mraba"}
+                one{"kilomita {0} ya mraba"}
+                other{"kilomita {0} za mraba"}
+                per{"{0} kwa kila kilomita mraba"}
             }
             square-meter{
                 dnam{"mita za mraba"}
-                one{"Mita {0} ya mraba"}
-                other{"Mita {0} za mraba"}
+                one{"mita {0} ya mraba"}
+                other{"mita {0} za mraba"}
+                per{"{0} kwa kila mita mraba"}
             }
             square-mile{
                 dnam{"maili za mraba"}
-                one{"Maili {0} ya mraba"}
-                other{"Maili {0} za mraba"}
+                one{"maili {0} ya mraba"}
+                other{"maili {0} za mraba"}
+                per{"{0} kwa kila maili mraba"}
             }
             square-yard{
                 dnam{"yadi za mraba"}
@@ -96,11 +100,38 @@ sw{
             }
         }
         compound{
-            per{"{0}kwa kila{1}"}
+            per{"{0} kwa kila {1}"}
+        }
+        concentr{
+            karat{
+                dnam{"karati"}
+                one{"karati {0}"}
+                other{"karati {0}"}
+            }
+            milligram-per-deciliter{
+                dnam{"miligramu kwa kila desilita"}
+                one{"miligramu kwa kila desilita"}
+                other{"miligramu {0} kwa kila desilita"}
+            }
+            millimole-per-liter{
+                dnam{"milimoli kwa kila lita"}
+                one{"milimoli {0} kwa kila lita"}
+                other{"milimoli {0} kwa kila lita"}
+            }
+            part-per-million{
+                dnam{"ppm"}
+                one{"ppm {0}"}
+                other{"ppm {0}"}
+            }
         }
         consumption{
+            liter-per-100kilometers{
+                dnam{"lita kwa kilomita 100"}
+                one{"lita {0} kwa kilomita 100"}
+                other{"lita {0} kwa kilomita 100"}
+            }
             liter-per-kilometer{
-                dnam{"lita kwa kilomita"}
+                dnam{"lita kwa kila kilomita"}
                 one{"lita {0} kwa kilomita"}
                 other{"lita {0} kwa kilomita"}
             }
@@ -109,6 +140,17 @@ sw{
                 one{"maili {0} kwa kila galoni"}
                 other{"maili {0} kwa kila galoni"}
             }
+            mile-per-gallon-imperial{
+                dnam{"maili kwa kila galoni la Uingereza"}
+                one{"maili {0} kwa kila galoni la Uingereza"}
+                other{"maili {0} kwa kila galoni la Uingereza"}
+            }
+        }
+        coordinate{
+            east{"{0} Mashariki"}
+            north{"{0} Kaskazini"}
+            south{"{0} Kusini"}
+            west{"{0} Magharibi"}
         }
         digital{
             bit{
@@ -128,8 +170,8 @@ sw{
             }
             gigabyte{
                 dnam{"gigabaiti"}
-                one{"Gigabaiti {0}"}
-                other{"Gigabaiti {0}"}
+                one{"gigabaiti {0}"}
+                other{"gigabaiti {0}"}
             }
             kilobit{
                 dnam{"kilobiti"}
@@ -148,8 +190,8 @@ sw{
             }
             megabyte{
                 dnam{"megabaiti"}
-                one{"Megabaiti {0}"}
-                other{"Megabaiti {0}"}
+                one{"megabaiti {0}"}
+                other{"megabaiti {0}"}
             }
             terabit{
                 dnam{"terabiti"}
@@ -163,16 +205,22 @@ sw{
             }
         }
         duration{
+            century{
+                dnam{"karne"}
+                one{"karne {0}"}
+                other{"karne {0}"}
+            }
             day{
                 dnam{"siku"}
                 one{"siku {0}"}
                 other{"siku {0}"}
+                per{"{0} kwa siku"}
             }
             hour{
                 dnam{"saa"}
                 one{"saa {0}"}
                 other{"saa {0}"}
-                per{"{0}/h"}
+                per{"{0} kwa saa"}
             }
             microsecond{
                 dnam{"mikrosekunde"}
@@ -188,11 +236,13 @@ sw{
                 dnam{"dakika"}
                 one{"dakika {0}"}
                 other{"dakika {0}"}
+                per{"{0} kwa kila dakika"}
             }
             month{
                 dnam{"miezi"}
                 one{"mwezi {0}"}
                 other{"miezi {0}"}
+                per{"{0} kwa mwezi"}
             }
             nanosecond{
                 dnam{"nanosekunde"}
@@ -203,17 +253,19 @@ sw{
                 dnam{"sekunde"}
                 one{"sekunde {0}"}
                 other{"sekunde {0}"}
-                per{"{0}/s"}
+                per{"{0} kwa kila sekunde"}
             }
             week{
                 dnam{"wiki"}
                 one{"wiki {0}"}
                 other{"wiki {0}"}
+                per{"{0} kwa wiki"}
             }
             year{
                 dnam{"miaka"}
                 one{"mwaka {0}"}
                 other{"miaka {0}"}
+                per{"{0} kwa mwaka"}
             }
         }
         electric{
@@ -299,9 +351,10 @@ sw{
                 other{"vipimo {0} vya astronomia"}
             }
             centimeter{
-                dnam{"Sentimita"}
-                one{"Sentimita {0}"}
-                other{"Sentimita {0}"}
+                dnam{"sentimita"}
+                one{"sentimita {0}"}
+                other{"sentimita {0}"}
+                per{"{0} kwa kila sentimita"}
             }
             decimeter{
                 dnam{"desimita"}
@@ -309,29 +362,33 @@ sw{
                 other{"desimita {0}"}
             }
             foot{
-                dnam{"Futi"}
-                one{"Futi {0}"}
-                other{"Futi {0}"}
+                dnam{"futi"}
+                one{"futi {0}"}
+                other{"futi {0}"}
+                per{"{0} kwa kila futi"}
             }
             inch{
-                dnam{"Inchi"}
-                one{"Inchi {0}"}
-                other{"Inchi {0}"}
+                dnam{"inchi"}
+                one{"inchi {0}"}
+                other{"inchi {0}"}
+                per{"{0} kwa kila inchi"}
             }
             kilometer{
-                dnam{"Kilomita"}
-                one{"Kilomita {0}"}
-                other{"Kilomita {0}"}
+                dnam{"kilomita"}
+                one{"kilomita {0}"}
+                other{"kilomita {0}"}
+                per{"{0} kwa kila kilomita"}
             }
             light-year{
-                dnam{"Miaka ya mwanga"}
-                one{"Mwaka wa mwanga {0}"}
-                other{"Miaka ya mwanga {0}"}
+                dnam{"miaka ya mwanga"}
+                one{"miaka ya mwanga {0}"}
+                other{"miaka ya mwanga {0}"}
             }
             meter{
-                dnam{"Mita"}
-                one{"Mita {0}"}
-                other{"Mita {0}"}
+                dnam{"mita"}
+                one{"mita {0}"}
+                other{"mita {0}"}
+                per{"{0} kwa kila mita"}
             }
             micrometer{
                 dnam{"mikromita"}
@@ -339,14 +396,19 @@ sw{
                 other{"mikromita {0}"}
             }
             mile{
-                dnam{"Maili"}
-                one{"Maili {0}"}
-                other{"Maili {0}"}
+                dnam{"maili"}
+                one{"maili {0}"}
+                other{"maili {0}"}
+            }
+            mile-scandinavian{
+                dnam{"maili ya skandinavia"}
+                one{"maili ya skandinavia"}
+                other{"{0} smi"}
             }
             millimeter{
-                dnam{"Millimita"}
-                one{"Millimita {0}"}
-                other{"Millimita {0}"}
+                dnam{"milimita"}
+                one{"milimita {0}"}
+                other{"milimita {0}"}
             }
             nanometer{
                 dnam{"nanomita"}
@@ -359,19 +421,24 @@ sw{
                 other{"maili {0} za kibaharia"}
             }
             parsec{
-                dnam{"parsecs"}
-                one{"parsec {0}"}
-                other{"parsecs {0}"}
+                dnam{"kila sekunde"}
+                one{"{0} kila sekunde"}
+                other{"{0} kila sekunde"}
             }
             picometer{
-                dnam{"Pikomita"}
-                one{"Pikomita {0}"}
-                other{"Pikomita {0}"}
+                dnam{"pikomita"}
+                one{"pikomita {0}"}
+                other{"pikomita {0}"}
+            }
+            point{
+                dnam{"pointi"}
+                one{"pointi {0}"}
+                other{"pointi {0}"}
             }
             yard{
-                dnam{"Yadi"}
-                one{"Yadi {0}"}
-                other{"Yadi {0}"}
+                dnam{"yadi"}
+                one{"yadi {0}"}
+                other{"yadi {0}"}
             }
         }
         light{
@@ -388,14 +455,16 @@ sw{
                 other{"karati {0}"}
             }
             gram{
-                dnam{"Gramu"}
-                one{"Gramu {0}"}
-                other{"Gramu {0}"}
+                dnam{"gramu"}
+                one{"gramu {0}"}
+                other{"gramu {0}"}
+                per{"{0} kwa kila gramu"}
             }
             kilogram{
-                dnam{"Kilogramu"}
-                one{"Kilogramu {0}"}
-                other{"Kilogramu {0}"}
+                dnam{"kilogramu"}
+                one{"kilogramu {0}"}
+                other{"kilogramu {0}"}
+                per{"{0} kwa kila kilogramu"}
             }
             metric-ton{
                 dnam{"tani mita"}
@@ -413,9 +482,10 @@ sw{
                 other{"miligramu {0}"}
             }
             ounce{
-                dnam{"Aunsi"}
-                one{"Aunsi {0}"}
-                other{"Aunsi {0}"}
+                dnam{"aunsi"}
+                one{"aunsi {0}"}
+                other{"aunsi {0}"}
+                per{"{0} kwa kila aunsi"}
             }
             ounce-troy{
                 dnam{"tola aunsi"}
@@ -423,9 +493,10 @@ sw{
                 other{"tola aunsi {0}"}
             }
             pound{
-                dnam{"Ratili"}
-                one{"Ratili {0}"}
-                other{"Ratili {0}"}
+                dnam{"ratili"}
+                one{"ratili {0}"}
+                other{"ratili {0}"}
+                per{"{0} kwa kila ratili"}
             }
             ton{
                 dnam{"tani"}
@@ -440,14 +511,14 @@ sw{
                 other{"gigawati {0}"}
             }
             horsepower{
-                dnam{"Kipimo cha Hospawa"}
-                one{"Kipimo cha Hospawa {0}"}
-                other{"Kipimo cha Hospawa {0}"}
+                dnam{"kipimo cha hospawa"}
+                one{"kipimo cha hospawa {0}"}
+                other{"kipimo cha hospawa {0}"}
             }
             kilowatt{
-                dnam{"Kilowati"}
-                one{"Kilowati {0}"}
-                other{"Kilowati {0}"}
+                dnam{"kilowati"}
+                one{"kilowati {0}"}
+                other{"kilowati {0}"}
             }
             megawatt{
                 dnam{"megawati"}
@@ -460,26 +531,26 @@ sw{
                 other{"miliwati {0}"}
             }
             watt{
-                dnam{"Wati"}
-                one{"Wati {0}"}
-                other{"Wati {0}"}
+                dnam{"wati"}
+                one{"wati {0}"}
+                other{"wati {0}"}
             }
         }
         pressure{
             hectopascal{
-                dnam{"Hektopaskali"}
-                one{"Hektopaskali {0}"}
-                other{"Hektopaskali {0}"}
+                dnam{"hektopaskali"}
+                one{"hektopaskali {0}"}
+                other{"hektopaskali {0}"}
             }
             inch-hg{
-                dnam{"Inchi za zebaki"}
-                one{"Inchi za zebaki {0}"}
-                other{"Inchi za zebaki {0}"}
+                dnam{"inchi za zebaki"}
+                one{"inchi {0} ya zebaki"}
+                other{"inchi {0} za zebaki"}
             }
             millibar{
-                dnam{"Kipimo cha milibari"}
-                one{"Kipimo cha milibari {0}"}
-                other{"Kipimo cha milibari {0}"}
+                dnam{"kipimo cha milibari"}
+                one{"kipimo cha milibari {0}"}
+                other{"kipimo cha milibari {0}"}
             }
             millimeter-of-mercury{
                 dnam{"milimita za zebaki"}
@@ -492,40 +563,43 @@ sw{
                 other{"pauni {0} kwa kila inchi mraba"}
             }
         }
-        proportion{
-            karat{
-                dnam{"karati"}
-                one{"karati {0}"}
-                other{"karati {0}"}
-            }
-        }
         speed{
             kilometer-per-hour{
                 dnam{"kilomita kwa saa"}
-                one{"Kilomita {0} kwa saa"}
-                other{"Kilomita {0} kwa saa"}
+                one{"kilomita {0} kwa saa"}
+                other{"kilomita {0} kwa saa"}
+            }
+            knot{
+                dnam{"noti"}
+                one{"noti {0}"}
+                other{"noti {0}"}
             }
             meter-per-second{
                 dnam{"mita kwa kila sekunde"}
-                one{"Mita {0} kwa sekunde"}
-                other{"Mita {0} kwa sekunde"}
+                one{"mita {0} kwa sekunde"}
+                other{"mita {0} kwa sekunde"}
             }
             mile-per-hour{
                 dnam{"maili kwa kila saa"}
-                one{"Maili {0} kwa saa"}
-                other{"Maili {0} kwa saa"}
+                one{"maili {0} kwa saa"}
+                other{"maili {0} kwa saa"}
             }
         }
         temperature{
             celsius{
-                dnam{"Nyuzi za Selisiasi"}
-                one{"Nyuzi za Selisiasi {0}"}
-                other{"Nyuzi za Selisiasi {0}"}
+                dnam{"nyuzi"}
+                one{"nyuzi {0}"}
+                other{"nyuzi {0}"}
             }
             fahrenheit{
-                dnam{"Nyuzi za Farenheiti"}
-                one{"Nyuzi za Farenheiti {0}"}
-                other{"Nyuzi za Farenheiti {0}"}
+                dnam{"nyuzi za farenheiti"}
+                one{"nyuzi za farenheiti {0}"}
+                other{"nyuzi za farenheiti {0}"}
+            }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
             }
             kelvin{
                 dnam{"kelvini"}
@@ -548,6 +622,7 @@ sw{
                 dnam{"sentimita za ujazo"}
                 one{"sentimita {0} ya ujazo"}
                 other{"sentimita {0} za ujazo"}
+                per{"{0} kwa kila sentimita ya ujazo"}
             }
             cubic-foot{
                 dnam{"futi za ujazo"}
@@ -561,18 +636,19 @@ sw{
             }
             cubic-kilometer{
                 dnam{"kilomita za ujazo"}
-                one{"Kilomita {0} ya ujazo"}
-                other{"Kilomita {0} ya ujazo"}
+                one{"kilomita {0} ya ujazo"}
+                other{"kilomita {0} za ujazo"}
             }
             cubic-meter{
                 dnam{"mita za ujazo"}
                 one{"mita {0} ya ujazo"}
                 other{"mita {0} za ujazo"}
+                per{"{0} kwa kila mita ya ujazo"}
             }
             cubic-mile{
                 dnam{"maili za ujazo"}
-                one{"Maili {0} ya ujazo"}
-                other{"Maili {0} ya ujazo"}
+                one{"maili {0} ya ujazo"}
+                other{"maili {0} za ujazo"}
             }
             cubic-yard{
                 dnam{"yadi za ujazo"}
@@ -584,6 +660,11 @@ sw{
                 one{"kikombe {0}"}
                 other{"vikombe {0}"}
             }
+            cup-metric{
+                dnam{"vikombe vya mizani"}
+                one{"kikombe {0} cha mizani"}
+                other{"vikombe {0} vya mizani"}
+            }
             deciliter{
                 dnam{"desilita"}
                 one{"desilita {0}"}
@@ -598,6 +679,13 @@ sw{
                 dnam{"galoni"}
                 one{"galoni {0}"}
                 other{"galoni {0}"}
+                per{"{0} kwa kila galoni"}
+            }
+            gallon-imperial{
+                dnam{"Imp. gal"}
+                one{"{0} gal Imp."}
+                other{"{0} gal Imp."}
+                per{"{0}/gal Imp."}
             }
             hectoliter{
                 dnam{"hektolita"}
@@ -605,9 +693,10 @@ sw{
                 other{"hektolita {0}"}
             }
             liter{
-                dnam{"Lita"}
-                one{"Lita {0}"}
-                other{"Lita {0}"}
+                dnam{"lita"}
+                one{"lita {0}"}
+                other{"lita {0}"}
+                per{"{0} kwa kila lita"}
             }
             megaliter{
                 dnam{"megalita"}
@@ -624,6 +713,11 @@ sw{
                 one{"painti {0}"}
                 other{"painti {0}"}
             }
+            pint-metric{
+                dnam{"painti za mizani"}
+                one{"painti {0} ya mizani"}
+                other{"painti {0} za mizani"}
+            }
             quart{
                 dnam{"kwati"}
                 one{"kwati {0}"}
@@ -691,6 +785,19 @@ sw{
         compound{
             per{"{0}/{1}"}
         }
+        consumption{
+            liter-per-100kilometers{
+                dnam{"lita kwa kilomita 100"}
+                one{"{0}L/100km"}
+                other{"{0}L/100km"}
+            }
+        }
+        coordinate{
+            east{"{0} Mashariki"}
+            north{"{0} Kaskazini"}
+            south{"{0} Kusini"}
+            west{"{0} Magharibi"}
+        }
         duration{
             day{
                 dnam{"siku"}
@@ -719,8 +826,8 @@ sw{
             }
             second{
                 dnam{"sekunde"}
-                one{"s {0}"}
-                other{"s {0}"}
+                one{"sekunde {0}"}
+                other{"sekunde {0}"}
             }
             week{
                 dnam{"wiki"}
@@ -733,22 +840,28 @@ sw{
                 other{"miaka {0}"}
             }
         }
+        electric{
+            volt{
+                dnam{"volti"}
+            }
+        }
         length{
             centimeter{
-                dnam{"Sentimita"}
-                one{"cm {0}"}
-                other{"cm {0}"}
+                dnam{"sentimita"}
+                one{"{0} cm"}
+                other{"{0} cm"}
             }
             foot{
                 one{"Futi {0}"}
                 other{"Futi {0}"}
             }
             inch{
+                dnam{"Inchi"}
                 one{"Inchi {0}"}
                 other{"Inchi {0}"}
             }
             kilometer{
-                dnam{"Kilomita"}
+                dnam{"km"}
                 one{"km {0}"}
                 other{"km {0}"}
             }
@@ -757,18 +870,18 @@ sw{
                 other{"ly {0}"}
             }
             meter{
-                dnam{"Mita"}
-                one{"Mita {0}"}
-                other{"Mita {0}"}
+                dnam{"mita"}
+                one{"mita {0}"}
+                other{"mita {0}"}
             }
             mile{
                 one{"Maili {0}"}
                 other{"Maili {0}"}
             }
             millimeter{
-                dnam{"Millimita"}
-                one{"mm {0}"}
-                other{"mm {0}"}
+                dnam{"milimita"}
+                one{"{0} mm"}
+                other{"{0} mm"}
             }
             picometer{
                 one{"pm {0}"}
@@ -781,12 +894,12 @@ sw{
         }
         mass{
             gram{
-                dnam{"Gramu"}
-                one{"g {0}"}
-                other{"g {0}"}
+                dnam{"gramu"}
+                one{"gramu {0}"}
+                other{"gramu {0}"}
             }
             kilogram{
-                dnam{"Kilogramu"}
+                dnam{"kilogramu"}
                 one{"kg {0}"}
                 other{"kg {0}"}
             }
@@ -809,6 +922,7 @@ sw{
                 other{"kW {0}"}
             }
             watt{
+                dnam{"wati"}
                 one{"Wati {0}"}
                 other{"Wati {0}"}
             }
@@ -844,9 +958,9 @@ sw{
         }
         temperature{
             celsius{
-                dnam{"Nyuzi za Selisiasi"}
-                one{"{0}°"}
-                other{"{0}°"}
+                dnam{"°C"}
+                one{"{0}°C"}
+                other{"{0}°C"}
             }
             fahrenheit{
                 one{"{0}°F"}
@@ -863,16 +977,16 @@ sw{
                 other{"mi³ {0}"}
             }
             liter{
-                dnam{"Lita"}
-                one{"Lita {0}"}
-                other{"Lita {0}"}
+                dnam{"lita"}
+                one{"lita {0}"}
+                other{"lita {0}"}
             }
         }
     }
     unitsShort{
         acceleration{
             g-force{
-                dnam{"Mvuto wa graviti"}
+                dnam{"mvuto wa graviti"}
                 one{"G {0}"}
                 other{"G {0}"}
             }
@@ -896,76 +1010,124 @@ sw{
             degree{
                 dnam{"digrii"}
                 one{"digrii {0}"}
-                other{"Digrii {0}°"}
+                other{"digrii {0}"}
             }
             radian{
                 dnam{"radiani"}
                 one{"radiani {0}"}
                 other{"radiani {0}"}
             }
+            revolution{
+                dnam{"mzunguko"}
+                one{"mzunguko {0}"}
+                other{"mizunguko {0}"}
+            }
         }
         area{
             acre{
-                dnam{"Ekari"}
-                one{"Ekari {0}"}
-                other{"Ekari {0}"}
+                dnam{"ekari"}
+                one{"ekari {0}"}
+                other{"ekari {0}"}
             }
             hectare{
-                dnam{"Hektari"}
-                one{"Hektari {0}"}
-                other{"Hektari {0}"}
+                dnam{"hekta"}
+                one{"hekta {0}"}
+                other{"hekta {0}"}
             }
             square-centimeter{
                 dnam{"sentimita mraba"}
-                one{"sentimita mraba {0}"}
-                other{"sentimita mraba {0}"}
+                one{"cm² {0}"}
+                other{"cm² {0}"}
+                per{"{0}/cm²"}
             }
             square-foot{
-                dnam{"ft²"}
+                dnam{"futi za mraba"}
                 one{"ft² {0}"}
                 other{"ft² {0}"}
             }
             square-inch{
                 dnam{"inchi za mraba"}
-                one{"inchi {0} ya mraba"}
-                other{"inchi {0} za mraba"}
+                one{"in² {0}"}
+                other{"in² {0}"}
+                per{"{0}/in²"}
             }
             square-kilometer{
-                dnam{"km²"}
+                dnam{"kilomita za mraba"}
                 one{"km² {0}"}
                 other{"km² {0}"}
+                per{"{0}/km²"}
             }
             square-meter{
-                dnam{"m²"}
-                one{"m² {0}"}
+                dnam{"mita za mraba"}
+                one{"mita {0} ya mraba"}
                 other{"m² {0}"}
+                per{"{0}/m²"}
             }
             square-mile{
-                dnam{"mi²"}
-                one{"mi² {0}"}
-                other{"mi² {0}"}
+                dnam{"maili za mraba"}
+                one{"maili {0} ya mraba"}
+                other{"maili {0} za mraba"}
+                per{"{0}/mi²"}
             }
             square-yard{
-                dnam{"yd²"}
-                one{"yd² {0}"}
-                other{"yd² {0}"}
+                dnam{"yadi za mraba"}
+                one{"yadi {0} ya mraba"}
+                other{"yadi {0} za mraba"}
             }
         }
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            karat{
+                dnam{"karati"}
+                one{"karati {0}"}
+                other{"karati {0}"}
+            }
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0} mg/dL"}
+                other{"{0} mg/dL"}
+            }
+            millimole-per-liter{
+                dnam{"milimoli kwa kila lita"}
+                one{"mmol {0}/lita"}
+                other{"mmol {0}/L"}
+            }
+            part-per-million{
+                dnam{"ppm"}
+                one{"ppm {0}"}
+                other{"ppm {0}"}
+            }
+        }
         consumption{
+            liter-per-100kilometers{
+                dnam{"lita kwa kilomita 100"}
+                one{"lita {0} kwa kilomita 100"}
+                other{"lita {0}/km100"}
+            }
             liter-per-kilometer{
-                dnam{"L/km"}
+                dnam{"lita kwa kila kilomita"}
                 one{"lita {0} kwa kilomita"}
                 other{"lita {0} kwa kilomita"}
             }
             mile-per-gallon{
                 dnam{"maili kwa kila galoni"}
-                one{"maili {0} kwa kila galoni"}
-                other{"maili {0} kwa kila galoni"}
+                one{"{0} mpg"}
+                other{"{0} mpg"}
+            }
+            mile-per-gallon-imperial{
+                dnam{"mpg Imp."}
+                one{"{0} mpg Imp."}
+                other{"{0} mpg Imp."}
             }
         }
+        coordinate{
+            east{"{0} Mashariki"}
+            north{"{0} Kaskazini"}
+            south{"{0} Kusini"}
+            west{"{0} Magharibi"}
+        }
         digital{
             bit{
                 dnam{"biti"}
@@ -998,7 +1160,7 @@ sw{
                 other{"kilobaiti {0}"}
             }
             megabit{
-                dnam{"megabiti"}
+                dnam{"Mb"}
                 one{"megabiti {0}"}
                 other{"megabiti {0}"}
             }
@@ -1019,16 +1181,22 @@ sw{
             }
         }
         duration{
+            century{
+                dnam{"karne"}
+                one{"karne {0}"}
+                other{"karne {0}"}
+            }
             day{
                 dnam{"siku"}
                 one{"siku {0}"}
                 other{"siku {0}"}
+                per{"{0} kwa siku"}
             }
             hour{
                 dnam{"saa"}
                 one{"saa {0}"}
                 other{"saa {0}"}
-                per{"{0}/h"}
+                per{"{0} kwa saa"}
             }
             microsecond{
                 dnam{"mikrosekunde"}
@@ -1037,18 +1205,20 @@ sw{
             }
             millisecond{
                 dnam{"millisekunde"}
-                one{"ms {0}"}
-                other{"ms {0}"}
+                one{"millisekunde {0}"}
+                other{"millisekunde {0}"}
             }
             minute{
                 dnam{"dakika"}
                 one{"dakika {0}"}
                 other{"dakika {0}"}
+                per{"{0} kwa kila dakika"}
             }
             month{
                 dnam{"miezi"}
                 one{"mwezi {0}"}
                 other{"miezi {0}"}
+                per{"{0} kwa mwezi"}
             }
             nanosecond{
                 dnam{"nanosekunde"}
@@ -1059,17 +1229,19 @@ sw{
                 dnam{"sekunde"}
                 one{"sekunde {0}"}
                 other{"sekunde {0}"}
-                per{"{0}/s"}
+                per{"{0} kwa kila sekunde"}
             }
             week{
                 dnam{"wiki"}
                 one{"wiki {0}"}
                 other{"wiki {0}"}
+                per{"{0} kwa wiki"}
             }
             year{
                 dnam{"miaka"}
                 one{"mwaka {0}"}
                 other{"miaka {0}"}
+                per{"{0} kwa mwaka"}
             }
         }
         electric{
@@ -1122,8 +1294,8 @@ sw{
             }
             kilowatt-hour{
                 dnam{"kilowati kwa saa"}
-                one{"kilowati {0} kwa saa"}
-                other{"kilowati {0} kwa saa"}
+                one{"{0} kWh"}
+                other{"{0} kWh"}
             }
         }
         frequency{
@@ -1155,9 +1327,10 @@ sw{
                 other{"au {0}"}
             }
             centimeter{
-                dnam{"Sentimita"}
-                one{"Sentimita {0}"}
-                other{"Sentimita {0}"}
+                dnam{"sentimita"}
+                one{"sentimita {0}"}
+                other{"sentimita {0}"}
+                per{"{0} kwa kila sentimita"}
             }
             decimeter{
                 dnam{"desimita"}
@@ -1165,29 +1338,33 @@ sw{
                 other{"desimita {0}"}
             }
             foot{
-                dnam{"Futi"}
-                one{"Futi {0}"}
-                other{"Futi {0}"}
+                dnam{"futi"}
+                one{"futi {0}"}
+                other{"futi {0}"}
+                per{"{0} kwa kila futi"}
             }
             inch{
-                dnam{"Inchi"}
-                one{"Inchi {0}"}
-                other{"Inchi {0}"}
+                dnam{"inchi"}
+                one{"inchi {0}"}
+                other{"inchi {0}"}
+                per{"{0} kwa kila inchi"}
             }
             kilometer{
-                dnam{"Kilomita"}
-                one{"Kilomita {0}"}
-                other{"Kilomita {0}"}
+                dnam{"kilomita"}
+                one{"km {0}"}
+                other{"km {0}"}
+                per{"{0} kwa kila kilomita"}
             }
             light-year{
-                dnam{"Miaka ya mwanga"}
+                dnam{"miaka ya mwanga"}
                 one{"ly {0}"}
                 other{"ly {0}"}
             }
             meter{
-                dnam{"Mita"}
-                one{"Mita {0}"}
-                other{"Mita {0}"}
+                dnam{"mita"}
+                one{"mita {0}"}
+                other{"mita {0}"}
+                per{"{0} kwa kila mita"}
             }
             micrometer{
                 dnam{"mikromita"}
@@ -1195,14 +1372,19 @@ sw{
                 other{"mikromita {0}"}
             }
             mile{
-                dnam{"Maili"}
-                one{"Maili {0}"}
-                other{"Maili {0}"}
+                dnam{"maili"}
+                one{"maili {0}"}
+                other{"maili {0}"}
+            }
+            mile-scandinavian{
+                dnam{"smi"}
+                one{"{0} smi"}
+                other{"{0} smi"}
             }
             millimeter{
-                dnam{"Millimita"}
-                one{"Millimita {0}"}
-                other{"Millimita {0}"}
+                dnam{"milimita"}
+                one{"milimita {0}"}
+                other{"milimita {0}"}
             }
             nanometer{
                 dnam{"nanomita"}
@@ -1215,26 +1397,31 @@ sw{
                 other{"maili {0} za kibaharia"}
             }
             parsec{
-                dnam{"parsecs"}
-                one{"pc {0}"}
-                other{"pc {0}"}
+                dnam{"kila sekunde"}
+                one{"{0} pc"}
+                other{"{0} pc"}
             }
             picometer{
-                dnam{"Pikomita"}
-                one{"Pikomita {0}"}
-                other{"Pikomita {0}"}
+                dnam{"pikomita"}
+                one{"pikomita {0}"}
+                other{"pikomita {0}"}
+            }
+            point{
+                dnam{"pointi"}
+                one{"pointi {0}"}
+                other{"pointi {0}"}
             }
             yard{
-                dnam{"Yadi"}
-                one{"Yadi {0}"}
-                other{"Yadi {0}"}
+                dnam{"yadi"}
+                one{"yadi {0}"}
+                other{"yadi {0}"}
             }
         }
         light{
             lux{
                 dnam{"lux"}
-                one{"lux {0}"}
-                other{"lux {0}"}
+                one{"lx {0}"}
+                other{"lx {0}"}
             }
         }
         mass{
@@ -1244,14 +1431,16 @@ sw{
                 other{"karati {0}"}
             }
             gram{
-                dnam{"Gramu"}
-                one{"Gramu {0}"}
-                other{"Gramu {0}"}
+                dnam{"gramu"}
+                one{"gramu {0}"}
+                other{"gramu {0}"}
+                per{"{0} kwa kila gramu"}
             }
             kilogram{
-                dnam{"Kilogramu"}
+                dnam{"kilogramu"}
                 one{"kg {0}"}
                 other{"kg {0}"}
+                per{"{0}/kg"}
             }
             metric-ton{
                 dnam{"tani mita"}
@@ -1269,9 +1458,10 @@ sw{
                 other{"mg {0}"}
             }
             ounce{
-                dnam{"Aunsi"}
-                one{"Aunsi {0}"}
-                other{"Aunsi {0}"}
+                dnam{"aunsi"}
+                one{"aunsi {0}"}
+                other{"aunsi {0}"}
+                per{"{0}/oz"}
             }
             ounce-troy{
                 dnam{"tola aunsi"}
@@ -1279,9 +1469,10 @@ sw{
                 other{"tola aunsi {0}"}
             }
             pound{
-                dnam{"Ratili"}
-                one{"Ratili {0}"}
-                other{"Ratili {0}"}
+                dnam{"ratili"}
+                one{"ratili {0}"}
+                other{"ratili {0}"}
+                per{"{0}/lb"}
             }
             ton{
                 dnam{"tani"}
@@ -1296,14 +1487,14 @@ sw{
                 other{"gigawati {0}"}
             }
             horsepower{
-                dnam{"Kipimo cha Hospawa"}
-                one{"hp {0}"}
-                other{"hp {0}"}
+                dnam{"kipimo cha hospawa"}
+                one{"{0} hp"}
+                other{"{0} hp"}
             }
             kilowatt{
-                dnam{"Kilowati"}
-                one{"Kilowati {0}"}
-                other{"Kilowati {0}"}
+                dnam{"kilowati"}
+                one{"kilowati {0}"}
+                other{"kilowati {0}"}
             }
             megawatt{
                 dnam{"megawati"}
@@ -1316,31 +1507,31 @@ sw{
                 other{"miliwati {0}"}
             }
             watt{
-                dnam{"Wati"}
-                one{"Wati {0}"}
-                other{"Wati {0}"}
+                dnam{"wati"}
+                one{"wati {0}"}
+                other{"wati {0}"}
             }
         }
         pressure{
             hectopascal{
-                dnam{"Hektopaskali"}
+                dnam{"hektopaskali"}
                 one{"hPa {0}"}
                 other{"hPa {0}"}
             }
             inch-hg{
-                dnam{"Inchi za zebaki"}
+                dnam{"inchi za zebaki"}
                 one{"{0} inHg"}
                 other{"{0} inHg"}
             }
             millibar{
-                dnam{"Kipimo cha milibari"}
+                dnam{"kipimo cha milibari"}
                 one{"mbar {0}"}
                 other{"mbar {0}"}
             }
             millimeter-of-mercury{
                 dnam{"milimita za zebaki"}
                 one{"milimita {0} ya zebaki"}
-                other{"milimita {0} za zebaki"}
+                other{"{0} mm Hg"}
             }
             pound-per-square-inch{
                 dnam{"pauni kwa kila inchi mraba"}
@@ -1348,41 +1539,44 @@ sw{
                 other{"psi {0}"}
             }
         }
-        proportion{
-            karat{
-                dnam{"karati"}
-                one{"karati {0}"}
-                other{"karati {0}"}
-            }
-        }
         speed{
             kilometer-per-hour{
                 dnam{"kilomita kwa saa"}
                 one{"km {0}/saa"}
                 other{"km {0}/saa"}
             }
+            knot{
+                dnam{"noti"}
+                one{"noti {0}"}
+                other{"noti {0}"}
+            }
             meter-per-second{
                 dnam{"mita kwa kila sekunde"}
-                one{"m {0}/s"}
-                other{"m {0}/s"}
+                one{"{0} m/s"}
+                other{"{0} m/s"}
             }
             mile-per-hour{
                 dnam{"maili kwa kila saa"}
-                one{"mi {0}/saa"}
-                other{"mi {0}/saa"}
+                one{"{0} mph"}
+                other{"{0} mph"}
             }
         }
         temperature{
             celsius{
-                dnam{"Nyuzi za Selisiasi"}
+                dnam{"nyuzi"}
                 one{"{0}°C"}
                 other{"{0}°C"}
             }
             fahrenheit{
-                dnam{"Nyuzi za Farenheiti"}
+                dnam{"nyuzi za farenheiti"}
                 one{"{0}°F"}
                 other{"{0}°F"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
             kelvin{
                 dnam{"K"}
                 one{"{0} K"}
@@ -1404,16 +1598,17 @@ sw{
                 dnam{"sentimita za ujazo"}
                 one{"cm³ {0}"}
                 other{"cm³ {0}"}
+                per{"{0}/cm³"}
             }
             cubic-foot{
                 dnam{"futi za ujazo"}
-                one{"futi {0} ya ujazo"}
-                other{"futi {0} za ujazo"}
+                one{"ft³ {0}"}
+                other{"ft³ {0}"}
             }
             cubic-inch{
                 dnam{"inchi za ujazo"}
-                one{"inchi {0} ya ujazo"}
-                other{"inchi {0} za ujazo"}
+                one{"in³ {0}"}
+                other{"in³ {0}"}
             }
             cubic-kilometer{
                 dnam{"kilomita za ujazo"}
@@ -1422,8 +1617,9 @@ sw{
             }
             cubic-meter{
                 dnam{"mita za ujazo"}
-                one{"mita {0} ya ujazo"}
+                one{"m³ {0}"}
                 other{"mita {0} za ujazo"}
+                per{"{0}/m³"}
             }
             cubic-mile{
                 dnam{"maili za ujazo"}
@@ -1432,14 +1628,19 @@ sw{
             }
             cubic-yard{
                 dnam{"yadi za ujazo"}
-                one{"yadi {0} ya ujazo"}
-                other{"yadi {0} za ujazo"}
+                one{"yd³ {0}"}
+                other{"yd³ {0}"}
             }
             cup{
                 dnam{"vikombe"}
                 one{"kikombe {0}"}
                 other{"vikombe {0}"}
             }
+            cup-metric{
+                dnam{"vikombe vya mizani"}
+                one{"mc {0}"}
+                other{"vikombe {0} vya mizani"}
+            }
             deciliter{
                 dnam{"desilita"}
                 one{"desilita {0}"}
@@ -1447,13 +1648,20 @@ sw{
             }
             fluid-ounce{
                 dnam{"aunsi za ujazo"}
-                one{"aunsi {0} ya ujazo"}
-                other{"aunsi {0} za ujazo"}
+                one{"fl oz {0}"}
+                other{"fl oz {0}"}
             }
             gallon{
                 dnam{"galoni"}
                 one{"galoni {0}"}
                 other{"galoni {0}"}
+                per{"{0}/gal"}
+            }
+            gallon-imperial{
+                dnam{"Imp. gal"}
+                one{"{0} gal Imp."}
+                other{"{0} gal Imp."}
+                per{"{0}/gal Imp."}
             }
             hectoliter{
                 dnam{"hektolita"}
@@ -1461,9 +1669,10 @@ sw{
                 other{"hektolita {0}"}
             }
             liter{
-                dnam{"Lita"}
-                one{"Lita {0}"}
-                other{"Lita {0}"}
+                dnam{"lita"}
+                one{"lita {0}"}
+                other{"lita {0}"}
+                per{"{0} kwa kila lita"}
             }
             megaliter{
                 dnam{"megalita"}
@@ -1480,6 +1689,11 @@ sw{
                 one{"painti {0}"}
                 other{"painti {0}"}
             }
+            pint-metric{
+                dnam{"painti za mizani"}
+                one{"mpt {0}"}
+                other{"mpt {0}"}
+            }
             quart{
                 dnam{"kwati"}
                 one{"kwati {0}"}