Index: source/data/unit/uz.txt |
diff --git a/source/data/unit/uz.txt b/source/data/unit/uz.txt |
old mode 100755 |
new mode 100644 |
index c037da68cbc2fedc96c939a239f6bd23402e9a96..3ee8e26b84a53e47a6ec4178e08f7c41444a15db |
--- a/source/data/unit/uz.txt |
+++ b/source/data/unit/uz.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/uz.xml |
-// * |
-// *************************************************************************** |
+// © 2016 and later: Unicode, Inc. and others. |
+// License & terms of use: http://www.unicode.org/copyright.html#License |
uz{ |
- Version{"2.1.20.4"} |
+ Version{"2.1.29.44"} |
durationUnits{ |
hm{"h:mm"} |
hms{"h:mm:ss"} |
@@ -21,7 +15,7 @@ uz{ |
other{"{0} grav. kuchi"} |
} |
meter-per-second-squared{ |
- dnam{"metr taqsim soniyaning kvadrati"} |
+ dnam{"metr/soniya kvadrat"} |
one{"{0} metr/soniya kvadrat"} |
other{"{0} metr/soniya kvadrat"} |
} |
@@ -85,6 +79,7 @@ uz{ |
dnam{"kvadrat kilometr"} |
one{"{0} kvadrat kilometr"} |
other{"{0} kvadrat kilometr"} |
+ per{"{0} kvadrat kilometr"} |
} |
square-meter{ |
dnam{"kvadrat metr"} |
@@ -96,6 +91,7 @@ uz{ |
dnam{"kvadrat mil"} |
one{"{0} kvadrat mil"} |
other{"{0} kvadrat mil"} |
+ per{"{0}/kvadrat mil"} |
} |
square-yard{ |
dnam{"kvadrat yard"} |
@@ -106,6 +102,28 @@ uz{ |
compound{ |
per{"{0}/{1}"} |
} |
+ concentr{ |
+ karat{ |
+ dnam{"karat"} |
+ one{"{0} karat"} |
+ other{"{0} karat"} |
+ } |
+ milligram-per-deciliter{ |
+ dnam{"milligramm/detsilitr"} |
+ one{"{0} milligramm/detsilitr"} |
+ other{"{0} milligramm/detsilitr"} |
+ } |
+ millimole-per-liter{ |
+ dnam{"millimol/litr"} |
+ one{"{0} millimol/litr"} |
+ other{"{0} millimol/litr"} |
+ } |
+ part-per-million{ |
+ dnam{"millionning ulushi"} |
+ one{"milliondan {0}"} |
+ other{"milliondan {0}"} |
+ } |
+ } |
consumption{ |
liter-per-100kilometers{ |
dnam{"litr/100 km"} |
@@ -122,12 +140,17 @@ uz{ |
one{"{0} mil/gallon"} |
other{"{0} mil/gallon"} |
} |
+ mile-per-gallon-imperial{ |
+ dnam{"mil/imp. gallon"} |
+ one{"{0} mil/imp. gallon"} |
+ other{"{0} mil/imp. gallon"} |
+ } |
} |
coordinate{ |
- east{"{0}E"} |
- north{"{0}N"} |
- south{"{0}S"} |
- west{"{0}W"} |
+ east{"{0} sharqiy uzunlik"} |
+ north{"{0} shimoliy kenglik"} |
+ south{"{0} janubiy kenglik"} |
+ west{"{0} g‘arbiy uzunlik"} |
} |
digital{ |
bit{ |
@@ -345,9 +368,10 @@ uz{ |
per{"{0}/fut"} |
} |
inch{ |
- dnam{"dyum"} |
- one{"{0} dyum"} |
- other{"{0} dyum"} |
+ dnam{"duym"} |
+ one{"{0} duym"} |
+ other{"{0} duym"} |
+ per{"{0}/duym"} |
} |
kilometer{ |
dnam{"kilometr"} |
@@ -377,9 +401,9 @@ uz{ |
other{"{0} mil"} |
} |
mile-scandinavian{ |
- dnam{"Skandinaviya mili"} |
- one{"{0} Skandinaviya mili"} |
- other{"{0} Skandinaviya mili"} |
+ dnam{"skandinav mili"} |
+ one{"{0} skandinav mili"} |
+ other{"{0} skandinav mili"} |
} |
millimeter{ |
dnam{"millimetr"} |
@@ -534,18 +558,11 @@ uz{ |
other{"{0} funt/kvadrat duym"} |
} |
} |
- proportion{ |
- karat{ |
- dnam{"karat"} |
- one{"{0} karat"} |
- other{"{0} karat"} |
- } |
- } |
speed{ |
kilometer-per-hour{ |
dnam{"km/soat"} |
- one{"soatiga {0} kilometr"} |
- other{"soatiga {0} kilometr"} |
+ one{"{0} km/soat"} |
+ other{"{0} km/soat"} |
} |
knot{ |
dnam{"uzel"} |
@@ -659,6 +676,12 @@ uz{ |
other{"{0} gallon"} |
per{"{0}/gallon"} |
} |
+ gallon-imperial{ |
+ dnam{"imp. gallon"} |
+ one{"{0} imp. gallon"} |
+ other{"{0} imp. gallon"} |
+ per{"{0}/imp. gallon"} |
+ } |
hectoliter{ |
dnam{"gektolitr"} |
one{"{0} gektolitr"} |
@@ -765,10 +788,10 @@ uz{ |
} |
} |
coordinate{ |
- east{"{0}E"} |
- north{"{0}N"} |
- south{"{0}S"} |
- west{"{0}W"} |
+ east{"{0} shq. u."} |
+ north{"{0} shm. k."} |
+ south{"{0} jan. k."} |
+ west{"{0} g‘rb. u."} |
} |
duration{ |
day{ |
@@ -778,8 +801,8 @@ uz{ |
} |
hour{ |
dnam{"soat"} |
- one{"{0} st"} |
- other{"{0} st"} |
+ one{"{0} soat"} |
+ other{"{0} soat"} |
} |
millisecond{ |
dnam{"mson"} |
@@ -787,9 +810,9 @@ uz{ |
other{"{0} ms"} |
} |
minute{ |
- dnam{"daq"} |
- one{"{0} d"} |
- other{"{0} d"} |
+ dnam{"daq."} |
+ one{"{0} daq."} |
+ other{"{0} daq."} |
} |
month{ |
dnam{"oy"} |
@@ -797,7 +820,7 @@ uz{ |
other{"{0} oy"} |
} |
second{ |
- dnam{"son"} |
+ dnam{"son."} |
one{"{0} s"} |
other{"{0} s"} |
} |
@@ -943,8 +966,8 @@ uz{ |
} |
liter{ |
dnam{"litr"} |
- one{"{0} l"} |
- other{"{0} l"} |
+ one{"{0}L"} |
+ other{"{0}L"} |
} |
} |
} |
@@ -1020,6 +1043,7 @@ uz{ |
dnam{"km²"} |
one{"{0} km²"} |
other{"{0} km²"} |
+ per{"{0}/km²"} |
} |
square-meter{ |
dnam{"m²"} |
@@ -1031,6 +1055,7 @@ uz{ |
dnam{"kv. mil"} |
one{"{0} kv. mil"} |
other{"{0} kv. mil"} |
+ per{"{0}/mil²"} |
} |
square-yard{ |
dnam{"yard²"} |
@@ -1041,6 +1066,28 @@ uz{ |
compound{ |
per{"{0}/{1}"} |
} |
+ concentr{ |
+ karat{ |
+ dnam{"karat"} |
+ one{"{0} kt"} |
+ other{"{0} kt"} |
+ } |
+ milligram-per-deciliter{ |
+ dnam{"mg/dL"} |
+ one{"{0} mg/dL"} |
+ other{"{0} mg/dL"} |
+ } |
+ millimole-per-liter{ |
+ dnam{"millimol/litr"} |
+ one{"{0} mmol/L"} |
+ other{"{0} mmol/L"} |
+ } |
+ part-per-million{ |
+ dnam{"ppm"} |
+ one{"{0} ppm"} |
+ other{"{0} ppm"} |
+ } |
+ } |
consumption{ |
liter-per-100kilometers{ |
dnam{"L/100 km"} |
@@ -1057,12 +1104,17 @@ uz{ |
one{"{0} mil/gal"} |
other{"{0} mil/gal"} |
} |
+ mile-per-gallon-imperial{ |
+ dnam{"mil/imp. gallon"} |
+ one{"{0} mil/imp. gal"} |
+ other{"{0} mil/imp. gal"} |
+ } |
} |
coordinate{ |
- east{"{0}E"} |
- north{"{0}N"} |
- south{"{0}S"} |
- west{"{0}W"} |
+ east{"{0} shq. u."} |
+ north{"{0} shm. k."} |
+ south{"{0} jan. k."} |
+ west{"{0} g‘rb. u."} |
} |
digital{ |
bit{ |
@@ -1091,9 +1143,9 @@ uz{ |
other{"{0} kbit"} |
} |
kilobyte{ |
- dnam{"kB"} |
- one{"{0} kB"} |
- other{"{0} kB"} |
+ dnam{"KB"} |
+ one{"{0} KB"} |
+ other{"{0} KB"} |
} |
megabit{ |
dnam{"Mbit"} |
@@ -1130,9 +1182,9 @@ uz{ |
} |
hour{ |
dnam{"soat"} |
- one{"{0} st"} |
- other{"{0} st"} |
- per{"{0}/st"} |
+ one{"{0} soat"} |
+ other{"{0} soat"} |
+ per{"{0}/soat"} |
} |
microsecond{ |
dnam{"mks"} |
@@ -1145,10 +1197,10 @@ uz{ |
other{"{0} ms"} |
} |
minute{ |
- dnam{"daq"} |
- one{"{0} daq"} |
- other{"{0} daq"} |
- per{"{0}/daq"} |
+ dnam{"daq."} |
+ one{"{0} daq."} |
+ other{"{0} daq."} |
+ per{"{0}/daq."} |
} |
month{ |
dnam{"oy"} |
@@ -1162,9 +1214,9 @@ uz{ |
other{"{0} ns"} |
} |
second{ |
- dnam{"son"} |
- one{"{0} son"} |
- other{"{0} son"} |
+ dnam{"son."} |
+ one{"{0} son."} |
+ other{"{0} son."} |
per{"{0}/s"} |
} |
week{ |
@@ -1280,7 +1332,7 @@ uz{ |
per{"{0} fut"} |
} |
inch{ |
- dnam{"dyum"} |
+ dnam{"duym"} |
one{"{0} dy"} |
other{"{0} dy"} |
per{"{0}/dy"} |
@@ -1313,9 +1365,9 @@ uz{ |
other{"{0} mil"} |
} |
mile-scandinavian{ |
- dnam{"s-mil"} |
- one{"{0} s-mil"} |
- other{"{0} s-mil"} |
+ dnam{"sk. mili"} |
+ one{"{0} sk. mili"} |
+ other{"{0} sk. mili"} |
} |
millimeter{ |
dnam{"mm"} |
@@ -1328,9 +1380,9 @@ uz{ |
other{"{0} nm"} |
} |
nautical-mile{ |
- dnam{"den.mili"} |
- one{"{0} den.mili"} |
- other{"{0} den.mili"} |
+ dnam{"den. mili"} |
+ one{"{0} den. mili"} |
+ other{"{0} den. mili"} |
} |
parsec{ |
dnam{"pk"} |
@@ -1470,13 +1522,6 @@ uz{ |
other{"{0} funt/kv.dy"} |
} |
} |
- proportion{ |
- karat{ |
- dnam{"karat"} |
- one{"{0} kt"} |
- other{"{0} kt"} |
- } |
- } |
speed{ |
kilometer-per-hour{ |
dnam{"km/soat"} |
@@ -1595,6 +1640,12 @@ uz{ |
other{"{0} gal"} |
per{"{0}/gal"} |
} |
+ gallon-imperial{ |
+ dnam{"imp. gal."} |
+ one{"{0} imp. gal."} |
+ other{"{0} imp. gal."} |
+ per{"{0} imp. gal."} |
+ } |
hectoliter{ |
dnam{"gL"} |
one{"{0} gL"} |
@@ -1602,9 +1653,9 @@ uz{ |
} |
liter{ |
dnam{"litr"} |
- one{"{0} l"} |
- other{"{0} l"} |
- per{"{0}/l"} |
+ one{"{0} L"} |
+ other{"{0} L"} |
+ per{"{0}/L"} |
} |
megaliter{ |
dnam{"ML"} |