From b403a10e514d7317999c78a53e300b15c85616a5 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 19 Sep 2022 12:50:37 -0700 Subject: [PATCH] ICU-21957 integrate CLDR release-42-beta1b to ICU main for 72 --- icu4c/source/common/localefallback_data.h | 725 +++++++++--------- icu4c/source/data/misc/keyTypeData.txt | 4 +- .../com/ibm/icu/impl/LocaleFallbackData.java | 1 + icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 4 +- icu4j/main/shared/data/testdata.jar | 2 +- 6 files changed, 371 insertions(+), 369 deletions(-) diff --git a/icu4c/source/common/localefallback_data.h b/icu4c/source/common/localefallback_data.h index 18cbec78c31..da725de42d9 100644 --- a/icu4c/source/common/localefallback_data.h +++ b/icu4c/source/common/localefallback_data.h @@ -23,8 +23,8 @@ const char scriptCodeChars[] = "Xpeo\0Xsux\0Yiii\0"; const char dsLocaleIDChars[] = - "ab\0abq\0adp\0ady\0ae\0aeb\0aho\0akk\0alt\0am\0apc\0apd\0ar\0" - "arc\0arq\0ars\0ary\0arz\0as\0ase\0av\0avl\0awa\0az_IQ\0az_IR\0" + "ab\0abq\0adp\0ady\0ae\0aeb\0aho\0ajt\0akk\0alt\0am\0apc\0apd\0" + "ar\0arc\0arq\0ars\0ary\0arz\0as\0ase\0av\0avl\0awa\0az_IQ\0az_IR\0" "az_RU\0ba\0bal\0bap\0bax\0bcq\0be\0bej\0bfq\0bft\0bfy\0bg\0bgc\0" "bgn\0bgx\0bhb\0bhi\0bho\0bji\0bjj\0blt\0bn\0bo\0bpy\0bqi\0bra\0" "brh\0brx\0bsq\0bst\0btv\0bua\0byn\0ccp\0ce\0chm\0chr\0cja\0cjm\0" @@ -62,366 +62,367 @@ const int32_t defaultScriptTable[] = { 15, 25, // ae -> Avst 18, 10, // aeb -> Arab 22, 5, // aho -> Ahom - 26, 500, // akk -> Xsux - 30, 90, // alt -> Cyrl - 34, 105, // am -> Ethi - 37, 10, // apc -> Arab - 41, 10, // apd -> Arab - 45, 10, // ar -> Arab - 48, 15, // arc -> Armi - 52, 10, // arq -> Arab - 56, 10, // ars -> Arab - 60, 10, // ary -> Arab - 64, 10, // arz -> Arab - 68, 40, // as -> Beng - 71, 390, // ase -> Sgnw - 75, 90, // av -> Cyrl - 78, 10, // avl -> Arab - 82, 95, // awa -> Deva - 86, 10, // az_IQ -> Arab - 92, 10, // az_IR -> Arab - 98, 90, // az_RU -> Cyrl - 104, 90, // ba -> Cyrl - 107, 10, // bal -> Arab - 111, 95, // bap -> Deva - 115, 30, // bax -> Bamu - 119, 105, // bcq -> Ethi - 123, 90, // be -> Cyrl - 126, 10, // bej -> Arab - 130, 430, // bfq -> Taml - 134, 10, // bft -> Arab - 138, 95, // bfy -> Deva - 142, 90, // bg -> Cyrl - 145, 95, // bgc -> Deva - 149, 10, // bgn -> Arab - 153, 130, // bgx -> Grek - 157, 95, // bhb -> Deva - 161, 95, // bhi -> Deva - 165, 95, // bho -> Deva - 169, 105, // bji -> Ethi - 173, 95, // bjj -> Deva - 177, 440, // blt -> Tavt - 181, 40, // bn -> Beng - 184, 465, // bo -> Tibt - 187, 40, // bpy -> Beng - 191, 10, // bqi -> Arab - 195, 95, // bra -> Deva - 199, 10, // brh -> Arab - 203, 95, // brx -> Deva - 207, 35, // bsq -> Bass - 211, 105, // bst -> Ethi - 215, 95, // btv -> Deva - 219, 90, // bua -> Cyrl - 223, 105, // byn -> Ethi - 227, 50, // ccp -> Cakm - 231, 90, // ce -> Cyrl - 234, 90, // chm -> Cyrl - 238, 70, // chr -> Cher - 242, 10, // cja -> Arab - 246, 65, // cjm -> Cham - 250, 10, // ckb -> Arab - 254, 410, // cmg -> Soyo - 258, 80, // cop -> Copt - 262, 55, // cr -> Cans - 265, 90, // crh -> Cyrl - 269, 55, // crk -> Cans - 273, 55, // crl -> Cans - 277, 55, // csw -> Cans - 281, 340, // ctd -> Pauc - 285, 90, // cu -> Cyrl - 288, 90, // cv -> Cyrl - 291, 90, // dar -> Cyrl - 295, 10, // dcc -> Arab - 299, 10, // dgl -> Arab - 303, 265, // dmf -> Medf - 307, 95, // doi -> Deva - 311, 280, // drh -> Mong - 315, 105, // drs -> Ethi - 319, 95, // dty -> Deva - 323, 455, // dv -> Thaa - 326, 465, // dz -> Tibt - 329, 100, // egy -> Egyp - 333, 180, // eky -> Kali - 337, 130, // el -> Grek - 340, 120, // esg -> Gonm - 344, 170, // ett -> Ital - 348, 10, // fa -> Arab - 351, 10, // fia -> Arab - 355, 10, // fub -> Arab - 359, 145, // gan -> Hans - 363, 95, // gbm -> Deva - 367, 10, // gbz -> Arab - 371, 105, // gez -> Ethi - 375, 95, // ggn -> Deva - 379, 10, // gjk -> Arab - 383, 10, // gju -> Arab - 387, 10, // glk -> Arab - 391, 105, // gmv -> Ethi - 395, 105, // gof -> Ethi - 399, 95, // gom -> Deva - 403, 445, // gon -> Telu - 407, 125, // got -> Goth - 411, 85, // grc -> Cprt - 415, 40, // grt -> Beng - 419, 135, // gu -> Gujr - 422, 95, // gvr -> Deva - 426, 10, // gwc -> Arab - 430, 10, // gwt -> Arab - 434, 10, // ha_CM -> Arab - 440, 10, // ha_SD -> Arab - 446, 145, // hak -> Hans - 450, 10, // haz -> Arab - 454, 105, // hdy -> Ethi - 458, 155, // he -> Hebr - 461, 95, // hi -> Deva - 464, 160, // hlu -> Hluw - 468, 355, // hmd -> Plrd - 472, 10, // hnd -> Arab - 476, 95, // hne -> Deva - 480, 165, // hnj -> Hmnp - 484, 10, // hno -> Arab - 488, 95, // hoc -> Deva - 492, 95, // hoj -> Deva - 496, 145, // hsn -> Hans - 500, 20, // hy -> Armn - 503, 505, // ii -> Yiii - 506, 90, // inh -> Cyrl - 510, 55, // iu -> Cans - 513, 155, // iw -> Hebr - 516, 175, // ja -> Jpan - 519, 155, // ji -> Hebr - 522, 95, // jml -> Deva - 526, 110, // ka -> Geor - 529, 90, // kaa -> Cyrl - 533, 190, // kaw -> Kawi - 537, 90, // kbd -> Cyrl - 541, 10, // kby -> Arab - 545, 460, // kdt -> Thai - 549, 95, // kfr -> Deva - 553, 95, // kfy -> Deva - 557, 425, // khb -> Talu - 561, 95, // khn -> Deva - 565, 290, // kht -> Mymr - 569, 10, // khw -> Arab - 573, 225, // kjg -> Laoo - 577, 90, // kk -> Cyrl - 580, 10, // kk_AF -> Arab - 586, 10, // kk_CN -> Arab - 592, 10, // kk_IR -> Arab - 598, 10, // kk_MN -> Arab - 604, 200, // km -> Khmr - 607, 210, // kn -> Knda - 610, 215, // ko -> Kore - 613, 90, // koi -> Cyrl - 617, 95, // kok -> Deva - 621, 105, // kqy -> Ethi - 625, 90, // krc -> Cyrl - 629, 95, // kru -> Deva - 633, 10, // ks -> Arab - 636, 105, // ktb -> Ethi - 640, 10, // ku_LB -> Arab - 646, 90, // kum -> Cyrl - 650, 90, // kv -> Cyrl - 653, 10, // kvx -> Arab - 657, 105, // kxc -> Ethi - 661, 95, // kxl -> Deva - 665, 460, // kxm -> Thai - 669, 10, // kxp -> Arab - 673, 90, // ky -> Cyrl - 676, 10, // ky_CN -> Arab - 682, 10, // kzh -> Arab - 686, 235, // lab -> Lina - 690, 155, // lad -> Hebr - 694, 10, // lah -> Arab - 698, 90, // lbe -> Cyrl - 702, 460, // lcp -> Thai - 706, 230, // lep -> Lepc - 710, 90, // lez -> Cyrl - 714, 95, // lif -> Deva - 718, 240, // lis -> Lisu - 722, 10, // lki -> Arab - 726, 445, // lmn -> Telu - 730, 225, // lo -> Laoo - 733, 10, // lrc -> Arab - 737, 10, // luz -> Arab - 741, 460, // lwl -> Thai - 745, 145, // lzh -> Hans - 749, 95, // mag -> Deva - 753, 95, // mai -> Deva - 757, 300, // man_GN -> Nkoo - 764, 10, // mde -> Arab - 768, 90, // mdf -> Cyrl - 772, 105, // mdx -> Ethi - 776, 10, // mfa -> Arab - 780, 95, // mgp -> Deva - 784, 90, // mk -> Cyrl - 787, 10, // mki -> Arab - 791, 275, // ml -> Mlym - 794, 90, // mn -> Cyrl - 797, 280, // mn_CN -> Mong - 803, 40, // mni -> Beng - 807, 290, // mnw -> Mymr - 811, 95, // mr -> Deva - 814, 95, // mrd -> Deva - 818, 90, // mrj -> Cyrl - 822, 285, // mro -> Mroo - 826, 10, // ms_CC -> Arab - 832, 95, // mtr -> Deva - 836, 10, // mvy -> Arab - 840, 95, // mwr -> Deva - 844, 165, // mww -> Hmnp - 848, 290, // my -> Mymr - 851, 105, // mym -> Ethi - 855, 90, // myv -> Cyrl - 859, 255, // myz -> Mand - 863, 10, // mzn -> Arab - 867, 145, // nan -> Hans - 871, 95, // ne -> Deva - 874, 95, // new -> Deva - 878, 490, // nnp -> Wcho - 882, 220, // nod -> Lana - 886, 95, // noe -> Deva - 890, 370, // non -> Runr - 894, 300, // nqo -> Nkoo - 898, 55, // nsk -> Cans - 902, 470, // nst -> Tnsa - 906, 55, // oj -> Cans - 909, 55, // ojs -> Cans - 913, 325, // or -> Orya - 916, 10, // oru -> Arab - 920, 90, // os -> Cyrl - 923, 330, // osa -> Osge - 927, 10, // ota -> Arab - 931, 320, // otk -> Orkh - 935, 335, // oui -> Ougr - 939, 140, // pa -> Guru - 942, 10, // pa_PK -> Arab - 948, 345, // pal -> Phli - 952, 495, // peo -> Xpeo - 956, 10, // phl -> Arab - 960, 350, // phn -> Phnx - 964, 45, // pka -> Brah - 968, 130, // pnt -> Grek - 972, 95, // ppa -> Deva - 976, 195, // pra -> Khar - 980, 10, // prd -> Arab - 984, 10, // ps -> Arab - 987, 95, // raj -> Deva - 991, 365, // rhg -> Rohg - 995, 450, // rif -> Tfng - 999, 95, // rjs -> Deva - 1003, 40, // rkt -> Beng - 1007, 10, // rmt -> Arab - 1011, 90, // ru -> Cyrl - 1014, 90, // rue -> Cyrl - 1018, 185, // ryu -> Kana - 1022, 95, // sa -> Deva - 1025, 90, // sah -> Cyrl - 1029, 315, // sat -> Olck - 1033, 385, // saz -> Saur - 1037, 95, // sck -> Deva - 1041, 10, // scl -> Arab - 1045, 10, // sd -> Arab - 1048, 95, // sd_IN -> Deva - 1054, 10, // sdh -> Arab - 1058, 310, // sga -> Ogam - 1062, 105, // sgw -> Ethi - 1066, 450, // shi -> Tfng - 1070, 290, // shn -> Mymr - 1074, 10, // shu -> Arab - 1078, 395, // si -> Sinh - 1081, 10, // skr -> Arab - 1085, 375, // smp -> Samr - 1089, 400, // sog -> Sogd - 1093, 460, // sou -> Thai - 1097, 90, // sr -> Cyrl - 1100, 405, // srb -> Sora - 1104, 95, // srx -> Deva - 1108, 10, // swb -> Arab - 1112, 95, // swv -> Deva - 1116, 40, // syl -> Beng - 1120, 415, // syr -> Syrc - 1124, 430, // ta -> Taml - 1127, 95, // taj -> Deva - 1131, 210, // tcy -> Knda - 1135, 420, // tdd -> Tale - 1139, 95, // tdg -> Deva - 1143, 95, // tdh -> Deva - 1147, 445, // te -> Telu - 1150, 90, // tg -> Cyrl - 1153, 10, // tg_PK -> Arab - 1159, 460, // th -> Thai - 1162, 95, // thl -> Deva - 1166, 95, // thq -> Deva - 1170, 95, // thr -> Deva - 1174, 105, // ti -> Ethi - 1177, 105, // tig -> Ethi - 1181, 95, // tkt -> Deva - 1185, 10, // trw -> Arab - 1189, 130, // tsd -> Grek - 1193, 95, // tsf -> Deva - 1197, 465, // tsj -> Tibt - 1201, 90, // tt -> Cyrl - 1204, 460, // tts -> Thai - 1208, 435, // txg -> Tang - 1212, 475, // txo -> Toto - 1216, 90, // tyv -> Cyrl - 1220, 0, // udi -> Aghb - 1224, 90, // udm -> Cyrl - 1228, 10, // ug -> Arab - 1231, 90, // ug_KZ -> Cyrl - 1237, 90, // ug_MN -> Cyrl - 1243, 480, // uga -> Ugar - 1247, 90, // uk -> Cyrl - 1250, 40, // unr -> Beng - 1254, 95, // unr_NP -> Deva - 1261, 40, // unx -> Beng - 1265, 10, // ur -> Arab - 1268, 10, // uz_AF -> Arab - 1274, 90, // uz_CN -> Cyrl - 1280, 485, // vai -> Vaii - 1284, 105, // wal -> Ethi - 1288, 445, // wbq -> Telu - 1292, 95, // wbr -> Deva - 1296, 10, // wni -> Arab - 1300, 115, // wsg -> Gong - 1304, 95, // wtm -> Deva - 1308, 145, // wuu -> Hans - 1312, 75, // xco -> Chrs - 1316, 60, // xcr -> Cari - 1320, 245, // xlc -> Lyci - 1324, 250, // xld -> Lydi - 1328, 110, // xmf -> Geor - 1332, 260, // xmn -> Mani - 1336, 270, // xmr -> Merc - 1340, 295, // xna -> Narb - 1344, 95, // xnr -> Deva - 1348, 360, // xpr -> Prti - 1352, 380, // xsa -> Sarb - 1356, 95, // xsr -> Deva - 1360, 155, // yi -> Hebr - 1363, 150, // yue -> Hant - 1367, 145, // yue_CN -> Hans - 1374, 10, // zdj -> Arab - 1378, 450, // zgh -> Tfng - 1382, 145, // zh -> Hans - 1385, 150, // zh_AU -> Hant - 1391, 150, // zh_BN -> Hant - 1397, 150, // zh_GB -> Hant - 1403, 150, // zh_GF -> Hant - 1409, 150, // zh_HK -> Hant - 1415, 150, // zh_ID -> Hant - 1421, 150, // zh_MO -> Hant - 1427, 150, // zh_PA -> Hant - 1433, 150, // zh_PF -> Hant - 1439, 150, // zh_PH -> Hant - 1445, 150, // zh_SR -> Hant - 1451, 150, // zh_TH -> Hant - 1457, 150, // zh_TW -> Hant - 1463, 150, // zh_US -> Hant - 1469, 150, // zh_VN -> Hant - 1475, 305, // zhx -> Nshu - 1479, 205, // zkt -> Kits + 26, 10, // ajt -> Arab + 30, 500, // akk -> Xsux + 34, 90, // alt -> Cyrl + 38, 105, // am -> Ethi + 41, 10, // apc -> Arab + 45, 10, // apd -> Arab + 49, 10, // ar -> Arab + 52, 15, // arc -> Armi + 56, 10, // arq -> Arab + 60, 10, // ars -> Arab + 64, 10, // ary -> Arab + 68, 10, // arz -> Arab + 72, 40, // as -> Beng + 75, 390, // ase -> Sgnw + 79, 90, // av -> Cyrl + 82, 10, // avl -> Arab + 86, 95, // awa -> Deva + 90, 10, // az_IQ -> Arab + 96, 10, // az_IR -> Arab + 102, 90, // az_RU -> Cyrl + 108, 90, // ba -> Cyrl + 111, 10, // bal -> Arab + 115, 95, // bap -> Deva + 119, 30, // bax -> Bamu + 123, 105, // bcq -> Ethi + 127, 90, // be -> Cyrl + 130, 10, // bej -> Arab + 134, 430, // bfq -> Taml + 138, 10, // bft -> Arab + 142, 95, // bfy -> Deva + 146, 90, // bg -> Cyrl + 149, 95, // bgc -> Deva + 153, 10, // bgn -> Arab + 157, 130, // bgx -> Grek + 161, 95, // bhb -> Deva + 165, 95, // bhi -> Deva + 169, 95, // bho -> Deva + 173, 105, // bji -> Ethi + 177, 95, // bjj -> Deva + 181, 440, // blt -> Tavt + 185, 40, // bn -> Beng + 188, 465, // bo -> Tibt + 191, 40, // bpy -> Beng + 195, 10, // bqi -> Arab + 199, 95, // bra -> Deva + 203, 10, // brh -> Arab + 207, 95, // brx -> Deva + 211, 35, // bsq -> Bass + 215, 105, // bst -> Ethi + 219, 95, // btv -> Deva + 223, 90, // bua -> Cyrl + 227, 105, // byn -> Ethi + 231, 50, // ccp -> Cakm + 235, 90, // ce -> Cyrl + 238, 90, // chm -> Cyrl + 242, 70, // chr -> Cher + 246, 10, // cja -> Arab + 250, 65, // cjm -> Cham + 254, 10, // ckb -> Arab + 258, 410, // cmg -> Soyo + 262, 80, // cop -> Copt + 266, 55, // cr -> Cans + 269, 90, // crh -> Cyrl + 273, 55, // crk -> Cans + 277, 55, // crl -> Cans + 281, 55, // csw -> Cans + 285, 340, // ctd -> Pauc + 289, 90, // cu -> Cyrl + 292, 90, // cv -> Cyrl + 295, 90, // dar -> Cyrl + 299, 10, // dcc -> Arab + 303, 10, // dgl -> Arab + 307, 265, // dmf -> Medf + 311, 95, // doi -> Deva + 315, 280, // drh -> Mong + 319, 105, // drs -> Ethi + 323, 95, // dty -> Deva + 327, 455, // dv -> Thaa + 330, 465, // dz -> Tibt + 333, 100, // egy -> Egyp + 337, 180, // eky -> Kali + 341, 130, // el -> Grek + 344, 120, // esg -> Gonm + 348, 170, // ett -> Ital + 352, 10, // fa -> Arab + 355, 10, // fia -> Arab + 359, 10, // fub -> Arab + 363, 145, // gan -> Hans + 367, 95, // gbm -> Deva + 371, 10, // gbz -> Arab + 375, 105, // gez -> Ethi + 379, 95, // ggn -> Deva + 383, 10, // gjk -> Arab + 387, 10, // gju -> Arab + 391, 10, // glk -> Arab + 395, 105, // gmv -> Ethi + 399, 105, // gof -> Ethi + 403, 95, // gom -> Deva + 407, 445, // gon -> Telu + 411, 125, // got -> Goth + 415, 85, // grc -> Cprt + 419, 40, // grt -> Beng + 423, 135, // gu -> Gujr + 426, 95, // gvr -> Deva + 430, 10, // gwc -> Arab + 434, 10, // gwt -> Arab + 438, 10, // ha_CM -> Arab + 444, 10, // ha_SD -> Arab + 450, 145, // hak -> Hans + 454, 10, // haz -> Arab + 458, 105, // hdy -> Ethi + 462, 155, // he -> Hebr + 465, 95, // hi -> Deva + 468, 160, // hlu -> Hluw + 472, 355, // hmd -> Plrd + 476, 10, // hnd -> Arab + 480, 95, // hne -> Deva + 484, 165, // hnj -> Hmnp + 488, 10, // hno -> Arab + 492, 95, // hoc -> Deva + 496, 95, // hoj -> Deva + 500, 145, // hsn -> Hans + 504, 20, // hy -> Armn + 507, 505, // ii -> Yiii + 510, 90, // inh -> Cyrl + 514, 55, // iu -> Cans + 517, 155, // iw -> Hebr + 520, 175, // ja -> Jpan + 523, 155, // ji -> Hebr + 526, 95, // jml -> Deva + 530, 110, // ka -> Geor + 533, 90, // kaa -> Cyrl + 537, 190, // kaw -> Kawi + 541, 90, // kbd -> Cyrl + 545, 10, // kby -> Arab + 549, 460, // kdt -> Thai + 553, 95, // kfr -> Deva + 557, 95, // kfy -> Deva + 561, 425, // khb -> Talu + 565, 95, // khn -> Deva + 569, 290, // kht -> Mymr + 573, 10, // khw -> Arab + 577, 225, // kjg -> Laoo + 581, 90, // kk -> Cyrl + 584, 10, // kk_AF -> Arab + 590, 10, // kk_CN -> Arab + 596, 10, // kk_IR -> Arab + 602, 10, // kk_MN -> Arab + 608, 200, // km -> Khmr + 611, 210, // kn -> Knda + 614, 215, // ko -> Kore + 617, 90, // koi -> Cyrl + 621, 95, // kok -> Deva + 625, 105, // kqy -> Ethi + 629, 90, // krc -> Cyrl + 633, 95, // kru -> Deva + 637, 10, // ks -> Arab + 640, 105, // ktb -> Ethi + 644, 10, // ku_LB -> Arab + 650, 90, // kum -> Cyrl + 654, 90, // kv -> Cyrl + 657, 10, // kvx -> Arab + 661, 105, // kxc -> Ethi + 665, 95, // kxl -> Deva + 669, 460, // kxm -> Thai + 673, 10, // kxp -> Arab + 677, 90, // ky -> Cyrl + 680, 10, // ky_CN -> Arab + 686, 10, // kzh -> Arab + 690, 235, // lab -> Lina + 694, 155, // lad -> Hebr + 698, 10, // lah -> Arab + 702, 90, // lbe -> Cyrl + 706, 460, // lcp -> Thai + 710, 230, // lep -> Lepc + 714, 90, // lez -> Cyrl + 718, 95, // lif -> Deva + 722, 240, // lis -> Lisu + 726, 10, // lki -> Arab + 730, 445, // lmn -> Telu + 734, 225, // lo -> Laoo + 737, 10, // lrc -> Arab + 741, 10, // luz -> Arab + 745, 460, // lwl -> Thai + 749, 145, // lzh -> Hans + 753, 95, // mag -> Deva + 757, 95, // mai -> Deva + 761, 300, // man_GN -> Nkoo + 768, 10, // mde -> Arab + 772, 90, // mdf -> Cyrl + 776, 105, // mdx -> Ethi + 780, 10, // mfa -> Arab + 784, 95, // mgp -> Deva + 788, 90, // mk -> Cyrl + 791, 10, // mki -> Arab + 795, 275, // ml -> Mlym + 798, 90, // mn -> Cyrl + 801, 280, // mn_CN -> Mong + 807, 40, // mni -> Beng + 811, 290, // mnw -> Mymr + 815, 95, // mr -> Deva + 818, 95, // mrd -> Deva + 822, 90, // mrj -> Cyrl + 826, 285, // mro -> Mroo + 830, 10, // ms_CC -> Arab + 836, 95, // mtr -> Deva + 840, 10, // mvy -> Arab + 844, 95, // mwr -> Deva + 848, 165, // mww -> Hmnp + 852, 290, // my -> Mymr + 855, 105, // mym -> Ethi + 859, 90, // myv -> Cyrl + 863, 255, // myz -> Mand + 867, 10, // mzn -> Arab + 871, 145, // nan -> Hans + 875, 95, // ne -> Deva + 878, 95, // new -> Deva + 882, 490, // nnp -> Wcho + 886, 220, // nod -> Lana + 890, 95, // noe -> Deva + 894, 370, // non -> Runr + 898, 300, // nqo -> Nkoo + 902, 55, // nsk -> Cans + 906, 470, // nst -> Tnsa + 910, 55, // oj -> Cans + 913, 55, // ojs -> Cans + 917, 325, // or -> Orya + 920, 10, // oru -> Arab + 924, 90, // os -> Cyrl + 927, 330, // osa -> Osge + 931, 10, // ota -> Arab + 935, 320, // otk -> Orkh + 939, 335, // oui -> Ougr + 943, 140, // pa -> Guru + 946, 10, // pa_PK -> Arab + 952, 345, // pal -> Phli + 956, 495, // peo -> Xpeo + 960, 10, // phl -> Arab + 964, 350, // phn -> Phnx + 968, 45, // pka -> Brah + 972, 130, // pnt -> Grek + 976, 95, // ppa -> Deva + 980, 195, // pra -> Khar + 984, 10, // prd -> Arab + 988, 10, // ps -> Arab + 991, 95, // raj -> Deva + 995, 365, // rhg -> Rohg + 999, 450, // rif -> Tfng + 1003, 95, // rjs -> Deva + 1007, 40, // rkt -> Beng + 1011, 10, // rmt -> Arab + 1015, 90, // ru -> Cyrl + 1018, 90, // rue -> Cyrl + 1022, 185, // ryu -> Kana + 1026, 95, // sa -> Deva + 1029, 90, // sah -> Cyrl + 1033, 315, // sat -> Olck + 1037, 385, // saz -> Saur + 1041, 95, // sck -> Deva + 1045, 10, // scl -> Arab + 1049, 10, // sd -> Arab + 1052, 95, // sd_IN -> Deva + 1058, 10, // sdh -> Arab + 1062, 310, // sga -> Ogam + 1066, 105, // sgw -> Ethi + 1070, 450, // shi -> Tfng + 1074, 290, // shn -> Mymr + 1078, 10, // shu -> Arab + 1082, 395, // si -> Sinh + 1085, 10, // skr -> Arab + 1089, 375, // smp -> Samr + 1093, 400, // sog -> Sogd + 1097, 460, // sou -> Thai + 1101, 90, // sr -> Cyrl + 1104, 405, // srb -> Sora + 1108, 95, // srx -> Deva + 1112, 10, // swb -> Arab + 1116, 95, // swv -> Deva + 1120, 40, // syl -> Beng + 1124, 415, // syr -> Syrc + 1128, 430, // ta -> Taml + 1131, 95, // taj -> Deva + 1135, 210, // tcy -> Knda + 1139, 420, // tdd -> Tale + 1143, 95, // tdg -> Deva + 1147, 95, // tdh -> Deva + 1151, 445, // te -> Telu + 1154, 90, // tg -> Cyrl + 1157, 10, // tg_PK -> Arab + 1163, 460, // th -> Thai + 1166, 95, // thl -> Deva + 1170, 95, // thq -> Deva + 1174, 95, // thr -> Deva + 1178, 105, // ti -> Ethi + 1181, 105, // tig -> Ethi + 1185, 95, // tkt -> Deva + 1189, 10, // trw -> Arab + 1193, 130, // tsd -> Grek + 1197, 95, // tsf -> Deva + 1201, 465, // tsj -> Tibt + 1205, 90, // tt -> Cyrl + 1208, 460, // tts -> Thai + 1212, 435, // txg -> Tang + 1216, 475, // txo -> Toto + 1220, 90, // tyv -> Cyrl + 1224, 0, // udi -> Aghb + 1228, 90, // udm -> Cyrl + 1232, 10, // ug -> Arab + 1235, 90, // ug_KZ -> Cyrl + 1241, 90, // ug_MN -> Cyrl + 1247, 480, // uga -> Ugar + 1251, 90, // uk -> Cyrl + 1254, 40, // unr -> Beng + 1258, 95, // unr_NP -> Deva + 1265, 40, // unx -> Beng + 1269, 10, // ur -> Arab + 1272, 10, // uz_AF -> Arab + 1278, 90, // uz_CN -> Cyrl + 1284, 485, // vai -> Vaii + 1288, 105, // wal -> Ethi + 1292, 445, // wbq -> Telu + 1296, 95, // wbr -> Deva + 1300, 10, // wni -> Arab + 1304, 115, // wsg -> Gong + 1308, 95, // wtm -> Deva + 1312, 145, // wuu -> Hans + 1316, 75, // xco -> Chrs + 1320, 60, // xcr -> Cari + 1324, 245, // xlc -> Lyci + 1328, 250, // xld -> Lydi + 1332, 110, // xmf -> Geor + 1336, 260, // xmn -> Mani + 1340, 270, // xmr -> Merc + 1344, 295, // xna -> Narb + 1348, 95, // xnr -> Deva + 1352, 360, // xpr -> Prti + 1356, 380, // xsa -> Sarb + 1360, 95, // xsr -> Deva + 1364, 155, // yi -> Hebr + 1367, 150, // yue -> Hant + 1371, 145, // yue_CN -> Hans + 1378, 10, // zdj -> Arab + 1382, 450, // zgh -> Tfng + 1386, 145, // zh -> Hans + 1389, 150, // zh_AU -> Hant + 1395, 150, // zh_BN -> Hant + 1401, 150, // zh_GB -> Hant + 1407, 150, // zh_GF -> Hant + 1413, 150, // zh_HK -> Hant + 1419, 150, // zh_ID -> Hant + 1425, 150, // zh_MO -> Hant + 1431, 150, // zh_PA -> Hant + 1437, 150, // zh_PF -> Hant + 1443, 150, // zh_PH -> Hant + 1449, 150, // zh_SR -> Hant + 1455, 150, // zh_TH -> Hant + 1461, 150, // zh_TW -> Hant + 1467, 150, // zh_US -> Hant + 1473, 150, // zh_VN -> Hant + 1479, 305, // zhx -> Nshu + 1483, 205, // zkt -> Kits }; //====================================================================== diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt index 0fe141d529a..75ff90f5e0f 100644 --- a/icu4c/source/data/misc/keyTypeData.txt +++ b/icu4c/source/data/misc/keyTypeData.txt @@ -49,7 +49,7 @@ keyTypeData:table(nofallback){ lw{""} m0{""} measure{"ms"} - measurement-unit{"mu"} + mu{""} numbers{"nu"} rg{""} s0{""} @@ -618,7 +618,7 @@ keyTypeData:table(nofallback){ metric{""} ussystem{""} } - measurement-unit{ + mu{ celsius{""} fahrenhe{""} kelvin{""} diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleFallbackData.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleFallbackData.java index ea42151da72..e09559f83ac 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleFallbackData.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleFallbackData.java @@ -26,6 +26,7 @@ class LocaleFallbackData { t.put("ae", "Avst"); t.put("aeb", "Arab"); t.put("aho", "Ahom"); + t.put("ajt", "Arab"); t.put("akk", "Xsux"); t.put("alt", "Cyrl"); t.put("am", "Ethi"); diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 454a9d06ed2..15b748c2c3c 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:351e9ec7313d1790c632ccd0bda7bfe0c902bf44a3b77edd6727e1f3867a7bf0 -size 14172315 +oid sha256:be6c5894e82fad8d494d73fe41ba083ba08290a78cc5f359431a8b73188d8658 +size 14172311 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 292c31eb2c1..91a92af7bb1 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43439de857605f4c5b84d73891bb2d0ede88866bf93db98bdf1e7638e3849bbf -size 93667 +oid sha256:782ec347cdeed1852c5b37b63c8120469dfabaec6aff408d9c3b80f6a1522fb7 +size 93663 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 5ad5c3330dc..91fa96194df 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e37c706605af4a3ddf8f58b3526d5d5904df5e552086d3cc6e69bef63be6048c +oid sha256:a522856180aa25c87c818fadca9b85cf64463204190f3280a76bbf1e83ed8b38 size 831602