From 7159e334ff12893b857de9a92e1c2eae4f3399fc Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 16 Feb 2021 01:08:03 -0800 Subject: [PATCH] ICU-21480 integrate CLDR release 39 alpha1 to ICU trunk --- icu4c/source/common/locid.cpp | 4 +- icu4c/source/common/locmap.cpp | 4 +- icu4c/source/common/uresbund.cpp | 19 +- icu4c/source/data/coll/LOCALE_DEPS.json | 4 +- icu4c/source/data/coll/nb.txt | 2 +- icu4c/source/data/coll/nb_NO.txt | 1 - icu4c/source/data/coll/no_NO.txt | 1 + icu4c/source/data/curr/LOCALE_DEPS.json | 5 +- icu4c/source/data/curr/nb.txt | 2 +- icu4c/source/data/curr/nb_NO.txt | 6 - icu4c/source/data/curr/nb_SJ.txt | 6 - icu4c/source/data/curr/nn.txt | 1480 +---------------- icu4c/source/data/curr/no_NO.txt | 5 +- icu4c/source/data/curr/no_SJ.txt | 9 - icu4c/source/data/lang/LOCALE_DEPS.json | 5 +- icu4c/source/data/lang/nb.txt | 2 +- icu4c/source/data/lang/nb_NO.txt | 6 - icu4c/source/data/lang/nb_SJ.txt | 6 - icu4c/source/data/lang/nn.txt | 572 ------- icu4c/source/data/lang/no_NO.txt | 5 +- icu4c/source/data/lang/no_SJ.txt | 9 - icu4c/source/data/locales/LOCALE_DEPS.json | 5 +- icu4c/source/data/locales/ko.txt | 2 +- icu4c/source/data/locales/nb.txt | 2 +- icu4c/source/data/locales/nb_NO.txt | 1 - icu4c/source/data/locales/nb_SJ.txt | 1 - icu4c/source/data/locales/nn.txt | 665 +------- icu4c/source/data/locales/no_NO.txt | 1 + icu4c/source/data/locales/no_SJ.txt | 5 - icu4c/source/data/misc/dayPeriods.txt | 2 + .../source/data/misc/grammaticalFeatures.txt | 370 +++++ icu4c/source/data/misc/langInfo.txt | 638 +++---- icu4c/source/data/misc/likelySubtags.txt | 4 +- icu4c/source/data/misc/metadata.txt | 13 +- icu4c/source/data/misc/pluralRanges.txt | 1 + icu4c/source/data/misc/plurals.txt | 1 + icu4c/source/data/misc/supplementalData.txt | 31 +- icu4c/source/data/misc/windowsZones.txt | 6 +- icu4c/source/data/rbnf/LOCALE_DEPS.json | 2 +- icu4c/source/data/rbnf/nb.txt | 2 +- icu4c/source/data/rbnf/ne.txt | 174 ++ icu4c/source/data/region/LOCALE_DEPS.json | 5 +- icu4c/source/data/region/nb.txt | 2 +- icu4c/source/data/region/nb_NO.txt | 6 - icu4c/source/data/region/nb_SJ.txt | 6 - icu4c/source/data/region/nn.txt | 256 +-- icu4c/source/data/region/no_NO.txt | 5 +- icu4c/source/data/region/no_SJ.txt | 9 - icu4c/source/data/unit/LOCALE_DEPS.json | 5 +- icu4c/source/data/unit/fa.txt | 262 +-- icu4c/source/data/unit/nb.txt | 2 +- icu4c/source/data/unit/nb_NO.txt | 6 - icu4c/source/data/unit/nb_SJ.txt | 6 - icu4c/source/data/unit/nn.txt | 1409 +--------------- icu4c/source/data/unit/no.txt | 28 +- icu4c/source/data/unit/no_NO.txt | 5 +- icu4c/source/data/unit/no_SJ.txt | 9 - icu4c/source/data/zone/LOCALE_DEPS.json | 5 +- icu4c/source/data/zone/nb.txt | 2 +- icu4c/source/data/zone/nb_NO.txt | 6 - icu4c/source/data/zone/nb_SJ.txt | 6 - icu4c/source/data/zone/nn.txt | 1404 ---------------- icu4c/source/data/zone/no_NO.txt | 5 +- icu4c/source/data/zone/no_SJ.txt | 9 - icu4c/source/test/cintltst/cldrtest.c | 3 +- icu4c/source/test/cintltst/cloctst.c | 8 +- icu4c/source/test/cintltst/creststn.c | 6 +- icu4c/source/test/intltest/loctest.cpp | 22 +- .../test/testdata/localeCanonicalization.txt | 14 +- .../test/testdata/numberpermutationtest.txt | 162 +- .../core/src/com/ibm/icu/impl/LocaleIDs.java | 4 +- .../core/src/com/ibm/icu/util/ULocale.java | 4 +- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 4 +- .../icu/dev/data/numberpermutationtest.txt | 162 +- .../data/unicode/localeCanonicalization.txt | 14 +- .../ibm/icu/dev/test/util/ULocaleTest.java | 22 +- tools/cldr/cldr-to-icu/build-icu-data.xml | 9 +- .../icu/tool/cldrtoicu/LdmlConverter.java | 4 + .../icu/tool/cldrtoicu/SupplementalData.java | 5 + .../tool/cldrtoicu/ant/LocaleIdResolver.java | 2 + 81 files changed, 1332 insertions(+), 6654 deletions(-) delete mode 100644 icu4c/source/data/curr/nb_NO.txt delete mode 100644 icu4c/source/data/curr/nb_SJ.txt delete mode 100644 icu4c/source/data/curr/no_SJ.txt delete mode 100644 icu4c/source/data/lang/nb_NO.txt delete mode 100644 icu4c/source/data/lang/nb_SJ.txt delete mode 100644 icu4c/source/data/lang/no_SJ.txt delete mode 100644 icu4c/source/data/locales/no_SJ.txt create mode 100644 icu4c/source/data/rbnf/ne.txt delete mode 100644 icu4c/source/data/region/nb_NO.txt delete mode 100644 icu4c/source/data/region/nb_SJ.txt delete mode 100644 icu4c/source/data/region/no_SJ.txt delete mode 100644 icu4c/source/data/unit/nb_NO.txt delete mode 100644 icu4c/source/data/unit/nb_SJ.txt delete mode 100644 icu4c/source/data/unit/no_SJ.txt delete mode 100644 icu4c/source/data/zone/nb_NO.txt delete mode 100644 icu4c/source/data/zone/nb_SJ.txt delete mode 100644 icu4c/source/data/zone/no_SJ.txt diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp index b02c335cad9..448c1de5e44 100644 --- a/icu4c/source/common/locid.cpp +++ b/icu4c/source/common/locid.cpp @@ -523,8 +523,8 @@ static const char* const KNOWN_CANONICALIZED[] = { "it", "it_IT", "ja", "ja_JP", "jv", "jv_ID", "ka", "ka_GE", "kk", "kk_KZ", "km", "km_KH", "kn", "kn_IN", "ko", "ko_KR", "ky", "ky_KG", "lo", "lo_LA", "lt", "lt_LT", "lv", "lv_LV", "mk", "mk_MK", "ml", "ml_IN", "mn", "mn_MN", - "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "ne", "ne_NP", "nl", "nl_NL", - "no", "no_NO", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", + "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "nb", "nb_NO", "ne", "ne_NP", + "nl", "nl_NL", "no", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", "pt", "pt_BR", "pt_PT", "ro", "ro_RO", "ru", "ru_RU", "sd", "sd_IN", "si", "si_LK", "sk", "sk_SK", "sl", "sl_SI", "so", "so_SO", "sq", "sq_AL", "sr", "sr_Cyrl_RS", "sr_Latn", "sr_RS", "sv", "sv_SE", "sw", "sw_TZ", "ta", diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp index 46008afb74a..29a5646385e 100644 --- a/icu4c/source/common/locmap.cpp +++ b/icu4c/source/common/locmap.cpp @@ -526,8 +526,8 @@ ILCID_POSIX_SUBTABLE(nl) { ILCID_POSIX_SUBTABLE(no) { {0x14, "no"}, /* really nb_NO - actually Windows differentiates between neutral (no region) and specific (with region) */ {0x7c14, "nb"}, /* really nb */ - {0x0414, "no_NO"}, /* really no_NO. Keep first in the 414 list. */ - {0x0414, "nb_NO"}, /* really no_NO */ + {0x0414, "nb_NO"}, /* really nb_NO. Keep first in the 414 list. */ + {0x0414, "no_NO"}, /* really nb_NO */ {0x0814, "nn_NO"}, /* really nn_NO. Keep first in the 814 list. */ {0x7814, "nn"}, /* It's 0x14 or 0x814, pick one to make the test program happy. */ {0x0814, "no_NO_NY"}/* really nn_NO */ diff --git a/icu4c/source/common/uresbund.cpp b/icu4c/source/common/uresbund.cpp index d2746b17d9e..5ea4187100e 100644 --- a/icu4c/source/common/uresbund.cpp +++ b/icu4c/source/common/uresbund.cpp @@ -91,6 +91,15 @@ static UBool chopLocale(char *name) { return FALSE; } +/** + * Called to check whether a name without '_' needs to be checked for a parent. + * Some code had assumed that locale IDs with '_' could not have a non-root parent. + * We may want a better way of doing this. + */ +static UBool mayHaveParent(char *name) { + return (name[0] != 0 && uprv_strstr("nb nn",name) != nullptr); +} + /** * Internal function */ @@ -529,8 +538,8 @@ loadParentsExceptRoot(UResourceDataEntry *&t1, char name[], int32_t nameCapacity, UBool usingUSRData, char usrDataPath[], UErrorCode *status) { if (U_FAILURE(*status)) { return FALSE; } - UBool hasChopped = TRUE; - while (hasChopped && t1->fParent == NULL && !t1->fData.noFallback && + UBool checkParent = TRUE; + while (checkParent && t1->fParent == NULL && !t1->fData.noFallback && res_getResource(&t1->fData,"%%ParentIsRoot") == RES_BOGUS) { Resource parentRes = res_getResource(&t1->fData, "%%Parent"); if (parentRes != RES_BOGUS) { // An explicit parent was found. @@ -573,7 +582,7 @@ loadParentsExceptRoot(UResourceDataEntry *&t1, } } t1 = t2; - hasChopped = chopLocale(name); + checkParent = chopLocale(name) || mayHaveParent(name); } return TRUE; } @@ -692,7 +701,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, } } } - if (hasChopped && !isRoot) { + if ((hasChopped || mayHaveParent(name)) && !isRoot) { if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) { goto finish; } @@ -716,7 +725,7 @@ static UResourceDataEntry *entryOpen(const char* path, const char* localeID, hasRealData = TRUE; isDefault = TRUE; // TODO: Why not if (usingUSRData) { ... } like in the non-default-locale code path? - if (hasChopped && !isRoot) { + if ((hasChopped || mayHaveParent(name)) && !isRoot) { if (!loadParentsExceptRoot(t1, name, UPRV_LENGTHOF(name), usingUSRData, usrDataPath, status)) { goto finish; } diff --git a/icu4c/source/data/coll/LOCALE_DEPS.json b/icu4c/source/data/coll/LOCALE_DEPS.json index 5977eb7e183..ce2e4768f04 100644 --- a/icu4c/source/data/coll/LOCALE_DEPS.json +++ b/icu4c/source/data/coll/LOCALE_DEPS.json @@ -11,8 +11,7 @@ "iw": "he", "iw_IL": "he_IL", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", + "no_NO": "no", "pa_IN": "pa_Guru_IN", "sh": "sr_Latn", "sh_BA": "sr_Latn_BA", @@ -34,6 +33,7 @@ }, "parents": { "ff_Adlm": "root", + "nb": "no", "nn": "no" } } diff --git a/icu4c/source/data/coll/nb.txt b/icu4c/source/data/coll/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/coll/nb.txt +++ b/icu4c/source/data/coll/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/coll/nb_NO.txt b/icu4c/source/data/coll/nb_NO.txt index 2de7860c57e..61b454bf298 100644 --- a/icu4c/source/data/coll/nb_NO.txt +++ b/icu4c/source/data/coll/nb_NO.txt @@ -2,5 +2,4 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb_NO{ - "%%ALIAS"{"no_NO"} } diff --git a/icu4c/source/data/coll/no_NO.txt b/icu4c/source/data/coll/no_NO.txt index d9e856ba0bb..6613a86c4e6 100644 --- a/icu4c/source/data/coll/no_NO.txt +++ b/icu4c/source/data/coll/no_NO.txt @@ -2,4 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/curr/LOCALE_DEPS.json b/icu4c/source/data/curr/LOCALE_DEPS.json index f737ebe3754..606469a66a5 100644 --- a/icu4c/source/data/curr/LOCALE_DEPS.json +++ b/icu4c/source/data/curr/LOCALE_DEPS.json @@ -21,9 +21,7 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", - "nb_SJ": "no_SJ", + "no_NO": "no", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -178,6 +176,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nb": "no", "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", diff --git a/icu4c/source/data/curr/nb.txt b/icu4c/source/data/curr/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/curr/nb.txt +++ b/icu4c/source/data/curr/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/curr/nb_NO.txt b/icu4c/source/data/curr/nb_NO.txt deleted file mode 100644 index 2de7860c57e..00000000000 --- a/icu4c/source/data/curr/nb_NO.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_NO{ - "%%ALIAS"{"no_NO"} -} diff --git a/icu4c/source/data/curr/nb_SJ.txt b/icu4c/source/data/curr/nb_SJ.txt deleted file mode 100644 index b1caa388a5d..00000000000 --- a/icu4c/source/data/curr/nb_SJ.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_SJ{ - "%%ALIAS"{"no_SJ"} -} diff --git a/icu4c/source/data/curr/nn.txt b/icu4c/source/data/curr/nn.txt index 497473859f7..f52bbb72711 100644 --- a/icu4c/source/data/curr/nn.txt +++ b/icu4c/source/data/curr/nn.txt @@ -8,34 +8,10 @@ nn{ "ADP", "andorranske peseta", } - AED{ - "AED", - "emiratarabiske dirham", - } AFA{ "AFA", "afghani (1927–2002)", } - AFN{ - "AFN", - "afghanske afghani", - } - ALL{ - "ALL", - "albanske lek", - } - AMD{ - "AMD", - "armenske dram", - } - ANG{ - "ANG", - "nederlandske antillegylden", - } - AOA{ - "AOA", - "angolanske kwanza", - } AOK{ "AOK", "angolske kwanza (1977–1990)", @@ -56,54 +32,22 @@ nn{ "ARP", "argentinske peso (1983–1985)", } - ARS{ - "ARS", - "argentinske pesos", - } ATS{ "ATS", "austerrikske schilling", } - AUD{ - "AUD", - "australske dollar", - } - AWG{ - "AWG", - "arubiske floriner", - } AZM{ "AZM", "aserbaijanske manat", } - AZN{ - "AZN", - "aserbajdsjanske manat", - } BAD{ "BAD", "bosnisk-hercegovinske dinarar", } - BAM{ - "BAM", - "bosnisk-hercegovinske konvertible mark", - } - BBD{ - "BBD", - "barbadiske dollar", - } - BDT{ - "BDT", - "bangladeshiske taka", - } BEC{ "BEC", "belgiske franc (konvertibel)", } - BEF{ - "BEF", - "belgiske franc", - } BEL{ "BEL", "belgiske franc (finansiell)", @@ -112,30 +56,10 @@ nn{ "BGL", "bulgarsk hard lev", } - BGN{ - "BGN", - "bulgarske lev", - } BHD{ "BHD", "bahrainske dinarar", } - BIF{ - "BIF", - "burundiske franc", - } - BMD{ - "BMD", - "bermudiske dollar", - } - BND{ - "BND", - "bruneiske dollar", - } - BOB{ - "BOB", - "bolivianske boliviano", - } BOP{ "BOP", "boliviske peso", @@ -152,14 +76,6 @@ nn{ "BRC", "brasilianske cruzado", } - BRE{ - "BRE", - "brasilianske cruzeiro (1990–1993)", - } - BRL{ - "BRL", - "brasilianske real", - } BRN{ "BRN", "brasilianske cruzado novo", @@ -168,22 +84,10 @@ nn{ "BRR", "brasilianske cruzeiro", } - BSD{ - "BSD", - "bahamanske dollar", - } - BTN{ - "BTN", - "bhutanske ngultrum", - } BUK{ "BUK", "burmesisk kyat", } - BWP{ - "BWP", - "botswanske pula", - } BYB{ "BYB", "kviterussiske nye rublar (1994–1999)", @@ -196,46 +100,6 @@ nn{ "BYR", "kviterussiske rublar (2000–2016)", } - BZD{ - "BZD", - "beliziske dollar", - } - CAD{ - "CAD", - "kanadiske dollar", - } - CDF{ - "CDF", - "kongolesiske franc", - } - CHE{ - "CHE", - "WIR euro", - } - CHF{ - "CHF", - "sveitsiske franc", - } - CHW{ - "CHW", - "WIR franc", - } - CLF{ - "CLF", - "chilenske unidades de fomento", - } - CLP{ - "CLP", - "chilenske pesos", - } - CNH{ - "CNH", - "kinesiske yuan (offshore)", - } - CNY{ - "CNY", - "kinesiske yuan", - } COP{ "COP", "kolombianske pesos", @@ -252,190 +116,38 @@ nn{ "CSD", "gamle serbiske dinarer", } - CSK{ - "CSK", - "tsjekkoslovakiske koruna (hard)", - } - CUC{ - "CUC", - "kubanske konvertible pesos", - } - CUP{ - "CUP", - "kubanske pesos", - } CVE{ "CVE", "kappverdiske escudo", } - CYP{ - "CYP", - "kypriotiske pund", - } - CZK{ - "CZK", - "tsjekkiske koruna", - } DDM{ "DDM", "austtyske mark", } - DEM{ - "DEM", - "tyske mark", - } - DJF{ - "DJF", - "djiboutiske franc", - } - DKK{ - "DKK", - "danske kroner", - } - DOP{ - "DOP", - "dominikanske pesos", - } DZD{ "DZD", "algeriske dinarar", } - ECS{ - "ECS", - "ecuadorianske sucre", - } - ECV{ - "ECV", - "ecuadorianske unidad de valor constante (UVC)", - } - EEK{ - "EEK", - "estiske kroon", - } - EGP{ - "EGP", - "egyptiske pund", - } - ERN{ - "ERN", - "eritreiske nakfa", - } - ESA{ - "ESA", - "spanske peseta (A–konto)", - } - ESB{ - "ESB", - "spanske peseta (konvertibel konto)", - } - ESP{ - "ESP", - "spanske peseta", - } - ETB{ - "ETB", - "etiopiske birr", - } - EUR{ - "€", - "euro", - } - FIM{ - "FIM", - "finske mark", - } - FJD{ - "FJD", - "fijianske dollar", - } - FKP{ - "FKP", - "falklandspund", - } - FRF{ - "FRF", - "franske franc", - } GBP{ "GBP", "britiske pund", } - GEK{ - "GEK", - "georgiske kupon larit", - } - GEL{ - "GEL", - "georgiske lari", - } GHC{ "GHC", "ghanesiske cedi (1979–2007)", } - GHS{ - "GHS", - "ghanesiske cedi", - } - GIP{ - "GIP", - "gibraltarske pund", - } - GMD{ - "GMD", - "gambiske dalasi", - } - GNF{ - "GNF", - "guineanske franc", - } - GNS{ - "GNS", - "guineanske syli", - } - GQE{ - "GQE", - "ekvatorialguineanske ekwele guineana", - } GRD{ "GRD", "greske drakme", } - GTQ{ - "GTQ", - "guatemalanske quetzal", - } - GWE{ - "GWE", - "portugisiske guinea escudo", - } GWP{ "GWP", "Guinea-Bissau-peso", } - GYD{ - "GYD", - "guyanske dollar", - } - HKD{ - "HKD", - "Hongkong-dollar", - } - HNL{ - "HNL", - "honduranske lempira", - } HRD{ "HRD", "kroatiske dinar", } - HRK{ - "HRK", - "kroatiske kuna", - } - HTG{ - "HTG", - "haitiske gourde", - } HUF{ "HUF", "ungarske forintar", @@ -444,14 +156,6 @@ nn{ "IDR", "indonesiske rupiar", } - IEP{ - "IEP", - "irske pund", - } - ILP{ - "ILP", - "israelske pund", - } ILS{ "ILS", "nye israelske sheklar", @@ -468,82 +172,18 @@ nn{ "IRR", "iranske rial", } - ISK{ - "ISK", - "islandske kroner", - } - ITL{ - "ITL", - "italienske lire", - } - JMD{ - "JMD", - "jamaikanske dollar", - } JOD{ "JOD", "jordanske dinarar", } - JPY{ - "JPY", - "japanske yen", - } - KES{ - "KES", - "kenyanske shilling", - } - KGS{ - "KGS", - "kirgisiske som", - } - KHR{ - "KHR", - "kambodsjanske riel", - } - KMF{ - "KMF", - "komoriske franc", - } - KPW{ - "KPW", - "nordkoreanske won", - } - KRW{ - "KRW", - "sørkoreanske won", - } KWD{ "KWD", "kuwaitiske dinarar", } - KYD{ - "KYD", - "caymanske dollar", - } - KZT{ - "KZT", - "kasakhstanske tenge", - } - LAK{ - "LAK", - "laotiske kip", - } - LBP{ - "LBP", - "libanesiske pund", - } LKR{ "LKR", "srilankiske rupiar", } - LRD{ - "LRD", - "liberiske dollar", - } - LSL{ - "LSL", - "lesothiske loti", - } LTL{ "LTL", "litauiske lita", @@ -556,14 +196,6 @@ nn{ "LUC", "luxemburgske konvertibel franc", } - LUF{ - "LUF", - "luxemburgske franc", - } - LUL{ - "LUL", - "luxemburgske finansielle franc", - } LVL{ "LVL", "latviske lat", @@ -576,126 +208,30 @@ nn{ "LYD", "libyske dinarar", } - MAD{ - "MAD", - "marokkanske dirham", - } - MAF{ - "MAF", - "marokkanske franc", - } MDL{ "MDL", "moldovske leuar", } - MGA{ - "MGA", - "madagassiske ariary", - } - MGF{ - "MGF", - "madagassiske franc", - } MKD{ "MKD", "makedonske denarar", } - MLF{ - "MLF", - "maliske franc", - } - MMK{ - "MMK", - "myanmarske kyat", - } - MNT{ - "MNT", - "mongolske tugrik", - } - MOP{ - "MOP", - "makaoiske pataca", - } - MRO{ - "MRO", - "mauritanske ouguiya (1973–2017)", - } MRU{ "MRU", "mauritanske ouguiya", } - MTL{ - "MTL", - "maltesiske lira", - } - MTP{ - "MTP", - "maltesiske pund", - } MUR{ "MUR", "mauritiske rupiar", } - MVR{ - "MVR", - "maldiviske rufiyaa", - } - MWK{ - "MWK", - "malawiske kwacha", - } - MXN{ - "MXN", - "meksikanske pesos", - } MXP{ "MXP", "meksikanske sølvpeso (1861–1992)", } - MXV{ - "MXV", - "meksikanske unidad de inversion (UDI)", - } - MYR{ - "MYR", - "malaysiske ringgit", - } - MZE{ - "MZE", - "mosambikiske escudo", - } - MZM{ - "MZM", - "gamle mosambikiske metical", - } - MZN{ - "MZN", - "mosambikiske metical", - } - NAD{ - "NAD", - "namibiske dollar", - } - NGN{ - "NGN", - "nigerianske naira", - } NIC{ "NIC", "nicaraguanske cordoba", } - NIO{ - "NIO", - "nicaraguanske córdoba", - } - NLG{ - "NLG", - "nederlandske gylden", - } - NOK{ - "kr", - "norske kroner", - } NPR{ "NPR", "nepalske rupiar", @@ -708,46 +244,10 @@ nn{ "OMR", "omanske rial", } - PAB{ - "PAB", - "panamanske balboa", - } - PEI{ - "PEI", - "peruanske inti", - } - PEN{ - "PEN", - "peruanske sol", - } - PES{ - "PES", - "peruanske sol (1863–1965)", - } - PGK{ - "PGK", - "papuanske kina", - } - PHP{ - "PHP", - "filippinske pesos", - } PKR{ "PKR", "pakistanske rupiar", } - PLN{ - "PLN", - "polske zloty", - } - PLZ{ - "PLZ", - "polske zloty (1950–1995)", - } - PTE{ - "PTE", - "portugisiske escudo", - } PYG{ "PYG", "paraguayanske guaraní", @@ -756,10 +256,6 @@ nn{ "QAR", "qatarske rial", } - RHD{ - "RHD", - "rhodesiske dollar", - } ROL{ "ROL", "gamle rumenske leu", @@ -780,18 +276,10 @@ nn{ "RUR", "russiske rublar (1991–1998)", } - RWF{ - "RWF", - "rwandiske franc", - } SAR{ "SAR", "saudiarabiske rial", } - SBD{ - "SBD", - "salomonske dollar", - } SCR{ "SCR", "seychelliske rupiar", @@ -800,154 +288,34 @@ nn{ "SDD", "gamle sudanske dinarer", } - SDG{ - "SDG", - "sudanske pund", - } SDP{ "SDP", "gamle sudanske pund", } - SEK{ - "SEK", - "svenske kroner", - } - SGD{ - "SGD", - "singaporske dollar", - } - SHP{ - "SHP", - "sankthelenske pund", - } - SIT{ - "SIT", - "slovenske tolar", - } - SKK{ - "SKK", - "slovakiske koruna", - } - SLL{ - "SLL", - "sierraleonske leone", - } - SOS{ - "SOS", - "somaliske shilling", - } - SRD{ - "SRD", - "surinamske dollar", - } - SRG{ - "SRG", - "surinamske gylden", - } - SSP{ - "SSP", - "sørsudanske pund", - } - STD{ - "STD", - "saotomesiske dobra (1977–2017)", - } - STN{ - "STN", - "saotomesiske dobra", - } SUR{ "SUR", "sovjetiske rublar", } - SVC{ - "SVC", - "salvadoranske colon", - } - SYP{ - "SYP", - "syriske pund", - } SZL{ "SZL", "eswatinisk lilangeni", } - THB{ - "THB", - "thailandske baht", - } TJR{ "TJR", "tadsjikiske rublar", } - TJS{ - "TJS", - "tadsjikiske somoni", - } TMM{ "TMM", "turkmensk manat (1993–2009)", } - TMT{ - "TMT", - "turkmenske manat", - } TND{ "TND", "tunisiske dinarar", } - TOP{ - "TOP", - "tonganske paʻanga", - } - TPE{ - "TPE", - "timoresiske escudo", - } TRL{ "TRL", "gamle tyrkiske lire", } - TRY{ - "TRY", - "tyrkiske lire", - } - TTD{ - "TTD", - "trinidadiske dollar", - } - TWD{ - "TWD", - "nye taiwanske dollar", - } - TZS{ - "TZS", - "tanzanianske shilling", - } - UAH{ - "UAH", - "ukrainske hryvnia", - } - UAK{ - "UAK", - "ukrainske karbovanetz", - } - UGS{ - "UGS", - "ugandiske shilling (1966–1987)", - } - UGX{ - "UGX", - "ugandiske shilling", - } - USD{ - "USD", - "amerikanske dollar", - } - USN{ - "USN", - "amerikanske dollar (neste dag)", - } USS{ "USS", "amerikanske dollar (same dag)", @@ -960,50 +328,14 @@ nn{ "UYP", "uruguayanske peso (1975–1993)", } - UYU{ - "UYU", - "uruguayanske pesos", - } UZS{ "UZS", "usbekiske sum", } - VEB{ - "VEB", - "venezuelanske bolivar (1871–2008)", - } - VEF{ - "VEF", - "venezuelanske bolivar (2008–2018)", - } - VES{ - "VES", - "venezuelanske bolivar", - } - VND{ - "VND", - "vietnamesiske dong", - } VUV{ "VUV", "vanuatuiske vatu", } - WST{ - "WST", - "samoanske tala", - } - XAF{ - "XAF", - "sentralafrikanske CFA-franc", - } - XAG{ - "XAG", - "sølv", - } - XAU{ - "XAU", - "gull", - } XBA{ "XBA", "europeiske samansette einingar", @@ -1032,40 +364,8 @@ nn{ "XEU", "europeiske valutaeiningar", } - XFO{ - "XFO", - "franske gullfranc", - } - XFU{ - "XFU", - "franske UIC-franc", - } - XOF{ - "F CFA", - "vestafrikanske CFA-franc", - } - XPD{ - "XPD", - "palladium", - } - XPF{ - "XPF", - "CFP-franc", - } - XPT{ - "XPT", - "platina", - } - XRE{ - "XRE", - "RINET-fond", - } - XTS{ - "XTS", - "testvalutakode", - } XXX{ - "¤", + "XXX", "ukjend valuta", } YDD{ @@ -1092,18 +392,6 @@ nn{ "ZAL", "sørafrikanske rand (finansiell)", } - ZAR{ - "ZAR", - "sørafrikanske rand", - } - ZMK{ - "ZMK", - "zambiske kwacha (1968–2012)", - } - ZMW{ - "ZMW", - "zambiske kwacha", - } ZRN{ "ZRN", "zairisk ny zaire", @@ -1118,197 +406,15 @@ nn{ } } Currencies%narrow{ - AOA{"Kz"} - ARS{"$"} - AUD{"$"} - BAM{"KM"} - BBD{"$"} - BDT{"৳"} - BMD{"$"} - BND{"$"} - BOB{"Bs"} - BRL{"R$"} - BSD{"$"} - BWP{"P"} - BYN{"р."} - BZD{"$"} - CAD{"$"} - CLP{"$"} - CNY{"¥"} - COP{"$"} - CRC{"₡"} - CUC{"$"} - CUP{"$"} - CZK{"Kč"} - DKK{"kr"} - DOP{"$"} - EGP{"E£"} - EUR{"€"} - FJD{"$"} - FKP{"£"} - GBP{"£"} - GEL{"₾"} - GIP{"£"} - GNF{"FG"} - GTQ{"Q"} - GYD{"$"} - HKD{"$"} - HNL{"L"} - HRK{"kn"} - HUF{"Ft"} - IDR{"Rp"} - ILS{"₪"} - INR{"₹"} - ISK{"kr"} - JMD{"$"} - JPY{"¥"} - KHR{"៛"} - KMF{"CF"} - KPW{"₩"} - KRW{"₩"} - KYD{"$"} - KZT{"₸"} - LAK{"₭"} - LBP{"L£"} - LKR{"Rs"} - LRD{"$"} - MGA{"Ar"} - MMK{"K"} - MNT{"₮"} - MUR{"Rs"} - MXN{"$"} - MYR{"RM"} - NAD{"$"} - NGN{"₦"} - NIO{"C$"} - NOK{"kr"} - NPR{"Rs"} - NZD{"$"} - PHP{"₱"} - PKR{"Rs"} - PLN{"zł"} - PYG{"₲"} RON{"lei"} - RUB{"₽"} - RWF{"RF"} - SBD{"$"} - SEK{"kr"} - SGD{"$"} - SHP{"£"} - SRD{"$"} - SSP{"£"} STN{"Db"} - SYP{"£"} - THB{"฿"} - TOP{"T$"} - TRY{"₺"} - TTD{"$"} TWD{"$"} - UAH{"₴"} - USD{"$"} - UYU{"$"} - VEF{"Bs"} - VND{"₫"} - XCD{"$"} - ZAR{"R"} - ZMW{"ZK"} - } - Currencies%variant{ - TRY{"TL"} } CurrencyPlurals{ - AED{ - one{"emiratarabisk dirham"} - other{"emiratarabiske dirham"} - } - AFN{ - one{"afghansk afghani"} - other{"afghanske afghani"} - } - ALL{ - one{"albansk lek"} - other{"albanske lek"} - } - AMD{ - one{"armensk dram"} - other{"armenske dram"} - } - ANG{ - one{"nederlandsk antillegylden"} - other{"nederlandske antillegylden"} - } - AOA{ - one{"angolansk kwanza"} - other{"angolanske kwanza"} - } - ARS{ - one{"argentinsk peso"} - other{"argentinske pesos"} - } - AUD{ - one{"australsk dollar"} - other{"australske dollar"} - } - AWG{ - one{"arubisk florin"} - other{"arubiske floriner"} - } - AZN{ - one{"aserbajdsjansk manat"} - other{"aserbajdsjanske manat"} - } - BAM{ - one{"bosnisk-hercegovinsk konvertibel mark"} - other{"bosnisk-hercegovinske konvertible mark"} - } - BBD{ - one{"barbadisk dollar"} - other{"barbadiske dollar"} - } - BDT{ - one{"bangladeshisk taka"} - other{"bangladeshiske taka"} - } - BGN{ - one{"bulgarsk lev"} - other{"bulgarske lev"} - } BHD{ one{"bahrainsk dinar"} other{"bahrainske dinarar"} } - BIF{ - one{"burundisk franc"} - other{"burundiske franc"} - } - BMD{ - one{"bermudisk dollar"} - other{"bermudiske dollar"} - } - BND{ - one{"bruneisk dollar"} - other{"bruneiske dollar"} - } - BOB{ - one{"boliviansk boliviano"} - other{"bolivianske boliviano"} - } - BRL{ - one{"brasiliansk real"} - other{"brasilianske real"} - } - BSD{ - one{"bahamansk dollar"} - other{"bahamanske dollar"} - } - BTN{ - one{"bhutansk ngultrum"} - other{"bhutanske ngultrum"} - } - BWP{ - one{"botswansk pula"} - other{"botswanske pula"} - } BYB{ one{"kviterussisk ny rubel (BYB)"} other{"kviterussiske nye rublar (BYB)"} @@ -1321,46 +427,14 @@ nn{ one{"kviterussisk rubel (2000–2016)"} other{"kviterussiske rublar (2000–2016)"} } - BZD{ - one{"belizisk dollar"} - other{"beliziske dollar"} - } - CAD{ - one{"kanadisk dollar"} - other{"kanadiske dollar"} - } - CDF{ - one{"kongolesisk franc"} - other{"kongolesiske franc"} - } CHE{ one{"WIR euro"} other{"WIR euro"} } - CHF{ - one{"sveitsisk franc"} - other{"sveitsiske franc"} - } CHW{ one{"WIR franc"} other{"WIR franc"} } - CLF{ - one{"chilensk unidades de fomento"} - other{"chilenske unidades de fomento"} - } - CLP{ - one{"chilensk peso"} - other{"chilenske pesos"} - } - CNH{ - one{"kinesisk yuan (offshore)"} - other{"kinesiske yuan (offshore)"} - } - CNY{ - one{"kinesisk yuan"} - other{"kinesiske yuan"} - } COP{ one{"kolombiansk peso"} other{"kolombianske pesos"} @@ -1377,186 +451,34 @@ nn{ one{"gammal serbisk dinar"} other{"gamle serbiske dinarar"} } - CSK{ - one{"tsjekkoslovakisk koruna (hard)"} - other{"tsjekkoslovakiske koruna (hard)"} - } - CUC{ - one{"kubansk konvertibel peso"} - other{"kubanske konvertible pesos"} - } - CUP{ - one{"kubansk peso"} - other{"kubanske pesos"} - } CVE{ one{"kappverdisk escudo"} other{"kappverdiske escudo"} } - CYP{ - one{"kypriotisk pund"} - other{"kypriotiske pund"} - } - CZK{ - one{"tsjekkisk koruna"} - other{"tsjekkiske koruna"} - } DDM{ one{"austtysk mark"} other{"austtyske mark"} } - DEM{ - one{"tysk mark"} - other{"tyske mark"} - } - DJF{ - one{"djiboutisk franc"} - other{"djiboutiske franc"} - } - DKK{ - one{"dansk krone"} - other{"danske kroner"} - } - DOP{ - one{"dominikansk peso"} - other{"dominikanske pesos"} - } DZD{ one{"algerisk dinar"} other{"algeriske dinarar"} } - ECS{ - one{"ecuadoriansk sucre"} - other{"ecuadorianske sucre"} - } - ECV{ - one{"ecuadoriansk unidad de valor constante (UVC)"} - other{"ecuadorianske unidad de valor constante (UVC)"} - } EEK{ one{"estisk kroon"} other{"estiske kroon"} } - EGP{ - one{"egyptisk pund"} - other{"egyptiske pund"} - } - ERN{ - one{"eritreisk nakfa"} - other{"eritreiske nakfa"} - } - ESA{ - one{"spansk peseta (A–konto)"} - other{"spanske peseta (A–konto)"} - } - ESB{ - one{"spansk peseta (konvertibel konto)"} - other{"spanske peseta (konvertibel konto)"} - } - ESP{ - one{"spansk peseta"} - other{"spanske peseta"} - } - ETB{ - one{"etiopisk birr"} - other{"etiopiske birr"} - } - EUR{ - one{"euro"} - other{"euro"} - } - FIM{ - one{"finsk mark"} - other{"finske mark"} - } - FJD{ - one{"fijiansk dollar"} - other{"fijianske dollar"} - } - FKP{ - one{"falklandspund"} - other{"falklandspund"} - } - FRF{ - one{"fransk franc"} - other{"franske franc"} - } - GBP{ - one{"britisk pund"} - other{"britiske pund"} - } - GEK{ - one{"georgisk kupon larit"} - other{"georgiske kupon larit"} - } - GEL{ - one{"georgisk lari"} - other{"georgiske lari"} - } GHC{ one{"ghanesisk cedi (GHC)"} other{"ghanesiske cedi (GHC)"} } - GHS{ - one{"ghanesisk cedi"} - other{"ghanesiske cedi"} - } - GIP{ - one{"gibraltarsk pund"} - other{"gibraltarske pund"} - } - GMD{ - one{"gambisk dalasi"} - other{"gambiske dalasi"} - } - GNF{ - one{"guineansk franc"} - other{"guineanske franc"} - } - GNS{ - one{"guineansk syli"} - other{"guineanske syli"} - } GQE{ one{"ekvatorialguineansk ekwele"} other{"ekvatorialguineanske ekwele"} } - GRD{ - one{"gresk drakme"} - other{"greske drakmer"} - } - GTQ{ - one{"guatemalansk quetzal"} - other{"guatemalanske quetzal"} - } - GWE{ - one{"portugisisk guinea escudo"} - other{"portugisiske guinea escudo"} - } - GYD{ - one{"guyansk dollar"} - other{"guyanske dollar"} - } - HKD{ - one{"Hongkong-dollar"} - other{"Hongkong-dollar"} - } - HNL{ - one{"honduransk lempira"} - other{"honduranske lempira"} - } HRD{ one{"kroatisk dinar"} other{"kroatiske dinarar"} } - HRK{ - one{"kroatisk kuna"} - other{"kroatiske kuna"} - } - HTG{ - one{"haitisk gourde"} - other{"haitiske gourde"} - } HUF{ one{"ungarsk forint"} other{"ungarske forintar"} @@ -1565,14 +487,6 @@ nn{ one{"indonesisk rupi"} other{"indonesiske rupiar"} } - IEP{ - one{"irsk pund"} - other{"irske pund"} - } - ILP{ - one{"israelsk pund"} - other{"israelske pund"} - } ILS{ one{"ny israelsk shekel"} other{"nye israelske sheklar"} @@ -1589,102 +503,22 @@ nn{ one{"iransk rial"} other{"iranske rial"} } - ISK{ - one{"islandsk krone"} - other{"islandske kroner"} - } - ITL{ - one{"italiensk lire"} - other{"italienske lire"} - } - JMD{ - one{"jamaikansk dollar"} - other{"jamaikanske dollar"} - } JOD{ one{"jordansk dinar"} other{"jordanske dinarar"} } - JPY{ - one{"japansk yen"} - other{"japanske yen"} - } - KES{ - one{"kenyansk shilling"} - other{"kenyanske shilling"} - } - KGS{ - one{"kirgisisk som"} - other{"kirgisiske som"} - } - KHR{ - one{"kambodsjansk riel"} - other{"kambodsjanske riel"} - } - KMF{ - one{"komorisk franc"} - other{"komoriske franc"} - } - KPW{ - one{"nordkoreansk won"} - other{"nordkoreanske won"} - } - KRW{ - one{"sørkoreansk won"} - other{"sørkoreanske won"} - } KWD{ one{"kuwaitisk dinar"} other{"kuwaitiske dinarar"} } - KYD{ - one{"caymansk dollar"} - other{"caymanske dollar"} - } - KZT{ - one{"kasakhstansk tenge"} - other{"kasakhstanske tenge"} - } - LAK{ - one{"laotisk kip"} - other{"laotiske kip"} - } - LBP{ - one{"libanesisk pund"} - other{"libanesiske pund"} - } LKR{ one{"srilankisk rupi"} other{"srilankiske rupiar"} } - LRD{ - one{"liberisk dollar"} - other{"liberiske dollar"} - } - LSL{ - one{"lesothisk loti"} - other{"lesothiske loti"} - } - LTL{ - one{"litauisk lita"} - other{"litauiske lita"} - } LTT{ one{"litauisk talona"} other{"litauiske talona"} } - LUC{ - one{"luxemburgsk konvertibel franc"} - other{"luxemburgske konvertible franc"} - } - LUF{ - one{"luxemburgsk franc"} - other{"luxemburgske franc"} - } - LUL{ - one{"luxemburgsk finansiell franc"} - other{"luxemburgske finansielle franc"} - } LVL{ one{"latvisk lat"} other{"latviske lat"} @@ -1697,126 +531,30 @@ nn{ one{"libysk dinar"} other{"libyske dinarar"} } - MAD{ - one{"marokkansk dirham"} - other{"marokkanske dirham"} - } - MAF{ - one{"marokkansk franc"} - other{"marokkanske franc"} - } MDL{ one{"moldovsk leu"} other{"moldovske leuar"} } - MGA{ - one{"madagassisk ariary"} - other{"madagassiske ariary"} - } - MGF{ - one{"madagassisk franc"} - other{"madagassiske franc"} - } MKD{ one{"makedonsk denar"} other{"makedonske denarar"} } - MLF{ - one{"malisk franc"} - other{"maliske franc"} - } - MMK{ - one{"myanmarsk kyat"} - other{"myanmarske kyat"} - } - MNT{ - one{"mongolsk tugrik"} - other{"mongolske tugrik"} - } - MOP{ - one{"makaoisk pataca"} - other{"makaoiske pataca"} - } - MRO{ - one{"mauritansk ouguiya (1973–2017)"} - other{"mauritanske ouguiya (1973–2017)"} - } - MRU{ - one{"mauritansk ouguiya"} - other{"mauritanske ouguiya"} - } - MTL{ - one{"maltesisk lira"} - other{"maltesiske lira"} - } - MTP{ - one{"maltesisk pund"} - other{"maltesiske pund"} - } MUR{ one{"mauritisk rupi"} other{"mauritiske rupiar"} } - MVR{ - one{"maldivisk rufiyaa"} - other{"maldiviske rufiyaa"} - } - MWK{ - one{"malawisk kwacha"} - other{"malawiske kwacha"} - } - MXN{ - one{"meksikansk peso"} - other{"meksikanske pesos"} - } MXP{ one{"meksikansk sølvpeso (MXP)"} other{"meksikanske sølvpeso (MXP)"} } - MXV{ - one{"meksikansk unidad de inversion (UDI)"} - other{"meksikanske unidad de inversion (UDI)"} - } - MYR{ - one{"malaysisk ringgit"} - other{"malaysiske ringgit"} - } - MZE{ - one{"mosambikisk escudo"} - other{"mosambikiske escudo"} - } MZM{ one{"gammal mosambikisk metical"} other{"gamle mosambikiske metical"} } - MZN{ - one{"mosambikisk metical"} - other{"mosambikiske metical"} - } - NAD{ - one{"namibisk dollar"} - other{"namibiske dollar"} - } - NGN{ - one{"nigeriansk naira"} - other{"nigerianske naira"} - } NIC{ one{"nicaraguansk cordoba"} other{"nicaraguanske cordoba"} } - NIO{ - one{"nicaraguansk córdoba"} - other{"nicaraguanske córdoba"} - } - NLG{ - one{"nederlandsk gylden"} - other{"nederlandske gylden"} - } - NOK{ - one{"norsk krone"} - other{"norske kroner"} - } NPR{ one{"nepalsk rupi"} other{"nepalske rupiar"} @@ -1829,46 +567,14 @@ nn{ one{"omansk rial"} other{"omanske rial"} } - PAB{ - one{"panamansk balboa"} - other{"panamanske balboa"} - } - PEI{ - one{"peruansk inti"} - other{"peruanske inti"} - } - PEN{ - one{"peruansk sol"} - other{"peruanske sol"} - } - PES{ - one{"peruansk sol (1863–1965)"} - other{"peruanske sol (1863–1965)"} - } - PGK{ - one{"papuansk kina"} - other{"papuanske kina"} - } - PHP{ - one{"filippinsk peso"} - other{"filippinske pesos"} - } PKR{ one{"pakistansk rupi"} other{"pakistanske rupiar"} } - PLN{ - one{"polsk zloty"} - other{"polske zloty"} - } PLZ{ one{"polsk zloty (PLZ)"} other{"polske zloty (PLZ)"} } - PTE{ - one{"portugisisk escudo"} - other{"portugisiske escudo"} - } PYG{ one{"paraguayansk guaraní"} other{"paraguayanske guaraní"} @@ -1877,10 +583,6 @@ nn{ one{"qatarsk rial"} other{"qatarske rial"} } - RHD{ - one{"rhodesisk dollar"} - other{"rhodesiske dollar"} - } ROL{ one{"gammal rumensk leu"} other{"gamle rumenske lei"} @@ -1901,18 +603,10 @@ nn{ one{"russisk rubel (RUR)"} other{"russiske rublar (RUR)"} } - RWF{ - one{"rwandisk franc"} - other{"rwandiske franc"} - } SAR{ one{"saudiarabisk rial"} other{"saudiarabiske rial"} } - SBD{ - one{"salomonsk dollar"} - other{"salomonske dollar"} - } SCR{ one{"seychellisk rupi"} other{"seychelliske rupiar"} @@ -1921,154 +615,34 @@ nn{ one{"gammal sudansk dinar"} other{"gamle sudanske dinarar"} } - SDG{ - one{"sudansk pund"} - other{"sudanske pund"} - } SDP{ one{"gammalt sudansk pund"} other{"gamle sudanske pund"} } - SEK{ - one{"svensk krone"} - other{"svenske kroner"} - } - SGD{ - one{"singaporsk dollar"} - other{"singaporske dollar"} - } - SHP{ - one{"sankthelensk pund"} - other{"sankthelenske pund"} - } - SIT{ - one{"slovensk tolar"} - other{"slovenske tolar"} - } - SKK{ - one{"slovakisk koruna"} - other{"slovakiske koruna"} - } - SLL{ - one{"sierraleonsk leone"} - other{"sierraleonske leone"} - } - SOS{ - one{"somalisk shilling"} - other{"somaliske shilling"} - } - SRD{ - one{"surinamsk dollar"} - other{"surinamske dollar"} - } - SRG{ - one{"surinamsk gylden"} - other{"surinamske gylden"} - } - SSP{ - one{"sørsudansk pund"} - other{"sørsudanske pund"} - } - STD{ - one{"saotomesisk dobra (1977–2017)"} - other{"saotomesiske dobra (1977–2017)"} - } - STN{ - one{"saotomesisk dobra"} - other{"saotomesiske dobra"} - } SUR{ one{"sovjetisk rubel"} other{"sovjetiske rublar"} } - SVC{ - one{"salvadoransk colon"} - other{"salvadoranske colon"} - } - SYP{ - one{"syrisk pund"} - other{"syriske pund"} - } SZL{ one{"eswatinisk lilangeni"} other{"eswatiniske emalangeni"} } - THB{ - one{"thailandsk baht"} - other{"thailandske baht"} - } TJR{ one{"tadsjikisk rubel"} other{"tadsjikiske rublar"} } - TJS{ - one{"tadsjikisk somoni"} - other{"tadsjikiske somoni"} - } - TMM{ - one{"turkmensk manat (1993–2009)"} - other{"turkmenske manat (1993–2009)"} - } - TMT{ - one{"turkmensk manat"} - other{"turkmenske manat"} - } TND{ one{"tunisisk dinar"} other{"tunisiske dinarar"} } - TOP{ - one{"tongansk paʻanga"} - other{"tonganske paʻanga"} - } - TPE{ - one{"timoresisk escudo"} - other{"timoresiske escudo"} - } TRL{ one{"gammal tyrkisk lire"} other{"gamle tyrkiske lire"} } - TRY{ - one{"tyrkisk lire"} - other{"tyrkiske lire"} - } - TTD{ - one{"trinidadisk dollar"} - other{"trinidadiske dollar"} - } - TWD{ - one{"ny taiwansk dollar"} - other{"nye taiwanske dollar"} - } - TZS{ - one{"tanzaniansk shilling"} - other{"tanzanianske shilling"} - } - UAH{ - one{"ukrainsk hryvnia"} - other{"ukrainske hryvnia"} - } - UAK{ - one{"ukrainsk karbovanetz"} - other{"ukrainske karbovanetz"} - } UGS{ one{"ugandisk shilling (UGS)"} other{"ugandiske shilling (UGS)"} } - UGX{ - one{"ugandisk shilling"} - other{"ugandiske shilling"} - } - USD{ - one{"amerikansk dollar"} - other{"amerikanske dollar"} - } - USN{ - one{"amerikansk dollar (neste dag)"} - other{"amerikanske dollar (neste dag)"} - } USS{ one{"amerikansk dollar (same dag)"} other{"amerikanske dollar (same dag)"} @@ -2089,34 +663,10 @@ nn{ one{"usbekisk sum"} other{"usbekiske sum"} } - VEB{ - one{"venezuelansk bolivar (1871–2008)"} - other{"venezuelanske bolivar (1871–2008)"} - } - VEF{ - one{"venezuelansk bolivar (2008–2018)"} - other{"venezuelanske bolivar (2008–2018)"} - } - VES{ - one{"venezuelansk bolivar"} - other{"venezuelanske bolivar"} - } - VND{ - one{"vietnamesisk dong"} - other{"vietnamesiske dong"} - } VUV{ one{"vanuatuisk vatu"} other{"vanuatuiske vatu"} } - WST{ - one{"samoansk tala"} - other{"samoanske tala"} - } - XAF{ - one{"sentralafrikansk CFA-franc"} - other{"sentralafrikanske CFA-franc"} - } XAG{ one{"sølv"} other{"sølv"} @@ -2153,26 +703,10 @@ nn{ one{"europeisk valutaeining"} other{"europeiske valutaeiningar"} } - XFO{ - one{"fransk gullfranc"} - other{"franske gullfranc"} - } - XFU{ - one{"fransk UIC-franc"} - other{"franske UIC-franc"} - } - XOF{ - one{"vestafrikansk CFA-franc"} - other{"vestafrikanske CFA-franc"} - } XPD{ one{"palladium"} other{"palladium"} } - XPF{ - one{"CFP-franc"} - other{"CFP-franc"} - } XPT{ one{"platina"} other{"platina"} @@ -2209,17 +743,5 @@ nn{ one{"jugoslavisk konvertibel dinar"} other{"jugoslaviske konvertible dinarar"} } - ZAR{ - one{"sørafrikansk rand"} - other{"sørafrikanske rand"} - } - ZMW{ - one{"zambisk kwacha"} - other{"zambiske kwacha"} - } - } - CurrencyUnitPatterns{ - one{"{0} {1}"} - other{"{0} {1}"} } } diff --git a/icu4c/source/data/curr/no_NO.txt b/icu4c/source/data/curr/no_NO.txt index 9de87e3d165..6613a86c4e6 100644 --- a/icu4c/source/data/curr/no_NO.txt +++ b/icu4c/source/data/curr/no_NO.txt @@ -1,9 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ no_NO{ - ___{""} + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/curr/no_SJ.txt b/icu4c/source/data/curr/no_SJ.txt deleted file mode 100644 index 42b03fcf8d0..00000000000 --- a/icu4c/source/data/curr/no_SJ.txt +++ /dev/null @@ -1,9 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ -no_SJ{ - ___{""} -} diff --git a/icu4c/source/data/lang/LOCALE_DEPS.json b/icu4c/source/data/lang/LOCALE_DEPS.json index f737ebe3754..606469a66a5 100644 --- a/icu4c/source/data/lang/LOCALE_DEPS.json +++ b/icu4c/source/data/lang/LOCALE_DEPS.json @@ -21,9 +21,7 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", - "nb_SJ": "no_SJ", + "no_NO": "no", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -178,6 +176,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nb": "no", "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", diff --git a/icu4c/source/data/lang/nb.txt b/icu4c/source/data/lang/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/lang/nb.txt +++ b/icu4c/source/data/lang/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/lang/nb_NO.txt b/icu4c/source/data/lang/nb_NO.txt deleted file mode 100644 index 2de7860c57e..00000000000 --- a/icu4c/source/data/lang/nb_NO.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_NO{ - "%%ALIAS"{"no_NO"} -} diff --git a/icu4c/source/data/lang/nb_SJ.txt b/icu4c/source/data/lang/nb_SJ.txt deleted file mode 100644 index b1caa388a5d..00000000000 --- a/icu4c/source/data/lang/nb_SJ.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_SJ{ - "%%ALIAS"{"no_SJ"} -} diff --git a/icu4c/source/data/lang/nn.txt b/icu4c/source/data/lang/nn.txt index f06701a47a9..45e8d9580a2 100644 --- a/icu4c/source/data/lang/nn.txt +++ b/icu4c/source/data/lang/nn.txt @@ -4,508 +4,97 @@ nn{ %%Parent{"no"} Keys{ - calendar{"kalender"} - cf{"valutaformat"} collation{"sorteringsrekkjefølgje"} - currency{"valuta"} - hc{"timesyklus (12 eller 24)"} lb{"lineskiftstil"} - ms{"målesystem"} numbers{"tal"} } Languages{ - aa{"afar"} - ab{"abkhasisk"} - ace{"achinesisk"} - ach{"acoli"} - ada{"adangme"} - ady{"adygeisk"} - ae{"avestisk"} - af{"afrikaans"} - afh{"afrihili"} - agq{"aghem"} - ain{"ainu"} - ak{"akan"} - akk{"akkadisk"} - ale{"aleutisk"} alt{"sør-altaj"} - am{"amharisk"} - an{"aragonsk"} ang{"gammalengelsk"} - anp{"angika"} - ar{"arabisk"} ar_001{"moderne standardarabisk"} - arc{"arameisk"} - arn{"mapudungun"} - arp{"arapaho"} - arw{"arawak"} - as{"assamesisk"} asa{"asu (Tanzania)"} - ast{"asturisk"} - av{"avarisk"} - awa{"avadhi"} - ay{"aymara"} - az{"aserbajdsjansk"} - ba{"basjkirsk"} - bal{"baluchi"} - ban{"balinesisk"} bas{"basa"} - bax{"bamun"} be{"kviterussisk"} - bej{"beja"} - bem{"bemba"} bez{"bena (Tanzania)"} - bg{"bulgarsk"} - bho{"bhojpuri"} - bi{"bislama"} - bik{"bikol"} - bin{"bini"} - bla{"siksika"} - bm{"bambara"} - bn{"bengali"} - bo{"tibetansk"} - br{"bretonsk"} - bra{"braj"} - brx{"bodo"} - bs{"bosnisk"} bss{"bakossi"} - bua{"burjatisk"} - bug{"buginesisk"} - byn{"blin"} - ca{"katalansk"} - cad{"caddo"} car{"carib"} - cch{"atsam"} - ccp{"chakma"} - ce{"tsjetsjensk"} ceb{"cebuano"} - cgg{"kiga"} - ch{"chamorro"} - chb{"chibcha"} chg{"tsjagataisk"} - chk{"chuukesisk"} - chm{"mari"} - chn{"chinook"} - cho{"choctaw"} - chp{"chipewiansk"} chr{"cherokee"} - chy{"cheyenne"} ckb{"sorani"} - co{"korsikansk"} - cop{"koptisk"} - cr{"cree"} - crh{"krimtatarisk"} crs{"seselwa (fransk-kreolsk)"} - cs{"tsjekkisk"} - csb{"kasjubisk"} cu{"kyrkjeslavisk"} cv{"tsjuvansk"} - cy{"walisisk"} - da{"dansk"} - dak{"dakota"} - dar{"dargwa"} - dav{"taita"} - de{"tysk"} - del{"delaware"} den{"slavej"} - dgr{"dogrib"} - din{"dinka"} - dje{"zarma"} - doi{"dogri"} dsb{"lågsorbisk"} - dua{"duala"} - dum{"mellomnederlandsk"} - dv{"divehi"} - dyo{"jola-fonyi"} - dyu{"dyula"} - dz{"dzongkha"} - dzg{"dazaga"} ebu{"embu"} - ee{"ewe"} - efi{"efik"} egy{"gammalegyptisk"} - eka{"ekajuk"} - el{"gresk"} elx{"elamite"} - en{"engelsk"} - enm{"mellomengelsk"} - eo{"esperanto"} - es{"spansk"} - et{"estisk"} - eu{"baskisk"} - ewo{"ewondo"} - fa{"persisk"} fa_AF{"dari"} - fan{"fang"} - fat{"fanti"} - ff{"fulfulde"} - fi{"finsk"} fil{"filippinsk"} - fj{"fijiansk"} - fo{"færøysk"} - fon{"fon"} - fr{"fransk"} - frm{"mellomfransk"} fro{"gammalfransk"} - frr{"nordfrisisk"} frs{"austfrisisk"} fur{"friulisk"} - fy{"vestfrisisk"} - ga{"irsk"} - gaa{"ga"} - gay{"gayo"} - gba{"gbaya"} - gd{"skotsk-gælisk"} - gez{"geez"} gil{"gilbertese"} - gl{"galisisk"} gmh{"mellomhøgtysk"} - gn{"guarani"} goh{"gammalhøgtysk"} - gon{"gondi"} - gor{"gorontalo"} - got{"gotisk"} - grb{"grebo"} grc{"gammalgresk"} - gsw{"sveitsertysk"} - gu{"gujarati"} - guz{"gusii"} gv{"manx"} - gwi{"gwichin"} - ha{"hausa"} - hai{"haida"} - haw{"hawaiisk"} - he{"hebraisk"} - hi{"hindi"} - hil{"hiligaynon"} - hit{"hettittisk"} - hmn{"hmong"} - ho{"hiri motu"} - hr{"kroatisk"} hsb{"høgsorbisk"} - ht{"haitisk"} - hu{"ungarsk"} - hup{"hupa"} - hy{"armensk"} - hz{"herero"} - ia{"interlingua"} - iba{"iban"} - ibb{"ibibio"} - id{"indonesisk"} - ie{"interlingue"} - ig{"ibo"} - ii{"sichuan-yi"} - ik{"inupiak"} - ilo{"iloko"} - inh{"ingusjisk"} - io{"ido"} - is{"islandsk"} - it{"italiensk"} - iu{"inuktitut"} - ja{"japansk"} - jbo{"lojban"} - jgo{"ngomba"} - jmc{"machame"} - jpr{"jødepersisk"} - jrb{"jødearabisk"} - jv{"javanesisk"} - ka{"georgisk"} - kaa{"karakalpakisk"} kab{"kabyle"} - kac{"kachin"} - kaj{"jju"} - kam{"kamba"} - kaw{"kawi"} - kbd{"kabardisk"} - kcg{"tyap"} - kde{"makonde"} kea{"kabuverdianu"} - kfo{"koro"} - kg{"kikongo"} - kha{"khasi"} - kho{"khotanesisk"} - khq{"koyra chiini"} - ki{"kikuyu"} - kj{"kuanyama"} - kk{"kasakhisk"} - kkj{"kako"} kl{"grønlandsk (kalaallisut)"} - kln{"kalenjin"} - km{"khmer"} - kmb{"kimbundu"} - kn{"kannada"} - ko{"koreansk"} - kok{"konkani"} - kos{"kosraeansk"} - kpe{"kpelle"} - kr{"kanuri"} krc{"karachay-balkar"} - krl{"karelsk"} - kru{"kurukh"} - ks{"kasjmiri"} - ksb{"shambala"} - ksf{"bafia"} - ksh{"kølnsk"} - ku{"kurdisk"} kum{"kumyk"} - kut{"kutenai"} - kv{"komi"} - kw{"kornisk"} - ky{"kirgisisk"} - la{"latin"} lad{"ladino"} - lag{"langi"} - lah{"lahnda"} - lam{"lamba"} - lb{"luxemburgsk"} lez{"lezghian"} - lg{"ganda"} li{"limburgisk"} - lkt{"lakota"} - ln{"lingala"} - lo{"laotisk"} - lol{"mongo"} - loz{"lozi"} lrc{"nord-lurisk"} - lt{"litauisk"} - lu{"luba-katanga"} - lua{"luba-lulua"} - lui{"luiseno"} - lun{"lunda"} - luo{"luo"} lus{"lushai"} luy{"olulujia"} - lv{"latvisk"} - mad{"maduresisk"} - mag{"magahi"} - mai{"maithili"} - mak{"makasar"} - man{"mandingo"} - mas{"masai"} mdf{"moksha"} - mdr{"mandar"} - men{"mende"} - mer{"meru"} mfe{"morisyen"} mg{"madagassisk"} - mga{"mellomirsk"} - mgh{"makhuwa-meetto"} - mgo{"meta’"} - mh{"marshallesisk"} - mi{"maori"} - mic{"micmac"} - min{"minangkabau"} - mk{"makedonsk"} - ml{"malayalam"} - mn{"mongolsk"} - mnc{"mandsju"} - mni{"manipuri"} - moh{"mohawk"} - mos{"mossi"} - mr{"marathi"} - ms{"malayisk"} - mt{"maltesisk"} - mua{"mundang"} mul{"fleire språk"} - mus{"creek"} - mwl{"mirandesisk"} - mwr{"marwari"} - my{"burmesisk"} - myv{"erzia"} mzn{"mazanderani"} - na{"nauru"} - nap{"napolitansk"} - naq{"nama"} - nb{"norsk bokmål"} - nd{"nord-ndebele"} nds{"lågtysk"} nds_NL{"lågsaksisk"} ne{"nepalsk"} - new{"newari"} - ng{"ndonga"} - nia{"nias"} niu{"niuisk"} - nl{"nederlandsk"} nl_BE{"flamsk"} - nmg{"kwasio"} - nn{"norsk nynorsk"} - nnh{"ngiemboon"} - no{"norsk"} nog{"nogai"} non{"gammalnorsk"} nqo{"n’ko"} - nr{"sør-ndebele"} nso{"nordsotho"} - nus{"nuer"} - nv{"navajo"} nwc{"klassisk newarisk"} - ny{"nyanja"} - nym{"nyamwezi"} - nyn{"nyankole"} - nyo{"nyoro"} - nzi{"nzima"} - oc{"oksitansk"} - oj{"ojibwa"} - om{"oromo"} - or{"odia"} - os{"ossetisk"} - osa{"osage"} - ota{"ottomansk tyrkisk"} - pa{"panjabi"} - pag{"pangasinan"} - pal{"pahlavi"} - pam{"pampanga"} - pap{"papiamento"} - pau{"palauisk"} pcm{"nigeriansk pidgin"} peo{"gammalpersisk"} - phn{"fønikisk"} - pi{"pali"} - pl{"polsk"} - pon{"ponapisk"} - prg{"prøyssisk"} pro{"gammalprovençalsk"} - ps{"pashto"} - pt{"portugisisk"} - qu{"quechua"} quc{"k’iche"} - raj{"rajasthani"} - rap{"rapanui"} - rar{"rarotongansk"} - rm{"retoromansk"} - rn{"rundi"} - ro{"rumensk"} ro_MD{"moldavisk"} - rof{"rombo"} - rom{"romani"} - ru{"russisk"} rup{"arumensk"} rw{"kinjarwanda"} - rwk{"rwa"} - sa{"sanskrit"} - sad{"sandawe"} - sah{"sakha"} - sam{"samaritansk arameisk"} - saq{"samburu"} - sas{"sasak"} - sat{"santali"} - sba{"ngambay"} - sbp{"sangu"} sc{"sardinsk"} - scn{"siciliansk"} - sco{"skotsk"} - sd{"sindhi"} - se{"nordsamisk"} - seh{"sena"} - sel{"selkupisk"} - ses{"koyraboro senni"} - sg{"sango"} sga{"gammalirsk"} - sh{"serbokroatisk"} - shi{"tachelhit"} - shn{"shan"} - si{"singalesisk"} - sid{"sidamo"} - sk{"slovakisk"} - sl{"slovensk"} - sm{"samoansk"} - sma{"sørsamisk"} - smj{"lulesamisk"} - smn{"enaresamisk"} - sms{"skoltesamisk"} - sn{"shona"} - snk{"soninke"} - so{"somali"} - sog{"sogdisk"} - sq{"albansk"} - sr{"serbisk"} srn{"sranan tongo"} - srr{"serer"} - ss{"swati"} - ssy{"saho"} st{"sørsotho"} - su{"sundanesisk"} - suk{"sukuma"} - sus{"susu"} - sux{"sumerisk"} - sv{"svensk"} - sw{"swahili"} swb{"shimaore"} - syc{"klassisk syrisk"} syr{"syrisk"} - ta{"tamil"} - te{"telugu"} - tem{"temne"} - teo{"teso"} - ter{"tereno"} - tet{"tetum"} - tg{"tadsjikisk"} - th{"thai"} - ti{"tigrinja"} - tig{"tigré"} tiv{"tivi"} - tk{"turkmensk"} tkl{"tokelau"} - tl{"tagalog"} - tlh{"klingon"} - tli{"tlingit"} - tmh{"tamasjek"} tn{"tswana"} - to{"tongansk"} tog{"tonga (Nyasa)"} - tpi{"tok pisin"} - tr{"tyrkisk"} - trv{"taroko"} - ts{"tsonga"} - tsi{"tsimshian"} - tt{"tatarisk"} - tum{"tumbuka"} tvl{"tuvalu"} - tw{"twi"} - twq{"tasawaq"} - ty{"tahitisk"} tyv{"tuvinisk"} tzm{"sentral-tamazight"} udm{"udmurt"} - ug{"uigurisk"} - uga{"ugaritisk"} - uk{"ukrainsk"} - umb{"umbundu"} - und{"ukjent språk"} - ur{"urdu"} - uz{"usbekisk"} - vai{"vai"} - ve{"venda"} - vi{"vietnamesisk"} - vo{"volapyk"} - vot{"votisk"} - vun{"vunjo"} - wa{"vallonsk"} - wae{"walsertysk"} - wal{"wolaytta"} war{"waray"} - was{"washo"} - wo{"wolof"} xal{"kalmykisk"} - xh{"xhosa"} - xog{"soga"} - yao{"yao"} - yap{"yapesisk"} - yav{"yangben"} - ybb{"yemba"} - yi{"jiddisk"} - yo{"joruba"} - yue{"kantonesisk"} - za{"zhuang"} zap{"zapotec"} zbl{"blissymbol"} - zen{"zenaga"} zgh{"standard marokkansk tamazight"} - zh{"kinesisk"} zh_Hans{"forenkla kinesisk"} zh_Hant{"tradisjonell kinesisk"} - zu{"zulu"} - zun{"zuni"} zxx{"utan språkleg innhald"} zza{"zaza"} } @@ -513,183 +102,57 @@ nn{ zh_Hans{"forenkla mandarinkinesisk"} zh_Hant{"tradisjonell mandarinkinesisk"} } - Languages%menu{ - ckb{"kurdisk (sentral)"} - zh{"kinesisk, mandarin"} - } Languages%variant{ ckb{"kurdisk (sorani)"} } Scripts{ - Arab{"arabisk"} Armi{"armisk"} - Armn{"armensk"} - Avst{"avestisk"} - Bali{"balinesisk"} - Batk{"batak"} - Beng{"bengalsk"} - Blis{"blissymbol"} - Bopo{"bopomofo"} - Brah{"brahmi"} - Brai{"punktskrift"} - Bugi{"buginesisk"} - Buhd{"buhid"} - Cakm{"chakma"} Cans{"felles kanadiske urspråksstavingar"} - Cari{"karisk"} - Cham{"cham"} - Cher{"cherokee"} - Cirt{"cirth"} - Copt{"koptisk"} - Cprt{"kypriotisk"} - Cyrl{"kyrillisk"} Cyrs{"kyrillisk (kyrkjeslavisk variant)"} - Deva{"devanagari"} - Dsrt{"deseret"} - Egyd{"egyptisk demotisk"} - Egyh{"egyptisk hieratisk"} Egyp{"egyptiske hieroglyfar"} - Ethi{"etiopisk"} Geok{"khutsuri (asomtavruli og nuskhuri)"} - Geor{"georgisk"} - Glag{"glagolittisk"} - Goth{"gotisk"} - Grek{"gresk"} - Gujr{"gujarati"} - Guru{"gurmukhi"} Hanb{"hanb"} - Hang{"hangul"} - Hani{"han"} - Hano{"hanunoo"} Hans{"forenkla"} - Hant{"tradisjonell"} - Hebr{"hebraisk"} - Hira{"hiragana"} Hmng{"pahawk hmong"} Hrkt{"japansk stavingsskrifter"} Hung{"gammalungarsk"} - Inds{"indus"} Ital{"gammalitalisk"} - Jamo{"jamo"} - Java{"javanesisk"} - Jpan{"japansk"} - Kali{"kayah li"} - Kana{"katakana"} - Khar{"kharoshthi"} - Khmr{"khmer"} - Knda{"kannada"} - Kore{"koreansk"} - Kthi{"kaithisk"} - Lana{"lanna"} - Laoo{"laotisk"} Latf{"latinsk (frakturvariant)"} Latg{"latinsk (gælisk variant)"} - Latn{"latinsk"} - Lepc{"lepcha"} Limb{"lumbu"} - Lina{"lineær A"} - Linb{"lineær B"} - Lyci{"lykisk"} - Lydi{"lydisk"} - Mand{"mandaisk"} - Mani{"manikeisk"} Maya{"maya-hieroglyfar"} - Mero{"meroitisk"} - Mlym{"malayalam"} - Mong{"mongolsk"} - Moon{"moon"} - Mtei{"meitei-mayek"} - Mymr{"burmesisk"} - Nkoo{"n’ko"} - Ogam{"ogham"} - Olck{"ol-chiki"} - Orkh{"orkhon"} - Orya{"odia"} - Osma{"osmanya"} Perm{"gammalpermisk"} - Phag{"phags-pa"} - Phli{"inskripsjonspahlavi"} Phlp{"salmepahlavi"} - Phlv{"pahlavi"} - Phnx{"fønikisk"} - Plrd{"pollard-fonetisk"} - Prti{"inskripsjonsparthisk"} - Rjng{"rejang"} - Roro{"rongorongo"} - Runr{"runer"} - Samr{"samaritansk"} - Sara{"sarati"} - Saur{"saurashtra"} Sgnw{"teiknskrift"} - Shaw{"shavisk"} - Sinh{"singalesisk"} - Sund{"sundanesisk"} - Sylo{"syloti nagri"} Syrc{"syriakisk"} Syre{"syriakisk (estrangelo-variant)"} Syrj{"syriakisk (vestleg variant)"} Syrn{"syriakisk (austleg variant)"} - Tagb{"tagbanwa"} - Tale{"tai le"} - Talu{"ny tai lue"} - Taml{"tamilsk"} - Tavt{"tai viet"} - Telu{"telugu"} - Teng{"tengwar"} - Tfng{"tifinagh"} - Tglg{"tagalog"} Thaa{"thaana"} - Thai{"thai"} - Tibt{"tibetansk"} - Ugar{"ugaritisk"} - Vaii{"vai"} Visp{"synleg tale"} Xpeo{"gammalpersisk"} Xsux{"sumero-akkadisk kileskrift"} - Yiii{"yi"} Zinh{"nedarva"} - Zmth{"matematisk notasjon"} - Zsye{"emoji"} Zsym{"symbol"} Zxxx{"språk utan skrift"} - Zyyy{"felles"} Zzzz{"ukjend skrift"} } Scripts%stand-alone{ Hans{"forenkla han"} - Hant{"tradisjonell han"} } Types{ calendar{ - buddhist{"buddhistisk kalender"} - chinese{"kinesisk kalender"} - dangi{"dangisk kalender"} - ethiopic{"etiopisk kalender"} - ethiopic-amete-alem{"etiopisk amete-alem-kalender"} - gregorian{"gregoriansk kalender"} - hebrew{"hebraisk kalender"} - indian{"indisk nasjonalkalender"} - islamic{"islamsk kalender"} islamic-civil{"islamsk sivil kalender"} - iso8601{"ISO 8601-kalender"} - japanese{"japansk kalender"} - persian{"persisk kalender"} - roc{"minguo-kalender"} } cf{ account{"valutaformat for rekneskapsføring"} - standard{"standard valutaformat"} } collation{ big5han{"tradisjonell kinesisk sortering"} ducet{"standard Unicode-sorteringsrekkjefølgje"} gb2312han{"forenkla kinesisk sortering"} - phonebook{"telefonkatalogsortering"} pinyin{"pinyin-sortering"} - search{"generelt søk"} standard{"standard sorteringsrekkjefølgje"} - stroke{"streksortering"} - traditional{"tradisjonell sortering"} } hc{ h11{"12-timesystem (0–11)"} @@ -702,11 +165,6 @@ nn{ normal{"normal lineskiftstil"} strict{"streng lineskiftstil"} } - ms{ - metric{"metrisk system"} - uksystem{"britisk målesystem"} - ussystem{"amerikansk målesystem"} - } numbers{ arab{"arabisk-indiske siffer"} arabext{"utvida arabisk-indiske siffer"} @@ -747,41 +205,21 @@ nn{ } Variants{ 1606NICT{"nyare mellomfransk til 1606"} - 1694ACAD{"eldre nyfransk"} - 1901{"tradisjonell tysk ortografi"} - 1994{"standardisert resisk ortografi"} 1996{"tysk ortografi frå 1996"} AREVELA{"austarmensk"} AREVMDA{"vestarmensk"} BAKU1926{"samla tyrkisk-latinsk alfabet"} - BISKE{"san giorgio- og biladialekt"} - BOONT{"boontling"} FONIPA{"det internasjonale fonetiske alfabetet (IPA)"} FONUPA{"det uralske fonetiske alfabetet UPA"} LIPAW{"resian, lipovazdialekt"} - MONOTON{"monotonisk rettskriving"} - NEDIS{"natisonedialekt"} - NJIVA{"gniva- og njivadialekt"} - OSOJS{"oseacco- og osojanedialekt"} - POLYTON{"polytonisk rettskriving"} - POSIX{"dataspråk"} REVISED{"revidert rettskriving"} - ROZAJ{"resisk dialekt"} SAAHO{"saaho-dialekt"} - SCOTLAND{"skotsk standard engelsk"} SCOUSE{"scouse-dialekt"} - SOLBA{"stolvizza- og solbicadialekt"} - TARASK{"taraskievica-ortografi"} VALENCIA{"valensisk dialekt"} } characterLabelPattern{ - all{"{0} – alt"} - category-list{"{0}: {1}"} - compatibility{"{0} – kompatibilitet"} enclosed{"{0} – omslutta"} extended{"{0} – utvida"} - historic{"{0} – historisk"} - miscellaneous{"{0} – diverse"} other{"{0} – anna"} scripts{"skriftsystem – {0}"} strokes{ @@ -791,14 +229,4 @@ nn{ subscript{"senka {0}"} superscript{"heva {0}"} } - codePatterns{ - language{"Språk: {0}"} - script{"Skrift: {0}"} - territory{"Område: {0}"} - } - localeDisplayPattern{ - keyTypePattern{"{0}: {1}"} - pattern{"{0} ({1})"} - separator{"{0}, {1}"} - } } diff --git a/icu4c/source/data/lang/no_NO.txt b/icu4c/source/data/lang/no_NO.txt index 9de87e3d165..6613a86c4e6 100644 --- a/icu4c/source/data/lang/no_NO.txt +++ b/icu4c/source/data/lang/no_NO.txt @@ -1,9 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ no_NO{ - ___{""} + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/lang/no_SJ.txt b/icu4c/source/data/lang/no_SJ.txt deleted file mode 100644 index 42b03fcf8d0..00000000000 --- a/icu4c/source/data/lang/no_SJ.txt +++ /dev/null @@ -1,9 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ -no_SJ{ - ___{""} -} diff --git a/icu4c/source/data/locales/LOCALE_DEPS.json b/icu4c/source/data/locales/LOCALE_DEPS.json index f737ebe3754..606469a66a5 100644 --- a/icu4c/source/data/locales/LOCALE_DEPS.json +++ b/icu4c/source/data/locales/LOCALE_DEPS.json @@ -21,9 +21,7 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", - "nb_SJ": "no_SJ", + "no_NO": "no", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -178,6 +176,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nb": "no", "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", diff --git a/icu4c/source/data/locales/ko.txt b/icu4c/source/data/locales/ko.txt index b7d03a2c617..a5d39d45b79 100644 --- a/icu4c/source/data/locales/ko.txt +++ b/icu4c/source/data/locales/ko.txt @@ -2043,7 +2043,7 @@ ko{ "분쇼 (1466 ~ 1467)", "오닌 (1467 ~ 1469)", "분메이 (1469 ~ 1487)", - "조쿄 (1487 ~ 1489)<", + "조쿄 (1487 ~ 1489)", "엔토쿠 (1489 ~ 1492)", "메이오 (1492 ~ 1501)", "분키 (1501 ~ 1504)", diff --git a/icu4c/source/data/locales/nb.txt b/icu4c/source/data/locales/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/locales/nb.txt +++ b/icu4c/source/data/locales/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/locales/nb_NO.txt b/icu4c/source/data/locales/nb_NO.txt index 2de7860c57e..61b454bf298 100644 --- a/icu4c/source/data/locales/nb_NO.txt +++ b/icu4c/source/data/locales/nb_NO.txt @@ -2,5 +2,4 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb_NO{ - "%%ALIAS"{"no_NO"} } diff --git a/icu4c/source/data/locales/nb_SJ.txt b/icu4c/source/data/locales/nb_SJ.txt index b1caa388a5d..78d04a51068 100644 --- a/icu4c/source/data/locales/nb_SJ.txt +++ b/icu4c/source/data/locales/nb_SJ.txt @@ -2,5 +2,4 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb_SJ{ - "%%ALIAS"{"no_SJ"} } diff --git a/icu4c/source/data/locales/nn.txt b/icu4c/source/data/locales/nn.txt index 07703cc00cd..09e3098e4eb 100644 --- a/icu4c/source/data/locales/nn.txt +++ b/icu4c/source/data/locales/nn.txt @@ -3,51 +3,21 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ %%Parent{"no"} - AuxExemplarCharacters{"[á ǎ č ç đ è ê ń ñ ŋ š ŧ ü ž ä ö]"} - Ellipsis{ - final{"{0}…"} - initial{"…{0}"} - medial{"{0}…{1}"} - word-final{"{0} …"} - word-initial{"… {0}"} - word-medial{"{0} … {1}"} - } - ExemplarCharacters{"[a à b c d e é f g h i j k l m n o ó ò ô p q r s t u v w x y z æ ø å]"} - ExemplarCharactersIndex{"[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å]"} - ExemplarCharactersNumbers{"[  , % ‰ + − 0 1 2 3 4 5 6 7 8 9]"} + AuxExemplarCharacters{"[á ǎ ä č ç đ è ê ń ñ ŋ ö š ŧ ü ž]"} + ExemplarCharacters{"[a à å æ b c d e é f g h i j k l m n o ó ò ô ø p q r s t u v w x y z]"} + ExemplarCharactersIndex{"[A Å Æ B C D E F G H I J K L M N O Ø P Q R S T U V W X Y Z]"} ExemplarCharactersPunctuation{ "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " "′ ″]" } NumberElements{ - default{"latn"} latn{ - miscPatterns{ - approximately{"ca. {0}"} - atLeast{"≥{0}"} - range{"{0}‒{1}"} - } patterns{ accountingFormat{"#,##0.00 ¤"} currencyFormat{"#,##0.00 ¤"} - decimalFormat{"#,##0.###"} - percentFormat{"#,##0 %"} - scientificFormat{"#E0"} } patternsLong{ decimalFormat{ - 1000{ - one{"0 tusen"} - other{"0 tusen"} - } - 10000{ - one{"00 tusen"} - other{"00 tusen"} - } - 100000{ - one{"000 tusen"} - other{"000 tusen"} - } 1000000{ one{"0 million"} other{"0 millionar"} @@ -88,18 +58,6 @@ nn{ } symbols{ approximatelySign{"≈"} - decimal{","} - exponential{"E"} - group{" "} - infinity{"∞"} - list{";"} - minusSign{"−"} - nan{"NaN"} - perMille{"‰"} - percentSign{"%"} - plusSign{"+"} - superscriptingExponent{"×"} - timeSeparator{":"} } } minimalPairs{ @@ -111,8 +69,6 @@ nn{ other{"{0} dagar"} } } - minimumGroupingDigits{"1"} - native{"latn"} } calendar{ generic{ @@ -131,142 +87,19 @@ nn{ "{1} {0}", "{1} {0}", } - availableFormats{ - E{"ccc"} - Ed{"E d."} - Gy{"y G"} - GyMMM{"MMM y G"} - GyMMMEd{"E d. MMM y G"} - GyMMMd{"d. MMM y G"} - H{"HH"} - Hm{"HH:mm"} - Hms{"HH:mm:ss"} - M{"L."} - MEd{"E d.M"} - MMM{"LLL"} - MMMEd{"E d. MMM"} - MMMMd{"d. MMMM"} - MMMd{"d. MMM"} - MMdd{"d.M."} - Md{"d.M."} - d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - ms{"mm:ss"} - y{"y G"} - yyyy{"y G"} - yyyyM{"M.y G"} - yyyyMEd{"E d.M.y G"} - yyyyMM{"MM.y G"} - yyyyMMM{"MMM y G"} - yyyyMMMEd{"E d. MMM y G"} - yyyyMMMM{"MMMM y G"} - yyyyMMMd{"d. MMM y G"} - yyyyMd{"d.M.y G"} - yyyyQQQ{"QQQ y G"} - yyyyQQQQ{"QQQQ y G"} - } intervalFormats{ - Gy{ - G{"y G–y G"} - y{"y–y G"} - } - GyM{ - G{"MM.y GGGGG–MM.y GGGGG"} - M{"MM.y–MM.y GGGGG"} - y{"MM.y–MM.y GGGGG"} - } - GyMEd{ - G{"E dd.MM.y GGGGG–E dd.MM.y GGGGG"} - M{"E dd.MM.y–E dd.MM.y GGGGG"} - d{"E dd.MM.y–E dd.MM.y GGGGG"} - y{"E dd.MM.y–E dd.MM.y GGGGG"} - } - GyMMM{ - G{"MMM y G–MMM y G"} - M{"MMM–MMM y G"} - y{"MMM y–MMM y G"} - } - GyMMMEd{ - G{"E d. MMM y G–E d. MMM y G"} - M{"E d. MMM–E d. MMM y G"} - d{"E d. MMM–E d. MMM y G"} - y{"E d. MMM y–E d. MMM y G"} - } - GyMMMd{ - G{"d. MMM y G–d. MMM y G"} - M{"d. MMM–d. MMM y G"} - d{"d.–d. MMM y G"} - y{"d. MMM y–d. MMM y G"} - } - GyMd{ - G{"dd.MM.y GGGGG–dd.MM.y GGGGG"} - M{"dd.MM.y–dd.MM.y GGGGG"} - d{"dd.MM.y–dd.MM.y GGGGG"} - y{"dd.MM.y–dd.MM.y GGGGG"} - } - H{ - H{"HH–HH"} - } - Hm{ - H{"HH:mm–HH:mm"} - m{"HH:mm–HH:mm"} - } - Hmv{ - H{"HH:mm–HH:mm v"} - m{"HH:mm–HH:mm v"} - } - Hv{ - H{"HH–HH v"} - } - M{ - M{"M.–M."} - } MEd{ M{"E dd.MM.–E dd.MM."} d{"E dd.MM.–E dd.MM."} } - MMM{ - M{"MMM–MMM"} - } MMMEd{ - M{"E d. MMM–E d. MMM"} d{"E d.–E d. MMM"} } - MMMd{ - M{"d. MMM–d. MMM"} - d{"d.–d. MMM"} - } Md{ M{"dd.MM.–dd.MM."} d{"dd.MM.–dd.MM."} } - d{ - d{"d.–d."} - } fallback{"{0} – {1}"} - h{ - a{"h a – h a"} - h{"h–h a"} - } - hm{ - a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} - } - hmv{ - a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} - } - hv{ - a{"h a – h a v"} - h{"h–h a v"} - } - y{ - y{"y–y G"} - } yM{ M{"MM.y–MM.y G"} y{"MM.y–MM.y G"} @@ -276,23 +109,8 @@ nn{ d{"E dd.MM.y–E dd.MM.y G"} y{"E dd.MM.y–E dd.MM.y G"} } - yMMM{ - M{"MMM–MMM y G"} - y{"MMM y–MMM y G"} - } yMMMEd{ - M{"E d. MMM–E d. MMM y G"} d{"E d.–E d. MMM y G"} - y{"E d. MMM y–E d. MMM y G"} - } - yMMMM{ - M{"MMMM–MMMM y G"} - y{"MMMM y–MMMM y G"} - } - yMMMd{ - M{"d. MMM–d. MMM y G"} - d{"d.–d. MMM y G"} - y{"d. MMM y–d. MMM y G"} } yMd{ M{"dd.MM.y–dd.MM.y G"} @@ -329,60 +147,14 @@ nn{ "{1}, {0}", "{1}, {0}", } - appendItems{ - Timezone{"{0} {1}"} - } availableFormats{ - Bh{"h B"} - Bhm{"h:mm B"} - Bhms{"h:mm:ss B"} - E{"ccc"} - EBhm{"E h:mm B"} - EBhms{"E h:mm:ss B"} EHm{"E HH:mm"} EHms{"E HH:mm:ss"} - Ed{"E d."} - Ehm{"E h:mm a"} - Ehms{"E h:mm:ss a"} - Gy{"y G"} - GyMMM{"MMM y G"} - GyMMMEd{"E d. MMM y G"} - GyMMMd{"d. MMM y G"} - H{"HH"} - Hm{"HH:mm"} - Hms{"HH:mm:ss"} - Hmsv{"HH:mm:ss v"} - Hmv{"HH:mm v"} - M{"L."} MEd{"E d.M"} - MMM{"LLL"} - MMMEd{"E d. MMM"} MMMMW{ one{"'veke' W 'i' MMMM"} other{"'veke' W 'i' MMMM"} } - MMMMd{"d. MMMM"} - MMMd{"d. MMM"} - MMdd{"d.M."} - Md{"d.M."} - d{"d."} - h{"h a"} - hm{"h:mm a"} - hms{"h:mm:ss a"} - hmsv{"h:mm:ss a v"} - hmv{"h:mm a v"} - ms{"mm:ss"} - y{"y"} - yM{"M.y"} - yMEd{"E d.M.y"} - yMM{"MM.y"} - yMMM{"MMM y"} - yMMMEd{"E d. MMM y"} - yMMMM{"MMMM y"} - yMMMd{"d. MMM y"} - yMd{"d.M.y"} - yQQQ{"QQQ y"} - yQQQQ{"QQQQ y"} yw{ one{"'veke' w 'i' Y"} other{"'veke' w 'i' Y"} @@ -483,18 +255,10 @@ nn{ } } eras{ - abbreviated{ - "f.Kr.", - "e.Kr.", - } abbreviated%variant{ "f.v.t.", "v.t.", } - narrow{ - "f.Kr.", - "e.Kr.", - } wide{ "f.Kr.", "e.Kr.", @@ -505,136 +269,22 @@ nn{ } } intervalFormats{ - Gy{ - G{"y G–y G"} - y{"y–y G"} - } - GyM{ - G{"MM.y GGGGG–MM.y GGGGG"} - M{"MM.y–MM.y GGGGG"} - y{"MM.y–MM.y GGGGG"} - } - GyMEd{ - G{"E dd.MM.y GGGGG–E dd.MM.y GGGGG"} - M{"E dd.MM.y–E dd.MM.y GGGGG"} - d{"E dd.MM.y–E dd.MM.y GGGGG"} - y{"E dd.MM.y–E dd.MM.y GGGGG"} - } - GyMMM{ - G{"MMM y G–MMM y G"} - M{"MMM–MMM y G"} - y{"MMM y–MMM y G"} - } - GyMMMEd{ - G{"E d. MMM y G–E d. MMM y G"} - M{"E d. MMM–E d. MMM y G"} - d{"E d. MMM–E d. MMM y G"} - y{"E d. MMM y–E d. MMM y G"} - } - GyMMMd{ - G{"d. MMM y G–d. MMM y G"} - M{"d. MMM–d. MMM y G"} - d{"d.–d. MMM y G"} - y{"d. MMM y–d. MMM y G"} - } - GyMd{ - G{"dd.MM.y GGGGG–dd.MM.y GGGGG"} - M{"dd.MM.y–dd.MM.y GGGGG"} - d{"dd.MM.y–dd.MM.y GGGGG"} - y{"dd.MM.y–dd.MM.y GGGGG"} - } - H{ - H{"HH–HH"} - } - Hm{ - H{"HH:mm–HH:mm"} - m{"HH:mm–HH:mm"} - } - Hmv{ - H{"HH:mm–HH:mm v"} - m{"HH:mm–HH:mm v"} - } - Hv{ - H{"HH–HH v"} - } - M{ - M{"M.–M."} - } - MEd{ - M{"E dd.MM.–E dd.MM."} - d{"E dd.MM.–E dd.MM."} - } - MMM{ - M{"MMM–MMM"} - } - MMMEd{ - M{"E d. MMM–E d. MMM"} - d{"E d.–E d. MMM"} - } - MMMd{ - M{"d. MMM–d. MMM"} - d{"d.–d. MMM"} - } Md{ M{"dd.MM–dd.MM"} d{"dd.MM–dd.MM"} } - d{ - d{"d.–d."} - } fallback{"{0} – {1}"} h{ a{"h a – h a"} - h{"h–h a"} } hm{ a{"h:mm a – h:mm a"} - h{"h:mm–h:mm a"} - m{"h:mm–h:mm a"} } hmv{ a{"h:mm a – h:mm a v"} - h{"h:mm–h:mm a v"} - m{"h:mm–h:mm a v"} } hv{ a{"h a – h a v"} - h{"h–h a v"} - } - y{ - y{"y–y"} - } - yM{ - M{"MM.y–MM.y"} - y{"MM.y–MM.y"} - } - yMEd{ - M{"E dd.MM.y–E dd.MM.y"} - d{"E dd.MM.y–E dd.MM.y"} - y{"E dd.MM.y–E dd.MM.y"} - } - yMMM{ - M{"MMM–MMM y"} - y{"MMM y–MMM y"} - } - yMMMEd{ - M{"E d. MMM–E d. MMM y"} - d{"E d.–E d. MMM y"} - y{"E d. MMM y–E d. MMM y"} - } - yMMMM{ - M{"MMMM–MMMM y"} - y{"MMMM y–MMMM y"} - } - yMMMd{ - M{"d. MMM–d. MMM y"} - d{"d.–d. MMM y"} - y{"d. MMM y–d. MMM y"} - } - yMd{ - M{"dd.MM.y–dd.MM.y"} - d{"dd.MM.y–dd.MM.y"} - y{"dd.MM.y–dd.MM.y"} } } monthNames{ @@ -653,120 +303,24 @@ nn{ "nov.", "des.", } - narrow{ - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - } - wide{ - "januar", - "februar", - "mars", - "april", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember", - } - } - stand-alone{ - abbreviated{ - "jan", - "feb", - "mar", - "apr", - "mai", - "jun", - "jul", - "aug", - "sep", - "okt", - "nov", - "des", - } - narrow{ - "J", - "F", - "M", - "A", - "M", - "J", - "J", - "A", - "S", - "O", - "N", - "D", - } - wide{ - "januar", - "februar", - "mars", - "april", - "mai", - "juni", - "juli", - "august", - "september", - "oktober", - "november", - "desember", - } } } quarters{ format{ - abbreviated{ - "K1", - "K2", - "K3", - "K4", - } narrow{ "1", "2", "3", "4", } - wide{ - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - } } stand-alone{ - abbreviated{ - "K1", - "K2", - "K3", - "K4", - } narrow{ "1", "2", "3", "4", } - wide{ - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - } } } } @@ -775,45 +329,28 @@ nn{ activities{"aktivitetar"} african_scripts{"afrikanske skriftsystem"} american_scripts{"amerikanske skriftsystem"} - animal{"dyr"} animals_nature{"dyr eller natur"} - arrows{"piler"} - body{"kropp"} box_drawing{"ruteteikning"} - braille{"punktskrift"} - building{"bygning"} bullets_stars{"punktteikn/stjerner"} - consonantal_jamo{"konsonantal jamo"} currency_symbols{"valutasymbol"} dash_connector{"tankestrek/bindeteikn"} digits{"siffer"} - dingbats{"dingbats"} divination_symbols{"spådomssymbol"} downwards_arrows{"piler som peiker nedover"} downwards_upwards_arrows{"piler som peiker nedover og oppover"} east_asian_scripts{"austasiatiske skriftsystem"} - emoji{"emoji"} european_scripts{"europeiske skriftsystem"} female{"kvinneleg"} - flag{"flagg"} - flags{"flagg"} - food_drink{"mat og drikke"} - format{"format"} - format_whitespace{"format og mellomrom"} full_width_form_variant{"fullbreiddvariantar"} geometric_shapes{"geometriske former"} half_width_form_variant{"halvbreiddvariantar"} han_characters{"han-teikn"} han_radicals{"han-radikalar"} - hanja{"hanja"} hanzi_simplified{"hanzi (forenkla)"} - hanzi_traditional{"hanzi (tradisjonell)"} heart{"hjarte"} historic_scripts{"historiske skriftsystem"} ideographic_desc_characters{"ideografiske beskrivande teikn"} japanese_kana{"japanske kana"} - kanbun{"kanbun"} - kanji{"kanji"} keycap{"tastar"} leftwards_arrows{"piler som peiker til venstre"} leftwards_rightwards_arrows{"piler som peiker til venstre og høgre"} @@ -822,52 +359,34 @@ nn{ male{"mannleg"} math_symbols{"matematikksymbol"} middle_eastern_scripts{"skriftsystem frå Midtausten"} - miscellaneous{"diverse"} modern_scripts{"moderne skriftsystem"} - modifier{"modifikator"} musical_symbols{"musikksymbol"} - nature{"natur"} nonspacing{"utan breidd"} numbers{"tal"} objects{"objekt"} other{"anna"} - paired{"par"} person{"person"} - phonetic_alphabet{"fonetisk alfabet"} pictographs{"piktogram"} place{"stad"} - plant{"plante"} punctuation{"skiljeteikn"} rightwards_arrows{"piler som peiker til høgre"} sign_standard_symbols{"teikn eller symbol"} small_form_variant{"små variantar"} - smiley{"smilefjes"} smileys_people{"smilefjes og personar"} south_asian_scripts{"sørasiatiske skriftsystem"} southeast_asian_scripts{"søraustasiatiske skriftsystem"} spacing{"med breidd"} - sport{"sport"} symbols{"symbol"} technical_symbols{"tekniske symbol"} tone_marks{"tonemerke"} - travel{"reise"} travel_places{"reise og stadar"} upwards_arrows{"pil som peiker oppover"} variant_forms{"variantar"} - vocalic_jamo{"vokalisk jamo"} weather{"vêr"} western_asian_scripts{"vestasiatiske skriftsystem"} - whitespace{"mellomrom"} - } - delimiters{ - alternateQuotationEnd{"’"} - alternateQuotationStart{"‘"} - quotationEnd{"»"} - quotationStart{"«"} } fields{ day{ - dn{"dag"} relative{ "-1"{"i går"} "-2"{"i førgår"} @@ -876,10 +395,6 @@ nn{ "2"{"i overmorgon"} } relativeTime{ - future{ - one{"om {0} døgn"} - other{"om {0} døgn"} - } past{ one{"for {0} døgn sidan"} other{"for {0} døgn sidan"} @@ -887,12 +402,7 @@ nn{ } } day-narrow{ - dn{"d."} relativeTime{ - future{ - one{"+{0} d."} - other{"+{0} d."} - } past{ one{"–{0} d."} other{"–{0} d."} @@ -900,45 +410,13 @@ nn{ } } day-short{ - dn{"dag"} relativeTime{ - future{ - one{"om {0} d."} - other{"om {0} d."} - } past{ one{"for {0} d. sidan"} other{"for {0} d. sidan"} } } } - dayOfYear{ - dn{"dag i året"} - } - dayOfYear-narrow{ - dn{"d. i året"} - } - dayOfYear-short{ - dn{"dag i året"} - } - dayperiod{ - dn{"a.m./p.m."} - } - dayperiod-narrow{ - dn{"am/pm"} - } - dayperiod-short{ - dn{"am/pm"} - } - era{ - dn{"tidsalder"} - } - era-narrow{ - dn{"tidsalder"} - } - era-short{ - dn{"tidsalder"} - } fri{ relative{ "-1"{"førre fredag"} @@ -963,10 +441,6 @@ nn{ "1"{"neste fr."} } relativeTime{ - future{ - one{"om {0} fr."} - other{"om {0} fr."} - } past{ one{"for {0} fr. sidan"} other{"for {0} fr. sidan"} @@ -980,10 +454,6 @@ nn{ "1"{"neste fre."} } relativeTime{ - future{ - one{"om {0} fre."} - other{"om {0} fre."} - } past{ one{"for {0} fre. sidan"} other{"for {0} fre. sidan"} @@ -991,10 +461,6 @@ nn{ } } hour{ - dn{"time"} - relative{ - "0"{"denne timen"} - } relativeTime{ future{ one{"om {0} time"} @@ -1007,12 +473,7 @@ nn{ } } hour-narrow{ - dn{"t"} relativeTime{ - future{ - one{"+{0} t"} - other{"+{0} t"} - } past{ one{"–{0} t"} other{"–{0} t"} @@ -1020,12 +481,7 @@ nn{ } } hour-short{ - dn{"t"} relativeTime{ - future{ - one{"om {0} t"} - other{"om {0} t"} - } past{ one{"for {0} t sidan"} other{"for {0} t sidan"} @@ -1033,10 +489,6 @@ nn{ } } minute{ - dn{"minutt"} - relative{ - "0"{"dette minuttet"} - } relativeTime{ future{ one{"om {0} minutt"} @@ -1049,12 +501,7 @@ nn{ } } minute-narrow{ - dn{"m"} relativeTime{ - future{ - one{"+{0} min"} - other{"+{0} min"} - } past{ one{"–{0} min"} other{"–{0} min"} @@ -1062,12 +509,7 @@ nn{ } } minute-short{ - dn{"min"} relativeTime{ - future{ - one{"om {0} min"} - other{"om {0} min"} - } past{ one{"for {0} min sidan"} other{"for {0} min sidan"} @@ -1144,12 +586,7 @@ nn{ } } month-narrow{ - dn{"md."} relativeTime{ - future{ - one{"+{0} md."} - other{"+{0} md."} - } past{ one{"–{0} md."} other{"–{0} md."} @@ -1159,10 +596,6 @@ nn{ month-short{ dn{"md."} relativeTime{ - future{ - one{"om {0} md."} - other{"om {0} md."} - } past{ one{"for {0} md. sidan"} other{"for {0} md. sidan"} @@ -1170,7 +603,6 @@ nn{ } } quarter{ - dn{"kvartal"} relative{ "-1"{"førre kvartal"} "0"{"dette kvartalet"} @@ -1187,26 +619,8 @@ nn{ } } } - quarter-narrow{ - dn{"kv."} - relativeTime{ - future{ - one{"+{0} kv."} - other{"+{0} kv."} - } - past{ - one{"–{0} kv."} - other{"–{0} kv."} - } - } - } quarter-short{ - dn{"kv."} relativeTime{ - future{ - one{"om {0} kv."} - other{"om {0} kv."} - } past{ one{"for {0} kv. sidan"} other{"for {0} kv. sidan"} @@ -1265,7 +679,6 @@ nn{ } } second{ - dn{"sekund"} relative{ "0"{"no"} } @@ -1281,12 +694,7 @@ nn{ } } second-narrow{ - dn{"s"} relativeTime{ - future{ - one{"+{0} s"} - other{"+{0} s"} - } past{ one{"–{0} s"} other{"–{0} s"} @@ -1294,7 +702,6 @@ nn{ } } second-short{ - dn{"sek"} relativeTime{ future{ one{"om {0} sek"} @@ -1381,10 +788,6 @@ nn{ "1"{"neste to."} } relativeTime{ - future{ - one{"om {0} to."} - other{"om {0} to."} - } past{ one{"for {0} to. sidan"} other{"for {0} to. sidan"} @@ -1398,10 +801,6 @@ nn{ "1"{"neste tor."} } relativeTime{ - future{ - one{"om {0} tor."} - other{"om {0} tor."} - } past{ one{"for {0} tor. sidan"} other{"for {0} tor. sidan"} @@ -1483,10 +882,6 @@ nn{ "1"{"neste on."} } relativeTime{ - future{ - one{"om {0} on."} - other{"om {0} on."} - } past{ one{"for {0} on. sidan"} other{"for {0} on. sidan"} @@ -1500,10 +895,6 @@ nn{ "1"{"neste ons."} } relativeTime{ - future{ - one{"om {0} ons."} - other{"om {0} ons."} - } past{ one{"for {0} ons. sidan"} other{"for {0} ons. sidan"} @@ -1584,17 +975,7 @@ nn{ dn{"veked. i md."} } year{ - dn{"år"} - relative{ - "-1"{"i fjor"} - "0"{"i år"} - "1"{"neste år"} - } relativeTime{ - future{ - one{"om {0} år"} - other{"om {0} år"} - } past{ one{"for {0} år sidan"} other{"for {0} år sidan"} @@ -1602,7 +983,6 @@ nn{ } } year-narrow{ - dn{"år"} relativeTime{ future{ one{"om {0} år"} @@ -1615,46 +995,18 @@ nn{ } } year-short{ - dn{"år"} relativeTime{ - future{ - one{"om {0} år"} - other{"om {0} år"} - } past{ one{"for {0} år sidan"} other{"for {0} år sidan"} } } } - zone{ - dn{"tidssone"} - } - zone-narrow{ - dn{"tidssone"} - } - zone-short{ - dn{"tidssone"} - } } listPattern{ - or{ - 2{"{0} eller {1}"} - end{"{0} eller {1}"} - middle{"{0}, {1}"} - start{"{0}, {1}"} - } - standard{ - 2{"{0} og {1}"} - end{"{0} og {1}"} - middle{"{0}, {1}"} - start{"{0}, {1}"} - } unit{ 2{"{0}, {1}"} end{"{0}, {1}"} - middle{"{0}, {1}"} - start{"{0}, {1}"} } unit-narrow{ 2{"{0} {1}"} @@ -1662,16 +1014,5 @@ nn{ middle{"{0} {1}"} start{"{0} {1}"} } - unit-short{ - 2{"{0}, {1}"} - end{"{0}, {1}"} - middle{"{0}, {1}"} - start{"{0}, {1}"} - } - } - measurementSystemNames{ - UK{"engelsk"} - US{"amerikansk"} - metric{"metrisk"} } } diff --git a/icu4c/source/data/locales/no_NO.txt b/icu4c/source/data/locales/no_NO.txt index d9e856ba0bb..6613a86c4e6 100644 --- a/icu4c/source/data/locales/no_NO.txt +++ b/icu4c/source/data/locales/no_NO.txt @@ -2,4 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no_NO{ + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/locales/no_SJ.txt b/icu4c/source/data/locales/no_SJ.txt deleted file mode 100644 index b65010f928e..00000000000 --- a/icu4c/source/data/locales/no_SJ.txt +++ /dev/null @@ -1,5 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -no_SJ{ -} diff --git a/icu4c/source/data/misc/dayPeriods.txt b/icu4c/source/data/misc/dayPeriods.txt index 3fce929397f..7c4bc7e9c4d 100644 --- a/icu4c/source/data/misc/dayPeriods.txt +++ b/icu4c/source/data/misc/dayPeriods.txt @@ -56,6 +56,7 @@ dayPeriods:table(nofallback){ mr{"set37"} ms{"set60"} my{"set56"} + nb{"set8"} ne{"set38"} nl{"set4"} no{"set8"} @@ -138,6 +139,7 @@ dayPeriods:table(nofallback){ mr{"set121"} ms{"set146"} my{"set155"} + nb{"set87"} ne{"set122"} nl{"set83"} no{"set87"} diff --git a/icu4c/source/data/misc/grammaticalFeatures.txt b/icu4c/source/data/misc/grammaticalFeatures.txt index b535c874b0b..1689d2fdea8 100644 --- a/icu4c/source/data/misc/grammaticalFeatures.txt +++ b/icu4c/source/data/misc/grammaticalFeatures.txt @@ -132,6 +132,28 @@ grammaticalFeatures:table(nofallback){ } } features{ + am{ + nominal{ + case{ + _{ + "nominative", + "accusative", + } + } + definiteness{ + _{ + "definite", + "indefinite", + } + } + gender{ + _{ + "masculine", + "feminine", + } + } + } + } ar{ nominal{ case{ @@ -157,6 +179,21 @@ grammaticalFeatures:table(nofallback){ } } } + az{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "ablative", + "locative", + } + units{""} + } + } + } bn{ nominal{ case{ @@ -181,6 +218,16 @@ grammaticalFeatures:table(nofallback){ } } } + ca{ + nominal{ + gender{ + _{ + "masculine", + "feminine", + } + } + } + } cs{ nominal{ case{ @@ -247,6 +294,25 @@ grammaticalFeatures:table(nofallback){ } } } + el{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "accusative", + "vocative", + } + } + gender{ + _{ + "masculine", + "feminine", + "neuter", + } + } + } + } es{ nominal{ gender{ @@ -257,6 +323,17 @@ grammaticalFeatures:table(nofallback){ } } } + fa{ + nominal{ + definiteness{ + _{ + "definite", + "indefinite", + "construct", + } + } + } + } fr{ nominal{ gender{ @@ -322,6 +399,67 @@ grammaticalFeatures:table(nofallback){ } } } + hr{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "instrumental", + "vocative", + "locative", + } + } + gender{ + _{ + "animate", + "inanimate", + "feminine", + "neuter", + } + } + } + } + hu{ + nominal{ + case{ + _{ + "nominative", + "ablative", + "accusative", + "adessive", + "allative", + "causal", + "dative", + "delative", + "elative", + "essive", + "illative", + "inessive", + "instrumental", + "sublative", + "superessive", + "terminative", + "translative", + } + } + } + } + hy{ + nominal{ + case{ + _{ + "nominative", + "ablative", + "dative", + "locative", + "instrumental", + } + } + } + } id{ nominal{ definiteness{ @@ -332,6 +470,31 @@ grammaticalFeatures:table(nofallback){ } } } + is{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + } + } + definiteness{ + _{ + "definite", + "indefinite", + } + } + gender{ + _{ + "masculine", + "feminine", + "neuter", + } + } + } + } it{ nominal{ gender{ @@ -342,6 +505,22 @@ grammaticalFeatures:table(nofallback){ } } } + kk{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "instrumental", + "ablative", + "locative", + } + units{""} + } + } + } kn{ nominal{ case{ @@ -364,6 +543,21 @@ grammaticalFeatures:table(nofallback){ } } } + ky{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "ablative", + "locative", + } + units{""} + } + } + } lij{ nominal{ gender{ @@ -374,6 +568,47 @@ grammaticalFeatures:table(nofallback){ } } } + lt{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "instrumental", + "vocative", + "locative", + } + } + gender{ + _{ + "masculine", + "feminine", + } + } + } + } + lv{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "vocative", + "locative", + } + } + gender{ + _{ + "masculine", + "feminine", + } + } + } + } ml{ nominal{ case{ @@ -460,6 +695,34 @@ grammaticalFeatures:table(nofallback){ } } } + no{ + nominal{ + case{ + _{ + "nominative", + "genitive", + } + units{""} + } + definiteness{ + _{ + "definite", + "indefinite", + } + } + gender{ + _{ + "masculine", + "feminine", + "neuter", + } + units{ + "masculine", + "neuter", + } + } + } + } pa{ nominal{ case{ @@ -583,6 +846,32 @@ grammaticalFeatures:table(nofallback){ } } } + si{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "ablative", + "accusative", + "dative", + } + } + definiteness{ + _{ + "definite", + "indefinite", + } + } + gender{ + _{ + "masculine", + "feminine", + "neuter", + } + } + } + } sk{ nominal{ case{ @@ -606,6 +895,50 @@ grammaticalFeatures:table(nofallback){ } } } + sl{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "accusative", + "dative", + "instrumental", + "locative", + } + } + gender{ + _{ + "masculine", + "feminine", + "neuter", + } + } + } + } + sr{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "instrumental", + "vocative", + "locative", + } + } + gender{ + _{ + "animate", + "inanimate", + "feminine", + "neuter", + } + } + } + } sv{ nominal{ case{ @@ -675,6 +1008,28 @@ grammaticalFeatures:table(nofallback){ } } } + uk{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "instrumental", + "vocative", + "locative", + } + } + gender{ + _{ + "masculine", + "feminine", + "neuter", + } + } + } + } ur{ nominal{ case{ @@ -691,6 +1046,21 @@ grammaticalFeatures:table(nofallback){ } } } + uz{ + nominal{ + case{ + _{ + "nominative", + "genitive", + "dative", + "accusative", + "ablative", + "locative", + } + units{""} + } + } + } } } } diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index bd119f34216..afcadd7edce 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -143,7 +143,6 @@ langInfo:table(nofallback){ "myd","aog", "myt","mry", "nad","xny", - "nb","no", "nbf","nru", "nbx","ekc", "ncp","kdz", @@ -1126,7 +1125,7 @@ langInfo:table(nofallback){ "nap","Latn","IT", "naq","Latn","NA", "nas","Latn","ZZ", - "no","Latn","NO", + "nb","Latn","NO", "nca","Latn","ZZ", "nce","Latn","ZZ", "ncf","Latn","ZZ", @@ -1166,6 +1165,7 @@ langInfo:table(nofallback){ "nnk","Latn","ZZ", "nnm","Latn","ZZ", "nnp","Wcho","IN", + "no","Latn","NO", "nod","Lana","TH", "noe","Deva","IN", "non","Runr","SE", @@ -1592,7 +1592,7 @@ langInfo:table(nofallback){ "en","Latn","DG", "fr","Latn","RE", "fr","Latn","SC", - "no","Latn","SJ", + "nb","Latn","SJ", "it","Latn","SM", "fr","Latn","SN", "nl","Latn","SR", @@ -1871,148 +1871,148 @@ langInfo:table(nofallback){ } trie:bin{ 001a6dcc0f74c4f077c26777a2b778a4 -5279a4c27a0f6d7d7a5c7a30e1ad99e8 -2ef5af3c10e1a539022a3c42cc184811 +5279a4c27a0f6d7d7a5c7a30e1ad9ae8 +2ef5af3d10e1a539022a3c42cc184811 616e01e2a3fdf4a3f80b4d25540e54ca c5552a5610cea3fb10d3a3fa4dd81e50 502a5310d2a3f602c1a3f5c6a3f3c8a3 f447d4d4473248d81e324910c4a3f101 c2a3f9c6a3ef6d326e36733a7910e2ad -9910e9af3a10e5af3b10ed22012aa90e +9a10e9af3b10e5af3c10ed22012aa90e 4310c3a90f6817683269366b3a6c10ed -af3910f8adb610e1af3810f4ad946132 -6436653a6710e8adc510e7af3510eaaf -3610e1af3700126d46741b7434753877 -42e1ade9efaf0010edaf0501f5af06f6 -af0710e1af086d3c6e406f50725a7301 -e7ad85ebaf0410efadfc02e3adfde9ad -fef5adff01e2af01f3af0210f3af0367 -266736683a693e6a4e6c10f3adfb10e9 -adf410e7adf502e2adf6f5adf7f6adf8 -01e1adf9e9adfa6138625463646501ec -a520f2adf304e5adeaeaadebecadecee -adedf2adee02f0adeff1adf0f2adf110 -e9adf20c6e3d7221722e7332774ee8af -0c10e2af1204e1adbde9af13eca52fed -af14f2af1510e5af166e346f3e7001e5 -a78df2adba01e1adb4f2af0f01e7af10 -eeaf11651d653a6c3e6d02e6af0eeead -aaf2adad10f3af0b02e1af0de3ada6e4 -ada7613462386301efad74f2ad7310f6 -af0910e9af0a0d6d49733073307534e9 -a733efaf2910f3af2e04e1af2fe532ea -af32f4af33f7af34012a2e4812616ef3 -af31012aaf304310ceaf316d3a6f3e72 -02e2af2be5af2cecaf2d10ecaf2810ee -af2a6520653e67426b4c6c02e5af25e7 -af26ecaf2710f2af2101f2af22f7af23 -10efaf24612e62606410e4a73307f40c -f4af1af6af1bf9af1cfaaf1deda7b6ef -af17f0af18f3af1902e1af1ee2af1ff9 -af2074a25275a4d0760a6f1fe509e5ad -dce9ad60efade46f3472387501eeade7 -f4ade810f4ade510efade6613c654c69 -566c606d01e6ade2f7ade302e7addae9 -adcaeeaddb01e3adddf0adde01e3addf -f6ade010f3ade100267576e91ff20ef2 -abc5f3abc9f4abcff767f9abdfe9abaa -ebabb1ecabb5eeabbbefabbd7a247a36 -e1ab89e5ab9be72ee8aba610edabe201 -2a2e41127261e2aba2012aaba15010cb -aba2753e7654776478cced7901e1abe0 -f6abe103e8abd6ecabd7edabd8f1abd9 -02e4a7b9ecabdaf5abdb01e8abdcf1ab -dd6b7d7049705e716e727273827406f1 -0cf1abb9f2abd3f3abd4f4abd5e4abd0 -e5abd1eaabd202e9abc1edabc2faabc3 -10efabc402f5abc6f6abc7f7abc804e4 -abcae6abcbe7abcceaabcdf7abce6b42 -6c526d626e6c6f02e6abbee7abbff1ab -c002ecabb2f2abb3f4abb402e6abb6f8 -abb7f9abb801e8abb9f9abba10e8abbc +af3a10f8adb710e1af3910f4ad956132 +6436653a6710e8adc610e7af3610eaaf +3710e1af3800126d46741b7434753877 +42e1adeaefaf0110edaf0601f5af07f6 +af0810e1af096d3c6e406f50725a7301 +e7ad86ebaf0510efadfd02e3adfee9ad +fff5af0001e2af02f3af0310f3af0467 +266736683a693e6a4e6c10f3adfc10e9 +adf510e7adf602e2adf7f5adf8f6adf9 +01e1adfae9adfb6138625463646501ec +a520f2adf404e5adebeaadececadedee +adeef2adef02f0adf0f1adf1f2adf210 +e9adf30c6e3d7221722e7332774ee8af +0d10e2af1304e1adbee9af14eca52fed +af15f2af1610e5af176e346f3e7001e5 +a78df2adbb01e1adb5f2af1001e7af11 +eeaf12651d653a6c3e6d02e6af0feead +abf2adae10f3af0c02e1af0ee3ada7e4 +ada8613462386301efad75f2ad7410f6 +af0a10e9af0b0d6d49733073307534e9 +a733efaf2a10f3af2f04e1af30e532ea +af33f4af34f7af35012a2e4812616ef3 +af32012aaf314310ceaf326d3a6f3e72 +02e2af2ce5af2decaf2e10ecaf2910ee +af2b6520653e67426b4c6c02e5af26e7 +af27ecaf2810f2af2201f2af23f7af24 +10efaf25612e62606410e4a73307f40c +f4af1bf6af1cf9af1dfaaf1eeda7b6ef +af18f0af19f3af1a02e1af1fe2af20f9 +af2174a25275a4d0760a6f1fe509e5ad +dde9ad61efade56f3472387501eeade8 +f4ade910f4ade610efade7613c654c69 +566c606d01e6ade3f7ade402e7addbe9 +adcbeeaddc01e3addef0addf01e3ade0 +f6ade110f3ade200267576e91ff20ef2 +abc6f3abcaf4abd0f767f9abe0e9abab +ebabb2ecabb6eeabbcefabbe7a247a36 +e1ab8ae5ab9ce72ee8aba710edabe301 +2a2e41127261e2aba3012aaba25010cb +aba3753e7654776478cced7901e1abe1 +f6abe203e8abd7ecabd8edabd9f1abda +02e4a7b9ecabdbf5abdc01e8abddf1ab +de6b7d7049705e716e727273827406f1 +0cf1abbaf2abd4f3abd5f4abd6e4abd1 +e5abd2eaabd302e9abc2edabc3faabc4 +10efabc502f5abc7f6abc8f7abc904e4 +abcbe6abcce7abcdeaabcef7abcf6b42 +6c526d626e6c6f02e6abbfe7abc0f1ab +c102ecabb3f2abb4f4abb502e6abb7f8 +abb8f9abb901e8abbaf9abbb10e8abbd 6546655e6674677868886906eb0cebab -adedabaeefabaff6abb0e2a3b1e6abab -e7abac03e4ab9cedab9defab9ef4ab9f -10e9aba002e3aba3efaba4f5aba502ec -aba7f1aba8f2aba96144625a63866403 -e4ab97e7ab98e8ab99f5ab9a03eaab8a -ecab8beeab8cf1ab8d06e70ce7ab91ef -ab92f7ab93faab94e3ab8ee4ab8fe6ab -9001e9ab95f9ab960f7362e72ce742eb -abe9f2ad48fa012a8641127261e2add8 -012a2e43127972ecabe6022aabe54b2a -4d10ceabe710daabe673607464766e7a -10ee012a2e41127261e2add8022aabf4 -412a4310ceadd910c6add810e1add401 -e8a549f2add501e8add6ecadd76d326d -3e6e426f707202e9add1f4add2f7add3 -10e2abeb01f226f8adcf012a2e441265 -76e1adce012aadcd4e10d0adce10ebad -d062326436673a6c10e9abea10f5abe3 -10edabe410e1abe870c39570a4f971a6 +aeedabafefabb0f6abb1e2a3b1e6abac +e7abad03e4ab9dedab9eefab9ff4aba0 +10e9aba102e3aba4efaba5f5aba602ec +aba8f1aba9f2abaa6144625a63866403 +e4ab98e7ab99e8ab9af5ab9b03eaab8b +ecab8ceeab8df1ab8e06e70ce7ab92ef +ab93f7ab94faab95e3ab8fe4ab90e6ab +9101e9ab96f9ab970f7362e72ce742eb +abeaf2ad49fa012a8641127261e2add9 +012a2e43127972ecabe7022aabe64b2a +4d10ceabe810daabe773607464766e7a +10ee012a2e41127261e2add9022aabf5 +412a4310ceadda10c6add910e1add501 +e8a549f2add601e8add7ecadd86d326d +3e6e426f707202e9add2f4add3f7add4 +10e2abec01f226f8add0012a2e441265 +76e1adcf012aadce4e10d0adcf10ebad +d162326436673a6c10e9abeb10f5abe4 +10edabe510e1abe970c39570a4f971a6 d772a6e47300287884ec39f229f509f5 -ab78f6ab7ef7ab7ff22cf3ab71f4ab75 -22032aab2b4da4bf522a5410d2ab2f01 -cfab2ed5ab2cecab53edab58eeab5fef -ab65f16de429e438e5ab3be7ab40e9ab -49ebab4f032aab3544324b3a5312696e -e4ab38126576e1ab3612686feaab3778 -34793e7a48e1ab1fe3ab2a01eeab85f7 -ab8601ecab87f2a50c10ecab886cad72 -4f725873747484758e7705e809e8ab7f -f0ab83f6ab84e2ab80e3ab81e7ab8204 -e2ab6ee3ab2aeeab6ff2ab70f8a5f102 -e4ab72e7ab73f9ab7401ebab76f1ab77 -04e1ab79e5ab7aebab7bf2ab7cf3ab7d -6c4a6d666e8c6fa2437003e4ab6becab -6cf3ab6df9a77404e4ab54e9ab55ecab -56efab4ff9ab5705f009f0ab5cf1ab5d -f3ab5ee1ab59eaab5aeeab5b04e3ab60 -ebab61f0ab62f8ab63f9ab6404e7ab66 -ebab67f1ab68f5ab69f9ab6a673e6742 -6858696e6a846b02e3ab50f2ab51f3ab -5203e1ab41f3ab42f7ab43faab4403e9 -ab45ebab46eeab47f5ab4803e4ab4ae7 -ab4becab4cedab4d10f2ab4e614a6276 -638664a26b6503e6ab3ce8ab3de9ab3e -f3ab3f06f30cf3ab23f4ab24f6ab25fa -ab26e6ab20e8ab21f1ab2202e1ab27e5 -ab28f0ab2906ee0ceeab32efab33f2a5 -fff3ab34e32cebab30ecab3122055211 -522e53325410d2ab2f10cfab2e10d5ab -2c2aab2b312a4d10c5ab2d1137b2ab2c -01e3ab39e8ab3a00166e63752bec09ec -a9eaf3a9dbf4a9f7754c7750e1012a2e -41127261e2a9d3012aa9d25010cba9d3 -10f5a9f910e1a9fa7217722e733e7410 -f0a9f802e1a9f3e4a9f4e7a9f510f3a9 -f66e346f4a7001e1a9f1efa9f203e2a7 -cce7a9edeea9eef4a9ef10eea9f06630 -6b176b2e6c386d10f3a9ec01e1a9e8ef -a9e901e1a9ebf4a92e663468386901ec -a9e6f0a9e710eca9e301eca9e4eea9e5 -614e627e638864926504e4a9e0efa9e1 -f2a570f3a570f8a9e204e7a9d4ec32ed -a9d7f0a9d8f5a9d9012aa9d55012686c -f0a9d601e9a9daf5a9db01e4a9dceda9 -dd01e3a9def4a9df017526f5a9fb02e3 -a9fce7a9fdfaa9fb00146f457917ef09 -efa94bf5ab18f7ab1b792cedab0beeab -1010f5ab1e6f3c724c745075547701eb -ab1cefab1d02e2ab13e6ab14efab1510 -efab1610edab1702e5ab19e7ab1aeda9 -4b6934693c6a566b5a6d5e6e01e1ab11 -e7ab1201e1ab06e622012aab074e10cc -ab0810f3ab0910f4ab0a03e6ab0cefab -0df4ab0ef5ab0f61366346654a675a68 -10e7ab0502e9a9feeaa960efa9ff10e6 -ab0002eaab01ecab02f3ab0310eeab04 +ab79f6ab7ff7ab80f22cf3ab72f4ab76 +22032aab2c4da4bf522a5410d2ab3001 +cfab2fd5ab2decab54edab59eeab60ef +ab66f16de429e438e5ab3ce7ab41e9ab +4aebab50032aab3644324b3a5312696e +e4ab39126576e1ab3712686feaab3878 +34793e7a48e1ab20e3ab2b01eeab86f7 +ab8701ecab88f2a50c10ecab896cad72 +4f725873747484758e7705e809e8ab80 +f0ab84f6ab85e2ab81e3ab82e7ab8304 +e2ab6fe3ab2beeab70f2ab71f8a5f102 +e4ab73e7ab74f9ab7501ebab77f1ab78 +04e1ab7ae5ab7bebab7cf2ab7df3ab7e +6c4a6d666e8c6fa2437003e4ab6cecab +6df3ab6ef9a77404e4ab55e9ab56ecab +57efab50f9ab5805f009f0ab5df1ab5e +f3ab5fe1ab5aeaab5beeab5c04e3ab61 +ebab62f0ab63f8ab64f9ab6504e7ab67 +ebab68f1ab69f5ab6af9ab6b673e6742 +6858696e6a846b02e3ab51f2ab52f3ab +5303e1ab42f3ab43f7ab44faab4503e9 +ab46ebab47eeab48f5ab4903e4ab4be7 +ab4cecab4dedab4e10f2ab4f614a6276 +638664a26b6503e6ab3de8ab3ee9ab3f +f3ab4006f30cf3ab24f4ab25f6ab26fa +ab27e6ab21e8ab22f1ab2302e1ab28e5 +ab29f0ab2a06ee0ceeab33efab34f2a5 +fff3ab35e32cebab31ecab3222055211 +522e53325410d2ab3010cfab2f10d5ab +2d2aab2c312a4d10c5ab2e1137b2ab2d +01e3ab3ae8ab3b00166e63752bec09ec +a9ebf3a9dcf4a9f8754c7750e1012a2e +41127261e2a9d4012aa9d35010cba9d4 +10f5a9fa10e1a9fb7217722e733e7410 +f0a9f902e1a9f4e4a9f5e7a9f610f3a9 +f76e346f4a7001e1a9f2efa9f303e2a7 +cce7a9eeeea9eff4a9f010eea9f16630 +6b176b2e6c386d10f3a9ed01e1a9e9ef +a9ea01e1a9ecf4a92e663468386901ec +a9e7f0a9e810eca9e401eca9e5eea9e6 +614e627e638864926504e4a9e1efa9e2 +f2a570f3a570f8a9e304e7a9d5ec32ed +a9d8f0a9d9f5a9da012aa9d65012686c +f0a9d701e9a9dbf5a9dc01e4a9ddeda9 +de01e3a9dff4a9e0017526f5a9fc02e3 +a9fde7a9fefaa9fc00146f457917ef09 +efa94bf5ab19f7ab1c792cedab0ceeab +1110f5ab1f6f3c724c745075547701eb +ab1defab1e02e2ab14e6ab15efab1610 +efab1710edab1802e5ab1ae7ab1beda9 +4b6934693c6a566b5a6d5e6e01e1ab12 +e7ab1301e1ab07e622012aab084e10cc +ab0910f3ab0a10f4ab0b03e6ab0defab +0ef4ab0ff5ab1061366346654a675a68 +10e7ab0602e9a9ffeaa960efab0010e6 +ab0102eaab02ecab03f3ab0410eeab05 6da2576ea63e6f0b741ded09eda5a1f2 -a9caf3a9cd742a7a34e3a9c201e1a9cf -eba9d010eda9d17017702e72327310e1 -a9ce10eda9c902efa9cbf5a9ccf9a9ca -673a6b3e6e02e7a9c6eea9c7f3a9c810 -e3a9c301f2a9c4f6a9c50022749fe926 +a9cbf3a9ce742a7a34e3a9c301e1a9d0 +eba9d110eda9d27017702e72327310e1 +a9cf10eda9ca02efa9ccf5a9cdf9a9cb +673a6b3e6e02e7a9c7eea9c8f3a9c910 +e3a9c401f2a9c5f6a9c60022749fe926 ef0fefa94bf2a956f3a492f4a95af9a3 cee9a90beba905eca940ee012abac64d 126f6ee7a53f783d7834793e7a64e7a9 @@ -2044,15 +2044,15 @@ e709e7a908e9a909eba90ae3a905e4a9 06e6a90704e8a911efa912f1a913f5a9 14f7a91504e9a916f0a917f1a918f2a9 19f5a91a0021745fe41dee0feea9a1ef -a97ff2a9adf6a9baf9a9bee4a986e5a9 +a9a7f2a9aef6a9bbf9a9bfe4a986e5a9 89e7a98eeca54b791579307a3ae1a977 -e2a97f01eda9bfeea9c010e9a9c17438 -7542775e7801f1a9bcf2a9bd01eda9b3 -f2a9b404e9a9b5f0a9b6f3a9b7f6a9b8 -f8a9b910e2a9bb6a5d6f326f48706471 -68726c7303eba9afeea9b0efa9b1f3a9 -b204e4a9a7e5a9a8eea9a9f0a9aaf5a9 -ab10e9a98910efa9ac10e2a9ae6a4a6b +e2a97f01eda9c0eea9c110e9a9c27438 +7542775e7801f1a9bdf2a9be01eda9b4 +f2a9b504e9a9b6f0a9b7f3a9b8f6a9b9 +f8a9ba10e2a9bc6a5d6f326f48706471 +68726c7303eba9b0eea9b1efa9b2f3a9 +b304e4a9a8e5a9a9eea9aaf0a9abf5a9 +ac10e9a98910efa9ad10e2a9af6a4a6b 4e6d586e04e6a9a2e8a9a3eba9a4eda9 a5f0a9a610efa99c01e7a99defa99e01 e7a99ffaa9a06637665a675e686e6906 @@ -2260,209 +2260,209 @@ a38bf8a38c05ec09eca391efa38df9a3 a36be2a36ce3a36d09ed0feda376eea3 77efa378f1a379f5a37ae3a363e6a372 e8a373e9a374eca37500184dc26554c0 -ca57365736584e59645a12616ee2adcc -01612c631168efa9a61172e1adcb0170 -2a731175f8691165efa9e101652c6911 +ca57365736584e59645a12616ee2adcd +01612c631168efa9a61172e1adcc0170 +2a731175f8691165efa9e201652c6911 69e9a717117ae9a77f543455a2875612 -6169e9adca056746674a68506901622a -7210e8adc910f4012aa3b14210d44511 -6ce7adc6106101e158e9042aaba64332 -4b364c3a5410c8aba610cea7d410c8ad -c710c1adc8012aa54c4d10d6a54c6130 -657c66116ee7adc5056d116d2e6e3276 -10f4a3a710ecab8910e7abde67346b38 -6c01e5ab97f5a75c10e2adc310f2adc4 -116cf5ab9b126761f2abe850c0c350a2 +6169e9adcb056746674a68506901622a +7210e8adca10f4012aa3b14210d44511 +6ce7adc7106101e158e9042aaba74332 +4b364c3a5410c8aba710cea7d410c8ad +c810c1adc9012aa54c4d10d6a54c6130 +657c66116ee7adc6056d116d2e6e3276 +10f4a3a710ecab8a10e7abdf67346b38 +6c01e5ab98f5a75c10e2adc410f2adc5 +116cf5ab9c126761f2abe950c0c350a2 7252a2a85306694369426f6a75907901 -6c2a7210e3a50c10efadc201643e6e01 -e4ab38e8012aab494c10cbab4910e4ad -bf02672e72387910efa50e01e4ab66ef -adc010e1ab6e116ee4adc1613e675e68 -01612a7210e4adbe10f7a560026d2e72 -327510f2ab2610f2ab5c10e2adbd116e +6c2a7210e3a50c10efadc301643e6e01 +e4ab39e8012aab4a4c10cbab4a10e4ad +c002672e72387910efa50e01e4ab67ef +adc110e1ab6f116ee4adc2613e675e68 +01612a7210e4adbf10f7a560026d2e72 +327510f2ab2710f2ab5d10e2adbe116e f7a34b046138654a68506c76721174e9 -adba016c2a7510e3a51c10eda11172ed -adb802612e6c326e10f8a9e510e7adb9 -01e9a9d5f0a9d61172e4a5f4026a306f -3675116ef2a9a9116ee7adbb1168e7ad -bc4d7c4ea2a44f0367426c48724e7301 -672a6d10e1adb710e5a9ce1161edab41 -1163ebab24016b2a7910e1a9ca10e8a9 -d007722e725a7460756679116df2032a -a3ce492e4d325410c8adb210cea76010 -cda3ce116fefa9591165e9adb0116cf4 -adb1614265746c9a6f01642a6e10e7a5 -3f10e9adaf0368326b366e3a7210e3ad -ab10eaada810e1ada901e4a970e9adaa -0264346e387201e3adadefadae10e6a9 -3a10e4adac1179eda940046138624c65 -506b56731168f5adb6016e2a7210e2ad -b410e4adb31161f49f1177e1adb5116f +adbb016c2a7510e3a51c10eda11172ed +adb902612e6c326e10f8a9e610e7adba +01e9a9d6f0a9d71172e4a5f4026a306f +3675116ef2a9aa116ee7adbc1168e7ad +bd4d7c4ea2a44f0367426c48724e7301 +672a6d10e1adb810e5a9cf1161edab42 +1163ebab25016b2a7910e1a9cb10e8a9 +d107722e725a7460756679116df2032a +a3ce492e4d325410c8adb310cea76010 +cda3ce116fefa9591165e9adb1116cf4 +adb2614265746c9a6f01642a6e10e7a5 +3f10e9adb00368326b366e3a7210e3ad +ac10eaada910e1adaa01e4a970e9adab +0264346e387201e3adaeefadaf10e6a9 +3a10e4adad1179eda940046138624c65 +506b56731168f5adb7016e2a7210e2ad +b510e4adb41161f49f1177e1adb6116f efa55e47c41b4ac32f4aa6c04ba6d94c 03614665a69c69a69e7901632a6410e9 -ada710e9ada6026ea6796fa67a7410ee +ada810e9ada7026ea6796fa67a7410ee 001a4bc139545b571457ac7058ac7459 -305a01c1abf0d7ab5f10d4ad64544055 -825603c1ad5fc5ad61cead60d5a3930b -ce14d609d6abdad7abc7daab7fceada4 -cfabbdd2abc5cbc5d4cbabb2ccad5bcd -abb104c1ada5c7ad5dd3a55fd9ad5eda -abf44e824e8a50a24a52a26d530cce17 -d40cd4ad55d5a79ad6ad56d9ada3cead -53cfab65d2ad54ca09caad51cbab4fcd -ad52c3ad50c5ab7ec9ab5306c70cc7ab -ecc9ad43cca54bcfa97fc1ad40c3ad41 -c5ad420acc14d409d4ad4cd7a9d9d9a5 -c0cca9eacdad49d2ad4ac1ad45c5ad46 -c6ad47c7abc1c8a57c03c5ad4fcfa94b -d5a79ad7ab1b4b9e4ca2434d0010cd1d -d40fd4a95ad5a92ad8abeed9a90edaad -3fcda73dcfada1d1ad3dd2ada2c60cc6 -ad3cc7a92ecbada0cca3a8c1ad9fc3ad -3ac4ad3bc5ab2d01c5ad2fcdad9e04c9 -ad35d3ad36d4a7fbd5ad37d6a90143c0 +305a01c1abf1d7ab6010d4ad65544055 +825603c1ad60c5ad62cead61d5a3930b +ce14d609d6abdbd7abc8daab80ceada5 +cfabbed2abc6cbc5d4cbabb3ccad5ccd +abb204c1ada6c7ad5ed3a55fd9ad5fda +abf54e824e8a50a24a52a26d530cce17 +d40cd4ad56d5a79ad6ad57d9ada4cead +54cfab66d2ad55ca09caad52cbab50cd +ad53c3ad51c5ab7fc9ab5406c70cc7ab +edc9ad44cca54bcfa97fc1ad41c3ad42 +c5ad430acc14d409d4ad4dd7a9dad9a5 +c0cca9ebcdad4ad2ad4bc1ad46c5ad47 +c6ad48c7abc2c8a57c03c5ad50cfa94b +d5a79ad7ab1c4b9e4ca2434d0010cd1d +d40fd4a95ad5a92ad8abefd9a90edaad +40cda73dcfada2d1ad3ed2ada3c60cc6 +ad3dc7a92ecbada1cca3a8c1ada0c3ad +3bc4ad3cc5ab2e01c5ad30cdad9f04c9 +ad36d3ad37d4a7fbd5ad38d6a90143c0 c246644656476648a24d4905d209d2ad -9dd3a70dd4a725c3ad2cc4a70fc5ad20 +9ed3a70dd4a725c3ad2dc4a70fc5ad21 02c9a57acfa581d2a5870cce17d30cd3 -ad27d4ad28d5abf3d7ad29cead24d0ad -25d1ad26c608c6ad23c867cca773c1ad -22c2abf6c5ad9c04cdad2acead2bd2a5 +ad28d4ad29d5abf4d7ad2acead25d0ad +26d1ad27c608c6ad24c867cca773c1ad +23c2abf7c5ad9d04cdad2bcead2cd2a5 ffd4a702d5a703435244a2424505d309 -d3a565d4ad96daad21c1ad1cc3ad1dc5 -a5580fcf1ad60cd6ad17d7abf8d9ad9a -daa519cfad14d0ad15d2ad16d5abf1c9 -c68cc9ad11ccad12cdad13cead9905cb -09cba521cfad1adaad9bc5a52dc7ad4e -caad19345e34ae874178420bce14d209 -d2a9f7d5a73dd6ad0dcead0acfad0bd1 -ad0cc909c9ab10caad08ccad09c1a3bf -c5ad05c6ad060cd217d50cd5abedd7ad -03d8ad04daa35ed2ad00d3ad01d4ad02 -cd09cdad98cfabfed1abffc4abfbc6ad -97cc6d2aa55f312c321133b0ad961137 -b2a79a10e1a9a710ef012aa7f34c10c1 +d3a565d4ad97daad22c1ad1dc3ad1ec5 +a5580fcf1ad60cd6ad18d7abf9d9ad9b +daa519cfad15d0ad16d2ad17d5abf2c9 +c68cc9ad12ccad13cdad14cead9a05cb +09cba521cfad1bdaad9cc5a52dc7ad4f +caad1a345e34ae874178420bce14d209 +d2a9f8d5a73dd6ad0ecead0bcfad0cd1 +ad0dc909c9ab11caad09ccad0ac1a3bf +c5ad06c6ad070cd217d50cd5abeed7ad +04d8ad05daa35ed2ad01d3ad02d4ad03 +cd09cdad99cfabffd1ad00c4abfcc6ad +98cc6d2aa55f312c321133b0ad971137 +b2a79a10e1a9a810ef012aa7f34c10c1 a7f31170e3a7d9026d2e6e327310f5a7 e710e2a7e301e1a7c9e2a5cc01613a70 1161ee012aa72b4a10d0a72b016d2a76 -10e1ad9210efad91056e1e6e306f3674 -1168e9ad951164e1a7831172e5012aa7 -884b01d0ad31d2a78861306844691174 -f3ad94016c2a6e10e1ad9310e9a55902 -612e6d326f10eaab3710f2a9f310f201 +10e1ad9310efad92056e1e6e306f3674 +1168e9ad961164e1a7831172e5012aa7 +884b01d0ad32d2a78861306844691174 +f3ad95016c2a6e10e1ad9410e9a55902 +612e6d326f10eaab3810f2a9f410f201 2aa7784b10c8a778473448a25c491274 61eca56a0465466c5a6f60727a75016a -2a7210f5a9d210f2a5d0116ff2012aa5 +2a7210f5a9d310f2a5d0116ff2012aa5 b04710c5a5b01161e7a51e016e2a7410 -e8a5ca01e7ad85eda5660161506510eb +e8a5ca01e7ad86eda5660161506510eb 032aa55a432e47325410d2a38c10d9ad -1810d2a55a10eead86056c186c306d36 -75116ee7ad901175f7a5f3106e01e7a5 -f8f0a9686130659c691172e1ad8f016e -2a7410f2a93905ef24efad89f34cf403 +1910d2a55a10eead87056c186c306d36 +75116ee7ad911175f7a5f3106e01e7a5 +f8f0a9686130659c691172e1ad90016e +2a7410f2a93905ef24efad8af34cf403 2aa3f8482e4d325410d7a3f810cba3f0 10cfa3f2012aa3ec4310cea3ece2a3fd -e7ad87e9ad881162f2054917493a533e -5502c1ad8dcbad8bd3ad8e10cca5e910 -c5ad8c2aa5e9432a4710c2ad8b10c1ad -8a43c107437044a2c0450267406c4674 -1168e9012a754501d2ad1fd4751179f0 -a55601622a7910edad8410e1ad830461 +e7ad88e9ad891162f2054917493a533e +5502c1ad8ecbad8cd3ad8f10cca5e910 +c5ad8d2aa5e9432a4710c2ad8c10c1ad +8b43c107437044a2c0450267406c4674 +1168e9012a754501d2ad20d4751179f0 +a55601622a7910edad8510e1ad840461 a26968a2786fa28770a289791172ec0a -4d335414542e55385810cbad7c01caab -a1d2ad7b10c1abe94d2e523e5310cbad -7a02c4ad78cba905cea53e02cfad79d3 -ab2bd5ab182aab184138423c474c4b01 -c7a7bfdaad3310ccad7502c1ad76c7a3 -89d9a37c01c5a9cdd2ad77026b2e6e32 -7210e9ad7310eda3e610f3a51202612e -65327210f3ad7410eda50510f2a50211 +4d335414542e55385810cbad7d01caab +a2d2ad7c10c1abea4d2e523e5310cbad +7b02c4ad79cba905cea53e02cfad7ad3 +ab2cd5ab192aab194138423c474c4b01 +c7a7bfdaad3410ccad7602c1ad77c7a3 +89d9a37c01c5a9ced2ad78026b2e6e32 +7210e9ad7410eda3e610f3a51202612e +65327210f3ad7510eda50510f2a50211 70f4a5101172f4a5cb03653469866f8c -751170ecad821176e106491749324d36 -4e3a5010cba3c610cea5eb10d5ad7f10 -d0a9892aa5eb422a4610caad7e10d4ad -7d1161ebad801167f2ad812aa25441aa +751170ecad831176e106491749324d36 +4e3a5010cba3c610cea5eb10d5ad8010 +d0a9892aa5eb422a4610caad7f10d4ad +7e1161ebad811167f2ad822aa25441aa 3142056f1f6f3e72447501672a6810e4 -ad7210e9ad711170efa3fc106101e8a9 -e8e9ad706130655c68116bf3ad6f036c -326d36733a7410ebad6e10e9ad6d10f5 +ad7310e9ad721170efa3fc106101e8a9 +e9e9ad716130655c68116bf3ad70036c +326d36733a7410ebad6f10e9ad6e10f5 a36a10f3a3c1116ee7012aa3ad4210c4 a3ad00214ac1c052c0cc5638563c5758 -586259665a01d2abefd7ab5f04c1ad5f -c4ad60c5ad61cead60d5a39301c6ad62 -d3ab5810cbad6303c4abfac5abfad4ad -64d5ab2b5246536c54a2575503c1abe9 -c7ad5dd9ad5edaabf405d309d3ab2bd5 -ab18d7ab1bc5ad4fc8ab5fcfa94b0ecd -1ad40cd4ad55d5ab18d6ad56d9ad57cd -ad52cead53cfab65d2ad54c50cc5ab7e -c9ab53caad51cbab4fc1abf5c3ad50c4 -abf90ecd1ad20cd2abc5d6abdad7a3f8 -daab7fcdabb1cead5ccfabbdd0ad5bc8 -0cc8aba6caaba1cbabb2ccad5bc4ad58 -c6ad59c7ad5a4e644e404fa896507851 -02c1ad4dcfad4ed5ad2009cc0fcca54b -cfa97fd0a989d1abffd4abf5c1ad40c3 -ad41c5ad42c8a393c9ad430dcd17d40c -d4ad4cd7a9d9d9a5c0daad45cdad49d2 -ad4ad3ad4bc70cc7abc1c8a57ccbad48 -cca9eac1ad45c5ad46c6ad474aa2484b +586259665a01d2abf0d7ab6004c1ad60 +c4ad61c5ad62cead61d5a39301c6ad63 +d3ab5910cbad6403c4abfbc5abfbd4ad +65d5ab2c5246536c54a2575503c1abea +c7ad5ed9ad5fdaabf505d309d3ab2cd5 +ab19d7ab1cc5ad50c8ab60cfa94b0ecd +1ad40cd4ad56d5ab19d6ad57d9ad58cd +ad53cead54cfab66d2ad55c50cc5ab7f +c9ab54caad52cbab50c1abf6c3ad51c4 +abfa0ecd1ad20cd2abc6d6abdbd7a3f8 +daab80cdabb2cead5dcfabbed0ad5cc8 +0cc8aba7caaba2cbabb3ccad5cc4ad59 +c6ad5ac7ad5b4e644e404fa896507851 +02c1ad4ecfad4fd5ad2109cc0fcca54b +cfa97fd0a989d1ad00d4abf6c1ad41c3 +ad42c5ad43c8a393c9ad440dcd17d40c +d4ad4dd7a9dad9a5c0daad46cdad4ad2 +ad4bd3ad4cc70cc7abc2c8a57ccbad49 +cca9ebc1ad46c5ad47c6ad484aa2484b a24c4ca2644d0012ce20d50fd5a92ad6 -a54cd8abeed9a90edaad3fcea53ecfa3 -f2d1ad3dd2ad3ed4a95ac60fc6ad3cc7 -a92ecba905cca3a8cda3cec1ad39c3ad -3ac4ad3bc5ab2d01cfad2ed0a72b07d0 -0cd0ad31d2a788d7ad32daad33c5ad2f -c7a7bfc8a778cdad3008d30fd3ad36d4 -a7fbd5ad37d6a901d9ad38c1a7f3c2ad -34c9ad35cbab4941c1604598456a46a2 -4147a24e48a2754907d10cd1ad2dd2a5 -70d3a70dd4a725c3ad2cc4a70fcca5e9 -cea5eb09d20ed2ad1fd3a565d475d5ad -20daad21c1ad1cc3ad1dc5a558c79bc8 -ad1e04c9a57acfa581d1abffd2a587d8 -a5870bd014d309d3ad27d4ad28d7ad29 -d0ad25d1ad26d2a55ac808c867cca773 -cead24c1ad22c5a5b0c6ad2306d20cd2 -a5ffd4a702d5a703d6ad06cba3f0cdad -2acead2b415e42a24c43a2834406cb0c -cba521cfad1ad9ad08daad1bc4a52dc5 -a52dcaad190dd117d40cd4ad02d7ad03 -d8ad04daa35ed1abffd2ad00d3ad01cc -0bcc6dcda342ceabf8cfabfec4abfbc5 -abfcc6abfd0010cc1cd20ed2a9f7d445 -d5a3ced6ad0dd9a37cccad09cead0acf -ad0bd1ad0cc70cc7a389c8ad07c9ab10 -caad08c1a3bfc4a3adc5ad05c6ad0600 -10cf1dd50fd5abf1d6ad17d7abf8d9ad -18daa519cfad14d0ad15d2ad16d3ab2b -c90cc9ad11ccad12cdad13cea3ecc4ab -efc6ad0ec7ad0fc8ad10342234423548 -374e3801382a3910b0ab2b10b6abfa11 -31b9abf71133b2abf81133b6abf92aa5 +a54cd8abefd9a90edaad40cea53ecfa3 +f2d1ad3ed2ad3fd4a95ac60fc6ad3dc7 +a92ecba905cca3a8cda3cec1ad3ac3ad +3bc4ad3cc5ab2e01cfad2fd0a72b07d0 +0cd0ad32d2a788d7ad33daad34c5ad30 +c7a7bfc8a778cdad3108d30fd3ad37d4 +a7fbd5ad38d6a901d9ad39c1a7f3c2ad +35c9ad36cbab4a41c1604598456a46a2 +4147a24e48a2754907d10cd1ad2ed2a5 +70d3a70dd4a725c3ad2dc4a70fcca5e9 +cea5eb09d20ed2ad20d3a565d475d5ad +21daad22c1ad1dc3ad1ec5a558c79bc8 +ad1f04c9a57acfa581d1ad00d2a587d8 +a5870bd014d309d3ad28d4ad29d7ad2a +d0ad26d1ad27d2a55ac808c867cca773 +cead25c1ad23c5a5b0c6ad2406d20cd2 +a5ffd4a702d5a703d6ad07cba3f0cdad +2bcead2c415e42a24c43a2834406cb0c +cba521cfad1bd9ad09daad1cc4a52dc5 +a52dcaad1a0dd117d40cd4ad03d7ad04 +d8ad05daa35ed1ad00d2ad01d3ad02cc +0bcc6dcda342ceabf9cfabffc4abfcc5 +abfdc6abfe0010cc1cd20ed2a9f8d445 +d5a3ced6ad0ed9a37cccad0acead0bcf +ad0cd1ad0dc70cc7a389c8ad08c9ab11 +caad09c1a3bfc4a3adc5ad06c6ad0700 +10cf1dd50fd5abf2d6ad18d7abf9d9ad +19daa519cfad15d0ad16d2ad17d3ab2c +c90cc9ad12ccad13cdad14cea3ecc4ab +f0c6ad0fc7ad10c8ad11342234423548 +374e3801382a3910b0ab2c10b6abfb11 +31b9abf81133b2abf91133b6abfa2aa5 5f305031a26b3202302e33383810b0a5 -2d01b0a519b2abec10b0750533233334 -354a3601b1ab58b2a5eb03b0a3ecb4a5 -ebb5a70fb9a72502b3abedb4abf2b7ab -f33034314a3201b1a55fb9abf103b2ab -ecb3a55fb5a9f7b9abed06b50bb59bb7 -abefb8abf0b9a55fb1abecb3abeeb4ab -7f02342e353e3710b2ab1802b2a3ecb3 -abf4b5abf503b0ab18b1ab18b4abf6b5 +2d01b0a519b2abed10b0750533233334 +354a3601b1ab59b2a5eb03b0a3ecb4a5 +ebb5a70fb9a72502b3abeeb4abf3b7ab +f43034314a3201b1a55fb9abf203b2ab +edb3a55fb5a9f8b9abee06b50bb59bb7 +abf0b8abf1b9a55fb1abedb3abefb4ab +8002342e353e3710b2ab1902b2a3ecb3 +abf5b5abf603b0ab19b1ab19b4abf7b5 a52d046436673c68427246761173f44b -116ceda5771168e2ad65116fed630161 +116ceda5771168e2ad66116fed630161 3c6d01e99dee012aa3424110cda34210 e200134c625131513c53405450556a59 -01c5abfad4ab8010c1ad4d02c1abf5c4 -abf9d9ad5704c791c8a929caad6bcead -5cd2ad6c10cbad664c3c4d464e624f66 -5001cbad48d3ad4b01c2ad34d9ad3804 -c1ad39cdab05cea770d2ad3ed5ad6910 -c7ad6a10cdad44452e4542474a494e4a -644b02c8a504cdad30d7ad3201c79bc8 -ad1e10c2ad6603c4ad67cead68d1ad2d -d2a57010cfad2e2a9b4132423c434644 -10daad1b01c5abfcc6abfd01c8ad07d5 -ab0501c3a90fceabe500217588e62bf2 +01c5abfbd4ab8110c1ad4e02c1abf6c4 +abfad9ad5804c791c8a929caad6ccead +5dd2ad6d10cbad674c3c4d464e624f66 +5001cbad49d3ad4c01c2ad35d9ad3904 +c1ad3acdab06cea770d2ad3fd5ad6a10 +c7ad6b10cdad45452e4542474a494e4a +644b02c8a504cdad31d7ad3301c79bc8 +ad1f10c2ad6703c4ad68cead69d1ad2e +d2a57010cfad2f2a9b4132423c434644 +10daad1c01c5abfdc6abfe01c8ad08d5 +ab0601c3a90fceabe600217588e62bf2 21f29bf3a349f6a353f9a35cfa012a2e 41127261e2a360022aa35e498a5210d5 a361e651eb67ed75ee7f7a2d7a2ce125 diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index 44cd72c10ab..c2db5fa3307 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -1572,7 +1572,7 @@ likelySubtags:table(nofallback){ und_NE{"ha_Latn_NE"} und_NI{"es_Latn_NI"} und_NL{"nl_Latn_NL"} - und_NO{"no_Latn_NO"} + und_NO{"nb_Latn_NO"} und_NP{"ne_Deva_NP"} und_Nand{"sa_Nand_IN"} und_Narb{"xna_Narb_SA"} @@ -1624,7 +1624,7 @@ likelySubtags:table(nofallback){ und_SD{"ar_Arab_SD"} und_SE{"sv_Latn_SE"} und_SI{"sl_Latn_SI"} - und_SJ{"no_Latn_SJ"} + und_SJ{"nb_Latn_SJ"} und_SK{"sk_Latn_SK"} und_SM{"it_Latn_SM"} und_SN{"fr_Latn_SN"} diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index 3b0cf6c5dd9..686d4fecfd8 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -1096,10 +1096,6 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"nv"} } - nb{ - reason{"macrolanguage"} - replacement{"no"} - } nbf{ reason{"deprecated"} replacement{"nru"} @@ -1154,11 +1150,11 @@ metadata:table(nofallback){ } no_bok{ reason{"deprecated"} - replacement{"no"} + replacement{"nb"} } no_bokmal{ reason{"deprecated"} - replacement{"no"} + replacement{"nb"} } no_nyn{ reason{"deprecated"} @@ -1170,7 +1166,7 @@ metadata:table(nofallback){ } nob{ reason{"overlong"} - replacement{"no"} + replacement{"nb"} } noo{ reason{"deprecated"} @@ -5274,6 +5270,8 @@ metadata:table(nofallback){ "myv_RU", "mzn_IR", "naq_NA", + "nb", + "nb_NO", "nd_ZW", "nds_DE", "ne_NP", @@ -5281,7 +5279,6 @@ metadata:table(nofallback){ "nmg_CM", "nn_NO", "nnh_CM", - "no_NO", "nqo_GN", "nr_ZA", "nso_ZA", diff --git a/icu4c/source/data/misc/pluralRanges.txt b/icu4c/source/data/misc/pluralRanges.txt index 10fbafe9567..54b09e92e06 100644 --- a/icu4c/source/data/misc/pluralRanges.txt +++ b/icu4c/source/data/misc/pluralRanges.txt @@ -59,6 +59,7 @@ pluralRanges:table(nofallback){ mr{"set01"} ms{"set00"} my{"set00"} + nb{"set04"} ne{"set03"} nl{"set03"} no{"set04"} diff --git a/icu4c/source/data/misc/plurals.txt b/icu4c/source/data/misc/plurals.txt index 89cf4b6fe15..16bc1749f7c 100644 --- a/icu4c/source/data/misc/plurals.txt +++ b/icu4c/source/data/misc/plurals.txt @@ -283,6 +283,7 @@ plurals:table(nofallback){ mr{"set52"} ms{"set39"} my{"set37"} + nb{"set37"} ne{"set41"} nl{"set37"} no{"set37"} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 7f922787314..33cb069b3ea 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -4812,7 +4812,6 @@ supplementalData:table(nofallback){ "myq", "myt", "nad", - "nb", "nbf", "nbx", "ncp", @@ -6241,6 +6240,7 @@ supplementalData:table(nofallback){ "naa~c", "nae~t", "naw~z", + "nb", "nba~e", "nbg~k", "nbm~w", @@ -15140,6 +15140,15 @@ supplementalData:table(nofallback){ scripts{"Latn"} } } + nb{ + primary{ + scripts{"Latn"} + territories{ + "NO", + "SJ", + } + } + } nch{ primary{ scripts{"Latn"} @@ -19844,7 +19853,10 @@ supplementalData:table(nofallback){ "es_UY", "es_VE", } - no{"nn"} + no{ + "nb", + "nn", + } pt_PT{ "pt_AO", "pt_CH", @@ -30613,13 +30625,13 @@ supplementalData:table(nofallback){ } } NO{ - nn{ + nb{ officialStatus{"official"} - populationShareF:int{49250000} + populationShareF:int{50100000} } - no{ + nn{ officialStatus{"official"} - populationShareF:int{50100000} + populationShareF:int{49250000} } se{ officialStatus{"official_regional"} @@ -31627,7 +31639,7 @@ supplementalData:table(nofallback){ } } SJ{ - no{ + nb{ officialStatus{"official"} populationShareF:int{49510000} } @@ -36367,6 +36379,11 @@ supplementalData:table(nofallback){ "weekOfInterval", "weekOfDate", } + nb{ + "weekOfYear", + "weekOfMonth", + "weekOfInterval", + } nl{ "weekOfDate", "weekOfYear", diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 1d87eaa2ab5..01a3730d355 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -674,6 +674,7 @@ windowsZones:table(nofallback){ } "US Mountain Standard Time"{ 001{"America/Phoenix"} + CA{"America/Creston America/Dawson_Creek America/Fort_Nelson"} MX{"America/Hermosillo"} US{"America/Phoenix"} ZZ{"Etc/GMT+7"} @@ -812,10 +813,7 @@ windowsZones:table(nofallback){ } "Yukon Standard Time"{ 001{"America/Whitehorse"} - CA{ - "America/Whitehorse America/Creston America/Dawson America/Dawson_Cre" - "ek America/Fort_Nelson" - } + CA{"America/Whitehorse America/Dawson"} } } } diff --git a/icu4c/source/data/rbnf/LOCALE_DEPS.json b/icu4c/source/data/rbnf/LOCALE_DEPS.json index 3dd2f00d5ba..148d8161725 100644 --- a/icu4c/source/data/rbnf/LOCALE_DEPS.json +++ b/icu4c/source/data/rbnf/LOCALE_DEPS.json @@ -8,7 +8,6 @@ "ars": "ar_SA", "in": "id", "iw": "he", - "nb": "no", "sh": "sr_Latn", "zh_HK": "zh_Hant_HK", "zh_Hant_HK": "yue", @@ -26,6 +25,7 @@ "es_PR": "es_419", "es_SV": "es_419", "es_US": "es_419", + "nb": "no", "nn": "no", "sr_Latn": "root", "yue_Hans": "root", diff --git a/icu4c/source/data/rbnf/nb.txt b/icu4c/source/data/rbnf/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/rbnf/nb.txt +++ b/icu4c/source/data/rbnf/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/rbnf/ne.txt b/icu4c/source/data/rbnf/ne.txt new file mode 100644 index 00000000000..c79a371f3f7 --- /dev/null +++ b/icu4c/source/data/rbnf/ne.txt @@ -0,0 +1,174 @@ +// © 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html +// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml +ne{ + RBNFRules{ + SpelloutRules{ + "%spellout-numbering-year:", + "-x: \u090B\u0923\u093E\u0924\u094D\u092E\u0915 >>;", + "x.x: =#,##,##0.#=;", + "0: =%spellout-numbering=;", + "1000/100: << \u0938\u092F[ >>];", + "10000: =%spellout-numbering=;", + "%spellout-numbering:", + "-x: \u090B\u0923\u093E\u0924\u094D\u092E\u0915 >>;", + "x.x: << \u0926\u0936\u092E\u0932\u0935 >>;", + "Inf: \u0905\u0928\u0928\u094D\u0924;", + "0: \u0936\u0941\u0928\u094D\u092F;", + "1: \u090F\u0915;", + "2: \u0926\u0941\u0908;", + "3: \u0924\u093F\u0928;", + "4: \u091A\u093E\u0930;", + "5: \u092A\u093E\u0901\u091A;", + "6: \u091B;", + "7: \u0938\u093E\u0924;", + "8: \u0906\u0920;", + "9: \u0928\u094C;", + "10: \u0926\u0938;", + "11: \u090F\u0918\u093E\u0930;", + "12: \u092C\u093E\u0939\u094D\u0930;", + "13: \u0924\u0947\u0939\u094D\u0930;", + "14: \u091A\u094C\u0927;", + "15: \u092A\u0928\u094D\u0927\u094D\u0930;", + "16: \u0938\u094B\u0939\u094D\u0930;", + "17: \u0938\u0924\u094D\u0930;", + "18: \u0905\u0920\u093E\u0930;", + "19: \u0909\u0928\u094D\u0928\u093E\u0907\u0938;", + "20: \u092C\u093F\u0938;", + "21: \u090F\u0915\u094D\u0915\u093E\u0907\u0938;", + "22: \u092C\u093E\u0907\u0938;", + "23: \u0924\u0947\u0907\u0938;", + "24: \u091A\u094C\u092C\u093F\u0938;", + "25: \u092A\u091A\u094D\u091A\u093F\u0938;", + "26: \u091B\u092C\u094D\u092C\u093F\u0938;", + "27: \u0938\u0924\u094D\u0924\u093E\u0907\u0938;", + "28: \u0905\u091F\u094D\u0920\u093E\u0907\u0938;", + "29: \u0909\u0928\u0928\u094D\u0924\u093F\u0938;", + "30: \u0924\u093F\u0938;", + "31: \u090F\u0915\u0924\u093F\u0938;", + "32: \u092C\u0924\u094D\u0924\u093F\u0938;", + "33: \u0924\u0947\u0924\u094D\u0924\u093F\u0938;", + "34: \u091A\u094C\u0901\u0924\u093F\u0938;", + "35: \u092A\u0948\u0901\u0924\u093F\u0938;", + "36: \u091B\u0924\u094D\u0924\u093F\u0938;", + "37: \u0938\u0948\u0901\u0924\u093F\u0938;", + "38: \u0905\u0920\u0924\u093F\u0938;", + "39: \u0909\u0928\u0928\u094D\u091A\u093E\u0932\u093F\u0938;", + "40: \u091A\u093E\u0932\u093F\u0938;", + "41: \u090F\u0915\u091A\u093E\u0932\u093F\u0938;", + "42: \u092C\u092F\u093E\u0932\u093F\u0938;", + "43: \u0924\u094D\u0930\u093F\u091A\u093E\u0932\u093F\u0938;", + "44: \u091A\u0935\u093E\u0932\u093F\u0938;", + "45: \u092A\u0948\u0901\u0924\u093E\u0932\u093F\u0938;", + "46: \u091B\u092F\u093E\u0932\u093F\u0938;", + "47: \u0938\u0924\u091A\u093E\u0932\u093F\u0938;", + "48: \u0905\u0920\u091A\u093E\u0932\u093F\u0938;", + "49: \u0909\u0928\u0928\u094D\u091A\u093E\u0938;", + "50: \u092A\u091A\u093E\u0938;", + "51: \u090F\u0915\u093E\u0909\u0928\u094D\u0928;", + "52: \u092C\u093E\u0909\u0928\u094D\u0928;", + "53: \u0924\u094D\u0930\u093F\u092A\u0928\u094D\u0928;", + "54: \u091A\u0935\u0928\u094D\u0928;", + "55: \u092A\u091A\u092A\u0928\u094D\u0928;", + "56: \u091B\u092A\u0928\u094D\u0928;", + "57: \u0938\u0928\u094D\u0924\u093E\u0909\u0928\u094D\u0928;", + "58: \u0905\u0928\u094D\u0920\u093E\u0909\u0928\u094D\u0928;", + "59: \u0909\u0928\u0928\u094D\u0938\u093E\u0920\u0940;", + "60: \u0938\u093E\u0920\u0940;", + "61: \u090F\u0915\u0938\u091F\u094D\u0920\u0940;", + "62: \u092C\u092F\u0938\u091F\u094D\u0920\u0940;", + "63: \u0924\u094D\u0930\u093F\u0938\u091F\u094D\u0920\u0940;", + "64: \u091A\u094C\u0938\u091F\u094D\u0920\u0940;", + "65: \u092A\u0948\u0901\u0938\u091F\u094D\u0920\u0940;", + "66: \u091B\u092F\u0938\u091F\u094D\u0920\u0940;", + "67: \u0938\u0924\u0938\u091F\u094D\u0920\u0940;", + "68: \u0905\u0920\u0938\u091F\u094D\u0920\u0940;", + "69: \u0909\u0928\u0928\u094D\u0938\u0924\u094D\u0924\u0930\u0940;", + "70: \u0938\u0924\u094D\u0924\u0930\u0940;", + "71: \u090F\u0915\u0939\u0924\u094D\u0924\u0930;", + "72: \u092C\u0939\u0924\u094D\u0924\u0930;", + "73: \u0924\u094D\u0930\u093F\u0939\u0924\u094D\u0924\u0930;", + "74: \u091A\u094C\u0939\u0924\u094D\u0924\u0930;", + "75: \u092A\u091A\u0939\u0924\u094D\u0924\u0930;", + "76: \u091B\u092F\u0939\u0924\u094D\u0924\u0930;", + "77: \u0938\u0924\u0939\u0924\u094D\u0924\u0930;", + "78: \u0905\u0920\u0939\u0924\u094D\u0924\u0930;", + "79: \u0909\u0928\u093E\u0938\u0940;", + "80: \u0905\u0938\u0940;", + "81: \u090F\u0915\u093E\u0938\u0940;", + "82: \u092C\u092F\u093E\u0938\u0940;", + "83: \u0924\u094D\u0930\u093F\u092F\u093E\u0938\u0940;", + "84: \u091A\u094C\u0930\u093E\u0938\u0940;", + "85: \u092A\u091A\u093E\u0938\u0940;", + "86: \u091B\u092F\u093E\u0938\u0940;", + "87: \u0938\u0924\u093E\u0938\u0940;", + "88: \u0905\u0920\u093E\u0938\u0940;", + "89: \u0909\u0928\u093E\u0928\u094D\u0928\u092C\u094D\u092C\u0947;", + "90: \u0928\u092C\u094D\u092C\u0947;", + "91: \u090F\u0915\u093E\u0928\u092C\u094D\u092C\u0947;", + "92: \u092C\u092F\u093E\u0928\u092C\u094D\u092C\u0947;", + "93: \u0924\u094D\u0930\u093F\u092F\u093E\u0928\u092C\u094D\u092C\u0947;", + "94: \u091A\u094C\u0930\u093E\u0928\u092C\u094D\u092C\u0947;", + "95: \u092A\u0928\u094D\u091A\u093E\u0928\u092C\u094D\u092C\u0947;", + "96: \u091B\u092F\u093E\u0928\u092C\u094D\u092C\u0947;", + "97: \u0938\u0928\u094D\u0924\u093E\u0928\u092C\u094D\u092C\u0947;", + "98: \u0905\u0928\u094D\u0920\u093E\u0928\u092C\u094D\u092C\u0947;", + "99: \u0909\u0928\u093E\u0928\u094D\u0938\u092F;", + "100: << \u0938\u092F[ >>];", + "1000: << \u0939\u091C\u093E\u0930[ >>];", + "100000: << \u0932\u093E\u0916[ >>];", + "10000000: << \u0915\u0930\u094B\u0921[ >>];", + "1000000000: << \u0905\u0930\u092C[ >>];", + "100000000000: << \u0916\u0930\u092C[ >>];", + "10000000000000: << \u0936\u0902\u0916[ >>];", + "1000000000000000: =#,##,##0=;", + "%spellout-cardinal:", + "0: =%spellout-numbering=;", + "%%consonant-suffix:", + "0: \u094C\u0901;", + "1: ' =%spellout-numbering=\u094C\u0901;", + "2: ' \u0926\u0941\u092F\u094C\u0901;", + "3: ' =%spellout-numbering=\u094C\u0901;", + "5: ' =%spellout-ordinal-masculine=;", + "%spellout-ordinal-masculine:", + "-x: \u090B\u0923\u093E\u0924\u094D\u092E\u0915 >>;", + "x.x: =#,##,##0.#=;", + "0: \u0936\u0941\u0928\u094D\u092F\u094C\u0901;", + "1: \u092A\u0939\u093F\u0932\u094B;", + "2: \u0926\u094B\u0938\u094D\u0930\u094B;", + "3: \u0924\u0947\u0938\u094D\u0930\u094B;", + "4: \u091A\u094C\u0925\u094B;", + "5: \u092A\u093E\u0901\u091A\u094C\u0901;", + "6: \u091B\u0948\u091F\u094C\u0901;", + "7: \u0938\u093E\u0924\u094C\u0901;", + "8: \u0906\u0920\u094C\u0901;", + "9: \u0928\u0935\u094C\u0901;", + "10: \u0926\u0936\u094C\u0901;", + "11: \u090F\u0918\u093E\u0930\u094C\u0901;", + "12: \u092C\u093E\u0939\u094D\u0930\u094C\u0901;", + "13: =%spellout-numbering=\u094C\u0901;", + "60: =%spellout-numbering=\u0914\u0901;", + "71: =%spellout-numbering=\u094C\u0901;", + "80: =%spellout-numbering=\u0914\u0901;", + "99: =%spellout-numbering=\u094C\u0901;", + "100: <%spellout-numbering< \u0938\u092F>%%consonant-suffix>;", + "1000: <%spellout-numbering< \u0939\u091C\u093E\u0930>%%consonant-suffix>;", + "100000: <%spellout-numbering< \u0932\u093E\u0916>%%consonant-suffix>;", + "10000000: <%spellout-numbering< \u0915\u0930\u094B\u0921>%%consonant-suffix>;", + "1000000000: <%spellout-numbering< \u0905\u0930\u092C>%%consonant-suffix>;", + "100000000000: <%spellout-numbering< \u0916\u0930\u092C>%%consonant-suffix>;", + "10000000000000: <%spellout-numbering< \u0936\u0902\u0916>%%consonant-suffix>;", + "1000000000000000: =#,##,##0=.;", + "%spellout-ordinal-feminine:", + "-x: \u090B\u0923\u093E\u0924\u094D\u092E\u0915 >>;", + "x.x: =#,##,##0.#=;", + "0: \u0936\u0941\u0928\u094D\u092F\u094C\u0901;", + "1: \u092A\u0939\u093F\u0932\u0940;", + "2: \u0926\u094B\u0938\u094D\u0930\u0940;", + "3: \u0924\u0947\u0938\u094D\u0930\u0940;", + "4: \u091A\u094C\u0925\u0940;", + "5: \u092A\u093E\u0901\u091A\u0935\u0940;", + "6: =%spellout-ordinal-masculine=;", + } + } +} diff --git a/icu4c/source/data/region/LOCALE_DEPS.json b/icu4c/source/data/region/LOCALE_DEPS.json index f737ebe3754..606469a66a5 100644 --- a/icu4c/source/data/region/LOCALE_DEPS.json +++ b/icu4c/source/data/region/LOCALE_DEPS.json @@ -21,9 +21,7 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", - "nb_SJ": "no_SJ", + "no_NO": "no", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -178,6 +176,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nb": "no", "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", diff --git a/icu4c/source/data/region/nb.txt b/icu4c/source/data/region/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/region/nb.txt +++ b/icu4c/source/data/region/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/region/nb_NO.txt b/icu4c/source/data/region/nb_NO.txt deleted file mode 100644 index 2de7860c57e..00000000000 --- a/icu4c/source/data/region/nb_NO.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_NO{ - "%%ALIAS"{"no_NO"} -} diff --git a/icu4c/source/data/region/nb_SJ.txt b/icu4c/source/data/region/nb_SJ.txt deleted file mode 100644 index b1caa388a5d..00000000000 --- a/icu4c/source/data/region/nb_SJ.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_SJ{ - "%%ALIAS"{"no_SJ"} -} diff --git a/icu4c/source/data/region/nn.txt b/icu4c/source/data/region/nn.txt index f3d0ee3db73..64826a3ee8d 100644 --- a/icu4c/source/data/region/nn.txt +++ b/icu4c/source/data/region/nn.txt @@ -5,309 +5,55 @@ nn{ %%Parent{"no"} Countries{ 001{"verda"} - 002{"Afrika"} - 003{"Nord-Amerika"} - 005{"Sør-Amerika"} - 009{"Oseania"} - 011{"Vest-Afrika"} 013{"Sentral-Amerika"} 014{"Aust-Afrika"} - 015{"Nord-Afrika"} - 017{"Sentral-Afrika"} 018{"Sørlege Afrika"} - 019{"Amerika"} 021{"Nordlege Amerika"} - 029{"Karibia"} 030{"Aust-Asia"} - 034{"Sør-Asia"} 035{"Søraust-Asia"} - 039{"Sør-Europa"} - 053{"Australasia"} - 054{"Melanesia"} - 057{"Mikronesia"} - 061{"Polynesia"} - 142{"Asia"} - 143{"Sentral-Asia"} - 145{"Vest-Asia"} - 150{"Europa"} 151{"Aust-Europa"} - 154{"Nord-Europa"} - 155{"Vest-Europa"} - 202{"Afrika sør for Sahara"} - 419{"Latin-Amerika"} - AC{"Ascension"} - AD{"Andorra"} AE{"Dei sameinte arabiske emirata"} - AF{"Afghanistan"} - AG{"Antigua og Barbuda"} - AI{"Anguilla"} - AL{"Albania"} - AM{"Armenia"} - AO{"Angola"} - AQ{"Antarktis"} - AR{"Argentina"} - AS{"Amerikansk Samoa"} AT{"Austerrike"} - AU{"Australia"} - AW{"Aruba"} - AX{"Åland"} - AZ{"Aserbajdsjan"} - BA{"Bosnia-Hercegovina"} - BB{"Barbados"} - BD{"Bangladesh"} - BE{"Belgia"} - BF{"Burkina Faso"} - BG{"Bulgaria"} - BH{"Bahrain"} - BI{"Burundi"} - BJ{"Benin"} BL{"Saint Barthélemy"} - BM{"Bermuda"} - BN{"Brunei"} - BO{"Bolivia"} - BQ{"Karibisk Nederland"} - BR{"Brasil"} - BS{"Bahamas"} - BT{"Bhutan"} - BV{"Bouvetøya"} - BW{"Botswana"} BY{"Kviterussland"} - BZ{"Belize"} - CA{"Canada"} CC{"Kokosøyane"} CD{"Kongo-Kinshasa"} CF{"Den sentralafrikanske republikken"} - CG{"Kongo-Brazzaville"} - CH{"Sveits"} CI{"Elfenbeinskysten"} CK{"Cookøyane"} - CL{"Chile"} - CM{"Kamerun"} - CN{"Kina"} - CO{"Colombia"} - CP{"Clippertonøya"} - CR{"Costa Rica"} - CU{"Cuba"} - CV{"Kapp Verde"} - CW{"Curaçao"} - CX{"Christmasøya"} - CY{"Kypros"} - CZ{"Tsjekkia"} - DE{"Tyskland"} - DG{"Diego Garcia"} - DJ{"Djibouti"} - DK{"Danmark"} - DM{"Dominica"} DO{"Den dominikanske republikken"} - DZ{"Algerie"} - EA{"Ceuta og Melilla"} - EC{"Ecuador"} - EE{"Estland"} - EG{"Egypt"} - EH{"Vest-Sahara"} - ER{"Eritrea"} - ES{"Spania"} - ET{"Etiopia"} EU{"Den europeiske unionen"} EZ{"eurosona"} - FI{"Finland"} - FJ{"Fiji"} FK{"Falklandsøyane"} - FM{"Mikronesiaføderasjonen"} FO{"Færøyane"} - FR{"Frankrike"} - GA{"Gabon"} - GB{"Storbritannia"} - GD{"Grenada"} - GE{"Georgia"} - GF{"Fransk Guyana"} - GG{"Guernsey"} - GH{"Ghana"} - GI{"Gibraltar"} - GL{"Grønland"} - GM{"Gambia"} - GN{"Guinea"} - GP{"Guadeloupe"} - GQ{"Ekvatorial-Guinea"} - GR{"Hellas"} GS{"Sør-Georgia og Sør-Sandwichøyane"} - GT{"Guatemala"} - GU{"Guam"} - GW{"Guinea-Bissau"} - GY{"Guyana"} - HK{"Hongkong SAR Kina"} HM{"Heardøya og McDonaldøyane"} - HN{"Honduras"} - HR{"Kroatia"} - HT{"Haiti"} - HU{"Ungarn"} IC{"Kanariøyane"} - ID{"Indonesia"} - IE{"Irland"} - IL{"Israel"} - IM{"Man"} - IN{"India"} - IO{"Det britiske territoriet i Indiahavet"} - IQ{"Irak"} - IR{"Iran"} - IS{"Island"} - IT{"Italia"} - JE{"Jersey"} - JM{"Jamaica"} - JO{"Jordan"} - JP{"Japan"} - KE{"Kenya"} - KG{"Kirgisistan"} - KH{"Kambodsja"} - KI{"Kiribati"} KM{"Komorane"} - KN{"Saint Kitts og Nevis"} - KP{"Nord-Korea"} - KR{"Sør-Korea"} - KW{"Kuwait"} KY{"Caymanøyane"} - KZ{"Kasakhstan"} - LA{"Laos"} - LB{"Libanon"} - LC{"St. Lucia"} - LI{"Liechtenstein"} - LK{"Sri Lanka"} - LR{"Liberia"} - LS{"Lesotho"} - LT{"Litauen"} LU{"Luxembourg"} - LV{"Latvia"} - LY{"Libya"} - MA{"Marokko"} - MC{"Monaco"} - MD{"Moldova"} - ME{"Montenegro"} - MF{"Saint-Martin"} - MG{"Madagaskar"} MH{"Marshalløyane"} - MK{"Nord-Makedonia"} - ML{"Mali"} - MM{"Myanmar (Burma)"} - MN{"Mongolia"} - MO{"Macao SAR Kina"} MP{"Nord-Marianane"} - MQ{"Martinique"} - MR{"Mauritania"} - MS{"Montserrat"} - MT{"Malta"} - MU{"Mauritius"} MV{"Maldivane"} - MW{"Malawi"} - MX{"Mexico"} - MY{"Malaysia"} - MZ{"Mosambik"} - NA{"Namibia"} - NC{"Ny-Caledonia"} - NE{"Niger"} - NF{"Norfolkøya"} - NG{"Nigeria"} - NI{"Nicaragua"} - NL{"Nederland"} NO{"Noreg"} - NP{"Nepal"} - NR{"Nauru"} - NU{"Niue"} - NZ{"New Zealand"} - OM{"Oman"} - PA{"Panama"} - PE{"Peru"} - PF{"Fransk Polynesia"} - PG{"Papua Ny-Guinea"} PH{"Filippinane"} - PK{"Pakistan"} - PL{"Polen"} - PM{"Saint-Pierre-et-Miquelon"} PN{"Pitcairn"} - PR{"Puerto Rico"} - PS{"Det palestinske området"} - PT{"Portugal"} - PW{"Palau"} - PY{"Paraguay"} - QA{"Qatar"} - QO{"Ytre Oseania"} - RE{"Réunion"} - RO{"Romania"} - RS{"Serbia"} - RU{"Russland"} - RW{"Rwanda"} - SA{"Saudi-Arabia"} SB{"Salomonøyane"} SC{"Seychellane"} - SD{"Sudan"} - SE{"Sverige"} - SG{"Singapore"} SH{"Saint Helena"} - SI{"Slovenia"} - SJ{"Svalbard og Jan Mayen"} - SK{"Slovakia"} - SL{"Sierra Leone"} - SM{"San Marino"} - SN{"Senegal"} - SO{"Somalia"} - SR{"Surinam"} - SS{"Sør-Sudan"} - ST{"São Tomé og Príncipe"} - SV{"El Salvador"} - SX{"Sint Maarten"} - SY{"Syria"} - SZ{"Eswatini"} - TA{"Tristan da Cunha"} TC{"Turks- og Caicosøyane"} - TD{"Tsjad"} TF{"Dei franske sørterritoria"} - TG{"Togo"} - TH{"Thailand"} - TJ{"Tadsjikistan"} - TK{"Tokelau"} TL{"Aust-Timor"} - TM{"Turkmenistan"} - TN{"Tunisia"} - TO{"Tonga"} - TR{"Tyrkia"} - TT{"Trinidad og Tobago"} - TV{"Tuvalu"} - TW{"Taiwan"} - TZ{"Tanzania"} - UA{"Ukraina"} - UG{"Uganda"} UM{"USAs ytre småøyar"} UN{"SN"} - US{"USA"} - UY{"Uruguay"} - UZ{"Usbekistan"} - VA{"Vatikanstaten"} VC{"St. Vincent og Grenadinane"} - VE{"Venezuela"} VG{"Dei britiske Jomfruøyane"} VI{"Dei amerikanske Jomfruøyane"} - VN{"Vietnam"} - VU{"Vanuatu"} - WF{"Wallis og Futuna"} - WS{"Samoa"} XA{"pseudospråk – aksentar"} XB{"pseudospråk – RTL"} - XK{"Kosovo"} - YE{"Jemen"} - YT{"Mayotte"} - ZA{"Sør-Afrika"} - ZM{"Zambia"} - ZW{"Zimbabwe"} - ZZ{"ukjent område"} - } - Countries%short{ - HK{"Hongkong"} - MO{"Macao"} - PS{"Palestina"} } Countries%variant{ - CD{"Den demokratiske republikken Kongo"} - CG{"Republikken Kongo"} FK{"Falklandsøyane (Islas Malvinas)"} - SZ{"Swaziland"} + TL{"Aust-Timor"} } } diff --git a/icu4c/source/data/region/no_NO.txt b/icu4c/source/data/region/no_NO.txt index 9de87e3d165..6613a86c4e6 100644 --- a/icu4c/source/data/region/no_NO.txt +++ b/icu4c/source/data/region/no_NO.txt @@ -1,9 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ no_NO{ - ___{""} + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/region/no_SJ.txt b/icu4c/source/data/region/no_SJ.txt deleted file mode 100644 index 42b03fcf8d0..00000000000 --- a/icu4c/source/data/region/no_SJ.txt +++ /dev/null @@ -1,9 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ -no_SJ{ - ___{""} -} diff --git a/icu4c/source/data/unit/LOCALE_DEPS.json b/icu4c/source/data/unit/LOCALE_DEPS.json index f737ebe3754..606469a66a5 100644 --- a/icu4c/source/data/unit/LOCALE_DEPS.json +++ b/icu4c/source/data/unit/LOCALE_DEPS.json @@ -21,9 +21,7 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", - "nb_SJ": "no_SJ", + "no_NO": "no", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -178,6 +176,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nb": "no", "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", diff --git a/icu4c/source/data/unit/fa.txt b/icu4c/source/data/unit/fa.txt index ac5c732f3d1..2ce3ad922b2 100644 --- a/icu4c/source/data/unit/fa.txt +++ b/icu4c/source/data/unit/fa.txt @@ -1449,13 +1449,13 @@ fa{ acceleration{ g-force{ dnam{"گرانش"} - one{"{0} G"} - other{"{0} G"} + one{"{0} G"} + other{"{0} G"} } meter-per-square-second{ dnam{"متر/مجذور ثانیه"} - one{"{0} m/s²"} - other{"{0} m/s²"} + one{"{0}‎ m/s²"} + other{"{0}‎ m/s²"} } } angle{ @@ -1499,12 +1499,12 @@ fa{ hectare{ dnam{"هکتار"} one{"{0} هک"} - other{"{0} ha"} + other{"{0} ha"} } square-centimeter{ one{"{0}‎ cm²"} other{"{0}‎ cm²"} - per{"{0}/cm²"} + per{"{0}‎/cm²"} } square-foot{ dnam{"فوت مربع"} @@ -1513,9 +1513,9 @@ fa{ } square-inch{ dnam{"اینچ مربع"} - one{"{0}/in²"} - other{"{0}/in²"} - per{"{0}/in²"} + one{"{0}‎/in²"} + other{"{0}‎/in²"} + per{"{0}‎/in²"} } square-kilometer{ dnam{"کیلومتر مربع"} @@ -1525,20 +1525,20 @@ fa{ } square-meter{ dnam{"متر مربع"} - one{"{0} m²"} - other{"{0} m²"} - per{"{0}/m²"} + one{"{0} m²"} + other{"{0} m²"} + per{"{0}‎/m²"} } square-mile{ dnam{"مایل مربع"} one{"{0} مایل مربع"} other{"{0} مایل مربع"} - per{"{0}/mi²"} + per{"{0}‎/mi²"} } square-yard{ dnam{"یارد مربع"} - one{"{0} yd²"} - other{"{0} yd²"} + one{"{0} yd²"} + other{"{0} yd²"} } } compound{ @@ -1649,48 +1649,48 @@ fa{ } gigabit{ dnam{"گیگابیت"} - one{"{0} Gb"} - other{"{0} Gb"} + one{"{0} Gb"} + other{"{0} Gb"} } gigabyte{ dnam{"GB"} - one{"{0} GB"} - other{"{0} GB"} + one{"{0} GB"} + other{"{0} GB"} } kilobit{ dnam{"کیلوبیت"} - one{"{0} kb"} - other{"{0} kb"} + one{"{0} kb"} + other{"{0} kb"} } kilobyte{ dnam{"کیلوبایت"} - one{"{0} kB"} - other{"{0} kB"} + one{"{0} kB"} + other{"{0} kB"} } megabit{ dnam{"مگابیت"} - one{"{0} Mb"} - other{"{0} Mb"} + one{"{0} Mb"} + other{"{0} Mb"} } megabyte{ dnam{"MB"} - one{"{0} MB"} - other{"{0} MB"} + one{"{0} MB"} + other{"{0} MB"} } petabyte{ dnam{"پتابایت"} - one{"{0} PB"} - other{"{0} PB"} + one{"{0} PB"} + other{"{0} PB"} } terabit{ dnam{"ترابیت"} - one{"{0} Tb"} - other{"{0} Tb"} + one{"{0} Tb"} + other{"{0} Tb"} } terabyte{ dnam{"ترابایت"} - one{"{0} TB"} - other{"{0} TB"} + one{"{0} TB"} + other{"{0} TB"} } } duration{ @@ -1719,7 +1719,7 @@ fa{ microsecond{ dnam{"میکروثانیه"} one{"{0} میکروثانیه"} - other{"{0} μs"} + other{"{0} μs"} } millisecond{ dnam{"میلی‌ثانیه"} @@ -1740,8 +1740,8 @@ fa{ } nanosecond{ dnam{"نانوثانیه"} - one{"{0} ns"} - other{"{0} ns"} + one{"{0} ns"} + other{"{0} ns"} } second{ dnam{"ثانیه"} @@ -1873,102 +1873,102 @@ fa{ } dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} - other{"{0} dpcm"} + one{"{0} dpcm"} + other{"{0} dpcm"} } dot-per-inch{ - one{"{0} dpi"} - other{"{0} dpi"} + one{"{0} dpi"} + other{"{0} dpi"} } em{ - one{"{0} em"} - other{"{0} em"} + one{"{0} em"} + other{"{0} em"} } megapixel{ - one{"{0} MP"} - other{"{0} MP"} + one{"{0} MP"} + other{"{0} MP"} } pixel{ - one{"{0} px"} - other{"{0} px"} + one{"{0} px"} + other{"{0} px"} } pixel-per-centimeter{ - one{"{0} ppcm"} - other{"{0} ppcm"} + one{"{0} ppcm"} + other{"{0} ppcm"} } pixel-per-inch{ - one{"{0} ppi"} - other{"{0} ppi"} + one{"{0} ppi"} + other{"{0} ppi"} } } length{ astronomical-unit{ - one{"{0} au"} - other{"{0} au"} + one{"{0} au"} + other{"{0} au"} } centimeter{ dnam{"cm"} - one{"{0} cm"} - other{"{0} cm"} - per{"{0}/cm"} + one{"{0} cm"} + other{"{0} cm"} + per{"{0}‎/cm"} } decimeter{ - one{"{0} dm"} - other{"{0} dm"} + one{"{0} dm"} + other{"{0} dm"} } earth-radius{ dnam{"R⊕"} - one{"{0} R⊕"} - other{"{0} R⊕"} + one{"{0} R⊕"} + other{"{0} R⊕"} } fathom{ dnam{"فاتوم"} - one{"{0} fth"} - other{"{0} fth"} + one{"{0} fth"} + other{"{0} fth"} } foot{ dnam{"فوت"} - one{"{0} ft"} - other{"{0} ft"} - per{"{0}/ft"} + one{"{0} ft"} + other{"{0} ft"} + per{"{0}‎/ft"} } furlong{ dnam{"فرلانگ"} - one{"{0} fur"} - other{"{0} fur"} + one{"{0} fur"} + other{"{0} fur"} } inch{ dnam{"اینچ"} - one{"{0} in"} - other{"{0} in"} - per{"{0}/in"} + one{"{0} in"} + other{"{0} in"} + per{"{0}‎/in"} } kilometer{ dnam{"کیلومتر"} - one{"{0} km"} - other{"{0} km"} - per{"{0}/km"} + one{"{0} km"} + other{"{0} km"} + per{"{0}‎/km"} } light-year{ dnam{"سال نوری"} - one{"{0} ly"} - other{"{0} ly"} + one{"{0} ly"} + other{"{0} ly"} } meter{ dnam{"متر"} - one{"{0} m"} - other{"{0} m"} - per{"{0}/m"} + one{"{0} m"} + other{"{0} m"} + per{"{0}‎/m"} } micrometer{ dnam{"میکرومتر"} - one{"{0} μm"} - other{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"مایل"} - one{"{0} mi"} - other{"{0} mi"} + one{"{0} mi"} + other{"{0} mi"} } mile-scandinavian{ one{"{0}‎ smi"} @@ -1976,41 +1976,41 @@ fa{ } millimeter{ dnam{"mm"} - one{"{0} mm"} - other{"{0} mm"} + one{"{0} mm"} + other{"{0} mm"} } nanometer{ - one{"{0} nm"} - other{"{0} nm"} + one{"{0} nm"} + other{"{0} nm"} } nautical-mile{ - one{"{0} nmi"} - other{"{0} nmi"} + one{"{0} nmi"} + other{"{0} nmi"} } parsec{ dnam{"پارسک"} - one{"{0} pc"} - other{"{0} pc"} + one{"{0} pc"} + other{"{0} pc"} } picometer{ dnam{"pm"} - one{"{0} pm"} - other{"{0} pm"} + one{"{0} pm"} + other{"{0} pm"} } point{ dnam{"پوینت"} - one{"{0} pt"} - other{"{0} pt"} + one{"{0} pt"} + other{"{0} pt"} } solar-radius{ dnam{"شعاع خورشید"} - one{"{0} R☉"} - other{"{0} R☉"} + one{"{0} R☉"} + other{"{0} R☉"} } yard{ dnam{"یارد"} - one{"{0} yd"} - other{"{0} yd"} + one{"{0} yd"} + other{"{0} yd"} } } light{ @@ -2054,21 +2054,21 @@ fa{ } kilogram{ dnam{"کیلوگرم"} - one{"{0} kg"} + one{"{0} kg"} other{"{0} کیلوگرم"} - per{"{0}/kg"} + per{"{0}‎/kg"} } metric-ton{ - one{"{0} t"} - other{"{0} t"} + one{"{0} t"} + other{"{0} t"} } microgram{ - one{"{0} μg"} - other{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ - one{"{0} mg"} - other{"{0} mg"} + one{"{0} mg"} + other{"{0} mg"} } ounce{ dnam{"اونس"} @@ -2177,8 +2177,8 @@ fa{ other{"{0} م‌م جیوه"} } pascal{ - one{"{0} Pa"} - other{"{0} Pa"} + one{"{0} Pa"} + other{"{0} Pa"} } pound-force-per-square-inch{ dnam{"پوند در اینچ مربع"} @@ -2199,8 +2199,8 @@ fa{ } meter-per-second{ dnam{"متر در ثانیه"} - one{"{0} m/s"} - other{"{0} m/s"} + one{"{0} m/s"} + other{"{0} m/s"} } mile-per-hour{ dnam{"مایل در ساعت"} @@ -2258,8 +2258,8 @@ fa{ other{"{0} بوشل"} } centiliter{ - one{"{0} cL"} - other{"{0} cL"} + one{"{0} cL"} + other{"{0} cL"} } cubic-centimeter{ one{"{0}‎ cm³"} @@ -2268,13 +2268,13 @@ fa{ } cubic-foot{ dnam{"فوت مکعب"} - one{"{0} ft³"} - other{"{0} ft³"} + one{"{0} ft³"} + other{"{0} ft³"} } cubic-inch{ dnam{"اینچ مکعب"} - one{"{0} in³"} - other{"{0} in³"} + one{"{0} in³"} + other{"{0} in³"} } cubic-kilometer{ dnam{"کیلومتر مکعب"} @@ -2283,18 +2283,18 @@ fa{ } cubic-meter{ dnam{"متر مکعب"} - one{"{0} m³"} - other{"{0} m³"} - per{"{0}/m³"} + one{"{0} m³"} + other{"{0} m³"} + per{"{0}‎/m³"} } cubic-mile{ - one{"{0} mi³"} - other{"{0} mi³"} + one{"{0} mi³"} + other{"{0} mi³"} } cubic-yard{ dnam{"یارد مکعب"} - one{"{0} yd³"} - other{"{0} yd³"} + one{"{0} yd³"} + other{"{0} yd³"} } cup{ dnam{"پیمانه"} @@ -2307,8 +2307,8 @@ fa{ other{"{0} پیمانهٔ متریک"} } deciliter{ - one{"{0} dL"} - other{"{0} dL"} + one{"{0} dL"} + other{"{0} dL"} } dessert-spoon{ dnam{"قاشق دسرخوری"} @@ -2353,8 +2353,8 @@ fa{ per{"{0}/گالن امپریال"} } hectoliter{ - one{"{0} hL"} - other{"{0} hL"} + one{"{0} hL"} + other{"{0} hL"} } jigger{ dnam{"گیلاس"} @@ -2363,14 +2363,14 @@ fa{ } liter{ dnam{"لیتر"} - one{"{0} L"} - other{"{0} L"} - per{"{0}/L"} + one{"{0} L"} + other{"{0} L"} + per{"{0}‎/L"} } megaliter{ dnam{"مگالیتر"} - one{"{0} ML"} - other{"{0} ML"} + one{"{0} ML"} + other{"{0} ML"} } milliliter{ dnam{"میلی‌لیتر"} diff --git a/icu4c/source/data/unit/nb.txt b/icu4c/source/data/unit/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/unit/nb.txt +++ b/icu4c/source/data/unit/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/unit/nb_NO.txt b/icu4c/source/data/unit/nb_NO.txt deleted file mode 100644 index 2de7860c57e..00000000000 --- a/icu4c/source/data/unit/nb_NO.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_NO{ - "%%ALIAS"{"no_NO"} -} diff --git a/icu4c/source/data/unit/nb_SJ.txt b/icu4c/source/data/unit/nb_SJ.txt deleted file mode 100644 index b1caa388a5d..00000000000 --- a/icu4c/source/data/unit/nb_SJ.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_SJ{ - "%%ALIAS"{"no_SJ"} -} diff --git a/icu4c/source/data/unit/nn.txt b/icu4c/source/data/unit/nn.txt index 8b848b9f4f4..dba5cec374d 100644 --- a/icu4c/source/data/unit/nn.txt +++ b/icu4c/source/data/unit/nn.txt @@ -3,20 +3,13 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ %%Parent{"no"} - durationUnits{ - hm{"h:mm"} - hms{"h:mm:ss"} - ms{"m:ss"} - } units{ acceleration{ g-force{ - dnam{"g-kraft"} one{"{0} g-kraft"} other{"{0} g-krefter"} } meter-per-square-second{ - dnam{"meter per sekund²"} one{"{0} meter per sekund²"} other{"{0} meter per sekund²"} } @@ -32,11 +25,6 @@ nn{ one{"{0} bogesekund"} other{"{0} bogesekund"} } - degree{ - dnam{"grader"} - one{"{0} grad"} - other{"{0} grader"} - } radian{ dnam{"radianar"} one{"{0} radian"} @@ -49,235 +37,33 @@ nn{ } } area{ - acre{ - dnam{"acre"} - one{"{0} acre"} - other{"{0} acre"} - } - hectare{ - dnam{"hektar"} - one{"{0} hektar"} - other{"{0} hektar"} - } - square-centimeter{ - dnam{"kvadratcentimeter"} - one{"{0} kvadratcentimeter"} - other{"{0} kvadratcentimeter"} - per{"{0} per kvadratcentimeter"} - } - square-foot{ - dnam{"kvadratfot"} - one{"{0} kvadratfot"} - other{"{0} kvadratfot"} - } square-inch{ dnam{"kvadrattommar"} one{"{0} kvadrattomme"} other{"{0} kvadrattommar"} - per{"{0} per kvadrattomme"} - } - square-kilometer{ - dnam{"kvadratkilometer"} - one{"{0} kvadratkilometer"} - other{"{0} kvadratkilometer"} - per{"{0} per kvadratkilometer"} - } - square-meter{ - dnam{"kvadratmeter"} - one{"{0} kvadratmeter"} - other{"{0} kvadratmeter"} - per{"{0} per kvadratmeter"} } square-mile{ - dnam{"engelske kvadratmil"} - one{"{0} engelsk kvadratmil"} - other{"{0} engelske kvadratmil"} per{"{0} per engelske kvadratmil"} } - square-yard{ - dnam{"kvadratyard"} - one{"{0} kvadratyard"} - other{"{0} kvadratyard"} - } } compound{ - 1024p1{"kibi{0}"} - 1024p2{"mebi{0}"} - 1024p3{"gibi{0}"} - 1024p4{"tebi{0}"} - 1024p5{"pebi{0}"} - 1024p6{"exbi{0}"} - 1024p7{"zebi{0}"} - 1024p8{"yobi{0}"} - 10p-1{"desi{0}"} - 10p-12{"piko{0}"} - 10p-15{"femto{0}"} - 10p-18{"atto{0}"} - 10p-2{"centi{0}"} - 10p-21{"zepto{0}"} - 10p-24{"yokto{0}"} - 10p-3{"milli{0}"} - 10p-6{"mikro{0}"} - 10p-9{"nano{0}"} - 10p1{"deka{0}"} - 10p12{"tera{0}"} - 10p15{"peta{0}"} - 10p18{"exa{0}"} - 10p2{"hekto{0}"} - 10p21{"zetta{0}"} - 10p24{"yotta{0}"} - 10p3{"kilo{0}"} - 10p6{"mega{0}"} - 10p9{"giga{0}"} - per{"{0} per {1}"} - power2{ - one{ - _{ - _{"kvadrat{0}"} - } - } - other{ - _{ - _{"kvadrat{0}"} - } - } - } - power3{ - one{ - _{ - _{"kubikk{0}"} - } - } - other{ - _{ - _{"kubikk{0}"} - } - } - } times{"{0}{1}"} } concentr{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - milligram-ofglucose-per-deciliter{ - dnam{"milligram per desiliter"} - one{"{0} milligram per desiliter"} - other{"{0} milligram per desiliter"} - } - millimole-per-liter{ - dnam{"millimol per liter"} - one{"{0} millimol per liter"} - other{"{0} millimol per liter"} - } - percent{ - dnam{"prosent"} - one{"{0} prosent"} - other{"{0} prosent"} - } - permille{ - dnam{"promille"} - one{"{0} promille"} - other{"{0} promille"} - } permillion{ dnam{"milliondelar"} one{"{0} milliondel"} other{"{0} milliondelar"} } - permyriad{ - dnam{"promyriade"} - one{"{0} promyriade"} - other{"{0} promyriade"} - } } consumption{ - liter-per-100-kilometer{ - dnam{"liter per 100 kilometer"} - one{"{0} liter per 100 kilometer"} - other{"{0} liter per 100 kilometer"} - } - liter-per-kilometer{ - dnam{"liter per kilometer"} - one{"{0} liter per kilometer"} - other{"{0} liter per kilometer"} - } - mile-per-gallon{ - dnam{"engelske mil per gallon"} - one{"{0} engelsk mil per gallon"} - other{"{0} engelske mil per gallon"} - } mile-per-gallon-imperial{ - dnam{"engelske mil per britiske gallon"} one{"{0} engelsk mil per britiske gallon"} other{"{0} engelske mil per britiske gallon"} } } coordinate{ - dnam{"himmelretning"} east{"{0} aust"} - north{"{0} nord"} - south{"{0} sør"} - west{"{0} vest"} - } - digital{ - bit{ - dnam{"bit"} - one{"{0} bit"} - other{"{0} bit"} - } - byte{ - dnam{"byte"} - one{"{0} byte"} - other{"{0} byte"} - } - gigabit{ - dnam{"gigabit"} - one{"{0} gigabit"} - other{"{0} gigabit"} - } - gigabyte{ - dnam{"gigabyte"} - one{"{0} gigabyte"} - other{"{0} gigabyte"} - } - kilobit{ - dnam{"kilobit"} - one{"{0} kilobit"} - other{"{0} kilobit"} - } - kilobyte{ - dnam{"kilobyte"} - one{"{0} kilobyte"} - other{"{0} kilobyte"} - } - megabit{ - dnam{"megabit"} - one{"{0} megabit"} - other{"{0} megabit"} - } - megabyte{ - dnam{"megabyte"} - one{"{0} megabyte"} - other{"{0} megabyte"} - } - petabyte{ - dnam{"petabyte"} - one{"{0} petabyte"} - other{"{0} petabyte"} - } - terabit{ - dnam{"terabit"} - one{"{0} terabit"} - other{"{0} terabit"} - } - terabyte{ - dnam{"terabyte"} - one{"{0} terabyte"} - other{"{0} terabyte"} - } } duration{ century{ @@ -285,22 +71,8 @@ nn{ one{"{0} hundreår"} other{"{0} hundreår"} } - day{ - dnam{"døgn"} - one{"{0} døgn"} - other{"{0} døgn"} - per{"{0} per døgn"} - } - decade{ - dnam{"tiår"} - one{"{0} tiår"} - other{"{0} tiår"} - } hour{ dnam{"timar"} - one{"{0} time"} - other{"{0} timer"} - per{"{0} per time"} } microsecond{ dnam{"mikrosekund"} @@ -316,7 +88,6 @@ nn{ dnam{"minutt"} one{"{0} minutt"} other{"{0} minutt"} - per{"{0} per minutt"} } month{ dnam{"månadar"} @@ -333,7 +104,6 @@ nn{ dnam{"sekund"} one{"{0} sekund"} other{"{0} sekund"} - per{"{0} per sekund"} } week{ dnam{"veker"} @@ -341,34 +111,12 @@ nn{ other{"{0} veker"} per{"{0} per veke"} } - year{ - dnam{"år"} - one{"{0} år"} - other{"{0} år"} - per{"{0} per år"} - } } electric{ ampere{ - dnam{"ampere"} one{"{0} ampere"} other{"{0} ampere"} } - milliampere{ - dnam{"milliampere"} - one{"{0} milliampere"} - other{"{0} milliampere"} - } - ohm{ - dnam{"ohm"} - one{"{0} ohm"} - other{"{0} ohm"} - } - volt{ - dnam{"volt"} - one{"{0} volt"} - other{"{0} volt"} - } } energy{ british-thermal-unit{ @@ -381,18 +129,12 @@ nn{ one{"{0} kalori"} other{"{0} kaloriar"} } - electronvolt{ - dnam{"elektronvolt"} - one{"{0} elektronvolt"} - other{"{0} elektronvolt"} - } foodcalorie{ dnam{"kaloriar"} one{"{0} kalori"} other{"{0} kaloriar"} } joule{ - dnam{"joule"} one{"{0} joule"} other{"{0} joule"} } @@ -401,59 +143,14 @@ nn{ one{"{0} kilokalori"} other{"{0} kilokaloriar"} } - kilojoule{ - dnam{"kilojoule"} - one{"{0} kilojoule"} - other{"{0} kilojoule"} - } kilowatt-hour{ dnam{"kilowattimar"} one{"{0} kilowattime"} other{"{0} kilowattimar"} } - therm-us{ - dnam{"therm"} - one{"{0} therm"} - other{"{0} therm"} - } - } - force{ - newton{ - dnam{"newton"} - one{"{0} newton"} - other{"{0} newton"} - } - pound-force{ - dnam{"poundforce"} - one{"{0} poundforce"} - other{"{0} poundforce"} - } - } - frequency{ - gigahertz{ - dnam{"gigahertz"} - one{"{0} gigahertz"} - other{"{0} gigahertz"} - } - hertz{ - dnam{"hertz"} - one{"{0} hertz"} - other{"{0} hertz"} - } - kilohertz{ - dnam{"kilohertz"} - one{"{0} kilohertz"} - other{"{0} kilohertz"} - } - megahertz{ - dnam{"megahertz"} - one{"{0} megahertz"} - other{"{0} megahertz"} - } } graphics{ dot{ - dnam{"punkt"} one{"{0} punkt"} other{"{0} punkt"} } @@ -467,11 +164,6 @@ nn{ one{"{0} punkt per tomme"} other{"{0} punkt per tomme"} } - em{ - dnam{"gefirt"} - one{"{0} gefirt"} - other{"{0} gefirt"} - } megapixel{ dnam{"megapikslar"} one{"{0} megapiksel"} @@ -499,19 +191,7 @@ nn{ one{"{0} astronomisk eining"} other{"{0} astronomiske einingar"} } - centimeter{ - dnam{"centimeter"} - one{"{0} centimeter"} - other{"{0} centimeter"} - per{"{0} per centimeter"} - } - decimeter{ - dnam{"desimeter"} - one{"{0} desimeter"} - other{"{0} desimeter"} - } earth-radius{ - dnam{"jordradius"} one{"{0} jordradius"} other{"{0} jordradius"} } @@ -520,80 +200,15 @@ nn{ one{"{0} famn"} other{"{0} famner"} } - foot{ - dnam{"fot"} - one{"{0} fot"} - other{"{0} fot"} - per{"{0} per fot"} - } - furlong{ - dnam{"furlong"} - one{"{0} furlong"} - other{"{0} furlong"} - } inch{ dnam{"tommar"} one{"{0} tomme"} other{"{0} tommar"} - per{"{0} per tomme"} - } - kilometer{ - dnam{"kilometer"} - one{"{0} kilometer"} - other{"{0} kilometer"} - per{"{0} per kilometer"} - } - light-year{ - dnam{"lysår"} - one{"{0} lysår"} - other{"{0} lysår"} - } - meter{ - dnam{"meter"} - one{"{0} meter"} - other{"{0} meter"} - per{"{0} per meter"} - } - micrometer{ - dnam{"mikrometer"} - one{"{0} mikrometer"} - other{"{0} mikrometer"} - } - mile{ - dnam{"engelske mil"} - one{"{0} engelsk mil"} - other{"{0} engelske mil"} - } - mile-scandinavian{ - dnam{"mil"} - one{"{0} mil"} - other{"{0} mil"} - } - millimeter{ - dnam{"millimeter"} - one{"{0} millimeter"} - other{"{0} millimeter"} } nanometer{ - dnam{"nanometer"} one{"{0} nm"} other{"{0} nm"} } - nautical-mile{ - dnam{"nautiske mil"} - one{"{0} nautisk mil"} - other{"{0} nautiske mil"} - } - parsec{ - dnam{"parsec"} - one{"{0} parsec"} - other{"{0} parsec"} - } - picometer{ - dnam{"pikometer"} - one{"{0} pikometer"} - other{"{0} pikometer"} - } point{ dnam{"typografiske punkt"} one{"{0} typografisk punkt"} @@ -611,21 +226,6 @@ nn{ } } light{ - candela{ - dnam{"candela"} - one{"{0} candela"} - other{"{0} candela"} - } - lumen{ - dnam{"lumen"} - one{"{0} lumen"} - other{"{0} lumen"} - } - lux{ - dnam{"lux"} - one{"{0} lux"} - other{"{0} lux"} - } solar-luminosity{ dnam{"solluminositetar"} one{"{0} solluminositet"} @@ -633,65 +233,11 @@ nn{ } } mass{ - carat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - dalton{ - dnam{"dalton"} - one{"{0} dalton"} - other{"{0} dalton"} - } earth-mass{ dnam{"jordmassar"} one{"{0} jordmasse"} other{"{0} jordmassar"} } - gram{ - dnam{"gram"} - one{"{0} gram"} - other{"{0} gram"} - per{"{0} per gram"} - } - kilogram{ - dnam{"kilogram"} - one{"{0} kilogram"} - other{"{0} kilogram"} - per{"{0} per kilogram"} - } - metric-ton{ - dnam{"tonn"} - one{"{0} tonn"} - other{"{0} tonn"} - } - microgram{ - dnam{"mikrogram"} - one{"{0} mikrogram"} - other{"{0} mikrogram"} - } - milligram{ - dnam{"milligram"} - one{"{0} milligram"} - other{"{0} milligram"} - } - ounce{ - dnam{"unser"} - one{"{0} unse"} - other{"{0} unser"} - per{"{0} per unse"} - } - ounce-troy{ - dnam{"troy ounce"} - one{"{0} troy ounce"} - other{"{0} troy ounce"} - } - pound{ - dnam{"pund"} - one{"{0} pund"} - other{"{0} pund"} - per{"{0} per pund"} - } solar-mass{ dnam{"solmassar"} one{"{0} solmasse"} @@ -703,137 +249,37 @@ nn{ other{"{0} engelske stones"} } ton{ - dnam{"amerikanske tonn"} one{"{0} amerikansk tonn"} other{"{0} amerikanske tonn"} } } - power{ - gigawatt{ - dnam{"gigawatt"} - one{"{0} gigawatt"} - other{"{0} gigawatt"} - } - horsepower{ - dnam{"hestekrefter"} - one{"{0} hestekraft"} - other{"{0} hestekrefter"} - } - kilowatt{ - dnam{"kilowatt"} - one{"{0} kilowatt"} - other{"{0} kilowatt"} - } - megawatt{ - dnam{"megawatt"} - one{"{0} megawatt"} - other{"{0} megawatt"} - } - milliwatt{ - dnam{"milliwatt"} - one{"{0} milliwatt"} - other{"{0} milliwatt"} - } - watt{ - dnam{"watt"} - one{"{0} watt"} - other{"{0} watt"} - } - } pressure{ atmosphere{ dnam{"atmosfærar"} one{"{0} atmosfære"} other{"{0} atmosfærar"} } - hectopascal{ - dnam{"hektopascal"} - one{"{0} hektopascal"} - other{"{0} hektopascal"} - } inch-ofhg{ dnam{"tommar kvikksølv"} one{"{0} tomme kvikksølv"} other{"{0} tommar kvikksølv"} } - kilopascal{ - dnam{"kilopascal"} - one{"{0} kilopascal"} - other{"{0} kilopascal"} - } - megapascal{ - dnam{"megapascal"} - one{"{0} megapascal"} - other{"{0} megapascal"} - } - millibar{ - dnam{"millibar"} - one{"{0} millibar"} - other{"{0} millibar"} - } - millimeter-ofhg{ - dnam{"millimeter kvikksølv"} - one{"{0} millimeter kvikksølv"} - other{"{0} millimeter kvikksølv"} - } - pascal{ - dnam{"pascal"} - one{"{0} pascal"} - other{"{0} pascal"} - } - pound-force-per-square-inch{ - dnam{"pund per kvadrattomme"} - one{"{0} pund per kvadrattomme"} - other{"{0} pund per kvadrattomme"} - } } speed{ kilometer-per-hour{ - dnam{"kilometer per time"} one{"{0} kilometer per time"} other{"{0} kilomeer per time"} } - knot{ - dnam{"knop"} - one{"{0} knop"} - other{"{0} knop"} - } - meter-per-second{ - dnam{"meter per sekund"} - one{"{0} meter per sekund"} - other{"{0} meter per sekund"} - } - mile-per-hour{ - dnam{"engelske mil per time"} - one{"{0} engelsk mil per time"} - other{"{0} engelske mil per time"} - } } temperature{ - celsius{ - dnam{"grader celsius"} - one{"{0} grad celsius"} - other{"{0} grader celsius"} - } - fahrenheit{ - dnam{"grader fahrenheit"} - one{"{0} grad fahrenheit"} - other{"{0} grader fahrenheit"} - } generic{ dnam{"°"} one{"{0}°"} other{"{0}°"} } - kelvin{ - dnam{"kelvin"} - one{"{0} kelvin"} - other{"{0} kelvin"} - } } torque{ newton-meter{ - dnam{"newtonmeter"} one{"{0} newtonmeter"} other{"{0} newtonmeter"} } @@ -844,60 +290,19 @@ nn{ } } volume{ - acre-foot{ - dnam{"acre-fot"} - one{"{0} acre-fot"} - other{"{0} acre-fot"} - } - barrel{ - dnam{"fat"} - one{"{0} fat"} - other{"{0} fat"} - } bushel{ dnam{"bushels"} - one{"{0} bushel"} - other{"{0} bushels"} - } - centiliter{ - dnam{"centiliter"} - one{"{0} centiliter"} - other{"{0} centiliter"} - } - cubic-centimeter{ - dnam{"kubikkcentimeter"} - one{"{0} kubikkcentimeter"} - other{"{0} kubikkcentimeter"} - per{"{0} per kubikkcentimeter"} - } - cubic-foot{ - dnam{"kubikkfot"} - one{"{0} kubikkfot"} - other{"{0} kubikkfot"} } cubic-inch{ dnam{"kubikktommar"} one{"{0} kubikktomme"} other{"{0} kubikktommar"} } - cubic-kilometer{ - dnam{"kubikkilometer"} - one{"{0} kubikkilometer"} - other{"{0} kubikkilometer"} - } - cubic-meter{ - dnam{"kubikkmeter"} - one{"{0} kubikkmeter"} - other{"{0} kubikkmeter"} - per{"{0} per kubikkmeter"} - } cubic-mile{ - dnam{"engelske kubikkmil"} one{"{0} engelske kubikkmil"} other{"{0} engelske kubikkmil"} } cubic-yard{ - dnam{"kubikkyard"} one{"{0} kubikkyard"} other{"{0} kubikkyard"} } @@ -911,11 +316,6 @@ nn{ one{"{0} metrisk kopp"} other{"{0} metriske koppar"} } - deciliter{ - dnam{"desiliter"} - one{"{0} desiliter"} - other{"{0} desiliter"} - } dessert-spoon{ dnam{"dessertskei"} one{"{0} dessertskei"} @@ -926,89 +326,14 @@ nn{ one{"{0} britisk dessertskei"} other{"{0} britisk dessertskei"} } - dram{ - dnam{"dram"} - one{"{0} dram"} - other{"{0} dram"} - } drop{ dnam{"drope"} one{"{0} drope"} other{"{0} dropar"} } - fluid-ounce{ - dnam{"væskeunser"} - one{"{0} væskeunse"} - other{"{0} væskeunser"} - } - fluid-ounce-imperial{ - dnam{"britiske væskeunser"} - one{"{0} britisk væskeunse"} - other{"{0} britiske væskeunser"} - } - gallon{ - dnam{"gallon"} - one{"{0} gallon"} - other{"{0} gallon"} - per{"{0} per gallon"} - } gallon-imperial{ - dnam{"britiske gallon"} - one{"{0} britisk gallon"} - other{"{0} britiske gallon"} per{"{0} per britiske gallon"} } - hectoliter{ - dnam{"hektoliter"} - one{"{0} hektoliter"} - other{"{0} hektoliter"} - } - jigger{ - dnam{"shot"} - one{"{0} shot"} - other{"{0} jigger"} - } - liter{ - dnam{"liter"} - one{"{0} liter"} - other{"{0} liter"} - per{"{0} per liter"} - } - megaliter{ - dnam{"megaliter"} - one{"{0} megaliter"} - other{"{0} megaliter"} - } - milliliter{ - dnam{"milliliter"} - one{"{0} milliliter"} - other{"{0} milliliter"} - } - pinch{ - dnam{"klype"} - one{"{0} klype"} - other{"{0} klyper"} - } - pint{ - dnam{"pint"} - one{"{0} pint"} - other{"{0} pint"} - } - pint-metric{ - dnam{"metriske pint"} - one{"{0} metrisk pint"} - other{"{0} metriske pint"} - } - quart{ - dnam{"quart"} - one{"{0} quart"} - other{"{0} quart"} - } - quart-imperial{ - dnam{"britisk quart"} - one{"{0} britisk quart"} - other{"{0} britiske quart"} - } tablespoon{ dnam{"matskeier"} one{"{0} matskei"} @@ -1023,10 +348,6 @@ nn{ } unitsNarrow{ area{ - acre{ - one{"{0} ac"} - other{"{0} ac"} - } square-foot{ one{"{0} ft²"} other{"{0} ft²"} @@ -1037,49 +358,22 @@ nn{ } } compound{ - per{"{0}/{1}"} times{"{0}{1}"} } - concentr{ - percent{ - dnam{"%"} - one{"{0} %"} - other{"{0} %"} - } - } consumption{ liter-per-100-kilometer{ dnam{"l/100 km"} - one{"{0} l/100km"} - other{"{0} l/100km"} } } - coordinate{ - east{"{0}Ø"} - north{"{0}N"} - south{"{0}S"} - west{"{0}V"} - } duration{ - day{ - dnam{"døgn"} - one{"{0}d"} - other{"{0}d"} - } hour{ dnam{"timar"} - one{"{0}t"} - other{"{0}t"} } millisecond{ dnam{"millisekund"} - one{"{0}ms"} - other{"{0}ms"} } minute{ dnam{"minutt"} - one{"{0}m"} - other{"{0}m"} } month{ dnam{"månad"} @@ -1088,61 +382,23 @@ nn{ } second{ dnam{"sekund"} - one{"{0}s"} - other{"{0}s"} } week{ dnam{"vk."} one{"{0}v"} other{"{0}v"} } - year{ - dnam{"år"} - one{"{0}å"} - other{"{0}å"} - } } length{ - centimeter{ - dnam{"cm"} - one{"{0}cm"} - other{"{0}cm"} - } - kilometer{ - dnam{"km"} - one{"{0}km"} - other{"{0}km"} - } - meter{ - one{"{0}m"} - other{"{0}m"} - } mile{ one{"{0} mi"} other{"{0} mi"} } - millimeter{ - dnam{"mm"} - one{"{0}mm"} - other{"{0}mm"} - } yard{ one{"{0} yd"} other{"{0} yd"} } } - mass{ - gram{ - dnam{"gram"} - one{"{0}g"} - other{"{0}g"} - } - kilogram{ - dnam{"kg"} - one{"{0}kg"} - other{"{0}kg"} - } - } pressure{ inch-ofhg{ one{"{0} inHg"} @@ -1150,11 +406,6 @@ nn{ } } speed{ - kilometer-per-hour{ - dnam{"km/t"} - one{"{0}km/t"} - other{"{0}km/t"} - } mile-per-hour{ one{"{0} mi/h"} other{"{0} mi/h"} @@ -1162,7 +413,6 @@ nn{ } temperature{ celsius{ - dnam{"°C"} one{"{0}°"} other{"{0}°"} } @@ -1174,159 +424,58 @@ nn{ } liter{ dnam{"liter"} - one{"{0}l"} - other{"{0}l"} } } } unitsShort{ acceleration{ - g-force{ - dnam{"g-kraft"} - one{"{0} G"} - other{"{0} G"} - } meter-per-square-second{ dnam{"m/s²"} - one{"{0} m/s²"} - other{"{0} m/s²"} } } angle{ arc-minute{ dnam{"bogeminutt"} - one{"{0}′"} - other{"{0}′"} } arc-second{ dnam{"bogesekund"} - one{"{0}″"} - other{"{0}″"} - } - degree{ - dnam{"grader"} - one{"{0}°"} - other{"{0}°"} } radian{ dnam{"radianar"} - one{"{0} rad"} - other{"{0} rad"} - } - revolution{ - dnam{"omdr."} - one{"{0} omdr."} - other{"{0} omdr."} } } area{ acre{ - dnam{"acre"} one{"{0} acre"} other{"{0} acre"} } - hectare{ - dnam{"hektar"} - one{"{0} ha"} - other{"{0} ha"} - } - square-centimeter{ - dnam{"cm²"} - one{"{0} cm²"} - other{"{0} cm²"} - per{"{0}/cm²"} - } - square-foot{ - dnam{"kvadratfot"} - one{"{0} fot²"} - other{"{0} fot²"} - } square-inch{ dnam{"tommar²"} one{"{0} tomme²"} other{"{0} tommar²"} per{"{0}/tomme²"} } - square-kilometer{ - dnam{"km²"} - one{"{0} km²"} - other{"{0} km²"} - per{"{0}/km²"} - } - square-meter{ - dnam{"m²"} - one{"{0} m²"} - other{"{0} m²"} - per{"{0}/m²"} - } square-mile{ dnam{"engelske mil²"} one{"{0} mi²"} other{"{0} mi²"} per{"{0}/mi²"} } - square-yard{ - dnam{"yd²"} - one{"{0} yd²"} - other{"{0} yd²"} - } } compound{ - per{"{0}/{1}"} times{"{0}{1}"} } concentr{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - milligram-ofglucose-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"} - } - percent{ - dnam{"prosent"} - one{"{0} %"} - other{"{0} %"} - } - permille{ - dnam{"promille"} - one{"{0} ‰"} - other{"{0} ‰"} - } - permillion{ - dnam{"ppm"} - one{"{0} ppm"} - other{"{0} ppm"} - } - permyriad{ - dnam{"promyriade"} - one{"{0} ‱"} - other{"{0} ‱"} } } consumption{ - liter-per-100-kilometer{ - dnam{"l/100 km"} - one{"{0} l/100 km"} - other{"{0} l/100 km"} - } liter-per-kilometer{ dnam{"l/km"} - one{"{0} l/km"} - other{"{0} l/km"} } mile-per-gallon{ dnam{"eng. mil/gal"} - one{"{0} mpg"} - other{"{0} mpg"} } mile-per-gallon-imperial{ dnam{"eng. mil/brit. gal"} @@ -1334,125 +483,44 @@ nn{ other{"{0} mile/brit. gal"} } } - coordinate{ - dnam{"retning"} - east{"{0} Ø"} - north{"{0} N"} - south{"{0} S"} - west{"{0} V"} - } digital{ - bit{ - dnam{"bit"} - one{"{0} bit"} - other{"{0} bit"} - } byte{ - dnam{"byte"} one{"{0} byte"} other{"{0} byte"} } gigabit{ dnam{"Gb"} - one{"{0} Gb"} - other{"{0} Gb"} - } - gigabyte{ - dnam{"GB"} - one{"{0} GB"} - other{"{0} GB"} } kilobit{ dnam{"kb"} - one{"{0} kb"} - other{"{0} kb"} - } - kilobyte{ - dnam{"kB"} - one{"{0} kB"} - other{"{0} kB"} } megabit{ dnam{"Mb"} - one{"{0} Mb"} - other{"{0} Mb"} - } - megabyte{ - dnam{"MB"} - one{"{0} MB"} - other{"{0} MB"} - } - petabyte{ - dnam{"PB"} - one{"{0} PB"} - other{"{0} PB"} } terabit{ dnam{"Tb"} - one{"{0} Tb"} - other{"{0} Tb"} - } - terabyte{ - dnam{"TB"} - one{"{0} TB"} - other{"{0} TB"} } } duration{ - century{ - dnam{"årh."} - one{"{0} årh."} - other{"{0} årh."} - } - day{ - dnam{"døgn"} - one{"{0} d"} - other{"{0} d"} - per{"{0}/d"} - } - decade{ - dnam{"tiår"} - one{"{0} tiår"} - other{"{0} tiår"} - } hour{ dnam{"timar"} - one{"{0} t"} - other{"{0} t"} - per{"{0}/t"} } microsecond{ dnam{"mikrosekund"} - one{"{0} μs"} - other{"{0} μs"} } millisecond{ dnam{"millisekund"} - one{"{0} ms"} - other{"{0} ms"} } minute{ dnam{"minutt"} - one{"{0} min"} - other{"{0} min"} - per{"{0}/min"} } month{ dnam{"månadar"} - one{"{0} md."} - other{"{0} md."} - per{"{0}/md."} - } - nanosecond{ - dnam{"ns"} - one{"{0} ns"} - other{"{0} ns"} } second{ dnam{"sekund"} one{"{0} s"} other{"{0} s"} - per{"{0}/s"} } week{ dnam{"veker"} @@ -1460,109 +528,8 @@ nn{ other{"{0} v"} per{"{0}/v"} } - year{ - dnam{"år"} - one{"{0} år"} - other{"{0} år"} - per{"{0}/år"} - } - } - electric{ - ampere{ - dnam{"ampere"} - one{"{0} A"} - other{"{0} A"} - } - milliampere{ - dnam{"milliampere"} - one{"{0} mA"} - other{"{0} mA"} - } - ohm{ - dnam{"ohm"} - one{"{0} Ω"} - other{"{0} Ω"} - } - volt{ - dnam{"volt"} - one{"{0} V"} - other{"{0} V"} - } - } - energy{ - calorie{ - dnam{"cal"} - one{"{0} cal"} - other{"{0} cal"} - } - electronvolt{ - dnam{"elektronvolt"} - one{"{0} eV"} - other{"{0} eV"} - } - foodcalorie{ - dnam{"cal"} - one{"{0} cal"} - other{"{0} cal"} - } - joule{ - dnam{"joule"} - one{"{0} J"} - other{"{0} J"} - } - kilocalorie{ - dnam{"kcal"} - one{"{0} kcal"} - other{"{0} kcal"} - } - kilojoule{ - dnam{"kilojoule"} - one{"{0} kJ"} - other{"{0} kJ"} - } - kilowatt-hour{ - dnam{"kWh"} - one{"{0} kWh"} - other{"{0} kWh"} - } - therm-us{ - one{"{0} therm"} - other{"{0} therm"} - } - } - force{ - pound-force{ - dnam{"poundforce"} - } - } - frequency{ - gigahertz{ - dnam{"GHz"} - one{"{0} GHz"} - other{"{0} GHz"} - } - hertz{ - dnam{"Hz"} - one{"{0} Hz"} - other{"{0} Hz"} - } - kilohertz{ - dnam{"kHz"} - one{"{0} kHz"} - other{"{0} kHz"} - } - megahertz{ - dnam{"MHz"} - one{"{0} MHz"} - other{"{0} MHz"} - } } graphics{ - dot{ - dnam{"pkt"} - one{"{0} pkt"} - other{"{0} pkt"} - } dot-per-centimeter{ one{"{0} dpcm"} other{"{0} ppcm"} @@ -1572,24 +539,12 @@ nn{ one{"{0} ppt"} other{"{0} ppt"} } - em{ - dnam{"gefirt"} - one{"{0} gefirt"} - other{"{0} gefirt"} - } megapixel{ dnam{"megapikslar"} - one{"{0} MP"} - other{"{0} MP"} } pixel{ dnam{"pikslar"} } - pixel-per-inch{ - dnam{"ppi"} - one{"{0} ppi"} - other{"{0} ppi"} - } } length{ astronomical-unit{ @@ -1597,339 +552,66 @@ nn{ one{"{0} au"} other{"{0} au"} } - centimeter{ - dnam{"cm"} - one{"{0} cm"} - other{"{0} cm"} - per{"{0}/cm"} - } - decimeter{ - dnam{"dm"} - one{"{0} dm"} - other{"{0} dm"} - } fathom{ dnam{"famner"} one{"{0} fmn"} other{"{0} fmn"} } foot{ - dnam{"fot"} - one{"{0} fot"} - other{"{0} fot"} per{"{0}/ft"} } - furlong{ - dnam{"furlong"} - one{"{0} fur"} - other{"{0} fur"} - } inch{ dnam{"tommar"} one{"{0} tomme"} other{"{0} tommar"} - per{"{0}/tomme"} - } - kilometer{ - dnam{"km"} - one{"{0} km"} - other{"{0} km"} - per{"{0}/km"} } light-year{ - dnam{"lysår"} one{"{0} lysår"} other{"{0} lysår"} } meter{ dnam{"m"} - one{"{0} m"} - other{"{0} m"} - per{"{0}/m"} - } - micrometer{ - dnam{"μm"} - one{"{0} μm"} - other{"{0} μm"} } mile{ dnam{"engelske mil"} one{"{0} mi"} other{"{0} mi"} } - mile-scandinavian{ - dnam{"mil"} - one{"{0} mil"} - other{"{0} mil"} - } - millimeter{ - dnam{"mm"} - one{"{0} mm"} - other{"{0} mm"} - } - nanometer{ - dnam{"nm"} - one{"{0} nm"} - other{"{0} nm"} - } - nautical-mile{ - dnam{"nmi"} - one{"{0} nmi"} - other{"{0} nmi"} - } - parsec{ - dnam{"parsec"} - one{"{0} pc"} - other{"{0} pc"} - } picometer{ dnam{"pikometer"} - one{"{0} pm"} - other{"{0} pm"} } point{ dnam{"pt"} - one{"{0} pt"} - other{"{0} pt"} - } - solar-radius{ - dnam{"solradius"} } yard{ dnam{"engelske yard"} } } light{ - lux{ - dnam{"lux"} - one{"{0} lx"} - other{"{0} lx"} - } solar-luminosity{ dnam{"solluminositetar"} } } mass{ - carat{ - dnam{"karat"} - one{"{0} c"} - other{"{0} c"} - } - dalton{ - one{"{0} Da"} - other{"{0} Da"} - } - earth-mass{ - dnam{"jordmasser"} - one{"{0} M⊕"} - other{"{0} M⊕"} - } - gram{ - dnam{"gram"} - one{"{0} g"} - other{"{0} g"} - per{"{0}/g"} - } - kilogram{ - dnam{"kg"} - one{"{0} kg"} - other{"{0} kg"} - per{"{0}/kg"} - } - metric-ton{ - dnam{"tonn"} - one{"{0} tonn"} - other{"{0} tonn"} - } - microgram{ - dnam{"μg"} - one{"{0} μg"} - other{"{0} μg"} - } - milligram{ - dnam{"mg"} - one{"{0} mg"} - other{"{0} mg"} - } - ounce{ - dnam{"unser"} - one{"{0} unse"} - other{"{0} unser"} - per{"{0}/unse"} - } - ounce-troy{ - dnam{"oz tr"} - one{"{0} oz tr"} - other{"{0} oz tr"} - } - pound{ - dnam{"pund"} - one{"{0} pund"} - other{"{0} pund"} - per{"{0}/pund"} - } solar-mass{ dnam{"solmassar"} - one{"{0} M☉"} - other{"{0} M☉"} } stone{ dnam{"stones"} one{"{0} eng. st."} other{"{0} eng. st."} } - ton{ - dnam{"am. tonn"} - one{"{0} am. tonn"} - other{"{0} am. tonn"} - } - } - power{ - gigawatt{ - dnam{"GW"} - one{"{0} GW"} - other{"{0} GW"} - } - horsepower{ - dnam{"hk"} - one{"{0} hk"} - other{"{0} hk"} - } - kilowatt{ - dnam{"kW"} - one{"{0} kW"} - other{"{0} kW"} - } - megawatt{ - dnam{"MW"} - one{"{0} MW"} - other{"{0} MW"} - } - milliwatt{ - dnam{"mW"} - one{"{0} mW"} - other{"{0} mW"} - } - watt{ - dnam{"watt"} - one{"{0} W"} - other{"{0} W"} - } - } - pressure{ - atmosphere{ - dnam{"atm"} - one{"{0} atm"} - other{"{0} atm"} - } - hectopascal{ - dnam{"hPa"} - one{"{0} hPa"} - other{"{0} hPa"} - } - inch-ofhg{ - dnam{"inHg"} - one{"{0} inHg"} - other{"{0} inHg"} - } - millibar{ - dnam{"mbar"} - one{"{0} mbar"} - other{"{0} mbar"} - } - millimeter-ofhg{ - dnam{"mmHg"} - one{"{0} mmHg"} - other{"{0} mmHg"} - } - pound-force-per-square-inch{ - dnam{"psi"} - one{"{0} psi"} - other{"{0} psi"} - } } speed{ - kilometer-per-hour{ - dnam{"km/time"} - one{"{0} km/t"} - other{"{0} km/t"} - } - knot{ - dnam{"kn"} - one{"{0} kn"} - other{"{0} kn"} - } - meter-per-second{ - dnam{"meter/s"} - one{"{0} m/s"} - other{"{0} m/s"} - } mile-per-hour{ dnam{"engelske mil/t"} one{"{0} mile/t"} other{"{0} mile/t"} } } - temperature{ - celsius{ - dnam{"°C"} - one{"{0} °C"} - other{"{0} °C"} - } - fahrenheit{ - dnam{"°F"} - one{"{0} °F"} - other{"{0} °F"} - } - generic{ - dnam{"°"} - one{"{0}°"} - other{"{0}°"} - } - kelvin{ - dnam{"K"} - one{"{0} K"} - other{"{0} K"} - } - } - torque{ - newton-meter{ - dnam{"Nm"} - one{"{0} Nm"} - other{"{0} Nm"} - } - } volume{ - acre-foot{ - dnam{"acre-fot"} - one{"{0} ac-fot"} - other{"{0} ac-fot"} - } - barrel{ - dnam{"fat"} - one{"{0} fat"} - other{"{0} fat"} - } bushel{ dnam{"bushels"} - one{"{0} bu"} - other{"{0} bu"} - } - centiliter{ - dnam{"cl"} - one{"{0} cl"} - other{"{0} cl"} - } - cubic-centimeter{ - dnam{"cm³"} - one{"{0} cm³"} - other{"{0} cm³"} - per{"{0}/cm³"} - } - cubic-foot{ - dnam{"fot³"} - one{"{0} fot³"} - other{"{0} fot³"} } cubic-inch{ dnam{"tommar³"} @@ -1938,40 +620,20 @@ nn{ } cubic-kilometer{ dnam{"kubikkilometer"} - one{"{0} km³"} - other{"{0} km³"} - } - cubic-meter{ - dnam{"m³"} - one{"{0} m³"} - other{"{0} m³"} - per{"{0}/m³"} } cubic-mile{ dnam{"engelske mil³"} one{"{0} mi³"} other{"{0} mi³"} } - cubic-yard{ - dnam{"yard³"} - one{"{0} yard³"} - other{"{0} yard³"} - } cup{ dnam{"koppar"} - one{"{0} k"} - other{"{0} k"} } cup-metric{ dnam{"m. koppar"} one{"{0} m. kopp"} other{"{0} m. koppar"} } - deciliter{ - dnam{"dl"} - one{"{0} dl"} - other{"{0} dl"} - } dessert-spoon{ dnam{"dsskei"} one{"{0} dsskei"} @@ -1985,91 +647,22 @@ nn{ drop{ dnam{"drope"} one{"{0} drope"} - other{"{0} drop"} - } - fluid-ounce{ - dnam{"væskeunse"} - one{"{0} fl oz"} - other{"{0} fl oz"} + other{"{0} dråpe"} } fluid-ounce-imperial{ dnam{"britisk væskeunse"} one{"{0} britisk væskeunse"} other{"{0} britiske væskeunser"} } - gallon{ - dnam{"gal"} - one{"{0} gal"} - other{"{0} gal"} - per{"{0}/gal"} - } - gallon-imperial{ - dnam{"brit. gal"} - one{"{0} brit. gal"} - other{"{0} brit. gal"} - per{"{0}/brit. gal"} - } - hectoliter{ - dnam{"hl"} - one{"{0} hl"} - other{"{0} hl"} - } - jigger{ - dnam{"shot"} - one{"{0} shot"} - other{"{0} jigger"} - } - liter{ - dnam{"liter"} - one{"{0} l"} - other{"{0} l"} - per{"{0}/l"} - } - megaliter{ - dnam{"Ml"} - one{"{0} Ml"} - other{"{0} Ml"} - } - milliliter{ - dnam{"ml"} - one{"{0} ml"} - other{"{0} ml"} - } - pinch{ - dnam{"klype"} - one{"{0} klype"} - other{"{0} pinch"} - } pint{ - dnam{"pint"} one{"{0} pt"} other{"{0} pt"} } - pint-metric{ - dnam{"mpt"} - one{"{0} mpt"} - other{"{0} mpt"} - } - quart{ - dnam{"qt"} - one{"{0} qt"} - other{"{0} qt"} - } quart-imperial{ dnam{"brit. quart"} one{"{0} b. quart"} other{"{0} b. quart"} } - tablespoon{ - dnam{"ss"} - one{"{0} ss"} - other{"{0} ss"} - } - teaspoon{ - dnam{"ts"} - one{"{0} ts"} - other{"{0} ts"} - } } } } diff --git a/icu4c/source/data/unit/no.txt b/icu4c/source/data/unit/no.txt index 331ec2f6bfc..47ae9a4e58b 100644 --- a/icu4c/source/data/unit/no.txt +++ b/icu4c/source/data/unit/no.txt @@ -180,7 +180,7 @@ no{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram per desiliter"} one{"{0} milligram per desiliter"} other{"{0} milligram per desiliter"} @@ -1175,7 +1175,7 @@ no{ 10p-21{"z{0}"} 10p-24{"y{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} 10p1{"da{0}"} 10p12{"T{0}"} @@ -1314,8 +1314,8 @@ no{ other{"{0}m"} } micrometer{ - one{"{0}µm"} - other{"{0}µm"} + one{"{0}μm"} + other{"{0}μm"} } mile{ dnam{"mile"} @@ -1373,8 +1373,8 @@ no{ other{"{0}t"} } microgram{ - one{"{0}µg"} - other{"{0}µg"} + one{"{0}μg"} + other{"{0}μg"} } milligram{ one{"{0}mg"} @@ -1581,7 +1581,7 @@ no{ 10p-21{"z{0}"} 10p-24{"y{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} 10p1{"da{0}"} 10p12{"T{0}"} @@ -1601,7 +1601,7 @@ no{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1974,9 +1974,9 @@ no{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"miles"} @@ -2081,9 +2081,9 @@ no{ other{"{0} tonn"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/no_NO.txt b/icu4c/source/data/unit/no_NO.txt index 9de87e3d165..6613a86c4e6 100644 --- a/icu4c/source/data/unit/no_NO.txt +++ b/icu4c/source/data/unit/no_NO.txt @@ -1,9 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ no_NO{ - ___{""} + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/unit/no_SJ.txt b/icu4c/source/data/unit/no_SJ.txt deleted file mode 100644 index 42b03fcf8d0..00000000000 --- a/icu4c/source/data/unit/no_SJ.txt +++ /dev/null @@ -1,9 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ -no_SJ{ - ___{""} -} diff --git a/icu4c/source/data/zone/LOCALE_DEPS.json b/icu4c/source/data/zone/LOCALE_DEPS.json index f737ebe3754..606469a66a5 100644 --- a/icu4c/source/data/zone/LOCALE_DEPS.json +++ b/icu4c/source/data/zone/LOCALE_DEPS.json @@ -21,9 +21,7 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "nb": "no", - "nb_NO": "no_NO", - "nb_SJ": "no_SJ", + "no_NO": "no", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -178,6 +176,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nb": "no", "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", diff --git a/icu4c/source/data/zone/nb.txt b/icu4c/source/data/zone/nb.txt index 934f064b8be..67eb7b42784 100644 --- a/icu4c/source/data/zone/nb.txt +++ b/icu4c/source/data/zone/nb.txt @@ -2,5 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - "%%ALIAS"{"no"} + %%Parent{"no"} } diff --git a/icu4c/source/data/zone/nb_NO.txt b/icu4c/source/data/zone/nb_NO.txt deleted file mode 100644 index 2de7860c57e..00000000000 --- a/icu4c/source/data/zone/nb_NO.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_NO{ - "%%ALIAS"{"no_NO"} -} diff --git a/icu4c/source/data/zone/nb_SJ.txt b/icu4c/source/data/zone/nb_SJ.txt deleted file mode 100644 index b1caa388a5d..00000000000 --- a/icu4c/source/data/zone/nb_SJ.txt +++ /dev/null @@ -1,6 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -nb_SJ{ - "%%ALIAS"{"no_SJ"} -} diff --git a/icu4c/source/data/zone/nn.txt b/icu4c/source/data/zone/nn.txt index 4c1fe9ef8e9..51c1b5e1d09 100644 --- a/icu4c/source/data/zone/nn.txt +++ b/icu4c/source/data/zone/nn.txt @@ -4,1304 +4,63 @@ nn{ %%Parent{"no"} zoneStrings{ - "Africa:Abidjan"{ - ec{"Abidjan"} - } - "Africa:Accra"{ - ec{"Accra"} - } - "Africa:Addis_Ababa"{ - ec{"Addis Abeba"} - } - "Africa:Algiers"{ - ec{"Alger"} - } - "Africa:Asmera"{ - ec{"Asmara"} - } - "Africa:Bamako"{ - ec{"Bamako"} - } - "Africa:Bangui"{ - ec{"Bangui"} - } - "Africa:Banjul"{ - ec{"Banjul"} - } - "Africa:Bissau"{ - ec{"Bissau"} - } - "Africa:Blantyre"{ - ec{"Blantyre"} - } - "Africa:Brazzaville"{ - ec{"Brazzaville"} - } - "Africa:Bujumbura"{ - ec{"Bujumbura"} - } - "Africa:Cairo"{ - ec{"Kairo"} - } - "Africa:Casablanca"{ - ec{"Casablanca"} - } - "Africa:Ceuta"{ - ec{"Ceuta"} - } - "Africa:Conakry"{ - ec{"Conakry"} - } - "Africa:Dakar"{ - ec{"Dakar"} - } - "Africa:Dar_es_Salaam"{ - ec{"Dar-es-Salaam"} - } - "Africa:Djibouti"{ - ec{"Djibouti"} - } - "Africa:Douala"{ - ec{"Douala"} - } - "Africa:El_Aaiun"{ - ec{"El Aaiún"} - } - "Africa:Freetown"{ - ec{"Freetown"} - } - "Africa:Gaborone"{ - ec{"Gaborone"} - } - "Africa:Harare"{ - ec{"Harare"} - } - "Africa:Johannesburg"{ - ec{"Johannesburg"} - } - "Africa:Juba"{ - ec{"Juba"} - } - "Africa:Kampala"{ - ec{"Kampala"} - } - "Africa:Khartoum"{ - ec{"Khartoum"} - } - "Africa:Kigali"{ - ec{"Kigali"} - } - "Africa:Kinshasa"{ - ec{"Kinshasa"} - } - "Africa:Lagos"{ - ec{"Lagos"} - } - "Africa:Libreville"{ - ec{"Libreville"} - } - "Africa:Lome"{ - ec{"Lomé"} - } - "Africa:Luanda"{ - ec{"Luanda"} - } - "Africa:Lubumbashi"{ - ec{"Lubumbashi"} - } - "Africa:Lusaka"{ - ec{"Lusaka"} - } - "Africa:Malabo"{ - ec{"Malabo"} - } - "Africa:Maputo"{ - ec{"Maputo"} - } - "Africa:Maseru"{ - ec{"Maseru"} - } - "Africa:Mbabane"{ - ec{"Mbabane"} - } - "Africa:Mogadishu"{ - ec{"Mogadishu"} - } - "Africa:Monrovia"{ - ec{"Monrovia"} - } - "Africa:Nairobi"{ - ec{"Nairobi"} - } - "Africa:Ndjamena"{ - ec{"Ndjamena"} - } - "Africa:Niamey"{ - ec{"Niamey"} - } - "Africa:Nouakchott"{ - ec{"Nouakchott"} - } - "Africa:Ouagadougou"{ - ec{"Ouagadougou"} - } - "Africa:Porto-Novo"{ - ec{"Porto-Novo"} - } - "Africa:Sao_Tome"{ - ec{"São Tomé"} - } - "Africa:Tripoli"{ - ec{"Tripoli"} - } - "Africa:Tunis"{ - ec{"Tunis"} - } - "Africa:Windhoek"{ - ec{"Windhoek"} - } - "America:Adak"{ - ec{"Adak"} - } - "America:Anchorage"{ - ec{"Anchorage"} - } - "America:Anguilla"{ - ec{"Anguilla"} - } - "America:Antigua"{ - ec{"Antigua"} - } - "America:Araguaina"{ - ec{"Araguaína"} - } - "America:Argentina:La_Rioja"{ - ec{"La Rioja"} - } - "America:Argentina:Rio_Gallegos"{ - ec{"Rio Gallegos"} - } - "America:Argentina:Salta"{ - ec{"Salta"} - } - "America:Argentina:San_Juan"{ - ec{"San Juan"} - } - "America:Argentina:San_Luis"{ - ec{"San Luis"} - } - "America:Argentina:Tucuman"{ - ec{"Tucumán"} - } - "America:Argentina:Ushuaia"{ - ec{"Ushuaia"} - } - "America:Aruba"{ - ec{"Aruba"} - } - "America:Asuncion"{ - ec{"Asunción"} - } - "America:Bahia"{ - ec{"Bahia"} - } - "America:Bahia_Banderas"{ - ec{"Bahía Banderas"} - } - "America:Barbados"{ - ec{"Barbados"} - } - "America:Belem"{ - ec{"Belém"} - } - "America:Belize"{ - ec{"Belize"} - } - "America:Blanc-Sablon"{ - ec{"Blanc-Sablon"} - } - "America:Boa_Vista"{ - ec{"Boa Vista"} - } - "America:Bogota"{ - ec{"Bogotá"} - } - "America:Boise"{ - ec{"Boise"} - } - "America:Buenos_Aires"{ - ec{"Buenos Aires"} - } - "America:Cambridge_Bay"{ - ec{"Cambridge Bay"} - } - "America:Campo_Grande"{ - ec{"Campo Grande"} - } - "America:Cancun"{ - ec{"Cancún"} - } - "America:Caracas"{ - ec{"Caracas"} - } - "America:Catamarca"{ - ec{"Catamarca"} - } - "America:Cayenne"{ - ec{"Cayenne"} - } "America:Cayman"{ ec{"Caymanøyane"} } - "America:Chicago"{ - ec{"Chicago"} - } - "America:Chihuahua"{ - ec{"Chihuahua"} - } - "America:Coral_Harbour"{ - ec{"Atikokan"} - } - "America:Cordoba"{ - ec{"Córdoba"} - } - "America:Costa_Rica"{ - ec{"Costa Rica"} - } - "America:Creston"{ - ec{"Creston"} - } "America:Cuiaba"{ ec{"Cuiaba"} } - "America:Curacao"{ - ec{"Curaçao"} - } - "America:Danmarkshavn"{ - ec{"Danmarkshavn"} - } - "America:Dawson"{ - ec{"Dawson"} - } - "America:Dawson_Creek"{ - ec{"Dawson Creek"} - } - "America:Denver"{ - ec{"Denver"} - } - "America:Detroit"{ - ec{"Detroit"} - } - "America:Dominica"{ - ec{"Dominica"} - } - "America:Edmonton"{ - ec{"Edmonton"} - } - "America:Eirunepe"{ - ec{"Eirunepe"} - } - "America:El_Salvador"{ - ec{"El Salvador"} - } - "America:Fort_Nelson"{ - ec{"Fort Nelson"} - } - "America:Fortaleza"{ - ec{"Fortaleza"} - } - "America:Glace_Bay"{ - ec{"Glace Bay"} - } - "America:Godthab"{ - ec{"Nuuk"} - } - "America:Goose_Bay"{ - ec{"Goose Bay"} - } - "America:Grand_Turk"{ - ec{"Grand Turk"} - } - "America:Grenada"{ - ec{"Grenada"} - } - "America:Guadeloupe"{ - ec{"Guadeloupe"} - } - "America:Guatemala"{ - ec{"Guatemala"} - } - "America:Guayaquil"{ - ec{"Guayaquil"} - } - "America:Guyana"{ - ec{"Guyana"} - } - "America:Halifax"{ - ec{"Halifax"} - } - "America:Havana"{ - ec{"Havana"} - } - "America:Hermosillo"{ - ec{"Hermosillo"} - } - "America:Indiana:Knox"{ - ec{"Knox, Indiana"} - } - "America:Indiana:Marengo"{ - ec{"Marengo, Indiana"} - } - "America:Indiana:Petersburg"{ - ec{"Petersburg, Indiana"} - } - "America:Indiana:Tell_City"{ - ec{"Tell City, Indiana"} - } - "America:Indiana:Vevay"{ - ec{"Vevay, Indiana"} - } - "America:Indiana:Vincennes"{ - ec{"Vincennes, Indiana"} - } - "America:Indiana:Winamac"{ - ec{"Winamac, Indiana"} - } - "America:Indianapolis"{ - ec{"Indianapolis"} - } - "America:Inuvik"{ - ec{"Inuvik"} - } - "America:Iqaluit"{ - ec{"Iqaluit"} - } - "America:Jamaica"{ - ec{"Jamaica"} - } - "America:Jujuy"{ - ec{"Jujuy"} - } - "America:Juneau"{ - ec{"Juneau"} - } - "America:Kentucky:Monticello"{ - ec{"Monticello, Kentucky"} - } - "America:Kralendijk"{ - ec{"Kralendijk"} - } - "America:La_Paz"{ - ec{"La Paz"} - } - "America:Lima"{ - ec{"Lima"} - } - "America:Los_Angeles"{ - ec{"Los Angeles"} - } - "America:Louisville"{ - ec{"Louisville"} - } - "America:Lower_Princes"{ - ec{"Lower Prince’s Quarter"} - } - "America:Maceio"{ - ec{"Maceió"} - } - "America:Managua"{ - ec{"Managua"} - } - "America:Manaus"{ - ec{"Manaus"} - } - "America:Marigot"{ - ec{"Marigot"} - } - "America:Martinique"{ - ec{"Martinique"} - } - "America:Matamoros"{ - ec{"Matamoros"} - } - "America:Mazatlan"{ - ec{"Mazatlan"} - } - "America:Mendoza"{ - ec{"Mendoza"} - } - "America:Menominee"{ - ec{"Menominee"} - } "America:Merida"{ ec{"Merida"} } - "America:Metlakatla"{ - ec{"Metlakatla"} - } - "America:Mexico_City"{ - ec{"Mexico by"} - } - "America:Miquelon"{ - ec{"Miquelon"} - } - "America:Moncton"{ - ec{"Moncton"} - } - "America:Monterrey"{ - ec{"Monterrey"} - } - "America:Montevideo"{ - ec{"Montevideo"} - } - "America:Montserrat"{ - ec{"Montserrat"} - } - "America:Nassau"{ - ec{"Nassau"} - } - "America:New_York"{ - ec{"New York"} - } - "America:Nipigon"{ - ec{"Nipigon"} - } - "America:Nome"{ - ec{"Nome"} - } - "America:Noronha"{ - ec{"Noronha"} - } - "America:North_Dakota:Beulah"{ - ec{"Beulah, Nord-Dakota"} - } - "America:North_Dakota:Center"{ - ec{"Center, Nord-Dakota"} - } - "America:North_Dakota:New_Salem"{ - ec{"New Salem, Nord-Dakota"} - } - "America:Ojinaga"{ - ec{"Ojinaga"} - } - "America:Panama"{ - ec{"Panama"} - } - "America:Pangnirtung"{ - ec{"Pangnirtung"} - } - "America:Paramaribo"{ - ec{"Paramaribo"} - } - "America:Phoenix"{ - ec{"Phoenix"} - } - "America:Port-au-Prince"{ - ec{"Port-au-Prince"} - } - "America:Port_of_Spain"{ - ec{"Port of Spain"} - } - "America:Porto_Velho"{ - ec{"Porto Velho"} - } - "America:Puerto_Rico"{ - ec{"Puerto Rico"} - } - "America:Punta_Arenas"{ - ec{"Punta Arenas"} - } - "America:Rainy_River"{ - ec{"Rainy River"} - } - "America:Rankin_Inlet"{ - ec{"Rankin Inlet"} - } - "America:Recife"{ - ec{"Recife"} - } - "America:Regina"{ - ec{"Regina"} - } - "America:Resolute"{ - ec{"Resolute"} - } - "America:Rio_Branco"{ - ec{"Rio Branco"} - } - "America:Santarem"{ - ec{"Santarém"} - } - "America:Santiago"{ - ec{"Santiago"} - } - "America:Santo_Domingo"{ - ec{"Santo Domingo"} - } - "America:Sao_Paulo"{ - ec{"São Paulo"} - } - "America:Scoresbysund"{ - ec{"Ittoqqortoormiit"} - } - "America:Sitka"{ - ec{"Sitka"} - } - "America:St_Barthelemy"{ - ec{"Saint-Barthélemy"} - } - "America:St_Johns"{ - ec{"St. John’s"} - } - "America:St_Kitts"{ - ec{"St. Kitts"} - } - "America:St_Lucia"{ - ec{"St. Lucia"} - } - "America:St_Thomas"{ - ec{"St. Thomas"} - } - "America:St_Vincent"{ - ec{"St. Vincent"} - } - "America:Swift_Current"{ - ec{"Swift Current"} - } - "America:Tegucigalpa"{ - ec{"Tegucigalpa"} - } - "America:Thule"{ - ec{"Thule"} - } - "America:Thunder_Bay"{ - ec{"Thunder Bay"} - } - "America:Tijuana"{ - ec{"Tijuana"} - } - "America:Toronto"{ - ec{"Toronto"} - } - "America:Tortola"{ - ec{"Tortola"} - } - "America:Vancouver"{ - ec{"Vancouver"} - } - "America:Whitehorse"{ - ec{"Whitehorse"} - } - "America:Winnipeg"{ - ec{"Winnipeg"} - } - "America:Yakutat"{ - ec{"Yakutat"} - } - "America:Yellowknife"{ - ec{"Yellowknife"} - } - "Antarctica:Casey"{ - ec{"Casey"} - } - "Antarctica:Davis"{ - ec{"Davis"} - } - "Antarctica:DumontDUrville"{ - ec{"Dumont d’Urville"} - } - "Antarctica:Macquarie"{ - ec{"Macquarie"} - } - "Antarctica:Mawson"{ - ec{"Mawson"} - } - "Antarctica:McMurdo"{ - ec{"McMurdo"} - } - "Antarctica:Palmer"{ - ec{"Palmer"} - } - "Antarctica:Rothera"{ - ec{"Rothera"} - } - "Antarctica:Syowa"{ - ec{"Syowa"} - } - "Antarctica:Troll"{ - ec{"Troll"} - } - "Antarctica:Vostok"{ - ec{"Vostok"} - } - "Arctic:Longyearbyen"{ - ec{"Longyearbyen"} - } - "Asia:Aden"{ - ec{"Aden"} - } - "Asia:Almaty"{ - ec{"Almaty"} - } - "Asia:Amman"{ - ec{"Amman"} - } - "Asia:Anadyr"{ - ec{"Anadyr"} - } - "Asia:Aqtau"{ - ec{"Aktau"} - } "Asia:Aqtobe"{ ec{"Aktobe"} } "Asia:Ashgabat"{ ec{"Asjgabat"} } - "Asia:Atyrau"{ - ec{"Atyrau"} - } - "Asia:Baghdad"{ - ec{"Bagdad"} - } - "Asia:Bahrain"{ - ec{"Bahrain"} - } - "Asia:Baku"{ - ec{"Baku"} - } - "Asia:Bangkok"{ - ec{"Bangkok"} - } - "Asia:Barnaul"{ - ec{"Barnaul"} - } - "Asia:Beirut"{ - ec{"Beirut"} - } - "Asia:Bishkek"{ - ec{"Bisjkek"} - } - "Asia:Brunei"{ - ec{"Brunei"} - } - "Asia:Calcutta"{ - ec{"Kolkata"} - } - "Asia:Chita"{ - ec{"Tsjita"} - } "Asia:Choibalsan"{ ec{"Tsjojbalsan"} } - "Asia:Colombo"{ - ec{"Colombo"} - } - "Asia:Damascus"{ - ec{"Damaskus"} - } - "Asia:Dhaka"{ - ec{"Dhaka"} - } - "Asia:Dili"{ - ec{"Dili"} - } - "Asia:Dubai"{ - ec{"Dubai"} - } - "Asia:Dushanbe"{ - ec{"Dusjanbe"} - } - "Asia:Famagusta"{ - ec{"Famagusta"} - } - "Asia:Gaza"{ - ec{"Gaza"} - } - "Asia:Hebron"{ - ec{"Hebron"} - } - "Asia:Hong_Kong"{ - ec{"Hongkong"} - } "Asia:Hovd"{ ec{"Khovd"} } - "Asia:Irkutsk"{ - ec{"Irkutsk"} - } - "Asia:Jakarta"{ - ec{"Jakarta"} - } - "Asia:Jayapura"{ - ec{"Jajapura"} - } - "Asia:Jerusalem"{ - ec{"Jerusalem"} - } - "Asia:Kabul"{ - ec{"Kabul"} - } - "Asia:Kamchatka"{ - ec{"Kamtsjatka"} - } - "Asia:Karachi"{ - ec{"Karachi"} - } - "Asia:Katmandu"{ - ec{"Katmandu"} - } - "Asia:Khandyga"{ - ec{"Khandyga"} - } - "Asia:Krasnoyarsk"{ - ec{"Krasnojarsk"} - } - "Asia:Kuala_Lumpur"{ - ec{"Kuala Lumpur"} - } - "Asia:Kuching"{ - ec{"Kuching"} - } - "Asia:Kuwait"{ - ec{"Kuwait"} - } - "Asia:Macau"{ - ec{"Macao"} - } - "Asia:Magadan"{ - ec{"Magadan"} - } - "Asia:Makassar"{ - ec{"Makassar"} - } - "Asia:Manila"{ - ec{"Manila"} - } - "Asia:Muscat"{ - ec{"Muskat"} - } - "Asia:Nicosia"{ - ec{"Nikosia"} - } - "Asia:Novokuznetsk"{ - ec{"Novokuznetsk"} - } - "Asia:Novosibirsk"{ - ec{"Novosibirsk"} - } - "Asia:Omsk"{ - ec{"Omsk"} - } - "Asia:Oral"{ - ec{"Oral"} - } - "Asia:Phnom_Penh"{ - ec{"Phnom Penh"} - } - "Asia:Pontianak"{ - ec{"Pontianak"} - } - "Asia:Pyongyang"{ - ec{"Pyongyang"} - } - "Asia:Qatar"{ - ec{"Qatar"} - } - "Asia:Qostanay"{ - ec{"Kostanaj"} - } - "Asia:Qyzylorda"{ - ec{"Kyzylorda"} - } "Asia:Rangoon"{ ec{"Yangôn"} } - "Asia:Riyadh"{ - ec{"Riyadh"} - } - "Asia:Saigon"{ - ec{"Ho Chi Minh-byen"} - } - "Asia:Sakhalin"{ - ec{"Sakhalin"} - } - "Asia:Samarkand"{ - ec{"Samarkand"} - } - "Asia:Seoul"{ - ec{"Seoul"} - } - "Asia:Shanghai"{ - ec{"Shanghai"} - } - "Asia:Singapore"{ - ec{"Singapore"} - } - "Asia:Srednekolymsk"{ - ec{"Srednekolymsk"} - } - "Asia:Taipei"{ - ec{"Taipei"} - } - "Asia:Tashkent"{ - ec{"Tasjkent"} - } - "Asia:Tbilisi"{ - ec{"Tbilisi"} - } - "Asia:Tehran"{ - ec{"Teheran"} - } - "Asia:Thimphu"{ - ec{"Thimpu"} - } - "Asia:Tokyo"{ - ec{"Tokyo"} - } - "Asia:Tomsk"{ - ec{"Tomsk"} - } - "Asia:Ulaanbaatar"{ - ec{"Ulan Bator"} - } - "Asia:Urumqi"{ - ec{"Ürümqi"} - } - "Asia:Ust-Nera"{ - ec{"Ust-Nera"} - } - "Asia:Vientiane"{ - ec{"Vientiane"} - } - "Asia:Vladivostok"{ - ec{"Vladivostok"} - } - "Asia:Yakutsk"{ - ec{"Jakutsk"} - } - "Asia:Yekaterinburg"{ - ec{"Jekaterinburg"} - } - "Asia:Yerevan"{ - ec{"Jerevan"} - } "Atlantic:Azores"{ ec{"Asorane"} } - "Atlantic:Bermuda"{ - ec{"Bermuda"} - } "Atlantic:Canary"{ ec{"Kanariøyane"} } - "Atlantic:Cape_Verde"{ - ec{"Kapp Verde"} - } "Atlantic:Faeroe"{ ec{"Færøyane"} } - "Atlantic:Madeira"{ - ec{"Madeira"} - } - "Atlantic:Reykjavik"{ - ec{"Reykjavík"} - } - "Atlantic:South_Georgia"{ - ec{"Sør-Georgia"} - } - "Atlantic:St_Helena"{ - ec{"St. Helena"} - } - "Atlantic:Stanley"{ - ec{"Stanley"} - } - "Australia:Adelaide"{ - ec{"Adelaide"} - } - "Australia:Brisbane"{ - ec{"Brisbane"} - } - "Australia:Broken_Hill"{ - ec{"Broken Hill"} - } - "Australia:Currie"{ - ec{"Currie"} - } - "Australia:Darwin"{ - ec{"Darwin"} - } - "Australia:Eucla"{ - ec{"Eucla"} - } - "Australia:Hobart"{ - ec{"Hobart"} - } - "Australia:Lindeman"{ - ec{"Lindeman"} - } - "Australia:Lord_Howe"{ - ec{"Lord Howe"} - } - "Australia:Melbourne"{ - ec{"Melbourne"} - } - "Australia:Perth"{ - ec{"Perth"} - } - "Australia:Sydney"{ - ec{"Sydney"} - } - "Etc:UTC"{ - ls{"koordinert universaltid"} - } "Etc:Unknown"{ ec{"ukjend by"} } - "Europe:Amsterdam"{ - ec{"Amsterdam"} - } - "Europe:Andorra"{ - ec{"Andorra"} - } - "Europe:Astrakhan"{ - ec{"Astrakhan"} - } - "Europe:Athens"{ - ec{"Athen"} - } - "Europe:Belgrade"{ - ec{"Beograd"} - } - "Europe:Berlin"{ - ec{"Berlin"} - } - "Europe:Bratislava"{ - ec{"Bratislava"} - } - "Europe:Brussels"{ - ec{"Brussel"} - } - "Europe:Bucharest"{ - ec{"București"} - } - "Europe:Budapest"{ - ec{"Budapest"} - } - "Europe:Busingen"{ - ec{"Büsingen"} - } - "Europe:Chisinau"{ - ec{"Chișinău"} - } - "Europe:Copenhagen"{ - ec{"København"} - } "Europe:Dublin"{ - ec{"Dublin"} ld{"irsk sommartid"} } - "Europe:Gibraltar"{ - ec{"Gibraltar"} - } - "Europe:Guernsey"{ - ec{"Guernsey"} - } - "Europe:Helsinki"{ - ec{"Helsingfors"} - } - "Europe:Isle_of_Man"{ - ec{"Man"} - } - "Europe:Istanbul"{ - ec{"Istanbul"} - } - "Europe:Jersey"{ - ec{"Jersey"} - } - "Europe:Kaliningrad"{ - ec{"Kaliningrad"} - } - "Europe:Kiev"{ - ec{"Kiev"} - } - "Europe:Kirov"{ - ec{"Kirov"} - } - "Europe:Lisbon"{ - ec{"Lisboa"} - } - "Europe:Ljubljana"{ - ec{"Ljubljana"} - } "Europe:London"{ - ec{"London"} ld{"britisk sommartid"} } - "Europe:Luxembourg"{ - ec{"Luxemburg"} - } - "Europe:Madrid"{ - ec{"Madrid"} - } - "Europe:Malta"{ - ec{"Malta"} - } - "Europe:Mariehamn"{ - ec{"Mariehamn"} - } - "Europe:Minsk"{ - ec{"Minsk"} - } - "Europe:Monaco"{ - ec{"Monaco"} - } - "Europe:Moscow"{ - ec{"Moskva"} - } - "Europe:Oslo"{ - ec{"Oslo"} - } - "Europe:Paris"{ - ec{"Paris"} - } - "Europe:Podgorica"{ - ec{"Podgorica"} - } - "Europe:Prague"{ - ec{"Praha"} - } - "Europe:Riga"{ - ec{"Riga"} - } - "Europe:Rome"{ - ec{"Roma"} - } - "Europe:Samara"{ - ec{"Samara"} - } - "Europe:San_Marino"{ - ec{"San Marino"} - } - "Europe:Sarajevo"{ - ec{"Sarajevo"} - } - "Europe:Saratov"{ - ec{"Saratov"} - } - "Europe:Simferopol"{ - ec{"Simferopol"} - } - "Europe:Skopje"{ - ec{"Skopje"} - } - "Europe:Sofia"{ - ec{"Sofia"} - } - "Europe:Stockholm"{ - ec{"Stockholm"} - } - "Europe:Tallinn"{ - ec{"Tallinn"} - } - "Europe:Tirane"{ - ec{"Tirana"} - } - "Europe:Ulyanovsk"{ - ec{"Uljanovsk"} - } - "Europe:Uzhgorod"{ - ec{"Uzjhorod"} - } - "Europe:Vaduz"{ - ec{"Vaduz"} - } - "Europe:Vatican"{ - ec{"Vatikanstaten"} - } - "Europe:Vienna"{ - ec{"Wien"} - } - "Europe:Vilnius"{ - ec{"Vilnius"} - } - "Europe:Volgograd"{ - ec{"Volgograd"} - } - "Europe:Warsaw"{ - ec{"Warszawa"} - } - "Europe:Zagreb"{ - ec{"Zagreb"} - } - "Europe:Zaporozhye"{ - ec{"Zaporizjzja"} - } - "Europe:Zurich"{ - ec{"Zürich"} - } - "Indian:Antananarivo"{ - ec{"Antananarivo"} - } - "Indian:Chagos"{ - ec{"Chagos"} - } - "Indian:Christmas"{ - ec{"Christmasøya"} - } "Indian:Cocos"{ ec{"Kokosøyane"} } "Indian:Comoro"{ ec{"Komorane"} } - "Indian:Kerguelen"{ - ec{"Kerguelen"} - } - "Indian:Mahe"{ - ec{"Mahé"} - } "Indian:Maldives"{ ec{"Maldivane"} } - "Indian:Mauritius"{ - ec{"Mauritius"} - } - "Indian:Mayotte"{ - ec{"Mayotte"} - } - "Indian:Reunion"{ - ec{"Réunion"} - } - "Pacific:Apia"{ - ec{"Apia"} - } - "Pacific:Auckland"{ - ec{"Auckland"} - } - "Pacific:Bougainville"{ - ec{"Bougainville"} - } - "Pacific:Chatham"{ - ec{"Chatham"} - } - "Pacific:Easter"{ - ec{"Påskeøya"} - } - "Pacific:Efate"{ - ec{"Efate"} - } - "Pacific:Enderbury"{ - ec{"Enderbury"} - } - "Pacific:Fakaofo"{ - ec{"Fakaofo"} - } - "Pacific:Fiji"{ - ec{"Fiji"} - } - "Pacific:Funafuti"{ - ec{"Funafuti"} - } "Pacific:Galapagos"{ ec{"Galápagosøyane"} } - "Pacific:Gambier"{ - ec{"Gambier"} - } - "Pacific:Guadalcanal"{ - ec{"Guadalcanal"} - } - "Pacific:Guam"{ - ec{"Guam"} - } - "Pacific:Honolulu"{ - ec{"Honolulu"} - } - "Pacific:Johnston"{ - ec{"Johnston"} - } - "Pacific:Kiritimati"{ - ec{"Kiritimati"} - } - "Pacific:Kosrae"{ - ec{"Kosrae"} - } - "Pacific:Kwajalein"{ - ec{"Kwajalein"} - } - "Pacific:Majuro"{ - ec{"Majuro"} - } - "Pacific:Marquesas"{ - ec{"Marquesas"} - } - "Pacific:Midway"{ - ec{"Midway"} - } - "Pacific:Nauru"{ - ec{"Nauru"} - } - "Pacific:Niue"{ - ec{"Niue"} - } - "Pacific:Norfolk"{ - ec{"Norfolkøya"} - } - "Pacific:Noumea"{ - ec{"Nouméa"} - } - "Pacific:Pago_Pago"{ - ec{"Pago Pago"} - } - "Pacific:Palau"{ - ec{"Palau"} - } - "Pacific:Pitcairn"{ - ec{"Pitcairn"} - } - "Pacific:Ponape"{ - ec{"Pohnpei"} - } - "Pacific:Port_Moresby"{ - ec{"Port Moresby"} - } - "Pacific:Rarotonga"{ - ec{"Rarotonga"} - } - "Pacific:Saipan"{ - ec{"Saipan"} - } - "Pacific:Tahiti"{ - ec{"Tahiti"} - } - "Pacific:Tarawa"{ - ec{"Tarawa"} - } - "Pacific:Tongatapu"{ - ec{"Tongatapu"} - } - "Pacific:Truk"{ - ec{"Chuuk"} - } - "Pacific:Wake"{ - ec{"Wake"} - } - "Pacific:Wallis"{ - ec{"Wallis"} - } - "meta:Afghanistan"{ - ls{"afghansk tid"} - } - "meta:Africa_Central"{ - ls{"sentralafrikansk tid"} - } "meta:Africa_Eastern"{ ls{"austafrikansk tid"} } - "meta:Africa_Southern"{ - ls{"sørafrikansk tid"} - } "meta:Africa_Western"{ ld{"vestafrikansk sommartid"} lg{"vestafrikansk tid"} @@ -1402,28 +161,16 @@ nn{ lg{"bangladeshisk tid"} ls{"bangladeshisk normaltid"} } - "meta:Bhutan"{ - ls{"bhutansk tid"} - } - "meta:Bolivia"{ - ls{"boliviansk tid"} - } "meta:Brasilia"{ ld{"sommartid for Brasilia"} lg{"tidssone for Brasilia"} ls{"normaltid for Brasilia"} } - "meta:Brunei"{ - ls{"tidssone for Brunei Darussalam"} - } "meta:Cape_Verde"{ ld{"kappverdisk sommartid"} lg{"kappverdisk tid"} ls{"kappverdisk normaltid"} } - "meta:Chamorro"{ - ls{"tidssone for Chamorro"} - } "meta:Chatham"{ ld{"sommartid for Chatham"} lg{"tidssone for Chatham"} @@ -1444,9 +191,6 @@ nn{ lg{"tidssone for Tsjojbalsan"} ls{"normaltid for Tsjojbalsan"} } - "meta:Christmas"{ - ls{"tidssone for Christmasøya"} - } "meta:Cocos"{ ls{"tidssone for Kokosøyane"} } @@ -1465,9 +209,6 @@ nn{ lg{"kubansk tid"} ls{"kubansk normaltid"} } - "meta:Davis"{ - ls{"tidssone for Davis"} - } "meta:DumontDUrville"{ ls{"tidssone for Dumont-d’Urville"} } @@ -1479,24 +220,15 @@ nn{ lg{"tidssone for Påskeøya"} ls{"normaltid for Påskeøya"} } - "meta:Ecuador"{ - ls{"ecuadoriansk tid"} - } "meta:Europe_Central"{ ld{"sentraleuropeisk sommartid"} lg{"sentraleuropeisk tid"} ls{"sentraleuropeisk standardtid"} - sd{"CEST"} - sg{"CET"} - ss{"CET"} } "meta:Europe_Eastern"{ ld{"austeuropeisk sommartid"} lg{"austeuropeisk tid"} ls{"austeuropeisk standardtid"} - sd{"EEST"} - sg{"EET"} - ss{"EET"} } "meta:Europe_Further_Eastern"{ ls{"fjern-austeuropeisk tid"} @@ -1505,9 +237,6 @@ nn{ ld{"vesteuropeisk sommartid"} lg{"vesteuropeisk tid"} ls{"vesteuropeisk standardtid"} - sd{"WEST"} - sg{"WET"} - ss{"WET"} } "meta:Falkland"{ ld{"sommartid for Falklandsøyane"} @@ -1519,22 +248,12 @@ nn{ lg{"fijiansk tid"} ls{"fijiansk normaltid"} } - "meta:French_Guiana"{ - ls{"tidssone for Fransk Guyana"} - } "meta:French_Southern"{ ls{"tidssone for Dei franske sørterritoria"} } - "meta:GMT"{ - ls{"Greenwich middeltid"} - ss{"GMT"} - } "meta:Galapagos"{ ls{"tidssone for Galápagosøyane"} } - "meta:Gambier"{ - ls{"tidssone for Gambier"} - } "meta:Georgia"{ ld{"georgisk sommartid"} lg{"georgisk tid"} @@ -1553,12 +272,6 @@ nn{ lg{"vestgrønlandsk tid"} ls{"vestgrønlandsk normaltid"} } - "meta:Gulf"{ - ls{"tidssone for Persiabukta"} - } - "meta:Guyana"{ - ls{"guyansk tid"} - } "meta:Hawaii_Aleutian"{ ld{"sommartid for Hawaii og Aleutene"} lg{"tidssone for Hawaii og Aleutene"} @@ -1574,24 +287,9 @@ nn{ lg{"tidssone for Khovd"} ls{"normaltid for Khovd"} } - "meta:India"{ - ls{"indisk tid"} - } - "meta:Indian_Ocean"{ - ls{"tidssone for Indiahavet"} - } - "meta:Indochina"{ - ls{"indokinesisk tid"} - } - "meta:Indonesia_Central"{ - ls{"sentralindonesisk tid"} - } "meta:Indonesia_Eastern"{ ls{"austindonesisk tid"} } - "meta:Indonesia_Western"{ - ls{"vestindonesisk tid"} - } "meta:Iran"{ ld{"iransk sommartid"} lg{"iransk tid"} @@ -1615,25 +313,16 @@ nn{ "meta:Kazakhstan_Eastern"{ ls{"austkasakhstansk tid"} } - "meta:Kazakhstan_Western"{ - ls{"vestkasakhstansk tid"} - } "meta:Korea"{ ld{"koreansk sommartid"} lg{"koreansk tid"} ls{"koreansk normaltid"} } - "meta:Kosrae"{ - ls{"tidssone for Kosrae"} - } "meta:Krasnoyarsk"{ ld{"sommartid for Krasnojarsk"} lg{"tidssone for Krasnojarsk"} ls{"normaltid for Krasnojarsk"} } - "meta:Kyrgystan"{ - ls{"kirgisisk tid"} - } "meta:Line_Islands"{ ls{"tidssone for Lineøyane"} } @@ -1642,34 +331,19 @@ nn{ lg{"tidssone for Lord Howe-øya"} ls{"normaltid for Lord Howe-øya"} } - "meta:Macquarie"{ - ls{"tidssone for Macquarieøya"} - } "meta:Magadan"{ ld{"sommartid for Magadan"} lg{"tidssone for Magadan"} ls{"normaltid for Magadan"} } - "meta:Malaysia"{ - ls{"malaysisk tid"} - } - "meta:Maldives"{ - ls{"maldivisk tid"} - } "meta:Marquesas"{ ls{"tidssone for Marquesasøyane"} } - "meta:Marshall_Islands"{ - ls{"marshallesisk tid"} - } "meta:Mauritius"{ ld{"mauritisk sommartid"} lg{"mauritisk tid"} ls{"mauritisk normaltid"} } - "meta:Mawson"{ - ls{"tidssone for Mawson"} - } "meta:Mexico_Northwest"{ ld{"sommartid for nordvestlege Mexico"} lg{"tidssone for nordvestlege Mexico"} @@ -1690,15 +364,6 @@ nn{ lg{"tidssone for Moskva"} ls{"normaltid for Moskva"} } - "meta:Myanmar"{ - ls{"myanmarsk tid"} - } - "meta:Nauru"{ - ls{"naurisk tid"} - } - "meta:Nepal"{ - ls{"nepalsk tid"} - } "meta:New_Caledonia"{ ld{"kaledonsk sommartid"} lg{"kaledonsk tid"} @@ -1714,9 +379,6 @@ nn{ lg{"tidssone for Newfoundland"} ls{"normaltid for Newfoundland"} } - "meta:Niue"{ - ls{"tidssone for Niue"} - } "meta:Norfolk"{ ld{"sommartid for Norfolkøya"} lg{"tidssone for Norfolkøya"} @@ -1742,12 +404,6 @@ nn{ lg{"pakistansk tid"} ls{"pakistansk normaltid"} } - "meta:Palau"{ - ls{"palauisk tid"} - } - "meta:Papua_New_Guinea"{ - ls{"papuansk tid"} - } "meta:Paraguay"{ ld{"paraguayansk sommartid"} lg{"paraguayansk tid"} @@ -1771,21 +427,6 @@ nn{ lg{"tidssone for Saint-Pierre-et-Miquelon"} ls{"normaltid for Saint-Pierre-et-Miquelon"} } - "meta:Pitcairn"{ - ls{"tidssone for Pitcairn"} - } - "meta:Ponape"{ - ls{"tidssone for Pohnpei"} - } - "meta:Pyongyang"{ - ls{"tidssone for Pyongyang"} - } - "meta:Reunion"{ - ls{"tidssone for Réunion"} - } - "meta:Rothera"{ - ls{"tidssone for Rothera"} - } "meta:Sakhalin"{ ld{"sommartid for Sakhalin"} lg{"tidssone for Sakhalin"} @@ -1796,38 +437,11 @@ nn{ lg{"samoansk tid"} ls{"samoansk normaltid"} } - "meta:Seychelles"{ - ls{"seychellisk tid"} - } - "meta:Singapore"{ - ls{"singaporsk tid"} - } - "meta:Solomon"{ - ls{"salomonsk tid"} - } - "meta:South_Georgia"{ - ls{"tidssone for Sør-Georgia"} - } - "meta:Suriname"{ - ls{"surinamsk tid"} - } - "meta:Syowa"{ - ls{"tidssone for Syowa"} - } - "meta:Tahiti"{ - ls{"tahitisk tid"} - } "meta:Taipei"{ ld{"sommartid for Taipei"} lg{"tidssone for Taipei"} ls{"normaltid for Taipei"} } - "meta:Tajikistan"{ - ls{"tadsjikisk tid"} - } - "meta:Tokelau"{ - ls{"tidssone for Tokelau"} - } "meta:Tonga"{ ld{"tongansk sommartid"} lg{"tongansk tid"} @@ -1841,9 +455,6 @@ nn{ lg{"turkmensk tid"} ls{"turkmensk normaltid"} } - "meta:Tuvalu"{ - ls{"tuvalsk tid"} - } "meta:Uruguay"{ ld{"uruguayansk sommartid"} lg{"uruguayansk tid"} @@ -1859,9 +470,6 @@ nn{ lg{"vanuatisk tid"} ls{"vanuatisk normaltid"} } - "meta:Venezuela"{ - ls{"venezuelansk tid"} - } "meta:Vladivostok"{ ld{"sommartid for Vladivostok"} lg{"tidssone for Vladivostok"} @@ -1872,12 +480,6 @@ nn{ lg{"tidssone for Volgograd"} ls{"normaltid for Volgograd"} } - "meta:Vostok"{ - ls{"tidssone for Vostok"} - } - "meta:Wake"{ - ls{"tidssone for Wake Island"} - } "meta:Wallis"{ ls{"tidssone for Wallis- og Futunaøyane"} } @@ -1891,12 +493,6 @@ nn{ lg{"tidssone for Jekaterinburg"} ls{"normaltid for Jekaterinburg"} } - fallbackFormat{"{1} ({0})"} - gmtFormat{"GMT{0}"} - gmtZeroFormat{"GMT"} - hourFormat{"+HH:mm;-HH:mm"} - regionFormat{"tidssone for {0}"} regionFormatDaylight{"sommartid – {0}"} - regionFormatStandard{"normaltid – {0}"} } } diff --git a/icu4c/source/data/zone/no_NO.txt b/icu4c/source/data/zone/no_NO.txt index 9de87e3d165..6613a86c4e6 100644 --- a/icu4c/source/data/zone/no_NO.txt +++ b/icu4c/source/data/zone/no_NO.txt @@ -1,9 +1,6 @@ // © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ no_NO{ - ___{""} + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/zone/no_SJ.txt b/icu4c/source/data/zone/no_SJ.txt deleted file mode 100644 index 42b03fcf8d0..00000000000 --- a/icu4c/source/data/zone/no_SJ.txt +++ /dev/null @@ -1,9 +0,0 @@ -// © 2016 and later: Unicode, Inc. and others. -// License & terms of use: http://www.unicode.org/copyright.html -// Generated using tools/cldr/cldr-to-icu/build-icu-data.xml -/** - * generated alias target - */ -no_SJ{ - ___{""} -} diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 15dd96edea8..e50ccb3cd1f 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -485,8 +485,7 @@ testLCID(UResourceBundle *currentBundle, log_verbose("WARNING: %-5s resolves to %s (0x%.4x)\n", localeName, lcidStringC, expectedLCID); } - else if (!(strcmp(localeName, "ku") == 0 && log_knownIssue("20181", "ICU-20181 Fix LCID mapping for ckb vs ku")) && - !(strcmp(localeName, "no_NO") == 0 && log_knownIssue("21488", "ICU-21488 Fix LCID mapping for no/nb"))) { + else if (!(strcmp(localeName, "ku") == 0 && log_knownIssue("20181", "ICU-20181 Fix LCID mapping for ckb vs ku"))) { log_err("ERROR: %-5s has 0x%.4x and the number resolves wrongfully to %s\n", localeName, expectedLCID, lcidStringC); } diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index b7407eca3a4..df9cebed9fb 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -4942,8 +4942,8 @@ const char* const full_data[][3] = { "nl" }, { "und_NO", - "no_Latn_NO", - "no" + "nb_Latn_NO", + "nb" }, { "und_NP", "ne_Deva_NP", @@ -5058,8 +5058,8 @@ const char* const full_data[][3] = { "sl" }, { "und_SJ", - "no_Latn_SJ", - "no_SJ" + "nb_Latn_SJ", + "nb_SJ" }, { "und_SK", "sk_Latn_SK", diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 58ba75c8039..8c9275fe309 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -267,12 +267,12 @@ static const char* norwayNames[] = { static const char* norwayLocales[] = { "nn_NO", - "no_NO", + "no", "no", "nn_NO", "nn", - "no_NO", - "no" + "nb_NO", + "nb" }; static void checkStatus(int32_t line, UErrorCode expected, UErrorCode status) { diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 42677564889..3b0bf1ad91f 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -2874,8 +2874,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "nl" }, { "und_NO", - "no_Latn_NO", - "no" + "nb_Latn_NO", + "nb" }, { "und_NP", "ne_Deva_NP", @@ -2986,8 +2986,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "sl" }, { "und_SJ", - "no_Latn_SJ", - "no_SJ" + "nb_Latn_SJ", + "nb_SJ" }, { "und_SK", "sk_Latn_SK", @@ -4750,7 +4750,7 @@ void LocaleTest::TestCanonicalization(void) { "de-1901", "de__1901", "de__1901" }, /* registered name */ { "de-1906", "de__1906", "de__1906" }, /* registered name */ // New in CLDR 39 / ICU 69 - { "nb", "nb", "no" }, + { "nb", "nb", "nb" }, /* posix behavior that used to be performed by getName */ { "mr.utf8", "mr.utf8", "mr" }, @@ -4853,12 +4853,12 @@ void LocaleTest::TestCanonicalize(void) const char *canonicalID; /* expected canonicalize() result */ } testCases[] = { // language _ variant -> language - { "no-BOKMAL", "no" }, + { "no-BOKMAL", "nb" }, // also test with script, country and extensions - { "no-Cyrl-ID-BOKMAL-u-ca-japanese", "no-Cyrl-ID-u-ca-japanese" }, - { "no-Cyrl-ID-1901-BOKMAL-xsistemo-u-ca-japanese", "no-Cyrl-ID-1901-xsistemo-u-ca-japanese" }, - { "no-Cyrl-ID-1901-BOKMAL-u-ca-japanese", "no-Cyrl-ID-1901-u-ca-japanese" }, - { "no-Cyrl-ID-BOKMAL-xsistemo-u-ca-japanese", "no-Cyrl-ID-xsistemo-u-ca-japanese" }, + { "no-Cyrl-ID-BOKMAL-u-ca-japanese", "nb-Cyrl-ID-u-ca-japanese" }, + { "no-Cyrl-ID-1901-BOKMAL-xsistemo-u-ca-japanese", "nb-Cyrl-ID-1901-xsistemo-u-ca-japanese" }, + { "no-Cyrl-ID-1901-BOKMAL-u-ca-japanese", "nb-Cyrl-ID-1901-u-ca-japanese" }, + { "no-Cyrl-ID-BOKMAL-xsistemo-u-ca-japanese", "nb-Cyrl-ID-xsistemo-u-ca-japanese" }, { "no-NYNORSK", "nn" }, { "no-Cyrl-ID-NYNORSK-u-ca-japanese", "nn-Cyrl-ID-u-ca-japanese" }, { "aa-SAAHO", "ssy" }, @@ -4965,7 +4965,7 @@ void LocaleTest::TestCanonicalize(void) { "en-t-hy-latn-SU", "en-t-hy-latn-am"}, { "ru-t-ru-cyrl-SU", "ru-t-ru-cyrl-ru"}, { "fr-t-fr-172", "fr-t-fr-ru"}, - { "und-t-no-latn-BOKMAL", "und-t-no-latn" }, + { "und-t-no-latn-BOKMAL", "und-t-nb-latn" }, { "und-t-sgn-qAAi-NL", "und-t-dse-zinh" }, // alias of tvalue should be replaced { "en-t-m0-NaMeS", "en-t-m0-prprname" }, diff --git a/icu4c/source/test/testdata/localeCanonicalization.txt b/icu4c/source/test/testdata/localeCanonicalization.txt index fea36ee912a..a7a8d890617 100644 --- a/icu4c/source/test/testdata/localeCanonicalization.txt +++ b/icu4c/source/test/testdata/localeCanonicalization.txt @@ -36,8 +36,8 @@ hy_arevela ; hy hy_arevmda ; hyw hy_arevmda_arevela ; hyw hye_arevmda ; hyw -no_bokmal_nynorsk ; nn -no_nynorsk_bokmal ; nn +no_bokmal_nynorsk ; nb +no_nynorsk_bokmal ; nb zh_guoyu_hakka_xiang ; hak zh_hakka_xiang ; hak @@ -276,9 +276,9 @@ nno ; nn nns ; nbr nnx ; ngv no ; no -no_bokmal ; no +no_bokmal ; nb no_nynorsk ; nn -nob ; no +nob ; nb nor ; no npi ; ne nts ; pij @@ -1460,11 +1460,11 @@ nld_Adlm_AC_fonipa ; nl_Adlm_AC_fonipa nno_Adlm_AC_fonipa ; nn_Adlm_AC_fonipa nns_Adlm_AC_fonipa ; nbr_Adlm_AC_fonipa nnx_Adlm_AC_fonipa ; ngv_Adlm_AC_fonipa -no_Adlm_AC_bokmal_fonipa ; no_Adlm_AC_fonipa -no_Adlm_AC_bokmal_fonipa_nynorsk ; nn_Adlm_AC_fonipa +no_Adlm_AC_bokmal_fonipa ; nb_Adlm_AC_fonipa +no_Adlm_AC_bokmal_fonipa_nynorsk ; nb_Adlm_AC_fonipa no_Adlm_AC_fonipa ; no_Adlm_AC_fonipa no_Adlm_AC_fonipa_nynorsk ; nn_Adlm_AC_fonipa -nob_Adlm_AC_fonipa ; no_Adlm_AC_fonipa +nob_Adlm_AC_fonipa ; nb_Adlm_AC_fonipa nor_Adlm_AC_fonipa ; no_Adlm_AC_fonipa npi_Adlm_AC_fonipa ; ne_Adlm_AC_fonipa nts_Adlm_AC_fonipa ; pij_Adlm_AC_fonipa diff --git a/icu4c/source/test/testdata/numberpermutationtest.txt b/icu4c/source/test/testdata/numberpermutationtest.txt index 9767baa8f8f..aba935f3e1f 100644 --- a/icu4c/source/test/testdata/numberpermutationtest.txt +++ b/icu4c/source/test/testdata/numberpermutationtest.txt @@ -3504,7 +3504,7 @@ measure-unit/length-furlong unit-width-full-name rounding-mode-floor percent unit-width-narrow integer-width/##00 es-MX 00 % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00% @@ -3518,7 +3518,7 @@ percent unit-width-narrow integer-width/##00 percent unit-width-full-name integer-width/##00 es-MX 00 por ciento - 1827.3645 por ciento + 1,827.3645 por ciento -00.22222 por ciento zh-TW 00% @@ -3532,7 +3532,7 @@ percent unit-width-full-name integer-width/##00 currency/EUR unit-width-narrow integer-width/##00 es-MX €00.00 - €1827.36 + €1,827.36 -€00.22 zh-TW €00.00 @@ -3546,7 +3546,7 @@ currency/EUR unit-width-narrow integer-width/##00 currency/EUR unit-width-full-name integer-width/##00 es-MX 00.00 euros - 1827.36 euros + 1,827.36 euros -00.22 euros zh-TW 00.00 歐元 @@ -3560,7 +3560,7 @@ currency/EUR unit-width-full-name integer-width/##00 measure-unit/length-furlong unit-width-narrow integer-width/##00 es-MX 00 fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00化朗 @@ -3574,7 +3574,7 @@ measure-unit/length-furlong unit-width-narrow integer-width/##00 measure-unit/length-furlong unit-width-full-name integer-width/##00 es-MX 00 furlongs - 1827.3645 furlongs + 1,827.3645 furlongs -00.22222 furlongs zh-TW 00 化朗 @@ -4176,7 +4176,7 @@ measure-unit/length-furlong @@ rounding-mode-floor percent precision-integer integer-width/##00 es-MX 00 % - 1827 % + 1,827 % -00 % zh-TW 00% @@ -4190,7 +4190,7 @@ percent precision-integer integer-width/##00 percent .000 integer-width/##00 es-MX 00.000 % - 1827.364 % + 1,827.364 % -00.222 % zh-TW 00.000% @@ -4204,7 +4204,7 @@ percent .000 integer-width/##00 percent .##/@@@+ integer-width/##00 es-MX 00 % - 1827.36 % + 1,827.36 % -00.222 % zh-TW 00% @@ -4218,7 +4218,7 @@ percent .##/@@@+ integer-width/##00 percent @@ integer-width/##00 es-MX 00.0 % - 2000 % + 2,000 % -00.22 % zh-TW 00.0% @@ -4232,7 +4232,7 @@ percent @@ integer-width/##00 currency/EUR precision-integer integer-width/##00 es-MX EUR 00 - EUR 1827 + EUR 1,827 -EUR 00 zh-TW €00 @@ -4246,7 +4246,7 @@ currency/EUR precision-integer integer-width/##00 currency/EUR .000 integer-width/##00 es-MX EUR 00.000 - EUR 1827.364 + EUR 1,827.364 -EUR 00.222 zh-TW €00.000 @@ -4260,7 +4260,7 @@ currency/EUR .000 integer-width/##00 currency/EUR .##/@@@+ integer-width/##00 es-MX EUR 00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.222 zh-TW €00 @@ -4274,7 +4274,7 @@ currency/EUR .##/@@@+ integer-width/##00 currency/EUR @@ integer-width/##00 es-MX EUR 00.0 - EUR 2000 + EUR 2,000 -EUR 00.22 zh-TW €00.0 @@ -4288,7 +4288,7 @@ currency/EUR @@ integer-width/##00 measure-unit/length-furlong precision-integer integer-width/##00 es-MX 00 fur - 1827 fur + 1,827 fur -00 fur zh-TW 00 化朗 @@ -4302,7 +4302,7 @@ measure-unit/length-furlong precision-integer integer-width/##00 measure-unit/length-furlong .000 integer-width/##00 es-MX 00.000 fur - 1827.364 fur + 1,827.364 fur -00.222 fur zh-TW 00.000 化朗 @@ -4316,7 +4316,7 @@ measure-unit/length-furlong .000 integer-width/##00 measure-unit/length-furlong .##/@@@+ integer-width/##00 es-MX 00 fur - 1827.36 fur + 1,827.36 fur -00.222 fur zh-TW 00 化朗 @@ -4330,7 +4330,7 @@ measure-unit/length-furlong .##/@@@+ integer-width/##00 measure-unit/length-furlong @@ integer-width/##00 es-MX 00.0 fur - 2000 fur + 2,000 fur -00.22 fur zh-TW 00.0 化朗 @@ -5184,7 +5184,7 @@ measure-unit/length-furlong @@ decimal-always percent rounding-mode-floor integer-width/##00 es-MX 00 % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00% @@ -5198,7 +5198,7 @@ percent rounding-mode-floor integer-width/##00 currency/EUR rounding-mode-floor integer-width/##00 es-MX EUR 00.00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.23 zh-TW €00.00 @@ -5212,7 +5212,7 @@ currency/EUR rounding-mode-floor integer-width/##00 measure-unit/length-furlong rounding-mode-floor integer-width/##00 es-MX 00 fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00 化朗 @@ -5436,7 +5436,7 @@ measure-unit/length-furlong rounding-mode-floor decimal-always percent integer-width/##00 scale/0.5 es-MX 00 % - 5913.68225 % + 5,913.68225 % -00.11111 % zh-TW 00% @@ -5450,7 +5450,7 @@ percent integer-width/##00 scale/0.5 currency/EUR integer-width/##00 scale/0.5 es-MX EUR 00.00 - EUR 5913.68 + EUR 5,913.68 -EUR 00.11 zh-TW €00.00 @@ -5464,7 +5464,7 @@ currency/EUR integer-width/##00 scale/0.5 measure-unit/length-furlong integer-width/##00 scale/0.5 es-MX 00 fur - 5913.68225 fur + 5,913.68225 fur -00.11111 fur zh-TW 00 化朗 @@ -5520,7 +5520,7 @@ measure-unit/length-furlong integer-width/##00 group-on-aligned percent integer-width/##00 latin es-MX 00 % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00% @@ -5534,7 +5534,7 @@ percent integer-width/##00 latin currency/EUR integer-width/##00 latin es-MX EUR 00.00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.22 zh-TW €00.00 @@ -5548,7 +5548,7 @@ currency/EUR integer-width/##00 latin measure-unit/length-furlong integer-width/##00 latin es-MX 00 fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00 化朗 @@ -5562,7 +5562,7 @@ measure-unit/length-furlong integer-width/##00 latin percent integer-width/##00 sign-accounting-except-zero es-MX 00 % - +1827.3645 % + +1,827.3645 % -00.22222 % zh-TW 00% @@ -5576,7 +5576,7 @@ percent integer-width/##00 sign-accounting-except-zero currency/EUR integer-width/##00 sign-accounting-except-zero es-MX EUR 00.00 - +EUR 1827.36 + +EUR 1,827.36 -EUR 00.22 zh-TW €00.00 @@ -5590,7 +5590,7 @@ currency/EUR integer-width/##00 sign-accounting-except-zero measure-unit/length-furlong integer-width/##00 sign-accounting-except-zero es-MX 00 fur - +1827.3645 fur + +1,827.3645 fur -00.22222 fur zh-TW 00 化朗 @@ -5604,7 +5604,7 @@ measure-unit/length-furlong integer-width/##00 sign-accounting-except-zero percent integer-width/##00 decimal-always es-MX 00. % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00.% @@ -5618,7 +5618,7 @@ percent integer-width/##00 decimal-always currency/EUR integer-width/##00 decimal-always es-MX EUR 00.00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.22 zh-TW €00.00 @@ -5632,7 +5632,7 @@ currency/EUR integer-width/##00 decimal-always measure-unit/length-furlong integer-width/##00 decimal-always es-MX 00. fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00. 化朗 @@ -6178,7 +6178,7 @@ unit-width-full-name @@ rounding-mode-floor unit-width-narrow precision-integer integer-width/##00 es-MX 00 - 1827 + 1,827 -00 zh-TW 00 @@ -6192,7 +6192,7 @@ unit-width-narrow precision-integer integer-width/##00 unit-width-narrow .000 integer-width/##00 es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -6206,7 +6206,7 @@ unit-width-narrow .000 integer-width/##00 unit-width-narrow .##/@@@+ integer-width/##00 es-MX 00 - 1827.36 + 1,827.36 -00.222 zh-TW 00 @@ -6220,7 +6220,7 @@ unit-width-narrow .##/@@@+ integer-width/##00 unit-width-narrow @@ integer-width/##00 es-MX 00.0 - 2000 + 2,000 -00.22 zh-TW 00.0 @@ -6234,7 +6234,7 @@ unit-width-narrow @@ integer-width/##00 unit-width-full-name precision-integer integer-width/##00 es-MX 00 - 1827 + 1,827 -00 zh-TW 00 @@ -6248,7 +6248,7 @@ unit-width-full-name precision-integer integer-width/##00 unit-width-full-name .000 integer-width/##00 es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -6262,7 +6262,7 @@ unit-width-full-name .000 integer-width/##00 unit-width-full-name .##/@@@+ integer-width/##00 es-MX 00 - 1827.36 + 1,827.36 -00.222 zh-TW 00 @@ -6276,7 +6276,7 @@ unit-width-full-name .##/@@@+ integer-width/##00 unit-width-full-name @@ integer-width/##00 es-MX 00.0 - 2000 + 2,000 -00.22 zh-TW 00.0 @@ -6850,7 +6850,7 @@ unit-width-full-name @@ decimal-always unit-width-narrow rounding-mode-floor integer-width/##00 es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -6864,7 +6864,7 @@ unit-width-narrow rounding-mode-floor integer-width/##00 unit-width-full-name rounding-mode-floor integer-width/##00 es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -7018,7 +7018,7 @@ unit-width-full-name rounding-mode-floor decimal-always unit-width-narrow integer-width/##00 scale/0.5 es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -7032,7 +7032,7 @@ unit-width-narrow integer-width/##00 scale/0.5 unit-width-full-name integer-width/##00 scale/0.5 es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -7074,7 +7074,7 @@ unit-width-full-name integer-width/##00 group-on-aligned unit-width-narrow integer-width/##00 latin es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -7088,7 +7088,7 @@ unit-width-narrow integer-width/##00 latin unit-width-full-name integer-width/##00 latin es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -7102,7 +7102,7 @@ unit-width-full-name integer-width/##00 latin unit-width-narrow integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -7116,7 +7116,7 @@ unit-width-narrow integer-width/##00 sign-accounting-except-zero unit-width-full-name integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -7130,7 +7130,7 @@ unit-width-full-name integer-width/##00 sign-accounting-except-zero unit-width-narrow integer-width/##00 decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -7144,7 +7144,7 @@ unit-width-narrow integer-width/##00 decimal-always unit-width-full-name integer-width/##00 decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -7438,7 +7438,7 @@ unit-width-full-name sign-accounting-except-zero decimal-always precision-integer rounding-mode-floor integer-width/##00 es-MX 00 - 1827 + 1,827 -01 zh-TW 00 @@ -7452,7 +7452,7 @@ precision-integer rounding-mode-floor integer-width/##00 .000 rounding-mode-floor integer-width/##00 es-MX 00.000 - 1827.364 + 1,827.364 -00.223 zh-TW 00.000 @@ -7466,7 +7466,7 @@ precision-integer rounding-mode-floor integer-width/##00 .##/@@@+ rounding-mode-floor integer-width/##00 es-MX 00 - 1827.36 + 1,827.36 -00.223 zh-TW 00 @@ -7480,7 +7480,7 @@ precision-integer rounding-mode-floor integer-width/##00 @@ rounding-mode-floor integer-width/##00 es-MX 00.0 - 1000 + 1,000 -00.23 zh-TW 00.0 @@ -7774,7 +7774,7 @@ precision-integer rounding-mode-floor decimal-always precision-integer integer-width/##00 scale/0.5 es-MX 00 - 5914 + 5,914 -00 zh-TW 00 @@ -7788,7 +7788,7 @@ precision-integer integer-width/##00 scale/0.5 .000 integer-width/##00 scale/0.5 es-MX 00.000 - 5913.682 + 5,913.682 -00.111 zh-TW 00.000 @@ -7802,7 +7802,7 @@ precision-integer integer-width/##00 scale/0.5 .##/@@@+ integer-width/##00 scale/0.5 es-MX 00 - 5913.68 + 5,913.68 -00.111 zh-TW 00 @@ -7816,7 +7816,7 @@ precision-integer integer-width/##00 scale/0.5 @@ integer-width/##00 scale/0.5 es-MX 00.0 - 6000 + 6,000 -00.11 zh-TW 00.0 @@ -7886,7 +7886,7 @@ precision-integer integer-width/##00 group-on-aligned precision-integer integer-width/##00 latin es-MX 00 - 1827 + 1,827 -00 zh-TW 00 @@ -7900,7 +7900,7 @@ precision-integer integer-width/##00 latin .000 integer-width/##00 latin es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -7914,7 +7914,7 @@ precision-integer integer-width/##00 latin .##/@@@+ integer-width/##00 latin es-MX 00 - 1827.36 + 1,827.36 -00.222 zh-TW 00 @@ -7928,7 +7928,7 @@ precision-integer integer-width/##00 latin @@ integer-width/##00 latin es-MX 00.0 - 2000 + 2,000 -00.22 zh-TW 00.0 @@ -7942,7 +7942,7 @@ precision-integer integer-width/##00 latin precision-integer integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827 + +1,827 00 zh-TW 00 @@ -7956,7 +7956,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero .000 integer-width/##00 sign-accounting-except-zero es-MX 00.000 - +1827.364 + +1,827.364 -00.222 zh-TW 00.000 @@ -7970,7 +7970,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero .##/@@@+ integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.36 + +1,827.36 -00.222 zh-TW 00 @@ -7984,7 +7984,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero @@ integer-width/##00 sign-accounting-except-zero es-MX 00.0 - +2000 + +2,000 -00.22 zh-TW 00.0 @@ -7998,7 +7998,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero precision-integer integer-width/##00 decimal-always es-MX 00. - 1827. + 1,827. -00. zh-TW 00. @@ -8012,7 +8012,7 @@ precision-integer integer-width/##00 decimal-always .000 integer-width/##00 decimal-always es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -8026,7 +8026,7 @@ precision-integer integer-width/##00 decimal-always .##/@@@+ integer-width/##00 decimal-always es-MX 00. - 1827.36 + 1,827.36 -00.222 zh-TW 00. @@ -8040,7 +8040,7 @@ precision-integer integer-width/##00 decimal-always @@ integer-width/##00 decimal-always es-MX 00.0 - 2000. + 2,000. -00.22 zh-TW 00.0 @@ -8614,7 +8614,7 @@ precision-integer sign-accounting-except-zero decimal-always rounding-mode-floor integer-width/##00 scale/0.5 es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -8642,7 +8642,7 @@ rounding-mode-floor integer-width/##00 group-on-aligned rounding-mode-floor integer-width/##00 latin es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -8656,7 +8656,7 @@ rounding-mode-floor integer-width/##00 latin rounding-mode-floor integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -8670,7 +8670,7 @@ rounding-mode-floor integer-width/##00 sign-accounting-except-zero rounding-mode-floor integer-width/##00 decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -8838,7 +8838,7 @@ integer-width/##00 scale/0.5 group-on-aligned integer-width/##00 scale/0.5 latin es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -8852,7 +8852,7 @@ integer-width/##00 scale/0.5 latin integer-width/##00 scale/0.5 sign-accounting-except-zero es-MX 00 - +5913.68225 + +5,913.68225 -00.11111 zh-TW 00 @@ -8866,7 +8866,7 @@ integer-width/##00 scale/0.5 sign-accounting-except-zero integer-width/##00 scale/0.5 decimal-always es-MX 00. - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00. @@ -8922,7 +8922,7 @@ integer-width/##00 group-on-aligned decimal-always integer-width/##00 latin sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -8936,7 +8936,7 @@ integer-width/##00 latin sign-accounting-except-zero integer-width/##00 latin decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -8950,7 +8950,7 @@ integer-width/##00 latin decimal-always integer-width/##00 sign-accounting-except-zero decimal-always es-MX 00. - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00. diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java index f693e434725..7bb2b672c5c 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java @@ -229,11 +229,11 @@ public class LocaleIDs { "zxx", "zza" }; private static final String[] _replacementLanguages = { - "id", "he", "yi", "jv", "sr", "no",/* replacement language codes */ + "id", "he", "yi", "jv", "sr", /* replacement language codes */ }; private static final String[] _obsoleteLanguages = { - "in", "iw", "ji", "jw", "sh", "nb", /* obsolete language codes */ + "in", "iw", "ji", "jw", "sh", /* obsolete language codes */ }; /* This list MUST contain a three-letter code for every two-letter code in the diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java index 881272081e9..140922f58ae 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java @@ -1759,8 +1759,8 @@ public final class ULocale implements Serializable, Comparable { "it", "it_IT", "ja", "ja_JP", "jv", "jv_ID", "ka", "ka_GE", "kk", "kk_KZ", "km", "km_KH", "kn", "kn_IN", "ko", "ko_KR", "ky", "ky_KG", "lo", "lo_LA", "lt", "lt_LT", "lv", "lv_LV", "mk", "mk_MK", "ml", "ml_IN", "mn", "mn_MN", - "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "ne", "ne_NP", "nl", "nl_NL", - "no", "no_NO", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", + "mr", "mr_IN", "ms", "ms_MY", "my", "my_MM", "nb", "nb_NO", "ne", "ne_NP", + "nl", "nl_NL", "no", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", "pt", "pt_BR", "pt_PT", "ro", "ro_RO", "ru", "ru_RU", "sd", "sd_IN", "si", "si_LK", "sk", "sk_SK", "sl", "sl_SI", "so", "so_SO", "sq", "sq_AL", "sr", "sr_Cyrl_RS", "sr_Latn", "sr_RS", "sv", "sv_SE", "sw", "sw_TZ", "ta", diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 2ce2af2796a..ec5cd575a3a 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:c657b0861d76c7177e4f79fb2f8240176711b364c76d698935496c0ebcf1ebdd -size 13328077 +oid sha256:60112625a7233f683d643fe3be8934324dcaa0447db5c07272e4967315113edc +size 13302670 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index a60950c286c..c2281fce17c 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:de3e8aefff4196afc4b03359802a7f7963fb4872a5ea193b3b8945206f9deb35 -size 95091 +oid sha256:17a6059bcb6831800a3fef6f90de4e709480b4a5d3efb22f3e86d9d380e547bb +size 95094 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberpermutationtest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberpermutationtest.txt index 9767baa8f8f..aba935f3e1f 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberpermutationtest.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberpermutationtest.txt @@ -3504,7 +3504,7 @@ measure-unit/length-furlong unit-width-full-name rounding-mode-floor percent unit-width-narrow integer-width/##00 es-MX 00 % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00% @@ -3518,7 +3518,7 @@ percent unit-width-narrow integer-width/##00 percent unit-width-full-name integer-width/##00 es-MX 00 por ciento - 1827.3645 por ciento + 1,827.3645 por ciento -00.22222 por ciento zh-TW 00% @@ -3532,7 +3532,7 @@ percent unit-width-full-name integer-width/##00 currency/EUR unit-width-narrow integer-width/##00 es-MX €00.00 - €1827.36 + €1,827.36 -€00.22 zh-TW €00.00 @@ -3546,7 +3546,7 @@ currency/EUR unit-width-narrow integer-width/##00 currency/EUR unit-width-full-name integer-width/##00 es-MX 00.00 euros - 1827.36 euros + 1,827.36 euros -00.22 euros zh-TW 00.00 歐元 @@ -3560,7 +3560,7 @@ currency/EUR unit-width-full-name integer-width/##00 measure-unit/length-furlong unit-width-narrow integer-width/##00 es-MX 00 fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00化朗 @@ -3574,7 +3574,7 @@ measure-unit/length-furlong unit-width-narrow integer-width/##00 measure-unit/length-furlong unit-width-full-name integer-width/##00 es-MX 00 furlongs - 1827.3645 furlongs + 1,827.3645 furlongs -00.22222 furlongs zh-TW 00 化朗 @@ -4176,7 +4176,7 @@ measure-unit/length-furlong @@ rounding-mode-floor percent precision-integer integer-width/##00 es-MX 00 % - 1827 % + 1,827 % -00 % zh-TW 00% @@ -4190,7 +4190,7 @@ percent precision-integer integer-width/##00 percent .000 integer-width/##00 es-MX 00.000 % - 1827.364 % + 1,827.364 % -00.222 % zh-TW 00.000% @@ -4204,7 +4204,7 @@ percent .000 integer-width/##00 percent .##/@@@+ integer-width/##00 es-MX 00 % - 1827.36 % + 1,827.36 % -00.222 % zh-TW 00% @@ -4218,7 +4218,7 @@ percent .##/@@@+ integer-width/##00 percent @@ integer-width/##00 es-MX 00.0 % - 2000 % + 2,000 % -00.22 % zh-TW 00.0% @@ -4232,7 +4232,7 @@ percent @@ integer-width/##00 currency/EUR precision-integer integer-width/##00 es-MX EUR 00 - EUR 1827 + EUR 1,827 -EUR 00 zh-TW €00 @@ -4246,7 +4246,7 @@ currency/EUR precision-integer integer-width/##00 currency/EUR .000 integer-width/##00 es-MX EUR 00.000 - EUR 1827.364 + EUR 1,827.364 -EUR 00.222 zh-TW €00.000 @@ -4260,7 +4260,7 @@ currency/EUR .000 integer-width/##00 currency/EUR .##/@@@+ integer-width/##00 es-MX EUR 00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.222 zh-TW €00 @@ -4274,7 +4274,7 @@ currency/EUR .##/@@@+ integer-width/##00 currency/EUR @@ integer-width/##00 es-MX EUR 00.0 - EUR 2000 + EUR 2,000 -EUR 00.22 zh-TW €00.0 @@ -4288,7 +4288,7 @@ currency/EUR @@ integer-width/##00 measure-unit/length-furlong precision-integer integer-width/##00 es-MX 00 fur - 1827 fur + 1,827 fur -00 fur zh-TW 00 化朗 @@ -4302,7 +4302,7 @@ measure-unit/length-furlong precision-integer integer-width/##00 measure-unit/length-furlong .000 integer-width/##00 es-MX 00.000 fur - 1827.364 fur + 1,827.364 fur -00.222 fur zh-TW 00.000 化朗 @@ -4316,7 +4316,7 @@ measure-unit/length-furlong .000 integer-width/##00 measure-unit/length-furlong .##/@@@+ integer-width/##00 es-MX 00 fur - 1827.36 fur + 1,827.36 fur -00.222 fur zh-TW 00 化朗 @@ -4330,7 +4330,7 @@ measure-unit/length-furlong .##/@@@+ integer-width/##00 measure-unit/length-furlong @@ integer-width/##00 es-MX 00.0 fur - 2000 fur + 2,000 fur -00.22 fur zh-TW 00.0 化朗 @@ -5184,7 +5184,7 @@ measure-unit/length-furlong @@ decimal-always percent rounding-mode-floor integer-width/##00 es-MX 00 % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00% @@ -5198,7 +5198,7 @@ percent rounding-mode-floor integer-width/##00 currency/EUR rounding-mode-floor integer-width/##00 es-MX EUR 00.00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.23 zh-TW €00.00 @@ -5212,7 +5212,7 @@ currency/EUR rounding-mode-floor integer-width/##00 measure-unit/length-furlong rounding-mode-floor integer-width/##00 es-MX 00 fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00 化朗 @@ -5436,7 +5436,7 @@ measure-unit/length-furlong rounding-mode-floor decimal-always percent integer-width/##00 scale/0.5 es-MX 00 % - 5913.68225 % + 5,913.68225 % -00.11111 % zh-TW 00% @@ -5450,7 +5450,7 @@ percent integer-width/##00 scale/0.5 currency/EUR integer-width/##00 scale/0.5 es-MX EUR 00.00 - EUR 5913.68 + EUR 5,913.68 -EUR 00.11 zh-TW €00.00 @@ -5464,7 +5464,7 @@ currency/EUR integer-width/##00 scale/0.5 measure-unit/length-furlong integer-width/##00 scale/0.5 es-MX 00 fur - 5913.68225 fur + 5,913.68225 fur -00.11111 fur zh-TW 00 化朗 @@ -5520,7 +5520,7 @@ measure-unit/length-furlong integer-width/##00 group-on-aligned percent integer-width/##00 latin es-MX 00 % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00% @@ -5534,7 +5534,7 @@ percent integer-width/##00 latin currency/EUR integer-width/##00 latin es-MX EUR 00.00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.22 zh-TW €00.00 @@ -5548,7 +5548,7 @@ currency/EUR integer-width/##00 latin measure-unit/length-furlong integer-width/##00 latin es-MX 00 fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00 化朗 @@ -5562,7 +5562,7 @@ measure-unit/length-furlong integer-width/##00 latin percent integer-width/##00 sign-accounting-except-zero es-MX 00 % - +1827.3645 % + +1,827.3645 % -00.22222 % zh-TW 00% @@ -5576,7 +5576,7 @@ percent integer-width/##00 sign-accounting-except-zero currency/EUR integer-width/##00 sign-accounting-except-zero es-MX EUR 00.00 - +EUR 1827.36 + +EUR 1,827.36 -EUR 00.22 zh-TW €00.00 @@ -5590,7 +5590,7 @@ currency/EUR integer-width/##00 sign-accounting-except-zero measure-unit/length-furlong integer-width/##00 sign-accounting-except-zero es-MX 00 fur - +1827.3645 fur + +1,827.3645 fur -00.22222 fur zh-TW 00 化朗 @@ -5604,7 +5604,7 @@ measure-unit/length-furlong integer-width/##00 sign-accounting-except-zero percent integer-width/##00 decimal-always es-MX 00. % - 1827.3645 % + 1,827.3645 % -00.22222 % zh-TW 00.% @@ -5618,7 +5618,7 @@ percent integer-width/##00 decimal-always currency/EUR integer-width/##00 decimal-always es-MX EUR 00.00 - EUR 1827.36 + EUR 1,827.36 -EUR 00.22 zh-TW €00.00 @@ -5632,7 +5632,7 @@ currency/EUR integer-width/##00 decimal-always measure-unit/length-furlong integer-width/##00 decimal-always es-MX 00. fur - 1827.3645 fur + 1,827.3645 fur -00.22222 fur zh-TW 00. 化朗 @@ -6178,7 +6178,7 @@ unit-width-full-name @@ rounding-mode-floor unit-width-narrow precision-integer integer-width/##00 es-MX 00 - 1827 + 1,827 -00 zh-TW 00 @@ -6192,7 +6192,7 @@ unit-width-narrow precision-integer integer-width/##00 unit-width-narrow .000 integer-width/##00 es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -6206,7 +6206,7 @@ unit-width-narrow .000 integer-width/##00 unit-width-narrow .##/@@@+ integer-width/##00 es-MX 00 - 1827.36 + 1,827.36 -00.222 zh-TW 00 @@ -6220,7 +6220,7 @@ unit-width-narrow .##/@@@+ integer-width/##00 unit-width-narrow @@ integer-width/##00 es-MX 00.0 - 2000 + 2,000 -00.22 zh-TW 00.0 @@ -6234,7 +6234,7 @@ unit-width-narrow @@ integer-width/##00 unit-width-full-name precision-integer integer-width/##00 es-MX 00 - 1827 + 1,827 -00 zh-TW 00 @@ -6248,7 +6248,7 @@ unit-width-full-name precision-integer integer-width/##00 unit-width-full-name .000 integer-width/##00 es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -6262,7 +6262,7 @@ unit-width-full-name .000 integer-width/##00 unit-width-full-name .##/@@@+ integer-width/##00 es-MX 00 - 1827.36 + 1,827.36 -00.222 zh-TW 00 @@ -6276,7 +6276,7 @@ unit-width-full-name .##/@@@+ integer-width/##00 unit-width-full-name @@ integer-width/##00 es-MX 00.0 - 2000 + 2,000 -00.22 zh-TW 00.0 @@ -6850,7 +6850,7 @@ unit-width-full-name @@ decimal-always unit-width-narrow rounding-mode-floor integer-width/##00 es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -6864,7 +6864,7 @@ unit-width-narrow rounding-mode-floor integer-width/##00 unit-width-full-name rounding-mode-floor integer-width/##00 es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -7018,7 +7018,7 @@ unit-width-full-name rounding-mode-floor decimal-always unit-width-narrow integer-width/##00 scale/0.5 es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -7032,7 +7032,7 @@ unit-width-narrow integer-width/##00 scale/0.5 unit-width-full-name integer-width/##00 scale/0.5 es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -7074,7 +7074,7 @@ unit-width-full-name integer-width/##00 group-on-aligned unit-width-narrow integer-width/##00 latin es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -7088,7 +7088,7 @@ unit-width-narrow integer-width/##00 latin unit-width-full-name integer-width/##00 latin es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -7102,7 +7102,7 @@ unit-width-full-name integer-width/##00 latin unit-width-narrow integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -7116,7 +7116,7 @@ unit-width-narrow integer-width/##00 sign-accounting-except-zero unit-width-full-name integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -7130,7 +7130,7 @@ unit-width-full-name integer-width/##00 sign-accounting-except-zero unit-width-narrow integer-width/##00 decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -7144,7 +7144,7 @@ unit-width-narrow integer-width/##00 decimal-always unit-width-full-name integer-width/##00 decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -7438,7 +7438,7 @@ unit-width-full-name sign-accounting-except-zero decimal-always precision-integer rounding-mode-floor integer-width/##00 es-MX 00 - 1827 + 1,827 -01 zh-TW 00 @@ -7452,7 +7452,7 @@ precision-integer rounding-mode-floor integer-width/##00 .000 rounding-mode-floor integer-width/##00 es-MX 00.000 - 1827.364 + 1,827.364 -00.223 zh-TW 00.000 @@ -7466,7 +7466,7 @@ precision-integer rounding-mode-floor integer-width/##00 .##/@@@+ rounding-mode-floor integer-width/##00 es-MX 00 - 1827.36 + 1,827.36 -00.223 zh-TW 00 @@ -7480,7 +7480,7 @@ precision-integer rounding-mode-floor integer-width/##00 @@ rounding-mode-floor integer-width/##00 es-MX 00.0 - 1000 + 1,000 -00.23 zh-TW 00.0 @@ -7774,7 +7774,7 @@ precision-integer rounding-mode-floor decimal-always precision-integer integer-width/##00 scale/0.5 es-MX 00 - 5914 + 5,914 -00 zh-TW 00 @@ -7788,7 +7788,7 @@ precision-integer integer-width/##00 scale/0.5 .000 integer-width/##00 scale/0.5 es-MX 00.000 - 5913.682 + 5,913.682 -00.111 zh-TW 00.000 @@ -7802,7 +7802,7 @@ precision-integer integer-width/##00 scale/0.5 .##/@@@+ integer-width/##00 scale/0.5 es-MX 00 - 5913.68 + 5,913.68 -00.111 zh-TW 00 @@ -7816,7 +7816,7 @@ precision-integer integer-width/##00 scale/0.5 @@ integer-width/##00 scale/0.5 es-MX 00.0 - 6000 + 6,000 -00.11 zh-TW 00.0 @@ -7886,7 +7886,7 @@ precision-integer integer-width/##00 group-on-aligned precision-integer integer-width/##00 latin es-MX 00 - 1827 + 1,827 -00 zh-TW 00 @@ -7900,7 +7900,7 @@ precision-integer integer-width/##00 latin .000 integer-width/##00 latin es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -7914,7 +7914,7 @@ precision-integer integer-width/##00 latin .##/@@@+ integer-width/##00 latin es-MX 00 - 1827.36 + 1,827.36 -00.222 zh-TW 00 @@ -7928,7 +7928,7 @@ precision-integer integer-width/##00 latin @@ integer-width/##00 latin es-MX 00.0 - 2000 + 2,000 -00.22 zh-TW 00.0 @@ -7942,7 +7942,7 @@ precision-integer integer-width/##00 latin precision-integer integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827 + +1,827 00 zh-TW 00 @@ -7956,7 +7956,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero .000 integer-width/##00 sign-accounting-except-zero es-MX 00.000 - +1827.364 + +1,827.364 -00.222 zh-TW 00.000 @@ -7970,7 +7970,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero .##/@@@+ integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.36 + +1,827.36 -00.222 zh-TW 00 @@ -7984,7 +7984,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero @@ integer-width/##00 sign-accounting-except-zero es-MX 00.0 - +2000 + +2,000 -00.22 zh-TW 00.0 @@ -7998,7 +7998,7 @@ precision-integer integer-width/##00 sign-accounting-except-zero precision-integer integer-width/##00 decimal-always es-MX 00. - 1827. + 1,827. -00. zh-TW 00. @@ -8012,7 +8012,7 @@ precision-integer integer-width/##00 decimal-always .000 integer-width/##00 decimal-always es-MX 00.000 - 1827.364 + 1,827.364 -00.222 zh-TW 00.000 @@ -8026,7 +8026,7 @@ precision-integer integer-width/##00 decimal-always .##/@@@+ integer-width/##00 decimal-always es-MX 00. - 1827.36 + 1,827.36 -00.222 zh-TW 00. @@ -8040,7 +8040,7 @@ precision-integer integer-width/##00 decimal-always @@ integer-width/##00 decimal-always es-MX 00.0 - 2000. + 2,000. -00.22 zh-TW 00.0 @@ -8614,7 +8614,7 @@ precision-integer sign-accounting-except-zero decimal-always rounding-mode-floor integer-width/##00 scale/0.5 es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -8642,7 +8642,7 @@ rounding-mode-floor integer-width/##00 group-on-aligned rounding-mode-floor integer-width/##00 latin es-MX 00 - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00 @@ -8656,7 +8656,7 @@ rounding-mode-floor integer-width/##00 latin rounding-mode-floor integer-width/##00 sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -8670,7 +8670,7 @@ rounding-mode-floor integer-width/##00 sign-accounting-except-zero rounding-mode-floor integer-width/##00 decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -8838,7 +8838,7 @@ integer-width/##00 scale/0.5 group-on-aligned integer-width/##00 scale/0.5 latin es-MX 00 - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00 @@ -8852,7 +8852,7 @@ integer-width/##00 scale/0.5 latin integer-width/##00 scale/0.5 sign-accounting-except-zero es-MX 00 - +5913.68225 + +5,913.68225 -00.11111 zh-TW 00 @@ -8866,7 +8866,7 @@ integer-width/##00 scale/0.5 sign-accounting-except-zero integer-width/##00 scale/0.5 decimal-always es-MX 00. - 5913.68225 + 5,913.68225 -00.11111 zh-TW 00. @@ -8922,7 +8922,7 @@ integer-width/##00 group-on-aligned decimal-always integer-width/##00 latin sign-accounting-except-zero es-MX 00 - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00 @@ -8936,7 +8936,7 @@ integer-width/##00 latin sign-accounting-except-zero integer-width/##00 latin decimal-always es-MX 00. - 1827.3645 + 1,827.3645 -00.22222 zh-TW 00. @@ -8950,7 +8950,7 @@ integer-width/##00 latin decimal-always integer-width/##00 sign-accounting-except-zero decimal-always es-MX 00. - +1827.3645 + +1,827.3645 -00.22222 zh-TW 00. diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt index fea36ee912a..a7a8d890617 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt @@ -36,8 +36,8 @@ hy_arevela ; hy hy_arevmda ; hyw hy_arevmda_arevela ; hyw hye_arevmda ; hyw -no_bokmal_nynorsk ; nn -no_nynorsk_bokmal ; nn +no_bokmal_nynorsk ; nb +no_nynorsk_bokmal ; nb zh_guoyu_hakka_xiang ; hak zh_hakka_xiang ; hak @@ -276,9 +276,9 @@ nno ; nn nns ; nbr nnx ; ngv no ; no -no_bokmal ; no +no_bokmal ; nb no_nynorsk ; nn -nob ; no +nob ; nb nor ; no npi ; ne nts ; pij @@ -1460,11 +1460,11 @@ nld_Adlm_AC_fonipa ; nl_Adlm_AC_fonipa nno_Adlm_AC_fonipa ; nn_Adlm_AC_fonipa nns_Adlm_AC_fonipa ; nbr_Adlm_AC_fonipa nnx_Adlm_AC_fonipa ; ngv_Adlm_AC_fonipa -no_Adlm_AC_bokmal_fonipa ; no_Adlm_AC_fonipa -no_Adlm_AC_bokmal_fonipa_nynorsk ; nn_Adlm_AC_fonipa +no_Adlm_AC_bokmal_fonipa ; nb_Adlm_AC_fonipa +no_Adlm_AC_bokmal_fonipa_nynorsk ; nb_Adlm_AC_fonipa no_Adlm_AC_fonipa ; no_Adlm_AC_fonipa no_Adlm_AC_fonipa_nynorsk ; nn_Adlm_AC_fonipa -nob_Adlm_AC_fonipa ; no_Adlm_AC_fonipa +nob_Adlm_AC_fonipa ; nb_Adlm_AC_fonipa nor_Adlm_AC_fonipa ; no_Adlm_AC_fonipa npi_Adlm_AC_fonipa ; ne_Adlm_AC_fonipa nts_Adlm_AC_fonipa ; pij_Adlm_AC_fonipa diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java index 7dec9e3c947..d34b729eefd 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -905,7 +905,7 @@ public class ULocaleTest extends TestFmwk { { "de-1901", "de__1901", "de__1901" }, /* registered name */ { "de-1906", "de__1906", "de__1906" }, /* registered name */ // New in CLDR 39 / ICU 69 - { "nb", "nb", "no" }, + { "nb", "nb", "nb" }, /* posix behavior that used to be performed by getName */ { "mr.utf8", null, "mr" }, @@ -3039,8 +3039,8 @@ public class ULocaleTest extends TestFmwk { "nl" }, { "und_NO", - "no_Latn_NO", - "no" + "nb_Latn_NO", + "nb" }, { "und_NP", "ne_Deva_NP", @@ -3151,8 +3151,8 @@ public class ULocaleTest extends TestFmwk { "sl" }, { "und_SJ", - "no_Latn_SJ", - "no_SJ" + "nb_Latn_SJ", + "nb_SJ" }, { "und_SK", "sk_Latn_SK", @@ -5161,15 +5161,15 @@ public class ULocaleTest extends TestFmwk { if (!logKnownIssue("21236", "skip some canonicalization tests until code fixed")) { // language _ variant -> language - Assert.assertEquals("no", canonicalTag("no-BOKMAL")); + Assert.assertEquals("nb", canonicalTag("no-BOKMAL")); // also test with script, country and extensions - Assert.assertEquals("no-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-u-ca-japanese")); + Assert.assertEquals("nb-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-u-ca-japanese")); // also test with other variants, script, country and extensions - Assert.assertEquals("no-Cyrl-ID-1901-xsistemo-u-ca-japanese", + Assert.assertEquals("nb-Cyrl-ID-1901-xsistemo-u-ca-japanese", canonicalTag("no-Cyrl-ID-1901-BOKMAL-xsistemo-u-ca-japanese")); - Assert.assertEquals("no-Cyrl-ID-1901-u-ca-japanese", + Assert.assertEquals("nb-Cyrl-ID-1901-u-ca-japanese", canonicalTag("no-Cyrl-ID-1901-BOKMAL-u-ca-japanese")); - Assert.assertEquals("no-Cyrl-ID-xsistemo-u-ca-japanese", + Assert.assertEquals("nb-Cyrl-ID-xsistemo-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-xsistemo-u-ca-japanese")); Assert.assertEquals("nn", canonicalTag("no-NYNORSK")); @@ -5282,7 +5282,7 @@ public class ULocaleTest extends TestFmwk { Assert.assertEquals("en-t-hy-latn-am", canonicalTag("en-t-hy-latn-SU")); Assert.assertEquals("ru-t-ru-cyrl-ru", canonicalTag("ru-t-ru-cyrl-SU")); Assert.assertEquals("fr-t-fr-ru", canonicalTag("fr-t-fr-172")); - Assert.assertEquals("und-t-no-latn", canonicalTag("und-t-no-latn-BOKMAL")); + Assert.assertEquals("und-t-nb-latn", canonicalTag("und-t-no-latn-BOKMAL")); Assert.assertEquals("und-t-dse-zinh", canonicalTag("und-t-sgn-qAAi-NL")); // alias of tvalue should be replaced Assert.assertEquals("en-t-m0-prprname", canonicalTag("en-t-m0-NaMeS")); diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index 4aba6bc770c..b0fafe3b64f 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -197,7 +197,7 @@ mt, mua, my, mzn // N - naq, nb, nb_NO, nb_SJ, nd, ne, nl, nmg, nn, nnh, no, no_NO_NY, nus, nyn + naq, nb, nd, ne, nl, nmg, nn, nnh, no, no_NO, no_NO_NY, nus, nyn // O om, or, os @@ -323,7 +323,7 @@ // F-P fa_AF, fa, ff, fil, fi, fo, fr_BE, fr_CH, fr, ga, he, hi, hr, hu, hy, id, in, is, it, iw, ja, ka, kl, km, ko, ky, lb, - lo, lrc, lt, lv, mk, ms, mt, my, nb, nl, nn, no, pl, pt_PT, pt, + lo, lrc, lt, lv, mk, ms, mt, my, nb, ne, nl, nn, no, pl, pt_PT, pt, // Q-Z qu, ro, ru, se, sh, sk, sl, sq, sr_Latn, sr, su, sv, sw, ta, th, tr, @@ -354,6 +354,11 @@ + + +