Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: source/data/unit/zu.txt

Issue 2440913002: Update ICU to 58.1
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/data/unit/zh_TW.txt ('k') | source/data/zone/af.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/data/unit/zu.txt
diff --git a/source/data/unit/zu.txt b/source/data/unit/zu.txt
old mode 100755
new mode 100644
index 28ce459ae2ed672aed524fef5dda72f98aa9568c..9b8553e5370a780ca27b07812ebd98199e72d1a3
--- a/source/data/unit/zu.txt
+++ b/source/data/unit/zu.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/zu.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
zu{
- Version{"2.1.19.14"}
+ Version{"2.1.29.22"}
durationUnits{
hm{"h:mm"}
hms{"h:mm:ss"}
@@ -43,8 +37,8 @@ zu{
other{"{0}°"}
}
radian{
- dnam{"rad"}
- one{"{0} i-radian"}
+ dnam{"radians"}
+ one{"{0} radians"}
other{"{0} radians"}
}
revolution{
@@ -85,6 +79,7 @@ zu{
dnam{"km²"}
one{"{0} km²"}
other{"{0} km²"}
+ per{"{0}/km²"}
}
square-meter{
dnam{"m²"}
@@ -96,6 +91,7 @@ zu{
dnam{"mi²"}
one{"{0} mi²"}
other{"{0} mi²"}
+ per{"{0}/mi²"}
}
square-yard{
dnam{"yd²"}
@@ -106,6 +102,28 @@ zu{
compound{
per{"{0} nge-{1}"}
}
+ concentr{
+ karat{
+ dnam{"ama-karats"}
+ one{"{0} i-karat"}
+ other{"{0} ama-karats"}
+ }
+ 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{"ppm"}
+ one{"{0} ppm"}
+ other{"{0} ppm"}
+ }
+ }
consumption{
liter-per-100kilometers{
dnam{"L/100km"}
@@ -122,6 +140,11 @@ zu{
one{"{0} mpg"}
other{"{0} mpg"}
}
+ mile-per-gallon-imperial{
+ dnam{"mpg Imp."}
+ one{"{0} mpg Imp."}
+ other{"{0} mpg Imp."}
+ }
}
coordinate{
east{"{0}E"}
@@ -201,7 +224,7 @@ zu{
}
microsecond{
dnam{"microseconds"}
- one{"{0} ama-microsecond"}
+ one{"{0} microsecond"}
other{"{0} microseconds"}
}
millisecond{
@@ -219,7 +242,7 @@ zu{
dnam{"izinyanga"}
one{"{0} inyanga"}
other{"{0} izinyanga"}
- per{"{0}/m"}
+ per{"{0} ngenyanga"}
}
nanosecond{
dnam{"ns"}
@@ -281,7 +304,7 @@ zu{
joule{
dnam{"joule"}
one{"{0} i-joule"}
- other{"{0} ama-joules"}
+ other{"{0} J"}
}
kilocalorie{
dnam{"kcal"}
@@ -535,13 +558,6 @@ zu{
other{"{0} psi"}
}
}
- proportion{
- karat{
- dnam{"karats"}
- one{"{0} i-karat"}
- other{"{0} ama-karats"}
- }
- }
speed{
kilometer-per-hour{
dnam{"km/h"}
@@ -660,6 +676,12 @@ zu{
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"}
one{"{0} hL"}
@@ -919,6 +941,7 @@ zu{
dnam{"km²"}
one{"{0} km²"}
other{"{0} km²"}
+ per{"{0}/km²"}
}
square-meter{
dnam{"m²"}
@@ -930,6 +953,7 @@ zu{
dnam{"mi²"}
one{"{0} mi²"}
other{"{0} mi²"}
+ per{"{0}/mi²"}
}
square-yard{
dnam{"yd²"}
@@ -940,6 +964,28 @@ zu{
compound{
per{"{0}/{1}"}
}
+ concentr{
+ karat{
+ dnam{"karats"}
+ one{"{0} kt"}
+ other{"{0} kt"}
+ }
+ 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{"izingxenye/izigidi"}
+ one{"{0} ppm"}
+ other{"{0} ppm"}
+ }
+ }
consumption{
liter-per-100kilometers{
dnam{"L/100km"}
@@ -956,6 +1002,11 @@ zu{
one{"{0} mpg"}
other{"{0} mpg"}
}
+ mile-per-gallon-imperial{
+ dnam{"mpg Imp."}
+ one{"{0} mpg Imp."}
+ other{"{0} mpg Imp."}
+ }
}
coordinate{
east{"{0}E"}
@@ -1030,7 +1081,7 @@ zu{
hour{
dnam{"amahora"}
one{"{0} hora"}
- other{"{0} amahora"}
+ other{"{0} hr"}
per{"{0}/h"}
}
microsecond{
@@ -1063,8 +1114,8 @@ zu{
second{
dnam{"amasekhondi"}
one{"{0} sekhondi"}
- other{"{0} s"}
- per{"{0}ps"}
+ other{"{0} sec"}
+ per{"{0}/s"}
}
week{
dnam{"amaviki"}
@@ -1369,13 +1420,6 @@ zu{
other{"{0} psi"}
}
}
- proportion{
- karat{
- dnam{"karats"}
- one{"{0} kt"}
- other{"{0} kt"}
- }
- }
speed{
kilometer-per-hour{
dnam{"km/h"}
@@ -1494,6 +1538,12 @@ zu{
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"}
one{"{0} hL"}
« no previous file with comments | « source/data/unit/zh_TW.txt ('k') | source/data/zone/af.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698