Skip to content

Commit f6e54f2

Browse files
committed
8258794: Support for CLDR version 39
Reviewed-by: joehw, erikj
1 parent e89fd15 commit f6e54f2

File tree

815 files changed

+19778
-25540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

815 files changed

+19778
-25540
lines changed

make/data/cldr/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CLDR - Unicode Common Locale Data Repository
22
http://cldr.unicode.org
33

4-
CLDR version installed: 38
4+
CLDR version installed: 39

make/data/cldr/common/dtd/ldml.dtd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ $Revision$
4646
<!ATTLIST version number CDATA #REQUIRED >
4747
<!--@MATCH:regex/\$Revision.*\$-->
4848
<!--@METADATA-->
49-
<!ATTLIST version cldrVersion CDATA #FIXED "38" >
49+
<!ATTLIST version cldrVersion CDATA #FIXED "39" >
5050
<!--@MATCH:any-->
5151
<!--@VALUE-->
5252
<!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >

make/data/cldr/common/dtd/ldmlBCP47.dtd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $Revision$
1616
<!ATTLIST version number CDATA #REQUIRED >
1717
<!--@MATCH:regex/\$Revision.*\$-->
1818
<!--@METADATA-->
19-
<!ATTLIST version cldrVersion CDATA #FIXED "38" >
19+
<!ATTLIST version cldrVersion CDATA #FIXED "39" >
2020
<!--@MATCH:version-->
2121
<!--@VALUE-->
2222

make/data/cldr/common/dtd/ldmlSupplemental.dtd

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Except as contained in this notice, the name of a copyright holder shall not be
1717
<!ATTLIST version number CDATA #REQUIRED >
1818
<!--@MATCH:any-->
1919
<!--@METADATA-->
20-
<!ATTLIST version cldrVersion CDATA #FIXED "38" >
20+
<!ATTLIST version cldrVersion CDATA #FIXED "39" >
2121
<!--@MATCH:version-->
2222
<!--@VALUE-->
2323
<!ATTLIST version unicodeVersion CDATA #FIXED "13.0.0" >
@@ -384,6 +384,9 @@ Except as contained in this notice, the name of a copyright holder shall not be
384384
<!ATTLIST unitConstant status NMTOKEN #IMPLIED >
385385
<!--@MATCH:literal/approximate, exact-->
386386
<!--@VALUE-->
387+
<!ATTLIST unitConstant description CDATA #IMPLIED >
388+
<!--@MATCH:any-->
389+
<!--@METADATA-->
387390

388391
<!ELEMENT unitQuantities ( unitQuantity* ) >
389392

@@ -396,6 +399,8 @@ Except as contained in this notice, the name of a copyright holder shall not be
396399
<!ATTLIST unitQuantity status NMTOKEN #IMPLIED >
397400
<!--@MATCH:regex/simple-->
398401
<!--@VALUE-->
402+
<!ATTLIST unitQuantity description CDATA #IMPLIED >
403+
<!--@METADATA-->
399404

400405
<!ELEMENT convertUnits ( convertUnit* ) >
401406

@@ -412,8 +417,10 @@ Except as contained in this notice, the name of a copyright holder shall not be
412417
<!--@MATCH:regex/[-+*/\._ 0-9a-zA-Z]+-->
413418
<!--@VALUE-->
414419
<!ATTLIST convertUnit systems NMTOKENS #IMPLIED >
415-
<!--@MATCH:set/literal/ussystem, uksystem-->
420+
<!--@MATCH:set/literal/ussystem, uksystem, metric, si, other -->
416421
<!--@VALUE-->
422+
<!ATTLIST convertUnit description CDATA #IMPLIED >
423+
<!--@METADATA-->
417424

418425
<!ELEMENT unitPreferenceData ( unitPreferences* ) >
419426
<!ATTLIST unitPreferenceData draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -1242,7 +1249,7 @@ Except as contained in this notice, the name of a copyright holder shall not be
12421249
<!ATTLIST grammaticalCase scope NMTOKENS #IMPLIED >
12431250
<!--@MATCH:set/literal/units-->
12441251
<!ATTLIST grammaticalCase values NMTOKENS #IMPLIED >
1245-
<!--@MATCH:set/literal/ablative, accusative, comitative, dative, ergative, genitive, instrumental, locative, locativecopulative, nominative, oblique, partitive, prepositional, sociative, vocative-->
1252+
<!--@MATCH:set/literal/abessive, ablative, accusative, adessive, allative, causal, comitative, dative, delative, elative, ergative, essive, genitive, illative, inessive, instrumental, locative, locativecopulative, nominative, oblique, partitive, prepositional, sociative, sublative, superessive, terminative, translative, vocative-->
12461253
<!--@VALUE-->
12471254

12481255
<!ELEMENT grammaticalGender EMPTY >

make/data/cldr/common/main/af.xml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2020 Unicode, Inc.
3+
<!-- Copyright © 1991-2021 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
@@ -318,7 +318,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
318318
<language type="rn">Rundi</language>
319319
<language type="ro">Roemeens</language>
320320
<language type="rof">Rombo</language>
321-
<language type="root">Root</language>
322321
<language type="ru">Russies</language>
323322
<language type="rup">Aromanies</language>
324323
<language type="rw">Rwandees</language>
@@ -2371,9 +2370,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
23712370
<zone type="America/Santa_Isabel">
23722371
<exemplarCity>Santa Isabel</exemplarCity>
23732372
</zone>
2374-
<zone type="Pacific/Honolulu">
2375-
<exemplarCity>Honolulu</exemplarCity>
2376-
</zone>
23772373
<zone type="Etc/UTC">
23782374
<long>
23792375
<standard>Gekoördineerde universele tyd</standard>
@@ -2493,12 +2489,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
24932489
<zone type="Australia/Broken_Hill">
24942490
<exemplarCity>Broken Hill</exemplarCity>
24952491
</zone>
2496-
<zone type="Australia/Currie">
2497-
<exemplarCity>Currie</exemplarCity>
2498-
</zone>
24992492
<zone type="Australia/Melbourne">
25002493
<exemplarCity>Melbourne</exemplarCity>
25012494
</zone>
2495+
<zone type="Australia/Currie">
2496+
<exemplarCity>Currie</exemplarCity>
2497+
</zone>
25022498
<zone type="Australia/Hobart">
25032499
<exemplarCity>Hobart</exemplarCity>
25042500
</zone>
@@ -3531,6 +3527,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
35313527
<zone type="America/Nome">
35323528
<exemplarCity>Nome</exemplarCity>
35333529
</zone>
3530+
<zone type="Pacific/Honolulu">
3531+
<exemplarCity>Honolulu</exemplarCity>
3532+
</zone>
35343533
<zone type="Pacific/Johnston">
35353534
<exemplarCity>Johnston</exemplarCity>
35363535
</zone>
@@ -5773,7 +5772,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
57735772
<displayName>Wes-Afrikaanse CFA-frank</displayName>
57745773
<displayName count="one">Wes-Afrikaanse CFA-frank</displayName>
57755774
<displayName count="other">Wes-Afrikaanse CFA-frank</displayName>
5776-
<symbol draft="contributed">CFA</symbol>
5775+
<symbol draft="contributed">F CFA</symbol>
57775776
</currency>
57785777
<currency type="XPF">
57795778
<displayName>CFP-frank</displayName>
@@ -5995,7 +5994,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
59955994
<unitPattern count="one">{0} karaat</unitPattern>
59965995
<unitPattern count="other">{0} karaat</unitPattern>
59975996
</unit>
5998-
<unit type="concentr-milligram-per-deciliter">
5997+
<unit type="concentr-milligram-ofglucose-per-deciliter">
59995998
<displayName>milligram per desiliter</displayName>
60005999
<unitPattern count="one">{0} milligram per desiliter</unitPattern>
60016000
<unitPattern count="other">{0} milligram per desiliter</unitPattern>
@@ -6917,7 +6916,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
69176916
<unitPattern count="one">{0} kar.</unitPattern>
69186917
<unitPattern count="other">{0} kar.</unitPattern>
69196918
</unit>
6920-
<unit type="concentr-milligram-per-deciliter">
6919+
<unit type="concentr-milligram-ofglucose-per-deciliter">
69216920
<displayName>mg/dℓ</displayName>
69226921
<unitPattern count="one">{0} mg/dℓ</unitPattern>
69236922
<unitPattern count="other">{0} mg/dℓ</unitPattern>
@@ -7258,9 +7257,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
72587257
<unitPattern count="other">{0} mm</unitPattern>
72597258
</unit>
72607259
<unit type="length-micrometer">
7261-
<displayName>µm</displayName>
7262-
<unitPattern count="one">{0} µm</unitPattern>
7263-
<unitPattern count="other">{0} µm</unitPattern>
7260+
<displayName>μm</displayName>
7261+
<unitPattern count="one">{0} μm</unitPattern>
7262+
<unitPattern count="other">{0} μm</unitPattern>
72647263
</unit>
72657264
<unit type="length-nanometer">
72667265
<displayName>nm</displayName>
@@ -7372,9 +7371,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
73727371
<unitPattern count="other">{0} mg</unitPattern>
73737372
</unit>
73747373
<unit type="mass-microgram">
7375-
<displayName>µg</displayName>
7376-
<unitPattern count="one">{0} µg</unitPattern>
7377-
<unitPattern count="other">{0} µg</unitPattern>
7374+
<displayName>μg</displayName>
7375+
<unitPattern count="one">{0} μg</unitPattern>
7376+
<unitPattern count="other">{0} μg</unitPattern>
73787377
</unit>
73797378
<unit type="mass-ton">
73807379
<displayName>VSA-ton</displayName>

make/data/cldr/common/main/af_NA.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2020 Unicode, Inc.
3+
<!-- Copyright © 1991-2021 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

make/data/cldr/common/main/af_ZA.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2020 Unicode, Inc.
3+
<!-- Copyright © 1991-2021 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

make/data/cldr/common/main/agq.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2020 Unicode, Inc.
3+
<!-- Copyright © 1991-2021 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

make/data/cldr/common/main/agq_CM.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2020 Unicode, Inc.
3+
<!-- Copyright © 1991-2021 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

make/data/cldr/common/main/ak.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
3-
<!-- Copyright © 1991-2020 Unicode, Inc.
3+
<!-- Copyright © 1991-2021 Unicode, Inc.
44
For terms of use, see http://www.unicode.org/copyright.html
55
Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
66
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)

0 commit comments

Comments
 (0)