X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/a0b4f637ba1a6c3c5651b61a69303b029bacf7d3..2ca993e82fb37b597a3c73ecd1586a139a6579c5:/icuSources/data/unit/zu.txt

diff --git a/icuSources/data/unit/zu.txt b/icuSources/data/unit/zu.txt
index c042cdce..a878e7f1 100755
--- a/icuSources/data/unit/zu.txt
+++ b/icuSources/data/unit/zu.txt
@@ -1,13 +1,13 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2015 International Business Machines
+// * Copyright (C) 2016 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/common/main/zu.xml
 // *
 // ***************************************************************************
 zu{
-    Version{"2.1.10.93"}
+    Version{"2.1.22.93"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -47,6 +47,11 @@ zu{
                 one{"{0} i-radian"}
                 other{"{0} radians"}
             }
+            revolution{
+                dnam{"rev"}
+                one{"{0} revolution"}
+                other{"{0} revolutions"}
+            }
         }
         area{
             acre{
@@ -63,6 +68,7 @@ zu{
                 dnam{"cm²"}
                 one{"{0} cm²"}
                 other{"{0} cm²"}
+                per{"{0}/cm²"}
             }
             square-foot{
                 dnam{"ft²"}
@@ -73,6 +79,7 @@ zu{
                 dnam{"in²"}
                 one{"{0} in²"}
                 other{"{0} in²"}
+                per{"{0}/in²"}
             }
             square-kilometer{
                 dnam{"km²"}
@@ -83,6 +90,7 @@ zu{
                 dnam{"m²"}
                 one{"{0} m²"}
                 other{"{0} m²"}
+                per{"{0} per m²"}
             }
             square-mile{
                 dnam{"mi²"}
@@ -98,7 +106,19 @@ zu{
         compound{
             per{"{0} nge-{1}"}
         }
+        concentr{
+            karat{
+                dnam{"karats"}
+                one{"{0} i-karat"}
+                other{"{0} ama-karats"}
+            }
+        }
         consumption{
+            liter-per-100kilometers{
+                dnam{"L/100km"}
+                one{"{0} L/100km"}
+                other{"{0} L/100km"}
+            }
             liter-per-kilometer{
                 dnam{"L/km"}
                 one{"{0} L/km"}
@@ -110,9 +130,15 @@ zu{
                 other{"{0} mpg"}
             }
         }
+        coordinate{
+            east{"{0}E"}
+            north{"{0}N"}
+            south{"{0}S"}
+            west{"{0}W"}
+        }
         digital{
             bit{
-                dnam{"bit"}
+                dnam{"bits"}
                 one{"{0} i-bit"}
                 other{"{0} ama-bits"}
             }
@@ -163,10 +189,16 @@ zu{
             }
         }
         duration{
+            century{
+                dnam{"c"}
+                one{"{0} c"}
+                other{"{0} c"}
+            }
             day{
                 dnam{"izinsuku"}
                 one{"{0} usuku"}
                 other{"{0} izinsuku"}
+                per{"{0}/d"}
             }
             hour{
                 dnam{"amahora"}
@@ -188,11 +220,13 @@ zu{
                 dnam{"amaminithi"}
                 one{"{0} iminithi"}
                 other{"{0} amaminithi"}
+                per{"{0}/min"}
             }
             month{
                 dnam{"izinyanga"}
                 one{"{0} inyanga"}
                 other{"{0} izinyanga"}
+                per{"{0}/m"}
             }
             nanosecond{
                 dnam{"ns"}
@@ -209,11 +243,13 @@ zu{
                 dnam{"amaviki"}
                 one{"{0} iviki"}
                 other{"{0} amaviki"}
+                per{"{0}/w"}
             }
             year{
                 dnam{"y"}
                 one{"{0} y"}
                 other{"{0} y"}
+                per{"{0}/y"}
             }
         }
         electric{
@@ -302,6 +338,7 @@ zu{
                 dnam{"cm"}
                 one{"{0} cm"}
                 other{"{0} cm"}
+                per{"{0}/cm"}
             }
             decimeter{
                 dnam{"dm"}
@@ -312,16 +349,19 @@ zu{
                 dnam{"ft"}
                 one{"{0} ft"}
                 other{"{0} ft"}
+                per{"{0}/ft"}
             }
             inch{
                 dnam{"in"}
                 one{"{0} in"}
                 other{"{0} in"}
+                per{"{0}/in"}
             }
             kilometer{
                 dnam{"km"}
                 one{"{0} km"}
                 other{"{0} km"}
+                per{"{0}/km"}
             }
             light-year{
                 dnam{"ly"}
@@ -332,6 +372,7 @@ zu{
                 dnam{"m"}
                 one{"{0} m"}
                 other{"{0} m"}
+                per{"{0}/m"}
             }
             micrometer{
                 dnam{"µm"}
@@ -343,6 +384,11 @@ zu{
                 one{"{0} mi"}
                 other{"{0} mi"}
             }
+            mile-scandinavian{
+                dnam{"smi"}
+                one{"{0} smi"}
+                other{"{0} smi"}
+            }
             millimeter{
                 dnam{"mm"}
                 one{"{0} mm"}
@@ -391,11 +437,13 @@ zu{
                 dnam{"g"}
                 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"}
@@ -416,6 +464,7 @@ zu{
                 dnam{"oz"}
                 one{"{0} oz"}
                 other{"{0} oz"}
+                per{"{0}/oz"}
             }
             ounce-troy{
                 dnam{"oz t"}
@@ -426,6 +475,7 @@ zu{
                 dnam{"lb"}
                 one{"{0} lb"}
                 other{"{0} lb"}
+                per{"{0}/lb"}
             }
             ton{
                 dnam{"tn"}
@@ -492,19 +542,17 @@ zu{
                 other{"{0} psi"}
             }
         }
-        proportion{
-            karat{
-                dnam{"karats"}
-                one{"{0} i-karat"}
-                other{"{0} ama-karats"}
-            }
-        }
         speed{
             kilometer-per-hour{
                 dnam{"km/h"}
                 one{"{0} km/h"}
                 other{"{0} km/h"}
             }
+            knot{
+                dnam{"knot"}
+                one{"{0} knots"}
+                other{"{0} knots"}
+            }
             meter-per-second{
                 dnam{"m/s"}
                 one{"{0} m/s"}
@@ -527,6 +575,11 @@ zu{
                 one{"{0}°F"}
                 other{"{0}°F"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
             kelvin{
                 dnam{"K"}
                 one{"{0} K"}
@@ -548,6 +601,7 @@ zu{
                 dnam{"cm³"}
                 one{"{0} cm³"}
                 other{"{0} cm³"}
+                per{"{0}/cm³"}
             }
             cubic-foot{
                 dnam{"ft³"}
@@ -568,6 +622,7 @@ zu{
                 dnam{"m³"}
                 one{"{0} m³"}
                 other{"{0} m³"}
+                per{"{0}/m³"}
             }
             cubic-mile{
                 dnam{"mi³"}
@@ -584,6 +639,11 @@ zu{
                 one{"{0} c"}
                 other{"{0} c"}
             }
+            cup-metric{
+                dnam{"mcup"}
+                one{"{0} mc"}
+                other{"{0} mc"}
+            }
             deciliter{
                 dnam{"dL"}
                 one{"{0} dL"}
@@ -598,6 +658,7 @@ zu{
                 dnam{"gal"}
                 one{"{0} gal"}
                 other{"{0} gal"}
+                per{"{0}/gal"}
             }
             hectoliter{
                 dnam{"hL"}
@@ -608,6 +669,7 @@ zu{
                 dnam{"l"}
                 one{"{0} l"}
                 other{"{0} l"}
+                per{"{0}/l"}
             }
             megaliter{
                 dnam{"ML"}
@@ -624,6 +686,11 @@ zu{
                 one{"{0} pt"}
                 other{"{0} pt"}
             }
+            pint-metric{
+                dnam{"mpt"}
+                one{"{0} mpt"}
+                other{"{0} mpt"}
+            }
             quart{
                 dnam{"qt"}
                 one{"{0} qt"}
@@ -665,6 +732,19 @@ zu{
         compound{
             per{"{0}/{1}"}
         }
+        consumption{
+            liter-per-100kilometers{
+                dnam{"L/100km"}
+                one{"{0}L/100km"}
+                other{"{0}L/100km"}
+            }
+        }
+        coordinate{
+            east{"{0}E"}
+            north{"{0}N"}
+            south{"{0}S"}
+            west{"{0}W"}
+        }
         duration{
             day{
                 dnam{"izinsuku"}
@@ -801,6 +881,11 @@ zu{
                 one{"{0} rad"}
                 other{"{0} rad"}
             }
+            revolution{
+                dnam{"rev"}
+                one{"{0} rev"}
+                other{"{0} rev"}
+            }
         }
         area{
             acre{
@@ -817,6 +902,7 @@ zu{
                 dnam{"cm²"}
                 one{"{0} cm²"}
                 other{"{0} cm²"}
+                per{"{0}/cm²"}
             }
             square-foot{
                 dnam{"ft²"}
@@ -827,6 +913,7 @@ zu{
                 dnam{"in²"}
                 one{"{0} in²"}
                 other{"{0} in²"}
+                per{"{0}/in²"}
             }
             square-kilometer{
                 dnam{"km²"}
@@ -837,6 +924,7 @@ zu{
                 dnam{"m²"}
                 one{"{0} m²"}
                 other{"{0} m²"}
+                per{"{0}/m²"}
             }
             square-mile{
                 dnam{"mi²"}
@@ -852,7 +940,19 @@ zu{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            karat{
+                dnam{"karats"}
+                one{"{0} kt"}
+                other{"{0} kt"}
+            }
+        }
         consumption{
+            liter-per-100kilometers{
+                dnam{"L/100km"}
+                one{"{0} L/100km"}
+                other{"{0} L/100km"}
+            }
             liter-per-kilometer{
                 dnam{"L/km"}
                 one{"{0} L/km"}
@@ -864,6 +964,12 @@ zu{
                 other{"{0} mpg"}
             }
         }
+        coordinate{
+            east{"{0}E"}
+            north{"{0}N"}
+            south{"{0}S"}
+            west{"{0}W"}
+        }
         digital{
             bit{
                 dnam{"bit"}
@@ -917,10 +1023,16 @@ zu{
             }
         }
         duration{
+            century{
+                dnam{"c"}
+                one{"{0} c"}
+                other{"{0} c"}
+            }
             day{
                 dnam{"izinsuku"}
                 one{"{0} usuku"}
                 other{"{0} izinsuku"}
+                per{"{0}/d"}
             }
             hour{
                 dnam{"amahora"}
@@ -941,12 +1053,14 @@ zu{
             minute{
                 dnam{"amaminithi"}
                 one{"{0} iminithi"}
-                other{"{0} amaminithi"}
+                other{"{0} iminithi"}
+                per{"{0}/min"}
             }
             month{
                 dnam{"izinyanga"}
                 one{"{0} nyanga"}
                 other{"{0} izinyanga"}
+                per{"{0}/m"}
             }
             nanosecond{
                 dnam{"ns"}
@@ -963,11 +1077,13 @@ zu{
                 dnam{"amaviki"}
                 one{"{0} viki"}
                 other{"{0} amaviki"}
+                per{"{0}/w"}
             }
             year{
                 dnam{"y"}
                 one{"{0} y"}
                 other{"{0} yrs"}
+                per{"{0}/y"}
             }
         }
         electric{
@@ -1056,6 +1172,7 @@ zu{
                 dnam{"cm"}
                 one{"{0} cm"}
                 other{"{0} cm"}
+                per{"{0}/cm"}
             }
             decimeter{
                 dnam{"dm"}
@@ -1066,16 +1183,19 @@ zu{
                 dnam{"ft"}
                 one{"{0} ft"}
                 other{"{0} ft"}
+                per{"{0}/ft"}
             }
             inch{
                 dnam{"in"}
                 one{"{0} in"}
                 other{"{0} in"}
+                per{"{0}/in"}
             }
             kilometer{
                 dnam{"km"}
                 one{"{0} km"}
                 other{"{0} km"}
+                per{"{0}/km"}
             }
             light-year{
                 dnam{"ly"}
@@ -1086,6 +1206,7 @@ zu{
                 dnam{"m"}
                 one{"{0} m"}
                 other{"{0} m"}
+                per{"{0}/m"}
             }
             micrometer{
                 dnam{"µm"}
@@ -1097,6 +1218,11 @@ zu{
                 one{"{0} mi"}
                 other{"{0} mi"}
             }
+            mile-scandinavian{
+                dnam{"smi"}
+                one{"{0} smi"}
+                other{"{0} smi"}
+            }
             millimeter{
                 dnam{"mm"}
                 one{"{0} mm"}
@@ -1145,11 +1271,13 @@ zu{
                 dnam{"g"}
                 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"}
@@ -1170,6 +1298,7 @@ zu{
                 dnam{"oz"}
                 one{"{0} oz"}
                 other{"{0} oz"}
+                per{"{0}/oz"}
             }
             ounce-troy{
                 dnam{"oz t"}
@@ -1180,6 +1309,7 @@ zu{
                 dnam{"lb"}
                 one{"{0} lb"}
                 other{"{0} lb"}
+                per{"{0}/lb"}
             }
             ton{
                 dnam{"tn"}
@@ -1246,19 +1376,17 @@ zu{
                 other{"{0} psi"}
             }
         }
-        proportion{
-            karat{
-                dnam{"karats"}
-                one{"{0} kt"}
-                other{"{0} kt"}
-            }
-        }
         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"}
@@ -1281,6 +1409,11 @@ zu{
                 one{"{0}°F"}
                 other{"{0}°F"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
             kelvin{
                 dnam{"K"}
                 one{"{0} K"}
@@ -1302,6 +1435,7 @@ zu{
                 dnam{"cm³"}
                 one{"{0} cm³"}
                 other{"{0} cm³"}
+                per{"{0}/cm³"}
             }
             cubic-foot{
                 dnam{"ft³"}
@@ -1322,6 +1456,7 @@ zu{
                 dnam{"m³"}
                 one{"{0} m³"}
                 other{"{0} m³"}
+                per{"{0}/m³"}
             }
             cubic-mile{
                 dnam{"mi³"}
@@ -1338,6 +1473,11 @@ zu{
                 one{"{0} c"}
                 other{"{0} c"}
             }
+            cup-metric{
+                dnam{"mcup"}
+                one{"{0} mc"}
+                other{"{0} mc"}
+            }
             deciliter{
                 dnam{"dL"}
                 one{"{0} dL"}
@@ -1352,6 +1492,7 @@ zu{
                 dnam{"gal"}
                 one{"{0} gal"}
                 other{"{0} gal"}
+                per{"{0}/gal"}
             }
             hectoliter{
                 dnam{"hL"}
@@ -1362,6 +1503,7 @@ zu{
                 dnam{"l"}
                 one{"{0} l"}
                 other{"{0} l"}
+                per{"{0}/l"}
             }
             megaliter{
                 dnam{"ML"}
@@ -1378,6 +1520,11 @@ zu{
                 one{"{0} pt"}
                 other{"{0} pt"}
             }
+            pint-metric{
+                dnam{"mpt"}
+                one{"{0} mpt"}
+                other{"{0} mpt"}
+            }
             quart{
                 dnam{"qt"}
                 one{"{0} qt"}