Skip to content

Commit 5182941

Browse files
theaoqitheaoqi
committed
Merge
2 parents c101669 + 781d6d7 commit 5182941

File tree

1,577 files changed

+225923
-16429
lines changed

Some content is hidden

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

1,577 files changed

+225923
-16429
lines changed

‎make/data/cldr/unicode-license.txt‎ renamed to ‎make/data/cldr/LICENSE.txt‎

File renamed without changes.

‎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: 42
4+
CLDR version installed: 43

‎make/data/cldr/common/bcp47/currency.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ For terms of use, see http://www.unicode.org/copyright.html
6767
<type name="btn" description="Bhutanese Ngultrum"/>
6868
<type name="buk" description="Burmese Kyat" since="1.9"/>
6969
<type name="bwp" description="Botswanan Pula"/>
70-
<type name="byb" description="Belarusian New Ruble (1994-1999)" since="1.9"/>
70+
<type name="byb" description="Belarusian Ruble (1994-1999)" since="1.9"/>
7171
<type name="byn" description="Belarusian Ruble" since="31"/>
72-
<type name="byr" description="Belarusian Ruble (2000–2016)" since="1.9"/>
72+
<type name="byr" description="Belarusian Ruble (2000-2016)" since="1.9"/>
7373
<type name="bzd" description="Belize Dollar"/>
7474
<type name="cad" description="Canadian Dollar"/>
7575
<type name="cdf" description="Congolese Franc"/>
@@ -112,7 +112,7 @@ For terms of use, see http://www.unicode.org/copyright.html
112112
<type name="fjd" description="Fijian Dollar"/>
113113
<type name="fkp" description="Falkland Islands Pound"/>
114114
<type name="frf" description="French Franc"/>
115-
<type name="gbp" description="British Pound Sterling"/>
115+
<type name="gbp" description="British Pound"/>
116116
<type name="gek" description="Georgian Kupon Larit" since="1.9"/>
117117
<type name="gel" description="Georgian Lari" since="1.9"/>
118118
<type name="ghc" description="Ghanaian Cedi (1979-2007)"/>
@@ -136,8 +136,8 @@ For terms of use, see http://www.unicode.org/copyright.html
136136
<type name="idr" description="Indonesian Rupiah"/>
137137
<type name="iep" description="Irish Pound"/>
138138
<type name="ilp" description="Israeli Pound"/>
139-
<type name="ilr" description="Israeli Sheqel (1980-1985)" since="1.9"/>
140-
<type name="ils" description="Israeli New Sheqel"/>
139+
<type name="ilr" description="Israeli Shekel (1980-1985)" since="1.9"/>
140+
<type name="ils" description="Israeli New Shekel"/>
141141
<type name="inr" description="Indian Rupee"/>
142142
<type name="iqd" description="Iraqi Dinar" since="1.9"/>
143143
<type name="irr" description="Iranian Rial" since="1.9"/>
@@ -181,15 +181,15 @@ For terms of use, see http://www.unicode.org/copyright.html
181181
<type name="mkd" description="Macedonian Denar" since="1.9"/>
182182
<type name="mkn" description="Macedonian Denar (1992-1993)" since="1.9"/>
183183
<type name="mlf" description="Malian Franc" since="1.9"/>
184-
<type name="mmk" description="Myanma Kyat"/>
184+
<type name="mmk" description="Myanmar Kyat"/>
185185
<type name="mnt" description="Mongolian Tugrik"/>
186186
<type name="mop" description="Macanese Pataca"/>
187187
<type name="mro" description="Mauritanian Ouguiya (1973-2017)"/>
188188
<type name="mru" description="Mauritanian Ouguiya" since="33"/>
189189
<type name="mtl" description="Maltese Lira"/>
190190
<type name="mtp" description="Maltese Pound"/>
191191
<type name="mur" description="Mauritian Rupee"/>
192-
<type name="mvp" description="Maldivian Rupee" since="1.9"/>
192+
<type name="mvp" description="Maldivian Rupee (1947-1981)" since="1.9"/>
193193
<type name="mvr" description="Maldivian Rufiyaa" since="1.9"/>
194194
<type name="mwk" description="Malawian Kwacha" since="1.9"/>
195195
<type name="mxn" description="Mexican Peso" since="1.9"/>
@@ -210,7 +210,7 @@ For terms of use, see http://www.unicode.org/copyright.html
210210
<type name="omr" description="Omani Rial" since="1.9"/>
211211
<type name="pab" description="Panamanian Balboa"/>
212212
<type name="pei" description="Peruvian Inti"/>
213-
<type name="pen" description="Peruvian Nuevo Sol"/>
213+
<type name="pen" description="Peruvian Sol"/>
214214
<type name="pes" description="Peruvian Sol (1863-1965)" since="1.9"/>
215215
<type name="pgk" description="Papua New Guinean Kina"/>
216216
<type name="php" description="Philippine Peso"/>
@@ -219,7 +219,7 @@ For terms of use, see http://www.unicode.org/copyright.html
219219
<type name="plz" description="Polish Zloty (1950-1995)" since="1.9"/>
220220
<type name="pte" description="Portuguese Escudo"/>
221221
<type name="pyg" description="Paraguayan Guarani"/>
222-
<type name="qar" description="Qatari Rial"/>
222+
<type name="qar" description="Qatari Riyal"/>
223223
<type name="rhd" description="Rhodesian Dollar"/>
224224
<type name="rol" description="Romanian Leu (1952-2006)" since="1.9"/>
225225
<type name="ron" description="Romanian Leu"/>
@@ -235,11 +235,11 @@ For terms of use, see http://www.unicode.org/copyright.html
235235
<type name="sdp" description="Sudanese Pound (1957-1998)" since="1.9"/>
236236
<type name="sek" description="Swedish Krona"/>
237237
<type name="sgd" description="Singapore Dollar"/>
238-
<type name="shp" description="Saint Helena Pound"/>
238+
<type name="shp" description="St. Helena Pound"/>
239239
<type name="sit" description="Slovenian Tolar" since="1.9"/>
240240
<type name="skk" description="Slovak Koruna"/>
241-
<type name="sle" description="Sierra Leonean New Leone"/>
242-
<type name="sll" description="Sierra Leonean Leone"/>
241+
<type name="sle" description="Sierra Leonean Leone" since="41"/>
242+
<type name="sll" description="Sierra Leonean Leone (1964—2022)"/>
243243
<type name="sos" description="Somali Shilling"/>
244244
<type name="srd" description="Surinamese Dollar"/>
245245
<type name="srg" description="Surinamese Guilder"/>
@@ -274,28 +274,28 @@ For terms of use, see http://www.unicode.org/copyright.html
274274
<type name="uyp" description="Uruguayan Peso (1975-1993)" since="1.9"/>
275275
<type name="uyu" description="Uruguayan Peso"/>
276276
<type name="uyw" description="Uruguayan Nominal Wage Index Unit" since="34"/>
277-
<type name="uzs" description="Uzbekistan Som" since="1.9"/>
277+
<type name="uzs" description="Uzbekistani Som" since="1.9"/>
278278
<type name="veb" description="Venezuelan Bolívar (1871-2008)" since="1.9"/>
279+
<type name="ved" description="Bolívar Soberano" since="41"/>
279280
<type name="vef" description="Venezuelan Bolívar (2008-2018)"/>
280281
<type name="ves" description="Venezuelan Bolívar" since="34"/>
281-
<type name="ved" description="Bolívar Soberano" since="41"/>
282282
<type name="vnd" description="Vietnamese Dong"/>
283283
<type name="vnn" description="Vietnamese Dong (1978-1985)" since="1.9"/>
284284
<type name="vuv" description="Vanuatu Vatu"/>
285285
<type name="wst" description="Samoan Tala"/>
286-
<type name="xaf" description="CFA Franc BEAC"/>
286+
<type name="xaf" description="Central African CFA Franc"/>
287287
<type name="xag" description="Silver" since="1.9"/>
288288
<type name="xau" description="Gold" since="1.9"/>
289289
<type name="xba" description="European Composite Unit" since="1.9"/>
290290
<type name="xbb" description="European Monetary Unit" since="1.9"/>
291-
<type name="xbc" description="European Unit of Account 9" since="1.9"/>
292-
<type name="xbd" description="European Unit of Account 17" since="1.9"/>
291+
<type name="xbc" description="European Unit of Account (XBC)" since="1.9"/>
292+
<type name="xbd" description="European Unit of Account (XBD)" since="1.9"/>
293293
<type name="xcd" description="East Caribbean Dollar"/>
294294
<type name="xdr" description="Special Drawing Rights" since="1.9"/>
295295
<type name="xeu" description="European Currency Unit" since="1.9"/>
296296
<type name="xfo" description="French Gold Franc" since="1.9"/>
297297
<type name="xfu" description="French UIC-Franc" since="1.9"/>
298-
<type name="xof" description="CFA Franc BCEAO"/>
298+
<type name="xof" description="West African CFA Franc"/>
299299
<type name="xpd" description="Palladium" since="1.9"/>
300300
<type name="xpf" description="CFP Franc"/>
301301
<type name="xpt" description="Platinum" since="1.9"/>

‎make/data/cldr/common/bcp47/segmentation.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ For terms of use, see http://www.unicode.org/copyright.html
1010
<version number="$Revision$"/>
1111
<keyword>
1212
<key name="dx" description="Scripts to exclude from dictionary break" valueType="multiple" since="38">
13-
<type name="SCRIPT_CODE" description="ISO 15924 script code"/>
13+
<type name="SCRIPT_CODE" description="ISO 15924 script code" since="38"/>
1414
</key>
1515

1616
<key name="lb" description="Line break type key" since="27">
17-
<type name="strict" description="CSS level 3 line-break=strict, e.g. treat CJ as NS"/>
18-
<type name="normal" description="CSS level 3 line-break=normal, e.g. treat CJ as ID, break before hyphens for ja,zh"/>
19-
<type name="loose" description="CSS lev 3 line-break=loose"/>
17+
<type name="strict" description="CSS level 3 line-break=strict, e.g. treat CJ as NS" since="27"/>
18+
<type name="normal" description="CSS level 3 line-break=normal, e.g. treat CJ as ID, break before hyphens for ja,zh" since="27"/>
19+
<type name="loose" description="CSS lev 3 line-break=loose" since="27"/>
2020
</key>
2121

2222
<key name="lw" description="Line break key for CSS lev 3 word-break options" since="28">
23-
<type name="normal" description="CSS lev 3 word-break=normal, normal script/language behavior for midword breaks"/>
24-
<type name="breakall" description="CSS lev 3 word-break=break-all, allow midword breaks unless forbidden by lb setting"/>
25-
<type name="keepall" description="CSS lev 3 word-break=keep-all, prohibit midword breaks except for dictionary breaks"/>
26-
<type name="phrase" description="Prioritize keeping natural phrases (of multiple words) together when breaking, used in short text like title and headline"/>
23+
<type name="normal" description="CSS lev 3 word-break=normal, normal script/language behavior for midword breaks" since="28"/>
24+
<type name="breakall" description="CSS lev 3 word-break=break-all, allow midword breaks unless forbidden by lb setting" since="28"/>
25+
<type name="keepall" description="CSS lev 3 word-break=keep-all, prohibit midword breaks except for dictionary breaks" since="28"/>
26+
<type name="phrase" description="Prioritize keeping natural phrases (of multiple words) together when breaking, used in short text like title and headline" since="41"/>
2727
</key>
2828

2929
<key name="ss" description="Sentence break parameter key to control use of suppressions data" since="28">
30-
<type name="none" description="Don't use segmentation suppressions data"/>
31-
<type name="standard" description="Use segmentation suppressions data of type standard"/>
30+
<type name="none" description="Don't use segmentation suppressions data" since="28"/>
31+
<type name="standard" description="Use segmentation suppressions data of type standard" since="28"/>
3232
</key>
3333

3434
</keyword>

‎make/data/cldr/common/bcp47/timezone.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@ For terms of use, see http://www.unicode.org/copyright.html
9696
<type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/>
9797
<type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/>
9898
<type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/>
99-
<type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson"/>
99+
<type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson" since="29"/>
100100
<type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/>
101101
<type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/>
102102
<type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/>
103103
<type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/>
104104
<type name="camon" description="Moncton, Canada" alias="America/Moncton"/>
105-
<type name="camtr" description="Montreal, Canada" deprecated="true" alias="America/Montreal"/>
105+
<type name="camtr" description="Montreal, Canada" deprecated="true" preferred="cator"/>
106106
<type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/>
107107
<type name="careb" description="Resolute, Canada" alias="America/Resolute"/>
108108
<type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/>
109109
<type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/>
110110
<type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/>
111111
<type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/>
112-
<type name="cator" description="Toronto, Canada" alias="America/Toronto Canada/Eastern"/>
112+
<type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern"/>
113113
<type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/>
114114
<type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/>
115115
<type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/>
@@ -177,7 +177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
177177
<type name="frpar" description="Paris, France" alias="Europe/Paris"/>
178178
<type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
179179
<type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
180-
<type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza"/>
180+
<type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
181181
<type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
182182
<type name="gdgnd" description="Grenada" alias="America/Grenada"/>
183183
<type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -190,7 +190,7 @@ For terms of use, see http://www.unicode.org/copyright.html
190190
<type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/>
191191
<type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/>
192192
<type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/>
193-
<type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich"/>
193+
<type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
194194
<type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
195195
<type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
196196
<type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
@@ -280,7 +280,7 @@ For terms of use, see http://www.unicode.org/copyright.html
280280
<type name="mwblz" description="Blantyre, Malawi" alias="Africa/Blantyre"/>
281281
<type name="mxchi" description="Chihuahua, Mexico" alias="America/Chihuahua"/>
282282
<type name="mxcun" description="Cancún, Mexico" alias="America/Cancun"/>
283-
<type name="mxcjs" description="Ciudad Juárez, Mexico" alias="America/Ciudad_Juarez"/>
283+
<type name="mxcjs" description="Ciudad Juárez, Mexico" alias="America/Ciudad_Juarez" since="43"/>
284284
<type name="mxhmo" description="Hermosillo, Mexico" alias="America/Hermosillo"/>
285285
<type name="mxmam" description="Matamoros, Mexico" alias="America/Matamoros"/>
286286
<type name="mxmex" description="Mexico City, Mexico" alias="America/Mexico_City Mexico/General"/>
@@ -390,7 +390,7 @@ For terms of use, see http://www.unicode.org/copyright.html
390390
<type name="tmasb" description="Ashgabat, Turkmenistan" alias="Asia/Ashgabat Asia/Ashkhabad"/>
391391
<type name="tntun" description="Tunis, Tunisia" alias="Africa/Tunis"/>
392392
<type name="totbu" description="Tongatapu, Tonga" alias="Pacific/Tongatapu"/>
393-
<type name="trist" description="Istanbul, Turkey" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
393+
<type name="trist" description="Istanbul, Türkiye" alias="Europe/Istanbul Asia/Istanbul Turkey"/>
394394
<type name="ttpos" description="Port of Spain, Trinidad and Tobago" alias="America/Port_of_Spain"/>
395395
<type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
396396
<type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>

‎make/data/cldr/common/bcp47/variant.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
<version number="$Revision$" />
88
<keyword>
99
<key name="em" description="Emoji presentation style request" since="29">
10-
<type name="emoji" description="use an emoji presentation for emoji characters if possible"/>
11-
<type name="text" description="use a text presentation for emoji characters if possible"/>
12-
<type name="default" description="use the default presentation as specified in UTR #51"/>
10+
<type name="emoji" description="use an emoji presentation for emoji characters if possible" since="29"/>
11+
<type name="text" description="use a text presentation for emoji characters if possible" since="29"/>
12+
<type name="default" description="use the default presentation as specified in UTR #51" since="29"/>
1313
</key>
1414

1515
<key name="rg" description="Alternate region for determining certain data values (e.g. default currency and units) specified by rgScope" since="29">
16-
<type name="RG_KEY_VALUE" description="A region code from idValidity/id[type='region'][idStatus='regular'], suffixed with 'ZZZZ'" />
16+
<type name="RG_KEY_VALUE" description="A region code from idValidity/id[type='region'][idStatus='regular'], suffixed with 'ZZZZ'" since="29"/>
1717
</key>
1818

1919
<key name="sd" description="Region subdivision" since="28">
2020
<type name="SUBDIVISION_CODE"
21-
description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" />
21+
description="Valid unicode_subdivision_subtag for the region subtag as specified in LDML, based on subdivisionContainment data in supplementalData, prefixed by the associated unicode_region_subtag" since="28"/>
2222
</key>
2323

2424
<key name="va" description="Common locale variant type key">

0 commit comments

Comments
 (0)