diff --git a/common/properties/scriptMetadata.txt b/common/properties/scriptMetadata.txt index 9dee6c4680c..568aaab453e 100644 --- a/common/properties/scriptMetadata.txt +++ b/common/properties/scriptMetadata.txt @@ -123,13 +123,13 @@ Dupl; 33; 1BC20; FR; 1; EXCLUSION; NO; NO; NO; YES; NO Egyp; 33; 13153; EG; 3; EXCLUSION; NO; NO; YES; YES; NO Elba; 33; 10500; AL; 1; EXCLUSION; NO; NO; NO; NO; NO Elym; 33; 10FF1; IR; 1; EXCLUSION; YES; NO; NO; NO; NO -Gara; 33; 10D5D; SN; 1; EXCLUSION; YES; NO; YES; NO; YES # provisional data for future Unicode 16.0 script +Gara; 33; 10D5D; SN; 1; EXCLUSION; YES; NO; YES; NO; YES Glag; 33; 2C00; BG; 1; EXCLUSION; NO; NO; NO; NO; YES Gong; 33; 11D71; IN; 1; LIMITED_USE; NO; NO; YES; NO; NO Gonm; 33; 11D10; IN; 1; EXCLUSION; NO; NO; YES; NO; NO Goth; 33; 10330; UA; 1; EXCLUSION; NO; NO; NO; NO; NO Gran; 33; 11315; IN; 1; EXCLUSION; NO; NO; NO; NO; NO -Gukh; 33; 1611C; NP; 1; EXCLUSION; NO; NO; YES; NO; NO # provisional data for future Unicode 16.0 script +Gukh; 33; 1611C; NP; 1; EXCLUSION; NO; NO; YES; NO; NO Hano; 33; 1723; PH; 1; EXCLUSION; NO; NO; YES; NO; NO Hatr; 33; 108F4; IQ; 1; EXCLUSION; YES; NO; NO; NO; NO Hluw; 33; 14400; TR; 1; EXCLUSION; NO; NO; NO; YES; NO @@ -143,7 +143,7 @@ Kawi; 33; 11F1B; ID; 1; EXCLUSION; NO; YES; YES; NO; NO Khar; 33; 10A00; PK; 1; EXCLUSION; YES; NO; YES; NO; NO Khoj; 33; 11208; IN; 1; EXCLUSION; NO; NO; NO; NO; NO Kits; 33; 18C65; CN; 2; EXCLUSION; NO; YES; NO; YES; NO -Krai; 33; 16D45; IN; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 16.0 script +Krai; 33; 16D45; IN; 1; EXCLUSION; NO; NO; NO; NO; NO Kthi; 33; 11083; IN; 1; EXCLUSION; NO; NO; MIN; NO; NO Lana; 33; 1A20; TH; 1; LIMITED_USE; NO; YES; YES; NO; NO Lepc; 33; 1C00; IN; 1; LIMITED_USE; NO; NO; YES; NO; NO @@ -176,7 +176,7 @@ Nkoo; 33; 07CA; GN; 1; LIMITED_USE; YES; NO; YES; NO; NO Nshu; 33; 1B1C4; CN; 2; EXCLUSION; NO; YES; NO; YES; NO Ogam; 33; 168F; IE; 1; EXCLUSION; NO; NO; NO; NO; NO Olck; 33; 1C5A; IN; 1; LIMITED_USE; NO; NO; NO; NO; NO -Onao; 33; 1E5D0; IN; 1; EXCLUSION; NO; NO; MIN; NO; NO # provisional data for future Unicode 16.0 script +Onao; 33; 1E5D0; IN; 1; EXCLUSION; NO; NO; MIN; NO; NO Orkh; 33; 10C00; MN; 1; EXCLUSION; YES; NO; NO; NO; NO Osge; 33; 104B5; US; 1; LIMITED_USE; NO; NO; NO; NO; YES Osma; 33; 10480; SO; 1; EXCLUSION; NO; NO; NO; NO; NO @@ -206,7 +206,7 @@ Sogo; 33; 10F19; UZ; 1; EXCLUSION; YES; NO; NO; NO; NO Sora; 33; 110D0; IN; 1; EXCLUSION; NO; NO; NO; NO; NO Soyo; 33; 11A5C; MN; 1; EXCLUSION; NO; NO; YES; NO; NO Sund; 33; 1B83; ID; 1; LIMITED_USE; NO; NO; YES; NO; NO -Sunu; 33; 11BC4; NP; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 16.0 script +Sunu; 33; 11BC4; NP; 1; EXCLUSION; NO; NO; NO; NO; NO Sylo; 33; A800; BD; 1; LIMITED_USE; NO; NO; YES; NO; NO Syrc; 33; 0710; SY; 1; LIMITED_USE; YES; NO; YES; NO; NO Tagb; 33; 1763; PH; 1; EXCLUSION; NO; NO; NO; NO; NO @@ -219,9 +219,9 @@ Tfng; 33; 2D30; MA; 1; LIMITED_USE; NO; NO; NO; NO; NO Tglg; 33; 1703; PH; 1; EXCLUSION; NO; NO; MIN; NO; NO Tirh; 33; 11484; IN; 1; EXCLUSION; NO; NO; NO; NO; NO Tnsa; 33; 16ABC; IN; 1; EXCLUSION; NO; NO; NO; NO; NO -Todr; 33; 105C2; AL; 1; EXCLUSION; NO; NO; NO; NO; NO # provisional data for future Unicode 16.0 script +Todr; 33; 105C2; AL; 1; EXCLUSION; NO; NO; NO; NO; NO Toto; 33; 1E290; IN; 1; EXCLUSION; NO; NO; NO; NO; NO -Tutg; 33; 11392; IN; 1; EXCLUSION; NO; NO; YES; NO; NO # provisional data for future Unicode 16.0 script +Tutg; 33; 11392; IN; 1; EXCLUSION; NO; NO; YES; NO; NO Ugar; 33; 10380; SY; 1; EXCLUSION; NO; NO; NO; NO; NO Vaii; 33; A549; LR; 2; LIMITED_USE; NO; NO; NO; YES; NO Vith; 33; 10582; AL; 1; EXCLUSION; NO; NO; NO; NO; YES diff --git a/common/supplemental/likelySubtags.xml b/common/supplemental/likelySubtags.xml index 48a25e76531..963a54c703e 100644 --- a/common/supplemental/likelySubtags.xml +++ b/common/supplemental/likelySubtags.xml @@ -183,6 +183,7 @@ not be patched by hand, as any changes made in that fashion may be lost. + @@ -241,13 +242,13 @@ not be patched by hand, as any changes made in that fashion may be lost. + - - + @@ -1090,7 +1091,7 @@ not be patched by hand, as any changes made in that fashion may be lost. - + @@ -1220,7 +1221,7 @@ not be patched by hand, as any changes made in that fashion may be lost. - + @@ -2812,7 +2813,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - @@ -3112,7 +3112,6 @@ not be patched by hand, as any changes made in that fashion may be lost. - diff --git a/common/supplemental/supplementalData.xml b/common/supplemental/supplementalData.xml index 6fe81c3e923..4a9654b7789 100644 --- a/common/supplemental/supplementalData.xml +++ b/common/supplemental/supplementalData.xml @@ -1531,6 +1531,7 @@ XXX Code for transations where no currency is involved + @@ -1620,6 +1621,7 @@ XXX Code for transations where no currency is involved + @@ -1629,7 +1631,7 @@ XXX Code for transations where no currency is involved - + @@ -2861,6 +2863,7 @@ XXX Code for transations where no currency is involved + @@ -3147,6 +3150,8 @@ XXX Code for transations where no currency is involved + + diff --git a/common/testData/localeIdentifiers/likelySubtags.txt b/common/testData/localeIdentifiers/likelySubtags.txt index 2188a18213f..a3ab24c2e84 100644 --- a/common/testData/localeIdentifiers/likelySubtags.txt +++ b/common/testData/localeIdentifiers/likelySubtags.txt @@ -251,6 +251,7 @@ en-GG ; en-Latn-GG ; en-GG ; en-GH ; en-Latn-GH ; en-GH ; en-GI ; en-Latn-GI ; en-GI ; en-GM ; en-Latn-GM ; en-GM ; +en-GS ; en-Latn-GS ; en-GS ; en-GU ; en-Latn-GU ; en-GU ; en-GY ; en-Latn-GY ; en-GY ; en-HK ; en-Latn-HK ; en-HK ; @@ -1221,6 +1222,7 @@ und-GN ; fr-Latn-GN ; fr-GN ; und-GP ; fr-Latn-GP ; fr-GP ; und-GQ ; es-Latn-GQ ; es-GQ ; und-GR ; el-Grek-GR ; el ; +und-GS ; en-Latn-GS ; en-GS ; und-GT ; es-Latn-GT ; es-GT ; und-GU ; en-Latn-GU ; en-GU ; und-GW ; pt-Latn-GW ; pt-GW ; @@ -1399,6 +1401,7 @@ und-Latn-GM ; en-Latn-GM ; en-GM ; und-Latn-GN ; fr-Latn-GN ; fr-GN ; und-Latn-GP ; fr-Latn-GP ; fr-GP ; und-Latn-GQ ; es-Latn-GQ ; es-GQ ; +und-Latn-GS ; en-Latn-GS ; en-GS ; und-Latn-GT ; es-Latn-GT ; es-GT ; und-Latn-GU ; en-Latn-GU ; en-GU ; und-Latn-GW ; pt-Latn-GW ; pt-GW ; diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java index a67fb3c088f..c36dd6ee838 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateLikelySubtags.java @@ -458,7 +458,6 @@ public static void main(String[] args) throws IOException { {"cu_Glag", "cu_Glag_BG"}, {"sd_Khoj", "sd_Khoj_IN"}, {"lif_Limb", "lif_Limb_IN"}, - {"grc_Linb", "grc_Linb_GR"}, {"arc_Nbat", "arc_Nbat_JO"}, {"arc_Palm", "arc_Palm_SY"}, {"pal_Phlp", "pal_Phlp_CN"}, diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv index 408ab50a7ab..10289d22d5e 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv @@ -68,7 +68,7 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L 66,Buhid,Buhd,3.2,20,ᝃ,1743,Philippines,1,Buhid,bku,Exclusion,no,no,Yes,no,no 67,Carian,Cari,5.1,49,𐊷,102A0,Turkey,1,Carian,xcr,Exclusion,no,no,no,no,no 68,Cuneiform,Xsux,5.0,"1,037",𒀀,12000,Iraq,3,Akkadian,akk,Exclusion,no,no,no,Yes,no -69,Cypriot,Cprt,4.0,55,𐠀,10800,Cyprus,1,Ancient Greek,grc,Exclusion,Yes,no,no,no,no +69,Cypriot,Cprt,4.0,55,𐠀,10800,Cyprus,1,Eteocypriot,ecy,Exclusion,Yes,no,no,no,no 70,Deseret,Dsrt,3.1,80,𐐔,10414,United States,1,English,en,Exclusion,no,no,no,no,Yes 71,Egyptian_Hieroglyphs,Egyp,5.2,"1,071",𓅓,13153,Egypt,3,Ancient Egyptian,egy,Exclusion,no,no,Yes,Yes,no 72,Gothic,Goth,3.1,27,𐌰,10330,Ukraine,1,Gothic,got,Exclusion,no,no,no,no,no @@ -78,7 +78,7 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L 76,Inscriptional_Parthian,Prti,5.2,30,𐭀,10B40,Iran,1,Parthian,xpr,Exclusion,Yes,no,no,no,no 77,Kaithi,Kthi,5.2,66,𑂃,11083,India,1,Bhojpuri,bho,Exclusion,no,no,min,no,no 78,Kharoshthi,Khar,4.1,65,𐨀,10A00,Pakistan,1,Gandhari,pra,Exclusion,Yes,no,Yes,no,no -79,Linear_B,Linb,4.0,211,𐀀,10000,Greece,1,Ancient Greek,grc,Exclusion,no,no,no,Yes,no +79,Linear_B,Linb,4.0,211,𐀀,10000,Greece,1,Mycenaean Greek,gmy,Exclusion,no,no,no,Yes,no 80,Lycian,Lyci,5.1,29,𐊀,10280,Turkey,1,Lycian,xlc,Exclusion,no,no,no,no,no 81,Lydian,Lydi,5.1,27,𐤠,10920,Turkey,1,Lydian,xld,Exclusion,Yes,no,no,no,no 82,Ogham,Ogam,3.0,29,ᚏ,168F,Ireland,1,Old Irish,sga,Exclusion,no,no,no,no,no diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv index d8e7e983080..45559e6ca73 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/country_language_population.tsv @@ -321,6 +321,7 @@ Cyprus CY "1,237,088" 99% "31,780,000,000" English en 73% Cyprus CY "1,237,088" 99% "31,780,000,000" French fr 7% Cyprus CY "1,237,088" 99% "31,780,000,000" official Greek el 95% Cyprus CY "1,237,088" 99% "31,780,000,000" official Turkish tr 23% +Cyprus CY "1,237,088" 99% "31,780,000,000" Eteocypriot ecy 1 Czechia CZ "10,686,269" 99% "375,900,000,000" official Czech cs 98% Czechia CZ "10,686,269" 99% "375,900,000,000" English en 27% Czechia CZ "10,686,269" 99% "375,900,000,000" German de 15% @@ -489,6 +490,8 @@ Greece GR "10,761,523" 97% "299,300,000,000" Macedonian mk "175,000" Greece GR "10,761,523" 97% "299,300,000,000" Pontic pnt 3.7% Greece GR "10,761,523" 97% "299,300,000,000" Tsakonian tsd 200 Greece GR "10,761,523" 97% "299,300,000,000" Turkish tr "125,000" +Greece GR "10,761,523" 97% "299,300,000,000" Ancient Greek grc 1 +Greece GR "10,761,523" 97% "299,300,000,000" Mycenaean Greek gmy 1 Greenland GL "57,691" 100% "2,413,000,000" Danish da "7,830" Greenland GL "57,691" 100% "2,413,000,000" official Kalaallisut kl 84% Grenada GD "112,207" 96% "1,634,000,000" official English en 96% https://www.cia.gov/cia/publications/factbook/geos/gj.html English official; the figure is derived from literacy * lang pop diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/language_script.tsv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/language_script.tsv index c8eabb9e545..5de306b10b9 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/language_script.tsv +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/language_script.tsv @@ -205,6 +205,7 @@ dyo Jola-Fonyi secondary Arab Arabic dyu Dyula primary Latn Latin dz Dzongkha primary Tibt Tibetan ebu Embu primary Latn Latin +ecy Eteocypriot primary Cprt Cypriot Syllabary ee Ewe primary Latn Latin efi Efik primary Latn Latin egl Emilian primary Latn Latin @@ -272,6 +273,7 @@ gl Galician primary Latn Latin gld Nanai primary Cyrl Cyrillic glk Gilaki primary Arab Arabic gmh Middle High German secondary Latn Latin +gmy Mycenaean Greek primary Linb Linear B gn Guarani primary Latn Latin goh Old High German secondary Latn Latin gon Gondi primary Deva Devanagari @@ -280,9 +282,7 @@ gor Gorontalo primary Latn Latin gos Gronings primary Latn Latin got Gothic secondary Goth Gothic grb Grebo primary Latn Latin -grc Ancient Greek secondary Cprt Cypriot -grc Ancient Greek secondary Grek Greek -grc Ancient Greek secondary Linb Linear B +grc Ancient Greek primary Grek Greek grt Garo primary Beng Bangla gsw Swiss German primary Latn Latin gu Gujarati primary Gujr Gujarati