diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp index de09a697191..b02c335cad9 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", "nb", "nb_NO", "ne", "ne_NP", - "nl", "nl_NL", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", + "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", "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 29a5646385e..46008afb74a 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, "nb_NO"}, /* really nb_NO. Keep first in the 414 list. */ - {0x0414, "no_NO"}, /* really nb_NO */ + {0x0414, "no_NO"}, /* really no_NO. Keep first in the 414 list. */ + {0x0414, "nb_NO"}, /* really no_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/data/brkitr/LOCALE_DEPS.json b/icu4c/source/data/brkitr/LOCALE_DEPS.json index 72ee5981c38..8b33eb08060 100644 --- a/icu4c/source/data/brkitr/LOCALE_DEPS.json +++ b/icu4c/source/data/brkitr/LOCALE_DEPS.json @@ -3,5 +3,5 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "38" + "cldrVersion": "39" } diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt index d7025733370..44e710e62f5 100644 --- a/icu4c/source/data/brkitr/root.txt +++ b/icu4c/source/data/brkitr/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"38"} + Version{"39"} boundaries{ grapheme:process(dependency){"char.brk"} line:process(dependency){"line.brk"} diff --git a/icu4c/source/data/build.xml b/icu4c/source/data/build.xml index ffee73d34b8..bcc07bd655d 100644 --- a/icu4c/source/data/build.xml +++ b/icu4c/source/data/build.xml @@ -30,18 +30,18 @@ - + - - + + - + diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index 93b9ef391a7..986447e4797 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -30,6 +30,9 @@ # plus the xml-apis.jar from the Apache xalan package # (http://xml.apache.org/xalan-j/downloads.html). # +# You will also need to have performed the CLDR Maven setup (non-Eclipse version) +# per http://cldr.unicode.org/development/maven +# # Note: Enough things can (and will) fail in this process that it is best to # run the commands separately from an interactive shell. They should all # copy and paste without problems. @@ -195,7 +198,7 @@ ant copy-cldr-testdata # 4d. Copy from CLDR common/testData/localeIdentifiers/localeCanonicalization.txt # into icu4c/source/test/testdata/localeCanonicalization.txt # and icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt -# and add the following line to the begginning of these two files +# and add the following line to the beginning of these two files # # File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt # 5. Check which data files have modifications, which have been added or removed diff --git a/icu4c/source/data/coll/LOCALE_DEPS.json b/icu4c/source/data/coll/LOCALE_DEPS.json index 2f4779bbbbc..5977eb7e183 100644 --- a/icu4c/source/data/coll/LOCALE_DEPS.json +++ b/icu4c/source/data/coll/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "38", + "cldrVersion": "39", "aliases": { "ars": "ar_SA", "in": "id", @@ -11,8 +11,8 @@ "iw": "he", "iw_IL": "he_IL", "mo": "ro", - "no": "nb", - "no_NO": "nb_NO", + "nb": "no", + "nb_NO": "no_NO", "pa_IN": "pa_Guru_IN", "sh": "sr_Latn", "sh_BA": "sr_Latn_BA", @@ -33,6 +33,7 @@ "zh_TW": "zh_Hant_TW" }, "parents": { - "ff_Adlm": "root" + "ff_Adlm": "root", + "nn": "no" } } diff --git a/icu4c/source/data/coll/af.txt b/icu4c/source/data/coll/af.txt index 94ffffe4595..32b62e44a3f 100644 --- a/icu4c/source/data/coll/af.txt +++ b/icu4c/source/data/coll/af.txt @@ -5,7 +5,7 @@ af{ collations{ standard{ Sequence{"&N<<<ʼn"} - Version{"38"} + Version{"39"} } } } diff --git a/icu4c/source/data/coll/am.txt b/icu4c/source/data/coll/am.txt index 7488ea62fd1..bfc5fba3789 100644 --- a/icu4c/source/data/coll/am.txt +++ b/icu4c/source/data/coll/am.txt @@ -5,7 +5,7 @@ am{ collations{ standard{ Sequence{"[reorder Ethi]"} - Version{"38"} + Version{"39"} } } } diff --git a/icu4c/source/data/coll/ar.txt b/icu4c/source/data/coll/ar.txt index 6f946191d16..efe8a4dbf62 100644 --- a/icu4c/source/data/coll/ar.txt +++ b/icu4c/source/data/coll/ar.txt @@ -9,7 +9,7 @@ ar{ "&ت<<ة<<<ﺔ<<<ﺓ" "&ي<<ى<<<ﯨ<<<ﯩ<<<ﻰ<<<ﻯ<<<ﲐ<<<ﱝ" } - Version{"38"} + Version{"39"} } standard{ Sequence{ @@ -397,7 +397,7 @@ ar{ "‎&ۓ‎=ﮰ‎=ﮱ" "‎&ۀ‎=ﮤ‎=ﮥ" } - Version{"38"} + Version{"39"} } } } diff --git a/icu4c/source/data/coll/as.txt b/icu4c/source/data/coll/as.txt index 7c6c46f2eea..bd3970ee622 100644 --- a/icu4c/source/data/coll/as.txt +++ b/icu4c/source/data/coll/as.txt @@ -11,7 +11,7 @@ as{ "&[before 1]ত<ৎ=ত্\u200D" "&হ<ক্ষ" } - Version{"38"} + Version{"39"} } } } diff --git a/icu4c/source/data/coll/az.txt b/icu4c/source/data/coll/az.txt index 0bc16bf3455..01723f81334 100644 --- a/icu4c/source/data/coll/az.txt +++ b/icu4c/source/data/coll/az.txt @@ -9,7 +9,7 @@ az{ "[import az-u-co-standard]" "[reorder others]" } - Version{"38"} + Version{"39"} } standard{ Sequence{ @@ -26,7 +26,7 @@ az{ "&H>;", "x.x: =0.0=;", "0: =%spellout-numbering=;", - "1100/100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];", - "10000: =%spellout-numbering=;", + "1100/100: <<\u00ADhundert[\u00AD>>];", + "2000: =%spellout-numbering=;", "%spellout-numbering:", "-x: minus >>;", "x.x: << Komma >>;", @@ -138,6 +138,23 @@ de{ "1000000000000000: eine Billiarde[ >>];", "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];", "1000000000000000000: =#,##0=;", + "%spellout-cardinal-m:", + "-x: minus >>;", + "x.x: << Komma >>;", + "0: null;", + "1: einem;", + "2: =%spellout-numbering=;", + "100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];", + "1000: <%spellout-cardinal-masculine<\u00ADtausend[\u00AD>>];", + "1000000: eine Million[ >>];", + "2000000: <%spellout-cardinal-feminine< Millionen[ >>];", + "1000000000: eine Milliarde[ >>];", + "2000000000: <%spellout-cardinal-feminine< Milliarden[ >>];", + "1000000000000: eine Billion[ >>];", + "2000000000000: <%spellout-cardinal-feminine< Billionen[ >>];", + "1000000000000000: eine Billiarde[ >>];", + "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];", + "1000000000000000000: =#,##0=;", "%%ste:", "0: ste;", "1: \u00AD=%spellout-ordinal=;", @@ -181,6 +198,10 @@ de{ "-x: minus >>;", "x.x: =#,##0.#=;", "0: =%spellout-ordinal=s;", + "%spellout-ordinal-m:", + "-x: minus >>;", + "x.x: =#,##0.#=;", + "0: =%spellout-ordinal=m;", } } } diff --git a/icu4c/source/data/rbnf/de_CH.txt b/icu4c/source/data/rbnf/de_CH.txt index 187418a4d63..eab318264da 100644 --- a/icu4c/source/data/rbnf/de_CH.txt +++ b/icu4c/source/data/rbnf/de_CH.txt @@ -8,8 +8,8 @@ de_CH{ "-x: minus >>;", "x.x: =0.0=;", "0: =%spellout-numbering=;", - "1100/100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];", - "10000: =%spellout-numbering=;", + "1100/100: <<\u00ADhundert[\u00AD>>];", + "2000: =%spellout-numbering=;", "%spellout-numbering:", "-x: minus >>;", "x.x: << Komma >>;", @@ -136,6 +136,23 @@ de_CH{ "1000000000000000: eine Billiarde[ >>];", "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];", "1000000000000000000: =#,##0=;", + "%spellout-cardinal-m:", + "-x: minus >>;", + "x.x: << Komma >>;", + "0: null;", + "1: einem;", + "2: =%spellout-numbering=;", + "100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];", + "1000: <%spellout-cardinal-masculine<\u00ADtausend[\u00AD>>];", + "1000000: eine Million[ >>];", + "2000000: <%spellout-cardinal-feminine< Millionen[ >>];", + "1000000000: eine Milliarde[ >>];", + "2000000000: <%spellout-cardinal-feminine< Milliarden[ >>];", + "1000000000000: eine Billion[ >>];", + "2000000000000: <%spellout-cardinal-feminine< Billionen[ >>];", + "1000000000000000: eine Billiarde[ >>];", + "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];", + "1000000000000000000: =#,##0=;", "%%ste:", "0: ste;", "1: \u00AD=%spellout-ordinal=;", @@ -179,6 +196,10 @@ de_CH{ "-x: minus >>;", "x.x: =#,##0.#=;", "0: =%spellout-ordinal=s;", + "%spellout-ordinal-m:", + "-x: minus >>;", + "x.x: =#,##0.#=;", + "0: =%spellout-ordinal=m;", } } } diff --git a/icu4c/source/data/rbnf/fi.txt b/icu4c/source/data/rbnf/fi.txt index eb627a9400a..9ce1970ea3e 100644 --- a/icu4c/source/data/rbnf/fi.txt +++ b/icu4c/source/data/rbnf/fi.txt @@ -307,6 +307,30 @@ fi{ "1000000000000: << biljoonalle[ >>];", "2000000000000: << biljoonalle[ >>];", "1000000000000000000: =#,##0=;", + "%spellout-cardinal-plural:", + "-x: miinus >>;", + "x.x: << pilkku >>;", + "0: nollat;", + "1: yhdet;", + "2: kahdet;", + "3: kolmet;", + "4: nelj\u00E4t;", + "5: viidet;", + "6: kuudet;", + "7: seitsem\u00E4t;", + "8: kahdeksat;", + "9: yhdeks\u00E4t;", + "10: kymmenet;", + "11: >>toista;", + "20: <<-kymmenet[\u00AD>>];", + "100: sadat[\u00AD>>];", + "200: <<-sadat[\u00AD>>];", + "1000: tuhannet[\u00AD>>];", + "2000: <<\u00ADtuhannet[\u00AD>>];", + "1000000: << miljoonat[ >>];", + "1000000000: << miljardit[ >>];", + "1000000000000: << biljoonat[ >>];", + "1000000000000000000: =#,##0=;", "%spellout-cardinal-genitive-plural:", "-x: miinus >>;", "x.x: << pilkku >>;", @@ -940,6 +964,39 @@ fi{ "1000000000000: biljoonannelle[ >>];", "2000000000000: <%%spellout-ordinal-allative-larger<\u00ADbiljoonannelle[ >>];", "1000000000000000000: =#,##0=;", + "%%spellout-ordinal-plural-larger:", + "0: ;", + "2: kahdennet;", + "3: =%spellout-ordinal-plural=;", + "%spellout-ordinal-plural:", + "-x: miinus >>;", + "x.x: =#,##0.#=;", + "0: nollannet;", + "1: ensimm\u00E4iset;", + "2: toiset;", + "3: kolmannet;", + "4: nelj\u00E4nnet;", + "5: viidennet;", + "6: kuudennet;", + "7: seitsem\u00E4nnet;", + "8: kahdeksannet;", + "9: yhdeks\u00E4nnet;", + "10: kymmenennet;", + "11: yhdennettoista;", + "12: kahdennettoista;", + "13: >>toista;", + "20: <%%spellout-ordinal-plural-larger<\u00ADkymmenennet[\u00AD>>];", + "100: sadannet[\u00AD>>];", + "200: <%%spellout-ordinal-plural-larger<\u00ADsadannet[\u00AD>>];", + "1000: tuhannennet[\u00AD>>];", + "2000: <%%spellout-ordinal-plural-larger<\u00ADtuhannennet[\u00AD>>];", + "1000000: miljoonannet[\u00AD>>];", + "2000000: <%%spellout-ordinal-plural-larger<\u00ADmiljoonannet[\u00AD>>];", + "1000000000: miljardinnet[\u00AD>>];", + "2000000000: <%%spellout-ordinal-plural-larger<\u00ADmiljardinnet[\u00AD>>];", + "1000000000000: biljoonannet[ >>];", + "2000000000000: <%%spellout-ordinal-plural-larger<\u00ADbiljoonannet[ >>];", + "1000000000000000000: =#,##0=;", "%%spellout-ordinal-genitive-plural-larger:", "0: ;", "2: kahdensien;", diff --git a/icu4c/source/data/rbnf/fr.txt b/icu4c/source/data/rbnf/fr.txt index 21f9bf9252a..0c230238de0 100644 --- a/icu4c/source/data/rbnf/fr.txt +++ b/icu4c/source/data/rbnf/fr.txt @@ -27,7 +27,7 @@ fr{ "x.x: =0.0=;", "0: =%spellout-numbering=;", "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;", - "10000: =%spellout-numbering=;", + "2000: =%spellout-numbering=;", "%spellout-numbering:", "0: =%spellout-cardinal-masculine=;", "%%et-un:", diff --git a/icu4c/source/data/rbnf/fr_BE.txt b/icu4c/source/data/rbnf/fr_BE.txt index ac5de381a7b..cf1e5c8834a 100644 --- a/icu4c/source/data/rbnf/fr_BE.txt +++ b/icu4c/source/data/rbnf/fr_BE.txt @@ -11,7 +11,7 @@ fr_BE{ "x.x: =0.0=;", "0: =%spellout-numbering=;", "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;", - "10000: =%spellout-numbering=;", + "2000: =%spellout-numbering=;", "%spellout-numbering:", "0: =%spellout-cardinal-masculine=;", "%%et-un:", diff --git a/icu4c/source/data/rbnf/fr_CH.txt b/icu4c/source/data/rbnf/fr_CH.txt index b1458911ac8..9cb1f8de164 100644 --- a/icu4c/source/data/rbnf/fr_CH.txt +++ b/icu4c/source/data/rbnf/fr_CH.txt @@ -11,7 +11,7 @@ fr_CH{ "x.x: =0.0=;", "0: =%spellout-numbering=;", "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;", - "10000: =%spellout-numbering=;", + "2000: =%spellout-numbering=;", "%spellout-numbering:", "0: =%spellout-cardinal-masculine=;", "%%et-un:", diff --git a/icu4c/source/data/rbnf/it.txt b/icu4c/source/data/rbnf/it.txt index 2dd2243f8ec..dd3b1c7da6c 100644 --- a/icu4c/source/data/rbnf/it.txt +++ b/icu4c/source/data/rbnf/it.txt @@ -152,7 +152,7 @@ it{ "200: <<\u00ADcent>%%msc-with-o-nofinal>;", "%%msc-with-i-nofinal:", "0: =%%msc-with-i=;", - "3: a\u00ADtre;", + "3: i\u00ADtre;", "4: =%%msc-with-i=;", "%%msc-with-a-nofinal:", "0: =%%msc-with-a=;", diff --git a/icu4c/source/data/rbnf/nb.txt b/icu4c/source/data/rbnf/nb.txt index 068f77413e2..934f064b8be 100644 --- a/icu4c/source/data/rbnf/nb.txt +++ b/icu4c/source/data/rbnf/nb.txt @@ -2,311 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - RBNFRules{ - SpelloutRules{ - "%%lenient-parse:", - "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';", - "%spellout-numbering-year:", - "-x: minus >>;", - "x.x: =0.0=;", - "0: =%spellout-numbering=;", - "1100/100: <<\u00ADhundre[ og >>];", - "10000: =%spellout-numbering=;", - "%spellout-numbering:", - "0: =%%spellout-cardinal-reale=;", - "%spellout-cardinal-masculine:", - "0: =%%spellout-cardinal-reale=;", - "%spellout-cardinal-feminine:", - "-x: minus >>;", - "x.x: << komma >>;", - "0: null;", - "1: ei;", - "2: =%%spellout-cardinal-reale=;", - "100: hundre[ og >>];", - "200: <%spellout-cardinal-neuter< hundre[ og >>];", - "1000: tusen[ >%%and-small-f>];", - "2000: <%spellout-cardinal-neuter< tusen[ >%%and-small-f>];", - "1000000: \u00E9n million[ >>];", - "2000000: <%%spellout-cardinal-reale< millioner[ >>];", - "1000000000: \u00E9n milliard[ >>];", - "2000000000: <%%spellout-cardinal-reale< milliarder[ >>];", - "1000000000000: \u00E9n billion[ >>];", - "2000000000000: <%%spellout-cardinal-reale< billioner[ >>];", - "1000000000000000: \u00E9n billiard[ >>];", - "2000000000000000: <%%spellout-cardinal-reale< billiarder[ >>];", - "1000000000000000000: =#,##0=;", - "%%and-small-f:", - "0: og =%spellout-cardinal-feminine=;", - "100: =%spellout-cardinal-feminine=;", - "%spellout-cardinal-neuter:", - "-x: minus >>;", - "x.x: << komma >>;", - "0: null;", - "1: ett;", - "2: =%%spellout-cardinal-reale=;", - "20: tjue[\u00AD>>];", - "30: tretti[\u00AD>>];", - "40: f\u00F8rti[\u00AD>>];", - "50: femti[\u00AD>>];", - "60: seksti[\u00AD>>];", - "70: sytti[\u00AD>>];", - "80: \u00E5tti[\u00AD>>];", - "90: nitti[\u00AD>>];", - "100: hundre[ og >>];", - "200: <%spellout-cardinal-neuter< hundre[ og >>];", - "1000: tusen[ >%%and-small-n>];", - "2000: <%spellout-cardinal-neuter< tusen[ >%%and-small-n>];", - "1000000: \u00E9n million[ >>];", - "2000000: <%%spellout-cardinal-reale< millioner[ >>];", - "1000000000: \u00E9n milliard[ >>];", - "2000000000: <%%spellout-cardinal-reale< milliarder[ >>];", - "1000000000000: \u00E9n billion[ >>];", - "2000000000000: <%%spellout-cardinal-reale< billioner[ >>];", - "1000000000000000: \u00E9n billiard[ >>];", - "2000000000000000: <%%spellout-cardinal-reale< billiarder[ >>];", - "1000000000000000000: =#,##0=;", - "%%and-small-n:", - "0: og =%spellout-cardinal-neuter=;", - "100: =%spellout-cardinal-neuter=;", - "%%spellout-cardinal-reale:", - "-x: minus >>;", - "x.x: << komma >>;", - "0: null;", - "1: \u00E9n;", - "2: to;", - "3: tre;", - "4: fire;", - "5: fem;", - "6: seks;", - "7: sju;", - "8: \u00E5tte;", - "9: ni;", - "10: ti;", - "11: elleve;", - "12: tolv;", - "13: tretten;", - "14: fjorten;", - "15: femten;", - "16: seksten;", - "17: sytten;", - "18: atten;", - "19: nitten;", - "20: tjue[\u00AD>>];", - "30: tretti[\u00AD>>];", - "40: f\u00F8rti[\u00AD>>];", - "50: femti[\u00AD>>];", - "60: seksti[\u00AD>>];", - "70: sytti[\u00AD>>];", - "80: \u00E5tti[\u00AD>>];", - "90: nitti[\u00AD>>];", - "100: hundre[ og >>];", - "200: <%spellout-cardinal-neuter< hundre[ og >>];", - "1000: tusen[ >%%and-small>];", - "2000: <%spellout-cardinal-neuter< tusen[ >%%and-small>];", - "1000000: \u00E9n million[ >>];", - "2000000: << millioner[ >>];", - "1000000000: \u00E9n milliard[ >>];", - "2000000000: << milliarder[ >>];", - "1000000000000: \u00E9n billion[ >>];", - "2000000000000: << billioner[ >>];", - "1000000000000000: \u00E9n billiard[ >>];", - "2000000000000000: << billiarder[ >>];", - "1000000000000000000: =#,##0=;", - "%%and-small:", - "0: og =%%spellout-cardinal-reale=;", - "100: =%%spellout-cardinal-reale=;", - "%spellout-ordinal-masculine:", - "-x: minus >>;", - "x.x: =#,##0.#=;", - "0: nullte;", - "1: f\u00F8rste;", - "2: andre;", - "3: tredje;", - "4: fjerde;", - "5: femte;", - "6: sjette;", - "7: sjuende;", - "8: \u00E5ttende;", - "9: niende;", - "10: tiende;", - "11: ellevte;", - "12: tolvte;", - "13: =%spellout-cardinal-neuter=de;", - "20: tjue>%%ord-masc-nde>;", - "30: tretti>%%ord-masc-nde>;", - "40: f\u00F8rti>%%ord-masc-nde>;", - "50: femti>%%ord-masc-nde>;", - "60: seksti>%%ord-masc-nde>;", - "70: sytti>%%ord-masc-nde>;", - "80: \u00E5tti>%%ord-masc-nde>;", - "90: nitti>%%ord-masc-nde>;", - "100: <%spellout-numbering<\u00ADhundre>%%ord-masc-de>;", - "1000: <%spellout-numbering<\u00ADtusen>%%ord-masc-de>;", - "1000000: \u00E9n million>%%ord-masc-te>;", - "2000000: <%%spellout-cardinal-reale< million>%%ord-masc-teer>;", - "1000000000: \u00E9n milliard>%%ord-masc-te>;", - "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-masc-teer>;", - "1000000000000: \u00E9n billion>%%ord-masc-te>;", - "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-masc-teer>;", - "1000000000000000: \u00E9n billiard>%%ord-masc-te>;", - "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-masc-teer>;", - "1000000000000000000: =#,##0=.;", - "%%ord-masc-nde:", - "0: ende;", - "1: \u00AD=%spellout-ordinal-masculine=;", - "%%ord-masc-de:", - "0: de;", - "1: ' =%spellout-ordinal-masculine=;", - "%%ord-masc-te:", - "0: te;", - "1: ' =%spellout-ordinal-masculine=;", - "%%ord-masc-teer:", - "0: te;", - "1: er =%spellout-ordinal-masculine=;", - "%spellout-ordinal-neuter:", - "-x: minus >>;", - "x.x: =#,##0.#=;", - "0: nullte;", - "1: f\u00F8rste;", - "2: andre;", - "3: tredje;", - "4: fjerde;", - "5: femte;", - "6: sjette;", - "7: sjuende;", - "8: \u00E5ttende;", - "9: niende;", - "10: tiende;", - "11: ellevte;", - "12: tolvte;", - "13: =%spellout-cardinal-neuter=de;", - "20: tjue>%%ord-neut-nde>;", - "30: tretti>%%ord-neut-nde>;", - "40: f\u00F8rti>%%ord-neut-nde>;", - "50: femti>%%ord-neut-nde>;", - "60: seksti>%%ord-neut-nde>;", - "70: sytti>%%ord-neut-nde>;", - "80: \u00E5tti>%%ord-neut-nde>;", - "90: nitti>%%ord-neut-nde>;", - "100: <%spellout-numbering<\u00ADhundre>%%ord-neut-de>;", - "1000: <%spellout-numbering<\u00ADtusen>%%ord-neut-de>;", - "1000000: \u00E9n million>%%ord-neut-te>;", - "2000000: <%%spellout-cardinal-reale< million>%%ord-neut-teer>;", - "1000000000: \u00E9n milliard>%%ord-neut-te>;", - "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-neut-teer>;", - "1000000000000: \u00E9n billion>%%ord-neut-te>;", - "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-neut-teer>;", - "1000000000000000: \u00E9n billiard>%%ord-neut-te>;", - "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-neut-teer>;", - "1000000000000000000: =#,##0=.;", - "%%ord-neut-nde:", - "0: ende;", - "1: \u00AD=%spellout-ordinal-neuter=;", - "%%ord-neut-de:", - "0: de;", - "1: ' =%spellout-ordinal-neuter=;", - "%%ord-neut-te:", - "0: te;", - "1: ' =%spellout-ordinal-neuter=;", - "%%ord-neut-teer:", - "0: te;", - "1: er =%spellout-ordinal-neuter=;", - "%spellout-ordinal-feminine:", - "-x: minus >>;", - "x.x: =#,##0.#=;", - "0: nullte;", - "1: f\u00F8rste;", - "2: andre;", - "3: tredje;", - "4: fjerde;", - "5: femte;", - "6: sjette;", - "7: sjuende;", - "8: \u00E5ttende;", - "9: niende;", - "10: tiende;", - "11: ellevte;", - "12: tolvte;", - "13: =%spellout-cardinal-neuter=de;", - "20: tjue>%%ord-fem-nde>;", - "30: tretti>%%ord-fem-nde>;", - "40: f\u00F8rti>%%ord-fem-nde>;", - "50: femti>%%ord-fem-nde>;", - "60: seksti>%%ord-fem-nde>;", - "70: sytti>%%ord-fem-nde>;", - "80: \u00E5tti>%%ord-fem-nde>;", - "90: nitti>%%ord-fem-nde>;", - "100: <%spellout-numbering<\u00ADhundre>%%ord-fem-de>;", - "1000: <%spellout-numbering<\u00ADtusen>%%ord-fem-de>;", - "1000000: \u00E9n million>%%ord-fem-te>;", - "2000000: <%%spellout-cardinal-reale< million>%%ord-fem-teer>;", - "1000000000: \u00E9n milliard>%%ord-fem-te>;", - "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-fem-teer>;", - "1000000000000: \u00E9n billion>%%ord-fem-te>;", - "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-fem-teer>;", - "1000000000000000: \u00E9n billiard>%%ord-fem-te>;", - "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-fem-teer>;", - "1000000000000000000: =#,##0=.;", - "%%ord-fem-nde:", - "0: ende;", - "1: \u00AD=%spellout-ordinal-feminine=;", - "%%ord-fem-de:", - "0: de;", - "1: ' =%spellout-ordinal-feminine=;", - "%%ord-fem-te:", - "0: te;", - "1: ' =%spellout-ordinal-feminine=;", - "%%ord-fem-teer:", - "0: te;", - "1: er =%spellout-ordinal-feminine=;", - "%spellout-ordinal-plural:", - "-x: minus >>;", - "x.x: =#,##0.#=;", - "0: nullte;", - "1: f\u00F8rste;", - "2: andre;", - "3: tredje;", - "4: fjerde;", - "5: femte;", - "6: sjette;", - "7: sjuende;", - "8: \u00E5ttende;", - "9: niende;", - "10: tiende;", - "11: ellevte;", - "12: tolvte;", - "13: =%spellout-cardinal-neuter=de;", - "20: tjue>%%ord-plural-nde>;", - "30: tretti>%%ord-plural-nde>;", - "40: f\u00F8rti>%%ord-plural-nde>;", - "50: femti>%%ord-plural-nde>;", - "60: seksti>%%ord-plural-nde>;", - "70: sytti>%%ord-plural-nde>;", - "80: \u00E5tti>%%ord-plural-nde>;", - "90: nitti>%%ord-plural-nde>;", - "100: <%spellout-numbering<\u00ADhundre>%%ord-plural-de>;", - "1000: <%spellout-numbering<\u00ADtusen>%%ord-plural-de>;", - "1000000: \u00E9n million>%%ord-plural-te>;", - "2000000: <%%spellout-cardinal-reale< million>%%ord-plural-teer>;", - "1000000000: \u00E9n milliard>%%ord-plural-te>;", - "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-plural-teer>;", - "1000000000000: \u00E9n billion>%%ord-plural-te>;", - "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-plural-teer>;", - "1000000000000000: \u00E9n billiard>%%ord-plural-te>;", - "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-plural-teer>;", - "1000000000000000000: =#,##0=.;", - "%%ord-plural-nde:", - "0: ende;", - "1: \u00AD=%spellout-ordinal-plural=;", - "%%ord-plural-de:", - "0: de;", - "1: ' =%spellout-ordinal-plural=;", - "%%ord-plural-te:", - "0: te;", - "1: ' =%spellout-ordinal-plural=;", - "%%ord-plural-teer:", - "0: te;", - "1: er =%spellout-ordinal-plural=;", - } - } + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/rbnf/nn.txt b/icu4c/source/data/rbnf/nn.txt index acb80407bd9..50704cb6ade 100644 --- a/icu4c/source/data/rbnf/nn.txt +++ b/icu4c/source/data/rbnf/nn.txt @@ -2,6 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ + %%Parent{"no"} RBNFRules{ SpelloutRules{ "%%lenient-parse:", diff --git a/icu4c/source/data/rbnf/no.txt b/icu4c/source/data/rbnf/no.txt index 474d0b21b0d..5ce7c65a4b2 100644 --- a/icu4c/source/data/rbnf/no.txt +++ b/icu4c/source/data/rbnf/no.txt @@ -2,5 +2,309 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ - "%%ALIAS"{"nb"} + RBNFRules{ + SpelloutRules{ + "%spellout-numbering-year:", + "-x: minus >>;", + "x.x: =0.0=;", + "0: =%spellout-numbering=;", + "1100/100: <<\u00ADhundre[ og >>];", + "10000: =%spellout-numbering=;", + "%spellout-numbering:", + "0: =%%spellout-cardinal-reale=;", + "%spellout-cardinal-masculine:", + "0: =%%spellout-cardinal-reale=;", + "%spellout-cardinal-feminine:", + "-x: minus >>;", + "x.x: << komma >>;", + "0: null;", + "1: ei;", + "2: =%%spellout-cardinal-reale=;", + "100: hundre[ og >>];", + "200: <%spellout-cardinal-neuter< hundre[ og >>];", + "1000: tusen[ >%%and-small-f>];", + "2000: <%spellout-cardinal-neuter< tusen[ >%%and-small-f>];", + "1000000: \u00E9n million[ >>];", + "2000000: <%%spellout-cardinal-reale< millioner[ >>];", + "1000000000: \u00E9n milliard[ >>];", + "2000000000: <%%spellout-cardinal-reale< milliarder[ >>];", + "1000000000000: \u00E9n billion[ >>];", + "2000000000000: <%%spellout-cardinal-reale< billioner[ >>];", + "1000000000000000: \u00E9n billiard[ >>];", + "2000000000000000: <%%spellout-cardinal-reale< billiarder[ >>];", + "1000000000000000000: =#,##0=;", + "%%and-small-f:", + "0: og =%spellout-cardinal-feminine=;", + "100: =%spellout-cardinal-feminine=;", + "%spellout-cardinal-neuter:", + "-x: minus >>;", + "x.x: << komma >>;", + "0: null;", + "1: ett;", + "2: =%%spellout-cardinal-reale=;", + "20: tjue[\u00AD>>];", + "30: tretti[\u00AD>>];", + "40: f\u00F8rti[\u00AD>>];", + "50: femti[\u00AD>>];", + "60: seksti[\u00AD>>];", + "70: sytti[\u00AD>>];", + "80: \u00E5tti[\u00AD>>];", + "90: nitti[\u00AD>>];", + "100: hundre[ og >>];", + "200: <%spellout-cardinal-neuter< hundre[ og >>];", + "1000: tusen[ >%%and-small-n>];", + "2000: <%spellout-cardinal-neuter< tusen[ >%%and-small-n>];", + "1000000: \u00E9n million[ >>];", + "2000000: <%%spellout-cardinal-reale< millioner[ >>];", + "1000000000: \u00E9n milliard[ >>];", + "2000000000: <%%spellout-cardinal-reale< milliarder[ >>];", + "1000000000000: \u00E9n billion[ >>];", + "2000000000000: <%%spellout-cardinal-reale< billioner[ >>];", + "1000000000000000: \u00E9n billiard[ >>];", + "2000000000000000: <%%spellout-cardinal-reale< billiarder[ >>];", + "1000000000000000000: =#,##0=;", + "%%and-small-n:", + "0: og =%spellout-cardinal-neuter=;", + "100: =%spellout-cardinal-neuter=;", + "%%spellout-cardinal-reale:", + "-x: minus >>;", + "x.x: << komma >>;", + "0: null;", + "1: \u00E9n;", + "2: to;", + "3: tre;", + "4: fire;", + "5: fem;", + "6: seks;", + "7: sju;", + "8: \u00E5tte;", + "9: ni;", + "10: ti;", + "11: elleve;", + "12: tolv;", + "13: tretten;", + "14: fjorten;", + "15: femten;", + "16: seksten;", + "17: sytten;", + "18: atten;", + "19: nitten;", + "20: tjue[\u00AD>>];", + "30: tretti[\u00AD>>];", + "40: f\u00F8rti[\u00AD>>];", + "50: femti[\u00AD>>];", + "60: seksti[\u00AD>>];", + "70: sytti[\u00AD>>];", + "80: \u00E5tti[\u00AD>>];", + "90: nitti[\u00AD>>];", + "100: hundre[ og >>];", + "200: <%spellout-cardinal-neuter< hundre[ og >>];", + "1000: tusen[ >%%and-small>];", + "2000: <%spellout-cardinal-neuter< tusen[ >%%and-small>];", + "1000000: \u00E9n million[ >>];", + "2000000: << millioner[ >>];", + "1000000000: \u00E9n milliard[ >>];", + "2000000000: << milliarder[ >>];", + "1000000000000: \u00E9n billion[ >>];", + "2000000000000: << billioner[ >>];", + "1000000000000000: \u00E9n billiard[ >>];", + "2000000000000000: << billiarder[ >>];", + "1000000000000000000: =#,##0=;", + "%%and-small:", + "0: og =%%spellout-cardinal-reale=;", + "100: =%%spellout-cardinal-reale=;", + "%spellout-ordinal-masculine:", + "-x: minus >>;", + "x.x: =#,##0.#=;", + "0: nullte;", + "1: f\u00F8rste;", + "2: andre;", + "3: tredje;", + "4: fjerde;", + "5: femte;", + "6: sjette;", + "7: sjuende;", + "8: \u00E5ttende;", + "9: niende;", + "10: tiende;", + "11: ellevte;", + "12: tolvte;", + "13: =%spellout-cardinal-neuter=de;", + "20: tjue>%%ord-masc-nde>;", + "30: tretti>%%ord-masc-nde>;", + "40: f\u00F8rti>%%ord-masc-nde>;", + "50: femti>%%ord-masc-nde>;", + "60: seksti>%%ord-masc-nde>;", + "70: sytti>%%ord-masc-nde>;", + "80: \u00E5tti>%%ord-masc-nde>;", + "90: nitti>%%ord-masc-nde>;", + "100: <%spellout-numbering<\u00ADhundre>%%ord-masc-de>;", + "1000: <%spellout-numbering<\u00ADtusen>%%ord-masc-de>;", + "1000000: \u00E9n million>%%ord-masc-te>;", + "2000000: <%%spellout-cardinal-reale< million>%%ord-masc-teer>;", + "1000000000: \u00E9n milliard>%%ord-masc-te>;", + "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-masc-teer>;", + "1000000000000: \u00E9n billion>%%ord-masc-te>;", + "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-masc-teer>;", + "1000000000000000: \u00E9n billiard>%%ord-masc-te>;", + "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-masc-teer>;", + "1000000000000000000: =#,##0=.;", + "%%ord-masc-nde:", + "0: ende;", + "1: \u00AD=%spellout-ordinal-masculine=;", + "%%ord-masc-de:", + "0: de;", + "1: ' =%spellout-ordinal-masculine=;", + "%%ord-masc-te:", + "0: te;", + "1: ' =%spellout-ordinal-masculine=;", + "%%ord-masc-teer:", + "0: te;", + "1: er =%spellout-ordinal-masculine=;", + "%spellout-ordinal-neuter:", + "-x: minus >>;", + "x.x: =#,##0.#=;", + "0: nullte;", + "1: f\u00F8rste;", + "2: andre;", + "3: tredje;", + "4: fjerde;", + "5: femte;", + "6: sjette;", + "7: sjuende;", + "8: \u00E5ttende;", + "9: niende;", + "10: tiende;", + "11: ellevte;", + "12: tolvte;", + "13: =%spellout-cardinal-neuter=de;", + "20: tjue>%%ord-neut-nde>;", + "30: tretti>%%ord-neut-nde>;", + "40: f\u00F8rti>%%ord-neut-nde>;", + "50: femti>%%ord-neut-nde>;", + "60: seksti>%%ord-neut-nde>;", + "70: sytti>%%ord-neut-nde>;", + "80: \u00E5tti>%%ord-neut-nde>;", + "90: nitti>%%ord-neut-nde>;", + "100: <%spellout-numbering<\u00ADhundre>%%ord-neut-de>;", + "1000: <%spellout-numbering<\u00ADtusen>%%ord-neut-de>;", + "1000000: \u00E9n million>%%ord-neut-te>;", + "2000000: <%%spellout-cardinal-reale< million>%%ord-neut-teer>;", + "1000000000: \u00E9n milliard>%%ord-neut-te>;", + "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-neut-teer>;", + "1000000000000: \u00E9n billion>%%ord-neut-te>;", + "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-neut-teer>;", + "1000000000000000: \u00E9n billiard>%%ord-neut-te>;", + "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-neut-teer>;", + "1000000000000000000: =#,##0=.;", + "%%ord-neut-nde:", + "0: ende;", + "1: \u00AD=%spellout-ordinal-neuter=;", + "%%ord-neut-de:", + "0: de;", + "1: ' =%spellout-ordinal-neuter=;", + "%%ord-neut-te:", + "0: te;", + "1: ' =%spellout-ordinal-neuter=;", + "%%ord-neut-teer:", + "0: te;", + "1: er =%spellout-ordinal-neuter=;", + "%spellout-ordinal-feminine:", + "-x: minus >>;", + "x.x: =#,##0.#=;", + "0: nullte;", + "1: f\u00F8rste;", + "2: andre;", + "3: tredje;", + "4: fjerde;", + "5: femte;", + "6: sjette;", + "7: sjuende;", + "8: \u00E5ttende;", + "9: niende;", + "10: tiende;", + "11: ellevte;", + "12: tolvte;", + "13: =%spellout-cardinal-neuter=de;", + "20: tjue>%%ord-fem-nde>;", + "30: tretti>%%ord-fem-nde>;", + "40: f\u00F8rti>%%ord-fem-nde>;", + "50: femti>%%ord-fem-nde>;", + "60: seksti>%%ord-fem-nde>;", + "70: sytti>%%ord-fem-nde>;", + "80: \u00E5tti>%%ord-fem-nde>;", + "90: nitti>%%ord-fem-nde>;", + "100: <%spellout-numbering<\u00ADhundre>%%ord-fem-de>;", + "1000: <%spellout-numbering<\u00ADtusen>%%ord-fem-de>;", + "1000000: \u00E9n million>%%ord-fem-te>;", + "2000000: <%%spellout-cardinal-reale< million>%%ord-fem-teer>;", + "1000000000: \u00E9n milliard>%%ord-fem-te>;", + "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-fem-teer>;", + "1000000000000: \u00E9n billion>%%ord-fem-te>;", + "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-fem-teer>;", + "1000000000000000: \u00E9n billiard>%%ord-fem-te>;", + "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-fem-teer>;", + "1000000000000000000: =#,##0=.;", + "%%ord-fem-nde:", + "0: ende;", + "1: \u00AD=%spellout-ordinal-feminine=;", + "%%ord-fem-de:", + "0: de;", + "1: ' =%spellout-ordinal-feminine=;", + "%%ord-fem-te:", + "0: te;", + "1: ' =%spellout-ordinal-feminine=;", + "%%ord-fem-teer:", + "0: te;", + "1: er =%spellout-ordinal-feminine=;", + "%spellout-ordinal-plural:", + "-x: minus >>;", + "x.x: =#,##0.#=;", + "0: nullte;", + "1: f\u00F8rste;", + "2: andre;", + "3: tredje;", + "4: fjerde;", + "5: femte;", + "6: sjette;", + "7: sjuende;", + "8: \u00E5ttende;", + "9: niende;", + "10: tiende;", + "11: ellevte;", + "12: tolvte;", + "13: =%spellout-cardinal-neuter=de;", + "20: tjue>%%ord-plural-nde>;", + "30: tretti>%%ord-plural-nde>;", + "40: f\u00F8rti>%%ord-plural-nde>;", + "50: femti>%%ord-plural-nde>;", + "60: seksti>%%ord-plural-nde>;", + "70: sytti>%%ord-plural-nde>;", + "80: \u00E5tti>%%ord-plural-nde>;", + "90: nitti>%%ord-plural-nde>;", + "100: <%spellout-numbering<\u00ADhundre>%%ord-plural-de>;", + "1000: <%spellout-numbering<\u00ADtusen>%%ord-plural-de>;", + "1000000: \u00E9n million>%%ord-plural-te>;", + "2000000: <%%spellout-cardinal-reale< million>%%ord-plural-teer>;", + "1000000000: \u00E9n milliard>%%ord-plural-te>;", + "2000000000: <%%spellout-cardinal-reale< milliard>%%ord-plural-teer>;", + "1000000000000: \u00E9n billion>%%ord-plural-te>;", + "2000000000000: <%%spellout-cardinal-reale< billion>%%ord-plural-teer>;", + "1000000000000000: \u00E9n billiard>%%ord-plural-te>;", + "2000000000000000: <%%spellout-cardinal-reale< billiard>%%ord-plural-teer>;", + "1000000000000000000: =#,##0=.;", + "%%ord-plural-nde:", + "0: ende;", + "1: \u00AD=%spellout-ordinal-plural=;", + "%%ord-plural-de:", + "0: de;", + "1: ' =%spellout-ordinal-plural=;", + "%%ord-plural-te:", + "0: te;", + "1: ' =%spellout-ordinal-plural=;", + "%%ord-plural-teer:", + "0: te;", + "1: er =%spellout-ordinal-plural=;", + } + } } diff --git a/icu4c/source/data/rbnf/pt.txt b/icu4c/source/data/rbnf/pt.txt index 73761389d0d..f9633438d76 100644 --- a/icu4c/source/data/rbnf/pt.txt +++ b/icu4c/source/data/rbnf/pt.txt @@ -21,6 +21,12 @@ pt{ "0: =%spellout-numbering=;", "%spellout-numbering:", "0: =%spellout-cardinal-masculine=;", + "%%optional-e:", + "0: ' e ;", + "1: ' ;", + "%%spellout-cardinal-masculine-with-e:", + "0: ' e =%spellout-cardinal-masculine=;", + "100: >%%optional-e>=%spellout-cardinal-masculine=;", "%spellout-cardinal-masculine:", "-x: menos >>;", "x.x: << v\u00EDrgula >>;", @@ -62,17 +68,16 @@ pt{ "700: setecentos[ e >>];", "800: oitocentos[ e >>];", "900: novecentos[ e >>];", - "1000: mil[ e >>];", - "2000: << mil[ e >>];", - "1000000: um milh\u00E3o[ e >>];", - "2000000: << milh\u00F5es[ e >>];", - "1000000000: um bilh\u00E3o[ e >>];", - "2000000000: << bilh\u00F5es[ e >>];", - "1000000000000: um trilh\u00E3o[ e >>];", - "2000000000000: << trilh\u00F5es[ e >>];", - "1000000000000000: um quatrilh\u00E3o[ e >>];", - "2000000000000000: << quatrilh\u00F5es[ e >>];", + "1000: mil[>%%spellout-cardinal-masculine-with-e>];", + "2000: << mil[>%%spellout-cardinal-masculine-with-e>];", + "1000000: << $(cardinal,one{milh\u00E3o}other{milh\u00F5es})$[>%%spellout-cardinal-masculine-with-e>];", + "1000000000: << $(cardinal,one{bilh\u00E3o}other{bilh\u00F5es})$[>%%spellout-cardinal-masculine-with-e>];", + "1000000000000: << $(cardinal,one{trilh\u00E3o}other{trilh\u00F5es})$[>%%spellout-cardinal-masculine-with-e>];", + "1000000000000000: << $(cardinal,one{quatrilh\u00E3o}other{quatrilh\u00F5es})$[>%%spellout-cardinal-masculine-with-e>];", "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-feminine-with-e:", + "0: ' e =%spellout-cardinal-feminine=;", + "100: >%%optional-e>=%spellout-cardinal-feminine=;", "%spellout-cardinal-feminine:", "-x: menos >>;", "x.x: << v\u00EDrgula >>;", @@ -98,16 +103,12 @@ pt{ "700: setecentas[ e >>];", "800: oitocentas[ e >>];", "900: novecentas[ e >>];", - "1000: mil[ e >>];", - "2000: << mil[ e >>];", - "1000000: um milh\u00E3o[ e >>];", - "2000000: <%spellout-cardinal-masculine< milh\u00F5es[ e >>];", - "1000000000: um bilh\u00E3o[ e >>];", - "2000000000: <%spellout-cardinal-masculine< bilh\u00F5es[ e >>];", - "1000000000000: um trilh\u00E3o[ e >>];", - "2000000000000: <%spellout-cardinal-masculine< trilh\u00F5es[ e >>];", - "1000000000000000: um quatrilh\u00E3o[ e >>];", - "2000000000000000: <%spellout-cardinal-masculine< quatrilh\u00F5es[ e >>];", + "1000: mil[>%%spellout-cardinal-feminine-with-e>];", + "2000: << mil[>%%spellout-cardinal-feminine-with-e>];", + "1000000: <%spellout-cardinal-masculine< $(cardinal,one{milh\u00E3o}other{milh\u00F5es})$[>%%spellout-cardinal-feminine-with-e>];", + "1000000000: <%spellout-cardinal-masculine< $(cardinal,one{bilh\u00E3o}other{bilh\u00F5es})$[>%%spellout-cardinal-feminine-with-e>];", + "1000000000000: <%spellout-cardinal-masculine< $(cardinal,one{trilh\u00E3o}other{trilh\u00F5es})$[>%%spellout-cardinal-feminine-with-e>];", + "1000000000000000: <%spellout-cardinal-masculine< $(cardinal,one{quatrilh\u00E3o}other{quatrilh\u00F5es})$[>%%spellout-cardinal-feminine-with-e>];", "1000000000000000000: =#,##0=;", "%spellout-ordinal-masculine:", "-x: menos >>;", @@ -141,15 +142,11 @@ pt{ "800: octingent\u00E9simo[ >>];", "900: noningent\u00E9simo[ >>];", "1000: mil\u00E9simo[ >>];", - "2000: <%spellout-cardinal-masculine< \u00ADmil\u00E9simo[ >>];", - "1000000: um milion\u00E9simo[ >>];", - "2000000: <%spellout-cardinal-masculine< milion\u00E9simo[ >>];", - "1000000000: um bilion\u00E9simo[ >>];", - "2000000000: <%spellout-cardinal-masculine< bilion\u00E9simo[ >>];", - "1000000000000: um trilion\u00E9simo[ >>];", - "2000000000000: <%spellout-cardinal-masculine< trilion\u00E9sima[ >>];", - "1000000000000000: um quadrilion\u00E9simo[ >>];", - "2000000000000000: <%spellout-cardinal-masculine< quadrilion\u00E9simo[ >>];", + "2000: <%spellout-cardinal-masculine< mil\u00E9simo[ >>];", + "1000000: <%spellout-cardinal-masculine< milion\u00E9simo[ >>];", + "1000000000: <%spellout-cardinal-masculine< bilion\u00E9simo[ >>];", + "1000000000000: <%spellout-cardinal-masculine< trilion\u00E9sima[ >>];", + "1000000000000000: <%spellout-cardinal-masculine< quadrilion\u00E9simo[ >>];", "1000000000000000000: =#,##0=\u00BA;", "%spellout-ordinal-feminine:", "-x: menos >>;", @@ -183,15 +180,11 @@ pt{ "800: octingent\u00E9sima[ >>];", "900: noningent\u00E9sima[ >>];", "1000: mil\u00E9sima[ >>];", - "2000: <%spellout-cardinal-feminine< \u00ADmil\u00E9sima[ >>];", - "1000000: uma milion\u00E9sima[ >>];", - "2000000: <%spellout-cardinal-feminine< milion\u00E9sima[ >>];", - "1000000000: uma bilion\u00E9sima[ >>];", - "2000000000: <%spellout-cardinal-feminine< bilion\u00E9sima[ >>];", - "1000000000000: uma trilion\u00E9sima[ >>];", - "2000000000000: <%spellout-cardinal-feminine< trilion\u00E9sima[ >>];", - "1000000000000000: uma quadrilion\u00E9sima[ >>];", - "2000000000000000: <%spellout-cardinal-feminine< quadrilion\u00E9sima[ >>];", + "2000: <%spellout-cardinal-feminine< mil\u00E9sima[ >>];", + "1000000: <%spellout-cardinal-feminine< milion\u00E9sima[ >>];", + "1000000000: <%spellout-cardinal-feminine< bilion\u00E9sima[ >>];", + "1000000000000: <%spellout-cardinal-feminine< trilion\u00E9sima[ >>];", + "1000000000000000: <%spellout-cardinal-feminine< quadrilion\u00E9sima[ >>];", "1000000000000000000: =#,##0=\u00AA;", } } diff --git a/icu4c/source/data/rbnf/pt_PT.txt b/icu4c/source/data/rbnf/pt_PT.txt index ebc631bdd81..69b4373907b 100644 --- a/icu4c/source/data/rbnf/pt_PT.txt +++ b/icu4c/source/data/rbnf/pt_PT.txt @@ -11,6 +11,12 @@ pt_PT{ "0: =%spellout-numbering=;", "%spellout-numbering:", "0: =%spellout-cardinal-masculine=;", + "%%optional-e:", + "0: ' e ;", + "1: ' ;", + "%%spellout-cardinal-masculine-with-e:", + "0: ' e =%spellout-cardinal-masculine=;", + "100: >%%optional-e>=%spellout-cardinal-masculine=;", "%spellout-cardinal-masculine:", "-x: menos >>;", "x.x: << v\u00EDrgula >>;", @@ -52,17 +58,16 @@ pt_PT{ "700: setecentos[ e >>];", "800: oitocentos[ e >>];", "900: novecentos[ e >>];", - "1000: mil[ e >>];", - "2000: << mil[ e >>];", - "1000000: um milh\u00E3o[ e >>];", - "2000000: << milh\u00F5es[ e >>];", - "1000000000: um bili\u00E3o[ e >>];", - "2000000000: << bili\u00F5es[ e >>];", - "1000000000000: um trili\u00E3o[ e >>];", - "2000000000000: << trili\u00F5es[ e >>];", - "1000000000000000: um quatrili\u00E3o[ e >>];", - "2000000000000000: << quatrili\u00F5es[ e >>];", + "1000: mil[>%%spellout-cardinal-masculine-with-e>];", + "2000: << mil[>%%spellout-cardinal-masculine-with-e>];", + "1000000: << $(cardinal,one{milh\u00E3o}other{milh\u00F5es})$[>%%spellout-cardinal-masculine-with-e>];", + "1000000000: << mil milh\u00F5es[>%%spellout-cardinal-masculine-with-e>];", + "1000000000000: << $(cardinal,one{bili\u00E3o}other{bili\u00F5es})$[>%%spellout-cardinal-masculine-with-e>];", + "1000000000000000: << mil bili\u00F5es[>%%spellout-cardinal-masculine-with-e>];", "1000000000000000000: =#,##0=;", + "%%spellout-cardinal-feminine-with-e:", + "0: ' e =%spellout-cardinal-feminine=;", + "100: >%%optional-e>=%spellout-cardinal-feminine=;", "%spellout-cardinal-feminine:", "-x: menos >>;", "x.x: << v\u00EDrgula >>;", @@ -88,16 +93,12 @@ pt_PT{ "700: setecentas[ e >>];", "800: oitocentas[ e >>];", "900: novecentas[ e >>];", - "1000: mil[ e >>];", - "2000: << mil[ e >>];", - "1000000: um milh\u00E3o[ e >>];", - "2000000: <%spellout-cardinal-masculine< milh\u00F5es[ e >>];", - "1000000000: um bili\u00E3o[ e >>];", - "2000000000: <%spellout-cardinal-masculine< bili\u00F5es[ e >>];", - "1000000000000: um trili\u00E3o[ e >>];", - "2000000000000: <%spellout-cardinal-masculine< trili\u00F5es[ e >>];", - "1000000000000000: um quatrili\u00E3o[ e >>];", - "2000000000000000: <%spellout-cardinal-masculine< quatrili\u00F5es[ e >>];", + "1000: mil[>%%spellout-cardinal-feminine-with-e>];", + "2000: << mil[>%%spellout-cardinal-feminine-with-e>];", + "1000000: <%spellout-cardinal-masculine< $(cardinal,one{milh\u00E3o}other{milh\u00F5es})$[>%%spellout-cardinal-feminine-with-e>];", + "1000000000: <%spellout-cardinal-masculine< mil milh\u00F5es[>%%spellout-cardinal-feminine-with-e>];", + "1000000000000: <%spellout-cardinal-masculine< $(cardinal,one{bili\u00E3o}other{bili\u00F5es})$[>%%spellout-cardinal-feminine-with-e>];", + "1000000000000000: <%spellout-cardinal-masculine< mil bili\u00F5es[>%%spellout-cardinal-feminine-with-e>];", "1000000000000000000: =#,##0=;", "%spellout-ordinal-masculine:", "-x: menos >>;", @@ -131,15 +132,11 @@ pt_PT{ "800: octingent\u00E9simo[ >>];", "900: noningent\u00E9simo[ >>];", "1000: mil\u00E9simo[ >>];", - "2000: <%spellout-cardinal-masculine< \u00ADmil\u00E9simo[ >>];", - "1000000: um milion\u00E9simo[ >>];", - "2000000: <%spellout-cardinal-masculine< milion\u00E9simo[ >>];", - "1000000000: um bilion\u00E9simo[ >>];", - "2000000000: <%spellout-cardinal-masculine< bilion\u00E9simo[ >>];", - "1000000000000: um trilion\u00E9simo[ >>];", - "2000000000000: <%spellout-cardinal-masculine< trilion\u00E9sima[ >>];", - "1000000000000000: um quadrilion\u00E9simo[ >>];", - "2000000000000000: <%spellout-cardinal-masculine< quadrilion\u00E9simo[ >>];", + "2000: <%spellout-cardinal-masculine< mil\u00E9simo[ >>];", + "1000000: <%spellout-cardinal-masculine< milion\u00E9simo[ >>];", + "1000000000: <%spellout-cardinal-masculine< mil milion\u00E9simo[ >>];", + "1000000000000: <%spellout-cardinal-masculine< bilion\u00E9simo[ >>];", + "1000000000000000: <%spellout-cardinal-masculine< mil bilion\u00E9simo[ >>];", "1000000000000000000: =#,##0=\u00BA;", "%spellout-ordinal-feminine:", "-x: menos >>;", @@ -173,15 +170,11 @@ pt_PT{ "800: octingent\u00E9sima[ >>];", "900: noningent\u00E9sima[ >>];", "1000: mil\u00E9sima[ >>];", - "2000: <%spellout-cardinal-feminine< \u00ADmil\u00E9sima[ >>];", - "1000000: uma milion\u00E9sima[ >>];", - "2000000: <%spellout-cardinal-feminine< milion\u00E9sima[ >>];", - "1000000000: uma bilion\u00E9sima[ >>];", - "2000000000: <%spellout-cardinal-feminine< bilion\u00E9sima[ >>];", - "1000000000000: uma trilion\u00E9sima[ >>];", - "2000000000000: <%spellout-cardinal-feminine< trilion\u00E9sima[ >>];", - "1000000000000000: uma quadrilion\u00E9sima[ >>];", - "2000000000000000: <%spellout-cardinal-feminine< quadrilion\u00E9sima[ >>];", + "2000: <%spellout-cardinal-feminine< mil\u00E9sima[ >>];", + "1000000: <%spellout-cardinal-feminine< milion\u00E9sima[ >>];", + "1000000000: <%spellout-cardinal-feminine< mil milion\u00E9sima[ >>];", + "1000000000000: <%spellout-cardinal-feminine< bilion\u00E9sima[ >>];", + "1000000000000000: <%spellout-cardinal-feminine< mil bilion\u00E9sima[ >>];", "1000000000000000000: =#,##0=\u00AA;", } } diff --git a/icu4c/source/data/rbnf/root.txt b/icu4c/source/data/rbnf/root.txt index b5a76c6bcb5..b37f24892d7 100644 --- a/icu4c/source/data/rbnf/root.txt +++ b/icu4c/source/data/rbnf/root.txt @@ -461,11 +461,11 @@ root{ "61: \u05E1\u05F4>%hebrew-item>;", "70: \u05F4\u05E2;", "71: \u05E2\u05F4>%hebrew-item>;", - "80: \u05F4\u05E4;", + "80: \u05F4\u05E3;", "81: \u05E4\u05F4>%hebrew-item>;", "90: \u05F4\u05E6;", "91: \u05E6\u05F4>%hebrew-item>;", - "%hebrew-item:", + "%%hebrew-item-hundreds:", "-x: \u2212>>;", "x.x: =#,##0.00=;", "0: \u05F4;", @@ -488,7 +488,8 @@ root{ "50: \u05E0[>>];", "60: \u05E1[>>];", "70: \u05E2[>>];", - "80: \u05E4[>>];", + "80: \u05E3;", + "81: \u05E4[>>];", "90: \u05E6[>>];", "100: \u05E7[>>];", "200: \u05E8[>>];", @@ -521,6 +522,32 @@ root{ "1900/100: \u05EA\u05EA\u05EA\u05EA\u05E9[>>];", "2000/100: \u05EA\u05EA\u05EA\u05EA\u05EA[>>];", "2100: =#,##0=;", + "%hebrew-item:", + "-x: \u2212>>;", + "x.x: =#,##0.00=;", + "0: \u05F4;", + "1: \u05D0;", + "2: \u05D1;", + "3: \u05D2;", + "4: \u05D3;", + "5: \u05D4;", + "6: \u05D5;", + "7: \u05D6;", + "8: \u05D7;", + "9: \u05D8;", + "10: \u05D9[>>];", + "15: \u05D8\u05D5;", + "16: \u05D8\u05D6;", + "17: \u05D9>>;", + "20: \u05DB[>>];", + "30: \u05DC[>>];", + "40: \u05DE[>>];", + "50: \u05E0[>>];", + "60: \u05E1[>>];", + "70: \u05E2[>>];", + "80: \u05E4[>>];", + "90: \u05E6[>>];", + "100: =%%hebrew-item-hundreds=;", "%roman-lower:", "-x: \u2212>>;", "x.x: =#,##0.00=;", @@ -656,5 +683,5 @@ root{ "0: =#,##0.#=.;", } } - Version{"38"} + Version{"39"} } diff --git a/icu4c/source/data/region/LOCALE_DEPS.json b/icu4c/source/data/region/LOCALE_DEPS.json index da24c8c172a..f737ebe3754 100644 --- a/icu4c/source/data/region/LOCALE_DEPS.json +++ b/icu4c/source/data/region/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "38", + "cldrVersion": "39", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -21,8 +21,9 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "no": "nb", - "no_NO": "nb_NO", + "nb": "no", + "nb_NO": "no_NO", + "nb_SJ": "no_SJ", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -177,6 +178,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", "pt_CH": "pt_PT", diff --git a/icu4c/source/data/region/en.txt b/icu4c/source/data/region/en.txt index 7b683db6a41..a95bcee872f 100644 --- a/icu4c/source/data/region/en.txt +++ b/icu4c/source/data/region/en.txt @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en{ Countries{ - 001{"World"} + 001{"world"} 002{"Africa"} 003{"North America"} 005{"South America"} diff --git a/icu4c/source/data/region/en_AU.txt b/icu4c/source/data/region/en_AU.txt index ba324c3761a..a1a7e2f9ba4 100644 --- a/icu4c/source/data/region/en_AU.txt +++ b/icu4c/source/data/region/en_AU.txt @@ -3,4 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml en_AU{ %%Parent{"en_001"} + Countries{ + 001{"World"} + } } diff --git a/icu4c/source/data/region/nb.txt b/icu4c/source/data/region/nb.txt index bf2ceb09100..934f064b8be 100644 --- a/icu4c/source/data/region/nb.txt +++ b/icu4c/source/data/region/nb.txt @@ -2,313 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - Countries{ - 001{"verden"} - 002{"Afrika"} - 003{"Nord-Amerika"} - 005{"Sør-Amerika"} - 009{"Oseania"} - 011{"Vest-Afrika"} - 013{"Mellom-Amerika"} - 014{"Øst-Afrika"} - 015{"Nord-Afrika"} - 017{"Sentral-Afrika"} - 018{"Sørlige Afrika"} - 019{"Amerika"} - 021{"Nordlige Amerika"} - 029{"Karibia"} - 030{"Øst-Asia"} - 034{"Sør-Asia"} - 035{"Sørøst-Asia"} - 039{"Sør-Europa"} - 053{"Australasia"} - 054{"Melanesia"} - 057{"Mikronesia"} - 061{"Polynesia"} - 142{"Asia"} - 143{"Sentral-Asia"} - 145{"Vest-Asia"} - 150{"Europa"} - 151{"Øst-Europa"} - 154{"Nord-Europa"} - 155{"Vest-Europa"} - 202{"Afrika sør for Sahara"} - 419{"Latin-Amerika"} - AC{"Ascension"} - AD{"Andorra"} - AE{"De forente arabiske emirater"} - AF{"Afghanistan"} - AG{"Antigua og Barbuda"} - AI{"Anguilla"} - AL{"Albania"} - AM{"Armenia"} - AO{"Angola"} - AQ{"Antarktis"} - AR{"Argentina"} - AS{"Amerikansk Samoa"} - AT{"Østerrike"} - 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{"Hviterussland"} - BZ{"Belize"} - CA{"Canada"} - CC{"Kokosøyene"} - CD{"Kongo"} - CF{"Den sentralafrikanske republikk"} - CG{"Kongo-Brazzaville"} - CH{"Sveits"} - CI{"Elfenbenskysten"} - CK{"Cookøyene"} - 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 republikk"} - DZ{"Algerie"} - EA{"Ceuta og Melilla"} - EC{"Ecuador"} - EE{"Estland"} - EG{"Egypt"} - EH{"Vest-Sahara"} - ER{"Eritrea"} - ES{"Spania"} - ET{"Etiopia"} - EU{"Den europeiske union"} - EZ{"eurosonen"} - FI{"Finland"} - FJ{"Fiji"} - FK{"Falklandsøyene"} - FM{"Mikronesiaføderasjonen"} - FO{"Færøyene"} - 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øyene"} - GT{"Guatemala"} - GU{"Guam"} - GW{"Guinea-Bissau"} - GY{"Guyana"} - HK{"Hongkong SAR Kina"} - HM{"Heard- og McDonaldøyene"} - HN{"Honduras"} - HR{"Kroatia"} - HT{"Haiti"} - HU{"Ungarn"} - IC{"Kanariøyene"} - 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{"Komorene"} - KN{"Saint Kitts og Nevis"} - KP{"Nord-Korea"} - KR{"Sør-Korea"} - KW{"Kuwait"} - KY{"Caymanøyene"} - KZ{"Kasakhstan"} - LA{"Laos"} - LB{"Libanon"} - LC{"St. Lucia"} - LI{"Liechtenstein"} - LK{"Sri Lanka"} - LR{"Liberia"} - LS{"Lesotho"} - LT{"Litauen"} - LU{"Luxemburg"} - LV{"Latvia"} - LY{"Libya"} - MA{"Marokko"} - MC{"Monaco"} - MD{"Moldova"} - ME{"Montenegro"} - MF{"Saint-Martin"} - MG{"Madagaskar"} - MH{"Marshalløyene"} - MK{"Nord-Makedonia"} - ML{"Mali"} - MM{"Myanmar (Burma)"} - MN{"Mongolia"} - MO{"Macao SAR Kina"} - MP{"Nord-Marianene"} - MQ{"Martinique"} - MR{"Mauritania"} - MS{"Montserrat"} - MT{"Malta"} - MU{"Mauritius"} - MV{"Maldivene"} - 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{"Norge"} - NP{"Nepal"} - NR{"Nauru"} - NU{"Niue"} - NZ{"New Zealand"} - OM{"Oman"} - PA{"Panama"} - PE{"Peru"} - PF{"Fransk Polynesia"} - PG{"Papua Ny-Guinea"} - PH{"Filippinene"} - PK{"Pakistan"} - PL{"Polen"} - PM{"Saint-Pierre-et-Miquelon"} - PN{"Pitcairnøyene"} - 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øyene"} - SC{"Seychellene"} - SD{"Sudan"} - SE{"Sverige"} - SG{"Singapore"} - SH{"St. 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øyene"} - TD{"Tsjad"} - TF{"De franske sørterritorier"} - TG{"Togo"} - TH{"Thailand"} - TJ{"Tadsjikistan"} - TK{"Tokelau"} - TL{"Øst-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 øyer"} - UN{"FN"} - US{"USA"} - UY{"Uruguay"} - UZ{"Usbekistan"} - VA{"Vatikanstaten"} - VC{"St. Vincent og Grenadinene"} - VE{"Venezuela"} - VG{"De britiske jomfruøyene"} - VI{"De amerikanske jomfruøyene"} - VN{"Vietnam"} - VU{"Vanuatu"} - WF{"Wallis og Futuna"} - WS{"Samoa"} - XA{"pseudospråk – aksenter"} - XB{"pseudospråk – tekst begge veier"} - 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"} - CZ{"Den tsjekkiske republikk"} - FK{"Falklandsøyene (Islas Malvinas)"} - SZ{"Swaziland"} - TL{"Timor-Leste"} - } + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/region/nb_NO.txt b/icu4c/source/data/region/nb_NO.txt index 15a33c3396f..2de7860c57e 100644 --- a/icu4c/source/data/region/nb_NO.txt +++ b/icu4c/source/data/region/nb_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 - */ nb_NO{ - ___{""} + "%%ALIAS"{"no_NO"} } diff --git a/icu4c/source/data/region/nb_SJ.txt b/icu4c/source/data/region/nb_SJ.txt new file mode 100644 index 00000000000..b1caa388a5d --- /dev/null +++ b/icu4c/source/data/region/nb_SJ.txt @@ -0,0 +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 +nb_SJ{ + "%%ALIAS"{"no_SJ"} +} diff --git a/icu4c/source/data/region/nn.txt b/icu4c/source/data/region/nn.txt index 061e8ea2d52..f3d0ee3db73 100644 --- a/icu4c/source/data/region/nn.txt +++ b/icu4c/source/data/region/nn.txt @@ -2,6 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ + %%Parent{"no"} Countries{ 001{"verda"} 002{"Afrika"} diff --git a/icu4c/source/data/region/no.txt b/icu4c/source/data/region/no.txt index 474d0b21b0d..46ed2237d38 100644 --- a/icu4c/source/data/region/no.txt +++ b/icu4c/source/data/region/no.txt @@ -2,5 +2,313 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ - "%%ALIAS"{"nb"} + Countries{ + 001{"verden"} + 002{"Afrika"} + 003{"Nord-Amerika"} + 005{"Sør-Amerika"} + 009{"Oseania"} + 011{"Vest-Afrika"} + 013{"Mellom-Amerika"} + 014{"Øst-Afrika"} + 015{"Nord-Afrika"} + 017{"Sentral-Afrika"} + 018{"Sørlige Afrika"} + 019{"Amerika"} + 021{"Nordlige Amerika"} + 029{"Karibia"} + 030{"Øst-Asia"} + 034{"Sør-Asia"} + 035{"Sørøst-Asia"} + 039{"Sør-Europa"} + 053{"Australasia"} + 054{"Melanesia"} + 057{"Mikronesia"} + 061{"Polynesia"} + 142{"Asia"} + 143{"Sentral-Asia"} + 145{"Vest-Asia"} + 150{"Europa"} + 151{"Øst-Europa"} + 154{"Nord-Europa"} + 155{"Vest-Europa"} + 202{"Afrika sør for Sahara"} + 419{"Latin-Amerika"} + AC{"Ascension"} + AD{"Andorra"} + AE{"De forente arabiske emirater"} + AF{"Afghanistan"} + AG{"Antigua og Barbuda"} + AI{"Anguilla"} + AL{"Albania"} + AM{"Armenia"} + AO{"Angola"} + AQ{"Antarktis"} + AR{"Argentina"} + AS{"Amerikansk Samoa"} + AT{"Østerrike"} + 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{"Hviterussland"} + BZ{"Belize"} + CA{"Canada"} + CC{"Kokosøyene"} + CD{"Kongo"} + CF{"Den sentralafrikanske republikk"} + CG{"Kongo-Brazzaville"} + CH{"Sveits"} + CI{"Elfenbenskysten"} + CK{"Cookøyene"} + 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 republikk"} + DZ{"Algerie"} + EA{"Ceuta og Melilla"} + EC{"Ecuador"} + EE{"Estland"} + EG{"Egypt"} + EH{"Vest-Sahara"} + ER{"Eritrea"} + ES{"Spania"} + ET{"Etiopia"} + EU{"Den europeiske union"} + EZ{"eurosonen"} + FI{"Finland"} + FJ{"Fiji"} + FK{"Falklandsøyene"} + FM{"Mikronesiaføderasjonen"} + FO{"Færøyene"} + 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øyene"} + GT{"Guatemala"} + GU{"Guam"} + GW{"Guinea-Bissau"} + GY{"Guyana"} + HK{"Hongkong SAR Kina"} + HM{"Heard- og McDonaldøyene"} + HN{"Honduras"} + HR{"Kroatia"} + HT{"Haiti"} + HU{"Ungarn"} + IC{"Kanariøyene"} + 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{"Komorene"} + KN{"Saint Kitts og Nevis"} + KP{"Nord-Korea"} + KR{"Sør-Korea"} + KW{"Kuwait"} + KY{"Caymanøyene"} + KZ{"Kasakhstan"} + LA{"Laos"} + LB{"Libanon"} + LC{"St. Lucia"} + LI{"Liechtenstein"} + LK{"Sri Lanka"} + LR{"Liberia"} + LS{"Lesotho"} + LT{"Litauen"} + LU{"Luxemburg"} + LV{"Latvia"} + LY{"Libya"} + MA{"Marokko"} + MC{"Monaco"} + MD{"Moldova"} + ME{"Montenegro"} + MF{"Saint-Martin"} + MG{"Madagaskar"} + MH{"Marshalløyene"} + MK{"Nord-Makedonia"} + ML{"Mali"} + MM{"Myanmar (Burma)"} + MN{"Mongolia"} + MO{"Macao SAR Kina"} + MP{"Nord-Marianene"} + MQ{"Martinique"} + MR{"Mauritania"} + MS{"Montserrat"} + MT{"Malta"} + MU{"Mauritius"} + MV{"Maldivene"} + 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{"Norge"} + NP{"Nepal"} + NR{"Nauru"} + NU{"Niue"} + NZ{"New Zealand"} + OM{"Oman"} + PA{"Panama"} + PE{"Peru"} + PF{"Fransk Polynesia"} + PG{"Papua Ny-Guinea"} + PH{"Filippinene"} + PK{"Pakistan"} + PL{"Polen"} + PM{"Saint-Pierre-et-Miquelon"} + PN{"Pitcairnøyene"} + 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øyene"} + SC{"Seychellene"} + SD{"Sudan"} + SE{"Sverige"} + SG{"Singapore"} + SH{"St. 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øyene"} + TD{"Tsjad"} + TF{"De franske sørterritorier"} + TG{"Togo"} + TH{"Thailand"} + TJ{"Tadsjikistan"} + TK{"Tokelau"} + TL{"Øst-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 øyer"} + UN{"FN"} + US{"USA"} + UY{"Uruguay"} + UZ{"Usbekistan"} + VA{"Vatikanstaten"} + VC{"St. Vincent og Grenadinene"} + VE{"Venezuela"} + VG{"De britiske jomfruøyene"} + VI{"De amerikanske jomfruøyene"} + VN{"Vietnam"} + VU{"Vanuatu"} + WF{"Wallis og Futuna"} + WS{"Samoa"} + XA{"pseudospråk – aksenter"} + XB{"pseudospråk – tekst begge veier"} + 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"} + CZ{"Den tsjekkiske republikk"} + FK{"Falklandsøyene (Islas Malvinas)"} + SZ{"Swaziland"} + TL{"Timor-Leste"} + } } diff --git a/icu4c/source/data/region/no_NO.txt b/icu4c/source/data/region/no_NO.txt index 5d7f8599c0e..9de87e3d165 100644 --- a/icu4c/source/data/region/no_NO.txt +++ b/icu4c/source/data/region/no_NO.txt @@ -1,6 +1,9 @@ // © 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"{"nb_NO"} + ___{""} } diff --git a/icu4c/source/data/region/no_SJ.txt b/icu4c/source/data/region/no_SJ.txt new file mode 100644 index 00000000000..42b03fcf8d0 --- /dev/null +++ b/icu4c/source/data/region/no_SJ.txt @@ -0,0 +1,9 @@ +// © 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/region/root.txt b/icu4c/source/data/region/root.txt index ee48ae4bc4c..4b13ae181f3 100644 --- a/icu4c/source/data/region/root.txt +++ b/icu4c/source/data/region/root.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 root{ - Version{"38"} + Version{"39"} } diff --git a/icu4c/source/data/translit/Grek_Latn_UNGEGN.txt b/icu4c/source/data/translit/Grek_Latn_UNGEGN.txt index 649a02812e8..573a21bf4d6 100644 --- a/icu4c/source/data/translit/Grek_Latn_UNGEGN.txt +++ b/icu4c/source/data/translit/Grek_Latn_UNGEGN.txt @@ -58,7 +58,7 @@ $iotasub → ; ψ ↔ ps ; ω ↔ o $under ; Ω ↔ O $under; -# at beginning or end of word, convert mp to b +# at begining or end of word, convert mp to b [^[:L:]$accent] { μπ → b ; μπ } [^[:L:]$accent] → b ; [^[:L:]$accent] { [Μμ][Ππ] → B ; diff --git a/icu4c/source/data/unit/LOCALE_DEPS.json b/icu4c/source/data/unit/LOCALE_DEPS.json index da24c8c172a..f737ebe3754 100644 --- a/icu4c/source/data/unit/LOCALE_DEPS.json +++ b/icu4c/source/data/unit/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "38", + "cldrVersion": "39", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -21,8 +21,9 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "no": "nb", - "no_NO": "nb_NO", + "nb": "no", + "nb_NO": "no_NO", + "nb_SJ": "no_SJ", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -177,6 +178,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", "pt_CH": "pt_PT", diff --git a/icu4c/source/data/unit/af.txt b/icu4c/source/data/unit/af.txt index c269485663d..8b00e41084b 100644 --- a/icu4c/source/data/unit/af.txt +++ b/icu4c/source/data/unit/af.txt @@ -157,7 +157,7 @@ af{ one{"{0} karaat"} other{"{0} karaat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram per desiliter"} one{"{0} milligram per desiliter"} other{"{0} milligram per desiliter"} @@ -1368,7 +1368,7 @@ af{ one{"{0} kar."} other{"{0} kar."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dℓ"} one{"{0} mg/dℓ"} other{"{0} mg/dℓ"} @@ -1761,9 +1761,9 @@ af{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"myl"} @@ -1867,9 +1867,9 @@ af{ other{"{0} t"} } 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/am.txt b/icu4c/source/data/unit/am.txt index d8af4774a2f..a4ecb1c102c 100644 --- a/icu4c/source/data/unit/am.txt +++ b/icu4c/source/data/unit/am.txt @@ -158,7 +158,7 @@ am{ one{"{0} ካራት"} other{"{0} ካራት"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ሚሊ ግራም በ ዴሲ ሊትር"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -635,9 +635,9 @@ am{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -1052,7 +1052,7 @@ am{ 10p-21{"ዜ{0}"} 10p-24{"ዮ{0}"} 10p-3{"ሚ{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"ና{0}"} 10p1{"ዴ{0}"} 10p2{"ሄ{0}"} @@ -1376,7 +1376,7 @@ am{ 10p-21{"ዜ{0}"} 10p-24{"ዮ{0}"} 10p-3{"ሚ{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"ና{0}"} 10p1{"ዴ{0}"} 10p2{"ሄ{0}"} @@ -1390,7 +1390,7 @@ am{ one{"{0} ካራት"} other{"{0} ካራት"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1858,9 +1858,9 @@ am{ other{"{0} t"} } 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/ar.txt b/icu4c/source/data/unit/ar.txt index ec298642d2b..8ea6d7a03dd 100644 --- a/icu4c/source/data/unit/ar.txt +++ b/icu4c/source/data/unit/ar.txt @@ -277,7 +277,7 @@ ar{ two{"قيراطان"} zero{"{0} قيراط"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"مغم/ديسيبل"} few{"{0} مغم/ديسيبل"} many{"{0} مغم/ديسيبل"} @@ -2468,7 +2468,7 @@ ar{ two{"{0} قيراط"} zero{"{0} قيراط"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"مغم/ديسبل"} few{"{0} مغم/ديسبل"} many{"{0} مغم/ديسبل"} @@ -2597,13 +2597,13 @@ ar{ zero{"{0} غيغابت"} } gigabyte{ - dnam{"غيغابايت"} - few{"{0} غيغابايت"} - many{"{0} غيغابايت"} - one{"{0} غيغابايت"} - other{"{0} غيغابايت"} - two{"{0} غيغابايت"} - zero{"{0} غيغابايت"} + dnam{"GB"} + few{"{0} GB"} + many{"{0} GB"} + one{"{0} GB"} + other{"{0} GB"} + two{"{0} GB"} + zero{"{0} GB"} } kilobit{ dnam{"كيلوبت"} @@ -2634,12 +2634,12 @@ ar{ } megabyte{ dnam{"ميغابايت"} - few{"{0} ميغابايت"} - many{"{0} ميغابايت"} - one{"{0} ميغابايت"} - other{"{0} ميغابايت"} - two{"{0} ميغابايت"} - zero{"{0} ميغابايت"} + few{"{0} MB"} + many{"{0} MB"} + one{"{0} MB"} + other{"{0} MB"} + two{"{0} MB"} + zero{"{0} MB"} } petabyte{ dnam{"بيتابايت"} @@ -2981,7 +2981,7 @@ ar{ many{"{0} نقطة/سم"} one{"{0} نقطة/سم"} other{"{0} نقطة/سم"} - two{"{0} نقطة/سم"} + two{"{0} بكسل/سم"} zero{"{0} نقطة/سم"} } dot-per-inch{ @@ -2990,7 +2990,7 @@ ar{ many{"{0} نقطة/بوصة"} one{"{0} نقطة/بوصة"} other{"{0} نقطة/بوصة"} - two{"{0} نقطة/بوصة"} + two{"{0} بكسل/بوصة"} zero{"{0} نقطة/بوصة"} } em{ diff --git a/icu4c/source/data/unit/as.txt b/icu4c/source/data/unit/as.txt index ce00128de54..0782cf0bf26 100644 --- a/icu4c/source/data/unit/as.txt +++ b/icu4c/source/data/unit/as.txt @@ -165,7 +165,7 @@ as{ one{"{0} কেৰেট"} other{"{0} কেৰেট"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"প্ৰতি ডেচিলিটাৰত মিলিগ্ৰাম"} one{"প্ৰতি ডেচিলিটাৰত {0} মিলিগ্ৰাম"} other{"প্ৰতি ডেচিলিটাৰত {0} মিলিগ্ৰাম"} @@ -1005,7 +1005,7 @@ as{ 10p-21{"জেপ্টো{0}"} 10p-24{"য়ক্টো{0}"} 10p-3{"মিলি{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"নেনো{0}"} 10p1{"ডেকা{0}"} 10p12{"টেৰা{0}"} @@ -1271,7 +1271,7 @@ as{ one{"{0} কেৰেট"} other{"{0} কেৰেট"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"মিঃ গ্ৰাঃ/ডেঃ লিঃ"} one{"{0} mg/dL"} other{"{0} mg/dL"} diff --git a/icu4c/source/data/unit/ast.txt b/icu4c/source/data/unit/ast.txt index 4621f85cca7..a4dd5af63df 100644 --- a/icu4c/source/data/unit/ast.txt +++ b/icu4c/source/data/unit/ast.txt @@ -108,7 +108,7 @@ ast{ one{"{0} quilate"} other{"{0} quilates"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramos per decillitru"} one{"{0} miligramu per decillitru"} other{"{0} miligramos per decillitru"} @@ -856,7 +856,7 @@ ast{ one{"{0}kt"} other{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} other{"{0}mg/dL"} @@ -1149,9 +1149,9 @@ ast{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0}µm"} - other{"{0}µm"} + dnam{"μm"} + one{"{0}μm"} + other{"{0}μm"} } mile{ dnam{"mi"} @@ -1225,9 +1225,9 @@ ast{ other{"{0}t"} } microgram{ - dnam{"µg"} - one{"{0}µg"} - other{"{0}µg"} + dnam{"μg"} + one{"{0}μg"} + other{"{0}μg"} } milligram{ dnam{"mg"} @@ -1599,7 +1599,7 @@ ast{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1892,9 +1892,9 @@ ast{ per{"{0}/m"} } micrometer{ - dnam{"µmetros"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmetros"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"milles"} @@ -1973,9 +1973,9 @@ ast{ other{"{0} t"} } 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/az.txt b/icu4c/source/data/unit/az.txt index 1c1648961fa..c4c77b181e7 100644 --- a/icu4c/source/data/unit/az.txt +++ b/icu4c/source/data/unit/az.txt @@ -165,7 +165,7 @@ az{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milliqram/desilitr"} one{"{0} milliqram/desilitr"} other{"{0} milliqram/desilitr"} @@ -554,9 +554,9 @@ az{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mil"} @@ -1399,7 +1399,7 @@ az{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mq/dl"} one{"{0} mq/dl"} other{"{0} mq/dl"} @@ -1779,9 +1779,9 @@ az{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mil"} @@ -1887,9 +1887,9 @@ az{ other{"{0} t"} } microgram{ - dnam{"µq"} - one{"{0} µq"} - other{"{0} µq"} + dnam{"μq"} + one{"{0} μq"} + other{"{0} μq"} } milligram{ dnam{"mq"} diff --git a/icu4c/source/data/unit/be.txt b/icu4c/source/data/unit/be.txt index 29c33fb4aae..bd091305ee7 100644 --- a/icu4c/source/data/unit/be.txt +++ b/icu4c/source/data/unit/be.txt @@ -221,7 +221,7 @@ be{ one{"{0} карат"} other{"{0} карата"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"міліграм на дэцылітр"} few{"{0} міліграмы на дэцылітр"} many{"{0} міліграм на дэцылітр"} @@ -1863,7 +1863,7 @@ be{ one{"{0} кар"} other{"{0} кар"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} few{"{0} мг/дл"} many{"{0} мг/дл"} diff --git a/icu4c/source/data/unit/bg.txt b/icu4c/source/data/unit/bg.txt index a8df6b54da8..8d6cd908eb7 100644 --- a/icu4c/source/data/unit/bg.txt +++ b/icu4c/source/data/unit/bg.txt @@ -165,7 +165,7 @@ bg{ one{"{0} карат"} other{"{0} карата"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"милиграми на децилитър"} one{"{0} милиграм на децилитър"} other{"{0} милиграма на децилитър"} @@ -1096,7 +1096,7 @@ bg{ 10p-21{"з{0}"} 10p-24{"й{0}"} 10p-3{"м{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"н{0}"} 10p1{"дк{0}"} 10p12{"Т{0}"} @@ -1419,7 +1419,7 @@ bg{ 10p-21{"з{0}"} 10p-24{"й{0}"} 10p-3{"м{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"н{0}"} 10p1{"дк{0}"} 10p12{"Т{0}"} @@ -1450,7 +1450,7 @@ bg{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1806,9 +1806,9 @@ bg{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ one{"{0} mi"} @@ -1915,9 +1915,9 @@ bg{ other{"{0} t"} } 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/bn.txt b/icu4c/source/data/unit/bn.txt index 34c87b79102..c4cc9214db6 100644 --- a/icu4c/source/data/unit/bn.txt +++ b/icu4c/source/data/unit/bn.txt @@ -158,7 +158,7 @@ bn{ one{"{0} ক্যারেট"} other{"{0} ক্যারেট"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"মিলিগ্রাম, প্রতি ডেসিলিটারে"} one{"{0} মিলিগ্রাম, প্রতি ডেসিলিটারে"} other{"{0} মিলিগ্রাম, প্রতি ডেসিলিটারে"} @@ -1013,7 +1013,7 @@ bn{ 10p-21{"জে{0}"} 10p-24{"ইয়ো{0}"} 10p-3{"মি{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"ন্যা{0}"} 10p1{"ডে{0}"} 10p12{"টে{0}"} @@ -1193,8 +1193,8 @@ bn{ per{"{0}/মি"} } micrometer{ - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"মাইল"} @@ -1266,9 +1266,9 @@ bn{ other{"{0} টন"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"মিগ্রা:"} @@ -1511,7 +1511,7 @@ bn{ 10p-21{"জে {0}"} 10p-24{"ইয়ো {0}"} 10p-3{"মি {0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"ন্যা {0}"} 10p1{"ডা {0}"} 10p12{"টে {0}"} @@ -1555,7 +1555,7 @@ bn{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1893,9 +1893,9 @@ bn{ per{"{0} প্রতি মি"} } micrometer{ - dnam{"µmeters"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmeters"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"মাইল"} @@ -1980,9 +1980,9 @@ bn{ other{"{0} t"} } 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/br.txt b/icu4c/source/data/unit/br.txt index a8f638bb7b7..f8ae287e0d0 100644 --- a/icu4c/source/data/unit/br.txt +++ b/icu4c/source/data/unit/br.txt @@ -234,7 +234,7 @@ br{ other{"{0} karat"} two{"{0} garat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligramm dre zekilitr"} few{"{0} milligramm dre zekilitr"} many{"{0} a villigrammoù dre zekilitr"} @@ -1720,7 +1720,7 @@ br{ other{"{0}kt"} two{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0}mg/dl"} many{"{0}mg/dl"} @@ -2301,12 +2301,12 @@ br{ two{"{0}m"} } micrometer{ - dnam{"µm"} - few{"{0}µm"} - many{"{0}µm"} - one{"{0}µm"} - other{"{0}µm"} - two{"{0}µm"} + dnam{"μm"} + few{"{0}μm"} + many{"{0}μm"} + one{"{0}μm"} + other{"{0}μm"} + two{"{0}μm"} } mile{ dnam{"mi"} @@ -2476,12 +2476,12 @@ br{ two{"{0}t"} } microgram{ - dnam{"µg"} - few{"{0}µg"} - many{"{0}µg"} - one{"{0}µg"} - other{"{0}µg"} - two{"{0}µg"} + dnam{"μg"} + few{"{0}μg"} + many{"{0}μg"} + one{"{0}μg"} + other{"{0}μg"} + two{"{0}μg"} } milligram{ dnam{"mg"} @@ -3168,7 +3168,7 @@ br{ other{"{0} kt"} two{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} many{"{0} mg/dl"} @@ -3699,12 +3699,12 @@ br{ two{"{0} m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} - two{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} + two{"{0} μm"} } mile{ dnam{"mi"} @@ -3825,12 +3825,12 @@ br{ two{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/bs.txt b/icu4c/source/data/unit/bs.txt index d4d7fdb0a49..3b266734ec6 100644 --- a/icu4c/source/data/unit/bs.txt +++ b/icu4c/source/data/unit/bs.txt @@ -173,7 +173,7 @@ bs{ one{"{0} karat"} other{"{0} karata"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrami po decilitru"} few{"{0} miligrama po decilitru"} one{"{0} miligram po decilitru"} @@ -1562,7 +1562,7 @@ bs{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0} mg/dL"} one{"{0} mg/dL"} @@ -1912,14 +1912,14 @@ bs{ graphics{ dot-per-centimeter{ dnam{"dpcm"} - few{"{0} dpcm"} - one{"{0} dpcm"} + few{"{0} ppcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - few{"{0} dpi"} - one{"{0} dpi"} + few{"{0} ppi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -2020,10 +2020,10 @@ bs{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"milje"} @@ -2140,10 +2140,10 @@ bs{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/ca.txt b/icu4c/source/data/unit/ca.txt index 62425edc05f..328069c58e6 100644 --- a/icu4c/source/data/unit/ca.txt +++ b/icu4c/source/data/unit/ca.txt @@ -165,7 +165,7 @@ ca{ one{"{0} quirat"} other{"{0} quirats"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mil·ligrams per decilitre"} one{"{0} mil·ligram per decilitre"} other{"{0} mil·ligrams per decilitre"} @@ -1416,7 +1416,7 @@ ca{ one{"{0} ct"} other{"{0} ct"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1785,9 +1785,9 @@ ca{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"milles"} @@ -1886,9 +1886,9 @@ ca{ other{"{0} t mètr."} } 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/ccp.txt b/icu4c/source/data/unit/ccp.txt index 617fea034f3..2288d16d69e 100644 --- a/icu4c/source/data/unit/ccp.txt +++ b/icu4c/source/data/unit/ccp.txt @@ -108,7 +108,7 @@ ccp{ one{"{0} 𑄇𑄳𑄠𑄢𑄬𑄖𑄴"} other{"{0} 𑄇𑄳𑄠𑄢𑄬𑄖𑄴"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"𑄟𑄨𑄣𑄨𑄉𑄳𑄢𑄟𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄓𑄬𑄥𑄨𑄣𑄨𑄑𑄢𑄬"} one{"{0} 𑄟𑄨𑄣𑄨𑄉𑄳𑄢𑄟𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄓𑄬𑄥𑄨𑄣𑄨𑄑𑄢𑄬"} other{"{0} 𑄟𑄨𑄣𑄨𑄉𑄳𑄢𑄟𑄴, 𑄛𑄳𑄢𑄧𑄖𑄨 𑄓𑄬𑄥𑄨𑄣𑄨𑄑𑄢𑄬"} @@ -1072,7 +1072,7 @@ ccp{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1355,9 +1355,9 @@ ccp{ per{"{0} 𑄛𑄳𑄢𑄧𑄖𑄨 𑄟𑄨"} } micrometer{ - dnam{"µmeters"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmeters"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"𑄟𑄬𑄣𑄴"} @@ -1431,9 +1431,9 @@ ccp{ other{"{0} t"} } 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/ceb.txt b/icu4c/source/data/unit/ceb.txt index 77412bc9534..312d5ea0404 100644 --- a/icu4c/source/data/unit/ceb.txt +++ b/icu4c/source/data/unit/ceb.txt @@ -164,7 +164,7 @@ ceb{ one{"{0} ka karat"} other{"{0} ka mga karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mga milligram kada deciliter"} one{"{0} ka milligram kada deciliter"} other{"{0} ka mga milligram kada deciliter"} @@ -461,7 +461,7 @@ ceb{ graphics{ dot{ one{"{0} dot"} - other{"{0} dot"} + other{"{0} px"} } dot-per-centimeter{ dnam{"mga dot kada sentimetro"} @@ -1180,7 +1180,7 @@ ceb{ karat{ dnam{"mga karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ one{"{0} mg/dL"} other{"{0} mg/dL"} } @@ -1400,7 +1400,7 @@ ceb{ dnam{"m"} } micrometer{ - dnam{"mga µmeter"} + dnam{"mga μmeter"} } mile{ dnam{"mga milya"} diff --git a/icu4c/source/data/unit/chr.txt b/icu4c/source/data/unit/chr.txt index bf57cdeb66e..42ff141e734 100644 --- a/icu4c/source/data/unit/chr.txt +++ b/icu4c/source/data/unit/chr.txt @@ -157,7 +157,7 @@ chr{ one{"{0} ᎧᏇᏓ"} other{"{0} ᏗᎧᏇᏓ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎤᏍᏗ ᏂᏚᏓᎨᏒ ᏌᏉ ᎢᏳᎾᏓᎢ ᏍᎪᎯ ᎵᏔᎢ ᎢᏳᏓᎵ"} one{"{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎤᏍᏗ ᎤᏓᎨᏒ ᏌᏉ ᎢᏳᎾᏓᎢ ᏍᎪᎯ ᎵᏔᎢ ᎢᏳᏓᎵ"} other{"{0} ᏌᏉ ᎢᏯᎦᎨᎵᏁᎢ ᎤᏍᏗ ᏂᏚᏓᎨᏒ ᏌᏉ ᎢᏳᎾᏓᎢ ᏍᎪᎯ ᎵᏔᎢ ᎢᏳᏓᎵ"} @@ -1182,7 +1182,7 @@ chr{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1531,9 +1531,9 @@ chr{ per{"{0}/ᎠᏟ"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"ᎢᏳᏟᎶᏓ"} @@ -1632,9 +1632,9 @@ chr{ other{"{0} t"} } 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/cs.txt b/icu4c/source/data/unit/cs.txt index 918542b1326..112770aff4d 100644 --- a/icu4c/source/data/unit/cs.txt +++ b/icu4c/source/data/unit/cs.txt @@ -222,7 +222,7 @@ cs{ one{"{0} karát"} other{"{0} karátů"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramy na decilitr"} few{"{0} miligramy na decilitr"} many{"{0} miligramu na decilitr"} @@ -1561,7 +1561,7 @@ cs{ 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}"} @@ -1628,7 +1628,7 @@ cs{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} many{"{0} mg/dl"} @@ -2025,11 +2025,11 @@ cs{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2136,11 +2136,11 @@ cs{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -2657,7 +2657,7 @@ cs{ 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}"} @@ -2724,7 +2724,7 @@ cs{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} many{"{0} mg/dl"} @@ -3266,11 +3266,11 @@ cs{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -3426,11 +3426,11 @@ cs{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/cy.txt b/icu4c/source/data/unit/cy.txt index 702acfef595..fb101ab4e21 100644 --- a/icu4c/source/data/unit/cy.txt +++ b/icu4c/source/data/unit/cy.txt @@ -277,7 +277,7 @@ cy{ two{"{0} kt"} zero{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramau y declilitr"} few{"{0} mg/dL"} many{"{0} mg/dL"} @@ -672,11 +672,11 @@ cy{ } foodcalorie{ dnam{"Calorïau"} - few{"{0} Cal"} - many{"{0} Cal"} + few{"{0} kcal"} + many{"{0} kcal"} one{"{0} Calori"} other{"{0} Calori"} - two{"{0} Cal"} + two{"{0} kcal"} zero{"{0} Cal"} } joule{ @@ -776,30 +776,30 @@ cy{ } graphics{ dot{ - few{"{0} dot"} - many{"{0} dot"} - one{"{0} dot"} - other{"{0} dot"} + few{"{0} px"} + many{"{0} px"} + one{"{0} px"} + other{"{0} px"} two{"{0} ddot"} - zero{"{0} dot"} + zero{"{0} px"} } dot-per-centimeter{ dnam{"dotiau mewn centimedr"} - few{"{0} dpcm"} - many{"{0} dpcm"} + few{"{0} ppcm"} + many{"{0} ppcm"} one{"{0} dot mewn centimedr"} other{"{0} mewn centimedr"} - two{"{0} dpcm"} - zero{"{0} dpcm"} + two{"{0} ppcm"} + zero{"{0} ppcm"} } dot-per-inch{ dnam{"dotiau mewn modfedd"} - few{"{0} dpi"} - many{"{0} dpi"} + few{"{0} ppi"} + many{"{0} ppi"} one{"{0} dot mewn modfedd"} other{"{0} dot mewn modfedd"} - two{"{0} dpi"} - zero{"{0} dpi"} + two{"{0} ppi"} + zero{"{0} ppi"} } em{ dnam{"em argraffyddol"} @@ -948,12 +948,12 @@ cy{ } micrometer{ dnam{"micrometrau"} - few{"{0} µm"} - many{"{0} µm"} + few{"{0} μm"} + many{"{0} μm"} one{"{0} micrometr"} other{"{0} micrometr"} - two{"{0} µm"} - zero{"{0} µm"} + two{"{0} μm"} + zero{"{0} μm"} } mile{ dnam{"milltiroedd"} @@ -1140,12 +1140,12 @@ cy{ } microgram{ dnam{"microgramau"} - few{"{0} µg"} - many{"{0} µg"} + few{"{0} μg"} + many{"{0} μg"} one{"{0} microgram"} other{"{0} microgram"} - two{"{0} µg"} - zero{"{0} µg"} + two{"{0} μg"} + zero{"{0} μg"} } milligram{ dnam{"miligramau"} @@ -2283,13 +2283,13 @@ cy{ zero{"{0}m"} } micrometer{ - dnam{"µm"} - few{"{0}µm"} - many{"{0}µm"} - one{"{0}µm"} - other{"{0}µm"} - two{"{0}µm"} - zero{"{0}µm"} + dnam{"μm"} + few{"{0}μm"} + many{"{0}μm"} + one{"{0}μm"} + other{"{0}μm"} + two{"{0}μm"} + zero{"{0}μm"} } mile{ dnam{"mi"} @@ -2400,13 +2400,13 @@ cy{ zero{"{0}t"} } microgram{ - dnam{"µg"} - few{"{0}µg"} - many{"{0}µg"} - one{"{0}µg"} - other{"{0}µg"} - two{"{0}µg"} - zero{"{0}µg"} + dnam{"μg"} + few{"{0}μg"} + many{"{0}μg"} + one{"{0}μg"} + other{"{0}μg"} + two{"{0}μg"} + zero{"{0}μg"} } milligram{ dnam{"mg"} @@ -2911,7 +2911,7 @@ cy{ two{"{0} kt"} zero{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ few{"{0} mg/dL"} many{"{0} mg/dL"} one{"{0} mg/dL"} @@ -3260,11 +3260,11 @@ cy{ } foodcalorie{ dnam{"Cal"} - few{"{0} Cal"} - many{"{0} Cal"} + few{"{0} kcal"} + many{"{0} kcal"} one{"{0} Cal"} - other{"{0} Cal"} - two{"{0} Cal"} + other{"{0} kcal"} + two{"{0} kcal"} zero{"{0} Cal"} } joule{ @@ -3337,12 +3337,12 @@ cy{ } graphics{ dot{ - few{"{0} dot"} - many{"{0} dot"} - one{"{0} dot"} - other{"{0} dot"} + few{"{0} px"} + many{"{0} px"} + one{"{0} px"} + other{"{0} px"} two{"{0} ddot"} - zero{"{0} dot"} + zero{"{0} px"} } megapixel{ dnam{"megapicseli"} @@ -3448,13 +3448,13 @@ cy{ zero{"{0} m"} } micrometer{ - dnam{"µmetrau"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} - two{"{0} µm"} - zero{"{0} µm"} + dnam{"μmetrau"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} + two{"{0} μm"} + zero{"{0} μm"} } mile{ dnam{"milltiroedd"} @@ -3610,13 +3610,13 @@ cy{ zero{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} - zero{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} + zero{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/da.txt b/icu4c/source/data/unit/da.txt index bb88d69723e..f5c5d42ef28 100644 --- a/icu4c/source/data/unit/da.txt +++ b/icu4c/source/data/unit/da.txt @@ -181,7 +181,7 @@ da{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram pr. deciliter"} one{"{0} milligram pr. deciliter"} other{"{0} milligram pr. deciliter"} @@ -1129,7 +1129,7 @@ da{ 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}"} @@ -1256,7 +1256,7 @@ da{ per{"{0}/m"} } micrometer{ - dnam{"µm"} + dnam{"μm"} one{"{0}μm"} other{"{0}μm"} } @@ -1522,7 +1522,7 @@ da{ one{"{0} kt."} other{"{0} kt."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1852,9 +1852,9 @@ da{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"engelske mil"} @@ -1940,9 +1940,9 @@ da{ other{"{0} t"} } 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/de.txt b/icu4c/source/data/unit/de.txt index 59a20450b1e..e15e8dc217b 100644 --- a/icu4c/source/data/unit/de.txt +++ b/icu4c/source/data/unit/de.txt @@ -375,7 +375,7 @@ de{ one{"{0} Karat"} other{"{0} Karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"Milligramm pro Deziliter"} one{"{0} Milligramm pro Deziliter"} other{"{0} Milligramm pro Deziliter"} @@ -2719,9 +2719,9 @@ de{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ one{"{0} mi"} @@ -2779,9 +2779,9 @@ de{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -3078,7 +3078,7 @@ de{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} diff --git a/icu4c/source/data/unit/de_CH.txt b/icu4c/source/data/unit/de_CH.txt index dc7606d2cb9..0b4ace087e2 100644 --- a/icu4c/source/data/unit/de_CH.txt +++ b/icu4c/source/data/unit/de_CH.txt @@ -24,18 +24,8 @@ de_CH{ other{"{0} Quadratfuss"} } } - compound{ - 1024p1{"kibi{0}"} - 1024p2{"mebi{0}"} - 1024p3{"gibi{0}"} - 1024p4{"tebi{0}"} - 1024p5{"pebi{0}"} - 1024p6{"exbi{0}"} - 1024p7{"zebi{0}"} - 1024p8{"yobe{0}"} - } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} } } diff --git a/icu4c/source/data/unit/dsb.txt b/icu4c/source/data/unit/dsb.txt index 1ace4af7c66..71e91277b29 100644 --- a/icu4c/source/data/unit/dsb.txt +++ b/icu4c/source/data/unit/dsb.txt @@ -1723,11 +1723,11 @@ dsb{ two{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/el.txt b/icu4c/source/data/unit/el.txt index b0a23066711..fc565136e40 100644 --- a/icu4c/source/data/unit/el.txt +++ b/icu4c/source/data/unit/el.txt @@ -165,7 +165,7 @@ el{ one{"{0} καράτι"} other{"{0} καράτια"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"χιλιοστόγραμμα ανά δεκατόλιτρο"} one{"{0} χιλιοστόγραμμο ανά δεκατόλιτρο"} other{"{0} χιλιοστόγραμμα ανά δεκατόλιτρο"} @@ -1441,7 +1441,7 @@ el{ 10p-21{"ζπτ-{0}"} 10p-24{"γκτ-{0}"} 10p-3{"χλστ-{0}"} - 10p-6{"µκρ-{0}"} + 10p-6{"μκρ-{0}"} 10p-9{"νν-{0}"} 10p1{"δκ-{0}"} 10p12{"τρ-{0}"} @@ -1473,7 +1473,7 @@ el{ one{"{0} κρτ"} other{"{0} κρτ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1835,8 +1835,8 @@ el{ } micrometer{ dnam{"μικρόμετρα"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"μίλια"} @@ -1948,9 +1948,9 @@ el{ other{"{0} τ."} } 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/en.txt b/icu4c/source/data/unit/en.txt index 93fd9c58f33..49b21657e53 100644 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -161,7 +161,7 @@ en{ one{"{0} karat"} other{"{0} karats"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrams per deciliter"} one{"{0} milligram per deciliter"} other{"{0} milligrams per deciliter"} @@ -1131,7 +1131,7 @@ en{ one{"{0}kt"} other{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} other{"{0}mg/dL"} @@ -1275,8 +1275,8 @@ en{ } microsecond{ dnam{"μsec"} - one{"{0}µs"} - other{"{0}µs"} + one{"{0}μs"} + other{"{0}μs"} } millisecond{ dnam{"msec"} @@ -1516,9 +1516,9 @@ en{ other{"{0}m"} } micrometer{ - dnam{"µm"} - one{"{0}µm"} - other{"{0}µm"} + dnam{"μm"} + one{"{0}μm"} + other{"{0}μm"} } mile{ dnam{"mi"} @@ -1630,9 +1630,9 @@ en{ other{"{0}t"} } microgram{ - dnam{"µg"} - one{"{0}µg"} - other{"{0}µg"} + dnam{"μg"} + one{"{0}μg"} + other{"{0}μg"} } milligram{ dnam{"mg"} @@ -2089,7 +2089,7 @@ en{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -2235,9 +2235,9 @@ en{ per{"{0}/h"} } microsecond{ - dnam{"µsecs"} - one{"{0} µs"} - other{"{0} µs"} + dnam{"μsecs"} + one{"{0} μs"} + other{"{0} μs"} } millisecond{ dnam{"millisecs"} @@ -2477,9 +2477,9 @@ en{ per{"{0}/m"} } micrometer{ - dnam{"µmeters"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmeters"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"miles"} @@ -2578,9 +2578,9 @@ en{ other{"{0} t"} } 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/en_001.txt b/icu4c/source/data/unit/en_001.txt index 5eb18ee7bd8..091f11aa181 100644 --- a/icu4c/source/data/unit/en_001.txt +++ b/icu4c/source/data/unit/en_001.txt @@ -39,7 +39,7 @@ en_001{ one{"{0} carat"} other{"{0} carats"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrams per decilitre"} one{"{0} milligram per decilitre"} other{"{0} milligrams per decilitre"} @@ -321,7 +321,7 @@ en_001{ } } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0}mg/dl"} other{"{0}mg/dl"} @@ -451,7 +451,7 @@ en_001{ one{"{0} ct"} other{"{0} ct"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -495,11 +495,6 @@ en_001{ one{"{0} hr"} other{"{0} hrs"} } - microsecond{ - dnam{"μsecs"} - one{"{0} μs"} - other{"{0} μs"} - } minute{ one{"{0} min"} other{"{0} mins"} @@ -520,7 +515,7 @@ en_001{ dnam{"metres"} } micrometer{ - dnam{"µmetres"} + dnam{"μmetres"} } } mass{ diff --git a/icu4c/source/data/unit/en_AU.txt b/icu4c/source/data/unit/en_AU.txt index 2be16c20c8c..767f5b3ca12 100644 --- a/icu4c/source/data/unit/en_AU.txt +++ b/icu4c/source/data/unit/en_AU.txt @@ -62,7 +62,7 @@ en_AU{ per{"{0}/{1}"} } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} other{"{0}mg/dL"} @@ -167,7 +167,7 @@ en_AU{ } } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} diff --git a/icu4c/source/data/unit/en_CA.txt b/icu4c/source/data/unit/en_CA.txt index 1be7f23ce9c..4f9af8545ee 100644 --- a/icu4c/source/data/unit/en_CA.txt +++ b/icu4c/source/data/unit/en_CA.txt @@ -71,7 +71,7 @@ en_CA{ } unitsNarrow{ concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} other{"{0}mg/dL"} @@ -253,7 +253,7 @@ en_CA{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} diff --git a/icu4c/source/data/unit/es.txt b/icu4c/source/data/unit/es.txt index ae7c5e8108e..f6e48077518 100644 --- a/icu4c/source/data/unit/es.txt +++ b/icu4c/source/data/unit/es.txt @@ -187,7 +187,7 @@ es{ one{"{0} quilate"} other{"{0} quilates"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramos por decilitro"} one{"{0} miligramo por decilitro"} other{"{0} miligramos por decilitro"} @@ -1199,7 +1199,7 @@ es{ 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}"} @@ -1368,9 +1368,9 @@ es{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0}µm"} - other{"{0}µm"} + dnam{"μm"} + one{"{0}μm"} + other{"{0}μm"} } mile{ dnam{"mi"} @@ -1641,7 +1641,7 @@ es{ 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}"} @@ -1686,7 +1686,7 @@ es{ one{"{0} ct"} other{"{0} ct"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -2057,9 +2057,9 @@ es{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2142,9 +2142,9 @@ es{ other{"{0} t"} } 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/es_419.txt b/icu4c/source/data/unit/es_419.txt index 3051b00028b..cbcd04a1ef1 100644 --- a/icu4c/source/data/unit/es_419.txt +++ b/icu4c/source/data/unit/es_419.txt @@ -11,7 +11,7 @@ es_419{ } } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} } } @@ -157,9 +157,9 @@ es_419{ other{"{0}t"} } 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/es_MX.txt b/icu4c/source/data/unit/es_MX.txt index f1daeacad1d..2d8c6fc127c 100644 --- a/icu4c/source/data/unit/es_MX.txt +++ b/icu4c/source/data/unit/es_MX.txt @@ -5,7 +5,7 @@ es_MX{ %%Parent{"es_419"} units{ concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramos por decilitro"} } } diff --git a/icu4c/source/data/unit/es_US.txt b/icu4c/source/data/unit/es_US.txt index 002a8621e12..818522fb294 100644 --- a/icu4c/source/data/unit/es_US.txt +++ b/icu4c/source/data/unit/es_US.txt @@ -19,7 +19,7 @@ es_US{ } } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramos por decilitro"} } } diff --git a/icu4c/source/data/unit/et.txt b/icu4c/source/data/unit/et.txt index 685fd8099bd..b2fb44d2de2 100644 --- a/icu4c/source/data/unit/et.txt +++ b/icu4c/source/data/unit/et.txt @@ -166,7 +166,7 @@ et{ one{"{0} karaat"} other{"{0} karaati"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrammid detsiliitri kohta"} one{"{0} milligramm detsiliitri kohta"} other{"{0} milligrammi detsiliitri kohta"} @@ -1431,7 +1431,7 @@ et{ one{"{0} ct"} other{"{0} ct"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1819,9 +1819,9 @@ et{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1925,9 +1925,9 @@ et{ other{"{0} t"} } 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/eu.txt b/icu4c/source/data/unit/eu.txt index e6d24e806b6..00aa028ad1b 100644 --- a/icu4c/source/data/unit/eu.txt +++ b/icu4c/source/data/unit/eu.txt @@ -161,7 +161,7 @@ eu{ one{"{0} kilate"} other{"{0} kilate"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramo dezilitro bakoitzeko"} one{"{0} miligramo dezilitro bakoitzeko"} other{"{0} miligramo dezilitro bakoitzeko"} @@ -1380,7 +1380,7 @@ eu{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1751,9 +1751,9 @@ eu{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"milia"} @@ -1861,9 +1861,9 @@ eu{ other{"{0} t"} } 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/fa.txt b/icu4c/source/data/unit/fa.txt index 8ca28d6271c..ac5c732f3d1 100644 --- a/icu4c/source/data/unit/fa.txt +++ b/icu4c/source/data/unit/fa.txt @@ -163,7 +163,7 @@ fa{ one{"{0} عیار"} other{"{0} عیار"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"میلی‌گرم در دسی‌لیتر"} one{"{0} میلی‌گرم در دسی‌لیتر"} other{"{0} میلی‌گرم در دسی‌لیتر"} @@ -1267,8 +1267,8 @@ fa{ per{"{0}/متر"} } micrometer{ - one{"{0}µm"} - other{"{0}µm"} + one{"{0}μm"} + other{"{0}μm"} } mile{ dnam{"مایل"} @@ -1571,7 +1571,7 @@ fa{ one{"{0} عیار"} other{"{0} عیار"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"میلی‌گرم در دسی‌لیتر"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1653,7 +1653,7 @@ fa{ other{"{0} Gb"} } gigabyte{ - dnam{"گیگابایت"} + dnam{"GB"} one{"{0} GB"} other{"{0} GB"} } @@ -1673,7 +1673,7 @@ fa{ other{"{0} Mb"} } megabyte{ - dnam{"مگابایت"} + dnam{"MB"} one{"{0} MB"} other{"{0} MB"} } @@ -1719,7 +1719,7 @@ fa{ microsecond{ dnam{"میکروثانیه"} one{"{0} میکروثانیه"} - other{"{0} µs"} + other{"{0} μs"} } millisecond{ dnam{"میلی‌ثانیه"} @@ -1962,8 +1962,8 @@ fa{ } micrometer{ dnam{"میکرومتر"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"مایل"} @@ -2063,8 +2063,8 @@ fa{ other{"{0} t"} } microgram{ - one{"{0} µg"} - other{"{0} µg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ one{"{0} mg"} diff --git a/icu4c/source/data/unit/ff_Adlm.txt b/icu4c/source/data/unit/ff_Adlm.txt index d2366aa1a84..9f258224f0c 100644 --- a/icu4c/source/data/unit/ff_Adlm.txt +++ b/icu4c/source/data/unit/ff_Adlm.txt @@ -157,7 +157,7 @@ ff_Adlm{ times{"{0}-{1}"} } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"𞤥𞤭𞤤𞤭𞤺𞤢𞤪𞤬𞤭 𞤲𞤣𞤫𞤪 𞤣𞤫𞥅𞤧𞤭𞤤𞤭𞥅𞤼𞤵"} } } diff --git a/icu4c/source/data/unit/fi.txt b/icu4c/source/data/unit/fi.txt index e9fe1b1690d..f9e13f9295e 100644 --- a/icu4c/source/data/unit/fi.txt +++ b/icu4c/source/data/unit/fi.txt @@ -165,7 +165,7 @@ fi{ one{"{0} karaatti"} other{"{0} karaattia"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1128,7 +1128,7 @@ fi{ one{"{0}ka"} other{"{0}ka"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0}mg/dl"} other{"{0}mg/dl"} @@ -1496,9 +1496,9 @@ fi{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0}µm"} - other{"{0}µm"} + dnam{"μm"} + one{"{0}μm"} + other{"{0}μm"} } mile{ dnam{"mi"} @@ -1596,7 +1596,7 @@ fi{ other{"{0}t"} } microgram{ - dnam{"µg"} + dnam{"μg"} one{"{0}μg"} other{"{0}μg"} } @@ -2039,7 +2039,7 @@ fi{ one{"{0} ka"} other{"{0} ka"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -2383,9 +2383,9 @@ fi{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2483,9 +2483,9 @@ fi{ other{"{0} t"} } 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/fil.txt b/icu4c/source/data/unit/fil.txt index ceedba4562f..3c903577f7d 100644 --- a/icu4c/source/data/unit/fil.txt +++ b/icu4c/source/data/unit/fil.txt @@ -160,7 +160,7 @@ fil{ one{"{0} karat"} other{"{0} na karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} milligram per deciliter"} other{"{0} milligrams per deciliter"} @@ -1068,7 +1068,7 @@ fil{ 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}"} @@ -1213,9 +1213,9 @@ fil{ per{"{0}/m"} } micrometer{ - dnam{"µmetro"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmetro"} + one{"{0} μm"} + other{"{0} μm"} } mile{ one{"{0}mi"} @@ -1285,9 +1285,9 @@ fil{ other{"{0}t"} } microgram{ - dnam{"µg"} - one{"{0}µg"} - other{"{0}µg"} + dnam{"μg"} + one{"{0}μg"} + other{"{0}μg"} } milligram{ dnam{"mg"} @@ -1520,7 +1520,7 @@ fil{ 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}"} @@ -1541,7 +1541,7 @@ fil{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1904,9 +1904,9 @@ fil{ per{"{0}/m"} } micrometer{ - dnam{"µmetro"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmetro"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"milya"} @@ -2008,9 +2008,9 @@ fil{ other{"{0} t"} } 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/fo.txt b/icu4c/source/data/unit/fo.txt index 67d1ce587af..e410682d7f1 100644 --- a/icu4c/source/data/unit/fo.txt +++ b/icu4c/source/data/unit/fo.txt @@ -160,7 +160,7 @@ fo{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligramm fyri hvønn desilitur"} one{"{0} milligramm fyri hvønn desilitur"} other{"{0} milligramm fyri hvønn desilitur"} @@ -1313,7 +1313,7 @@ fo{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1656,9 +1656,9 @@ fo{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"míl"} @@ -1749,9 +1749,9 @@ fo{ other{"{0} t"} } 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/fr.txt b/icu4c/source/data/unit/fr.txt index 9bd2418263e..497bcaec897 100644 --- a/icu4c/source/data/unit/fr.txt +++ b/icu4c/source/data/unit/fr.txt @@ -185,7 +185,7 @@ fr{ one{"{0} carat"} other{"{0} carats"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrammes par décilitre"} one{"{0} milligramme par décilitre"} other{"{0} milligrammes par décilitre"} @@ -1322,7 +1322,7 @@ fr{ per{"{0}/m"} } micrometer{ - dnam{"µm"} + dnam{"μm"} } mile{ dnam{"mi"} @@ -1379,7 +1379,7 @@ fr{ dnam{"t"} } microgram{ - dnam{"µg"} + dnam{"μg"} } milligram{ dnam{"mg"} @@ -1673,7 +1673,7 @@ fr{ one{"{0} ct"} other{"{0} ct"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -2061,9 +2061,9 @@ fr{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2165,9 +2165,9 @@ fr{ other{"{0} t"} } 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/fr_CA.txt b/icu4c/source/data/unit/fr_CA.txt index 8ebc4c932e3..4212d7837f8 100644 --- a/icu4c/source/data/unit/fr_CA.txt +++ b/icu4c/source/data/unit/fr_CA.txt @@ -547,8 +547,8 @@ fr_CA{ other{"´{0}s."} } microsecond{ - one{"{0}µs"} - other{"{0}µs"} + one{"{0}μs"} + other{"{0}μs"} } minute{ one{"{0}m"} @@ -589,8 +589,8 @@ fr_CA{ other{"{0}al"} } micrometer{ - one{"{0}µm"} - other{"{0}µm"} + one{"{0}μm"} + other{"{0}μm"} } mile-scandinavian{ one{"{0}smi"} @@ -625,8 +625,8 @@ fr_CA{ other{"{0}t"} } microgram{ - one{"{0}µg"} - other{"{0}µg"} + one{"{0}μg"} + other{"{0}μg"} } milligram{ one{"{0}mg"} @@ -979,8 +979,8 @@ fr_CA{ other{"{0} m"} } micrometer{ - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ one{"{0} mi"} @@ -1041,8 +1041,8 @@ fr_CA{ other{"{0} t"} } microgram{ - one{"{0} µg"} - other{"{0} µg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ one{"{0} mg"} diff --git a/icu4c/source/data/unit/ga.txt b/icu4c/source/data/unit/ga.txt index 65e362beadd..1d902bf8648 100644 --- a/icu4c/source/data/unit/ga.txt +++ b/icu4c/source/data/unit/ga.txt @@ -242,7 +242,7 @@ ga{ other{"{0} carat óir"} two{"{0} charat óir"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milleagraim sa deicilítear"} few{"{0} mhilleagram sa deicilítear"} many{"{0} milleagram sa deicilítear"} @@ -1756,7 +1756,7 @@ ga{ 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}"} @@ -1779,7 +1779,7 @@ ga{ other{"{0}kt"} two{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0} mg/dL"} many{"{0} mg/dL"} @@ -2237,12 +2237,12 @@ ga{ two{"{0}m"} } micrometer{ - dnam{"µm"} - few{"{0}µm"} - many{"{0}µm"} - one{"{0}µm"} - other{"{0}µm"} - two{"{0}µm"} + dnam{"μm"} + few{"{0}μm"} + many{"{0}μm"} + one{"{0}μm"} + other{"{0}μm"} + two{"{0}μm"} } mile{ dnam{"mílte"} @@ -2363,12 +2363,12 @@ ga{ two{"{0}t"} } microgram{ - dnam{"µg"} - few{"{0}µg"} - many{"{0}µg"} - one{"{0}µg"} - other{"{0}µg"} - two{"{0}µg"} + dnam{"μg"} + few{"{0}μg"} + many{"{0}μg"} + one{"{0}μg"} + other{"{0}μg"} + two{"{0}μg"} } milligram{ dnam{"mg"} @@ -2950,7 +2950,7 @@ ga{ 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}"} @@ -2973,7 +2973,7 @@ ga{ other{"{0} kt"} two{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0} mg/dL"} many{"{0} mg/dL"} @@ -3529,12 +3529,12 @@ ga{ two{"{0} m"} } micrometer{ - dnam{"µméadair"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} - two{"{0} µm"} + dnam{"μméadair"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} + two{"{0} μm"} } mile{ dnam{"mílte"} @@ -3695,12 +3695,12 @@ ga{ two{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/gd.txt b/icu4c/source/data/unit/gd.txt index 70a6bc64370..547c4f14f14 100644 --- a/icu4c/source/data/unit/gd.txt +++ b/icu4c/source/data/unit/gd.txt @@ -221,7 +221,7 @@ gd{ other{"{0} karat"} two{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligram san deicheamh-liotair"} few{"{0} miligramaichean san deicheamh-liotair"} one{"{0} mhiligram san deicheamh-liotair"} @@ -1566,7 +1566,7 @@ gd{ other{"{0}kt"} two{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0}mg/dL"} one{"{0}mg/dL"} @@ -2095,11 +2095,11 @@ gd{ two{"{0}m"} } micrometer{ - dnam{"µm"} - few{"{0}µm"} - one{"{0}µm"} - other{"{0}µm"} - two{"{0}µm"} + dnam{"μm"} + few{"{0}μm"} + one{"{0}μm"} + other{"{0}μm"} + two{"{0}μm"} } mile{ dnam{"mì"} @@ -2250,11 +2250,11 @@ gd{ two{"{0}t"} } microgram{ - dnam{"µg"} - few{"{0}µg"} - one{"{0}µg"} - other{"{0}µg"} - two{"{0}µg"} + dnam{"μg"} + few{"{0}μg"} + one{"{0}μg"} + other{"{0}μg"} + two{"{0}μg"} } milligram{ dnam{"mg"} @@ -2891,7 +2891,7 @@ gd{ other{"{0} kt"} two{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0} mg/dL"} one{"{0} mg/dL"} @@ -3356,11 +3356,11 @@ gd{ two{"{0} m"} } micrometer{ - dnam{"µ-meatair"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} - two{"{0} µm"} + dnam{"μ-meatair"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} + two{"{0} μm"} } mile{ dnam{"mìle"} @@ -3496,11 +3496,11 @@ gd{ two{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/gl.txt b/icu4c/source/data/unit/gl.txt index a0c84a39c41..2af521f7789 100644 --- a/icu4c/source/data/unit/gl.txt +++ b/icu4c/source/data/unit/gl.txt @@ -165,7 +165,7 @@ gl{ one{"{0} quilate"} other{"{0} quilates"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramos por decilitro"} one{"{0} miligramo por decilitro"} other{"{0} miligramos por decilitro"} @@ -1055,7 +1055,7 @@ gl{ 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}"} @@ -1298,7 +1298,7 @@ gl{ 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}"} @@ -1318,7 +1318,7 @@ gl{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1689,9 +1689,9 @@ gl{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"millas"} @@ -1787,9 +1787,9 @@ gl{ other{"{0} t"} } 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/gu.txt b/icu4c/source/data/unit/gu.txt index 5e24977536a..270c2b9add1 100644 --- a/icu4c/source/data/unit/gu.txt +++ b/icu4c/source/data/unit/gu.txt @@ -166,7 +166,7 @@ gu{ one{"{0} કૅરેટ"} other{"{0} કૅરેટ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"મિલિગ્રામ પ્રતિ ડેસિલિટર"} one{"{0} મિલિગ્રામ પ્રતિ ડેસિલિટર"} other{"{0} મિલિગ્રામ પ્રતિ ડેસિલિટર"} @@ -463,7 +463,7 @@ gu{ graphics{ dot{ dnam{"ડૉટ"} - one{"{0} ડૉટ"} + one{"{0} px"} other{"{0} ડૉટ"} } dot-per-centimeter{ @@ -1429,7 +1429,7 @@ gu{ one{"{0} કૅરેટ"} other{"{0} કૅરેટ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1726,7 +1726,7 @@ gu{ graphics{ dot{ dnam{"ડૉટ"} - one{"{0} ડૉટ"} + one{"{0} px"} other{"{0} ડૉટ"} } pixel{ @@ -1787,8 +1787,8 @@ gu{ } micrometer{ dnam{"માઇક્રોમીટર"} - one{"{0} µમી"} - other{"{0} µમી"} + one{"{0} μમી"} + other{"{0} μમી"} } mile{ dnam{"માઇલ"} @@ -1892,9 +1892,9 @@ gu{ other{"{0} t"} } microgram{ - dnam{"µગ્રામ"} - one{"{0} µગ્રામ"} - other{"{0} µગ્રામ"} + dnam{"μગ્રામ"} + one{"{0} μગ્રામ"} + other{"{0} μગ્રામ"} } milligram{ dnam{"મિગ્રા"} diff --git a/icu4c/source/data/unit/ha.txt b/icu4c/source/data/unit/ha.txt index 6873c9945e0..569a20a5af2 100644 --- a/icu4c/source/data/unit/ha.txt +++ b/icu4c/source/data/unit/ha.txt @@ -152,7 +152,7 @@ ha{ one{"karat {0}"} other{"karats {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrams per deciliter"} one{"milligram per deciliter {0}"} other{"milligrams per deciliter {0}"} @@ -1198,7 +1198,7 @@ ha{ one{"kt {0}"} other{"kt {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ one{"mg/dL {0}"} other{"mg/dL {0}"} } @@ -1337,9 +1337,9 @@ ha{ per{"{0}/saʼa"} } microsecond{ - dnam{"µsecs"} - one{"µs {0}"} - other{"µs {0}"} + dnam{"μsecs"} + one{"μs {0}"} + other{"μs {0}"} } millisecond{ dnam{"milseks"} @@ -1559,9 +1559,9 @@ ha{ other{"m {0}"} } micrometer{ - dnam{"µmeters"} - one{"µm {0}"} - other{"µm {0}"} + dnam{"μmeters"} + one{"μm {0}"} + other{"μm {0}"} } mile{ dnam{"mil-mil"} @@ -1660,8 +1660,8 @@ ha{ other{"t {0}"} } microgram{ - one{"µg {0}"} - other{"µg {0}"} + one{"μg {0}"} + other{"μg {0}"} } milligram{ one{"mg {0}"} diff --git a/icu4c/source/data/unit/he.txt b/icu4c/source/data/unit/he.txt index d7d3b3937c1..e9eda4e13ab 100644 --- a/icu4c/source/data/unit/he.txt +++ b/icu4c/source/data/unit/he.txt @@ -221,7 +221,7 @@ he{ other{"{0} קראט"} two{"{0} קראט"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"מיליגרם/דציליטר"} many{"{0} מיליגרם/דציליטר"} one{"{0} מיליגרם/דציליטר"} @@ -1711,11 +1711,11 @@ he{ two{"{0} מ′"} } micrometer{ - dnam{"µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} - two{"{0} µm"} + dnam{"μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} + two{"{0} μm"} } mile{ dnam{"מייל"} @@ -2158,7 +2158,7 @@ he{ other{"{0} kt"} two{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} many{"{0} mg/dL"} one{"{0} mg/dL"} @@ -2624,11 +2624,11 @@ he{ two{"{0} מ׳"} } micrometer{ - dnam{"µm"} - many{"‎{0} µm‎"} - one{"‎{0} µm‎"} - other{"‎{0} µm‎"} - two{"‎{0} µm‎"} + dnam{"μm"} + many{"‎{0} μm‎"} + one{"‎{0} μm‎"} + other{"‎{0} μm‎"} + two{"‎{0} μm‎"} } mile{ dnam{"מייל"} diff --git a/icu4c/source/data/unit/hi.txt b/icu4c/source/data/unit/hi.txt index 1a280053e22..6242925b4c6 100644 --- a/icu4c/source/data/unit/hi.txt +++ b/icu4c/source/data/unit/hi.txt @@ -241,7 +241,7 @@ hi{ one{"{0} कैरट"} other{"{0} कैरट"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"मिलिग्राम प्रति डेसीलीटर"} one{"{0} मिलिग्राम प्रति डेसीलीटर"} other{"{0} मिलिग्राम प्रति डेसीलीटर"} @@ -2017,7 +2017,7 @@ hi{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"मि॰ग्रा॰/डे॰ली॰"} one{"{0} मि॰ग्रा॰/डे॰ली॰"} other{"{0} मि॰ग्रा॰/डे॰ली॰"} @@ -2361,9 +2361,9 @@ hi{ per{"{0}/मी"} } micrometer{ - dnam{"µ मा॰मी॰"} - one{"{0} µ मा॰मी॰"} - other{"{0} µ मा॰मी॰"} + dnam{"μ मा॰मी॰"} + one{"{0} μ मा॰मी॰"} + other{"{0} μ मा॰मी॰"} } mile{ dnam{"मील"} diff --git a/icu4c/source/data/unit/hr.txt b/icu4c/source/data/unit/hr.txt index 5f2bf9578b7..5d7c76c53ee 100644 --- a/icu4c/source/data/unit/hr.txt +++ b/icu4c/source/data/unit/hr.txt @@ -193,7 +193,7 @@ hr{ one{"{0} karat"} other{"{0} karata"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrami po decilitru"} few{"{0} miligrama po decilitru"} one{"{0} miligram po decilitru"} @@ -1591,9 +1591,9 @@ hr{ other{"{0} m"} } micrometer{ - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ few{"{0} mi"} @@ -1663,9 +1663,9 @@ hr{ other{"{0} t"} } microgram{ - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ few{"{0} mg"} @@ -2033,7 +2033,7 @@ hr{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} one{"{0} mg/dl"} @@ -2481,10 +2481,10 @@ hr{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2586,10 +2586,10 @@ hr{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/hsb.txt b/icu4c/source/data/unit/hsb.txt index ba2bb9b3f86..a9c44d6e074 100644 --- a/icu4c/source/data/unit/hsb.txt +++ b/icu4c/source/data/unit/hsb.txt @@ -1723,11 +1723,11 @@ hsb{ two{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/hu.txt b/icu4c/source/data/unit/hu.txt index f6a01340871..f8c632d15ab 100644 --- a/icu4c/source/data/unit/hu.txt +++ b/icu4c/source/data/unit/hu.txt @@ -160,7 +160,7 @@ hu{ one{"{0} karát"} other{"{0} karát"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligramm/deciliter"} one{"{0} milligramm/deciliter"} other{"{0} milligramm/deciliter"} @@ -1516,7 +1516,7 @@ hu{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1787,7 +1787,7 @@ hu{ dot-per-centimeter{ dnam{"dpcm"} one{"{0} dpcm"} - other{"{0} dpcm"} + other{"{0} ppcm"} } em{ dnam{"em"} @@ -1858,9 +1858,9 @@ hu{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mf"} @@ -1947,9 +1947,9 @@ hu{ other{"{0} t"} } 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/hy.txt b/icu4c/source/data/unit/hy.txt index b0e8f779e2a..5a27fb57bf5 100644 --- a/icu4c/source/data/unit/hy.txt +++ b/icu4c/source/data/unit/hy.txt @@ -165,7 +165,7 @@ hy{ one{"{0} կարատ"} other{"{0} կարատ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"միլիգրամներ դեցիլիտրի վրա"} one{"{0} միլիգրամ դեցիլիտրի վրա"} other{"{0} միլիգրամ դեցիլիտրի վրա"} @@ -1477,7 +1477,7 @@ hy{ one{"{0} կար"} other{"{0} կար"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"մգ/դլ"} one{"{0} մգ/դլ"} other{"{0} մգ/դլ"} diff --git a/icu4c/source/data/unit/ia.txt b/icu4c/source/data/unit/ia.txt index 6e01a9c49f5..415dc638045 100644 --- a/icu4c/source/data/unit/ia.txt +++ b/icu4c/source/data/unit/ia.txt @@ -108,7 +108,7 @@ ia{ one{"{0} kt"} other{"{0} carates"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrammas per decilitro"} one{"{0} mg/dL"} other{"{0} milligrammas per decilitro"} @@ -408,7 +408,7 @@ ia{ } micrometer{ dnam{"micrometros"} - one{"{0} µm"} + one{"{0} μm"} other{"{0} micrometros"} } mile{ @@ -489,7 +489,7 @@ ia{ } microgram{ dnam{"microgrammas"} - one{"{0} µg"} + one{"{0} μg"} other{"{0} microgrammas"} } milligram{ @@ -980,7 +980,7 @@ ia{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1279,9 +1279,9 @@ ia{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1360,9 +1360,9 @@ ia{ other{"{0}t"} } 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/id.txt b/icu4c/source/data/unit/id.txt index 70ce6b7285b..5364fdb8b48 100644 --- a/icu4c/source/data/unit/id.txt +++ b/icu4c/source/data/unit/id.txt @@ -133,7 +133,7 @@ id{ dnam{"karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram per desiliter"} other{"{0} milligram per desiliter"} } @@ -973,8 +973,8 @@ id{ other{"{0}m"} } micrometer{ - dnam{"µmeter"} - other{"{0}µm"} + dnam{"μmeter"} + other{"{0}μm"} } mile{ dnam{"mil"} @@ -1153,7 +1153,7 @@ id{ dnam{"karat"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -1439,8 +1439,8 @@ id{ per{"{0}/m"} } micrometer{ - dnam{"µmeter"} - other{"{0} µm"} + dnam{"μmeter"} + other{"{0} μm"} } mile{ dnam{"mil"} @@ -1529,8 +1529,8 @@ id{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/is.txt b/icu4c/source/data/unit/is.txt index b6dd2826047..905061b980f 100644 --- a/icu4c/source/data/unit/is.txt +++ b/icu4c/source/data/unit/is.txt @@ -165,7 +165,7 @@ is{ one{"{0} karat"} other{"{0} karöt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrömm á desílítra"} one{"{0} milligramm á desílítra"} other{"{0} milligrömm á desílítra"} @@ -1098,7 +1098,7 @@ is{ per{"{0}/{1}"} } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} other{"{0}mg/dL"} @@ -1254,9 +1254,9 @@ is{ per{"{0}/m"} } micrometer{ - dnam{"µmetrar"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmetrar"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mílur"} @@ -1328,9 +1328,9 @@ is{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -1579,7 +1579,7 @@ is{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1957,9 +1957,9 @@ is{ per{"{0}/m"} } micrometer{ - dnam{"µmetrar"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmetrar"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mílur"} @@ -2064,9 +2064,9 @@ is{ other{"{0} tn"} } 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/it.txt b/icu4c/source/data/unit/it.txt index 786d447a048..76863b10eb9 100644 --- a/icu4c/source/data/unit/it.txt +++ b/icu4c/source/data/unit/it.txt @@ -186,7 +186,7 @@ it{ one{"{0} carato"} other{"{0} carati"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligrammi per decilitro"} one{"{0} milligrammo per decilitro"} other{"{0} milligrammi per decilitro"} @@ -1470,7 +1470,7 @@ it{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1795,9 +1795,9 @@ it{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"miglia"} @@ -1886,9 +1886,9 @@ it{ other{"{0} t"} } 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/ja.txt b/icu4c/source/data/unit/ja.txt index 6c9588e11e2..002b94696db 100644 --- a/icu4c/source/data/unit/ja.txt +++ b/icu4c/source/data/unit/ja.txt @@ -138,7 +138,7 @@ ja{ dnam{"金"} other{"{0} 金"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ミリグラム毎デシリットル"} other{"{0} ミリグラム毎デシリットル"} } @@ -981,7 +981,7 @@ ja{ per{"{0}/時間"} } microsecond{ - dnam{"µs"} + dnam{"μs"} other{"{0}μs"} } millisecond{ @@ -1111,7 +1111,7 @@ ja{ } micrometer{ dnam{"マイクロメートル"} - other{"{0}µm"} + other{"{0}μm"} } mile{ dnam{"マイル"} @@ -1172,7 +1172,7 @@ ja{ other{"{0}MT"} } microgram{ - other{"{0}µg"} + other{"{0}μg"} } milligram{ other{"{0}mg"} @@ -1442,7 +1442,7 @@ ja{ dnam{"金"} other{"{0} 金"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ミリグラム毎デシリットル"} other{"{0} mg/dL"} } @@ -1769,7 +1769,7 @@ ja{ } micrometer{ dnam{"マイクロメートル"} - other{"{0} µm"} + other{"{0} μm"} } mile{ dnam{"マイル"} @@ -1863,7 +1863,7 @@ ja{ } microgram{ dnam{"マイクログラム"} - other{"{0} µg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/jv.txt b/icu4c/source/data/unit/jv.txt index f2057fec5f3..68eaa7ead1b 100644 --- a/icu4c/source/data/unit/jv.txt +++ b/icu4c/source/data/unit/jv.txt @@ -133,7 +133,7 @@ jv{ dnam{"karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligram saben desiliter"} other{"{0} miligram saben desiliter"} } @@ -1014,7 +1014,7 @@ jv{ dnam{"karat"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -1306,8 +1306,8 @@ jv{ per{"{0}/m"} } micrometer{ - dnam{"µmeter"} - other{"{0} µm"} + dnam{"μmeter"} + other{"{0} μm"} } mile{ dnam{"mil"} diff --git a/icu4c/source/data/unit/ka.txt b/icu4c/source/data/unit/ka.txt index 25d562d514c..789d139634d 100644 --- a/icu4c/source/data/unit/ka.txt +++ b/icu4c/source/data/unit/ka.txt @@ -165,7 +165,7 @@ ka{ one{"{0} კარატი"} other{"{0} კარატი"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"მილიგრამი დეცილიტრზე"} one{"{0} მილიგრამი დეცილიტრზე"} other{"{0} მილიგრამი დეცილიტრზე"} @@ -1476,7 +1476,7 @@ ka{ one{"{0} კარ."} other{"{0} კარ."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"მგ/დლ"} one{"{0} მგ/დლ"} other{"{0} მგ/დლ"} @@ -1548,9 +1548,9 @@ ka{ other{"{0} გბიტი"} } gigabyte{ - dnam{"გბაიტი"} - one{"{0} გბაიტი"} - other{"{0} გბაიტი"} + dnam{"GB"} + one{"{0} GB"} + other{"{0} GB"} } kilobit{ dnam{"კბიტი"} @@ -1568,9 +1568,9 @@ ka{ other{"{0} მბიტი"} } megabyte{ - dnam{"მბაიტი"} - one{"{0} მბაიტი"} - other{"{0} მბაიტი"} + dnam{"MB"} + one{"{0} MB"} + other{"{0} MB"} } petabyte{ dnam{"პბაიტი"} diff --git a/icu4c/source/data/unit/kea.txt b/icu4c/source/data/unit/kea.txt index dafb0c364db..f7d737181d1 100644 --- a/icu4c/source/data/unit/kea.txt +++ b/icu4c/source/data/unit/kea.txt @@ -126,7 +126,7 @@ kea{ dnam{"kilati"} other{"{0} kilati"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrama pur desilitru"} other{"{0} miligrama pur desilitru"} } @@ -966,7 +966,7 @@ kea{ dnam{"kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} other{"{0} mg/dl"} } @@ -1207,8 +1207,8 @@ kea{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - other{"{0} µm"} + dnam{"μm"} + other{"{0} μm"} } mile{ dnam{"mi"} diff --git a/icu4c/source/data/unit/kk.txt b/icu4c/source/data/unit/kk.txt index 679c92b150a..dbbc4e21f36 100644 --- a/icu4c/source/data/unit/kk.txt +++ b/icu4c/source/data/unit/kk.txt @@ -165,7 +165,7 @@ kk{ one{"{0} карат"} other{"{0} карат"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"миллиграмм/децилитр"} one{"{0} миллиграмм/децилитр"} other{"{0} миллиграмм/децилитр"} @@ -1450,7 +1450,7 @@ kk{ one{"{0} кар."} other{"{0} кар."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} one{"{0} мг/дл"} other{"{0} мг/дл"} diff --git a/icu4c/source/data/unit/km.txt b/icu4c/source/data/unit/km.txt index 046b183620c..fa2a439fec0 100644 --- a/icu4c/source/data/unit/km.txt +++ b/icu4c/source/data/unit/km.txt @@ -129,7 +129,7 @@ km{ dnam{"ការ៉ាត់"} other{"{0} ការ៉ាត់"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"មិល្លីក្រាមក្នុងមួយដេស៊ីលីត្រ"} other{"{0} មិល្លីក្រាមក្នុងមួយដេស៊ីលីត្រ"} } @@ -815,7 +815,7 @@ km{ 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}"} @@ -1078,7 +1078,7 @@ km{ 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}"} @@ -1097,7 +1097,7 @@ km{ dnam{"ការ៉ាត់"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -1364,7 +1364,7 @@ km{ } micrometer{ dnam{"មីក្រូ​ម៉ែត្រ"} - other{"{0} µm"} + other{"{0} μm"} } mile{ dnam{"ម៉ាយ"} @@ -1433,8 +1433,8 @@ km{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/kn.txt b/icu4c/source/data/unit/kn.txt index 10011ee6ec3..03c331cadc2 100644 --- a/icu4c/source/data/unit/kn.txt +++ b/icu4c/source/data/unit/kn.txt @@ -165,7 +165,7 @@ kn{ one{"{0} ಕಾರಟ್‌"} other{"{0} ಕಾರಟ್‌ಗಳು"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂಗಳು"} one{"{0} ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂ"} other{"{0} ಪ್ರತಿ ಡೆಸಿಲೀಟರ್‌ಗೆ ಮಿಲಿಗ್ರಾಂಗಳು"} @@ -1520,7 +1520,7 @@ kn{ one{"{0} ಕಾರ."} other{"{0} ಕಾರ."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ಮಿಗ್ರಾಂ/ಡೆಲೀ"} one{"{0} ಮಿಗ್ರಾಂ/ಡೆಲೀ"} other{"{0} ಮಿಗ್ರಾಂ/ಡೆಲೀ"} @@ -1822,12 +1822,12 @@ kn{ } dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - one{"{0} dpi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -1918,9 +1918,9 @@ kn{ per{"{0}/ಮೀ"} } micrometer{ - dnam{"µmeters"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmeters"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"ಮೈಲುಗಳು"} diff --git a/icu4c/source/data/unit/ko.txt b/icu4c/source/data/unit/ko.txt index 714a6bfd081..a9fad843c5f 100644 --- a/icu4c/source/data/unit/ko.txt +++ b/icu4c/source/data/unit/ko.txt @@ -137,7 +137,7 @@ ko{ dnam{"캐럿"} other{"{0}캐럿"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"데시리터당 밀리그램"} other{"데시리터당 {0}밀리그램"} } @@ -993,8 +993,8 @@ ko{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - other{"{0}µm"} + dnam{"μm"} + other{"{0}μm"} } mile{ dnam{"mi"} @@ -1053,8 +1053,8 @@ ko{ other{"{0}t"} } microgram{ - dnam{"µg"} - other{"{0}µg"} + dnam{"μg"} + other{"{0}μg"} } milligram{ dnam{"mg"} @@ -1254,7 +1254,7 @@ ko{ dnam{"kt"} other{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0}mg/dL"} } @@ -1572,8 +1572,8 @@ ko{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - other{"{0}µm"} + dnam{"μm"} + other{"{0}μm"} } mile{ dnam{"mi"} @@ -1662,8 +1662,8 @@ ko{ other{"{0}t"} } microgram{ - dnam{"µg"} - other{"{0}µg"} + dnam{"μg"} + other{"{0}μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/kok.txt b/icu4c/source/data/unit/kok.txt index a116885fa44..c1cb9eded03 100644 --- a/icu4c/source/data/unit/kok.txt +++ b/icu4c/source/data/unit/kok.txt @@ -138,7 +138,7 @@ kok{ dnam{"कॅरट्स"} other{"{0} कॅरट्स"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"मिलिग्राम/डेसिलिटर"} other{"{0} मिलिग्राम/डेसिलिटर"} } @@ -847,7 +847,7 @@ kok{ 10p-21{"जे{0}"} 10p-24{"यॉ{0}"} 10p-3{"मि {0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"नॅ{0}"} 10p1{"डा{0}"} 10p12{"टे {0}"} @@ -1061,7 +1061,7 @@ kok{ 10p-21{"जे{0}"} 10p-24{"यॉ{0}"} 10p-3{"मि{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"नॅ{0}"} 10p1{"डा{0}"} 10p12{"टे{0}"} @@ -1095,7 +1095,7 @@ kok{ dnam{"कॅरट्स"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"मिग्रा/डेलि"} other{"{0} मिग्रा/डेलि"} } @@ -1421,8 +1421,8 @@ kok{ per{"{0}/मी"} } micrometer{ - dnam{"µm"} - other{"{0} µm"} + dnam{"μm"} + other{"{0} μm"} } mile{ dnam{"मायल्स"} @@ -1515,8 +1515,8 @@ kok{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"मिग्रा"} diff --git a/icu4c/source/data/unit/ky.txt b/icu4c/source/data/unit/ky.txt index 110a0709816..a044b74e85d 100644 --- a/icu4c/source/data/unit/ky.txt +++ b/icu4c/source/data/unit/ky.txt @@ -157,7 +157,7 @@ ky{ one{"{0} карат"} other{"{0} карат"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"децилитрга миллиграмм"} one{"децилитрга {0} миллиграмм"} other{"децилитрга {0} миллиграмм"} @@ -1345,7 +1345,7 @@ ky{ one{"{0} кт"} other{"{0} кт"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} one{"{0} мг/дл"} other{"{0} мг/дл"} @@ -1693,9 +1693,9 @@ ky{ per{"{0}/м"} } micrometer{ - dnam{"µметр"} - one{"{0} µм"} - other{"{0} µм"} + dnam{"μметр"} + one{"{0} μм"} + other{"{0} μм"} } mile{ dnam{"миля"} diff --git a/icu4c/source/data/unit/lb.txt b/icu4c/source/data/unit/lb.txt index 3143f4a796f..a663c35c7b8 100644 --- a/icu4c/source/data/unit/lb.txt +++ b/icu4c/source/data/unit/lb.txt @@ -795,8 +795,8 @@ lb{ other{"{0} m"} } micrometer{ - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ one{"{0} mi"} @@ -848,8 +848,8 @@ lb{ other{"{0} t"} } microgram{ - one{"{0} µg"} - other{"{0} µg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ one{"{0} mg"} @@ -1371,9 +1371,9 @@ lb{ other{"{0} m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1440,9 +1440,9 @@ lb{ other{"{0} t"} } 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/lo.txt b/icu4c/source/data/unit/lo.txt index 4f9e521ede3..dcddf53d941 100644 --- a/icu4c/source/data/unit/lo.txt +++ b/icu4c/source/data/unit/lo.txt @@ -136,7 +136,7 @@ lo{ dnam{"ກະຣັດ"} other{"{0} ກະຣັດ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ມິລິກຣັມຕໍ່ເດຊິລິດ"} other{"{0} mg/dL"} } @@ -516,8 +516,8 @@ lo{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"ມິນລີກຣາມ"} @@ -1118,7 +1118,7 @@ lo{ dnam{"ກະຣັດ"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -1378,8 +1378,8 @@ lo{ per{"{0}/ມ"} } micrometer{ - dnam{"µm"} - other{"{0} µm"} + dnam{"μm"} + other{"{0} μm"} } mile{ dnam{"ໄມລ໌"} @@ -1448,8 +1448,8 @@ lo{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"ມກ"} diff --git a/icu4c/source/data/unit/lt.txt b/icu4c/source/data/unit/lt.txt index f57af5141d6..5cfddf8deb4 100644 --- a/icu4c/source/data/unit/lt.txt +++ b/icu4c/source/data/unit/lt.txt @@ -221,7 +221,7 @@ lt{ one{"{0} karatas"} other{"{0} karatų"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramai decilitre"} few{"{0} miligramai decilitre"} many{"{0} miligramo decilitre"} @@ -2046,7 +2046,7 @@ lt{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} many{"{0} mg/dl"} @@ -2532,11 +2532,11 @@ lt{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2664,11 +2664,11 @@ lt{ other{"{0} mt"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/lv.txt b/icu4c/source/data/unit/lv.txt index b015adcc16a..a74af9b627b 100644 --- a/icu4c/source/data/unit/lv.txt +++ b/icu4c/source/data/unit/lv.txt @@ -192,7 +192,7 @@ lv{ other{"{0} karāti"} zero{"{0} karātu"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrami uz decilitru"} one{"{0} miligrams uz decilitru"} other{"{0} miligrami uz decilitru"} @@ -553,7 +553,7 @@ lv{ dnam{"punkti collā"} one{"{0} punkts collā"} other{"{0} punkti collā"} - zero{"{0} dpi"} + zero{"{0} ppi"} } megapixel{ dnam{"megapikseļi"} @@ -1716,7 +1716,7 @@ lv{ other{"{0} kt"} zero{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -2060,7 +2060,7 @@ lv{ dnam{"punkts"} one{"{0} p."} other{"{0} p."} - zero{"{0} p."} + zero{"{0} px"} } dot-per-centimeter{ dnam{"dpc"} @@ -2136,10 +2136,10 @@ lv{ zero{"{0} m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} - zero{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} + zero{"{0} μm"} } mile{ dnam{"jūdzes"} @@ -2267,10 +2267,10 @@ lv{ zero{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} - zero{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} + zero{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/mk.txt b/icu4c/source/data/unit/mk.txt index 49f67f56681..51f3b5be295 100644 --- a/icu4c/source/data/unit/mk.txt +++ b/icu4c/source/data/unit/mk.txt @@ -166,7 +166,7 @@ mk{ one{"{0} карат"} other{"{0} карати"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"милиграм по децилитар"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1293,8 +1293,8 @@ mk{ per{"{0}/м"} } micrometer{ - one{"{0} µм"} - other{"{0} µм"} + one{"{0} μм"} + other{"{0} μм"} } mile{ dnam{"ми"} @@ -1367,8 +1367,8 @@ mk{ other{"{0} т"} } microgram{ - one{"{0} µг"} - other{"{0} µг"} + one{"{0} μг"} + other{"{0} μг"} } milligram{ dnam{"мг"} @@ -1694,7 +1694,7 @@ mk{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1991,17 +1991,17 @@ mk{ graphics{ dot{ dnam{"тчк."} - one{"{0} тчк."} + one{"{0} px"} other{"{0} тчк."} } dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - one{"{0} dpi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -2087,9 +2087,9 @@ mk{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"милји"} @@ -2193,9 +2193,9 @@ mk{ other{"{0} t"} } 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/ml.txt b/icu4c/source/data/unit/ml.txt index 363da7a37b8..b47ed2f611f 100644 --- a/icu4c/source/data/unit/ml.txt +++ b/icu4c/source/data/unit/ml.txt @@ -163,7 +163,7 @@ ml{ one{"{0} ക്യാരറ്റ്"} other{"{0} ക്യാരറ്റ്"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"മില്ലിഗ്രാം / ഡെസിലിറ്റർ"} one{"{0} മില്ലിഗ്രാം / ഡെസിലിറ്റർ"} other{"{0} മില്ലിഗ്രാം / ഡെസിലിറ്റർ"} @@ -1132,9 +1132,9 @@ ml{ per{"{0}/മീ."} } micrometer{ - dnam{"µമീ."} - one{"{0}µമീ."} - other{"{0}µമീ."} + dnam{"μമീ."} + one{"{0}μമീ."} + other{"{0}μമീ."} } mile{ dnam{"മൈൽ"} @@ -1206,9 +1206,9 @@ ml{ other{"{0}ട."} } microgram{ - dnam{"µ.ഗ്രാം."} - one{"{0}µ.ഗ്രാം."} - other{"{0}µ.ഗ്രാം."} + dnam{"μ.ഗ്രാം."} + one{"{0}μ.ഗ്രാം."} + other{"{0}μ.ഗ്രാം."} } milligram{ dnam{"മി.ഗ്രാം."} @@ -1445,7 +1445,7 @@ ml{ one{"{0} ക്യാ."} other{"{0} ക്യാ."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"മി.ഗ്രാം/ഡെ.ലി."} one{"{0} മി.ഗ്രാം/ഡെ.ലി."} other{"{0} മി.ഗ്രാം/ഡെ.ലി."} @@ -1732,12 +1732,12 @@ ml{ graphics{ dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - one{"{0} dpi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -1823,9 +1823,9 @@ ml{ per{"{0}/മീ."} } micrometer{ - dnam{"µമീറ്റർ"} - one{"µമീ."} - other{"{0} µമീ."} + dnam{"μമീറ്റർ"} + one{"μമീ."} + other{"{0} μമീ."} } mile{ dnam{"മൈൽ"} @@ -1920,9 +1920,9 @@ ml{ other{"{0} ട."} } microgram{ - dnam{"µ.ഗ്രാം."} - one{"{0} µ.ഗ്രാം."} - other{"{0} µ.ഗ്രാം."} + dnam{"μ.ഗ്രാം."} + one{"{0} μ.ഗ്രാം."} + other{"{0} μ.ഗ്രാം."} } milligram{ dnam{"മി.ഗ്രാം."} diff --git a/icu4c/source/data/unit/mn.txt b/icu4c/source/data/unit/mn.txt index 4aa97b3f1d6..dfc861d83e8 100644 --- a/icu4c/source/data/unit/mn.txt +++ b/icu4c/source/data/unit/mn.txt @@ -165,7 +165,7 @@ mn{ one{"{0} карат"} other{"{0} карат"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} one{"{0} мг/дл"} other{"{0} мг/дл"} @@ -1076,7 +1076,7 @@ mn{ 10p-21{"з{0}"} 10p-24{"ё{0}"} 10p-3{"м{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"н{0}"} 10p1{"да{0}"} 10p12{"Т{0}"} @@ -1427,7 +1427,7 @@ mn{ 10p-21{"з{0}"} 10p-24{"ё{0}"} 10p-3{"м{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"н{0}"} 10p1{"да{0}"} 10p12{"Т{0}"} @@ -1471,7 +1471,7 @@ mn{ one{"{0} кар"} other{"{0} кар"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} one{"{0} мг/дл"} other{"{0} мг/дл"} @@ -1824,9 +1824,9 @@ mn{ per{"{0}/м"} } micrometer{ - dnam{"µметр"} - one{"{0} µм"} - other{"{0} µм"} + dnam{"μметр"} + one{"{0} μм"} + other{"{0} μм"} } mile{ dnam{"миль"} @@ -1924,9 +1924,9 @@ mn{ other{"{0} т"} } microgram{ - dnam{"µг"} - one{"{0} µг"} - other{"{0} µг"} + dnam{"μг"} + one{"{0} μг"} + other{"{0} μг"} } milligram{ dnam{"мг"} diff --git a/icu4c/source/data/unit/mr.txt b/icu4c/source/data/unit/mr.txt index dd33df23f0c..ded0933ad05 100644 --- a/icu4c/source/data/unit/mr.txt +++ b/icu4c/source/data/unit/mr.txt @@ -165,7 +165,7 @@ mr{ one{"{0} कॅरेट"} other{"{0} कॅरेट्स"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"मिलीग्रामस् पर डेसीलिटर"} one{"{0} मिलीग्राम पर डेसीलिटर"} other{"{0} मिलीग्रामस् पर डेसीलिटर"} @@ -1095,7 +1095,7 @@ mr{ 10p-21{"झे{0}"} 10p-24{"यो{0}"} 10p-3{"मि{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"नॅ{0}"} 10p1{"डे{0}"} 10p12{"टे{0}"} @@ -1261,8 +1261,8 @@ mr{ } micrometer{ dnam{"मायक्रोमीटर"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"मैल"} @@ -1543,7 +1543,7 @@ mr{ 10p-21{"झेप{0}"} 10p-24{"योक{0}"} 10p-3{"मि{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"नॅ{0}"} 10p1{"डे{0}"} 10p12{"टे{0}"} @@ -1587,7 +1587,7 @@ mr{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1966,8 +1966,8 @@ mr{ } micrometer{ dnam{"मायक्रोमीटर"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"मैल"} @@ -2075,9 +2075,9 @@ mr{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"मिग्रॅ"} diff --git a/icu4c/source/data/unit/ms.txt b/icu4c/source/data/unit/ms.txt index b643dbc9d3b..0568b3afdf0 100644 --- a/icu4c/source/data/unit/ms.txt +++ b/icu4c/source/data/unit/ms.txt @@ -133,7 +133,7 @@ ms{ dnam{"karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligram setiap desiliter"} other{"{0} miligram setiap desiliter"} } @@ -985,8 +985,8 @@ ms{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - other{"{0} µm"} + dnam{"μm"} + other{"{0} μm"} } mile{ dnam{"bt"} @@ -1045,8 +1045,8 @@ ms{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -1240,7 +1240,7 @@ ms{ dnam{"karat"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -1534,8 +1534,8 @@ ms{ per{"{0}/m"} } micrometer{ - dnam{"µmeter"} - other{"{0} µm"} + dnam{"μmeter"} + other{"{0} μm"} } mile{ dnam{"batu"} @@ -1603,8 +1603,8 @@ ms{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/my.txt b/icu4c/source/data/unit/my.txt index 87558a000d6..73db0e6ec1c 100644 --- a/icu4c/source/data/unit/my.txt +++ b/icu4c/source/data/unit/my.txt @@ -136,7 +136,7 @@ my{ dnam{"ကာရက်"} other{"{0} ကာရက်"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"တစ်ဒက်စီလီတာရှိ မီလီဂရမ်"} other{"တစ်ဒက်စီလီတာရှိ {0} မီလီဂရမ်"} } @@ -1124,7 +1124,7 @@ my{ dnam{"ကာရက်"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -1422,7 +1422,7 @@ my{ } micrometer{ dnam{"မိုက်ခရိုမီတာ"} - other{"{0} µm"} + other{"{0} μm"} } mile{ dnam{"မိုင်"} @@ -1514,8 +1514,8 @@ my{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"မီလီဂရမ်"} diff --git a/icu4c/source/data/unit/mzn.txt b/icu4c/source/data/unit/mzn.txt index 370d1accd7f..64fb69472a0 100644 --- a/icu4c/source/data/unit/mzn.txt +++ b/icu4c/source/data/unit/mzn.txt @@ -762,7 +762,7 @@ mzn{ } microgram{ dnam{"میکروگرم"} - other{"{0} µg"} + other{"{0} μg"} } milligram{ dnam{"میلی‌گرم"} diff --git a/icu4c/source/data/unit/nb.txt b/icu4c/source/data/unit/nb.txt index 2aaa0ff7edd..934f064b8be 100644 --- a/icu4c/source/data/unit/nb.txt +++ b/icu4c/source/data/unit/nb.txt @@ -2,2424 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - durationUnits{ - hm{"h:mm"} - hms{"h:mm:ss"} - ms{"m:ss"} - } - units{ - acceleration{ - g-force{ - dnam{"g-kraft"} - gender{"masculine"} - one{"{0} g-kraft"} - other{"{0} g-kraft"} - } - meter-per-square-second{ - dnam{"meter per sekund²"} - gender{"masculine"} - one{"{0} meter per sekund²"} - other{"{0} meter per sekund²"} - } - } - angle{ - arc-minute{ - dnam{"bueminutter"} - one{"{0} bueminutt"} - other{"{0} bueminutter"} - } - arc-second{ - dnam{"buesekunder"} - one{"{0} buesekund"} - other{"{0} buesekunder"} - } - degree{ - dnam{"grader"} - one{"{0} grad"} - other{"{0} grader"} - } - radian{ - dnam{"radianer"} - one{"{0} radian"} - other{"{0} radianer"} - } - revolution{ - dnam{"omdreininger"} - one{"{0} omdreining"} - other{"{0} omdreininger"} - } - } - area{ - acre{ - dnam{"acre"} - gender{"masculine"} - one{"{0} acre"} - other{"{0} acre"} - } - hectare{ - dnam{"hektar"} - gender{"neuter"} - one{"{0} hektar"} - other{"{0} hektar"} - } - square-centimeter{ - dnam{"kvadratcentimeter"} - gender{"masculine"} - one{"{0} kvadratcentimeter"} - other{"{0} kvadratcentimeter"} - per{"{0} per kvadratcentimeter"} - } - square-foot{ - dnam{"kvadratfot"} - gender{"masculine"} - one{"{0} kvadratfot"} - other{"{0} kvadratfot"} - } - square-inch{ - dnam{"kvadrattommer"} - one{"{0} kvadrattomme"} - other{"{0} kvadrattommer"} - per{"{0} per kvadrattomme"} - } - square-kilometer{ - dnam{"kvadratkilometer"} - gender{"masculine"} - 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"} - gender{"masculine"} - one{"{0} engelsk kvadratmil"} - other{"{0} engelske kvadratmil"} - per{"{0} per engelsk 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}"} - } - masculine{ - _{"kvadrat{0}"} - } - } - other{ - _{ - _{"kvadrat{0}"} - } - masculine{ - _{"kvadrat{0}"} - } - } - } - power3{ - one{ - _{ - _{"kubikk{0}"} - } - masculine{ - _{"kubikk{0}"} - } - } - other{ - _{ - _{"kubikk{0}"} - } - masculine{ - _{"kubikk{0}"} - } - } - } - } - concentr{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - milligram-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"} - gender{"masculine"} - one{"{0} prosent"} - other{"{0} prosent"} - } - permille{ - dnam{"promille"} - one{"{0} promille"} - other{"{0} promille"} - } - permillion{ - dnam{"deler per million"} - one{"{0} del per million"} - other{"{0} deler per million"} - } - permyriad{ - dnam{"promyriade"} - one{"{0} promyriade"} - other{"{0} promyriade"} - } - } - consumption{ - liter-per-100-kilometer{ - dnam{"liter per 100 kilometer"} - gender{"masculine"} - 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"} - gender{"masculine"} - one{"{0} engelsk mil per gallon"} - other{"{0} engelske mil per gallon"} - } - mile-per-gallon-imperial{ - dnam{"engelske mil per britiske gallon"} - gender{"masculine"} - one{"{0} engelsk mil per britisk gallon"} - other{"{0} engelske mil per britiske gallon"} - } - } - coordinate{ - dnam{"himmelretning"} - east{"{0} øst"} - 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{ - dnam{"århundrer"} - one{"{0} århundre"} - other{"{0} århundrer"} - } - day{ - dnam{"døgn"} - gender{"neuter"} - 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{"timer"} - gender{"masculine"} - one{"{0} time"} - other{"{0} timer"} - per{"{0} per time"} - } - microsecond{ - dnam{"mikrosekunder"} - one{"{0} mikrosekund"} - other{"{0} mikrosekunder"} - } - millisecond{ - dnam{"millisekunder"} - one{"{0} millisekund"} - other{"{0} millisekunder"} - } - minute{ - dnam{"minutter"} - gender{"neuter"} - one{"{0} minutt"} - other{"{0} minutter"} - per{"{0} per minutt"} - } - month{ - dnam{"måneder"} - gender{"masculine"} - one{"{0} måned"} - other{"{0} måneder"} - per{"{0} per måned"} - } - nanosecond{ - dnam{"nanosekunder"} - one{"{0} nanosekund"} - other{"{0} nanosekunder"} - } - second{ - dnam{"sekunder"} - gender{"neuter"} - one{"{0} sekund"} - other{"{0} sekunder"} - per{"{0} per sekund"} - } - week{ - dnam{"uker"} - gender{"masculine"} - one{"{0} uke"} - other{"{0} uker"} - per{"{0} per uke"} - } - year{ - dnam{"år"} - gender{"neuter"} - 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{ - dnam{"British thermal unit"} - } - calorie{ - dnam{"kalorier"} - one{"{0} kalori"} - other{"{0} kalorier"} - } - electronvolt{ - dnam{"elektronvolt"} - one{"{0} elektronvolt"} - other{"{0} elektronvolt"} - } - foodcalorie{ - dnam{"kalorier"} - gender{"masculine"} - one{"{0} kalori"} - other{"{0} kalorier"} - } - joule{ - dnam{"joule"} - one{"{0} joule"} - other{"{0} joule"} - } - kilocalorie{ - dnam{"kilokalorier"} - gender{"masculine"} - one{"{0} kilokalori"} - other{"{0} kilokalorier"} - } - kilojoule{ - dnam{"kilojoule"} - one{"{0} kilojoule"} - other{"{0} kilojoule"} - } - kilowatt-hour{ - dnam{"kilowattimer"} - one{"{0} kilowattime"} - other{"{0} kilowattimer"} - } - 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} punkter"} - } - dot-per-centimeter{ - dnam{"punkter per centimeter"} - one{"{0} punkt per centimeter"} - other{"{0} punkter per centimeter"} - } - dot-per-inch{ - dnam{"punkter per tomme"} - one{"{0} punkt per tomme"} - other{"{0} punkter per tomme"} - } - em{ - dnam{"gefirt"} - one{"{0} gefirt"} - other{"{0} gefirt"} - } - megapixel{ - dnam{"megapiksler"} - one{"{0} megapiksel"} - other{"{0} megapiksler"} - } - pixel{ - dnam{"piksler"} - one{"{0} piksel"} - other{"{0} piksler"} - } - pixel-per-centimeter{ - dnam{"piksler per centimeter"} - one{"{0} piksel per centimeter"} - other{"{0} piksler per centimeter"} - } - pixel-per-inch{ - dnam{"piksler per tomme"} - one{"{0} piksel per tomme"} - other{"{0} piksler per tomme"} - } - } - length{ - astronomical-unit{ - dnam{"astronomiske enheter"} - one{"{0} astronomisk enhet"} - other{"{0} astronomiske enheter"} - } - centimeter{ - dnam{"centimeter"} - gender{"masculine"} - one{"{0} centimeter"} - other{"{0} centimeter"} - per{"{0} per centimeter"} - } - decimeter{ - dnam{"desimeter"} - gender{"masculine"} - one{"{0} desimeter"} - other{"{0} desimeter"} - } - earth-radius{ - dnam{"jordradius"} - one{"{0} jordradius"} - other{"{0} jordradier"} - } - fathom{ - dnam{"favner"} - one{"{0} favn"} - other{"{0} favner"} - } - foot{ - dnam{"fot"} - gender{"masculine"} - one{"{0} fot"} - other{"{0} fot"} - per{"{0} per fot"} - } - furlong{ - dnam{"furlong"} - one{"{0} furlong"} - other{"{0} furlong"} - } - inch{ - dnam{"tommer"} - gender{"masculine"} - one{"{0} tomme"} - other{"{0} tommer"} - per{"{0} per tomme"} - } - kilometer{ - dnam{"kilometer"} - gender{"masculine"} - 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"} - gender{"masculine"} - one{"{0} meter"} - other{"{0} meter"} - per{"{0} per meter"} - } - micrometer{ - dnam{"mikrometer"} - one{"{0} mikrometer"} - other{"{0} mikrometer"} - } - mile{ - dnam{"engelske mil"} - gender{"masculine"} - one{"{0} engelsk mil"} - other{"{0} engelske mil"} - } - mile-scandinavian{ - dnam{"mil"} - gender{"masculine"} - one{"{0} mil"} - other{"{0} mil"} - } - millimeter{ - dnam{"millimeter"} - gender{"masculine"} - one{"{0} millimeter"} - other{"{0} millimeter"} - } - nanometer{ - dnam{"nanometer"} - one{"{0} nanometer"} - other{"{0} nanometer"} - } - nautical-mile{ - dnam{"nautiske mil"} - one{"{0} nautisk mil"} - other{"{0} nautiske mil"} - } - parsec{ - dnam{"parsec"} - gender{"masculine"} - one{"{0} parsec"} - other{"{0} parsec"} - } - picometer{ - dnam{"pikometer"} - gender{"masculine"} - one{"{0} pikometer"} - other{"{0} pikometer"} - } - point{ - dnam{"typografiske punkter"} - one{"{0} typografisk punkt"} - other{"{0} typografiske punkter"} - } - solar-radius{ - dnam{"solradier"} - gender{"masculine"} - one{"{0} solradius"} - other{"{0} solradier"} - } - yard{ - dnam{"yard"} - gender{"masculine"} - one{"{0} yard"} - other{"{0} yard"} - } - } - 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{"solluminositet"} - gender{"masculine"} - } - } - mass{ - carat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - dalton{ - dnam{"dalton"} - gender{"masculine"} - one{"{0} dalton"} - other{"{0} dalton"} - } - earth-mass{ - dnam{"jordmasser"} - gender{"masculine"} - one{"{0} jordmasse"} - other{"{0} jordmasser"} - } - grain{ - gender{"neuter"} - one{"{0} grain"} - other{"{0} grain"} - } - gram{ - dnam{"gram"} - gender{"neuter"} - one{"{0} gram"} - other{"{0} gram"} - per{"{0} per gram"} - } - kilogram{ - dnam{"kilogram"} - gender{"neuter"} - 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"} - gender{"neuter"} - one{"{0} milligram"} - other{"{0} milligram"} - } - ounce{ - dnam{"unser"} - gender{"masculine"} - 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"} - gender{"neuter"} - one{"{0} pund"} - other{"{0} pund"} - per{"{0} per pund"} - } - solar-mass{ - dnam{"solmasser"} - gender{"masculine"} - one{"{0} solmasse"} - other{"{0} solmasser"} - } - stone{ - dnam{"stone"} - one{"{0} stone"} - other{"{0} stone"} - } - 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ærer"} - one{"{0} atmosfære"} - other{"{0} atmosfærer"} - } - hectopascal{ - dnam{"hektopascal"} - one{"{0} hektopascal"} - other{"{0} hektopascal"} - } - inch-ofhg{ - dnam{"tommer kvikksølv"} - one{"{0} tomme kvikksølv"} - other{"{0} tommer kvikksølv"} - } - kilopascal{ - dnam{"kilopascal"} - gender{"masculine"} - 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"} - gender{"masculine"} - one{"{0} kilometer per time"} - other{"{0} kilometer per time"} - } - knot{ - dnam{"knop"} - one{"{0} knop"} - other{"{0} knop"} - } - meter-per-second{ - dnam{"meter per sekund"} - gender{"masculine"} - one{"{0} meter per sekund"} - other{"{0} meter per sekund"} - } - mile-per-hour{ - dnam{"engelske mil per time"} - gender{"masculine"} - one{"{0} engelsk mil per time"} - other{"{0} engelske mil per time"} - } - } - temperature{ - celsius{ - dnam{"grader celsius"} - gender{"masculine"} - one{"{0} grad celsius"} - other{"{0} grader celsius"} - } - fahrenheit{ - dnam{"grader fahrenheit"} - gender{"masculine"} - one{"{0} grad fahrenheit"} - other{"{0} grader fahrenheit"} - } - generic{ - dnam{"grader"} - gender{"masculine"} - one{"{0} grad"} - other{"{0} grader"} - } - kelvin{ - dnam{"kelvin"} - gender{"masculine"} - one{"{0} kelvin"} - other{"{0} kelvin"} - } - } - torque{ - newton-meter{ - dnam{"newtonmeter"} - one{"{0} Nm"} - other{"{0} Nm"} - } - pound-force-foot{ - dnam{"pound-foot"} - one{"{0} pound-foot"} - other{"{0} pound-foot"} - } - } - volume{ - acre-foot{ - dnam{"acre-fot"} - one{"{0} acre-fot"} - other{"{0} acre-fot"} - } - barrel{ - dnam{"fat"} - gender{"neuter"} - one{"{0} fat"} - other{"{0} fat"} - } - bushel{ - dnam{"bushel"} - one{"{0} bushel"} - other{"{0} bushels"} - } - centiliter{ - dnam{"centiliter"} - gender{"masculine"} - one{"{0} centiliter"} - other{"{0} centiliter"} - } - cubic-centimeter{ - dnam{"kubikkcentimeter"} - gender{"masculine"} - one{"{0} kubikkcentimeter"} - other{"{0} kubikkcentimeter"} - per{"{0} per kubikkcentimeter"} - } - cubic-foot{ - dnam{"kubikkfot"} - gender{"masculine"} - one{"{0} kubikkfot"} - other{"{0} kubikkfot"} - } - cubic-inch{ - dnam{"kubikktommer"} - gender{"masculine"} - one{"{0} kubikktomme"} - other{"{0} kubikktommer"} - } - cubic-kilometer{ - dnam{"kubikkilometer"} - gender{"masculine"} - one{"{0} kubikkilometer"} - other{"{0} kubikkilometer"} - } - cubic-meter{ - dnam{"kubikkmeter"} - gender{"masculine"} - one{"{0} kubikkmeter"} - other{"{0} kubikkmeter"} - per{"{0} per kubikkmeter"} - } - cubic-mile{ - dnam{"engelske kubikkmil"} - gender{"masculine"} - one{"{0} engelsk kubikkmil"} - other{"{0} engelske kubikkmil"} - } - cubic-yard{ - dnam{"kubikkyard"} - one{"{0} kubikkyard"} - other{"{0} kubikkyard"} - } - cup{ - dnam{"kopper"} - gender{"masculine"} - one{"{0} kopp"} - other{"{0} kopper"} - } - cup-metric{ - dnam{"metriske kopper"} - gender{"masculine"} - one{"{0} metrisk kopp"} - other{"{0} metriske kopper"} - } - deciliter{ - dnam{"desiliter"} - gender{"masculine"} - one{"{0} desiliter"} - other{"{0} desiliter"} - } - dessert-spoon{ - dnam{"barneskje"} - gender{"masculine"} - one{"{0} barneskje"} - other{"{0} barneskjeer"} - } - dessert-spoon-imperial{ - dnam{"britisk barneskje"} - gender{"masculine"} - one{"{0} britisk barneskje"} - other{"{0} britiske barneskjeer"} - } - dram{ - dnam{"dram"} - gender{"masculine"} - one{"{0} dram"} - other{"{0} dram"} - } - drop{ - dnam{"dråpe"} - gender{"masculine"} - one{"{0} dråpe"} - other{"{0} dråper"} - } - fluid-ounce{ - dnam{"væskeunser"} - gender{"masculine"} - one{"{0} væskeunse"} - other{"{0} væskeunser"} - } - fluid-ounce-imperial{ - dnam{"britiske væskeunser"} - gender{"masculine"} - one{"{0} britisk væskeunse"} - other{"{0} britiske væskeunser"} - } - gallon{ - dnam{"gallon"} - gender{"masculine"} - one{"{0} gallon"} - other{"{0} gallon"} - per{"{0} per gallon"} - } - gallon-imperial{ - dnam{"britiske gallon"} - gender{"masculine"} - one{"{0} britisk gallon"} - other{"{0} britiske gallon"} - per{"{0} per britisk gallon"} - } - hectoliter{ - dnam{"hektoliter"} - gender{"masculine"} - one{"{0} hektoliter"} - other{"{0} hektoliter"} - } - jigger{ - dnam{"shot"} - gender{"masculine"} - one{"{0} shot"} - other{"{0} shot"} - } - liter{ - dnam{"liter"} - gender{"masculine"} - one{"{0} liter"} - other{"{0} liter"} - per{"{0} per liter"} - } - megaliter{ - dnam{"megaliter"} - one{"{0} megaliter"} - other{"{0} megaliter"} - } - milliliter{ - dnam{"milliliter"} - gender{"masculine"} - one{"{0} milliliter"} - other{"{0} milliliter"} - } - pinch{ - dnam{"klype"} - gender{"masculine"} - one{"{0} klype"} - other{"{0} klyper"} - } - pint{ - dnam{"pint"} - gender{"masculine"} - one{"{0} pint"} - other{"{0} pint"} - } - pint-metric{ - dnam{"metriske pint"} - one{"{0} metrisk pint"} - other{"{0} metriske pint"} - } - quart{ - dnam{"quart"} - gender{"masculine"} - one{"{0} quart"} - other{"{0} quart"} - } - quart-imperial{ - dnam{"britisk quart"} - gender{"masculine"} - one{"{0} britisk quart"} - other{"{0} britiske quart"} - } - tablespoon{ - dnam{"spiseskjeer"} - gender{"masculine"} - one{"{0} spiseskje"} - other{"{0} spiseskjeer"} - } - teaspoon{ - dnam{"teskjeer"} - gender{"masculine"} - one{"{0} teskje"} - other{"{0} teskjeer"} - } - } - } - unitsNarrow{ - acceleration{ - g-force{ - dnam{"G"} - one{"{0}G"} - other{"{0}G"} - } - meter-per-square-second{ - one{"{0}m/s²"} - other{"{0}m/s²"} - } - } - angle{ - arc-minute{ - one{"{0}′"} - other{"{0}′"} - } - arc-second{ - one{"{0}″"} - other{"{0}″"} - } - degree{ - one{"{0}°"} - other{"{0}°"} - } - } - area{ - acre{ - one{"{0} ac"} - other{"{0} ac"} - } - hectare{ - one{"{0}ha"} - other{"{0}ha"} - } - square-foot{ - one{"{0}fot²"} - other{"{0}fot²"} - } - square-kilometer{ - one{"{0}km²"} - other{"{0}km²"} - } - square-meter{ - one{"{0}m²"} - other{"{0}m²"} - } - square-mile{ - one{"{0} eng mil²"} - other{"{0} eng mil²"} - } - } - compound{ - 1024p1{"Ki{0}"} - 1024p2{"Mi{0}"} - 10p-1{"d{0}"} - 10p-12{"p{0}"} - 10p-15{"f{0}"} - 10p-18{"a{0}"} - 10p-2{"c{0}"} - 10p-21{"z{0}"} - 10p-24{"y{0}"} - 10p-3{"m{0}"} - 10p-6{"µ{0}"} - 10p-9{"n{0}"} - 10p1{"da{0}"} - 10p12{"T{0}"} - 10p15{"P{0}"} - 10p18{"E{0}"} - 10p2{"h{0}"} - 10p21{"Z{0}"} - 10p24{"Y{0}"} - 10p3{"k{0}"} - 10p6{"M{0}"} - 10p9{"G{0}"} - per{"{0}/{1}"} - } - concentr{ - percent{ - dnam{"%"} - one{"{0} %"} - other{"{0} %"} - } - } - consumption{ - liter-per-100-kilometer{ - dnam{"l/100km"} - one{"{0} l/100km"} - other{"{0} l/100km"} - } - } - coordinate{ - dnam{"retning"} - east{"{0}Ø"} - north{"{0}N"} - south{"{0}S"} - west{"{0}V"} - } - duration{ - century{ - dnam{"årh."} - one{"{0} årh."} - other{"{0} årh."} - } - day{ - dnam{"døgn"} - one{"{0}d"} - other{"{0}d"} - per{"{0}/d"} - } - hour{ - dnam{"time"} - one{"{0}t"} - other{"{0}t"} - per{"{0}/t"} - } - microsecond{ - dnam{"μs"} - one{"{0}μs"} - other{"{0}μs"} - } - millisecond{ - dnam{"ms"} - one{"{0}ms"} - other{"{0}ms"} - } - minute{ - dnam{"min"} - one{"{0}m"} - other{"{0}m"} - per{"{0}/m"} - } - month{ - dnam{"måned"} - one{"{0} m"} - other{"{0} m"} - per{"{0}/m"} - } - nanosecond{ - dnam{"ns"} - one{"{0}ns"} - other{"{0}ns"} - } - second{ - dnam{"sek"} - one{"{0}s"} - other{"{0}s"} - per{"{0}/s"} - } - week{ - dnam{"uke"} - one{"{0}u"} - other{"{0}u"} - per{"{0}/u"} - } - year{ - dnam{"år"} - one{"{0}å"} - other{"{0}å"} - per{"{0}/år"} - } - } - length{ - astronomical-unit{ - one{"{0}au"} - other{"{0}au"} - } - centimeter{ - dnam{"cm"} - one{"{0}cm"} - other{"{0}cm"} - } - decimeter{ - one{"{0}dm"} - other{"{0}dm"} - } - foot{ - dnam{"fot"} - one{"{0} fot"} - other{"{0} fot"} - } - inch{ - dnam{"to"} - one{"{0} tomme"} - other{"{0} tommer"} - per{"{0}to"} - } - kilometer{ - dnam{"km"} - one{"{0}km"} - other{"{0}km"} - } - light-year{ - one{"{0} lysår"} - other{"{0} lysår"} - } - meter{ - dnam{"m"} - one{"{0}m"} - other{"{0}m"} - } - micrometer{ - one{"{0}µm"} - other{"{0}µm"} - } - mile{ - dnam{"mile"} - one{"{0} eng mil"} - other{"{0} eng mil"} - } - mile-scandinavian{ - dnam{"mil"} - one{"{0}mil"} - other{"{0}mil"} - } - millimeter{ - dnam{"mm"} - one{"{0}mm"} - other{"{0}mm"} - } - nanometer{ - one{"{0}nm"} - other{"{0}nm"} - } - nautical-mile{ - one{"{0}nmi"} - other{"{0}nmi"} - } - parsec{ - one{"{0}pc"} - other{"{0}pc"} - } - picometer{ - one{"{0}pm"} - other{"{0}pm"} - } - point{ - one{"{0}pt"} - other{"{0}pt"} - } - yard{ - one{"{0} yard"} - other{"{0} yard"} - } - } - mass{ - gram{ - dnam{"gram"} - one{"{0}g"} - other{"{0}g"} - } - kilogram{ - dnam{"kg"} - one{"{0}kg"} - other{"{0}kg"} - } - metric-ton{ - one{"{0}t"} - other{"{0}t"} - } - microgram{ - one{"{0}µg"} - other{"{0}µg"} - } - milligram{ - one{"{0}mg"} - other{"{0}mg"} - } - ounce{ - dnam{"unse"} - one{"{0} unse"} - other{"{0} unser"} - } - pound{ - dnam{"pund"} - one{"{0} pund"} - other{"{0} pund"} - per{"{0}/pund"} - } - } - power{ - horsepower{ - one{"{0}hk"} - other{"{0}hk"} - } - kilowatt{ - one{"{0}kW"} - other{"{0}kW"} - } - watt{ - one{"{0}W"} - other{"{0}W"} - } - } - pressure{ - hectopascal{ - one{"{0}hPa"} - other{"{0}hPa"} - } - inch-ofhg{ - one{"{0}ʹʹ Hg"} - other{"{0}ʹʹ Hg"} - } - millibar{ - one{"{0}mbar"} - other{"{0}mbar"} - } - millimeter-ofhg{ - one{"{0}mmHg"} - other{"{0}mmHg"} - } - pound-force-per-square-inch{ - one{"{0}psi"} - other{"{0}psi"} - } - } - speed{ - kilometer-per-hour{ - dnam{"km/t"} - one{"{0}km/t"} - other{"{0}km/t"} - } - knot{ - one{"{0}kn"} - other{"{0}kn"} - } - meter-per-second{ - one{"{0}m/s"} - other{"{0}m/s"} - } - mile-per-hour{ - dnam{"mile/t"} - one{"{0} eng mil/t"} - other{"{0} eng mil/t"} - } - } - temperature{ - celsius{ - dnam{"°C"} - one{"{0} °C"} - other{"{0} °C"} - } - fahrenheit{ - one{"{0}°F"} - other{"{0}°F"} - } - kelvin{ - one{"{0}K"} - other{"{0}K"} - } - } - volume{ - cubic-kilometer{ - one{"{0}km³"} - other{"{0}km³"} - } - cubic-mile{ - one{"{0} eng mil³"} - other{"{0} eng mil³"} - } - liter{ - dnam{"l"} - one{"{0}l"} - other{"{0}l"} - } - } - } - unitsShort{ - acceleration{ - g-force{ - dnam{"g-kraft"} - one{"{0} G"} - other{"{0} G"} - } - meter-per-square-second{ - dnam{"meter/s²"} - one{"{0} m/s²"} - other{"{0} m/s²"} - } - } - angle{ - arc-minute{ - dnam{"bueminutter"} - one{"{0}′"} - other{"{0}′"} - } - arc-second{ - dnam{"buesek"} - one{"{0}″"} - other{"{0}″"} - } - degree{ - dnam{"grader"} - one{"{0}°"} - other{"{0}°"} - } - radian{ - dnam{"radianer"} - one{"{0} rad"} - other{"{0} rad"} - } - revolution{ - dnam{"omdr."} - one{"{0} omdr."} - other{"{0} omdr."} - } - } - area{ - acre{ - dnam{"acre"} - one{"{0} ac"} - other{"{0} ac"} - } - 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{"tommer²"} - one{"{0} tomme²"} - other{"{0} tommer²"} - per{"{0}/tommer²"} - } - 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{"miles²"} - one{"{0} mile²"} - other{"{0} miles²"} - per{"{0}/mile²"} - } - square-yard{ - dnam{"yd²"} - one{"{0} yd²"} - other{"{0} yd²"} - } - } - compound{ - 1024p1{"Ki{0}"} - 10p-1{"d{0}"} - 10p-12{"p{0}"} - 10p-15{"f{0}"} - 10p-18{"a{0}"} - 10p-2{"c{0}"} - 10p-21{"z{0}"} - 10p-24{"y{0}"} - 10p-3{"m{0}"} - 10p-6{"µ{0}"} - 10p-9{"n{0}"} - 10p1{"da{0}"} - 10p12{"T{0}"} - 10p15{"P{0}"} - 10p18{"E{0}"} - 10p2{"h{0}"} - 10p21{"Z{0}"} - 10p24{"Y{0}"} - 10p3{"k{0}"} - 10p6{"M{0}"} - 10p9{"G{0}"} - per{"{0}/{1}"} - } - concentr{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - milligram-per-deciliter{ - dnam{"mg/dl"} - one{"{0} mg/dl"} - other{"{0} mg/dl"} - } - millimole-per-liter{ - dnam{"mmol/liter"} - 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{"liter/km"} - one{"{0} l/km"} - other{"{0} l/km"} - } - mile-per-gallon{ - dnam{"miles/gal"} - one{"{0} mpg"} - other{"{0} mpg"} - } - mile-per-gallon-imperial{ - dnam{"miles/brit. gal"} - one{"{0} mpg brit."} - other{"{0} mpg brit."} - } - } - 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} B"} - other{"{0} B"} - } - gigabit{ - dnam{"Gbit"} - one{"{0} Gb"} - other{"{0} Gb"} - } - gigabyte{ - dnam{"GB"} - one{"{0} GB"} - other{"{0} GB"} - } - kilobit{ - dnam{"kbit"} - one{"{0} kb"} - other{"{0} kb"} - } - kilobyte{ - dnam{"kB"} - one{"{0} kB"} - other{"{0} kB"} - } - megabit{ - dnam{"Mbit"} - 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{"Tbit"} - 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{"timer"} - one{"{0} t"} - other{"{0} t"} - per{"{0}/t"} - } - microsecond{ - dnam{"μs"} - one{"{0} μs"} - other{"{0} μs"} - } - millisecond{ - dnam{"ms"} - one{"{0} ms"} - other{"{0} ms"} - } - minute{ - dnam{"min"} - one{"{0} min"} - other{"{0} min"} - per{"{0}/min"} - } - month{ - dnam{"måneder"} - one{"{0} md."} - other{"{0} md."} - per{"{0}/md."} - } - nanosecond{ - dnam{"ns"} - one{"{0} ns"} - other{"{0} ns"} - } - second{ - dnam{"sek"} - one{"{0} sek"} - other{"{0} sek"} - per{"{0}/s"} - } - week{ - dnam{"uker"} - one{"{0} u"} - other{"{0} u"} - per{"{0}/u"} - } - 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{ - dnam{"therm"} - one{"{0} therm"} - other{"{0} therm"} - } - } - force{ - newton{ - dnam{"newton"} - } - pound-force{ - dnam{"poundforce"} - one{"{0} lbf"} - other{"{0} lbf"} - } - } - 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{ - dnam{"dpcm"} - } - em{ - dnam{"gefirt"} - one{"{0} gefirt"} - other{"{0} gefirt"} - } - megapixel{ - dnam{"megapiksler"} - one{"{0} MP"} - other{"{0} MP"} - } - pixel{ - dnam{"piksler"} - one{"{0} px"} - other{"{0} px"} - } - pixel-per-centimeter{ - one{"{0} ppcm"} - other{"{0} ppcm"} - } - pixel-per-inch{ - dnam{"ppi"} - one{"{0} ppi"} - other{"{0} ppi"} - } - } - length{ - astronomical-unit{ - dnam{"AU"} - 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{"favner"} - one{"{0} fm"} - other{"{0} fm"} - } - foot{ - dnam{"fot"} - one{"{0} fot"} - other{"{0} fot"} - per{"{0}/fot"} - } - furlong{ - dnam{"furlong"} - one{"{0} fur"} - other{"{0} fur"} - } - inch{ - dnam{"tommer"} - one{"{0} tomme"} - other{"{0} tommer"} - per{"{0}/tomme"} - } - kilometer{ - dnam{"km"} - one{"{0} km"} - other{"{0} km"} - per{"{0}/km"} - } - light-year{ - dnam{"lysår"} - one{"{0} ly"} - other{"{0} ly"} - } - meter{ - dnam{"meter"} - one{"{0} m"} - other{"{0} m"} - per{"{0}/m"} - } - micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} - } - mile{ - dnam{"miles"} - one{"{0} mile"} - other{"{0} miles"} - } - 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{"pm"} - one{"{0} pm"} - other{"{0} pm"} - } - point{ - dnam{"punkter"} - one{"{0} pt"} - other{"{0} pt"} - } - solar-radius{ - dnam{"solradius"} - } - yard{ - dnam{"yard"} - one{"{0} yard"} - other{"{0} yard"} - } - } - light{ - candela{ - dnam{"cd"} - one{"{0} cd"} - other{"{0} cd"} - } - lumen{ - dnam{"lm"} - one{"{0} lm"} - other{"{0} lm"} - } - lux{ - dnam{"lux"} - one{"{0} lx"} - other{"{0} lx"} - } - solar-luminosity{ - dnam{"solluminositet"} - } - } - mass{ - carat{ - dnam{"karat"} - one{"{0} c"} - other{"{0} c"} - } - dalton{ - dnam{"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{"solmasser"} - one{"{0} M☉"} - other{"{0} M☉"} - } - stone{ - dnam{"stone"} - } - 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"} - } - bar{ - one{"{0} bar"} - other{"{0} bar"} - } - 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"} - } - pascal{ - one{"{0} Pa"} - other{"{0} Pa"} - } - 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{"miles/t"} - one{"{0} mile/t"} - other{"{0} miles/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{"bushel"} - 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{"tommer³"} - one{"{0} tomme³"} - other{"{0} tommer³"} - } - cubic-kilometer{ - dnam{"km³"} - one{"{0} km³"} - other{"{0} km³"} - } - cubic-meter{ - dnam{"m³"} - one{"{0} m³"} - other{"{0} m³"} - per{"{0}/m³"} - } - cubic-mile{ - dnam{"miles³"} - one{"{0} mile³"} - other{"{0} miles³"} - } - cubic-yard{ - dnam{"yard³"} - one{"{0} yard³"} - other{"{0} yard³"} - } - cup{ - dnam{"kopper"} - one{"{0} k"} - other{"{0} k"} - } - cup-metric{ - dnam{"m. kopper"} - one{"{0} m. kopp"} - other{"{0} m. kopper"} - } - deciliter{ - dnam{"dl"} - one{"{0} dl"} - other{"{0} dl"} - } - dessert-spoon{ - dnam{"bs"} - one{"{0} bs"} - other{"{0} bs"} - } - dessert-spoon-imperial{ - dnam{"imp. bs"} - one{"{0} imp. bs"} - other{"{0} imp. bs"} - } - dram{ - dnam{"dram fluid"} - one{"{0} dram fl"} - other{"{0} dram fl"} - } - drop{ - dnam{"dråpe"} - one{"{0} dråpe"} - other{"{0} dråpe"} - } - fluid-ounce{ - dnam{"væskeunse"} - one{"{0} fl oz"} - other{"{0} fl oz"} - } - fluid-ounce-imperial{ - dnam{"imp. fl oz"} - one{"{0} imp. fl oz"} - other{"{0} imp. fl oz"} - } - 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} shot"} - } - 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} klype"} - } - 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{"imp. quart"} - one{"{0} imp. quart"} - other{"{0} imp. quart"} - } - tablespoon{ - dnam{"ss"} - one{"{0} ss"} - other{"{0} ss"} - } - teaspoon{ - dnam{"ts"} - one{"{0} ts"} - other{"{0} ts"} - } - } - } + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/unit/nb_NO.txt b/icu4c/source/data/unit/nb_NO.txt index 15a33c3396f..2de7860c57e 100644 --- a/icu4c/source/data/unit/nb_NO.txt +++ b/icu4c/source/data/unit/nb_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 - */ nb_NO{ - ___{""} + "%%ALIAS"{"no_NO"} } diff --git a/icu4c/source/data/unit/nb_SJ.txt b/icu4c/source/data/unit/nb_SJ.txt new file mode 100644 index 00000000000..b1caa388a5d --- /dev/null +++ b/icu4c/source/data/unit/nb_SJ.txt @@ -0,0 +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 +nb_SJ{ + "%%ALIAS"{"no_SJ"} +} diff --git a/icu4c/source/data/unit/ne.txt b/icu4c/source/data/unit/ne.txt index 4f269eb66c3..d1f09db3286 100644 --- a/icu4c/source/data/unit/ne.txt +++ b/icu4c/source/data/unit/ne.txt @@ -165,7 +165,7 @@ ne{ one{"{0}कराट"} other{"{0}कराट"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1475,7 +1475,7 @@ ne{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1775,12 +1775,12 @@ ne{ } dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - one{"{0} dpi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -1871,9 +1871,9 @@ ne{ per{"{0} प्रति मिटर"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"माइल"} @@ -1983,9 +1983,9 @@ ne{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"मिलिग्राम"} diff --git a/icu4c/source/data/unit/nl.txt b/icu4c/source/data/unit/nl.txt index 0e78956819d..70372807a45 100644 --- a/icu4c/source/data/unit/nl.txt +++ b/icu4c/source/data/unit/nl.txt @@ -173,7 +173,7 @@ nl{ one{"{0} karaat"} other{"{0} karaat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram per deciliter"} one{"{0} milligram per deciliter"} other{"{0} milligram per deciliter"} @@ -1193,7 +1193,7 @@ nl{ one{"{0} K"} other{"{0} K"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1510,9 +1510,9 @@ nl{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1591,9 +1591,9 @@ nl{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -1975,7 +1975,7 @@ nl{ one{"{0} K"} other{"{0} K"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -2240,7 +2240,7 @@ nl{ graphics{ dot{ one{"{0} dot"} - other{"{0} dot"} + other{"{0} px"} } dot-per-centimeter{ dnam{"dpcm"} @@ -2335,9 +2335,9 @@ nl{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2421,9 +2421,9 @@ nl{ other{"{0} t"} } 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/nn.txt b/icu4c/source/data/unit/nn.txt index 005b2eacdaf..8b848b9f4f4 100644 --- a/icu4c/source/data/unit/nn.txt +++ b/icu4c/source/data/unit/nn.txt @@ -2,6 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ + %%Parent{"no"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -161,7 +162,7 @@ nn{ 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"} @@ -1280,7 +1281,7 @@ nn{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -1564,7 +1565,7 @@ nn{ } dot-per-centimeter{ one{"{0} dpcm"} - other{"{0} dpcm"} + other{"{0} ppcm"} } dot-per-inch{ dnam{"ppt"} @@ -1647,9 +1648,9 @@ nn{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"engelske mil"} @@ -1741,9 +1742,9 @@ nn{ 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.txt b/icu4c/source/data/unit/no.txt index 474d0b21b0d..331ec2f6bfc 100644 --- a/icu4c/source/data/unit/no.txt +++ b/icu4c/source/data/unit/no.txt @@ -2,5 +2,2424 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ - "%%ALIAS"{"nb"} + durationUnits{ + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} + } + units{ + acceleration{ + g-force{ + dnam{"g-kraft"} + gender{"masculine"} + one{"{0} g-kraft"} + other{"{0} g-kraft"} + } + meter-per-square-second{ + dnam{"meter per sekund²"} + gender{"masculine"} + one{"{0} meter per sekund²"} + other{"{0} meter per sekund²"} + } + } + angle{ + arc-minute{ + dnam{"bueminutter"} + one{"{0} bueminutt"} + other{"{0} bueminutter"} + } + arc-second{ + dnam{"buesekunder"} + one{"{0} buesekund"} + other{"{0} buesekunder"} + } + degree{ + dnam{"grader"} + one{"{0} grad"} + other{"{0} grader"} + } + radian{ + dnam{"radianer"} + one{"{0} radian"} + other{"{0} radianer"} + } + revolution{ + dnam{"omdreininger"} + one{"{0} omdreining"} + other{"{0} omdreininger"} + } + } + area{ + acre{ + dnam{"acre"} + gender{"masculine"} + one{"{0} acre"} + other{"{0} acre"} + } + hectare{ + dnam{"hektar"} + gender{"neuter"} + one{"{0} hektar"} + other{"{0} hektar"} + } + square-centimeter{ + dnam{"kvadratcentimeter"} + gender{"masculine"} + one{"{0} kvadratcentimeter"} + other{"{0} kvadratcentimeter"} + per{"{0} per kvadratcentimeter"} + } + square-foot{ + dnam{"kvadratfot"} + gender{"masculine"} + one{"{0} kvadratfot"} + other{"{0} kvadratfot"} + } + square-inch{ + dnam{"kvadrattommer"} + one{"{0} kvadrattomme"} + other{"{0} kvadrattommer"} + per{"{0} per kvadrattomme"} + } + square-kilometer{ + dnam{"kvadratkilometer"} + gender{"masculine"} + 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"} + gender{"masculine"} + one{"{0} engelsk kvadratmil"} + other{"{0} engelske kvadratmil"} + per{"{0} per engelsk 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}"} + } + masculine{ + _{"kvadrat{0}"} + } + } + other{ + _{ + _{"kvadrat{0}"} + } + masculine{ + _{"kvadrat{0}"} + } + } + } + power3{ + one{ + _{ + _{"kubikk{0}"} + } + masculine{ + _{"kubikk{0}"} + } + } + other{ + _{ + _{"kubikk{0}"} + } + masculine{ + _{"kubikk{0}"} + } + } + } + } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + milligram-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"} + gender{"masculine"} + one{"{0} prosent"} + other{"{0} prosent"} + } + permille{ + dnam{"promille"} + one{"{0} promille"} + other{"{0} promille"} + } + permillion{ + dnam{"deler per million"} + one{"{0} del per million"} + other{"{0} deler per million"} + } + permyriad{ + dnam{"promyriade"} + one{"{0} promyriade"} + other{"{0} promyriade"} + } + } + consumption{ + liter-per-100-kilometer{ + dnam{"liter per 100 kilometer"} + gender{"masculine"} + 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"} + gender{"masculine"} + one{"{0} engelsk mil per gallon"} + other{"{0} engelske mil per gallon"} + } + mile-per-gallon-imperial{ + dnam{"engelske mil per britiske gallon"} + gender{"masculine"} + one{"{0} engelsk mil per britisk gallon"} + other{"{0} engelske mil per britiske gallon"} + } + } + coordinate{ + dnam{"himmelretning"} + east{"{0} øst"} + 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{ + dnam{"århundrer"} + one{"{0} århundre"} + other{"{0} århundrer"} + } + day{ + dnam{"døgn"} + gender{"neuter"} + 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{"timer"} + gender{"masculine"} + one{"{0} time"} + other{"{0} timer"} + per{"{0} per time"} + } + microsecond{ + dnam{"mikrosekunder"} + one{"{0} mikrosekund"} + other{"{0} mikrosekunder"} + } + millisecond{ + dnam{"millisekunder"} + one{"{0} millisekund"} + other{"{0} millisekunder"} + } + minute{ + dnam{"minutter"} + gender{"neuter"} + one{"{0} minutt"} + other{"{0} minutter"} + per{"{0} per minutt"} + } + month{ + dnam{"måneder"} + gender{"masculine"} + one{"{0} måned"} + other{"{0} måneder"} + per{"{0} per måned"} + } + nanosecond{ + dnam{"nanosekunder"} + one{"{0} nanosekund"} + other{"{0} nanosekunder"} + } + second{ + dnam{"sekunder"} + gender{"neuter"} + one{"{0} sekund"} + other{"{0} sekunder"} + per{"{0} per sekund"} + } + week{ + dnam{"uker"} + gender{"masculine"} + one{"{0} uke"} + other{"{0} uker"} + per{"{0} per uke"} + } + year{ + dnam{"år"} + gender{"neuter"} + 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{ + dnam{"British thermal unit"} + } + calorie{ + dnam{"kalorier"} + one{"{0} kalori"} + other{"{0} kalorier"} + } + electronvolt{ + dnam{"elektronvolt"} + one{"{0} elektronvolt"} + other{"{0} elektronvolt"} + } + foodcalorie{ + dnam{"kalorier"} + gender{"masculine"} + one{"{0} kalori"} + other{"{0} kalorier"} + } + joule{ + dnam{"joule"} + one{"{0} joule"} + other{"{0} joule"} + } + kilocalorie{ + dnam{"kilokalorier"} + gender{"masculine"} + one{"{0} kilokalori"} + other{"{0} kilokalorier"} + } + kilojoule{ + dnam{"kilojoule"} + one{"{0} kilojoule"} + other{"{0} kilojoule"} + } + kilowatt-hour{ + dnam{"kilowattimer"} + one{"{0} kilowattime"} + other{"{0} kilowattimer"} + } + 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} punkter"} + } + dot-per-centimeter{ + dnam{"punkter per centimeter"} + one{"{0} punkt per centimeter"} + other{"{0} punkter per centimeter"} + } + dot-per-inch{ + dnam{"punkter per tomme"} + one{"{0} punkt per tomme"} + other{"{0} punkter per tomme"} + } + em{ + dnam{"gefirt"} + one{"{0} gefirt"} + other{"{0} gefirt"} + } + megapixel{ + dnam{"megapiksler"} + one{"{0} megapiksel"} + other{"{0} megapiksler"} + } + pixel{ + dnam{"piksler"} + one{"{0} piksel"} + other{"{0} piksler"} + } + pixel-per-centimeter{ + dnam{"piksler per centimeter"} + one{"{0} piksel per centimeter"} + other{"{0} piksler per centimeter"} + } + pixel-per-inch{ + dnam{"piksler per tomme"} + one{"{0} piksel per tomme"} + other{"{0} piksler per tomme"} + } + } + length{ + astronomical-unit{ + dnam{"astronomiske enheter"} + one{"{0} astronomisk enhet"} + other{"{0} astronomiske enheter"} + } + centimeter{ + dnam{"centimeter"} + gender{"masculine"} + one{"{0} centimeter"} + other{"{0} centimeter"} + per{"{0} per centimeter"} + } + decimeter{ + dnam{"desimeter"} + gender{"masculine"} + one{"{0} desimeter"} + other{"{0} desimeter"} + } + earth-radius{ + dnam{"jordradius"} + one{"{0} jordradius"} + other{"{0} jordradier"} + } + fathom{ + dnam{"favner"} + one{"{0} favn"} + other{"{0} favner"} + } + foot{ + dnam{"fot"} + gender{"masculine"} + one{"{0} fot"} + other{"{0} fot"} + per{"{0} per fot"} + } + furlong{ + dnam{"furlong"} + one{"{0} furlong"} + other{"{0} furlong"} + } + inch{ + dnam{"tommer"} + gender{"masculine"} + one{"{0} tomme"} + other{"{0} tommer"} + per{"{0} per tomme"} + } + kilometer{ + dnam{"kilometer"} + gender{"masculine"} + 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"} + gender{"masculine"} + one{"{0} meter"} + other{"{0} meter"} + per{"{0} per meter"} + } + micrometer{ + dnam{"mikrometer"} + one{"{0} mikrometer"} + other{"{0} mikrometer"} + } + mile{ + dnam{"engelske mil"} + gender{"masculine"} + one{"{0} engelsk mil"} + other{"{0} engelske mil"} + } + mile-scandinavian{ + dnam{"mil"} + gender{"masculine"} + one{"{0} mil"} + other{"{0} mil"} + } + millimeter{ + dnam{"millimeter"} + gender{"masculine"} + one{"{0} millimeter"} + other{"{0} millimeter"} + } + nanometer{ + dnam{"nanometer"} + one{"{0} nanometer"} + other{"{0} nanometer"} + } + nautical-mile{ + dnam{"nautiske mil"} + one{"{0} nautisk mil"} + other{"{0} nautiske mil"} + } + parsec{ + dnam{"parsec"} + gender{"masculine"} + one{"{0} parsec"} + other{"{0} parsec"} + } + picometer{ + dnam{"pikometer"} + gender{"masculine"} + one{"{0} pikometer"} + other{"{0} pikometer"} + } + point{ + dnam{"typografiske punkter"} + one{"{0} typografisk punkt"} + other{"{0} typografiske punkter"} + } + solar-radius{ + dnam{"solradier"} + gender{"masculine"} + one{"{0} solradius"} + other{"{0} solradier"} + } + yard{ + dnam{"yard"} + gender{"masculine"} + one{"{0} yard"} + other{"{0} yard"} + } + } + 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{"solluminositet"} + gender{"masculine"} + } + } + mass{ + carat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + dalton{ + dnam{"dalton"} + gender{"masculine"} + one{"{0} dalton"} + other{"{0} dalton"} + } + earth-mass{ + dnam{"jordmasser"} + gender{"masculine"} + one{"{0} jordmasse"} + other{"{0} jordmasser"} + } + grain{ + gender{"neuter"} + one{"{0} grain"} + other{"{0} grain"} + } + gram{ + dnam{"gram"} + gender{"neuter"} + one{"{0} gram"} + other{"{0} gram"} + per{"{0} per gram"} + } + kilogram{ + dnam{"kilogram"} + gender{"neuter"} + 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"} + gender{"neuter"} + one{"{0} milligram"} + other{"{0} milligram"} + } + ounce{ + dnam{"unser"} + gender{"masculine"} + 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"} + gender{"neuter"} + one{"{0} pund"} + other{"{0} pund"} + per{"{0} per pund"} + } + solar-mass{ + dnam{"solmasser"} + gender{"masculine"} + one{"{0} solmasse"} + other{"{0} solmasser"} + } + stone{ + dnam{"stone"} + one{"{0} stone"} + other{"{0} stone"} + } + 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ærer"} + one{"{0} atmosfære"} + other{"{0} atmosfærer"} + } + hectopascal{ + dnam{"hektopascal"} + one{"{0} hektopascal"} + other{"{0} hektopascal"} + } + inch-ofhg{ + dnam{"tommer kvikksølv"} + one{"{0} tomme kvikksølv"} + other{"{0} tommer kvikksølv"} + } + kilopascal{ + dnam{"kilopascal"} + gender{"masculine"} + 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"} + gender{"masculine"} + one{"{0} kilometer per time"} + other{"{0} kilometer per time"} + } + knot{ + dnam{"knop"} + one{"{0} knop"} + other{"{0} knop"} + } + meter-per-second{ + dnam{"meter per sekund"} + gender{"masculine"} + one{"{0} meter per sekund"} + other{"{0} meter per sekund"} + } + mile-per-hour{ + dnam{"engelske mil per time"} + gender{"masculine"} + one{"{0} engelsk mil per time"} + other{"{0} engelske mil per time"} + } + } + temperature{ + celsius{ + dnam{"grader celsius"} + gender{"masculine"} + one{"{0} grad celsius"} + other{"{0} grader celsius"} + } + fahrenheit{ + dnam{"grader fahrenheit"} + gender{"masculine"} + one{"{0} grad fahrenheit"} + other{"{0} grader fahrenheit"} + } + generic{ + dnam{"grader"} + gender{"masculine"} + one{"{0} grad"} + other{"{0} grader"} + } + kelvin{ + dnam{"kelvin"} + gender{"masculine"} + one{"{0} kelvin"} + other{"{0} kelvin"} + } + } + torque{ + newton-meter{ + dnam{"newtonmeter"} + one{"{0} Nm"} + other{"{0} Nm"} + } + pound-force-foot{ + dnam{"pound-foot"} + one{"{0} pound-foot"} + other{"{0} pound-foot"} + } + } + volume{ + acre-foot{ + dnam{"acre-fot"} + one{"{0} acre-fot"} + other{"{0} acre-fot"} + } + barrel{ + dnam{"fat"} + gender{"neuter"} + one{"{0} fat"} + other{"{0} fat"} + } + bushel{ + dnam{"bushel"} + one{"{0} bushel"} + other{"{0} bushels"} + } + centiliter{ + dnam{"centiliter"} + gender{"masculine"} + one{"{0} centiliter"} + other{"{0} centiliter"} + } + cubic-centimeter{ + dnam{"kubikkcentimeter"} + gender{"masculine"} + one{"{0} kubikkcentimeter"} + other{"{0} kubikkcentimeter"} + per{"{0} per kubikkcentimeter"} + } + cubic-foot{ + dnam{"kubikkfot"} + gender{"masculine"} + one{"{0} kubikkfot"} + other{"{0} kubikkfot"} + } + cubic-inch{ + dnam{"kubikktommer"} + gender{"masculine"} + one{"{0} kubikktomme"} + other{"{0} kubikktommer"} + } + cubic-kilometer{ + dnam{"kubikkilometer"} + gender{"masculine"} + one{"{0} kubikkilometer"} + other{"{0} kubikkilometer"} + } + cubic-meter{ + dnam{"kubikkmeter"} + gender{"masculine"} + one{"{0} kubikkmeter"} + other{"{0} kubikkmeter"} + per{"{0} per kubikkmeter"} + } + cubic-mile{ + dnam{"engelske kubikkmil"} + gender{"masculine"} + one{"{0} engelsk kubikkmil"} + other{"{0} engelske kubikkmil"} + } + cubic-yard{ + dnam{"kubikkyard"} + one{"{0} kubikkyard"} + other{"{0} kubikkyard"} + } + cup{ + dnam{"kopper"} + gender{"masculine"} + one{"{0} kopp"} + other{"{0} kopper"} + } + cup-metric{ + dnam{"metriske kopper"} + gender{"masculine"} + one{"{0} metrisk kopp"} + other{"{0} metriske kopper"} + } + deciliter{ + dnam{"desiliter"} + gender{"masculine"} + one{"{0} desiliter"} + other{"{0} desiliter"} + } + dessert-spoon{ + dnam{"barneskje"} + gender{"masculine"} + one{"{0} barneskje"} + other{"{0} barneskjeer"} + } + dessert-spoon-imperial{ + dnam{"britisk barneskje"} + gender{"masculine"} + one{"{0} britisk barneskje"} + other{"{0} britiske barneskjeer"} + } + dram{ + dnam{"dram"} + gender{"masculine"} + one{"{0} dram"} + other{"{0} dram"} + } + drop{ + dnam{"dråpe"} + gender{"masculine"} + one{"{0} dråpe"} + other{"{0} dråper"} + } + fluid-ounce{ + dnam{"væskeunser"} + gender{"masculine"} + one{"{0} væskeunse"} + other{"{0} væskeunser"} + } + fluid-ounce-imperial{ + dnam{"britiske væskeunser"} + gender{"masculine"} + one{"{0} britisk væskeunse"} + other{"{0} britiske væskeunser"} + } + gallon{ + dnam{"gallon"} + gender{"masculine"} + one{"{0} gallon"} + other{"{0} gallon"} + per{"{0} per gallon"} + } + gallon-imperial{ + dnam{"britiske gallon"} + gender{"masculine"} + one{"{0} britisk gallon"} + other{"{0} britiske gallon"} + per{"{0} per britisk gallon"} + } + hectoliter{ + dnam{"hektoliter"} + gender{"masculine"} + one{"{0} hektoliter"} + other{"{0} hektoliter"} + } + jigger{ + dnam{"shot"} + gender{"masculine"} + one{"{0} shot"} + other{"{0} shot"} + } + liter{ + dnam{"liter"} + gender{"masculine"} + one{"{0} liter"} + other{"{0} liter"} + per{"{0} per liter"} + } + megaliter{ + dnam{"megaliter"} + one{"{0} megaliter"} + other{"{0} megaliter"} + } + milliliter{ + dnam{"milliliter"} + gender{"masculine"} + one{"{0} milliliter"} + other{"{0} milliliter"} + } + pinch{ + dnam{"klype"} + gender{"masculine"} + one{"{0} klype"} + other{"{0} klyper"} + } + pint{ + dnam{"pint"} + gender{"masculine"} + one{"{0} pint"} + other{"{0} pint"} + } + pint-metric{ + dnam{"metriske pint"} + one{"{0} metrisk pint"} + other{"{0} metriske pint"} + } + quart{ + dnam{"quart"} + gender{"masculine"} + one{"{0} quart"} + other{"{0} quart"} + } + quart-imperial{ + dnam{"britisk quart"} + gender{"masculine"} + one{"{0} britisk quart"} + other{"{0} britiske quart"} + } + tablespoon{ + dnam{"spiseskjeer"} + gender{"masculine"} + one{"{0} spiseskje"} + other{"{0} spiseskjeer"} + } + teaspoon{ + dnam{"teskjeer"} + gender{"masculine"} + one{"{0} teskje"} + other{"{0} teskjeer"} + } + } + } + unitsNarrow{ + acceleration{ + g-force{ + dnam{"G"} + one{"{0}G"} + other{"{0}G"} + } + meter-per-square-second{ + one{"{0}m/s²"} + other{"{0}m/s²"} + } + } + angle{ + arc-minute{ + one{"{0}′"} + other{"{0}′"} + } + arc-second{ + one{"{0}″"} + other{"{0}″"} + } + degree{ + one{"{0}°"} + other{"{0}°"} + } + } + area{ + acre{ + one{"{0} ac"} + other{"{0} ac"} + } + hectare{ + one{"{0}ha"} + other{"{0}ha"} + } + square-foot{ + one{"{0}fot²"} + other{"{0}fot²"} + } + square-kilometer{ + one{"{0}km²"} + other{"{0}km²"} + } + square-meter{ + one{"{0}m²"} + other{"{0}m²"} + } + square-mile{ + one{"{0} eng mil²"} + other{"{0} eng mil²"} + } + } + compound{ + 1024p1{"Ki{0}"} + 1024p2{"Mi{0}"} + 10p-1{"d{0}"} + 10p-12{"p{0}"} + 10p-15{"f{0}"} + 10p-18{"a{0}"} + 10p-2{"c{0}"} + 10p-21{"z{0}"} + 10p-24{"y{0}"} + 10p-3{"m{0}"} + 10p-6{"µ{0}"} + 10p-9{"n{0}"} + 10p1{"da{0}"} + 10p12{"T{0}"} + 10p15{"P{0}"} + 10p18{"E{0}"} + 10p2{"h{0}"} + 10p21{"Z{0}"} + 10p24{"Y{0}"} + 10p3{"k{0}"} + 10p6{"M{0}"} + 10p9{"G{0}"} + per{"{0}/{1}"} + } + concentr{ + percent{ + dnam{"%"} + one{"{0} %"} + other{"{0} %"} + } + } + consumption{ + liter-per-100-kilometer{ + dnam{"l/100km"} + one{"{0} l/100km"} + other{"{0} l/100km"} + } + } + coordinate{ + dnam{"retning"} + east{"{0}Ø"} + north{"{0}N"} + south{"{0}S"} + west{"{0}V"} + } + duration{ + century{ + dnam{"årh."} + one{"{0} årh."} + other{"{0} årh."} + } + day{ + dnam{"døgn"} + one{"{0}d"} + other{"{0}d"} + per{"{0}/d"} + } + hour{ + dnam{"time"} + one{"{0}t"} + other{"{0}t"} + per{"{0}/t"} + } + microsecond{ + dnam{"μs"} + one{"{0}μs"} + other{"{0}μs"} + } + millisecond{ + dnam{"ms"} + one{"{0}ms"} + other{"{0}ms"} + } + minute{ + dnam{"min"} + one{"{0}m"} + other{"{0}m"} + per{"{0}/m"} + } + month{ + dnam{"måned"} + one{"{0} m"} + other{"{0} m"} + per{"{0}/m"} + } + nanosecond{ + dnam{"ns"} + one{"{0}ns"} + other{"{0}ns"} + } + second{ + dnam{"sek"} + one{"{0}s"} + other{"{0}s"} + per{"{0}/s"} + } + week{ + dnam{"uke"} + one{"{0}u"} + other{"{0}u"} + per{"{0}/u"} + } + year{ + dnam{"år"} + one{"{0}å"} + other{"{0}å"} + per{"{0}/år"} + } + } + length{ + astronomical-unit{ + one{"{0}au"} + other{"{0}au"} + } + centimeter{ + dnam{"cm"} + one{"{0}cm"} + other{"{0}cm"} + } + decimeter{ + one{"{0}dm"} + other{"{0}dm"} + } + foot{ + dnam{"fot"} + one{"{0} fot"} + other{"{0} fot"} + } + inch{ + dnam{"to"} + one{"{0} tomme"} + other{"{0} tommer"} + per{"{0}to"} + } + kilometer{ + dnam{"km"} + one{"{0}km"} + other{"{0}km"} + } + light-year{ + one{"{0} lysår"} + other{"{0} lysår"} + } + meter{ + dnam{"m"} + one{"{0}m"} + other{"{0}m"} + } + micrometer{ + one{"{0}µm"} + other{"{0}µm"} + } + mile{ + dnam{"mile"} + one{"{0} eng mil"} + other{"{0} eng mil"} + } + mile-scandinavian{ + dnam{"mil"} + one{"{0}mil"} + other{"{0}mil"} + } + millimeter{ + dnam{"mm"} + one{"{0}mm"} + other{"{0}mm"} + } + nanometer{ + one{"{0}nm"} + other{"{0}nm"} + } + nautical-mile{ + one{"{0}nmi"} + other{"{0}nmi"} + } + parsec{ + one{"{0}pc"} + other{"{0}pc"} + } + picometer{ + one{"{0}pm"} + other{"{0}pm"} + } + point{ + one{"{0}pt"} + other{"{0}pt"} + } + yard{ + one{"{0} yard"} + other{"{0} yard"} + } + } + mass{ + gram{ + dnam{"gram"} + one{"{0}g"} + other{"{0}g"} + } + kilogram{ + dnam{"kg"} + one{"{0}kg"} + other{"{0}kg"} + } + metric-ton{ + one{"{0}t"} + other{"{0}t"} + } + microgram{ + one{"{0}µg"} + other{"{0}µg"} + } + milligram{ + one{"{0}mg"} + other{"{0}mg"} + } + ounce{ + dnam{"unse"} + one{"{0} unse"} + other{"{0} unser"} + } + pound{ + dnam{"pund"} + one{"{0} pund"} + other{"{0} pund"} + per{"{0}/pund"} + } + } + power{ + horsepower{ + one{"{0}hk"} + other{"{0}hk"} + } + kilowatt{ + one{"{0}kW"} + other{"{0}kW"} + } + watt{ + one{"{0}W"} + other{"{0}W"} + } + } + pressure{ + hectopascal{ + one{"{0}hPa"} + other{"{0}hPa"} + } + inch-ofhg{ + one{"{0}ʹʹ Hg"} + other{"{0}ʹʹ Hg"} + } + millibar{ + one{"{0}mbar"} + other{"{0}mbar"} + } + millimeter-ofhg{ + one{"{0}mmHg"} + other{"{0}mmHg"} + } + pound-force-per-square-inch{ + one{"{0}psi"} + other{"{0}psi"} + } + } + speed{ + kilometer-per-hour{ + dnam{"km/t"} + one{"{0}km/t"} + other{"{0}km/t"} + } + knot{ + one{"{0}kn"} + other{"{0}kn"} + } + meter-per-second{ + one{"{0}m/s"} + other{"{0}m/s"} + } + mile-per-hour{ + dnam{"mile/t"} + one{"{0} eng mil/t"} + other{"{0} eng mil/t"} + } + } + temperature{ + celsius{ + dnam{"°C"} + one{"{0} °C"} + other{"{0} °C"} + } + fahrenheit{ + one{"{0}°F"} + other{"{0}°F"} + } + kelvin{ + one{"{0}K"} + other{"{0}K"} + } + } + volume{ + cubic-kilometer{ + one{"{0}km³"} + other{"{0}km³"} + } + cubic-mile{ + one{"{0} eng mil³"} + other{"{0} eng mil³"} + } + liter{ + dnam{"l"} + one{"{0}l"} + other{"{0}l"} + } + } + } + unitsShort{ + acceleration{ + g-force{ + dnam{"g-kraft"} + one{"{0} G"} + other{"{0} G"} + } + meter-per-square-second{ + dnam{"meter/s²"} + one{"{0} m/s²"} + other{"{0} m/s²"} + } + } + angle{ + arc-minute{ + dnam{"bueminutter"} + one{"{0}′"} + other{"{0}′"} + } + arc-second{ + dnam{"buesek"} + one{"{0}″"} + other{"{0}″"} + } + degree{ + dnam{"grader"} + one{"{0}°"} + other{"{0}°"} + } + radian{ + dnam{"radianer"} + one{"{0} rad"} + other{"{0} rad"} + } + revolution{ + dnam{"omdr."} + one{"{0} omdr."} + other{"{0} omdr."} + } + } + area{ + acre{ + dnam{"acre"} + one{"{0} ac"} + other{"{0} ac"} + } + 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{"tommer²"} + one{"{0} tomme²"} + other{"{0} tommer²"} + per{"{0}/tommer²"} + } + 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{"miles²"} + one{"{0} mile²"} + other{"{0} miles²"} + per{"{0}/mile²"} + } + square-yard{ + dnam{"yd²"} + one{"{0} yd²"} + other{"{0} yd²"} + } + } + compound{ + 1024p1{"Ki{0}"} + 10p-1{"d{0}"} + 10p-12{"p{0}"} + 10p-15{"f{0}"} + 10p-18{"a{0}"} + 10p-2{"c{0}"} + 10p-21{"z{0}"} + 10p-24{"y{0}"} + 10p-3{"m{0}"} + 10p-6{"µ{0}"} + 10p-9{"n{0}"} + 10p1{"da{0}"} + 10p12{"T{0}"} + 10p15{"P{0}"} + 10p18{"E{0}"} + 10p2{"h{0}"} + 10p21{"Z{0}"} + 10p24{"Y{0}"} + 10p3{"k{0}"} + 10p6{"M{0}"} + 10p9{"G{0}"} + per{"{0}/{1}"} + } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kt"} + other{"{0} kt"} + } + milligram-per-deciliter{ + dnam{"mg/dl"} + one{"{0} mg/dl"} + other{"{0} mg/dl"} + } + millimole-per-liter{ + dnam{"mmol/liter"} + 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{"liter/km"} + one{"{0} l/km"} + other{"{0} l/km"} + } + mile-per-gallon{ + dnam{"miles/gal"} + one{"{0} mpg"} + other{"{0} mpg"} + } + mile-per-gallon-imperial{ + dnam{"miles/brit. gal"} + one{"{0} mpg brit."} + other{"{0} mpg brit."} + } + } + 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} B"} + other{"{0} B"} + } + gigabit{ + dnam{"Gbit"} + one{"{0} Gb"} + other{"{0} Gb"} + } + gigabyte{ + dnam{"GB"} + one{"{0} GB"} + other{"{0} GB"} + } + kilobit{ + dnam{"kbit"} + one{"{0} kb"} + other{"{0} kb"} + } + kilobyte{ + dnam{"kB"} + one{"{0} kB"} + other{"{0} kB"} + } + megabit{ + dnam{"Mbit"} + 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{"Tbit"} + 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{"timer"} + one{"{0} t"} + other{"{0} t"} + per{"{0}/t"} + } + microsecond{ + dnam{"μs"} + one{"{0} μs"} + other{"{0} μs"} + } + millisecond{ + dnam{"ms"} + one{"{0} ms"} + other{"{0} ms"} + } + minute{ + dnam{"min"} + one{"{0} min"} + other{"{0} min"} + per{"{0}/min"} + } + month{ + dnam{"måneder"} + one{"{0} md."} + other{"{0} md."} + per{"{0}/md."} + } + nanosecond{ + dnam{"ns"} + one{"{0} ns"} + other{"{0} ns"} + } + second{ + dnam{"sek"} + one{"{0} sek"} + other{"{0} sek"} + per{"{0}/s"} + } + week{ + dnam{"uker"} + one{"{0} u"} + other{"{0} u"} + per{"{0}/u"} + } + 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{ + dnam{"therm"} + one{"{0} therm"} + other{"{0} therm"} + } + } + force{ + newton{ + dnam{"newton"} + } + pound-force{ + dnam{"poundforce"} + one{"{0} lbf"} + other{"{0} lbf"} + } + } + 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{ + dnam{"dpcm"} + } + em{ + dnam{"gefirt"} + one{"{0} gefirt"} + other{"{0} gefirt"} + } + megapixel{ + dnam{"megapiksler"} + one{"{0} MP"} + other{"{0} MP"} + } + pixel{ + dnam{"piksler"} + one{"{0} px"} + other{"{0} px"} + } + pixel-per-centimeter{ + one{"{0} ppcm"} + other{"{0} ppcm"} + } + pixel-per-inch{ + dnam{"ppi"} + one{"{0} ppi"} + other{"{0} ppi"} + } + } + length{ + astronomical-unit{ + dnam{"AU"} + 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{"favner"} + one{"{0} fm"} + other{"{0} fm"} + } + foot{ + dnam{"fot"} + one{"{0} fot"} + other{"{0} fot"} + per{"{0}/fot"} + } + furlong{ + dnam{"furlong"} + one{"{0} fur"} + other{"{0} fur"} + } + inch{ + dnam{"tommer"} + one{"{0} tomme"} + other{"{0} tommer"} + per{"{0}/tomme"} + } + kilometer{ + dnam{"km"} + one{"{0} km"} + other{"{0} km"} + per{"{0}/km"} + } + light-year{ + dnam{"lysår"} + one{"{0} ly"} + other{"{0} ly"} + } + meter{ + dnam{"meter"} + one{"{0} m"} + other{"{0} m"} + per{"{0}/m"} + } + micrometer{ + dnam{"µm"} + one{"{0} µm"} + other{"{0} µm"} + } + mile{ + dnam{"miles"} + one{"{0} mile"} + other{"{0} miles"} + } + 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{"pm"} + one{"{0} pm"} + other{"{0} pm"} + } + point{ + dnam{"punkter"} + one{"{0} pt"} + other{"{0} pt"} + } + solar-radius{ + dnam{"solradius"} + } + yard{ + dnam{"yard"} + one{"{0} yard"} + other{"{0} yard"} + } + } + light{ + candela{ + dnam{"cd"} + one{"{0} cd"} + other{"{0} cd"} + } + lumen{ + dnam{"lm"} + one{"{0} lm"} + other{"{0} lm"} + } + lux{ + dnam{"lux"} + one{"{0} lx"} + other{"{0} lx"} + } + solar-luminosity{ + dnam{"solluminositet"} + } + } + mass{ + carat{ + dnam{"karat"} + one{"{0} c"} + other{"{0} c"} + } + dalton{ + dnam{"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{"solmasser"} + one{"{0} M☉"} + other{"{0} M☉"} + } + stone{ + dnam{"stone"} + } + 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"} + } + bar{ + one{"{0} bar"} + other{"{0} bar"} + } + 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"} + } + pascal{ + one{"{0} Pa"} + other{"{0} Pa"} + } + 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{"miles/t"} + one{"{0} mile/t"} + other{"{0} miles/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{"bushel"} + 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{"tommer³"} + one{"{0} tomme³"} + other{"{0} tommer³"} + } + cubic-kilometer{ + dnam{"km³"} + one{"{0} km³"} + other{"{0} km³"} + } + cubic-meter{ + dnam{"m³"} + one{"{0} m³"} + other{"{0} m³"} + per{"{0}/m³"} + } + cubic-mile{ + dnam{"miles³"} + one{"{0} mile³"} + other{"{0} miles³"} + } + cubic-yard{ + dnam{"yard³"} + one{"{0} yard³"} + other{"{0} yard³"} + } + cup{ + dnam{"kopper"} + one{"{0} k"} + other{"{0} k"} + } + cup-metric{ + dnam{"m. kopper"} + one{"{0} m. kopp"} + other{"{0} m. kopper"} + } + deciliter{ + dnam{"dl"} + one{"{0} dl"} + other{"{0} dl"} + } + dessert-spoon{ + dnam{"bs"} + one{"{0} bs"} + other{"{0} bs"} + } + dessert-spoon-imperial{ + dnam{"imp. bs"} + one{"{0} imp. bs"} + other{"{0} imp. bs"} + } + dram{ + dnam{"dram fluid"} + one{"{0} dram fl"} + other{"{0} dram fl"} + } + drop{ + dnam{"dråpe"} + one{"{0} dråpe"} + other{"{0} dråpe"} + } + fluid-ounce{ + dnam{"væskeunse"} + one{"{0} fl oz"} + other{"{0} fl oz"} + } + fluid-ounce-imperial{ + dnam{"imp. fl oz"} + one{"{0} imp. fl oz"} + other{"{0} imp. fl oz"} + } + 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} shot"} + } + 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} klype"} + } + 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{"imp. quart"} + one{"{0} imp. quart"} + other{"{0} imp. 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_NO.txt b/icu4c/source/data/unit/no_NO.txt index 5d7f8599c0e..9de87e3d165 100644 --- a/icu4c/source/data/unit/no_NO.txt +++ b/icu4c/source/data/unit/no_NO.txt @@ -1,6 +1,9 @@ // © 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"{"nb_NO"} + ___{""} } diff --git a/icu4c/source/data/unit/no_SJ.txt b/icu4c/source/data/unit/no_SJ.txt new file mode 100644 index 00000000000..42b03fcf8d0 --- /dev/null +++ b/icu4c/source/data/unit/no_SJ.txt @@ -0,0 +1,9 @@ +// © 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/or.txt b/icu4c/source/data/unit/or.txt index 25844fba16f..ce43c6f8eb1 100644 --- a/icu4c/source/data/unit/or.txt +++ b/icu4c/source/data/unit/or.txt @@ -158,7 +158,7 @@ or{ one{"{0} କ୍ୟାରେଟ୍"} other{"{0} କ୍ୟାରେଟ୍"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ମିଲିଗ୍ରାମ୍ ପ୍ରତି ଡେସିଲିଟର୍"} one{"{0} ମିଲିଗ୍ରାମ୍ ପ୍ରତି ଡେସିଲିଟର୍"} other{"{0} ମିଲିଗ୍ରାମ୍ ପ୍ରତି ଡେସିଲିଟର୍"} @@ -1187,7 +1187,7 @@ or{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ମିଗ୍ରା/ଡେଲି"} one{"{0} ମିଗ୍ରା/ଡେଲି"} other{"{0} ମିଗ୍ରା/ଡେଲି"} @@ -1520,9 +1520,9 @@ or{ per{"{0}/ମି"} } micrometer{ - dnam{"µମିଟର୍"} - one{"{0} µମି"} - other{"{0} µମି"} + dnam{"μମିଟର୍"} + one{"{0} μମି"} + other{"{0} μମି"} } mile{ dnam{"ମାଇଲ୍"} @@ -1615,9 +1615,9 @@ or{ other{"{0} ଟ"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"ମିଗ୍ରା"} diff --git a/icu4c/source/data/unit/pa.txt b/icu4c/source/data/unit/pa.txt index 85fa5dd2753..86db68b3001 100644 --- a/icu4c/source/data/unit/pa.txt +++ b/icu4c/source/data/unit/pa.txt @@ -165,7 +165,7 @@ pa{ one{"{0} ਕੇਰਟ"} other{"{0} ਕੇਰਟ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ"} one{"{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ"} other{"{0} ਮਿਲੀਗ੍ਰਾਮ ਪ੍ਰਤੀ ਡੈਸੀਲਿਟਰ"} @@ -1402,8 +1402,8 @@ pa{ } micrometer{ dnam{"ਮਾਇਕ੍ਰੋ. ਮੀ."} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"ਮੀਲ"} @@ -1820,7 +1820,7 @@ pa{ one{"{0} ਕੇਰਟ"} other{"{0} ਕੇਰਟ"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ਮਿ.ਗ੍ਰਾ./ਡੈ.ਲਿ."} one{"{0}ਮਿਗ੍ਰਾ/ਡੈ.ਲਿ"} other{"{0}ਮਿਗ੍ਰਾ/ਡੈ.ਲਿ"} @@ -2114,12 +2114,12 @@ pa{ } dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - one{"{0} dpi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -2206,8 +2206,8 @@ pa{ } micrometer{ dnam{"ਮਾਈਕਰੋਮੀਟਰ"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"ਮੀਲ"} @@ -2310,9 +2310,9 @@ pa{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"ਮਿ.ਗ੍ਰਾ."} diff --git a/icu4c/source/data/unit/pcm.txt b/icu4c/source/data/unit/pcm.txt index b1fa7f1e6c3..65ca0a3140d 100644 --- a/icu4c/source/data/unit/pcm.txt +++ b/icu4c/source/data/unit/pcm.txt @@ -162,7 +162,7 @@ pcm{ one{"{0} Karat"} other{"{0} Karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"Mílígram-dẹm Fọ Ẹ́vrí Dẹsílíta"} one{"{0} Mílígram Fọ Ẹ́vrí Dẹsílíta"} other{"{0} Mílígram Fọ Ẹ́vrí Dẹsílíta"} @@ -1054,7 +1054,7 @@ pcm{ 10p-21{"Zẹ́{0}"} 10p-24{"Yó{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} 10p1{"Dẹ́{0}"} 10p12{"T{0}"} @@ -1326,7 +1326,7 @@ pcm{ 10p-21{"Zẹ{0}"} 10p-24{"Yo{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} 10p1{"Dẹ́{0}"} 10p12{"T{0}"} @@ -1371,7 +1371,7 @@ pcm{ one{"{0} kar"} other{"{0} kar"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1764,9 +1764,9 @@ pcm{ per{"{0}/m"} } micrometer{ - dnam{"µmíta"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmíta"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"Mails"} @@ -1880,9 +1880,9 @@ pcm{ other{"{0} t"} } 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/pl.txt b/icu4c/source/data/unit/pl.txt index aeb8fee90dc..764f8da637e 100644 --- a/icu4c/source/data/unit/pl.txt +++ b/icu4c/source/data/unit/pl.txt @@ -683,7 +683,7 @@ pl{ one{"{0} karat"} other{"{0} karata"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramy na decylitr"} few{"{0} miligramy na decylitr"} many{"{0} miligramów na decylitr"} @@ -4617,7 +4617,7 @@ pl{ karat{ dnam{"karaty"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} many{"{0} mg/dl"} diff --git a/icu4c/source/data/unit/ps.txt b/icu4c/source/data/unit/ps.txt index d80c0269985..539d75c8b2b 100644 --- a/icu4c/source/data/unit/ps.txt +++ b/icu4c/source/data/unit/ps.txt @@ -157,7 +157,7 @@ ps{ one{"{0} قيراط"} other{"{0} قيراط"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ملي ګرام في ډيسي ليټر"} one{"{0} ملي ګرام في ډيسي ليټر"} other{"{0} ملي ګرام في ډيسي ليټر"} @@ -913,7 +913,7 @@ ps{ 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}"} @@ -1164,7 +1164,7 @@ ps{ 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}"} @@ -1208,7 +1208,7 @@ ps{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1567,9 +1567,9 @@ ps{ per{"{0}/m"} } micrometer{ - dnam{"µmeters"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmeters"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"ميلونه"} @@ -1660,9 +1660,9 @@ ps{ other{"{0} t"} } 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/pt.txt b/icu4c/source/data/unit/pt.txt index 8179e6acbab..3927f56847a 100644 --- a/icu4c/source/data/unit/pt.txt +++ b/icu4c/source/data/unit/pt.txt @@ -185,7 +185,7 @@ pt{ one{"{0} kilate"} other{"{0} kilates"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramas por decilitro"} one{"{0} miligrama por decilitro"} other{"{0} miligramas por decilitro"} @@ -1415,7 +1415,7 @@ pt{ one{"{0} k"} other{"{0} k"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} diff --git a/icu4c/source/data/unit/pt_PT.txt b/icu4c/source/data/unit/pt_PT.txt index b67237ef3b8..e55d363a2c8 100644 --- a/icu4c/source/data/unit/pt_PT.txt +++ b/icu4c/source/data/unit/pt_PT.txt @@ -710,9 +710,9 @@ pt_PT{ other{"{0} m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ one{"{0} milha"} @@ -773,9 +773,9 @@ pt_PT{ other{"{0} kg"} } 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/ro.txt b/icu4c/source/data/unit/ro.txt index 195c66cae7b..dce34aede8c 100644 --- a/icu4c/source/data/unit/ro.txt +++ b/icu4c/source/data/unit/ro.txt @@ -194,7 +194,7 @@ ro{ one{"{0} karată"} other{"{0} de karate"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrame pe decilitru"} few{"{0} miligrame pe decilitru"} one{"{0} miligram pe decilitru"} @@ -1298,7 +1298,7 @@ ro{ 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}"} @@ -1466,10 +1466,10 @@ ro{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1554,10 +1554,10 @@ ro{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -1835,7 +1835,7 @@ ro{ 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}"} @@ -1857,7 +1857,7 @@ ro{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} one{"{0} mg/dl"} @@ -2278,10 +2278,10 @@ ro{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2398,10 +2398,10 @@ ro{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/root.txt b/icu4c/source/data/unit/root.txt index 4b269a3bd6a..839fc60a771 100644 --- a/icu4c/source/data/unit/root.txt +++ b/icu4c/source/data/unit/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"38"} + Version{"39"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -107,7 +107,7 @@ root{ 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}"} @@ -141,7 +141,7 @@ root{ dnam{"kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} } @@ -262,8 +262,8 @@ root{ per{"{0}/h"} } microsecond{ - dnam{"µs"} - other{"{0} µs"} + dnam{"μs"} + other{"{0} μs"} } millisecond{ dnam{"ms"} @@ -333,10 +333,7 @@ root{ dnam{"eV"} other{"{0} eV"} } - foodcalorie{ - dnam{"Cal"} - other{"{0} Cal"} - } + foodcalorie:alias{"/LOCALE/unitsShort/energy/kilocalorie"} joule{ dnam{"joule"} other{"{0} J"} @@ -387,18 +384,9 @@ root{ } } graphics{ - dot{ - dnam{"dot"} - other{"{0} dot"} - } - dot-per-centimeter{ - dnam{"dpcm"} - other{"{0} dpcm"} - } - dot-per-inch{ - dnam{"dpi"} - other{"{0} dpi"} - } + dot-per-centimeter:alias{"/LOCALE/unitsShort/graphics/pixel-per-centimeter"} + dot-per-inch:alias{"/LOCALE/unitsShort/graphics/pixel-per-inch"} + dot:alias{"/LOCALE/unitsShort/graphics/pixel"} em{ dnam{"em"} other{"{0} em"} @@ -471,8 +459,8 @@ root{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - other{"{0} µm"} + dnam{"μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -565,8 +553,8 @@ root{ other{"{0} t"} } microgram{ - dnam{"µg"} - other{"{0} µg"} + dnam{"μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/ru.txt b/icu4c/source/data/unit/ru.txt index bd0e0481410..7337baf67c2 100644 --- a/icu4c/source/data/unit/ru.txt +++ b/icu4c/source/data/unit/ru.txt @@ -693,7 +693,7 @@ ru{ one{"{0} карат"} other{"{0} карата"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"миллиграммы на децилитр"} few{"{0} миллиграмма на децилитр"} many{"{0} миллиграммов на децилитр"} @@ -5854,7 +5854,7 @@ ru{ one{"{0} кар"} other{"{0} кар"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} few{"{0} мг/дл"} many{"{0} мг/дл"} diff --git a/icu4c/source/data/unit/sd.txt b/icu4c/source/data/unit/sd.txt index 0cde6b80d84..b70c7ca62dd 100644 --- a/icu4c/source/data/unit/sd.txt +++ b/icu4c/source/data/unit/sd.txt @@ -165,7 +165,7 @@ sd{ one{"{0} قيراط"} other{"{0} قيراط"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ملي گرامز في ڊيسي ليٽر"} one{"{0} mg/dL"} other{"{0} ملي گرامز في ڊيسي ليٽر"} @@ -977,7 +977,7 @@ sd{ 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}"} @@ -1240,7 +1240,7 @@ sd{ 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}"} @@ -1285,7 +1285,7 @@ sd{ one{"{0} قيراط"} other{"{0} قيراط"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ملي گرامز في ڊيسي ليٽر"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1730,8 +1730,8 @@ sd{ other{"{0} t"} } microgram{ - one{"{0} µg"} - other{"{0} µg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ one{"{0} mg"} diff --git a/icu4c/source/data/unit/si.txt b/icu4c/source/data/unit/si.txt index 9056a7f0a1f..fbb5936748d 100644 --- a/icu4c/source/data/unit/si.txt +++ b/icu4c/source/data/unit/si.txt @@ -165,7 +165,7 @@ si{ one{"ක්‍රාත් {0}"} other{"ක්‍රාත් {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ඩෙසිලීටරයකට මිලිග්‍රෑම්"} one{"ඩෙසිලීටරයකට මිලිග්‍රෑම් {0}"} other{"ඩෙසිලීටරයකට මිලිග්‍රෑම් {0}"} @@ -1101,7 +1101,7 @@ si{ 10p-21{"සෙ{0}"} 10p-24{"යො{0}"} 10p-3{"මි{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"නැ{0}"} 10p1{"ඩෙ{0}"} 10p12{"ටෙ{0}"} @@ -1428,7 +1428,7 @@ si{ 10p-21{"සෙප්{0}"} 10p-24{"යො{0}"} 10p-3{"මි{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"නැ{0}"} 10p1{"ඩෙක{0}"} 10p12{"ටෙ{0}"} @@ -1449,7 +1449,7 @@ si{ one{"ක්‍රාත් {0}"} other{"ක්‍රාත් {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"මිග්‍රෑ/ඩෙලි"} one{"{0} මිග්‍රෑ/ඩෙලි"} other{"{0} මිග්‍රෑ/ඩෙලි"} @@ -1751,12 +1751,12 @@ si{ } dot-per-centimeter{ dnam{"dpcm"} - one{"{0} dpcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - one{"{0} dpi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ diff --git a/icu4c/source/data/unit/sk.txt b/icu4c/source/data/unit/sk.txt index f10cf2b27f6..d3e8114c641 100644 --- a/icu4c/source/data/unit/sk.txt +++ b/icu4c/source/data/unit/sk.txt @@ -222,7 +222,7 @@ sk{ one{"{0} karát"} other{"{0} karátov"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramy na deciliter"} few{"{0} miligramy na deciliter"} many{"{0} miligramu na deciliter"} @@ -1724,11 +1724,11 @@ sk{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1834,11 +1834,11 @@ sk{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -2296,7 +2296,7 @@ sk{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} many{"{0} mg/dl"} @@ -2713,9 +2713,9 @@ sk{ } dot-per-inch{ dnam{"dpi"} - few{"{0} dpi"} - many{"{0} dpi"} - one{"{0} dpi"} + few{"{0} ppi"} + many{"{0} ppi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -2831,11 +2831,11 @@ sk{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - many{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + many{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -2991,11 +2991,11 @@ sk{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - many{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + many{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/sl.txt b/icu4c/source/data/unit/sl.txt index 9b1f8d74195..ea06fe0e792 100644 --- a/icu4c/source/data/unit/sl.txt +++ b/icu4c/source/data/unit/sl.txt @@ -221,7 +221,7 @@ sl{ other{"{0} karatov"} two{"{0} karata"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrami na deciliter"} few{"{0} miligrami na deciliter"} one{"{0} miligram na deciliter"} @@ -1402,7 +1402,7 @@ sl{ 10p-18{"a{0}"} 10p-2{"c{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} per{"{0}/{1}"} } @@ -1831,7 +1831,7 @@ sl{ other{"{0} kt"} two{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} few{"{0} mg/dl"} one{"{0} mg/dl"} @@ -2241,17 +2241,17 @@ sl{ } dot-per-centimeter{ dnam{"dpcm"} - few{"{0} dpcm"} - one{"{0} dpcm"} + few{"{0} ppcm"} + one{"{0} ppcm"} other{"{0} dpcm"} - two{"{0} dpcm"} + two{"{0} ppcm"} } dot-per-inch{ dnam{"dpi"} - few{"{0} dpi"} - one{"{0} dpi"} + few{"{0} ppi"} + one{"{0} ppi"} other{"{0} dpi"} - two{"{0} dpi"} + two{"{0} ppi"} } em{ dnam{"em"} @@ -2373,11 +2373,11 @@ sl{ two{"{0} m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} - two{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} + two{"{0} μm"} } mile{ dnam{"mi"} @@ -2519,11 +2519,11 @@ sl{ two{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} - two{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} + two{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/so.txt b/icu4c/source/data/unit/so.txt index 13257a834ac..99800a4eab6 100644 --- a/icu4c/source/data/unit/so.txt +++ b/icu4c/source/data/unit/so.txt @@ -138,7 +138,7 @@ so{ one{"{0} karaat"} other{"{0} karaat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligaraam disilitirkiiba"} one{"{0} miligaraam disilitirkiiba"} other{"{0} miligaraam disilitirkiiba"} @@ -1327,7 +1327,7 @@ so{ dnam{"m"} } micrometer{ - dnam{"µmitir"} + dnam{"μmitir"} } mile{ dnam{"meyl"} diff --git a/icu4c/source/data/unit/sq.txt b/icu4c/source/data/unit/sq.txt index c284af557c9..35ae3235833 100644 --- a/icu4c/source/data/unit/sq.txt +++ b/icu4c/source/data/unit/sq.txt @@ -165,7 +165,7 @@ sq{ one{"{0} karat"} other{"{0} karatë"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramë për decilitër"} one{"{0} miligram për decilitër"} other{"{0} miligramë për decilitër"} @@ -1364,7 +1364,7 @@ sq{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1676,9 +1676,9 @@ sq{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1757,9 +1757,9 @@ sq{ other{"{0} t"} } 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/sr.txt b/icu4c/source/data/unit/sr.txt index 8f1015ef742..e483a3da36a 100644 --- a/icu4c/source/data/unit/sr.txt +++ b/icu4c/source/data/unit/sr.txt @@ -194,7 +194,7 @@ sr{ one{"{0} карат"} other{"{0} карата"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"милиграми по децилитру"} few{"{0} милиграма по децилитру"} one{"{0} милиграм по децилитру"} @@ -1631,7 +1631,7 @@ sr{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0} mg/dL"} one{"{0} mg/dL"} @@ -1960,14 +1960,14 @@ sr{ } dot-per-centimeter{ dnam{"dpcm"} - few{"{0} dpcm"} - one{"{0} dpcm"} + few{"{0} ppcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - few{"{0} dpi"} - one{"{0} dpi"} + few{"{0} ppi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ @@ -2074,10 +2074,10 @@ sr{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"миље"} @@ -2173,10 +2173,10 @@ sr{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/sr_Latn.txt b/icu4c/source/data/unit/sr_Latn.txt index a4709898b6d..14de1dee89a 100644 --- a/icu4c/source/data/unit/sr_Latn.txt +++ b/icu4c/source/data/unit/sr_Latn.txt @@ -195,7 +195,7 @@ sr_Latn{ one{"{0} karat"} other{"{0} karata"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligrami po decilitru"} few{"{0} miligrama po decilitru"} one{"{0} miligram po decilitru"} @@ -1637,7 +1637,7 @@ sr_Latn{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} few{"{0} mg/dL"} one{"{0} mg/dL"} @@ -2066,10 +2066,10 @@ sr_Latn{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - few{"{0} µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + few{"{0} μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"milje"} @@ -2165,10 +2165,10 @@ sr_Latn{ other{"{0} t"} } microgram{ - dnam{"µg"} - few{"{0} µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + few{"{0} μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/sv.txt b/icu4c/source/data/unit/sv.txt index d601bd4d6a7..60c69bd95c7 100644 --- a/icu4c/source/data/unit/sv.txt +++ b/icu4c/source/data/unit/sv.txt @@ -186,7 +186,7 @@ sv{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram per deciliter"} one{"{0} milligram per deciliter"} other{"{0} milligram per deciliter"} @@ -1199,7 +1199,7 @@ sv{ 10p-21{"z{0}"} 10p-24{"y{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p12{"T{0}"} 10p15{"P{0}"} 10p18{"E{0}"} @@ -1215,7 +1215,7 @@ sv{ one{"{0} krt"} other{"{0} krt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} other{"{0}mg/dL"} @@ -2047,7 +2047,7 @@ sv{ 10p-2{"c{0}"} 10p-21{"z{0}"} 10p-24{"y{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p12{"T{0}"} 10p18{"E{0}"} 10p2{"h{0}"} @@ -2062,7 +2062,7 @@ sv{ one{"{0} kar"} other{"{0} kar"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} diff --git a/icu4c/source/data/unit/sw.txt b/icu4c/source/data/unit/sw.txt index ac0be2a2421..8cb0848af37 100644 --- a/icu4c/source/data/unit/sw.txt +++ b/icu4c/source/data/unit/sw.txt @@ -165,7 +165,7 @@ sw{ one{"karati {0}"} other{"karati {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligramu kwa kila desilita"} one{"miligramu kwa kila desilita"} other{"miligramu {0} kwa kila desilita"} @@ -1457,7 +1457,7 @@ sw{ one{"karati {0}"} other{"karati {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} diff --git a/icu4c/source/data/unit/ta.txt b/icu4c/source/data/unit/ta.txt index 066a825cd18..8b44558c6f1 100644 --- a/icu4c/source/data/unit/ta.txt +++ b/icu4c/source/data/unit/ta.txt @@ -165,7 +165,7 @@ ta{ one{"{0} காரட்"} other{"{0} காரட்கள்"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"மில்லிகிராம்கள்/டெசிலிட்டர்"} one{"{0} மில்லிகிராம்/டெசிலிட்டர்"} other{"{0} மில்லிகிராம்கள்/டெசிலிட்டர்"} @@ -1491,7 +1491,7 @@ ta{ one{"{0} கார."} other{"{0} கார."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"மி.கி./டெ.லி."} one{"{0} மி.கி./டெ.லி."} other{"{0} மி.கி./டெ.லி."} @@ -1880,9 +1880,9 @@ ta{ per{"{0}/மீ."} } micrometer{ - dnam{"µமீ."} - one{"{0} µமீ."} - other{"{0} µமீ."} + dnam{"μமீ."} + one{"{0} μமீ."} + other{"{0} μமீ."} } mile{ dnam{"மைல்கள்"} @@ -1990,9 +1990,9 @@ ta{ other{"{0} ட."} } microgram{ - dnam{"µகி"} - one{"{0} µகி"} - other{"{0} µகி"} + dnam{"μகி"} + one{"{0} μகி"} + other{"{0} μகி"} } milligram{ dnam{"மி.கி."} diff --git a/icu4c/source/data/unit/te.txt b/icu4c/source/data/unit/te.txt index 82367c65775..136c5e1f9d9 100644 --- a/icu4c/source/data/unit/te.txt +++ b/icu4c/source/data/unit/te.txt @@ -165,7 +165,7 @@ te{ one{"{0} కేరట్"} other{"{0} కేరట్లు"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"మిల్లీగ్రాములు/డెసిలీటర్"} one{"{0} మిల్లీగ్రాము/డెసిలీటర్"} other{"{0} మిల్లీగ్రాములు/డెసిలీటర్"} @@ -1518,7 +1518,7 @@ te{ one{"{0} కేర."} other{"{0} కేర."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"మి.గ్రా./డె.లీ."} one{"{0} మి.గ్రా./డె.లీ."} other{"{0} మి.గ్రా./డె.లీ."} diff --git a/icu4c/source/data/unit/th.txt b/icu4c/source/data/unit/th.txt index d69f476594a..94985d15c08 100644 --- a/icu4c/source/data/unit/th.txt +++ b/icu4c/source/data/unit/th.txt @@ -137,7 +137,7 @@ th{ dnam{"กะรัต"} other{"{0} กะรัต"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"มิลลิกรัมต่อเดซิลิตร"} other{"{0} มิลลิกรัมต่อเดซิลิตร"} } @@ -1198,7 +1198,7 @@ th{ dnam{"กะรัต"} other{"{0} กะรัต"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"มก./ดล."} other{"{0} มก./ดล."} } diff --git a/icu4c/source/data/unit/tk.txt b/icu4c/source/data/unit/tk.txt index acaeafed718..734c6d1cee7 100644 --- a/icu4c/source/data/unit/tk.txt +++ b/icu4c/source/data/unit/tk.txt @@ -165,7 +165,7 @@ tk{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligram/desilitr"} one{"{0} milligram/desilitr"} other{"{0} milligram/desilitr"} @@ -1286,7 +1286,7 @@ tk{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1677,9 +1677,9 @@ tk{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1793,9 +1793,9 @@ tk{ other{"{0} t"} } 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/to.txt b/icu4c/source/data/unit/to.txt index 03f5b1c8379..de743842356 100644 --- a/icu4c/source/data/unit/to.txt +++ b/icu4c/source/data/unit/to.txt @@ -137,7 +137,7 @@ to{ dnam{"kalati"} other{"kalati ʻe {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milikalami he tesilita"} other{"milikalami ʻe {0} he tesilita"} } @@ -1152,8 +1152,8 @@ to{ other{"{0} m"} } micrometer{ - dnam{"µm"} - other{"{0} µm"} + dnam{"μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1496,7 +1496,7 @@ to{ dnam{"kt"} other{"kt ʻe {0}"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mk/tl"} other{"mk ʻe {0}/tl"} } @@ -1819,8 +1819,8 @@ to{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - other{"µm ʻe {0}"} + dnam{"μm"} + other{"μm ʻe {0}"} } mile{ dnam{"mi"} diff --git a/icu4c/source/data/unit/tr.txt b/icu4c/source/data/unit/tr.txt index 3f535e35d85..9e4a07b0634 100644 --- a/icu4c/source/data/unit/tr.txt +++ b/icu4c/source/data/unit/tr.txt @@ -165,7 +165,7 @@ tr{ one{"{0} ayar"} other{"{0} ayar"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"miligram/desilitre"} one{"{0} miligram/desilitre"} other{"{0} miligram/desilitre"} @@ -1125,7 +1125,7 @@ tr{ one{"{0} ayar"} other{"{0} ayar"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1415,8 +1415,8 @@ tr{ per{"{0}/m"} } micrometer{ - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mil"} @@ -1493,9 +1493,9 @@ tr{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -1834,7 +1834,7 @@ tr{ one{"{0} ayar"} other{"{0} ayar"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dl"} one{"{0} mg/dl"} other{"{0} mg/dl"} @@ -2192,8 +2192,8 @@ tr{ } micrometer{ dnam{"mikron"} - one{"{0} µm"} - other{"{0} µm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mil"} @@ -2297,9 +2297,9 @@ tr{ other{"{0} t"} } 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/uk.txt b/icu4c/source/data/unit/uk.txt index 40bebae3b22..216ba8554e9 100644 --- a/icu4c/source/data/unit/uk.txt +++ b/icu4c/source/data/unit/uk.txt @@ -221,7 +221,7 @@ uk{ one{"{0} карат"} other{"{0} карата"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"міліграми на децилітр"} few{"{0} міліграми на децилітр"} many{"{0} міліграмів на децилітр"} @@ -2191,7 +2191,7 @@ uk{ one{"{0} кар."} other{"{0} кар."} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"мг/дл"} few{"{0} мг/дл"} many{"{0} мг/дл"} @@ -2597,16 +2597,16 @@ uk{ } dot-per-centimeter{ dnam{"dpcm"} - few{"{0} dpcm"} - many{"{0} dpcm"} - one{"{0} dpcm"} + few{"{0} ppcm"} + many{"{0} ppcm"} + one{"{0} ppcm"} other{"{0} dpcm"} } dot-per-inch{ dnam{"dpi"} - few{"{0} dpi"} - many{"{0} dpi"} - one{"{0} dpi"} + few{"{0} ppi"} + many{"{0} ppi"} + one{"{0} ppi"} other{"{0} dpi"} } em{ diff --git a/icu4c/source/data/unit/ur.txt b/icu4c/source/data/unit/ur.txt index 31374260968..661f3d7da35 100644 --- a/icu4c/source/data/unit/ur.txt +++ b/icu4c/source/data/unit/ur.txt @@ -165,7 +165,7 @@ ur{ one{"{0} قیراط"} other{"{0} قیراط"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"ملی گرام فی ڈیسی لیٹر"} one{"{0} ملی گرام فی ڈیسی لیٹر"} other{"{0} ملی گرام فی ڈیسی لیٹر"} @@ -1500,7 +1500,7 @@ ur{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1859,9 +1859,9 @@ ur{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"میل"} @@ -1971,9 +1971,9 @@ ur{ other{"{0} t"} } 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/uz.txt b/icu4c/source/data/unit/uz.txt index cf0c57977f7..a7126071a70 100644 --- a/icu4c/source/data/unit/uz.txt +++ b/icu4c/source/data/unit/uz.txt @@ -160,7 +160,7 @@ uz{ one{"{0} karat"} other{"{0} karat"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"milligramm/detsilitr"} one{"{0} milligramm/detsilitr"} other{"{0} milligramm/detsilitr"} @@ -1078,7 +1078,7 @@ uz{ 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}"} @@ -1426,7 +1426,7 @@ uz{ 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}"} @@ -1471,7 +1471,7 @@ uz{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1869,9 +1869,9 @@ uz{ per{"{0}/m"} } micrometer{ - dnam{"µmetr"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μmetr"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mil"} @@ -1985,9 +1985,9 @@ uz{ other{"{0} t"} } 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/vi.txt b/icu4c/source/data/unit/vi.txt index 253d6764f37..626890b32e6 100644 --- a/icu4c/source/data/unit/vi.txt +++ b/icu4c/source/data/unit/vi.txt @@ -972,7 +972,7 @@ vi{ 1024p8{"Yi{0}"} } concentr{ - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} } mole{ @@ -1231,7 +1231,7 @@ vi{ dnam{"t"} } microgram{ - dnam{"µg"} + dnam{"μg"} } milligram{ dnam{"mg"} diff --git a/icu4c/source/data/unit/yue.txt b/icu4c/source/data/unit/yue.txt index bec7b14c2d2..70a50c39ce6 100644 --- a/icu4c/source/data/unit/yue.txt +++ b/icu4c/source/data/unit/yue.txt @@ -137,7 +137,7 @@ yue{ dnam{"克拉"} other{"{0} 克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/公合"} other{"{0} 毫克/公合"} } @@ -1131,7 +1131,7 @@ yue{ other{"{0} 米"} } micrometer{ - other{"{0}µm"} + other{"{0}μm"} } mile{ other{"{0}英里"} @@ -1177,7 +1177,7 @@ yue{ other{"{0}t"} } microgram{ - other{"{0}µg"} + other{"{0}μg"} } milligram{ other{"{0}mg"} @@ -1462,7 +1462,7 @@ yue{ dnam{"克拉"} other{"{0} 克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/公合"} other{"{0} 毫克/公合"} } diff --git a/icu4c/source/data/unit/yue_Hans.txt b/icu4c/source/data/unit/yue_Hans.txt index 062afef4aa3..d8a77a27eaf 100644 --- a/icu4c/source/data/unit/yue_Hans.txt +++ b/icu4c/source/data/unit/yue_Hans.txt @@ -138,7 +138,7 @@ yue_Hans{ dnam{"克拉"} other{"{0} 克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/公合"} other{"{0} 毫克/公合"} } @@ -1132,7 +1132,7 @@ yue_Hans{ other{"{0} 公尺"} } micrometer{ - other{"{0}µm"} + other{"{0}μm"} } mile{ other{"{0}英里"} @@ -1178,7 +1178,7 @@ yue_Hans{ other{"{0}t"} } microgram{ - other{"{0}µg"} + other{"{0}μg"} } milligram{ other{"{0}mg"} @@ -1463,7 +1463,7 @@ yue_Hans{ dnam{"克拉"} other{"{0} 克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/公合"} other{"{0} 毫克/公合"} } diff --git a/icu4c/source/data/unit/zh.txt b/icu4c/source/data/unit/zh.txt index fd024ffa468..c2845de250f 100644 --- a/icu4c/source/data/unit/zh.txt +++ b/icu4c/source/data/unit/zh.txt @@ -126,7 +126,7 @@ zh{ dnam{"克拉"} other{"{0}克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/分升"} other{"每分升{0}毫克"} } diff --git a/icu4c/source/data/unit/zh_Hant.txt b/icu4c/source/data/unit/zh_Hant.txt index ca52e9eb6b1..be652624dcd 100644 --- a/icu4c/source/data/unit/zh_Hant.txt +++ b/icu4c/source/data/unit/zh_Hant.txt @@ -138,7 +138,7 @@ zh_Hant{ dnam{"克拉"} other{"{0} 克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"每分升毫克"} other{"每分升 {0} 毫克"} } @@ -919,7 +919,7 @@ zh_Hant{ dnam{"克拉"} other{"{0}kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/分升"} other{"{0}mg/dL"} } @@ -1166,7 +1166,7 @@ zh_Hant{ } micrometer{ dnam{"微米"} - other{"{0}µm"} + other{"{0}μm"} } mile{ dnam{"英里"} @@ -1229,7 +1229,7 @@ zh_Hant{ } microgram{ dnam{"微克"} - other{"{0}µg"} + other{"{0}μg"} } milligram{ dnam{"毫克"} @@ -1554,7 +1554,7 @@ zh_Hant{ dnam{"克拉"} other{"{0} 克拉"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"毫克/分升"} other{"{0} 毫克/分升"} } diff --git a/icu4c/source/data/unit/zu.txt b/icu4c/source/data/unit/zu.txt index 1d1f4ec7285..08cc93a96ce 100644 --- a/icu4c/source/data/unit/zu.txt +++ b/icu4c/source/data/unit/zu.txt @@ -152,7 +152,7 @@ zu{ one{"{0} i-karat"} other{"{0} ama-karats"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -461,9 +461,9 @@ zu{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -550,9 +550,9 @@ zu{ other{"{0} t"} } microgram{ - dnam{"µg"} - one{"{0} µg"} - other{"{0} µg"} + dnam{"μg"} + one{"{0} μg"} + other{"{0} μg"} } milligram{ dnam{"mg"} @@ -856,7 +856,7 @@ zu{ 10p-21{"i-z{0}"} 10p-24{"i-y{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} 10p1{"da{0}"} 10p12{"T{0}"} @@ -1121,7 +1121,7 @@ zu{ 10p-21{"z{0}"} 10p-24{"i-y{0}"} 10p-3{"m{0}"} - 10p-6{"µ{0}"} + 10p-6{"μ{0}"} 10p-9{"n{0}"} 10p1{"da{0}"} 10p12{"T{0}"} @@ -1165,7 +1165,7 @@ zu{ one{"{0} kt"} other{"{0} kt"} } - milligram-per-deciliter{ + milligram-ofglucose-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} other{"{0} mg/dL"} @@ -1463,9 +1463,9 @@ zu{ per{"{0}/m"} } micrometer{ - dnam{"µm"} - one{"{0} µm"} - other{"{0} µm"} + dnam{"μm"} + one{"{0} μm"} + other{"{0} μm"} } mile{ dnam{"mi"} @@ -1544,9 +1544,9 @@ zu{ other{"{0} t"} } 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/zone/LOCALE_DEPS.json b/icu4c/source/data/zone/LOCALE_DEPS.json index da24c8c172a..f737ebe3754 100644 --- a/icu4c/source/data/zone/LOCALE_DEPS.json +++ b/icu4c/source/data/zone/LOCALE_DEPS.json @@ -3,7 +3,7 @@ // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml { - "cldrVersion": "38", + "cldrVersion": "39", "aliases": { "ars": "ar_SA", "az_AZ": "az_Latn_AZ", @@ -21,8 +21,9 @@ "ks_IN": "ks_Arab_IN", "mni_IN": "mni_Beng_IN", "mo": "ro", - "no": "nb", - "no_NO": "nb_NO", + "nb": "no", + "nb_NO": "no_NO", + "nb_SJ": "no_SJ", "no_NO_NY": "nn_NO", "pa_IN": "pa_Guru_IN", "pa_PK": "pa_Arab_PK", @@ -177,6 +178,7 @@ "es_UY": "es_419", "es_VE": "es_419", "ff_Adlm": "root", + "nn": "no", "pa_Arab": "root", "pt_AO": "pt_PT", "pt_CH": "pt_PT", diff --git a/icu4c/source/data/zone/nb.txt b/icu4c/source/data/zone/nb.txt index 6eccb516bbf..934f064b8be 100644 --- a/icu4c/source/data/zone/nb.txt +++ b/icu4c/source/data/zone/nb.txt @@ -2,1981 +2,5 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nb{ - 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øyene"} - } - "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{"Cuiabá"} - } - "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{"Mérida"} - } - "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:Santa_Isabel"{ - ec{"Santa Isabel"} - } - "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{"Aqtöbe"} - } - "Asia:Ashgabat"{ - ec{"Asjkhabad"} - } - "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{"Choybalsan"} - } - "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{"Hovd"} - } - "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{"Yangon"} - } - "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{"Asorene"} - } - "Atlantic:Bermuda"{ - ec{"Bermuda"} - } - "Atlantic:Canary"{ - ec{"Kanariøyene"} - } - "Atlantic:Cape_Verde"{ - ec{"Kapp Verde"} - } - "Atlantic:Faeroe"{ - ec{"Færøyene"} - } - "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{"ukjent 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 sommertid"} - } - "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 sommertid"} - } - "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øyene"} - } - "Indian:Comoro"{ - ec{"Komorene"} - } - "Indian:Kerguelen"{ - ec{"Kerguelen"} - } - "Indian:Mahe"{ - ec{"Mahé"} - } - "Indian:Maldives"{ - ec{"Maldivene"} - } - "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øyene"} - } - "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:Acre"{ - ld{"Acre sommertid"} - lg{"Acre-tid"} - ls{"Acre normaltid"} - } - "meta:Afghanistan"{ - ls{"afghansk tid"} - } - "meta:Africa_Central"{ - ls{"sentralafrikansk tid"} - } - "meta:Africa_Eastern"{ - ls{"østafrikansk tid"} - } - "meta:Africa_Southern"{ - ls{"sørafrikansk tid"} - } - "meta:Africa_Western"{ - ld{"vestafrikansk sommertid"} - lg{"vestafrikansk tid"} - ls{"vestafrikansk normaltid"} - } - "meta:Alaska"{ - ld{"alaskisk sommertid"} - lg{"alaskisk tid"} - ls{"alaskisk normaltid"} - sd{"AKDT"} - sg{"AKT"} - ss{"AKST"} - } - "meta:Almaty"{ - ld{"Almaty, sommertid"} - lg{"Almaty-tid"} - ls{"Almaty, standardtid"} - } - "meta:Amazon"{ - ld{"sommertid for Amazonas"} - lg{"tidssone for Amazonas"} - ls{"normaltid for Amazonas"} - } - "meta:America_Central"{ - ld{"sommertid for det sentrale Nord-Amerika"} - lg{"tidssone for det sentrale Nord-Amerika"} - ls{"normaltid for det sentrale Nord-Amerika"} - sd{"CDT"} - sg{"CT"} - ss{"CST"} - } - "meta:America_Eastern"{ - ld{"sommertid for den nordamerikanske østkysten"} - lg{"tidssone for den nordamerikanske østkysten"} - ls{"normaltid for den nordamerikanske østkysten"} - sd{"EDT"} - sg{"ET"} - ss{"EST"} - } - "meta:America_Mountain"{ - ld{"sommertid for Rocky Mountains (USA)"} - lg{"tidssone for Rocky Mountains (USA)"} - ls{"normaltid for Rocky Mountains (USA)"} - sd{"MDT"} - sg{"MT"} - ss{"MST"} - } - "meta:America_Pacific"{ - ld{"sommertid for den nordamerikanske Stillehavskysten"} - lg{"tidssone for den nordamerikanske Stillehavskysten"} - ls{"normaltid for den nordamerikanske Stillehavskysten"} - sd{"PDT"} - sg{"PT"} - ss{"PST"} - } - "meta:Anadyr"{ - ld{"Russisk (Anadyr) sommertid"} - lg{"Russisk (Anadyr) tid"} - ls{"Russisk (Anadyr) normaltid"} - } - "meta:Apia"{ - ld{"sommertid for Apia"} - lg{"tidssone for Apia"} - ls{"normaltid for Apia"} - } - "meta:Aqtau"{ - ld{"Aqtau, sommertid"} - lg{"Aqtau-tid"} - ls{"Aqtau, standardtid"} - } - "meta:Aqtobe"{ - ld{"Aqtobe, sommertid"} - lg{"Aqtobe-tid"} - ls{"Aqtobe, standardtid"} - } - "meta:Arabian"{ - ld{"arabisk sommertid"} - lg{"arabisk tid"} - ls{"arabisk standardtid"} - } - "meta:Argentina"{ - ld{"argentinsk sommertid"} - lg{"argentinsk tid"} - ls{"argentinsk normaltid"} - } - "meta:Argentina_Western"{ - ld{"vestargentinsk sommertid"} - lg{"vestargentinsk tid"} - ls{"vestargentinsk normaltid"} - } - "meta:Armenia"{ - ld{"armensk sommertid"} - lg{"armensk tid"} - ls{"armensk normaltid"} - } - "meta:Atlantic"{ - ld{"sommertid for den nordamerikanske atlanterhavskysten"} - lg{"tidssone for den nordamerikanske atlanterhavskysten"} - ls{"normaltid for den nordamerikanske atlanterhavskysten"} - sd{"ADT"} - sg{"AT"} - ss{"AST"} - } - "meta:Australia_Central"{ - ld{"sentralaustralsk sommertid"} - lg{"sentralaustralsk tid"} - ls{"sentralaustralsk normaltid"} - } - "meta:Australia_CentralWestern"{ - ld{"vest-sentralaustralsk sommertid"} - lg{"vest-sentralaustralsk tid"} - ls{"vest-sentralaustralsk normaltid"} - } - "meta:Australia_Eastern"{ - ld{"østaustralsk sommertid"} - lg{"østaustralsk tid"} - ls{"østaustralsk normaltid"} - } - "meta:Australia_Western"{ - ld{"vestaustralsk sommertid"} - lg{"vestaustralsk tid"} - ls{"vestaustralsk normaltid"} - } - "meta:Azerbaijan"{ - ld{"aserbajdsjansk sommertid"} - lg{"aserbajdsjansk tid"} - ls{"aserbajdsjansk normaltid"} - } - "meta:Azores"{ - ld{"asorisk sommertid"} - lg{"asorisk tid"} - ls{"asorisk normaltid"} - } - "meta:Bangladesh"{ - ld{"bangladeshisk sommertid"} - lg{"bangladeshisk tid"} - ls{"bangladeshisk normaltid"} - } - "meta:Bhutan"{ - ls{"bhutansk tid"} - } - "meta:Bolivia"{ - ls{"boliviansk tid"} - } - "meta:Brasilia"{ - ld{"sommertid for Brasilia"} - lg{"tidssone for Brasilia"} - ls{"normaltid for Brasilia"} - } - "meta:Brunei"{ - ls{"tidssone for Brunei Darussalam"} - } - "meta:Cape_Verde"{ - ld{"kappverdisk sommertid"} - lg{"kappverdisk tid"} - ls{"kappverdisk normaltid"} - } - "meta:Casey"{ - ls{"Casey-tid"} - } - "meta:Chamorro"{ - ls{"tidssone for Chamorro"} - } - "meta:Chatham"{ - ld{"sommertid for Chatham"} - lg{"tidssone for Chatham"} - ls{"normaltid for Chatham"} - } - "meta:Chile"{ - ld{"chilensk sommertid"} - lg{"chilensk tid"} - ls{"chilensk normaltid"} - } - "meta:China"{ - ld{"kinesisk sommertid"} - lg{"kinesisk tid"} - ls{"kinesisk normaltid"} - } - "meta:Choibalsan"{ - ld{"sommertid for Tsjojbalsan"} - lg{"tidssone for Tsjojbalsan"} - ls{"normaltid for Tsjojbalsan"} - } - "meta:Christmas"{ - ls{"tidssone for Christmasøya"} - } - "meta:Cocos"{ - ls{"tidssone for Kokosøyene"} - } - "meta:Colombia"{ - ld{"colombiansk sommertid"} - lg{"colombiansk tid"} - ls{"colombiansk normaltid"} - } - "meta:Cook"{ - ld{"halv sommertid for Cookøyene"} - lg{"tidssone for Cookøyene"} - ls{"normaltid for Cookøyene"} - } - "meta:Cuba"{ - ld{"cubansk sommertid"} - lg{"cubansk tid"} - ls{"cubansk normaltid"} - } - "meta:Davis"{ - ls{"tidssone for Davis"} - } - "meta:DumontDUrville"{ - ls{"tidssone for Dumont d’Urville"} - } - "meta:East_Timor"{ - ls{"østtimoresisk tid"} - } - "meta:Easter"{ - ld{"sommertid for Påskeøya"} - lg{"tidssone for Påskeøya"} - ls{"normaltid for Påskeøya"} - } - "meta:Ecuador"{ - ls{"ecuadoriansk tid"} - } - "meta:Europe_Central"{ - ld{"sentraleuropeisk sommertid"} - lg{"sentraleuropeisk tid"} - ls{"sentraleuropeisk normaltid"} - sd{"CEST"} - sg{"CET"} - ss{"CET"} - } - "meta:Europe_Eastern"{ - ld{"østeuropeisk sommertid"} - lg{"østeuropeisk tid"} - ls{"østeuropeisk normaltid"} - sd{"EEST"} - sg{"EET"} - ss{"EET"} - } - "meta:Europe_Further_Eastern"{ - ls{"fjern-østeuropeisk tid"} - } - "meta:Europe_Western"{ - ld{"vesteuropeisk sommertid"} - lg{"vesteuropeisk tid"} - ls{"vesteuropeisk normaltid"} - sd{"WEST"} - sg{"WET"} - ss{"WET"} - } - "meta:Falkland"{ - ld{"sommertid for Falklandsøyene"} - lg{"tidssone for Falklandsøyene"} - ls{"normaltid for Falklandsøyene"} - } - "meta:Fiji"{ - ld{"fijiansk sommertid"} - lg{"fijiansk tid"} - ls{"fijiansk normaltid"} - } - "meta:French_Guiana"{ - ls{"tidssone for Fransk Guyana"} - } - "meta:French_Southern"{ - ls{"tidssone for De franske sørterritorier"} - } - "meta:GMT"{ - ls{"Greenwich middeltid"} - ss{"GMT"} - } - "meta:Galapagos"{ - ls{"tidssone for Galápagosøyene"} - } - "meta:Gambier"{ - ls{"tidssone for Gambier"} - } - "meta:Georgia"{ - ld{"georgisk sommertid"} - lg{"georgisk tid"} - ls{"georgisk normaltid"} - } - "meta:Gilbert_Islands"{ - ls{"tidssone for Gilbertøyene"} - } - "meta:Greenland_Eastern"{ - ld{"østgrønlandsk sommertid"} - lg{"østgrønlandsk tid"} - ls{"østgrønlandsk normaltid"} - } - "meta:Greenland_Western"{ - ld{"vestgrønlandsk sommertid"} - lg{"vestgrønlandsk tid"} - ls{"vestgrønlandsk normaltid"} - } - "meta:Guam"{ - ls{"Guam-tid"} - } - "meta:Gulf"{ - ls{"tidssone for Persiabukta"} - } - "meta:Guyana"{ - ls{"guyansk tid"} - } - "meta:Hawaii_Aleutian"{ - ld{"sommertid for Hawaii og Aleutene"} - lg{"tidssone for Hawaii og Aleutene"} - ls{"normaltid for Hawaii og Aleutene"} - sd{"HADT"} - sg{"HAT"} - ss{"HAST"} - } - "meta:Hong_Kong"{ - ld{"sommertid for Hongkong"} - lg{"tidssone for Hongkong"} - ls{"normaltid for Hongkong"} - } - "meta:Hovd"{ - ld{"sommertid for Khovd"} - 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{"østindonesisk tid"} - } - "meta:Indonesia_Western"{ - ls{"vestindonesisk tid"} - } - "meta:Iran"{ - ld{"iransk sommertid"} - lg{"iransk tid"} - ls{"iransk normaltid"} - } - "meta:Irkutsk"{ - ld{"sommertid for Irkutsk"} - lg{"tidssone for Irkutsk"} - ls{"normaltid for Irkutsk"} - } - "meta:Israel"{ - ld{"israelsk sommertid"} - lg{"israelsk tid"} - ls{"israelsk normaltid"} - } - "meta:Japan"{ - ld{"japansk sommertid"} - lg{"japansk tid"} - ls{"japansk normaltid"} - } - "meta:Kamchatka"{ - ld{"Russisk (Petropavlovsk-Kamtsjatskij) sommertid"} - lg{"Russisk (Petropavlovsk-Kamtsjatskij) tid"} - ls{"Russisk (Petropavlovsk-Kamtsjatskij) normaltid"} - } - "meta:Kazakhstan_Eastern"{ - ls{"østkasakhstansk tid"} - } - "meta:Kazakhstan_Western"{ - ls{"vestkasakhstansk tid"} - } - "meta:Korea"{ - ld{"koreansk sommertid"} - lg{"koreansk tid"} - ls{"koreansk normaltid"} - } - "meta:Kosrae"{ - ls{"tidssone for Kosrae"} - } - "meta:Krasnoyarsk"{ - ld{"sommertid for Krasnojarsk"} - lg{"tidssone for Krasnojarsk"} - ls{"normaltid for Krasnojarsk"} - } - "meta:Kyrgystan"{ - ls{"kirgisisk tid"} - } - "meta:Lanka"{ - ls{"Lanka-tid"} - } - "meta:Line_Islands"{ - ls{"tidssone for Linjeøyene"} - } - "meta:Lord_Howe"{ - ld{"sommertid for Lord Howe-øya"} - lg{"tidssone for Lord Howe-øya"} - ls{"normaltid for Lord Howe-øya"} - } - "meta:Macau"{ - ld{"Macau, sommertid"} - lg{"Macau-tid"} - ls{"Macau, standardtid"} - } - "meta:Macquarie"{ - ls{"tidssone for Macquarieøya"} - } - "meta:Magadan"{ - ld{"sommertid 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øyene"} - } - "meta:Marshall_Islands"{ - ls{"marshallesisk tid"} - } - "meta:Mauritius"{ - ld{"mauritisk sommertid"} - lg{"mauritisk tid"} - ls{"mauritisk normaltid"} - } - "meta:Mawson"{ - ls{"tidssone for Mawson"} - } - "meta:Mexico_Northwest"{ - ld{"sommertid for nordvestlige Mexico"} - lg{"tidssone for nordvestlige Mexico"} - ls{"normaltid for nordvestlige Mexico"} - } - "meta:Mexico_Pacific"{ - ld{"sommertid for den meksikanske Stillehavskysten"} - lg{"tidssone for den meksikanske Stillehavskysten"} - ls{"normaltid for den meksikanske Stillehavskysten"} - } - "meta:Mongolia"{ - ld{"sommertid for Ulan Bator"} - lg{"tidssone for Ulan Bator"} - ls{"normaltid for Ulan Bator"} - } - "meta:Moscow"{ - ld{"sommertid for Moskva"} - 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 sommertid"} - lg{"kaledonsk tid"} - ls{"kaledonsk normaltid"} - } - "meta:New_Zealand"{ - ld{"newzealandsk sommertid"} - lg{"newzealandsk tid"} - ls{"newzealandsk normaltid"} - } - "meta:Newfoundland"{ - ld{"sommertid for Newfoundland"} - lg{"tidssone for Newfoundland"} - ls{"normaltid for Newfoundland"} - } - "meta:Niue"{ - ls{"tidssone for Niue"} - } - "meta:Norfolk"{ - ld{"sommertid for Norfolkøya"} - lg{"tidssone for Norfolkøya"} - ls{"normaltid for Norfolkøya"} - } - "meta:Noronha"{ - ld{"sommertid for Fernando de Noronha"} - lg{"tidssone for Fernando de Noronha"} - ls{"normaltid for Fernando de Noronha"} - } - "meta:North_Mariana"{ - ls{"Nord-Marianene-tid"} - } - "meta:Novosibirsk"{ - ld{"sommertid for Novosibirsk"} - lg{"tidssone for Novosibirsk"} - ls{"normaltid for Novosibirsk"} - } - "meta:Omsk"{ - ld{"sommertid for Omsk"} - lg{"tidssone for Omsk"} - ls{"normaltid for Omsk"} - } - "meta:Pakistan"{ - ld{"pakistansk sommertid"} - lg{"pakistansk tid"} - ls{"pakistansk normaltid"} - } - "meta:Palau"{ - ls{"palauisk tid"} - } - "meta:Papua_New_Guinea"{ - ls{"papuansk tid"} - } - "meta:Paraguay"{ - ld{"paraguayansk sommertid"} - lg{"paraguayansk tid"} - ls{"paraguayansk normaltid"} - } - "meta:Peru"{ - ld{"peruansk sommertid"} - lg{"peruansk tid"} - ls{"peruansk normaltid"} - } - "meta:Philippines"{ - ld{"filippinsk sommertid"} - lg{"filippinsk tid"} - ls{"filippinsk normaltid"} - } - "meta:Phoenix_Islands"{ - ls{"tidssone for Phoenixøyene"} - } - "meta:Pierre_Miquelon"{ - ld{"sommertid for Saint-Pierre-et-Miquelon"} - 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:Qyzylorda"{ - ld{"Qyzylorda, sommertid"} - lg{"Qyzylorda-tid"} - ls{"Qyzylorda, standardtid"} - } - "meta:Reunion"{ - ls{"tidssone for Réunion"} - } - "meta:Rothera"{ - ls{"tidssone for Rothera"} - } - "meta:Sakhalin"{ - ld{"sommertid for Sakhalin"} - lg{"tidssone for Sakhalin"} - ls{"normaltid for Sakhalin"} - } - "meta:Samara"{ - ld{"Russisk (Samara) sommertid"} - lg{"Russisk (Samara) tid"} - ls{"Russisk (Samara) normaltid"} - } - "meta:Samoa"{ - ld{"samoansk sommertid"} - 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{"sommertid 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 sommertid"} - lg{"tongansk tid"} - ls{"tongansk normaltid"} - } - "meta:Truk"{ - ls{"tidssone for Chuukøyene"} - } - "meta:Turkmenistan"{ - ld{"turkmensk sommertid"} - lg{"turkmensk tid"} - ls{"turkmensk normaltid"} - } - "meta:Tuvalu"{ - ls{"tuvalsk tid"} - } - "meta:Uruguay"{ - ld{"uruguayansk sommertid"} - lg{"uruguayansk tid"} - ls{"uruguayansk normaltid"} - } - "meta:Uzbekistan"{ - ld{"usbekisk sommertid"} - lg{"usbekisk tid"} - ls{"usbekisk normaltid"} - } - "meta:Vanuatu"{ - ld{"vanuatisk sommertid"} - lg{"vanuatisk tid"} - ls{"vanuatisk normaltid"} - } - "meta:Venezuela"{ - ls{"venezuelansk tid"} - } - "meta:Vladivostok"{ - ld{"sommertid for Vladivostok"} - lg{"tidssone for Vladivostok"} - ls{"normaltid for Vladivostok"} - } - "meta:Volgograd"{ - ld{"sommertid for Volgograd"} - 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øyene"} - } - "meta:Yakutsk"{ - ld{"sommertid for Jakutsk"} - lg{"tidssone for Jakutsk"} - ls{"normaltid for Jakutsk"} - } - "meta:Yekaterinburg"{ - ld{"sommertid for Jekaterinburg"} - 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{"sommertid – {0}"} - regionFormatStandard{"normaltid – {0}"} - } + "%%ALIAS"{"no"} } diff --git a/icu4c/source/data/zone/nb_NO.txt b/icu4c/source/data/zone/nb_NO.txt index 15a33c3396f..2de7860c57e 100644 --- a/icu4c/source/data/zone/nb_NO.txt +++ b/icu4c/source/data/zone/nb_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 - */ nb_NO{ - ___{""} + "%%ALIAS"{"no_NO"} } diff --git a/icu4c/source/data/zone/nb_SJ.txt b/icu4c/source/data/zone/nb_SJ.txt new file mode 100644 index 00000000000..b1caa388a5d --- /dev/null +++ b/icu4c/source/data/zone/nb_SJ.txt @@ -0,0 +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 +nb_SJ{ + "%%ALIAS"{"no_SJ"} +} diff --git a/icu4c/source/data/zone/nn.txt b/icu4c/source/data/zone/nn.txt index 4cb9a290697..4c1fe9ef8e9 100644 --- a/icu4c/source/data/zone/nn.txt +++ b/icu4c/source/data/zone/nn.txt @@ -2,6 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml nn{ + %%Parent{"no"} zoneStrings{ "Africa:Abidjan"{ ec{"Abidjan"} diff --git a/icu4c/source/data/zone/no.txt b/icu4c/source/data/zone/no.txt index 474d0b21b0d..a98652a306c 100644 --- a/icu4c/source/data/zone/no.txt +++ b/icu4c/source/data/zone/no.txt @@ -2,5 +2,1981 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml no{ - "%%ALIAS"{"nb"} + 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øyene"} + } + "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{"Cuiabá"} + } + "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{"Mérida"} + } + "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:Santa_Isabel"{ + ec{"Santa Isabel"} + } + "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{"Aqtöbe"} + } + "Asia:Ashgabat"{ + ec{"Asjkhabad"} + } + "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{"Choybalsan"} + } + "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{"Hovd"} + } + "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{"Yangon"} + } + "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{"Asorene"} + } + "Atlantic:Bermuda"{ + ec{"Bermuda"} + } + "Atlantic:Canary"{ + ec{"Kanariøyene"} + } + "Atlantic:Cape_Verde"{ + ec{"Kapp Verde"} + } + "Atlantic:Faeroe"{ + ec{"Færøyene"} + } + "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{"ukjent 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 sommertid"} + } + "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 sommertid"} + } + "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øyene"} + } + "Indian:Comoro"{ + ec{"Komorene"} + } + "Indian:Kerguelen"{ + ec{"Kerguelen"} + } + "Indian:Mahe"{ + ec{"Mahé"} + } + "Indian:Maldives"{ + ec{"Maldivene"} + } + "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øyene"} + } + "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:Acre"{ + ld{"Acre sommertid"} + lg{"Acre-tid"} + ls{"Acre normaltid"} + } + "meta:Afghanistan"{ + ls{"afghansk tid"} + } + "meta:Africa_Central"{ + ls{"sentralafrikansk tid"} + } + "meta:Africa_Eastern"{ + ls{"østafrikansk tid"} + } + "meta:Africa_Southern"{ + ls{"sørafrikansk tid"} + } + "meta:Africa_Western"{ + ld{"vestafrikansk sommertid"} + lg{"vestafrikansk tid"} + ls{"vestafrikansk normaltid"} + } + "meta:Alaska"{ + ld{"alaskisk sommertid"} + lg{"alaskisk tid"} + ls{"alaskisk normaltid"} + sd{"AKDT"} + sg{"AKT"} + ss{"AKST"} + } + "meta:Almaty"{ + ld{"Almaty, sommertid"} + lg{"Almaty-tid"} + ls{"Almaty, standardtid"} + } + "meta:Amazon"{ + ld{"sommertid for Amazonas"} + lg{"tidssone for Amazonas"} + ls{"normaltid for Amazonas"} + } + "meta:America_Central"{ + ld{"sommertid for det sentrale Nord-Amerika"} + lg{"tidssone for det sentrale Nord-Amerika"} + ls{"normaltid for det sentrale Nord-Amerika"} + sd{"CDT"} + sg{"CT"} + ss{"CST"} + } + "meta:America_Eastern"{ + ld{"sommertid for den nordamerikanske østkysten"} + lg{"tidssone for den nordamerikanske østkysten"} + ls{"normaltid for den nordamerikanske østkysten"} + sd{"EDT"} + sg{"ET"} + ss{"EST"} + } + "meta:America_Mountain"{ + ld{"sommertid for Rocky Mountains (USA)"} + lg{"tidssone for Rocky Mountains (USA)"} + ls{"normaltid for Rocky Mountains (USA)"} + sd{"MDT"} + sg{"MT"} + ss{"MST"} + } + "meta:America_Pacific"{ + ld{"sommertid for den nordamerikanske Stillehavskysten"} + lg{"tidssone for den nordamerikanske Stillehavskysten"} + ls{"normaltid for den nordamerikanske Stillehavskysten"} + sd{"PDT"} + sg{"PT"} + ss{"PST"} + } + "meta:Anadyr"{ + ld{"Russisk (Anadyr) sommertid"} + lg{"Russisk (Anadyr) tid"} + ls{"Russisk (Anadyr) normaltid"} + } + "meta:Apia"{ + ld{"sommertid for Apia"} + lg{"tidssone for Apia"} + ls{"normaltid for Apia"} + } + "meta:Aqtau"{ + ld{"Aqtau, sommertid"} + lg{"Aqtau-tid"} + ls{"Aqtau, standardtid"} + } + "meta:Aqtobe"{ + ld{"Aqtobe, sommertid"} + lg{"Aqtobe-tid"} + ls{"Aqtobe, standardtid"} + } + "meta:Arabian"{ + ld{"arabisk sommertid"} + lg{"arabisk tid"} + ls{"arabisk standardtid"} + } + "meta:Argentina"{ + ld{"argentinsk sommertid"} + lg{"argentinsk tid"} + ls{"argentinsk normaltid"} + } + "meta:Argentina_Western"{ + ld{"vestargentinsk sommertid"} + lg{"vestargentinsk tid"} + ls{"vestargentinsk normaltid"} + } + "meta:Armenia"{ + ld{"armensk sommertid"} + lg{"armensk tid"} + ls{"armensk normaltid"} + } + "meta:Atlantic"{ + ld{"sommertid for den nordamerikanske atlanterhavskysten"} + lg{"tidssone for den nordamerikanske atlanterhavskysten"} + ls{"normaltid for den nordamerikanske atlanterhavskysten"} + sd{"ADT"} + sg{"AT"} + ss{"AST"} + } + "meta:Australia_Central"{ + ld{"sentralaustralsk sommertid"} + lg{"sentralaustralsk tid"} + ls{"sentralaustralsk normaltid"} + } + "meta:Australia_CentralWestern"{ + ld{"vest-sentralaustralsk sommertid"} + lg{"vest-sentralaustralsk tid"} + ls{"vest-sentralaustralsk normaltid"} + } + "meta:Australia_Eastern"{ + ld{"østaustralsk sommertid"} + lg{"østaustralsk tid"} + ls{"østaustralsk normaltid"} + } + "meta:Australia_Western"{ + ld{"vestaustralsk sommertid"} + lg{"vestaustralsk tid"} + ls{"vestaustralsk normaltid"} + } + "meta:Azerbaijan"{ + ld{"aserbajdsjansk sommertid"} + lg{"aserbajdsjansk tid"} + ls{"aserbajdsjansk normaltid"} + } + "meta:Azores"{ + ld{"asorisk sommertid"} + lg{"asorisk tid"} + ls{"asorisk normaltid"} + } + "meta:Bangladesh"{ + ld{"bangladeshisk sommertid"} + lg{"bangladeshisk tid"} + ls{"bangladeshisk normaltid"} + } + "meta:Bhutan"{ + ls{"bhutansk tid"} + } + "meta:Bolivia"{ + ls{"boliviansk tid"} + } + "meta:Brasilia"{ + ld{"sommertid for Brasilia"} + lg{"tidssone for Brasilia"} + ls{"normaltid for Brasilia"} + } + "meta:Brunei"{ + ls{"tidssone for Brunei Darussalam"} + } + "meta:Cape_Verde"{ + ld{"kappverdisk sommertid"} + lg{"kappverdisk tid"} + ls{"kappverdisk normaltid"} + } + "meta:Casey"{ + ls{"Casey-tid"} + } + "meta:Chamorro"{ + ls{"tidssone for Chamorro"} + } + "meta:Chatham"{ + ld{"sommertid for Chatham"} + lg{"tidssone for Chatham"} + ls{"normaltid for Chatham"} + } + "meta:Chile"{ + ld{"chilensk sommertid"} + lg{"chilensk tid"} + ls{"chilensk normaltid"} + } + "meta:China"{ + ld{"kinesisk sommertid"} + lg{"kinesisk tid"} + ls{"kinesisk normaltid"} + } + "meta:Choibalsan"{ + ld{"sommertid for Tsjojbalsan"} + lg{"tidssone for Tsjojbalsan"} + ls{"normaltid for Tsjojbalsan"} + } + "meta:Christmas"{ + ls{"tidssone for Christmasøya"} + } + "meta:Cocos"{ + ls{"tidssone for Kokosøyene"} + } + "meta:Colombia"{ + ld{"colombiansk sommertid"} + lg{"colombiansk tid"} + ls{"colombiansk normaltid"} + } + "meta:Cook"{ + ld{"halv sommertid for Cookøyene"} + lg{"tidssone for Cookøyene"} + ls{"normaltid for Cookøyene"} + } + "meta:Cuba"{ + ld{"cubansk sommertid"} + lg{"cubansk tid"} + ls{"cubansk normaltid"} + } + "meta:Davis"{ + ls{"tidssone for Davis"} + } + "meta:DumontDUrville"{ + ls{"tidssone for Dumont d’Urville"} + } + "meta:East_Timor"{ + ls{"østtimoresisk tid"} + } + "meta:Easter"{ + ld{"sommertid for Påskeøya"} + lg{"tidssone for Påskeøya"} + ls{"normaltid for Påskeøya"} + } + "meta:Ecuador"{ + ls{"ecuadoriansk tid"} + } + "meta:Europe_Central"{ + ld{"sentraleuropeisk sommertid"} + lg{"sentraleuropeisk tid"} + ls{"sentraleuropeisk normaltid"} + sd{"CEST"} + sg{"CET"} + ss{"CET"} + } + "meta:Europe_Eastern"{ + ld{"østeuropeisk sommertid"} + lg{"østeuropeisk tid"} + ls{"østeuropeisk normaltid"} + sd{"EEST"} + sg{"EET"} + ss{"EET"} + } + "meta:Europe_Further_Eastern"{ + ls{"fjern-østeuropeisk tid"} + } + "meta:Europe_Western"{ + ld{"vesteuropeisk sommertid"} + lg{"vesteuropeisk tid"} + ls{"vesteuropeisk normaltid"} + sd{"WEST"} + sg{"WET"} + ss{"WET"} + } + "meta:Falkland"{ + ld{"sommertid for Falklandsøyene"} + lg{"tidssone for Falklandsøyene"} + ls{"normaltid for Falklandsøyene"} + } + "meta:Fiji"{ + ld{"fijiansk sommertid"} + lg{"fijiansk tid"} + ls{"fijiansk normaltid"} + } + "meta:French_Guiana"{ + ls{"tidssone for Fransk Guyana"} + } + "meta:French_Southern"{ + ls{"tidssone for De franske sørterritorier"} + } + "meta:GMT"{ + ls{"Greenwich middeltid"} + ss{"GMT"} + } + "meta:Galapagos"{ + ls{"tidssone for Galápagosøyene"} + } + "meta:Gambier"{ + ls{"tidssone for Gambier"} + } + "meta:Georgia"{ + ld{"georgisk sommertid"} + lg{"georgisk tid"} + ls{"georgisk normaltid"} + } + "meta:Gilbert_Islands"{ + ls{"tidssone for Gilbertøyene"} + } + "meta:Greenland_Eastern"{ + ld{"østgrønlandsk sommertid"} + lg{"østgrønlandsk tid"} + ls{"østgrønlandsk normaltid"} + } + "meta:Greenland_Western"{ + ld{"vestgrønlandsk sommertid"} + lg{"vestgrønlandsk tid"} + ls{"vestgrønlandsk normaltid"} + } + "meta:Guam"{ + ls{"Guam-tid"} + } + "meta:Gulf"{ + ls{"tidssone for Persiabukta"} + } + "meta:Guyana"{ + ls{"guyansk tid"} + } + "meta:Hawaii_Aleutian"{ + ld{"sommertid for Hawaii og Aleutene"} + lg{"tidssone for Hawaii og Aleutene"} + ls{"normaltid for Hawaii og Aleutene"} + sd{"HADT"} + sg{"HAT"} + ss{"HAST"} + } + "meta:Hong_Kong"{ + ld{"sommertid for Hongkong"} + lg{"tidssone for Hongkong"} + ls{"normaltid for Hongkong"} + } + "meta:Hovd"{ + ld{"sommertid for Khovd"} + 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{"østindonesisk tid"} + } + "meta:Indonesia_Western"{ + ls{"vestindonesisk tid"} + } + "meta:Iran"{ + ld{"iransk sommertid"} + lg{"iransk tid"} + ls{"iransk normaltid"} + } + "meta:Irkutsk"{ + ld{"sommertid for Irkutsk"} + lg{"tidssone for Irkutsk"} + ls{"normaltid for Irkutsk"} + } + "meta:Israel"{ + ld{"israelsk sommertid"} + lg{"israelsk tid"} + ls{"israelsk normaltid"} + } + "meta:Japan"{ + ld{"japansk sommertid"} + lg{"japansk tid"} + ls{"japansk normaltid"} + } + "meta:Kamchatka"{ + ld{"Russisk (Petropavlovsk-Kamtsjatskij) sommertid"} + lg{"Russisk (Petropavlovsk-Kamtsjatskij) tid"} + ls{"Russisk (Petropavlovsk-Kamtsjatskij) normaltid"} + } + "meta:Kazakhstan_Eastern"{ + ls{"østkasakhstansk tid"} + } + "meta:Kazakhstan_Western"{ + ls{"vestkasakhstansk tid"} + } + "meta:Korea"{ + ld{"koreansk sommertid"} + lg{"koreansk tid"} + ls{"koreansk normaltid"} + } + "meta:Kosrae"{ + ls{"tidssone for Kosrae"} + } + "meta:Krasnoyarsk"{ + ld{"sommertid for Krasnojarsk"} + lg{"tidssone for Krasnojarsk"} + ls{"normaltid for Krasnojarsk"} + } + "meta:Kyrgystan"{ + ls{"kirgisisk tid"} + } + "meta:Lanka"{ + ls{"Lanka-tid"} + } + "meta:Line_Islands"{ + ls{"tidssone for Linjeøyene"} + } + "meta:Lord_Howe"{ + ld{"sommertid for Lord Howe-øya"} + lg{"tidssone for Lord Howe-øya"} + ls{"normaltid for Lord Howe-øya"} + } + "meta:Macau"{ + ld{"Macau, sommertid"} + lg{"Macau-tid"} + ls{"Macau, standardtid"} + } + "meta:Macquarie"{ + ls{"tidssone for Macquarieøya"} + } + "meta:Magadan"{ + ld{"sommertid 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øyene"} + } + "meta:Marshall_Islands"{ + ls{"marshallesisk tid"} + } + "meta:Mauritius"{ + ld{"mauritisk sommertid"} + lg{"mauritisk tid"} + ls{"mauritisk normaltid"} + } + "meta:Mawson"{ + ls{"tidssone for Mawson"} + } + "meta:Mexico_Northwest"{ + ld{"sommertid for nordvestlige Mexico"} + lg{"tidssone for nordvestlige Mexico"} + ls{"normaltid for nordvestlige Mexico"} + } + "meta:Mexico_Pacific"{ + ld{"sommertid for den meksikanske Stillehavskysten"} + lg{"tidssone for den meksikanske Stillehavskysten"} + ls{"normaltid for den meksikanske Stillehavskysten"} + } + "meta:Mongolia"{ + ld{"sommertid for Ulan Bator"} + lg{"tidssone for Ulan Bator"} + ls{"normaltid for Ulan Bator"} + } + "meta:Moscow"{ + ld{"sommertid for Moskva"} + 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 sommertid"} + lg{"kaledonsk tid"} + ls{"kaledonsk normaltid"} + } + "meta:New_Zealand"{ + ld{"newzealandsk sommertid"} + lg{"newzealandsk tid"} + ls{"newzealandsk normaltid"} + } + "meta:Newfoundland"{ + ld{"sommertid for Newfoundland"} + lg{"tidssone for Newfoundland"} + ls{"normaltid for Newfoundland"} + } + "meta:Niue"{ + ls{"tidssone for Niue"} + } + "meta:Norfolk"{ + ld{"sommertid for Norfolkøya"} + lg{"tidssone for Norfolkøya"} + ls{"normaltid for Norfolkøya"} + } + "meta:Noronha"{ + ld{"sommertid for Fernando de Noronha"} + lg{"tidssone for Fernando de Noronha"} + ls{"normaltid for Fernando de Noronha"} + } + "meta:North_Mariana"{ + ls{"Nord-Marianene-tid"} + } + "meta:Novosibirsk"{ + ld{"sommertid for Novosibirsk"} + lg{"tidssone for Novosibirsk"} + ls{"normaltid for Novosibirsk"} + } + "meta:Omsk"{ + ld{"sommertid for Omsk"} + lg{"tidssone for Omsk"} + ls{"normaltid for Omsk"} + } + "meta:Pakistan"{ + ld{"pakistansk sommertid"} + lg{"pakistansk tid"} + ls{"pakistansk normaltid"} + } + "meta:Palau"{ + ls{"palauisk tid"} + } + "meta:Papua_New_Guinea"{ + ls{"papuansk tid"} + } + "meta:Paraguay"{ + ld{"paraguayansk sommertid"} + lg{"paraguayansk tid"} + ls{"paraguayansk normaltid"} + } + "meta:Peru"{ + ld{"peruansk sommertid"} + lg{"peruansk tid"} + ls{"peruansk normaltid"} + } + "meta:Philippines"{ + ld{"filippinsk sommertid"} + lg{"filippinsk tid"} + ls{"filippinsk normaltid"} + } + "meta:Phoenix_Islands"{ + ls{"tidssone for Phoenixøyene"} + } + "meta:Pierre_Miquelon"{ + ld{"sommertid for Saint-Pierre-et-Miquelon"} + 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:Qyzylorda"{ + ld{"Qyzylorda, sommertid"} + lg{"Qyzylorda-tid"} + ls{"Qyzylorda, standardtid"} + } + "meta:Reunion"{ + ls{"tidssone for Réunion"} + } + "meta:Rothera"{ + ls{"tidssone for Rothera"} + } + "meta:Sakhalin"{ + ld{"sommertid for Sakhalin"} + lg{"tidssone for Sakhalin"} + ls{"normaltid for Sakhalin"} + } + "meta:Samara"{ + ld{"Russisk (Samara) sommertid"} + lg{"Russisk (Samara) tid"} + ls{"Russisk (Samara) normaltid"} + } + "meta:Samoa"{ + ld{"samoansk sommertid"} + 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{"sommertid 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 sommertid"} + lg{"tongansk tid"} + ls{"tongansk normaltid"} + } + "meta:Truk"{ + ls{"tidssone for Chuukøyene"} + } + "meta:Turkmenistan"{ + ld{"turkmensk sommertid"} + lg{"turkmensk tid"} + ls{"turkmensk normaltid"} + } + "meta:Tuvalu"{ + ls{"tuvalsk tid"} + } + "meta:Uruguay"{ + ld{"uruguayansk sommertid"} + lg{"uruguayansk tid"} + ls{"uruguayansk normaltid"} + } + "meta:Uzbekistan"{ + ld{"usbekisk sommertid"} + lg{"usbekisk tid"} + ls{"usbekisk normaltid"} + } + "meta:Vanuatu"{ + ld{"vanuatisk sommertid"} + lg{"vanuatisk tid"} + ls{"vanuatisk normaltid"} + } + "meta:Venezuela"{ + ls{"venezuelansk tid"} + } + "meta:Vladivostok"{ + ld{"sommertid for Vladivostok"} + lg{"tidssone for Vladivostok"} + ls{"normaltid for Vladivostok"} + } + "meta:Volgograd"{ + ld{"sommertid for Volgograd"} + 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øyene"} + } + "meta:Yakutsk"{ + ld{"sommertid for Jakutsk"} + lg{"tidssone for Jakutsk"} + ls{"normaltid for Jakutsk"} + } + "meta:Yekaterinburg"{ + ld{"sommertid for Jekaterinburg"} + 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{"sommertid – {0}"} + regionFormatStandard{"normaltid – {0}"} + } } diff --git a/icu4c/source/data/zone/no_NO.txt b/icu4c/source/data/zone/no_NO.txt index 5d7f8599c0e..9de87e3d165 100644 --- a/icu4c/source/data/zone/no_NO.txt +++ b/icu4c/source/data/zone/no_NO.txt @@ -1,6 +1,9 @@ // © 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"{"nb_NO"} + ___{""} } diff --git a/icu4c/source/data/zone/no_SJ.txt b/icu4c/source/data/zone/no_SJ.txt new file mode 100644 index 00000000000..42b03fcf8d0 --- /dev/null +++ b/icu4c/source/data/zone/no_SJ.txt @@ -0,0 +1,9 @@ +// © 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/root.txt b/icu4c/source/data/zone/root.txt index d7d93008ef1..d8d0784b39a 100644 --- a/icu4c/source/data/zone/root.txt +++ b/icu4c/source/data/zone/root.txt @@ -2,7 +2,7 @@ // License & terms of use: http://www.unicode.org/copyright.html // Generated using tools/cldr/cldr-to-icu/build-icu-data.xml root{ - Version{"38"} + Version{"39"} zoneStrings{ "Africa:Asmera"{ ec{"Asmara"} diff --git a/icu4c/source/data/zone/zh.txt b/icu4c/source/data/zone/zh.txt index ca469f5ee30..5188a0f3b3d 100644 --- a/icu4c/source/data/zone/zh.txt +++ b/icu4c/source/data/zone/zh.txt @@ -1604,7 +1604,7 @@ zh{ ls{"印度洋时间"} } "meta:Indochina"{ - ls{"印度支那时间"} + ls{"中南半岛时间"} } "meta:Indonesia_Central"{ ls{"印度尼西亚中部时间"} diff --git a/icu4c/source/data/zone/zh_Hant.txt b/icu4c/source/data/zone/zh_Hant.txt index f0aa4d898f0..130cbaee81d 100644 --- a/icu4c/source/data/zone/zh_Hant.txt +++ b/icu4c/source/data/zone/zh_Hant.txt @@ -1627,7 +1627,7 @@ zh_Hant{ ls{"印度洋時間"} } "meta:Indochina"{ - ls{"印度支那時間"} + ls{"中南半島時間"} } "meta:Indonesia_Central"{ ls{"印尼中部時間"} diff --git a/icu4c/source/data/zone/zh_Hant_HK.txt b/icu4c/source/data/zone/zh_Hant_HK.txt index fe44f288cc6..2fd976fac7b 100644 --- a/icu4c/source/data/zone/zh_Hant_HK.txt +++ b/icu4c/source/data/zone/zh_Hant_HK.txt @@ -566,9 +566,6 @@ zh_Hant_HK{ "meta:India"{ ls{"印度時間"} } - "meta:Indochina"{ - ls{"中南半島時間"} - } "meta:Irkutsk"{ ld{"伊爾庫茨克夏令時間"} lg{"伊爾庫茨克時間"} diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp index 5e55fde4ca1..f57495e65a1 100644 --- a/icu4c/source/i18n/measunit.cpp +++ b/icu4c/source/i18n/measunit.cpp @@ -41,26 +41,26 @@ static const int32_t gOffsets[] = { 2, 7, 17, - 25, - 29, - 328, - 339, - 355, - 359, - 368, - 370, - 374, - 382, - 404, - 408, - 423, + 26, + 30, + 329, + 340, + 356, + 360, + 369, + 371, + 375, + 383, + 405, + 409, 424, - 430, - 440, - 444, - 448, - 450, - 484 + 425, + 431, + 441, + 445, + 449, + 451, + 485 }; static const int32_t kCurrencyOffset = 5; @@ -112,6 +112,7 @@ static const char * const gSubTypes[] = { "square-mile", "square-yard", "karat", + "milligram-ofglucose-per-deciliter", "milligram-per-deciliter", "millimole-per-liter", "mole", @@ -728,62 +729,70 @@ MeasureUnit MeasureUnit::getKarat() { return MeasureUnit(3, 0); } -MeasureUnit *MeasureUnit::createMilligramPerDeciliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilligramOfglucosePerDeciliter(UErrorCode &status) { return MeasureUnit::create(3, 1, status); } -MeasureUnit MeasureUnit::getMilligramPerDeciliter() { +MeasureUnit MeasureUnit::getMilligramOfglucosePerDeciliter() { return MeasureUnit(3, 1); } -MeasureUnit *MeasureUnit::createMillimolePerLiter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilligramPerDeciliter(UErrorCode &status) { return MeasureUnit::create(3, 2, status); } -MeasureUnit MeasureUnit::getMillimolePerLiter() { +MeasureUnit MeasureUnit::getMilligramPerDeciliter() { return MeasureUnit(3, 2); } -MeasureUnit *MeasureUnit::createMole(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMillimolePerLiter(UErrorCode &status) { return MeasureUnit::create(3, 3, status); } -MeasureUnit MeasureUnit::getMole() { +MeasureUnit MeasureUnit::getMillimolePerLiter() { return MeasureUnit(3, 3); } -MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMole(UErrorCode &status) { return MeasureUnit::create(3, 4, status); } -MeasureUnit MeasureUnit::getPercent() { +MeasureUnit MeasureUnit::getMole() { return MeasureUnit(3, 4); } -MeasureUnit *MeasureUnit::createPermille(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPercent(UErrorCode &status) { return MeasureUnit::create(3, 5, status); } -MeasureUnit MeasureUnit::getPermille() { +MeasureUnit MeasureUnit::getPercent() { return MeasureUnit(3, 5); } -MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPermille(UErrorCode &status) { return MeasureUnit::create(3, 6, status); } -MeasureUnit MeasureUnit::getPartPerMillion() { +MeasureUnit MeasureUnit::getPermille() { return MeasureUnit(3, 6); } -MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) { return MeasureUnit::create(3, 7, status); } -MeasureUnit MeasureUnit::getPermyriad() { +MeasureUnit MeasureUnit::getPartPerMillion() { return MeasureUnit(3, 7); } +MeasureUnit *MeasureUnit::createPermyriad(UErrorCode &status) { + return MeasureUnit::create(3, 8, status); +} + +MeasureUnit MeasureUnit::getPermyriad() { + return MeasureUnit(3, 8); +} + MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) { return MeasureUnit::create(4, 0, status); } diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h index 4104f40d1e1..cedf6ea45ea 100644 --- a/icu4c/source/i18n/unicode/measunit.h +++ b/icu4c/source/i18n/unicode/measunit.h @@ -668,7 +668,7 @@ class U_I18N_API MeasureUnit: public UObject { // the "End generated createXXX methods" comment is auto generated code // and must not be edited manually. For instructions on how to correctly // update this code, refer to: -// http://site.icu-project.org/design/formatting/measureformat/updating-measure-unit +// docs/processes/release/tasks/updating-measure-unit.md // // Start generated createXXX methods @@ -960,6 +960,24 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit getKarat(); +#ifndef U_HIDE_DRAFT_API + /** + * Returns by pointer, unit of concentr: milligram-ofglucose-per-deciliter. + * Caller owns returned value and must free it. + * Also see {@link #getMilligramOfglucosePerDeciliter()}. + * @param status ICU error code. + * @draft ICU 69 + */ + static MeasureUnit *createMilligramOfglucosePerDeciliter(UErrorCode &status); + + /** + * Returns by value, unit of concentr: milligram-ofglucose-per-deciliter. + * Also see {@link #createMilligramOfglucosePerDeciliter()}. + * @draft ICU 69 + */ + static MeasureUnit getMilligramOfglucosePerDeciliter(); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns by pointer, unit of concentr: milligram-per-deciliter. * Caller owns returned value and must free it. diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index e50ccb3cd1f..15dd96edea8 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -485,7 +485,8 @@ 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"))) { + 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"))) { 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 b74d5a05c5a..b7407eca3a4 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -4108,6 +4108,10 @@ const char* const full_data[][3] = { "nn", "nn_Latn_NO", "nn" + }, { + "no", + "no_Latn_NO", + "no" }, { "nr", "nr_Latn_ZA", @@ -4938,8 +4942,8 @@ const char* const full_data[][3] = { "nl" }, { "und_NO", - "nb_Latn_NO", - "nb" + "no_Latn_NO", + "no" }, { "und_NP", "ne_Deva_NP", @@ -5054,8 +5058,8 @@ const char* const full_data[][3] = { "sl" }, { "und_SJ", - "nb_Latn_SJ", - "nb_SJ" + "no_Latn_SJ", + "no_SJ" }, { "und_SK", "sk_Latn_SK", diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 007d8e18da0..58ba75c8039 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", - "nb_NO", - "nb", + "no_NO", + "no", "nn_NO", "nn", - "nb_NO", - "nb" + "no_NO", + "no" }; static void checkStatus(int32_t line, UErrorCode expected, UErrorCode status) { @@ -2181,7 +2181,7 @@ static void TestFallback() UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err); UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err); const UChar* version = NULL; - static const UChar versionStr[] = u"38"; // 38 in nn_NO or in a parent bundle/root + static const UChar versionStr[] = u"39"; // 39 in nn_NO or in a parent bundle/root if(U_FAILURE(err)) { log_data_err("Expected success when trying to test no_NO_NY aliased to nn_NO for Version " diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp index da61e3ba9cf..f939c38e36f 100644 --- a/icu4c/source/test/intltest/dtifmtts.cpp +++ b/icu4c/source/test/intltest/dtifmtts.cpp @@ -835,7 +835,7 @@ void DateIntervalFormatTest::testFormat() { "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "MMMMy", "2007\\u5e7410\\u6708\\u81f311\\u6708", - "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "2007/10/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", + "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", @@ -864,9 +864,9 @@ void DateIntervalFormatTest::testFormat() { "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "MMM", "11\\u6708", // (fixed expected result per ticket:6626: and others) - "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "2007/11/10GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20GMT-8 \\u4e0a\\u534810:10", + "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10", - "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "2007/11/10\\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20\\u4e0a\\u534810\\u65f6", + "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6", "zh", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket:6626:) diff --git a/icu4c/source/test/intltest/itrbnf.cpp b/icu4c/source/test/intltest/itrbnf.cpp index efddaa76606..d5487cc6ae5 100644 --- a/icu4c/source/test/intltest/itrbnf.cpp +++ b/icu4c/source/test/intltest/itrbnf.cpp @@ -1522,8 +1522,8 @@ IntlTestRBNF::TestPortugueseSpellout() { "1,000", "mil" }, { "2,000", "dois mil" }, { "3,004", "tr\\u00EAs mil e quatro" }, - { "4,567", "quatro mil e quinhentos e sessenta e sete" }, - { "15,943", "quinze mil e novecentos e quarenta e tr\\u00EAs" }, + { "4,567", "quatro mil quinhentos e sessenta e sete" }, + { "15,943", "quinze mil novecentos e quarenta e tr\\u00EAs" }, { "-36", "menos trinta e seis" }, { "234.567", "duzentos e trinta e quatro v\\u00EDrgula cinco seis sete" }, { NULL, NULL} diff --git a/icu4c/source/test/intltest/localematchertest.cpp b/icu4c/source/test/intltest/localematchertest.cpp index 664f300e013..a2fc1e42afe 100644 --- a/icu4c/source/test/intltest/localematchertest.cpp +++ b/icu4c/source/test/intltest/localematchertest.cpp @@ -437,8 +437,8 @@ void LocaleMatcherTest::testMatch() { double matchEnHantTw = matcher.internalMatch(en_Hant_TW, zh_Hant, errorCode); assertTrue("zh_Hant should be closer to und_TW than to en_Hant_TW", matchEnHantTw < matchZhHant); - assertTrue("zh should be closer to und_TW than to en_Hant_TW", - matchEnHantTw < matchZh); + assertTrue("zh should not match und_TW or en_Hant_TW", + matchZh == 0.0 && matchEnHantTw == 0.0); // with changes in CLDR-1435 } void LocaleMatcherTest::testResolvedLocale() { diff --git a/icu4c/source/test/intltest/locnmtst.cpp b/icu4c/source/test/intltest/locnmtst.cpp index 61baca2e463..16fab2fba16 100644 --- a/icu4c/source/test/intltest/locnmtst.cpp +++ b/icu4c/source/test/intltest/locnmtst.cpp @@ -408,7 +408,7 @@ void LocaleDisplayNamesTest::TestRootEtc() { UnicodeString temp; LocaleDisplayNames *ldn = LocaleDisplayNames::createInstance(Locale::getUS()); const char *locname = "@collation=phonebook"; - const char *target = "Root (Phonebook Sort Order)"; + const char *target = "root (Phonebook Sort Order)"; ldn->localeDisplayName(locname, temp); test_assert_equal(target, temp); diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 36b37287bc0..42677564889 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -2052,6 +2052,10 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "nn", "nn_Latn_NO", "nn" + }, { + "no", + "no_Latn_NO", + "no" }, { "nr", "nr_Latn_ZA", @@ -2870,8 +2874,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "nl" }, { "und_NO", - "nb_Latn_NO", - "nb" + "no_Latn_NO", + "no" }, { "und_NP", "ne_Deva_NP", @@ -2982,8 +2986,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "sl" }, { "und_SJ", - "nb_Latn_SJ", - "nb_SJ" + "no_Latn_SJ", + "no_SJ" }, { "und_SK", "sk_Latn_SK", @@ -4736,15 +4740,17 @@ void LocaleTest::TestCanonicalization(void) { "zh_CN_CA@collation=pinyin", "zh_CN_CA@collation=pinyin", "zh_CN_CA@collation=pinyin" }, { "en_US_POSIX", "en_US_POSIX", "en_US_POSIX" }, { "hy_AM_REVISED", "hy_AM_REVISED", "hy_AM_REVISED" }, - { "no_NO_NY", "no_NO_NY", "nb_NO_NY" /* not: "nn_NO" [alan ICU3.0] */ }, - { "no@ny", "no@ny", "nb__NY" /* not: "nn" [alan ICU3.0] */ }, /* POSIX ID */ - { "no-no.utf32@B", "no_NO.utf32@B", "nb_NO_B" /* not: "nb_NO_B" [alan ICU3.0] */ }, /* POSIX ID */ + { "no_NO_NY", "no_NO_NY", "no_NO_NY" /* not: "nn_NO" [alan ICU3.0] */ }, + { "no@ny", "no@ny", "no__NY" /* not: "nn" [alan ICU3.0] */ }, /* POSIX ID */ + { "no-no.utf32@B", "no_NO.utf32@B", "no_NO_B" }, /* POSIX ID */ { "qz-qz@Euro", "qz_QZ@Euro", "qz_QZ_EURO" }, /* qz-qz uses private use iso codes */ // NOTE: uloc_getName() works on en-BOONT, but Locale() parser considers it BOGUS // TODO: unify this behavior { "en-BOONT", "en__BOONT", "en__BOONT" }, /* registered name */ { "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" }, /* posix behavior that used to be performed by getName */ { "mr.utf8", "mr.utf8", "mr" }, @@ -4752,7 +4758,7 @@ void LocaleTest::TestCanonicalization(void) { "x-piglatin_ML.MBE", "x-piglatin_ML.MBE", "x-piglatin_ML" }, { "i-cherokee_US.utf7", "i-cherokee_US.utf7", "i-cherokee_US" }, { "x-filfli_MT_FILFLA.gb-18030", "x-filfli_MT_FILFLA.gb-18030", "x-filfli_MT_FILFLA" }, - { "no-no-ny.utf8@B", "no_NO_NY.utf8@B", "nb_NO_B_NY" /* not: "nn_NO" [alan ICU3.0] */ }, /* @ ignored unless variant is empty */ + { "no-no-ny.utf8@B", "no_NO_NY.utf8@B", "no_NO_B_NY" /* not: "nn_NO" [alan ICU3.0] */ }, /* @ ignored unless variant is empty */ /* fleshing out canonicalization */ /* trim space and sort keywords, ';' is separator so not present at end in canonical form */ @@ -4764,7 +4770,7 @@ void LocaleTest::TestCanonicalization(void) "en_Hant_IL_VALLEY_GIRL@calendar=Japanese;currency=EUR", "en_Hant_IL_GIRL_VALLEY@calendar=Japanese;currency=EUR" }, /* norwegian is just too weird, if we handle things in their full generality */ - { "no-Hant-GB_NY@currency=$$$", "no_Hant_GB_NY@currency=$$$", "nb_Hant_GB_NY@currency=$$$" /* not: "nn_Hant_GB@currency=$$$" [alan ICU3.0] */ }, + { "no-Hant-GB_NY@currency=$$$", "no_Hant_GB_NY@currency=$$$", "no_Hant_GB_NY@currency=$$$" /* not: "nn_Hant_GB@currency=$$$" [alan ICU3.0] */ }, /* test cases reflecting internal resource bundle usage */ { "root@kw=foo", "root@kw=foo", "root@kw=foo" }, @@ -4847,12 +4853,12 @@ void LocaleTest::TestCanonicalize(void) const char *canonicalID; /* expected canonicalize() result */ } testCases[] = { // language _ variant -> language - { "no-BOKMAL", "nb" }, + { "no-BOKMAL", "no" }, // also test with script, country and extensions - { "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-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-NYNORSK", "nn" }, { "no-Cyrl-ID-NYNORSK-u-ca-japanese", "nn-Cyrl-ID-u-ca-japanese" }, { "aa-SAAHO", "ssy" }, @@ -4959,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-nb-latn" }, + { "und-t-no-latn-BOKMAL", "und-t-no-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/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 3f429cd3fab..c9f6b4261d2 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -57,6 +57,7 @@ private: void TestCompatible64(); void TestCompatible65(); void TestCompatible68(); + void TestCompatible69(); void TestGetAvailable(); void TestExamplesInDocs(); void TestFormatPeriodEn(); @@ -189,6 +190,7 @@ void MeasureFormatTest::runIndexedTest( TESTCASE_AUTO(TestCompatible64); TESTCASE_AUTO(TestCompatible65); TESTCASE_AUTO(TestCompatible68); + TESTCASE_AUTO(TestCompatible69); TESTCASE_AUTO(TestGetAvailable); TESTCASE_AUTO(TestExamplesInDocs); TESTCASE_AUTO(TestFormatPeriodEn); @@ -2302,6 +2304,383 @@ void MeasureFormatTest::TestCompatible68() { assertSuccess("", status); } +void MeasureFormatTest::TestCompatible69() { + UErrorCode status = U_ZERO_ERROR; + LocalPointer measureUnit; + MeasureUnit measureUnitValue; + measureUnit.adoptInstead(MeasureUnit::createGForce(status)); + measureUnitValue = MeasureUnit::getGForce(); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecondSquared(status)); + measureUnitValue = MeasureUnit::getMeterPerSecondSquared(); + measureUnit.adoptInstead(MeasureUnit::createArcMinute(status)); + measureUnitValue = MeasureUnit::getArcMinute(); + measureUnit.adoptInstead(MeasureUnit::createArcSecond(status)); + measureUnitValue = MeasureUnit::getArcSecond(); + measureUnit.adoptInstead(MeasureUnit::createDegree(status)); + measureUnitValue = MeasureUnit::getDegree(); + measureUnit.adoptInstead(MeasureUnit::createRadian(status)); + measureUnitValue = MeasureUnit::getRadian(); + measureUnit.adoptInstead(MeasureUnit::createRevolutionAngle(status)); + measureUnitValue = MeasureUnit::getRevolutionAngle(); + measureUnit.adoptInstead(MeasureUnit::createAcre(status)); + measureUnitValue = MeasureUnit::getAcre(); + measureUnit.adoptInstead(MeasureUnit::createDunam(status)); + measureUnitValue = MeasureUnit::getDunam(); + measureUnit.adoptInstead(MeasureUnit::createHectare(status)); + measureUnitValue = MeasureUnit::getHectare(); + measureUnit.adoptInstead(MeasureUnit::createSquareCentimeter(status)); + measureUnitValue = MeasureUnit::getSquareCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createSquareFoot(status)); + measureUnitValue = MeasureUnit::getSquareFoot(); + measureUnit.adoptInstead(MeasureUnit::createSquareInch(status)); + measureUnitValue = MeasureUnit::getSquareInch(); + measureUnit.adoptInstead(MeasureUnit::createSquareKilometer(status)); + measureUnitValue = MeasureUnit::getSquareKilometer(); + measureUnit.adoptInstead(MeasureUnit::createSquareMeter(status)); + measureUnitValue = MeasureUnit::getSquareMeter(); + measureUnit.adoptInstead(MeasureUnit::createSquareMile(status)); + measureUnitValue = MeasureUnit::getSquareMile(); + measureUnit.adoptInstead(MeasureUnit::createSquareYard(status)); + measureUnitValue = MeasureUnit::getSquareYard(); + measureUnit.adoptInstead(MeasureUnit::createKarat(status)); + measureUnitValue = MeasureUnit::getKarat(); + measureUnit.adoptInstead(MeasureUnit::createMilligramOfglucosePerDeciliter(status)); + measureUnitValue = MeasureUnit::getMilligramOfglucosePerDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status)); + measureUnitValue = MeasureUnit::getMilligramPerDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createMillimolePerLiter(status)); + measureUnitValue = MeasureUnit::getMillimolePerLiter(); + measureUnit.adoptInstead(MeasureUnit::createMole(status)); + measureUnitValue = MeasureUnit::getMole(); + measureUnit.adoptInstead(MeasureUnit::createPercent(status)); + measureUnitValue = MeasureUnit::getPercent(); + measureUnit.adoptInstead(MeasureUnit::createPermille(status)); + measureUnitValue = MeasureUnit::getPermille(); + measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status)); + measureUnitValue = MeasureUnit::getPartPerMillion(); + measureUnit.adoptInstead(MeasureUnit::createPermyriad(status)); + measureUnitValue = MeasureUnit::getPermyriad(); + measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status)); + measureUnitValue = MeasureUnit::getLiterPer100Kilometers(); + measureUnit.adoptInstead(MeasureUnit::createLiterPerKilometer(status)); + measureUnitValue = MeasureUnit::getLiterPerKilometer(); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallon(status)); + measureUnitValue = MeasureUnit::getMilePerGallon(); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallonImperial(status)); + measureUnitValue = MeasureUnit::getMilePerGallonImperial(); + measureUnit.adoptInstead(MeasureUnit::createBit(status)); + measureUnitValue = MeasureUnit::getBit(); + measureUnit.adoptInstead(MeasureUnit::createByte(status)); + measureUnitValue = MeasureUnit::getByte(); + measureUnit.adoptInstead(MeasureUnit::createGigabit(status)); + measureUnitValue = MeasureUnit::getGigabit(); + measureUnit.adoptInstead(MeasureUnit::createGigabyte(status)); + measureUnitValue = MeasureUnit::getGigabyte(); + measureUnit.adoptInstead(MeasureUnit::createKilobit(status)); + measureUnitValue = MeasureUnit::getKilobit(); + measureUnit.adoptInstead(MeasureUnit::createKilobyte(status)); + measureUnitValue = MeasureUnit::getKilobyte(); + measureUnit.adoptInstead(MeasureUnit::createMegabit(status)); + measureUnitValue = MeasureUnit::getMegabit(); + measureUnit.adoptInstead(MeasureUnit::createMegabyte(status)); + measureUnitValue = MeasureUnit::getMegabyte(); + measureUnit.adoptInstead(MeasureUnit::createPetabyte(status)); + measureUnitValue = MeasureUnit::getPetabyte(); + measureUnit.adoptInstead(MeasureUnit::createTerabit(status)); + measureUnitValue = MeasureUnit::getTerabit(); + measureUnit.adoptInstead(MeasureUnit::createTerabyte(status)); + measureUnitValue = MeasureUnit::getTerabyte(); + measureUnit.adoptInstead(MeasureUnit::createCentury(status)); + measureUnitValue = MeasureUnit::getCentury(); + measureUnit.adoptInstead(MeasureUnit::createDay(status)); + measureUnitValue = MeasureUnit::getDay(); + measureUnit.adoptInstead(MeasureUnit::createDayPerson(status)); + measureUnitValue = MeasureUnit::getDayPerson(); + measureUnit.adoptInstead(MeasureUnit::createDecade(status)); + measureUnitValue = MeasureUnit::getDecade(); + measureUnit.adoptInstead(MeasureUnit::createHour(status)); + measureUnitValue = MeasureUnit::getHour(); + measureUnit.adoptInstead(MeasureUnit::createMicrosecond(status)); + measureUnitValue = MeasureUnit::getMicrosecond(); + measureUnit.adoptInstead(MeasureUnit::createMillisecond(status)); + measureUnitValue = MeasureUnit::getMillisecond(); + measureUnit.adoptInstead(MeasureUnit::createMinute(status)); + measureUnitValue = MeasureUnit::getMinute(); + measureUnit.adoptInstead(MeasureUnit::createMonth(status)); + measureUnitValue = MeasureUnit::getMonth(); + measureUnit.adoptInstead(MeasureUnit::createMonthPerson(status)); + measureUnitValue = MeasureUnit::getMonthPerson(); + measureUnit.adoptInstead(MeasureUnit::createNanosecond(status)); + measureUnitValue = MeasureUnit::getNanosecond(); + measureUnit.adoptInstead(MeasureUnit::createSecond(status)); + measureUnitValue = MeasureUnit::getSecond(); + measureUnit.adoptInstead(MeasureUnit::createWeek(status)); + measureUnitValue = MeasureUnit::getWeek(); + measureUnit.adoptInstead(MeasureUnit::createWeekPerson(status)); + measureUnitValue = MeasureUnit::getWeekPerson(); + measureUnit.adoptInstead(MeasureUnit::createYear(status)); + measureUnitValue = MeasureUnit::getYear(); + measureUnit.adoptInstead(MeasureUnit::createYearPerson(status)); + measureUnitValue = MeasureUnit::getYearPerson(); + measureUnit.adoptInstead(MeasureUnit::createAmpere(status)); + measureUnitValue = MeasureUnit::getAmpere(); + measureUnit.adoptInstead(MeasureUnit::createMilliampere(status)); + measureUnitValue = MeasureUnit::getMilliampere(); + measureUnit.adoptInstead(MeasureUnit::createOhm(status)); + measureUnitValue = MeasureUnit::getOhm(); + measureUnit.adoptInstead(MeasureUnit::createVolt(status)); + measureUnitValue = MeasureUnit::getVolt(); + measureUnit.adoptInstead(MeasureUnit::createBritishThermalUnit(status)); + measureUnitValue = MeasureUnit::getBritishThermalUnit(); + measureUnit.adoptInstead(MeasureUnit::createCalorie(status)); + measureUnitValue = MeasureUnit::getCalorie(); + measureUnit.adoptInstead(MeasureUnit::createElectronvolt(status)); + measureUnitValue = MeasureUnit::getElectronvolt(); + measureUnit.adoptInstead(MeasureUnit::createFoodcalorie(status)); + measureUnitValue = MeasureUnit::getFoodcalorie(); + measureUnit.adoptInstead(MeasureUnit::createJoule(status)); + measureUnitValue = MeasureUnit::getJoule(); + measureUnit.adoptInstead(MeasureUnit::createKilocalorie(status)); + measureUnitValue = MeasureUnit::getKilocalorie(); + measureUnit.adoptInstead(MeasureUnit::createKilojoule(status)); + measureUnitValue = MeasureUnit::getKilojoule(); + measureUnit.adoptInstead(MeasureUnit::createKilowattHour(status)); + measureUnitValue = MeasureUnit::getKilowattHour(); + measureUnit.adoptInstead(MeasureUnit::createThermUs(status)); + measureUnitValue = MeasureUnit::getThermUs(); + measureUnit.adoptInstead(MeasureUnit::createNewton(status)); + measureUnitValue = MeasureUnit::getNewton(); + measureUnit.adoptInstead(MeasureUnit::createPoundForce(status)); + measureUnitValue = MeasureUnit::getPoundForce(); + measureUnit.adoptInstead(MeasureUnit::createGigahertz(status)); + measureUnitValue = MeasureUnit::getGigahertz(); + measureUnit.adoptInstead(MeasureUnit::createHertz(status)); + measureUnitValue = MeasureUnit::getHertz(); + measureUnit.adoptInstead(MeasureUnit::createKilohertz(status)); + measureUnitValue = MeasureUnit::getKilohertz(); + measureUnit.adoptInstead(MeasureUnit::createMegahertz(status)); + measureUnitValue = MeasureUnit::getMegahertz(); + measureUnit.adoptInstead(MeasureUnit::createDot(status)); + measureUnitValue = MeasureUnit::getDot(); + measureUnit.adoptInstead(MeasureUnit::createDotPerCentimeter(status)); + measureUnitValue = MeasureUnit::getDotPerCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createDotPerInch(status)); + measureUnitValue = MeasureUnit::getDotPerInch(); + measureUnit.adoptInstead(MeasureUnit::createEm(status)); + measureUnitValue = MeasureUnit::getEm(); + measureUnit.adoptInstead(MeasureUnit::createMegapixel(status)); + measureUnitValue = MeasureUnit::getMegapixel(); + measureUnit.adoptInstead(MeasureUnit::createPixel(status)); + measureUnitValue = MeasureUnit::getPixel(); + measureUnit.adoptInstead(MeasureUnit::createPixelPerCentimeter(status)); + measureUnitValue = MeasureUnit::getPixelPerCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createPixelPerInch(status)); + measureUnitValue = MeasureUnit::getPixelPerInch(); + measureUnit.adoptInstead(MeasureUnit::createAstronomicalUnit(status)); + measureUnitValue = MeasureUnit::getAstronomicalUnit(); + measureUnit.adoptInstead(MeasureUnit::createCentimeter(status)); + measureUnitValue = MeasureUnit::getCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createDecimeter(status)); + measureUnitValue = MeasureUnit::getDecimeter(); + measureUnit.adoptInstead(MeasureUnit::createEarthRadius(status)); + measureUnitValue = MeasureUnit::getEarthRadius(); + measureUnit.adoptInstead(MeasureUnit::createFathom(status)); + measureUnitValue = MeasureUnit::getFathom(); + measureUnit.adoptInstead(MeasureUnit::createFoot(status)); + measureUnitValue = MeasureUnit::getFoot(); + measureUnit.adoptInstead(MeasureUnit::createFurlong(status)); + measureUnitValue = MeasureUnit::getFurlong(); + measureUnit.adoptInstead(MeasureUnit::createInch(status)); + measureUnitValue = MeasureUnit::getInch(); + measureUnit.adoptInstead(MeasureUnit::createKilometer(status)); + measureUnitValue = MeasureUnit::getKilometer(); + measureUnit.adoptInstead(MeasureUnit::createLightYear(status)); + measureUnitValue = MeasureUnit::getLightYear(); + measureUnit.adoptInstead(MeasureUnit::createMeter(status)); + measureUnitValue = MeasureUnit::getMeter(); + measureUnit.adoptInstead(MeasureUnit::createMicrometer(status)); + measureUnitValue = MeasureUnit::getMicrometer(); + measureUnit.adoptInstead(MeasureUnit::createMile(status)); + measureUnitValue = MeasureUnit::getMile(); + measureUnit.adoptInstead(MeasureUnit::createMileScandinavian(status)); + measureUnitValue = MeasureUnit::getMileScandinavian(); + measureUnit.adoptInstead(MeasureUnit::createMillimeter(status)); + measureUnitValue = MeasureUnit::getMillimeter(); + measureUnit.adoptInstead(MeasureUnit::createNanometer(status)); + measureUnitValue = MeasureUnit::getNanometer(); + measureUnit.adoptInstead(MeasureUnit::createNauticalMile(status)); + measureUnitValue = MeasureUnit::getNauticalMile(); + measureUnit.adoptInstead(MeasureUnit::createParsec(status)); + measureUnitValue = MeasureUnit::getParsec(); + measureUnit.adoptInstead(MeasureUnit::createPicometer(status)); + measureUnitValue = MeasureUnit::getPicometer(); + measureUnit.adoptInstead(MeasureUnit::createPoint(status)); + measureUnitValue = MeasureUnit::getPoint(); + measureUnit.adoptInstead(MeasureUnit::createSolarRadius(status)); + measureUnitValue = MeasureUnit::getSolarRadius(); + measureUnit.adoptInstead(MeasureUnit::createYard(status)); + measureUnitValue = MeasureUnit::getYard(); + measureUnit.adoptInstead(MeasureUnit::createCandela(status)); + measureUnitValue = MeasureUnit::getCandela(); + measureUnit.adoptInstead(MeasureUnit::createLumen(status)); + measureUnitValue = MeasureUnit::getLumen(); + measureUnit.adoptInstead(MeasureUnit::createLux(status)); + measureUnitValue = MeasureUnit::getLux(); + measureUnit.adoptInstead(MeasureUnit::createSolarLuminosity(status)); + measureUnitValue = MeasureUnit::getSolarLuminosity(); + measureUnit.adoptInstead(MeasureUnit::createCarat(status)); + measureUnitValue = MeasureUnit::getCarat(); + measureUnit.adoptInstead(MeasureUnit::createDalton(status)); + measureUnitValue = MeasureUnit::getDalton(); + measureUnit.adoptInstead(MeasureUnit::createEarthMass(status)); + measureUnitValue = MeasureUnit::getEarthMass(); + measureUnit.adoptInstead(MeasureUnit::createGrain(status)); + measureUnitValue = MeasureUnit::getGrain(); + measureUnit.adoptInstead(MeasureUnit::createGram(status)); + measureUnitValue = MeasureUnit::getGram(); + measureUnit.adoptInstead(MeasureUnit::createKilogram(status)); + measureUnitValue = MeasureUnit::getKilogram(); + measureUnit.adoptInstead(MeasureUnit::createMetricTon(status)); + measureUnitValue = MeasureUnit::getMetricTon(); + measureUnit.adoptInstead(MeasureUnit::createMicrogram(status)); + measureUnitValue = MeasureUnit::getMicrogram(); + measureUnit.adoptInstead(MeasureUnit::createMilligram(status)); + measureUnitValue = MeasureUnit::getMilligram(); + measureUnit.adoptInstead(MeasureUnit::createOunce(status)); + measureUnitValue = MeasureUnit::getOunce(); + measureUnit.adoptInstead(MeasureUnit::createOunceTroy(status)); + measureUnitValue = MeasureUnit::getOunceTroy(); + measureUnit.adoptInstead(MeasureUnit::createPound(status)); + measureUnitValue = MeasureUnit::getPound(); + measureUnit.adoptInstead(MeasureUnit::createSolarMass(status)); + measureUnitValue = MeasureUnit::getSolarMass(); + measureUnit.adoptInstead(MeasureUnit::createStone(status)); + measureUnitValue = MeasureUnit::getStone(); + measureUnit.adoptInstead(MeasureUnit::createTon(status)); + measureUnitValue = MeasureUnit::getTon(); + measureUnit.adoptInstead(MeasureUnit::createGigawatt(status)); + measureUnitValue = MeasureUnit::getGigawatt(); + measureUnit.adoptInstead(MeasureUnit::createHorsepower(status)); + measureUnitValue = MeasureUnit::getHorsepower(); + measureUnit.adoptInstead(MeasureUnit::createKilowatt(status)); + measureUnitValue = MeasureUnit::getKilowatt(); + measureUnit.adoptInstead(MeasureUnit::createMegawatt(status)); + measureUnitValue = MeasureUnit::getMegawatt(); + measureUnit.adoptInstead(MeasureUnit::createMilliwatt(status)); + measureUnitValue = MeasureUnit::getMilliwatt(); + measureUnit.adoptInstead(MeasureUnit::createWatt(status)); + measureUnitValue = MeasureUnit::getWatt(); + measureUnit.adoptInstead(MeasureUnit::createAtmosphere(status)); + measureUnitValue = MeasureUnit::getAtmosphere(); + measureUnit.adoptInstead(MeasureUnit::createBar(status)); + measureUnitValue = MeasureUnit::getBar(); + measureUnit.adoptInstead(MeasureUnit::createHectopascal(status)); + measureUnitValue = MeasureUnit::getHectopascal(); + measureUnit.adoptInstead(MeasureUnit::createInchHg(status)); + measureUnitValue = MeasureUnit::getInchHg(); + measureUnit.adoptInstead(MeasureUnit::createKilopascal(status)); + measureUnitValue = MeasureUnit::getKilopascal(); + measureUnit.adoptInstead(MeasureUnit::createMegapascal(status)); + measureUnitValue = MeasureUnit::getMegapascal(); + measureUnit.adoptInstead(MeasureUnit::createMillibar(status)); + measureUnitValue = MeasureUnit::getMillibar(); + measureUnit.adoptInstead(MeasureUnit::createMillimeterOfMercury(status)); + measureUnitValue = MeasureUnit::getMillimeterOfMercury(); + measureUnit.adoptInstead(MeasureUnit::createPascal(status)); + measureUnitValue = MeasureUnit::getPascal(); + measureUnit.adoptInstead(MeasureUnit::createPoundPerSquareInch(status)); + measureUnitValue = MeasureUnit::getPoundPerSquareInch(); + measureUnit.adoptInstead(MeasureUnit::createKilometerPerHour(status)); + measureUnitValue = MeasureUnit::getKilometerPerHour(); + measureUnit.adoptInstead(MeasureUnit::createKnot(status)); + measureUnitValue = MeasureUnit::getKnot(); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecond(status)); + measureUnitValue = MeasureUnit::getMeterPerSecond(); + measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status)); + measureUnitValue = MeasureUnit::getMilePerHour(); + measureUnit.adoptInstead(MeasureUnit::createCelsius(status)); + measureUnitValue = MeasureUnit::getCelsius(); + measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status)); + measureUnitValue = MeasureUnit::getFahrenheit(); + measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status)); + measureUnitValue = MeasureUnit::getGenericTemperature(); + measureUnit.adoptInstead(MeasureUnit::createKelvin(status)); + measureUnitValue = MeasureUnit::getKelvin(); + measureUnit.adoptInstead(MeasureUnit::createNewtonMeter(status)); + measureUnitValue = MeasureUnit::getNewtonMeter(); + measureUnit.adoptInstead(MeasureUnit::createPoundFoot(status)); + measureUnitValue = MeasureUnit::getPoundFoot(); + measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status)); + measureUnitValue = MeasureUnit::getAcreFoot(); + measureUnit.adoptInstead(MeasureUnit::createBarrel(status)); + measureUnitValue = MeasureUnit::getBarrel(); + measureUnit.adoptInstead(MeasureUnit::createBushel(status)); + measureUnitValue = MeasureUnit::getBushel(); + measureUnit.adoptInstead(MeasureUnit::createCentiliter(status)); + measureUnitValue = MeasureUnit::getCentiliter(); + measureUnit.adoptInstead(MeasureUnit::createCubicCentimeter(status)); + measureUnitValue = MeasureUnit::getCubicCentimeter(); + measureUnit.adoptInstead(MeasureUnit::createCubicFoot(status)); + measureUnitValue = MeasureUnit::getCubicFoot(); + measureUnit.adoptInstead(MeasureUnit::createCubicInch(status)); + measureUnitValue = MeasureUnit::getCubicInch(); + measureUnit.adoptInstead(MeasureUnit::createCubicKilometer(status)); + measureUnitValue = MeasureUnit::getCubicKilometer(); + measureUnit.adoptInstead(MeasureUnit::createCubicMeter(status)); + measureUnitValue = MeasureUnit::getCubicMeter(); + measureUnit.adoptInstead(MeasureUnit::createCubicMile(status)); + measureUnitValue = MeasureUnit::getCubicMile(); + measureUnit.adoptInstead(MeasureUnit::createCubicYard(status)); + measureUnitValue = MeasureUnit::getCubicYard(); + measureUnit.adoptInstead(MeasureUnit::createCup(status)); + measureUnitValue = MeasureUnit::getCup(); + measureUnit.adoptInstead(MeasureUnit::createCupMetric(status)); + measureUnitValue = MeasureUnit::getCupMetric(); + measureUnit.adoptInstead(MeasureUnit::createDeciliter(status)); + measureUnitValue = MeasureUnit::getDeciliter(); + measureUnit.adoptInstead(MeasureUnit::createDessertSpoon(status)); + measureUnitValue = MeasureUnit::getDessertSpoon(); + measureUnit.adoptInstead(MeasureUnit::createDessertSpoonImperial(status)); + measureUnitValue = MeasureUnit::getDessertSpoonImperial(); + measureUnit.adoptInstead(MeasureUnit::createDram(status)); + measureUnitValue = MeasureUnit::getDram(); + measureUnit.adoptInstead(MeasureUnit::createDrop(status)); + measureUnitValue = MeasureUnit::getDrop(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunce(status)); + measureUnitValue = MeasureUnit::getFluidOunce(); + measureUnit.adoptInstead(MeasureUnit::createFluidOunceImperial(status)); + measureUnitValue = MeasureUnit::getFluidOunceImperial(); + measureUnit.adoptInstead(MeasureUnit::createGallon(status)); + measureUnitValue = MeasureUnit::getGallon(); + measureUnit.adoptInstead(MeasureUnit::createGallonImperial(status)); + measureUnitValue = MeasureUnit::getGallonImperial(); + measureUnit.adoptInstead(MeasureUnit::createHectoliter(status)); + measureUnitValue = MeasureUnit::getHectoliter(); + measureUnit.adoptInstead(MeasureUnit::createJigger(status)); + measureUnitValue = MeasureUnit::getJigger(); + measureUnit.adoptInstead(MeasureUnit::createLiter(status)); + measureUnitValue = MeasureUnit::getLiter(); + measureUnit.adoptInstead(MeasureUnit::createMegaliter(status)); + measureUnitValue = MeasureUnit::getMegaliter(); + measureUnit.adoptInstead(MeasureUnit::createMilliliter(status)); + measureUnitValue = MeasureUnit::getMilliliter(); + measureUnit.adoptInstead(MeasureUnit::createPinch(status)); + measureUnitValue = MeasureUnit::getPinch(); + measureUnit.adoptInstead(MeasureUnit::createPint(status)); + measureUnitValue = MeasureUnit::getPint(); + measureUnit.adoptInstead(MeasureUnit::createPintMetric(status)); + measureUnitValue = MeasureUnit::getPintMetric(); + measureUnit.adoptInstead(MeasureUnit::createQuart(status)); + measureUnitValue = MeasureUnit::getQuart(); + measureUnit.adoptInstead(MeasureUnit::createQuartImperial(status)); + measureUnitValue = MeasureUnit::getQuartImperial(); + measureUnit.adoptInstead(MeasureUnit::createTablespoon(status)); + measureUnitValue = MeasureUnit::getTablespoon(); + measureUnit.adoptInstead(MeasureUnit::createTeaspoon(status)); + measureUnitValue = MeasureUnit::getTeaspoon(); + assertSuccess("", status); +} + void MeasureFormatTest::TestBasic() { UErrorCode status = U_ZERO_ERROR; MeasureUnit *ptr1 = MeasureUnit::createArcMinute(status); diff --git a/icu4c/source/test/testdata/localeCanonicalization.txt b/icu4c/source/test/testdata/localeCanonicalization.txt index e41eaac05a7..fea36ee912a 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 ; nb -no_nynorsk_bokmal ; nb +no_bokmal_nynorsk ; nn +no_nynorsk_bokmal ; nn zh_guoyu_hakka_xiang ; hak zh_hakka_xiang ; hak @@ -275,11 +275,11 @@ nld ; nl nno ; nn nns ; nbr nnx ; ngv -no ; nb -no_bokmal ; nb +no ; no +no_bokmal ; no no_nynorsk ; nn -nob ; nb -nor ; nb +nob ; no +nor ; no npi ; ne nts ; pij nya ; ny @@ -1460,12 +1460,12 @@ 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 ; nb_Adlm_AC_fonipa -no_Adlm_AC_bokmal_fonipa_nynorsk ; nb_Adlm_AC_fonipa -no_Adlm_AC_fonipa ; nb_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_fonipa ; no_Adlm_AC_fonipa no_Adlm_AC_fonipa_nynorsk ; nn_Adlm_AC_fonipa -nob_Adlm_AC_fonipa ; nb_Adlm_AC_fonipa -nor_Adlm_AC_fonipa ; nb_Adlm_AC_fonipa +nob_Adlm_AC_fonipa ; no_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 nya_Adlm_AC_fonipa ; ny_Adlm_AC_fonipa diff --git a/icu4c/source/test/testdata/localeMatcherTest.txt b/icu4c/source/test/testdata/localeMatcherTest.txt index 6d21303fe2d..38c3c5981a9 100644 --- a/icu4c/source/test/testdata/localeMatcherTest.txt +++ b/icu4c/source/test/testdata/localeMatcherTest.txt @@ -270,14 +270,14 @@ und-TW >> zh-Hant # und-TW should be closer to zh-Hant than to zh @supported=en-Hant-TW, und-TW zh-Hant >> und-TW # zh-Hant should be closer to und-TW than to en-Hant-TW -zh >> und-TW # zh should be closer to und-TW than to en-Hant-TW +zh >> en-Hant-TW # no match so get first @favor=script @supported=zh, zh-Hant und-TW >> zh-Hant @supported=en-Hant-TW, und-TW zh-Hant >> und-TW -zh >> und-TW +zh >> en-Hant-TW # no match so get first ** test: testMatchLegacyCode @@ -344,8 +344,8 @@ de-CH, fr >> de # to be an acceptable match. The regional difference is considered almost insignificant. @supported=fr, zh-Hans-CN, en-US -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first # For geopolitical reasons, you might want to avoid a zh-Hant -> zh-Hans match. # In this case, if zh-TW, zh-HK or a tag starting with zh-Hant is requested, you can @@ -358,8 +358,8 @@ zh-Hant-CN, en >> en-US zh-Hans, en >> zh-Hans-CN @favor=script -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first zh-TW, en >> en-US zh-Hant-CN, en >> en-US zh-Hans, en >> zh-Hans-CN @@ -1077,8 +1077,8 @@ ar-PSCRACK >> ar-PSCRACK # enough to be an acceptable match. The regional difference is considered # almost insignificant. @supported=fr, zh-Hans-CN, en-US -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first # For geopolitical reasons, you might want to avoid a zh-Hant -> zh-Hans # match. In this case, if zh-TW, zh-HK or a tag starting with zh-Hant is @@ -1129,7 +1129,7 @@ fr >> fr @default=und es-001 >> es und >> und -ca >> und +ca >> es gl-ES >> es es >> es es-MX >> es-MX @@ -1215,7 +1215,7 @@ es-VE >> es-MX @default=und es-001 >> es und >> und -ca >> und +ca >> es gl-ES >> es es >> es es-419 >> es-419 @@ -1538,8 +1538,8 @@ de, zh >> fr ** test: best match for traditional Chinese @supported=fr, zh-Hans-CN, en-US -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first zh-TW, en >> en-US zh-Hant-CN, en >> en-US zh-Hans, en >> zh-Hans-CN @@ -1646,14 +1646,14 @@ en >> it und-FR >> fr und-CN >> zh und-Hans >> zh -und-Hant >> zh +und-Hant >> it # no match so get first und-Latn >> it @favor=script und-FR >> fr und-CN >> zh und-Hans >> zh -und-Hant >> zh +und-Hant >> it # no match so get first und-Latn >> it ** test: match on maximized tag @@ -1918,7 +1918,7 @@ en >> und @supported=en, uk ru >> und @supported=zh-TW, en -zh-CN >> zh-TW +zh-CN >> und # no match @supported=ja ru >> und @@ -1948,7 +1948,7 @@ en >> iw-Latn @supported=en, uk ru >> uk @supported=zh-TW, en -zh-CN >> zh-TW +zh-CN >> und # no match @supported=ja ru >> und diff --git a/icu4c/source/test/testdata/root.txt b/icu4c/source/test/testdata/root.txt index c44da2d8ce5..93afadcb716 100644 --- a/icu4c/source/test/testdata/root.txt +++ b/icu4c/source/test/testdata/root.txt @@ -13,8 +13,8 @@ root { Version { 44.0 } - ExpectCLDRVersionAtLeast { 38.0 } // 'base' cldr version. Allow up to version =.=.* of this - CurrentCLDRVersion { 38.0 } // Current CLDR version as of the test update. Warn if not an exact match. + ExpectCLDRVersionAtLeast { 39.0 } // 'base' cldr version. Allow up to version =.=.* of this + CurrentCLDRVersion { 39.0 } // Current CLDR version as of the test update. Warn if not an exact match. ShortLanguage { xxx } 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 290fa6cef8a..f693e434725 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", "nb",/* replacement language codes */ + "id", "he", "yi", "jv", "sr", "no",/* replacement language codes */ }; private static final String[] _obsoleteLanguages = { - "in", "iw", "ji", "jw", "sh", "no", /* obsolete language codes */ + "in", "iw", "ji", "jw", "sh", "nb", /* 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/impl/number/LongNameHandler.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/LongNameHandler.java index 13084a7c0db..906a367c19e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/number/LongNameHandler.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/number/LongNameHandler.java @@ -70,7 +70,12 @@ public class LongNameHandler public void put(UResource.Key key, UResource.Value value, boolean noFallback) { UResource.Table pluralsTable = value.getTable(); for (int i = 0; pluralsTable.getKeyAndValue(i, key, value); ++i) { - int index = getIndex(key.toString()); + String keyString = key.toString(); + if (keyString.equals("case") || keyString.equals("gender")) { + // TODO: @Hugo to fix for new grammatical stuff + continue; + } + int index = getIndex(keyString); if (outArray[index] != null) { continue; } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java index 59c37217d43..f732c2f5c34 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/units/UnitsConverter.java @@ -165,7 +165,9 @@ public class UnitsConverter { private int exponentGalImpToM3 = 0; /** Exponent for the pound to kilogram conversion rate constant */ private int exponentLbToKg = 0; + /** Exponent for the glucose molar mass conversion rate constant */ private int exponentGlucoseMolarMass = 0; + /** Exponent for the item per mole conversion rate constant */ private int exponentItemPerMole = 0; /** diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java index 7391ac1dfc7..cdc8666b11e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/MeasureUnit.java @@ -930,7 +930,7 @@ public class MeasureUnit implements Serializable { // the "End generated MeasureUnit constants" comment is auto generated code // and must not be edited manually. For instructions on how to correctly // update this code, refer to: -// http://site.icu-project.org/design/formatting/measureformat/updating-measure-unit +// docs/processes/release/tasks/updating-measure-unit.md // // Start generated MeasureUnit constants @@ -1042,6 +1042,13 @@ public class MeasureUnit implements Serializable { */ public static final MeasureUnit KARAT = MeasureUnit.internalGetInstance("concentr", "karat"); + /** + * Constant for unit of concentr: milligram-ofglucose-per-deciliter + * @draft ICU 69 + * @provisional This API might change or be removed in a future release. + */ + public static final MeasureUnit MILLIGRAM_OFGLUCOSE_PER_DECILITER = MeasureUnit.internalGetInstance("concentr", "milligram-ofglucose-per-deciliter"); + /** * Constant for unit of concentr: milligram-per-deciliter * @stable ICU 57 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 a7b77a6cdf9..881272081e9 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", "nb", "nb_NO", "ne", "ne_NP", - "nl", "nl_NL", "or", "or_IN", "pa", "pa_IN", "pl", "pl_PL", "ps", "ps_AF", + "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", "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 3251490129b..5dd2efd6034 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:f4a144335f9c6c6a6df5a95d882d8841de82be4e86db650c643c67ac84ef8f84 -size 13306908 +oid sha256:4788511cd3c1370ba9cc1adfbef87e80ee8d844439daf66d9b121919d8c1d905 +size 13327705 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 5b649fdf1be..00eb5339615 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:09736746668a9d57494331b4533ae8ba1e38f55f433f5ecd9026e1c57735a413 -size 95080 +oid sha256:0bf4a8370234ddae7ea293f1028220f0d5581f7ef447dd8fa60757419cc5de68 +size 95091 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index b65c1cc48aa..a0128552758 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:056761b1169f3ba2b2c63e3f71c8bce2e61a7a80d7e21bcd9c38e98fbd3414a0 -size 723496 +oid sha256:40928033c3f04dad5dc5451bce45517686ebad7e50d11ca1fa52040a272f675d +size 723623 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 e41eaac05a7..fea36ee912a 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 ; nb -no_nynorsk_bokmal ; nb +no_bokmal_nynorsk ; nn +no_nynorsk_bokmal ; nn zh_guoyu_hakka_xiang ; hak zh_hakka_xiang ; hak @@ -275,11 +275,11 @@ nld ; nl nno ; nn nns ; nbr nnx ; ngv -no ; nb -no_bokmal ; nb +no ; no +no_bokmal ; no no_nynorsk ; nn -nob ; nb -nor ; nb +nob ; no +nor ; no npi ; ne nts ; pij nya ; ny @@ -1460,12 +1460,12 @@ 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 ; nb_Adlm_AC_fonipa -no_Adlm_AC_bokmal_fonipa_nynorsk ; nb_Adlm_AC_fonipa -no_Adlm_AC_fonipa ; nb_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_fonipa ; no_Adlm_AC_fonipa no_Adlm_AC_fonipa_nynorsk ; nn_Adlm_AC_fonipa -nob_Adlm_AC_fonipa ; nb_Adlm_AC_fonipa -nor_Adlm_AC_fonipa ; nb_Adlm_AC_fonipa +nob_Adlm_AC_fonipa ; no_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 nya_Adlm_AC_fonipa ; ny_Adlm_AC_fonipa diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java index 8d3ad1f5be5..22b9ec8ca41 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java @@ -430,7 +430,7 @@ public class DateIntervalFormatTest extends TestFmwk { "zh", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "EEEEdMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f32008\\u5e7410\\u670810\\u65e5\\u661f\\u671f\\u4e94", - "zh", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "2007/10/10\\u4e0a\\u534810:10 \\u2013 2008/10/10\\u4e0a\\u534810:10", + "zh", "CE 2007 10 10 10:10:10", "CE 2008 10 10 10:10:10", "hm", "2007/10/10 \\u4e0a\\u534810:10 \\u2013 2008/10/10 \\u4e0a\\u534810:10", "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "dMMMMy", "2007\\u5e7410\\u670810\\u65e5\\u81f311\\u670810\\u65e5", @@ -440,7 +440,7 @@ public class DateIntervalFormatTest extends TestFmwk { "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "EEEEdMMMM", "10\\u670810\\u65e5\\u661f\\u671f\\u4e09\\u81f311\\u670810\\u65e5\\u661f\\u671f\\u516d", - "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "2007/10/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10\\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", + "zh", "CE 2007 10 10 10:10:10", "CE 2007 11 10 10:10:10", "hmv", "2007/10/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10 \\u2013 2007/11/10 \\u6D1B\\u6749\\u77F6\\u65F6\\u95F4 \\u4E0A\\u534810:10", "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "EEEEdMMMMy", "2007\\u5e7411\\u670810\\u65e5\\u661f\\u671f\\u516d\\u81f320\\u65e5\\u661f\\u671f\\u4e8c", @@ -473,9 +473,9 @@ public class DateIntervalFormatTest extends TestFmwk { "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "MMMM", "\\u5341\\u4E00\\u6708", // (fixed expected result per ticket 6872<-6626 and others) - "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "2007/11/10GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20GMT-8 \\u4e0a\\u534810:10", + "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "hmz", "2007/11/10 GMT-8 \\u4e0a\\u534810:10 \\u2013 2007/11/20 GMT-8 \\u4e0a\\u534810:10", - "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "2007/11/10\\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20\\u4e0a\\u534810\\u65f6", + "zh", "CE 2007 11 10 10:10:10", "CE 2007 11 20 10:10:10", "h", "2007/11/10 \\u4e0a\\u534810\\u65f6 \\u2013 2007/11/20 \\u4e0a\\u534810\\u65f6", "zh", "CE 2007 01 10 10:00:10", "CE 2007 01 10 14:10:10", "EEEEdMMMMy", "2007\\u5e741\\u670810\\u65e5\\u661f\\u671f\\u4e09", // (fixed expected result per ticket 6872<-6626) diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java index 1220f562a36..e7e28d18ee5 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/MeasureUnitTest.java @@ -85,7 +85,7 @@ public class MeasureUnitTest extends TestFmwk { } } - private static final String[] DRAFT_VERSIONS = {"66", "67", "68"}; + private static final String[] DRAFT_VERSIONS = {"68", "69"}; private static final HashSet DRAFT_VERSION_SET = new HashSet<>(); @@ -276,6 +276,7 @@ public class MeasureUnitTest extends TestFmwk { {"JIGGER", "68"}, {"PINCH", "68"}, {"QUART_IMPERIAL", "68"}, + {"MILLIGRAM_OFGLUCOSE_PER_DECILITER", "69"}, }; private static final HashMap JAVA_VERSION_MAP = new HashMap<>(); @@ -317,14 +318,14 @@ public class MeasureUnitTest extends TestFmwk { @Test public void testZZZ() { // various generateXXX calls go here, see - // http://site.icu-project.org/design/formatting/measureformat/updating-measure-unit + // docs/processes/release/tasks/updating-measure-unit.md // use this test to run each of the ollowing in succession - //generateConstants("68"); // for MeasureUnit.java, update generated MeasureUnit constants - //generateBackwardCompatibilityTest("68"); // for MeasureUnitTest.java, create TestCompatible65 - //generateCXXHConstants("68"); // for measunit.h, update generated createXXX methods + //generateConstants("69"); // for MeasureUnit.java, update generated MeasureUnit constants + //generateBackwardCompatibilityTest("69"); // for MeasureUnitTest.java, create TestCompatible69 + //generateCXXHConstants("69"); // for measunit.h, update generated createXXX methods //generateCXXConstants(); // for measunit.cpp, update generated code - //generateCXXBackwardCompatibilityTest("68"); // for measfmttest.cpp, create TestCompatible65 - //updateJAVAVersions("68"); // for MeasureUnitTest.java, JAVA_VERSIONS + //generateCXXBackwardCompatibilityTest("69"); // for measfmttest.cpp, create TestCompatible69 + //updateJAVAVersions("69"); // for MeasureUnitTest.java, JAVA_VERSIONS } @Test @@ -1888,6 +1889,198 @@ public class MeasureUnitTest extends TestFmwk { assertEquals("", 184, units.length); } + @Test + public void TestCompatible69() { + MeasureUnit[] units = { + MeasureUnit.G_FORCE, + MeasureUnit.METER_PER_SECOND_SQUARED, + MeasureUnit.ARC_MINUTE, + MeasureUnit.ARC_SECOND, + MeasureUnit.DEGREE, + MeasureUnit.RADIAN, + MeasureUnit.REVOLUTION_ANGLE, + MeasureUnit.ACRE, + MeasureUnit.DUNAM, + MeasureUnit.HECTARE, + MeasureUnit.SQUARE_CENTIMETER, + MeasureUnit.SQUARE_FOOT, + MeasureUnit.SQUARE_INCH, + MeasureUnit.SQUARE_KILOMETER, + MeasureUnit.SQUARE_METER, + MeasureUnit.SQUARE_MILE, + MeasureUnit.SQUARE_YARD, + MeasureUnit.KARAT, + MeasureUnit.MILLIGRAM_OFGLUCOSE_PER_DECILITER, + MeasureUnit.MILLIGRAM_PER_DECILITER, + MeasureUnit.MILLIMOLE_PER_LITER, + MeasureUnit.MOLE, + MeasureUnit.PERCENT, + MeasureUnit.PERMILLE, + MeasureUnit.PART_PER_MILLION, + MeasureUnit.PERMYRIAD, + MeasureUnit.LITER_PER_100KILOMETERS, + MeasureUnit.LITER_PER_KILOMETER, + MeasureUnit.MILE_PER_GALLON, + MeasureUnit.MILE_PER_GALLON_IMPERIAL, + MeasureUnit.BIT, + MeasureUnit.BYTE, + MeasureUnit.GIGABIT, + MeasureUnit.GIGABYTE, + MeasureUnit.KILOBIT, + MeasureUnit.KILOBYTE, + MeasureUnit.MEGABIT, + MeasureUnit.MEGABYTE, + MeasureUnit.PETABYTE, + MeasureUnit.TERABIT, + MeasureUnit.TERABYTE, + MeasureUnit.CENTURY, + MeasureUnit.DAY, + MeasureUnit.DAY_PERSON, + MeasureUnit.DECADE, + MeasureUnit.HOUR, + MeasureUnit.MICROSECOND, + MeasureUnit.MILLISECOND, + MeasureUnit.MINUTE, + MeasureUnit.MONTH, + MeasureUnit.MONTH_PERSON, + MeasureUnit.NANOSECOND, + MeasureUnit.SECOND, + MeasureUnit.WEEK, + MeasureUnit.WEEK_PERSON, + MeasureUnit.YEAR, + MeasureUnit.YEAR_PERSON, + MeasureUnit.AMPERE, + MeasureUnit.MILLIAMPERE, + MeasureUnit.OHM, + MeasureUnit.VOLT, + MeasureUnit.BRITISH_THERMAL_UNIT, + MeasureUnit.CALORIE, + MeasureUnit.ELECTRONVOLT, + MeasureUnit.FOODCALORIE, + MeasureUnit.JOULE, + MeasureUnit.KILOCALORIE, + MeasureUnit.KILOJOULE, + MeasureUnit.KILOWATT_HOUR, + MeasureUnit.THERM_US, + MeasureUnit.NEWTON, + MeasureUnit.POUND_FORCE, + MeasureUnit.GIGAHERTZ, + MeasureUnit.HERTZ, + MeasureUnit.KILOHERTZ, + MeasureUnit.MEGAHERTZ, + MeasureUnit.DOT, + MeasureUnit.DOT_PER_CENTIMETER, + MeasureUnit.DOT_PER_INCH, + MeasureUnit.EM, + MeasureUnit.MEGAPIXEL, + MeasureUnit.PIXEL, + MeasureUnit.PIXEL_PER_CENTIMETER, + MeasureUnit.PIXEL_PER_INCH, + MeasureUnit.ASTRONOMICAL_UNIT, + MeasureUnit.CENTIMETER, + MeasureUnit.DECIMETER, + MeasureUnit.EARTH_RADIUS, + MeasureUnit.FATHOM, + MeasureUnit.FOOT, + MeasureUnit.FURLONG, + MeasureUnit.INCH, + MeasureUnit.KILOMETER, + MeasureUnit.LIGHT_YEAR, + MeasureUnit.METER, + MeasureUnit.MICROMETER, + MeasureUnit.MILE, + MeasureUnit.MILE_SCANDINAVIAN, + MeasureUnit.MILLIMETER, + MeasureUnit.NANOMETER, + MeasureUnit.NAUTICAL_MILE, + MeasureUnit.PARSEC, + MeasureUnit.PICOMETER, + MeasureUnit.POINT, + MeasureUnit.SOLAR_RADIUS, + MeasureUnit.YARD, + MeasureUnit.CANDELA, + MeasureUnit.LUMEN, + MeasureUnit.LUX, + MeasureUnit.SOLAR_LUMINOSITY, + MeasureUnit.CARAT, + MeasureUnit.DALTON, + MeasureUnit.EARTH_MASS, + MeasureUnit.GRAIN, + MeasureUnit.GRAM, + MeasureUnit.KILOGRAM, + MeasureUnit.METRIC_TON, + MeasureUnit.MICROGRAM, + MeasureUnit.MILLIGRAM, + MeasureUnit.OUNCE, + MeasureUnit.OUNCE_TROY, + MeasureUnit.POUND, + MeasureUnit.SOLAR_MASS, + MeasureUnit.STONE, + MeasureUnit.TON, + MeasureUnit.GIGAWATT, + MeasureUnit.HORSEPOWER, + MeasureUnit.KILOWATT, + MeasureUnit.MEGAWATT, + MeasureUnit.MILLIWATT, + MeasureUnit.WATT, + MeasureUnit.ATMOSPHERE, + MeasureUnit.BAR, + MeasureUnit.HECTOPASCAL, + MeasureUnit.INCH_HG, + MeasureUnit.KILOPASCAL, + MeasureUnit.MEGAPASCAL, + MeasureUnit.MILLIBAR, + MeasureUnit.MILLIMETER_OF_MERCURY, + MeasureUnit.PASCAL, + MeasureUnit.POUND_PER_SQUARE_INCH, + MeasureUnit.KILOMETER_PER_HOUR, + MeasureUnit.KNOT, + MeasureUnit.METER_PER_SECOND, + MeasureUnit.MILE_PER_HOUR, + MeasureUnit.CELSIUS, + MeasureUnit.FAHRENHEIT, + MeasureUnit.GENERIC_TEMPERATURE, + MeasureUnit.KELVIN, + MeasureUnit.NEWTON_METER, + MeasureUnit.POUND_FOOT, + MeasureUnit.ACRE_FOOT, + MeasureUnit.BARREL, + MeasureUnit.BUSHEL, + MeasureUnit.CENTILITER, + MeasureUnit.CUBIC_CENTIMETER, + MeasureUnit.CUBIC_FOOT, + MeasureUnit.CUBIC_INCH, + MeasureUnit.CUBIC_KILOMETER, + MeasureUnit.CUBIC_METER, + MeasureUnit.CUBIC_MILE, + MeasureUnit.CUBIC_YARD, + MeasureUnit.CUP, + MeasureUnit.CUP_METRIC, + MeasureUnit.DECILITER, + MeasureUnit.DESSERT_SPOON, + MeasureUnit.DESSERT_SPOON_IMPERIAL, + MeasureUnit.DRAM, + MeasureUnit.DROP, + MeasureUnit.FLUID_OUNCE, + MeasureUnit.FLUID_OUNCE_IMPERIAL, + MeasureUnit.GALLON, + MeasureUnit.GALLON_IMPERIAL, + MeasureUnit.HECTOLITER, + MeasureUnit.JIGGER, + MeasureUnit.LITER, + MeasureUnit.MEGALITER, + MeasureUnit.MILLILITER, + MeasureUnit.PINCH, + MeasureUnit.PINT, + MeasureUnit.PINT_METRIC, + MeasureUnit.QUART, + MeasureUnit.QUART_IMPERIAL, + MeasureUnit.TABLESPOON, + MeasureUnit.TEASPOON, + }; + assertEquals("", 185, units.length); + } + @Test public void TestExamplesInDocs() { MeasureFormat fmtFr = MeasureFormat.getInstance( diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java index 6a636c6693e..1fcdc0e4da6 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/number/NumberRangeFormatterTest.java @@ -13,6 +13,7 @@ import java.util.Set; import org.junit.Test; +import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.format.FormattedValueTest; import com.ibm.icu.impl.ICUData; import com.ibm.icu.impl.ICUResourceBundle; @@ -40,7 +41,7 @@ import com.ibm.icu.util.UResourceBundle; * @author sffc * */ -public class NumberRangeFormatterTest { +public class NumberRangeFormatterTest extends TestFmwk { private static final Currency USD = Currency.getInstance("USD"); private static final Currency GBP = Currency.getInstance("GBP"); @@ -823,6 +824,9 @@ public class NumberRangeFormatterTest { public void testNumberingSystemRangeData() { RangePatternSink sink = new RangePatternSink(); for (ULocale locale : ULocale.getAvailableLocales()) { + if (locale.getLanguage().equals("nn") && logKnownIssue("cldrbug:14477", "nn inherits inconsistent number range patterns")) { + continue; + } ICUResourceBundle resource = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, locale); resource.getAllItemsWithFallback("NumberElements", sink); diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java index b4aa6625f50..6760f2f0a90 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleMatcherTest.java @@ -345,9 +345,9 @@ public class LocaleMatcherTest extends TestFmwk { assertTrue("zh_Hant should be closer to und_TW (" + matchZhHant + ") than to en_Hant_TW (" + matchEnHantTw + ")", matchEnHantTw < matchZhHant); - assertTrue("zh should be closer to und_TW (" + matchZh + - ") than to en_Hant_TW (" + matchEnHantTw + ")", - matchEnHantTw < matchZh); + assertTrue("zh should not match und_TW (" + matchZh + + ") or en_Hant_TW (" + matchEnHantTw + ")", + matchZh == 0.0 && matchEnHantTw == 0.0); } @Test @@ -425,12 +425,10 @@ public class LocaleMatcherTest extends TestFmwk { // zh_Hans, it wouldn't make much of a difference. final LocaleMatcher matcher = newLocaleMatcher("fr, zh_Hans_CN, en_US"); - // The script distance (simplified vs. traditional Han) is considered - // small enough - // to be an acceptable match. The regional difference is considered - // almost insignificant. - assertEquals("zh_Hans_CN", matcher.getBestMatch("zh_TW").toString()); - assertEquals("zh_Hans_CN", matcher.getBestMatch("zh_Hant").toString()); + // The script distance (simplified vs. traditional Han) is now considered + // no match, so we just get the first entry. + assertEquals("fr", matcher.getBestMatch("zh_TW").toString()); + assertEquals("fr", matcher.getBestMatch("zh_Hant").toString()); // For geo_political reasons, you might want to avoid a zh_Hant -> // zh_Hans match. 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 f71b8792a86..7dec9e3c947 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 @@ -674,10 +674,10 @@ public class ULocaleTest extends TestFmwk { {"x-piglatin", "", "ML", "", "x-piglatin_ML.MBE", "x-piglatin_ML.MBE", "x-piglatin_ML"}, /* Multibyte English */ {"i-cherokee", "","US", "", "i-Cherokee_US.utf7", "i-cherokee_US.utf7", "i-cherokee_US"}, {"x-filfli", "", "MT", "FILFLA", "x-filfli_MT_FILFLA.gb-18030", "x-filfli_MT_FILFLA.gb-18030", "x-filfli_MT_FILFLA"}, - {"no", "", "NO", "NY_B", "no-no-ny.utf32@B", "no_NO_NY.utf32@B", "nb_NO_NY_B"}, - {"no", "", "NO", "B", "no-no.utf32@B", "no_NO.utf32@B", "nb_NO_B"}, - {"no", "", "", "NY", "no__ny", "no__NY", "nb__NY"}, - {"no", "", "", "NY", "no@ny", "no@ny", "nb__NY"}, + {"no", "", "NO", "NY_B", "no-no-ny.utf32@B", "no_NO_NY.utf32@B", "no_NO_NY_B"}, + {"no", "", "NO", "B", "no-no.utf32@B", "no_NO.utf32@B", "no_NO_B"}, + {"no", "", "", "NY", "no__ny", "no__NY", "no__NY"}, + {"no", "", "", "NY", "no@ny", "no@ny", "no__NY"}, {"el", "Latn", "", "", "el-latn", "el_Latn", null}, {"en", "Cyrl", "RU", "", "en-cyrl-ru", "en_Cyrl_RU", null}, {"qq", "Qqqq", "QQ", "QQ", "qq_Qqqq_QQ_QQ", "qq_Qqqq_QQ_QQ", null}, @@ -898,12 +898,14 @@ public class ULocaleTest extends TestFmwk { { "zh_CN_CA@collation=pinyin", "zh_CN_CA@collation=pinyin", "zh_CN_CA@collation=pinyin" }, { "en_US_POSIX", "en_US_POSIX", "en_US_POSIX" }, { "hy_AM_REVISED", "hy_AM_REVISED", "hy_AM_REVISED" }, - { "no_NO_NY", "no_NO_NY", "nb_NO_NY" /* not: "nn_NO" [alan ICU3.0] */ }, - { "no@ny", null, "nb__NY" /* not: "nn" [alan ICU3.0] */ }, /* POSIX ID */ - { "no-no.utf32@B", null, "nb_NO_B" /* not: "nb_NO_B" [alan ICU3.0] */ }, /* POSIX ID */ + { "no_NO_NY", "no_NO_NY", "no_NO_NY" /* not: "nn_NO" [alan ICU3.0] */ }, + { "no@ny", null, "no__NY" /* not: "nn" [alan ICU3.0] */ }, /* POSIX ID */ + { "no-no.utf32@B", null, "no_NO_B" }, /* POSIX ID */ { "en-BOONT", "en__BOONT", "en__BOONT" }, /* registered name */ { "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" }, /* posix behavior that used to be performed by getName */ { "mr.utf8", null, "mr" }, @@ -911,7 +913,7 @@ public class ULocaleTest extends TestFmwk { { "x-piglatin_ML.MBE", null, "x-piglatin_ML" }, { "i-cherokee_US.utf7", null, "i-cherokee_US" }, { "x-filfli_MT_FILFLA.gb-18030", null, "x-filfli_MT_FILFLA" }, - { "no-no-ny.utf8@B", null, "nb_NO_NY_B" /* not: "nn_NO" [alan ICU3.0] */ }, /* @ ignored unless variant is empty */ + { "no-no-ny.utf8@B", null, "no_NO_NY_B" /* not: "nn_NO" [alan ICU3.0] */ }, /* @ ignored unless variant is empty */ /* fleshing out canonicalization */ /* sort keywords, ';' is separator so not present at end in canonical form */ @@ -920,7 +922,7 @@ public class ULocaleTest extends TestFmwk { { "en_Hant_IL_VALLEY_GIRL@calendar=Japanese;currency=EUR", "en_Hant_IL_VALLEY_GIRL@calendar=Japanese;currency=EUR", "en_Hant_IL_VALLEY_GIRL@calendar=Japanese;currency=EUR" }, /* norwegian is just too weird, if we handle things in their full generality */ /* this is a negative test to show that we DO NOT handle 'lang=no,var=NY' specially. */ - { "no-Hant-GB_NY@currency=$$$", "no_Hant_GB_NY@currency=$$$", "nb_Hant_GB_NY@currency=$$$" /* not: "nn_Hant_GB@currency=$$$" [alan ICU3.0] */ }, + { "no-Hant-GB_NY@currency=$$$", "no_Hant_GB_NY@currency=$$$", "no_Hant_GB_NY@currency=$$$" /* not: "nn_Hant_GB@currency=$$$" [alan ICU3.0] */ }, /* test cases reflecting internal resource bundle usage */ /* root is just a language */ @@ -2215,6 +2217,10 @@ public class ULocaleTest extends TestFmwk { "nn", "nn_Latn_NO", "nn" + }, { + "no", + "no_Latn_NO", + "no" }, { "nr", "nr_Latn_ZA", @@ -3033,8 +3039,8 @@ public class ULocaleTest extends TestFmwk { "nl" }, { "und_NO", - "nb_Latn_NO", - "nb" + "no_Latn_NO", + "no" }, { "und_NP", "ne_Deva_NP", @@ -3145,8 +3151,8 @@ public class ULocaleTest extends TestFmwk { "sl" }, { "und_SJ", - "nb_Latn_SJ", - "nb_SJ" + "no_Latn_SJ", + "no_SJ" }, { "und_SK", "sk_Latn_SK", @@ -5155,15 +5161,15 @@ public class ULocaleTest extends TestFmwk { if (!logKnownIssue("21236", "skip some canonicalization tests until code fixed")) { // language _ variant -> language - Assert.assertEquals("nb", canonicalTag("no-BOKMAL")); + Assert.assertEquals("no", canonicalTag("no-BOKMAL")); // also test with script, country and extensions - Assert.assertEquals("nb-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-u-ca-japanese")); + Assert.assertEquals("no-Cyrl-ID-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-u-ca-japanese")); // also test with other variants, script, country and extensions - Assert.assertEquals("nb-Cyrl-ID-1901-xsistemo-u-ca-japanese", + Assert.assertEquals("no-Cyrl-ID-1901-xsistemo-u-ca-japanese", canonicalTag("no-Cyrl-ID-1901-BOKMAL-xsistemo-u-ca-japanese")); - Assert.assertEquals("nb-Cyrl-ID-1901-u-ca-japanese", + Assert.assertEquals("no-Cyrl-ID-1901-u-ca-japanese", canonicalTag("no-Cyrl-ID-1901-BOKMAL-u-ca-japanese")); - Assert.assertEquals("nb-Cyrl-ID-xsistemo-u-ca-japanese", + Assert.assertEquals("no-Cyrl-ID-xsistemo-u-ca-japanese", canonicalTag("no-Cyrl-ID-BOKMAL-xsistemo-u-ca-japanese")); Assert.assertEquals("nn", canonicalTag("no-NYNORSK")); @@ -5276,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-nb-latn", canonicalTag("und-t-no-latn-BOKMAL")); + Assert.assertEquals("und-t-no-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/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeDistanceTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeDistanceTest.txt index 57adea3cff8..d8787d5f752 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeDistanceTest.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeDistanceTest.txt @@ -25,7 +25,7 @@ no-DE ; nn ; 24 no ; no ; 0 no ; da ; 12 da ; zh-Hant ; 100 -zh-Hant ; zh-Hans ; 23 ; 19 +zh-Hant ; zh-Hans ; 100 ; 100 zh-Hans ; en ; 100 en-US ; en-AU ; 5 # across clusters diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeMatcherTest.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeMatcherTest.txt index 6d21303fe2d..38c3c5981a9 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeMatcherTest.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/data/localeMatcherTest.txt @@ -270,14 +270,14 @@ und-TW >> zh-Hant # und-TW should be closer to zh-Hant than to zh @supported=en-Hant-TW, und-TW zh-Hant >> und-TW # zh-Hant should be closer to und-TW than to en-Hant-TW -zh >> und-TW # zh should be closer to und-TW than to en-Hant-TW +zh >> en-Hant-TW # no match so get first @favor=script @supported=zh, zh-Hant und-TW >> zh-Hant @supported=en-Hant-TW, und-TW zh-Hant >> und-TW -zh >> und-TW +zh >> en-Hant-TW # no match so get first ** test: testMatchLegacyCode @@ -344,8 +344,8 @@ de-CH, fr >> de # to be an acceptable match. The regional difference is considered almost insignificant. @supported=fr, zh-Hans-CN, en-US -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first # For geopolitical reasons, you might want to avoid a zh-Hant -> zh-Hans match. # In this case, if zh-TW, zh-HK or a tag starting with zh-Hant is requested, you can @@ -358,8 +358,8 @@ zh-Hant-CN, en >> en-US zh-Hans, en >> zh-Hans-CN @favor=script -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first zh-TW, en >> en-US zh-Hant-CN, en >> en-US zh-Hans, en >> zh-Hans-CN @@ -1077,8 +1077,8 @@ ar-PSCRACK >> ar-PSCRACK # enough to be an acceptable match. The regional difference is considered # almost insignificant. @supported=fr, zh-Hans-CN, en-US -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first # For geopolitical reasons, you might want to avoid a zh-Hant -> zh-Hans # match. In this case, if zh-TW, zh-HK or a tag starting with zh-Hant is @@ -1129,7 +1129,7 @@ fr >> fr @default=und es-001 >> es und >> und -ca >> und +ca >> es gl-ES >> es es >> es es-MX >> es-MX @@ -1215,7 +1215,7 @@ es-VE >> es-MX @default=und es-001 >> es und >> und -ca >> und +ca >> es gl-ES >> es es >> es es-419 >> es-419 @@ -1538,8 +1538,8 @@ de, zh >> fr ** test: best match for traditional Chinese @supported=fr, zh-Hans-CN, en-US -zh-TW >> zh-Hans-CN -zh-Hant >> zh-Hans-CN +zh-TW >> fr # no match so get first +zh-Hant >> fr # no match so get first zh-TW, en >> en-US zh-Hant-CN, en >> en-US zh-Hans, en >> zh-Hans-CN @@ -1646,14 +1646,14 @@ en >> it und-FR >> fr und-CN >> zh und-Hans >> zh -und-Hant >> zh +und-Hant >> it # no match so get first und-Latn >> it @favor=script und-FR >> fr und-CN >> zh und-Hans >> zh -und-Hant >> zh +und-Hant >> it # no match so get first und-Latn >> it ** test: match on maximized tag @@ -1918,7 +1918,7 @@ en >> und @supported=en, uk ru >> und @supported=zh-TW, en -zh-CN >> zh-TW +zh-CN >> und # no match @supported=ja ru >> und @@ -1948,7 +1948,7 @@ en >> iw-Latn @supported=en, uk ru >> uk @supported=zh-TW, en -zh-CN >> zh-TW +zh-CN >> und # no match @supported=ja ru >> und diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index 1d5148cdbf2..ea2f6e3f87c 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, nd, ne, nl, nmg, nn, nnh, no, no_NO, no_NO_NY, nus, nyn + naq, nb, nb_NO, nb_SJ, nd, ne, nl, nmg, nn, nnh, no, no_NO_NY, nus, nyn // O om, or, os @@ -290,7 +290,7 @@ // K-P ka, kk, kl, km, kn, kok, ko, ku, ky, lb, lkt, ln, lo, lt, lv, - mk, ml, mn, mo, mr, ms, mt, my, nb, ne, nl, nn, no_NO, no, + mk, ml, mn, mo, mr, ms, mt, my, nb, nb_NO, ne, nl, nn, no, no_NO, om, or, pa_IN, pa, pa_Guru, pl, ps, pt, // R-T diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/LocaleIdResolver.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/LocaleIdResolver.java index 268fb26185f..b022ba658ff 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/LocaleIdResolver.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/LocaleIdResolver.java @@ -114,7 +114,12 @@ final class LocaleIdResolver { return false; } String parentId = supplementalData.getParent(id); - if (isWildcard.test(parentId) || addWildcardMatches(parentId, isWildcard, dst)) { + int index = parentId.indexOf("_"); + String parentIdLang = (index < 0)? parentId: parentId.substring(0, index); + index = id.indexOf("_"); + String idLang = (index < 0)? id: id.substring(0, index); + if (parentIdLang.equals(idLang) && (isWildcard.test(parentId) || addWildcardMatches(parentId, isWildcard, dst))) { + // Only add child locales here if their language matches their parent; need this to handle nn (child of no) dst.add(id); return true; } diff --git a/tools/cldr/lib/README.txt b/tools/cldr/lib/README.txt index be0fcf350fa..bfca72d31fe 100644 --- a/tools/cldr/lib/README.txt +++ b/tools/cldr/lib/README.txt @@ -39,13 +39,13 @@ Only follow these remaining steps if the installation script isn't suitable or doesn't work on your system. To regenerate the CLDR API jar you need to build the "jar" target manually -using the Ant build.xml file in the "tools/java" directory of the CLDR project: +using the Maven pom.xml file in the "tools" directory of the CLDR project: -$ cd "$CLDR_ROOT/tools/java" -$ ant clean jar +$ cd "$CLDR_ROOT/tools" +$ mvn package -DskipTests=true -This should result in the cldr.jar file being built into that directory, which -can then be installed as a Maven dependency as described above. +This should result in the cldr-code.jar file being built into the cldr-code/target +sub-directory, which can then be installed as a Maven dependency as described above. Updating local Maven repository @@ -62,7 +62,7 @@ $ mvn install:install-file \ -Dpackaging=jar \ -DgeneratePom=true \ -DlocalRepositoryPath=. \ - -Dfile="$CLDR_ROOT/tools/java/cldr.jar" + -Dfile="$CLDR_ROOT/tools/cldr-code/target/cldr-code.jar" And if you have updated one of these libraries then from this directory run: diff --git a/tools/cldr/lib/install-cldr-jars.sh b/tools/cldr/lib/install-cldr-jars.sh index ab9501e4848..7047d51fef4 100755 --- a/tools/cldr/lib/install-cldr-jars.sh +++ b/tools/cldr/lib/install-cldr-jars.sh @@ -71,13 +71,13 @@ LOG_FILE="${TMPDIR:-/tmp}/cldr2icu_log_$(date '+%m%d_%H%M%S').txt" touch $LOG_FILE || die "Cannot create temporary file: ${LOG_FILE}" echo -- "---- LOG FILE ---- $(date '+%F %T') ----" >> "${LOG_FILE}" -# Build the cldr.jar in the CLDR tools directory. -CLDR_TOOLS_DIR="$1/tools/java" +# Build the cldr-code.jar in the cldr-code/target subdirectory of the CLDR tools directory. +CLDR_TOOLS_DIR="$1/tools" pushd "${CLDR_TOOLS_DIR}" > /dev/null || die "Cannot change directory to: ${CLDR_TOOLS_DIR}" echo "Building CLDR JAR file..." -run_with_logging ant -f ./build.xml clean jar -[[ -f "cldr.jar" ]] || die "Error creating cldr.jar file" +run_with_logging mvn package -DskipTests=true +[[ -f "cldr-code/target/cldr-code.jar" ]] || die "Error creating cldr-code.jar file" popd > /dev/null @@ -91,7 +91,7 @@ run_with_logging mvn -B install:install-file \ -Dpackaging=jar \ -DgeneratePom=true \ -DlocalRepositoryPath=. \ - -Dfile="${CLDR_TOOLS_DIR}/cldr.jar" + -Dfile="${CLDR_TOOLS_DIR}/cldr-code/target/cldr-code.jar" echo "Syncing local Maven repository..." run_with_logging mvn -B dependency:purge-local-repository \