From c7fe2558be37dd2935dfcbe8b087ca3edd1f3945 Mon Sep 17 00:00:00 2001 From: DraganBesevic Date: Tue, 17 Sep 2024 13:55:28 -0700 Subject: [PATCH] ICU-22723 Integrate CLDR 46 release beta1, part 2, data and test files --- icu4c/source/data/brkitr/root.txt | 2 +- icu4c/source/data/locales/root.txt | 511 ++++++++--- icu4c/source/data/misc/langInfo.txt | 841 +++++++++--------- icu4c/source/data/misc/metaZones.txt | 20 - icu4c/source/data/misc/metadata.txt | 12 + icu4c/source/data/misc/supplementalData.txt | 243 ++--- icu4c/source/data/misc/windowsZones.txt | 4 - icu4c/source/data/unit/ak.txt | 2 + icu4c/source/data/unit/ar.txt | 30 - icu4c/source/data/unit/be.txt | 23 - icu4c/source/data/unit/bn.txt | 15 - icu4c/source/data/unit/bs.txt | 20 - icu4c/source/data/unit/cs.txt | 3 - icu4c/source/data/unit/da.txt | 29 - icu4c/source/data/unit/de.txt | 34 - icu4c/source/data/unit/et.txt | 17 - icu4c/source/data/unit/fa.txt | 15 - icu4c/source/data/unit/fi.txt | 35 - icu4c/source/data/unit/hy.txt | 33 - icu4c/source/data/unit/is.txt | 30 - icu4c/source/data/unit/it.txt | 4 - icu4c/source/data/unit/ka.txt | 17 - icu4c/source/data/unit/ko.txt | 12 - icu4c/source/data/unit/lt.txt | 54 -- icu4c/source/data/unit/ml.txt | 15 - icu4c/source/data/unit/mn.txt | 15 - icu4c/source/data/unit/nl.txt | 3 - icu4c/source/data/unit/nn.txt | 3 - icu4c/source/data/unit/ru.txt | 56 -- icu4c/source/data/unit/sk.txt | 61 -- icu4c/source/data/unit/sq.txt | 17 - icu4c/source/data/unit/uk.txt | 54 -- icu4c/source/data/unit/uz.txt | 15 - icu4c/source/data/unit/vi.txt | 14 - icu4c/source/data/unit/yo.txt | 7 +- icu4c/source/data/unit/zh_Hant.txt | 12 - icu4c/source/data/unit/zu.txt | 13 - icu4c/source/data/zone/tg.txt | 2 +- .../cldr/localeIdentifiers/likelySubtags.txt | 4 +- .../cldr/localeIdentifiers/likelySubtags.txt | 4 +- .../localeIdentifiers/localeDisplayName.txt | 52 ++ .../data/cldr/units/unitPreferencesTest.txt | 8 +- 42 files changed, 1005 insertions(+), 1356 deletions(-) diff --git a/icu4c/source/data/brkitr/root.txt b/icu4c/source/data/brkitr/root.txt index 74ac72fec682..71070dd05583 100644 --- a/icu4c/source/data/brkitr/root.txt +++ b/icu4c/source/data/brkitr/root.txt @@ -25,5 +25,5 @@ root{ lstm{ Thai{"Thai_graphclust_model4_heavy.res"} Mymr{"Burmese_graphclust_model5_heavy.res"} - } + } } diff --git a/icu4c/source/data/locales/root.txt b/icu4c/source/data/locales/root.txt index de59e32bbf8d..284cfc6144ba 100644 --- a/icu4c/source/data/locales/root.txt +++ b/icu4c/source/data/locales/root.txt @@ -1484,11 +1484,11 @@ root{ dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } @@ -1510,80 +1510,80 @@ root{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} + a{"h:mm a – h:mm a"} h{"h:mm–h:mm a"} m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} h{"h:mm–h:mm a v"} m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"U–U"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"U MMM–MMM"} - y{"U MMM – U MMM"} + y{"U MMM – U MMM"} } yMMMEd{ - M{"U MMM d, E – MMM d, E"} - d{"U MMM d, E – MMM d, E"} - y{"U MMM d, E – U MMM d, E"} + M{"U MMM d, E – MMM d, E"} + d{"U MMM d, E – MMM d, E"} + y{"U MMM d, E – U MMM d, E"} } yMMMM{ M{"U MMMM–MMMM"} - y{"U MMMM – U MMMM"} + y{"U MMMM – U MMMM"} } yMMMd{ - M{"U MMM d – MMM d"} + M{"U MMM d – MMM d"} d{"U MMM d–d"} - y{"U MMM d – U MMM d"} + y{"U MMM d – U MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ @@ -1874,7 +1874,7 @@ root{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} + h{"h a"} hm{"h:mm a"} hms{"h:mm:ss a"} ms{"mm:ss"} @@ -1901,51 +1901,51 @@ root{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"HH–HH"} @@ -1965,80 +1965,80 @@ root{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} + a{"h:mm a – h:mm a"} h{"h:mm–h:mm a"} m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} h{"h:mm–h:mm a v"} m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"G y–y"} } yM{ - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } yMEd{ - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } yMMMEd{ - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } yMMMM{ M{"G y MMMM–MMMM"} - y{"G y MMMM – y MMMM"} + y{"G y MMMM – y MMMM"} } yMMMd{ - M{"G y MMM d – MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } yMd{ - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } } monthNames{ @@ -2159,7 +2159,7 @@ root{ MMMd{"MMM d"} Md{"MM-dd"} d{"d"} - h{"h a"} + h{"h a"} hm{"h:mm a"} hms{"h:mm:ss a"} hmsv{"h:mm:ss a v"} @@ -2219,51 +2219,51 @@ root{ } intervalFormats{ Bh{ - B{"h B – h B"} + B{"h B – h B"} h{"h–h B"} } Bhm{ - B{"h:mm B – h:mm B"} + B{"h:mm B – h:mm B"} h{"h:mm–h:mm B"} m{"h:mm–h:mm B"} } Gy{ - G{"G y – G y"} + G{"G y – G y"} y{"G y–y"} } GyM{ - G{"GGGGG y-MM – GGGGG y-MM"} - M{"GGGGG y-MM – y-MM"} - y{"GGGGG y-MM – y-MM"} + G{"GGGGG y-MM – GGGGG y-MM"} + M{"GGGGG y-MM – y-MM"} + y{"GGGGG y-MM – y-MM"} } GyMEd{ - G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} - M{"GGGGG y-MM-dd, E – y-MM-dd, E"} - d{"GGGGG y-MM-dd, E – y-MM-dd, E"} - y{"GGGGG y-MM-dd, E – y-MM-dd, E"} + G{"GGGGG y-MM-dd, E – GGGGG y-MM-dd, E"} + M{"GGGGG y-MM-dd, E – y-MM-dd, E"} + d{"GGGGG y-MM-dd, E – y-MM-dd, E"} + y{"GGGGG y-MM-dd, E – y-MM-dd, E"} } GyMMM{ - G{"G y MMM – G y MMM"} + G{"G y MMM – G y MMM"} M{"G y MMM–MMM"} - y{"G y MMM – y MMM"} + y{"G y MMM – y MMM"} } GyMMMEd{ - G{"G y MMM d, E – G y MMM d, E"} - M{"G y MMM d, E – MMM d, E"} - d{"G y MMM d, E – MMM d, E"} - y{"G y MMM d, E – y MMM d, E"} + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} } GyMMMd{ - G{"G y MMM d – G y MMM d"} - M{"G y MMM d – MMM d"} + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} d{"G y MMM d–d"} - y{"G y MMM d – y MMM d"} + y{"G y MMM d – y MMM d"} } GyMd{ - G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} - M{"GGGGG y-MM-dd – y-MM-dd"} - d{"GGGGG y-MM-dd – y-MM-dd"} - y{"GGGGG y-MM-dd – y-MM-dd"} + G{"GGGGG y-MM-dd – GGGGG y-MM-dd"} + M{"GGGGG y-MM-dd – y-MM-dd"} + d{"GGGGG y-MM-dd – y-MM-dd"} + y{"GGGGG y-MM-dd – y-MM-dd"} } H{ H{"HH–HH"} @@ -2283,80 +2283,80 @@ root{ M{"MM–MM"} } MEd{ - M{"MM-dd, E – MM-dd, E"} - d{"MM-dd, E – MM-dd, E"} + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} } MMM{ M{"LLL–LLL"} } MMMEd{ - M{"MMM d, E – MMM d, E"} - d{"MMM d, E – MMM d, E"} + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} } MMMd{ - M{"MMM d – MMM d"} + M{"MMM d – MMM d"} d{"MMM d–d"} } Md{ - M{"MM-dd – MM-dd"} - d{"MM-dd – MM-dd"} + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} } d{ d{"d–d"} } fallback{"{0} – {1}"} h{ - a{"h a – h a"} - h{"h–h a"} + a{"h a – h a"} + h{"h–h a"} } hm{ - a{"h:mm a – h:mm a"} + a{"h:mm a – h:mm a"} h{"h:mm–h:mm a"} m{"h:mm–h:mm a"} } hmv{ - a{"h:mm a – h:mm a v"} + a{"h:mm a – h:mm a v"} h{"h:mm–h:mm a v"} m{"h:mm–h:mm a v"} } hv{ - a{"h a – h a v"} - h{"h–h a v"} + a{"h a – h a v"} + h{"h–h a v"} } y{ y{"y–y"} } yM{ - M{"y-MM – y-MM"} - y{"y-MM – y-MM"} + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} } yMEd{ - M{"y-MM-dd, E – y-MM-dd, E"} - d{"y-MM-dd, E – y-MM-dd, E"} - y{"y-MM-dd, E – y-MM-dd, E"} + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} } yMMM{ M{"y MMM–MMM"} - y{"y MMM – y MMM"} + y{"y MMM – y MMM"} } yMMMEd{ - M{"y MMM d, E – MMM d, E"} - d{"y MMM d, E – MMM d, E"} - y{"y MMM d, E – y MMM d, E"} + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} } yMMMM{ M{"y MMMM–MMMM"} - y{"y MMMM – y MMMM"} + y{"y MMMM – y MMMM"} } yMMMd{ - M{"y MMM d – MMM d"} + M{"y MMM d – MMM d"} d{"y MMM d–d"} - y{"y MMM d – y MMM d"} + y{"y MMM d – y MMM d"} } yMd{ - M{"y-MM-dd – y-MM-dd"} - d{"y-MM-dd – y-MM-dd"} - y{"y-MM-dd – y-MM-dd"} + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} } } monthNames{ @@ -2664,6 +2664,249 @@ root{ monthNames:alias{"/LOCALE/calendar/islamic/monthNames"} quarters:alias{"/LOCALE/calendar/islamic/quarters"} } + iso8601{ + AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} + AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} + DateTimePatterns{ + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + "y MMMM d, EEEE", + "y MMMM d", + "y MMM d", + "y-MM-dd", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + "{1} {0}", + } + DateTimeSkeletons{ + "HHmmsszzzz", + "HHmmssz", + "HHmmss", + "HHmm", + "yMMMMEEEEd", + "yMMMMd", + "yMMMd", + "yMMdd", + } + NoonMarker:alias{"/LOCALE/calendar/gregorian/NoonMarker"} + NoonMarkerNarrow:alias{"/LOCALE/calendar/gregorian/NoonMarkerNarrow"} + appendItems{ + Day{"{0} ({2}: {1})"} + Day-Of-Week{"{0} {1}"} + Era{"{1} {0}"} + Hour{"{0} ({2}: {1})"} + Minute{"{0} ({2}: {1})"} + Month{"{0} ({2}: {1})"} + Quarter{"{0} ({2}: {1})"} + Second{"{0} ({2}: {1})"} + Timezone{"{0} {1}"} + Week{"{0} ({2}: {1})"} + Year{"{1} {0}"} + } + availableFormats{ + Bh{"h B"} + Bhm{"h:mm B"} + Bhms{"h:mm:ss B"} + E{"ccc"} + EBhm{"E h:mm B"} + EBhms{"E h:mm:ss B"} + EHm{"E HH:mm"} + EHms{"E HH:mm:ss"} + Ed{"d, E"} + Ehm{"E h:mm a"} + Ehms{"E h:mm:ss a"} + Gy{"G y"} + GyMMM{"G y MMM"} + GyMMMEd{"G y MMM d, E"} + GyMMMd{"G y MMM d"} + GyMd{"G y-MM-dd"} + H{"HH"} + Hm{"HH:mm"} + Hms{"HH:mm:ss"} + Hmsv{"HH:mm:ss v"} + Hmv{"HH:mm v"} + M{"L"} + MEd{"MM-dd, E"} + MMM{"LLL"} + MMMEd{"MMM d"} + MMMMW{ + other{"MMMM 'week' W"} + } + MMMMd{"MMMM d"} + MMMd{"MMM d"} + Md{"MM-dd"} + d{"d"} + h{"h a"} + hm{"h:mm a"} + hms{"h:mm:ss a"} + hmsv{"h:mm:ss a v"} + hmv{"h:mm a v"} + ms{"mm:ss"} + y{"y"} + yM{"y-MM"} + yMEd{"y-MM-dd, E"} + yMMM{"y MMM"} + yMMMEd{"y MMM d, E"} + yMMMM{"y MMMM"} + yMMMd{"y MMM d"} + yMd{"y-MM-dd"} + yQQQ{"y QQQ"} + yQQQQ{"y QQQQ"} + yw{ + other{"Y 'week' w"} + } + } + dayNames:alias{"/LOCALE/calendar/gregorian/dayNames"} + eras:alias{"/LOCALE/calendar/gregorian/eras"} + intervalFormats{ + Bh{ + B{"h B – h B"} + h{"h–h B"} + } + Bhm{ + B{"h:mm B – h:mm B"} + h{"h:mm–h:mm B"} + m{"h:mm–h:mm B"} + } + Gy{ + G{"G y – G y"} + y{"y–y"} + } + GyM{ + G{"G y-MM – G y-MM"} + M{"G y-MM – y-MM"} + y{"G y-MM – y-MM"} + } + GyMEd{ + G{"G y-MM-dd, E – G y-MM-dd, E"} + M{"G y-MM-dd, E – y-MM-dd, E"} + d{"G y-MM-dd, E – y-MM-dd, E"} + y{"G y-MM-dd, E – y-MM-dd, E"} + } + GyMMM{ + G{"G y MMM – G y MMM"} + M{"G y MMM–MMM"} + y{"G y MMM – y MMM"} + } + GyMMMEd{ + G{"G y MMM d, E – G y MMM d, E"} + M{"G y MMM d, E – MMM d, E"} + d{"G y MMM d, E – MMM d, E"} + y{"G y MMM d, E – y MMM d, E"} + } + GyMMMd{ + G{"G y MMM d – G y MMM d"} + M{"G y MMM d – MMM d"} + d{"G y MMM d–d"} + y{"G y MMM d – y MMM d"} + } + GyMd{ + G{"G y-MM-dd – G y-MM-dd"} + M{"G y-MM-dd – y-MM-dd"} + d{"G y-MM-dd – y-MM-dd"} + y{"G y-MM-dd – y-MM-dd"} + } + H{ + H{"HH–HH"} + } + Hm{ + H{"HH:mm–HH:mm"} + m{"HH:mm–HH:mm"} + } + Hmv{ + H{"HH:mm–HH:mm v"} + m{"HH:mm–HH:mm v"} + } + Hv{ + H{"HH–HH v"} + } + M{ + M{"MM–MM"} + } + MEd{ + M{"MM-dd, E – MM-dd, E"} + d{"MM-dd, E – MM-dd, E"} + } + MMM{ + M{"LLL–LLL"} + } + MMMEd{ + M{"MMM d, E – MMM d, E"} + d{"MMM d, E – MMM d, E"} + } + MMMd{ + M{"MMM d – MMM d"} + d{"MMM d–d"} + } + Md{ + M{"MM-dd – MM-dd"} + d{"MM-dd – MM-dd"} + } + d{ + d{"d–d"} + } + fallback{"{0} – {1}"} + h{ + a{"h a – h a"} + h{"h–h a"} + } + hm{ + a{"h:mm a – h:mm a"} + h{"h:mm–h:mm a"} + m{"h:mm–h:mm a"} + } + hmv{ + a{"h:mm a – h:mm a v"} + h{"h:mm–h:mm a v"} + m{"h:mm–h:mm a v"} + } + hv{ + a{"h a – h a v"} + h{"h–h a v"} + } + y{ + y{"y–y"} + } + yM{ + M{"y-MM – y-MM"} + y{"y-MM – y-MM"} + } + yMEd{ + M{"y-MM-dd, E – y-MM-dd, E"} + d{"y-MM-dd, E – y-MM-dd, E"} + y{"y-MM-dd, E – y-MM-dd, E"} + } + yMMM{ + M{"y MMM–MMM"} + y{"y MMM – y MMM"} + } + yMMMEd{ + M{"y MMM d, E – MMM d, E"} + d{"y MMM d, E – MMM d, E"} + y{"y MMM d, E – y MMM d, E"} + } + yMMMM{ + M{"y MMMM–MMMM"} + y{"y MMMM – y MMMM"} + } + yMMMd{ + M{"y MMM d – MMM d"} + d{"y MMM d–d"} + y{"y MMM d – y MMM d"} + } + yMd{ + M{"y-MM-dd – y-MM-dd"} + d{"y-MM-dd – y-MM-dd"} + y{"y-MM-dd – y-MM-dd"} + } + } + monthNames:alias{"/LOCALE/calendar/gregorian/monthNames"} + quarters:alias{"/LOCALE/calendar/gregorian/quarters"} + } japanese{ AmPmMarkers:alias{"/LOCALE/calendar/gregorian/AmPmMarkers"} AmPmMarkersNarrow:alias{"/LOCALE/calendar/gregorian/AmPmMarkersNarrow"} diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index 49fcb0eaed04..211156c2aa1d 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -7782,9 +7782,9 @@ aebd79b8157a00186fc19d75957a647a 32e1d56de838f5d91d3001e1adf8ead9 1d3a022a3e42d85bc94811616e01e2ab aff4abaa0b4d26540f54d85b75552a56 -10ceabad10d3abac4dd87118502a5310 +10ceabad10d3abac4dd87117502a5310 d2aba802c1aba7c6aba5c8aba647f05b -83473248d870f94910c4aba301c2abab +83473248d870f84910c4aba301c2abab c6aba1754e776c7904e2d56de7d91d36 ead91d37eed91d38f0d91d3903e8d91d 31edd91d32eed91d33f9d91d3410e1d9 @@ -9246,8 +9246,8 @@ f2abb8e973e938eaabb0ebabb1ecabb2 edabb3022a3c42a2594811616e01e2ab aff4abaa0b4d2d5417542e55385610c4 abad01c8aba9d7abaa01cbababd3abac -4dcca1502a5310d2aba802c6aba5c8ab -a6daaba7470e473048cc854910c4aba3 +4dcca0502a5310d2aba802c6aba5c8ab +a6daaba7470e473048cc844910c4aba3 10c6aba12aab9e412a4210ceaba010d5 ab9f126f70efabaee2ab99e4ab9ae6ab 9be7ab9ce8ab9d06eb0cebab8ceeab8d @@ -9337,7 +9337,7 @@ ad890012ed20f40ff4ada9f5adaaf6ad abf7adacf9adadedada4eeada5efada6 f0ada7f1ada8e60fe6ad9fe7ada0e9ad a1eaada2ecada3e1ad9be2ad9ce4ad9d -e5ad9e2ab40061ccfb62002373c2d0e5 +e5ad9e2ab40061ccf262002373c2d0e5 1ded0feda905eea91eefa936f2a979f3 a993e5a74be7a778e8a78ee9a7a777c1 4b773878a26179a2a77aa2e8e1a5ea00 @@ -9524,11 +9524,11 @@ e3d591efd59210e6af1e10e4d5901179 edc1260461386258655e6b64731168f5 d59c02672e6e327210e2d59910edd597 10e4d5981161f4a54b1177e1d59a116f -ef012aafcf4d10ccd59b47c4684ac374 -4aa6f84ba8114c03614665a6d469a6d6 +ef012aafcf4d10ccd59b47c4674ac373 +4aa6f74ba8104c03614665a6d369a6d5 7901632a6410e9d58b10e9d58a026ea6 -b16fa6b27410ee001e49c17a539f571a -57acee58acf259305a01cda756d7cdce +b06fa6b17410ee001d4ac15d539f571a +57aced58acf159305a01cda756d7cdce 02c4d565c5d565d4d529534854a24855 a26b5603c1d524c5d526ced525d5a7a7 0fce1ad40cd4d519d5bb17d6d51ad9d5 @@ -9536,7 +9536,7 @@ a26b5603c1d524c5d526ced525d5a7a7 d514cbcd8fccbb14cdd515c3d513c4d5 64c5cf63c9cda80ccd17d20cd2d1e3d6 d33ed7d1f7dacf6acdd159ced588cfd1 -b0c8c615c8d587cbd161ccd51f04c1d5 +b0c8c614c8d587cbd161ccd51f04c1d5 89c7d521d3afd8d9d522dad5234d8f4d 484ea24f50a2645203c5d512cfc16ad5 bb17d7cbc30011cf1dd50fd5bf9cd6d5 @@ -9546,264 +9546,263 @@ d2d581d4c1e1c60fc6d3fec7bfb1cbd5 c5cd0006c90cc9d506ccaf82cfc392d0 d583c1d503c3d504c5d5050bcc14d409 d4d510d7c7f1d9b319ccc967cdd50dd2 -d50ec7c5d1c7d1ccc8b12fcbd584495a -4a8c4b904c06d30cd3d3f8d4bdedd5d3 -f9d6bf0cc2d57cc9d3f7cbd57d07d10c -d1d577d2d578d3b567d4b5d6c3d3eec4 -b56accd575ced57610cfd57902c5d3f1 -cdd57adad57b41c1044557454a467647 -864804cbd574ced3edd2b51ed4b52fd5 -b53506c70cc7d570d2d571d3aff5d4d5 -63c1d3e2c3d3e3c5afbc02c9b12bcfb1 -43d2b14c0ace0cd2c631d2d573d4d3eb -d7d3ecc1d3e6c5d572c6d3e7c8a3b9cc -b975414c429e43a26d4404c5adbbcad3 -dfcbad84cfd3e0dad56f0bd214d709d7 -d3c9d8d3cadaa5ded2d3c6d3d3c7d4d3 -c8cc09cca3cfcdd568cfd3c5c4d3c2c5 -d566c6d5670dcc17d10cd1d3d2d2c9dc -d4d56bd5b776ccd3cfced3d0cfd3d1c6 -0cc6d3ccc7d56ac9cb95cad3cec1a993 -c4d569c5d3cb0fce1ad60cd6d3ddd7c7 -edd9d56edaad43ced56dcfd3dad2d3db -d5d3dcc80cc8d3d6c9d3d7ccd3d8cdd3 -d9c3d56cc4d3d3c6d3d4c7d3d5321732 -3634ae6a3736381138b6d5651133b0d5 -631133b6d5642aafd830ae7b311137b2 -bb1710e1c5a110ef012abdbc4c10c1bd -bc1170e3bd2f026d2e6e327310f5bd65 -10e2bd5b01e1bbe3e2b34e01613a7011 -61ee012ab5f84a10d0b5f8016d2a7610 -e1d55f10efd55e066e256e346f3a7254 -741168e9d5621164e1b9ad1172e5012a -b9c64b01d0d3f3d2b9c61161e9a5f761 -306850691174f3d561026c2e6e327710 -e9b78210e9afc210e1d56002612e6d32 -6f10eacd1510f2c9c010f2012ab9904b -10c8b990473448a26a49127461ecb104 -056f456f4a726475026a2e6b327210f5 -c7de10f2b36510e8d554016e2a7410e8 -b34001e7d552edaff70161506510eb03 -2aafc3432e47325410d2a78b10d9d3de -10d2afc310eed553613065366c1161e7 -ad631172e1d551116ff2012ab1c24710 -c5b1c2056c186c306d3675116ee7d55d -1175f7b3ef106e01e7b507f0b5066132 -65a247691172e1d55c016e2a7410f2a5 -4a05ef2defd557f35ef4042aabaa4332 -483c4d405410d7abaa01c1d558ced559 -10cbaba210cfaba4012aab9e4310ceab -9ee2abafe7d555e9d5561162f2032ab3 -c9493453385501c1b72ad3d55b10ccb3 -c910c5d55a43c135437444a2ee450267 -446c4a741168e9012aa3e54501d2d3e5 -d4a3e51179f0afb201622a7910edd550 -10e1d54f0461a28e68a29d6fa2ac70a2 -ae791172ec0e4b48541d5432553c5846 -5910d5cbfe01cad110d2d54701c1d39d -dad54810cbd5494b324d3c52525310cb -d54601c7bbb1dad3f503c4d543c5d544 -cbbf24ceaf4f02cfd545d3cbfed5cbb4 -421f4232434247464910d2d54202c1d5 -40c7a778d9a74b10d3cbfe01c551d2d5 -412acbb438364102c6d53dccd53edad5 -3f1139b0cbfe026b2e6e327210e9d53a -10edab7c10f3b59302612e65327210f3 -d53b10edabce10f2abb81170f4ad1901 -6d2a7210f4b34d10eed53c0365346986 -6f8c751170ecd54e1176e10649174932 -4d364e3a5010cba9bd10ceb3d510d5d5 -4b10d0c3d52ab3d5422a4610cab3d910 -d4d54a1161ebd54c1167f2d54d2aa254 -41a8ae42056f1f6f3e72447501672a68 -10e4d53910e9d5381170efabae106101 -e8c95ee9d5376130655c68116bf3d536 -036c326d36733a7410ebd53510e9d534 -10f5a5fe10f3a9a2116ee7012aa91e42 -10c4a91e00214ac1c152c0d6563b5642 -575e5868596c5a02cda756d2d3d3d7cd -ce04c1d524c4d525c5d526ced525d5a7 -a701c6d527d3cdb910cbd52803c4d3c1 -c5d3c1d4d529d5cbfe5246536c54a25e -5503c1d39dc7d521d9d522dad52305d3 -09d3cbfed5cbb4d7cbc3c5d512c8cdce -cfc16a0010cd1dd30fd3d518d4d519d5 -cbb4d6d51ad9d51bcdd515ced516cfcd -e3d2d517c90cc9cda8cad514cbcd8fcc -bb14c1d507c3d513c4d3c0c5cf630ecd -1ad20cd2d1e3d6d33ed7abaadacf6acd -d159ced520cfd1b0d0d51fc80cc8d127 -cad110cbd161ccd51fc4d51cc6d51dc7 -d51e4e5b4e344fa81050665110c1d511 -08c90fc9d506ccaf82cfc392d0c3d5d4 -d507c1d503c3d504c5d505c8a7a70dcd -17d40cd4d510d7c7f1d9b319dad509cd -d50dd2d50ed3d50fc70cc7d1ccc8b12f -cbd50cccc967c1d509c5d50ac6d50b4a -a2484ba24c4ca2644d0012ce20d50fd5 -bf9cd6af89d8d501d9bf35dad502ceaf -4fcfaba4d1d3ffd2d500d4c1e1c60fc6 -d3fec7bfb1cbbf24cca905cda9d2c1d3 -fbc3d3fcc4d3fdc5cd0001cfd3f0d0b5 -f807d00cd0d3f3d2b9c6d7d3f4dad3f5 -c5d3f1c7bbb1c8b990cdd3f208d30fd3 -d3f8d4bdedd5d3f9d6bf0cd9d3fac1bd -bcc2d3f6c9d3f7cbcd6c41c14c458945 -68469a47a24748a26a4907d10cd1d3ef -d2b112d3b567d4b5d6c3d3eec4b56acc -b3c9ceb3d507c80cc8d3e4d2d3e5d3af -f5d4a3e5c1d3e2c3d3e3c5afbcc7a548 -03c9b12bcfb143d2b14cd8b14c0ace14 -d209d2afc3d4d3ebd7d3ecced3e8d0d3 -e9d1d3eac1d3e6c5b1c2c6d3e7c8a3b9 -ccb97505d409d4b52fd5b535d6d3cccb -aba2ced3edd2b51e415e42a24a43a27e -4406cb0ccbad84cfd3e0d9d3cedad3e1 -c4adbbc5adbbcad3df0ccf17d40cd4d3 -c8d7d3c9d8d3cadaa5decfd3c5d2d3c6 -d3d3c7cc09cca3cfcda554cec7edc4d3 -c2c5d3c3c6d3c40fcc1ad20cd2c9dcd4 -a34fd5a9d2d9a74bccd3cfced3d0cfd3 -d1d1d3d2c70cc7a778c8d3cdc9cb95ca -d3cec1a993c4a91ec5d3cbc6d3cc0010 -ce1dd50fd5d3dcd6d3ddd7c7edd9d3de -daad43ceab9ecfd3dad2d3dbd3cbfec8 -0cc8d3d6c9d3d7ccd3d8cdd3d9c3bf36 -c4d3d3c6d3d4c7d3d534223442354837 -4e3801382a3910b0cbfe10b6d3c11131 -b9d3bf1133b2c7ed1133b6d3c02aafd8 -304a31503202302e33323810b0adbb10 -b0ad4310b0a3e51130b1afd81137b2cb -b4046438673e6844724a761173f4a358 -116cedb1271168e2d52a116feda39601 -613e6d01e9a549ee012aa5544110cda5 -5410e200134c665135513c5340545655 -725901c5d3c1d4cf6b10c1d51103c1d5 -07c4d3c0d3d518d9d51b04c7a52ac8bf -98cad532ced520d2d53310cbd52d4c3c -4d464e624f665001cbd50cd3d50f01c2 -d3f6d9d3fa04c1d3fbcdd52cceb95bd2 -d500d5d53010c7d53110cdd508452f45 -42474c49504a664b02c8abc9cdd3f2d7 -d3f401c7a548c8d3e410c2d52d03c4d5 -2eced52fd1d3efd2b11210cfd3f02aa5 -484132423c434c4410dad3e101c5d3c3 -c6d3c402c8d3cdced52bd5d52c01c3bf -36ced390002574c1f5e534f223f2a548 -f3a560f6a5a3f9a5cafa012a2e411272 -61e2a5e0022aa5de49a2b55210d5a5e1 -e5a358e6a366eba3b9eda3e5eea3fc78 -a67832795e7aa260e125e25106eb0ceb -a5c6eca5c7eda5c8f8a5c9e2a5c3e5a5 -c4e7a5c50013ee20f30ff3a5d9f4a5da -f5a5dbf8a5dcfaa5ddeea5d5efa5d6f0 -a5d7f1a5d8f2a5cae70fe7a5d0e8a5d1 -e9a5d2eba5d3eca5d4e1a5cbe2a5cce3 -a5cde4a5cee5a5cf08ed0feda5e5eea5 -e6efa5e7f4a5e8faa5e9e2a5e2e4a5e3 -e7a5e4ea012a2e41127261e2a5e0032a -a5de312e49345310d5a5e11137b2a5e1 -01d1a5dfd2a5e074a24875a29d76a2e3 -770012ee20f50ff5a5bef6a5bff7a5c0 -f8a5c1f9a5c2eea5b9efa5baf2a5bbf3 -a5bcf4a5bde70fe7a5b4e8a5b5e9a5b6 -eba5b7eda5b8e1a5b0e2a5b1e3a5b2e5 -a5b30017ef2af514f809f8a58bf9a58c -faa58df5a588f6a589f7a58af209f2a5 -85f3a586f4a587efa582f0a583f1a584 -e914ec09eca57feda580eea581e9a57c -eaa57deba57ee409e4a579e5a57ae7a5 -7be1a576e2a577e3a5780014ed25f214 -f709f7a5a0f9a5a1faa5a2f2a59df4a5 -9ef5a59feda598eea599efa59af0a59b -f1a59ce80fe8a593e9a594eaa595eba5 -96eca597e1a58ee3a58fe4a590e5a591 -e7a5920bee14f409f4a5adf5a5aef6a5 -afeea5aaefa5abf3a5aceb09eba5a7ec -a5a8eda5a9e2a5a4e4a5a5e9a5a66ac2 -e86fc16d6fa25370a28e71a2e372a2fe -730014ec25f414f809f8a573f9a574fa -a575f4a570f5a571f6a572eca56beea5 -6cefa56df2a56ef3a56fe70fe7a566e8 -a567e9a568eaa569eba56ae1a561e2a5 -62e3a563e4a564e5a5650011eb1df20f -f2a524f3a525f4a526f8a527faa528eb -a520eca521eda522eea523e50fe5a51b -e6a51ce7a51de9a51eeaa51fe1a517e2 -a518e3a519e4a51a0017ee2af514f809 -f8a53cf9a53dfaa53ef5a539f6a53af7 -a53bf209f2a536f3a537f4a538eea533 -efa534f0a535e814eb09eba530eca531 -eda532e8a52de9a52eeaa52fe509e5a5 -2be6a382e7a52ce2a529e3a3b5e4a52a -08ed0feda543eea544f2a545f4a546fa -a547e3a53fe4a540e7a541eba5420014 -ee25f314f809f8a55df9a55efaa55ff3 -a55af5a55bf7a55ceea555efa556f0a5 -57f1a558f2a559e90fe9a550eaa551eb -a552eca553eda554e2a548e332e4a54d -e5a54ee8a54f032aa54948324e3a5012 -616ceda54c126174f2a54a126261f4a5 -4b6aa2686ba2836ca2c46da4196e0019 -ee2df417f70cf7a513f8a514f9a515fa -a516f4a510f5a511f6a512f109f1a50d -f2a50ef3a50feea50aefa50bf0a50ce7 -17ea0ceaa506eba507eca508eda509e7 -a503e8a504e9a505e409e4a500e5a501 -e6a502e1a3fde2a3fee3a3ff08f00ff0 -a3b5f4a35af5a3b6f7a3b7faa3b8e1a3 -b1e7a3b2e9a3b3eea3b40013ef20f40f -f4a3c9f5a3caf6a3cbf7a3ccfaa3cdef -a3c4f0a3c5f1a3c6f2a3c7f3a3c8e70f -e7a3bfe8a3c0e9a3c1eba3c2eca3c3e2 -a3bae3a3bbe4a3bce5a3bde6a3be0017 -ee2af414f809f8a3e2f9a3e3faa3e4f4 -a3dff5a3e0f7a3e1f109f1a3ddf2a3de -f3a3cfeea3daefa3dbf0a3dce814eb09 -eba3d7eca3d8eda3d9e8a3d4e9a3d5ea -a3d6e409e4a3d1e5a3d2e6a3d3e1a3ce -e2a3cfe3a3d00016ef2af514f809f8a3 -f9f9a3fafaa3fbf5a3f6f6a3f7f7a3f8 -f209f2a3f3f3a3f4f4a3f5efa3f0f0a3 -f1f1a3f2e714eb09eba3ededa3eeeea3 -efe7a3ebe9a3aceaa3ece1a3e6e2a3e7 -e3a3e8e5a3e9e6a3ea65c14365a25866 -a28367a2ab68a406690015ed25f214f7 -09f7a3aef8a3aff9a3b0f2a3abf3a3ac -f4a3adeda3a6eea3a7efa3a8f0a3a9f1 -a3aae614ea09eaa3a3eba3a4eca3a5e6 -a3a0e7a3a1e9a3a2e1a39be2a39ce3a3 -9de4a39ee5a39f0ced17f50cf5a362f7 -a363f9a364faa365eda35ff1a360f2a3 -61e509e5a35ceba35deca35ee1a359e2 -a35ae3a35b0bee14f309f3a370f5a371 -faa372eea36defa36ef0a36fe809e8a3 -6ae9a36beba36ce2a367e4a368e5a369 -0019ee2df417f70cf7a389f8a38af9a3 -8bfaa38cf4a386f5a387f6a388f109f1 -a383f2a384f3a385eea380efa381f0a3 -82e717ea0ceaa37ceba37deca37eeda3 -7fe7a379e8a37ae9a37be409e4a376e5 -a377e6a378e1a373e2a374e3a3750ded -17f00cf0a397f2a398f3a399f4a39aed -a394eea395efa396e80ce8a390e9a391 -eba392eca393e1a38de2a38ee7a38f61 -a25062a28563a2be640014ee25f414f8 -09f8a355f9a356faa357f4a352f5a353 -f7a354eea34defa34ef0a34ff1a350f2 -a351e70fe7a348e8a349e9a34aeaa34b -eca34ce1a343e2a344e4a345e5a346e6 -a3470015ed1af30ef706f74bf84dfa4f -f33df447f549ed3dee3fef41f043f145 -e60ee906e937eb39ec3be631e733e835 -e127e229e32be42de52f0016ee1ef50e -f806f87bf97dfa7ff575f677f779f206 -f26ff371f473ee69ef6bf06de60ee906 -e963ec65ed67e65de75fe861e153e255 -e357e459e55b0012f118f60cf69df79f -f8a1f9a341faa342f193f295f397f499 -f59be60ae689e88bed8dee8ff091e181 -e283e485e587 +d50ec7c5d0c7d1ccc8b12fcbd5844a56 +4b5a4c06d30cd3d3f8d4bdedd5d3f9d6 +bf0cc2d57cc9d3f7cbd57d10cfd57902 +c5d3f1cdd57adad57b42c0f6465b4662 +477248a2444907d10cd1d577d2d578d3 +b567d4b5d6c3d3eec4b56accd575ced5 +7602c9b12bcfb143d2b14c0ace0cd2c6 +3bd2d573d4d3ebd7d3ecc1d3e6c5d572 +c6d3e7c8a3b9ccb97504cbd574ced3ed +d2b51ed4b52fd5b535425e43a24d44a2 +814506c70cc7d570d2d571d3aff5d4d5 +63c1d3e2c3d3e3c5afbc0dcc17d10cd1 +d3d2d2c9dcd4d56bd5b776ccd3cfced3 +d0cfd3d1c60cc6d3ccc7d56ac9cb95ca +d3cec1a993c4d569c5d3cb0fce1ad60c +d6d3ddd7c7edd9d56edaad43ced56dcf +d3dad2d3dbd5d3dcc80cc8d3d6c9d3d7 +ccd3d8cdd3d9c3d56cc4d3d3c6d3d4c7 +d3d504c5adbbcad3dfcbad84cfd3e0da +d56f343d34aea5377c3882410bd214d7 +09d7d3c9d8d3cadaa5ded2d3c6d3d3c7 +d4d3c8cc09cca3cfcdd568cfd3c5c4d3 +c2c5d566c6d5671133b6d5641138b6d5 +652aafd8312c321133b0d5631137b2bb +1710e1c5a110ef012abdbc4c10c1bdbc +1170e3bd2f026d2e6e327310f5bd6510 +e2bd5b01e1bbe3e2b34e01613a701161 +ee012ab5f84a10d0b5f8016d2a7610e1 +d55f10efd55e066e256e346f3a725474 +1168e9d5621164e1b9ad1172e5012ab9 +c64b01d0d3f3d2b9c61161e9a5f76130 +6850691174f3d561026c2e6e327710e9 +b78210e9afc210e1d56002612e6d326f +10eacd1510f2c9c010f2012ab9904b10 +c8b990473448a26a49127461ecb10405 +6f456f4a726475026a2e6b327210f5c7 +de10f2b36510e8d554016e2a7410e8b3 +4001e7d552edaff70161506510eb032a +afc3432e47325410d2a78b10d9d3de10 +d2afc310eed553613065366c1161e7ad +631172e1d551116ff2012ab1c24710c5 +b1c2056c186c306d3675116ee7d55d11 +75f7b3ef106e01e7b507f0b506613265 +a247691172e1d55c016e2a7410f2a54a +05ef2defd557f35ef4042aabaa433248 +3c4d405410d7abaa01c1d558ced55910 +cbaba210cfaba4012aab9e4310ceab9e +e2abafe7d555e9d5561162f2032ab3c9 +493453385501c1b72ad3d55b10ccb3c9 +10c5d55a43c135437444a2ee45026744 +6c4a741168e9012aa3e54501d2d3e5d4 +a3e51179f0afb201622a7910edd55010 +e1d54f0461a28e68a29d6fa2ac70a2ae +791172ec0e4b48541d5432553c584659 +10d5cbfe01cad110d2d54701c1d39dda +d54810cbd5494b324d3c52525310cbd5 +4601c7bbb1dad3f503c4d543c5d544cb +bf24ceaf4f02cfd545d3cbfed5cbb442 +1f4232434247464910d2d54202c1d540 +c7a778d9a74b10d3cbfe01c551d2d541 +2acbb438364102c6d53dccd53edad53f +1139b0cbfe026b2e6e327210e9d53a10 +edab7c10f3b59302612e65327210f3d5 +3b10edabce10f2abb81170f4ad19016d +2a7210f4b34d10eed53c03653469866f +8c751170ecd54e1176e106491749324d +364e3a5010cba9bd10ceb3d510d5d54b +10d0c3d52ab3d5422a4610cab3d910d4 +d54a1161ebd54c1167f2d54d2aa25441 +a8a642056f1f6f3e72447501672a6810 +e4d53910e9d5381170efabae106101e8 +c95ee9d5376130655c68116bf3d53603 +6c326d36733a7410ebd53510e9d53410 +f5a5fe10f3a9a2116ee7012aa91e4210 +c4a91e00204ac1c152c0d6563b564257 +5e5868596c5a02cda756d2d3d3d7cdce +04c1d524c4d525c5d526ced525d5a7a7 +01c6d527d3cdb910cbd52803c4d3c1c5 +d3c1d4d529d5cbfe5246536c54a25e55 +03c1d39dc7d521d9d522dad52305d309 +d3cbfed5cbb4d7cbc3c5d512c8cdcecf +c16a0010cd1dd30fd3d518d4d519d5cb +b4d6d51ad9d51bcdd515ced516cfcde3 +d2d517c90cc9cda8cad514cbcd8fccbb +14c1d507c3d513c4d3c0c5cf630ecd1a +d20cd2d1e3d6d33ed7abaadacf6acdd1 +59ced520cfd1b0d0d51fc80cc8d127ca +d110cbd161ccd51fc4d51cc6d51dc7d5 +1e4e5b4e344fa80850665110c1d51108 +c90fc9d506ccaf82cfc392d0c3d5d4d5 +07c1d503c3d504c5d505c8a7a70dcd17 +d40cd4d510d7c7f1d9b319dad509cdd5 +0dd2d50ed3d50fc70cc7d1ccc8b12fcb +d50cccc967c1d509c5d50ac6d50b4aa2 +484ba24c4ca2644d0012ce20d50fd5bf +9cd6af89d8d501d9bf35dad502ceaf4f +cfaba4d1d3ffd2d500d4c1e1c60fc6d3 +fec7bfb1cbbf24cca905cda9d2c1d3fb +c3d3fcc4d3fdc5cd0001cfd3f0d0b5f8 +07d00cd0d3f3d2b9c6d7d3f4dad3f5c5 +d3f1c7bbb1c8b990cdd3f208d30fd3d3 +f8d4bdedd5d3f9d6bf0cd9d3fac1bdbc +c2d3f6c9d3f7cbcd6c42c11b466b4662 +477848a24f4907d10cd1d3efd2b112d3 +b567d4b5d6c3d3eec4b56accb3c9ceb3 +d503c9b12bcfb143d2b14cd8b14c0ace +14d209d2afc3d4d3ebd7d3ecced3e8d0 +d3e9d1d3eac1d3e6c5b1c2c6d3e7c8a3 +b9ccb97505d409d4b52fd5b535d6d3cc +cbaba2ced3edd2b51e426443a25644a2 +8e4507c80cc8d3e4d2d3e5d3aff5d4a3 +e5c1d3e2c3d3e3c5afbcc7a5480fcc1a +d20cd2c9dcd4a34fd5a9d2d9a74bccd3 +cfced3d0cfd3d1d1d3d2c70cc7a778c8 +d3cdc9cb95cad3cec1a993c4a91ec5d3 +cbc6d3cc0010ce1dd50fd5d3dcd6d3dd +d7c7edd9d3dedaad43ceab9ecfd3dad2 +d3dbd3cbfec80cc8d3d6c9d3d7ccd3d8 +cdd3d9c3bf36c4d3d3c6d3d4c7d3d506 +cb0ccbad84cfd3e0d9d3cedad3e1c4ad +bbc5adbbcad3df354b3586378c389241 +0ccf17d40cd4d3c8d7d3c9d8d3cadaa5 +decfd3c5d2d3c6d3d3c7cc09cca3cfcd +a554cec7edc4d3c2c5d3c3c6d3c41133 +b2c7ed1133b6d3c001382a3910b0cbfe +10b6d3c12aafd831303236341131b9d3 +bf1137b2cbb402302e33323810b0adbb +10b0ad4310b0a3e5046438673e684472 +4a761173f4a358116cedb1271168e2d5 +2a116feda39601613e6d01e9a549ee01 +2aa5544110cda55410e200134c665135 +513c5340545655725901c5d3c1d4cf6b +10c1d51103c1d507c4d3c0d3d518d9d5 +1b04c7a52ac8bf98cad532ced520d2d5 +3310cbd52d4c3c4d464e624f665001cb +d50cd3d50f01c2d3f6d9d3fa04c1d3fb +cdd52cceb95bd2d500d5d53010c7d531 +10cdd508452f4542474c49504a664b02 +c8abc9cdd3f2d7d3f401c7a548c8d3e4 +10c2d52d03c4d52eced52fd1d3efd2b1 +1210cfd3f02aa5484132423c434c4410 +dad3e101c5d3c3c6d3c402c8d3cdced5 +2bd5d52c01c3bf36ced390002574c1f5 +e534f223f2a548f3a560f6a5a3f9a5ca +fa012a2e41127261e2a5e0022aa5de49 +a2b55210d5a5e1e5a358e6a366eba3b9 +eda3e5eea3fc78a67832795e7aa260e1 +25e25106eb0ceba5c6eca5c7eda5c8f8 +a5c9e2a5c3e5a5c4e7a5c50013ee20f3 +0ff3a5d9f4a5daf5a5dbf8a5dcfaa5dd +eea5d5efa5d6f0a5d7f1a5d8f2a5cae7 +0fe7a5d0e8a5d1e9a5d2eba5d3eca5d4 +e1a5cbe2a5cce3a5cde4a5cee5a5cf08 +ed0feda5e5eea5e6efa5e7f4a5e8faa5 +e9e2a5e2e4a5e3e7a5e4ea012a2e4112 +7261e2a5e0032aa5de312e49345310d5 +a5e11137b2a5e101d1a5dfd2a5e074a2 +4875a29d76a2e3770012ee20f50ff5a5 +bef6a5bff7a5c0f8a5c1f9a5c2eea5b9 +efa5baf2a5bbf3a5bcf4a5bde70fe7a5 +b4e8a5b5e9a5b6eba5b7eda5b8e1a5b0 +e2a5b1e3a5b2e5a5b30017ef2af514f8 +09f8a58bf9a58cfaa58df5a588f6a589 +f7a58af209f2a585f3a586f4a587efa5 +82f0a583f1a584e914ec09eca57feda5 +80eea581e9a57ceaa57deba57ee409e4 +a579e5a57ae7a57be1a576e2a577e3a5 +780014ed25f214f709f7a5a0f9a5a1fa +a5a2f2a59df4a59ef5a59feda598eea5 +99efa59af0a59bf1a59ce80fe8a593e9 +a594eaa595eba596eca597e1a58ee3a5 +8fe4a590e5a591e7a5920bee14f409f4 +a5adf5a5aef6a5afeea5aaefa5abf3a5 +aceb09eba5a7eca5a8eda5a9e2a5a4e4 +a5a5e9a5a66ac2e86fc16d6fa25370a2 +8e71a2e372a2fe730014ec25f414f809 +f8a573f9a574faa575f4a570f5a571f6 +a572eca56beea56cefa56df2a56ef3a5 +6fe70fe7a566e8a567e9a568eaa569eb +a56ae1a561e2a562e3a563e4a564e5a5 +650011eb1df20ff2a524f3a525f4a526 +f8a527faa528eba520eca521eda522ee +a523e50fe5a51be6a51ce7a51de9a51e +eaa51fe1a517e2a518e3a519e4a51a00 +17ee2af514f809f8a53cf9a53dfaa53e +f5a539f6a53af7a53bf209f2a536f3a5 +37f4a538eea533efa534f0a535e814eb +09eba530eca531eda532e8a52de9a52e +eaa52fe509e5a52be6a382e7a52ce2a5 +29e3a3b5e4a52a08ed0feda543eea544 +f2a545f4a546faa547e3a53fe4a540e7 +a541eba5420014ee25f314f809f8a55d +f9a55efaa55ff3a55af5a55bf7a55cee +a555efa556f0a557f1a558f2a559e90f +e9a550eaa551eba552eca553eda554e2 +a548e332e4a54de5a54ee8a54f032aa5 +4948324e3a5012616ceda54c126174f2 +a54a126261f4a54b6aa2686ba2836ca2 +c46da4196e0019ee2df417f70cf7a513 +f8a514f9a515faa516f4a510f5a511f6 +a512f109f1a50df2a50ef3a50feea50a +efa50bf0a50ce717ea0ceaa506eba507 +eca508eda509e7a503e8a504e9a505e4 +09e4a500e5a501e6a502e1a3fde2a3fe +e3a3ff08f00ff0a3b5f4a35af5a3b6f7 +a3b7faa3b8e1a3b1e7a3b2e9a3b3eea3 +b40013ef20f40ff4a3c9f5a3caf6a3cb +f7a3ccfaa3cdefa3c4f0a3c5f1a3c6f2 +a3c7f3a3c8e70fe7a3bfe8a3c0e9a3c1 +eba3c2eca3c3e2a3bae3a3bbe4a3bce5 +a3bde6a3be0017ee2af414f809f8a3e2 +f9a3e3faa3e4f4a3dff5a3e0f7a3e1f1 +09f1a3ddf2a3def3a3cfeea3daefa3db +f0a3dce814eb09eba3d7eca3d8eda3d9 +e8a3d4e9a3d5eaa3d6e409e4a3d1e5a3 +d2e6a3d3e1a3cee2a3cfe3a3d00016ef +2af514f809f8a3f9f9a3fafaa3fbf5a3 +f6f6a3f7f7a3f8f209f2a3f3f3a3f4f4 +a3f5efa3f0f0a3f1f1a3f2e714eb09eb +a3ededa3eeeea3efe7a3ebe9a3aceaa3 +ece1a3e6e2a3e7e3a3e8e5a3e9e6a3ea +65c14365a25866a28367a2ab68a40669 +0015ed25f214f709f7a3aef8a3aff9a3 +b0f2a3abf3a3acf4a3adeda3a6eea3a7 +efa3a8f0a3a9f1a3aae614ea09eaa3a3 +eba3a4eca3a5e6a3a0e7a3a1e9a3a2e1 +a39be2a39ce3a39de4a39ee5a39f0ced +17f50cf5a362f7a363f9a364faa365ed +a35ff1a360f2a361e509e5a35ceba35d +eca35ee1a359e2a35ae3a35b0bee14f3 +09f3a370f5a371faa372eea36defa36e +f0a36fe809e8a36ae9a36beba36ce2a3 +67e4a368e5a3690019ee2df417f70cf7 +a389f8a38af9a38bfaa38cf4a386f5a3 +87f6a388f109f1a383f2a384f3a385ee +a380efa381f0a382e717ea0ceaa37ceb +a37deca37eeda37fe7a379e8a37ae9a3 +7be409e4a376e5a377e6a378e1a373e2 +a374e3a3750ded17f00cf0a397f2a398 +f3a399f4a39aeda394eea395efa396e8 +0ce8a390e9a391eba392eca393e1a38d +e2a38ee7a38f61a25062a28563a2be64 +0014ee25f414f809f8a355f9a356faa3 +57f4a352f5a353f7a354eea34defa34e +f0a34ff1a350f2a351e70fe7a348e8a3 +49e9a34aeaa34beca34ce1a343e2a344 +e4a345e5a346e6a3470015ed1af30ef7 +06f74bf84dfa4ff33df447f549ed3dee +3fef41f043f145e60ee906e937eb39ec +3be631e733e835e127e229e32be42de5 +2f0016ee1ef50ef806f87bf97dfa7ff5 +75f677f779f206f26ff371f473ee69ef +6bf06de60ee906e963ec65ed67e65de7 +5fe861e153e255e357e459e55b0012f1 +18f60cf69df79ff8a1f9a341faa342f1 +93f295f397f499f59be60ae689e88bed +8dee8ff091e181e283e485e587 } } match{ @@ -9947,14 +9946,14 @@ e283e485e587 00000000010000000001000000 } trie:bin{ -00196ec43274c1b177c0c777a27d78a2 -8779a2977a046c386daaa2e138e856f5 +00196ec42e74c1ad77c0c777a27d78a2 +8779a2977a046c386daa9ee138e856f5 1165ee5d12ed6df335117ae848012a85 4c166174ee48616ef335117ae820022a 8548344c166174ee48616ef34911616e 01e97ef41348616ef42007b30ab33eb4 3ab536b610b6292a2bb026b122b205b3 -c8bcb329b429b52905b3c8b2b329b429 +c8b8b329b429b52905b3c8aeb329b429 b5291248616e01f349f44901752aef11 66f25d12f57ae835016d2ae81165ee5d 02eda241f622f7116de7350369327538 @@ -9962,161 +9961,161 @@ e93eef1165ee5d12e879e93512e57ae8 351165ee5c012a8548166562f24c6174 ee35744a75a2b476016b2c7212ef65f4 3501eb22f4116df3350ee171eb0eeba2 -a4eea2dfefa2dcf41172f55de14ee592 -e7aa5ee91165ee5c012a8545167468e9 +a5eea2dbefa2d8f41172f55de14ee592 +e7aa5ae91165ee5c012a8545167468e9 4c6174ee350165427410e120012a854c 166174ee54616dec4910ee5c012a8554 16616dec4c6174ee350165427410e520 012a854c166174ee54656cf54910ee5c 012a855416656cf54c6174ee356c1c6c -366dac2c75367812f96de73512e865ee -5d01eda25ef9126b6cee35643265a2ed -6b12e76de73512f86de73505eb18ebb2 -cdf2a29afa1172f55c012a854c166174 -ee437972ec35722e7a34e7117ae84912 -eb6df33512f375fa3571c16e71a2b972 -a456730013e85bf12df130f234f428f5 -a830f71165ee5d107301e829f220022a -8543344c166174ee437972ec2b167972 -ec4c6174ee2be836e946eb64ee22ef11 -65ee5d0262ac3d68227310f2291165ee -5c012a855316696ee84c6174ee351163 -f349702e70527258735ee1b220e41165 -ee5c012a8541167261e24c6174ee3512 -f66ff23512ef73e33501e8b020f91161 -e1296338643e674a68526b12e76de735 -12ee69f44901e322ee1173e33513e36b -6cee3512f561f23504753a769077a264 -78a26df51165f35d0cec16f30bf32af7 -26f822f91171f535ec26f022f21171f5 -35e709e726e822eb1171f535e226e422 -e61171f5350ded16f00bf02af326f722 -fa1171f535ed26ee22ef1171f535e80b -e82ae926ea22ec1171f535e126e322e5 -1171f53503e12ae326e822f31171f535 -0aef14f409f426f522f71171f535ef26 -f022f21171f535e12ee32ae826ec22ee -1171f5351171f5350361a820ed30eea2 -89f71166f25d1164e5496ea2736fa2d9 -70086b516bac1b7362e170f38ef41170 -f4a28007b3c4dab3aaf4b426b522b604 -b029b229b429b529b62901e5a2d5f411 -70f3351165ee5c012a8547167572f54c -6174ee351165ee5c012a8541167261e2 -4c6174ee356234633a65406712e161f2 -3512f470f33512ed65ee4912ec6df335 -0a7946ee19ee2eef38f91165ee5d106e -01e249ef4901647c6e01e223ee497948 -e256e51165ee5c012a8544166576e14c -6174ee3501e4a67eee1165ee5d01642c -6e01ee49ef2310e13161a87a6834693a -6c427312ef65ee5d12e467ee3513f16b -6cee3513e56c75f935046b54725ce3ae -31eda2e4f21165ee5c012a854f167279 -e14c6174ee3513e96b6cee3502e3a6cc -ee22f3116df33567c3316ac2586aa2bc -6ba4146ca4c06d00107669ee35eea411 -f24ef374f4a2a1f91165ee5c012a854d -16796df24c6174ee350168a6636d10f2 -20012a854c166174ee446576e1491169 -e45d7676e7a44de9a61aec0165426d10 -ec20012a854c166174ee4d6c79ed4910 -ee5c012a854d166c79ed4c6174ee3512 -e66dee356e1f6e34713a73407512e96d -f33512f07ae83512e76df33501e8aca9 -e9116df33561346548664e6912ee6df3 -3501e92af8116df3351168e94912ef6d -f33502e14ae246e51165ee5d02612ee1 -3af61169e44901eb22f8116df335116a -e120032a8548384b784c166174ee4a70 -61ee2b026136694272156bf44a7061ee -2b156ee94a7061ee2b1172e10148464a -127061ee2b12616ee101482c4a127061 -ee2b12726bf42b0beb73ef36ef2ef57c -f91172f55d116bef20022a8548464a12 -616def01482c4b126f72e52b12616ee7 -2b11616e01e722e9134b6f72e52b1174 -f25deba8c7ed6aee0165426b10ee2001 -2a854c166174ee4b6e64e14910ee5c01 -2a854b166e64e14c6174ee351165ee5c -012a854b16686df24c6174ee35781f78 -2ee134e71166f25d12e46df3351165ee -5c012a854716656ff24c6174ee356e36 -723e7601e222f2116df33513ee6b6feb -3512e965ee5d0e753ee221e24ee7a29d -ee4cef1165ee5c012a854c16616fef4c -6174ee351164e5291166f25d75327738 -7a40e11169f44912e166f25d13e76c75 -f93512e87ae8356f2a6f48724e735c74 -02e730ef22f3126c75f935116cf63512 -fa65ee5d01e922ed126c75f93513ed6c -75f935634669526b02e226ef22f3126c -75f935126c75f93501e522e6116df335 -12f76df335676a68a2766905e40ae4a8 -b4e734f31165ee49642e6b36e11165ee -5d13e16c75f93512f469f53509e124e1 -a297e4a294eca2ffeea2fcf501672868 -10e95d10f520012a854c166174ee4775 -6af249613e6b526e5a73607501e922ee -1167ee3502e1a256eea483f8116fed35 -13f06b70e53512f767ee3512f764e529 -07e934e94ef26cf4a828f91172f55c01 -2a854116726dee437972ec351168e920 -012a854c166174ee446576e149016228 -7310e82910f32961326a4c7352e11165 -ee5d02e530eba426f71165ee49116fed -3512e96df33512ee7ae83564c0ea6488 -65a248660366327538ef6af9116eec49 -12ed66e63506e80be82ae926f122f611 -66e635e226e522e61166e6351166e635 -1164e149027434753ae1106e01e231ef -3112f96ee53512f06df33506ee85ee36 -efa285f3a241f51165f3491165eea280 -07b31db364b426b538b604b029b129b4 -29b527b62904b027b127b427b527b627 -2a2bb030b12cb201b229b32904b029b1 -29b429b527b6291165f3a28007b312b3 -7ab426b522b604b029b229b429b529b6 -292a2bb026b14eb204b029b229b429b5 -29b62904b029b229b429b529b62901b1 -29b3296e2e7936e51165ee5d13e26b6c -ee3513ef6b6cee3561a26062a499630c -702ee111e1a2cdefa4d8f32af91165ee -491173eb49703e72447a01e822ef117a -e835117ae83512f87ae83512f366f249 -6a146a306b366f12e16df33512f97ae8 -3512e261f25d643065366812f265ee49 -12ef7ae83513e26669ec5d001576bce6 -92f275f24af9a26cfa1172f55c012a85 -4c166174ee437972ec351161f220012a -5a4c166174ee417261e24807b327b32a -b460b522b605b336b329b529b6298407 -b313b32ab438b522b605b322b329b529 -b62910b4292a2bb026b122b205b30fb3 -29b529b62905b306b329b529b629b029 -b129b2291165f349e64aeba2aded1165 -ee5c012a8545167468e94c6174ee3511 -6eec497636793c7a50e156e21172f55d -12ec61f23503e82aec26ee22f01161f2 -3512e261fa35127373f9296635701e70 -30723c7512fa61f23501e322e41161f2 -3503f12af326f922fa1161f235663069 -366c12ee73f13512e261f23513e97379 -f235613e624e635a64906501e222e311 -61f23502e526ef32f41173f13501e822 -f61161f23505f709f726f822f91161f2 -35e82eed22f11161f2351165ee5d1161 -f23512e661f2350e7668ee4aee3eef82 -f2a0f30168287310e82910f229016242 -6510ee5c012a854216656ee74c6174ee -3510ee20012a854c166174ee42656ee7 -49117ae848012a8554166962f448616e -f3351166f24976327a3ee544e81168e9 -5d01e522f5116df33512e36de7351172 -f549682268346a3a6d4e7412ea6df335 -12f26de73501ee2af1116de735116df3 -3512ed6de735613062366512ed65ee5d -12ec75f24912fa61f235 +366dac2875367812f96de73512e865ee +5d01eda25af9126b6cee35643265a2e9 +6b12e76de73512f86de7350472527a58 +e75ef2a295fa1172f55c012a854c1661 +74ee437972ec3512eb6df33512f375fa +35117ae84971c16e71a2b972a4567300 +13e85bf12df130f234f428f5a830f711 +65ee5d107301e829f220022a8543344c +166174ee437972ec2b167972ec4c6174 +ee2be836e946eb64ee22ef1165ee5d02 +62ac3d68227310f2291165ee5c012a85 +5316696ee84c6174ee351163f349702e +70527258735ee1b220e41165ee5c012a +8541167261e24c6174ee3512f66ff235 +12ef73e33501e8b020f91161e1296338 +643e674a68526b12e76de73512ee69f4 +4901e322ee1173e33513e36b6cee3512 +f561f23504753a769077a26478a26df5 +1165f35d0cec16f30bf32af726f822f9 +1171f535ec26f022f21171f535e709e7 +26e822eb1171f535e226e422e61171f5 +350ded16f00bf02af326f722fa1171f5 +35ed26ee22ef1171f535e80be82ae926 +ea22ec1171f535e126e322e51171f535 +03e12ae326e822f31171f5350aef14f4 +09f426f522f71171f535ef26f022f211 +71f535e12ee32ae826ec22ee1171f535 +1171f5350361a820ed30eea289f71166 +f25d1164e5496ea2736fa2d970086b51 +6bac1b7362e170f38ef41170f4a28007 +b3c4dab3aaf4b426b522b604b029b229 +b429b529b62901e5a2d5f41170f33511 +65ee5c012a8547167572f54c6174ee35 +1165ee5c012a8541167261e24c6174ee +356234633a65406712e161f23512f470 +f33512ed65ee4912ec6df3350a7946ee +19ee2eef38f91165ee5d106e01e249ef +4901647c6e01e223ee497948e256e511 +65ee5c012a8544166576e14c6174ee35 +01e4a67eee1165ee5d01642c6e01ee49 +ef2310e13161a87a6834693a6c427312 +ef65ee5d12e467ee3513f16b6cee3513 +e56c75f935046b54725ce3ae31eda2e4 +f21165ee5c012a854f167279e14c6174 +ee3513e96b6cee3502e3a6ccee22f311 +6df33567c3316ac2586aa2bc6ba4146c +a4c06d00107669ee35eea411f24ef374 +f4a2a1f91165ee5c012a854d16796df2 +4c6174ee350168a6636d10f220012a85 +4c166174ee446576e1491169e45d7676 +e7a44de9a61aec0165426d10ec20012a +854c166174ee4d6c79ed4910ee5c012a +854d166c79ed4c6174ee3512e66dee35 +6e1f6e34713a73407512e96df33512f0 +7ae83512e76df33501e8aca9e9116df3 +3561346548664e6912ee6df33501e92a +f8116df3351168e94912ef6df33502e1 +4ae246e51165ee5d02612ee13af61169 +e44901eb22f8116df335116ae120032a +8548384b784c166174ee4a7061ee2b02 +6136694272156bf44a7061ee2b156ee9 +4a7061ee2b1172e10148464a127061ee +2b12616ee101482c4a127061ee2b1272 +6bf42b0beb73ef36ef2ef57cf91172f5 +5d116bef20022a8548464a12616def01 +482c4b126f72e52b12616ee72b11616e +01e722e9134b6f72e52b1174f25deba8 +c7ed6aee0165426b10ee20012a854c16 +6174ee4b6e64e14910ee5c012a854b16 +6e64e14c6174ee351165ee5c012a854b +16686df24c6174ee35781f782ee134e7 +1166f25d12e46df3351165ee5c012a85 +4716656ff24c6174ee356e36723e7601 +e222f2116df33513ee6b6feb3512e965 +ee5d0e753ee221e24ee7a29dee4cef11 +65ee5c012a854c16616fef4c6174ee35 +1164e5291166f25d753277387a40e111 +69f44912e166f25d13e76c75f93512e8 +7ae8356f2a6f48724e735c7402e730ef +22f3126c75f935116cf63512fa65ee5d +01e922ed126c75f93513ed6c75f93563 +4669526b02e226ef22f3126c75f93512 +6c75f93501e522e6116df33512f76df3 +35676a68a2766905e40ae4a8b4e734f3 +1165ee49642e6b36e11165ee5d13e16c +75f93512f469f53509e124e1a297e4a2 +94eca2ffeea2fcf50167286810e95d10 +f520012a854c166174ee47756af24961 +3e6b526e5a73607501e922ee1167ee35 +02e1a256eea483f8116fed3513f06b70 +e53512f767ee3512f764e52907e934e9 +4ef26cf4a828f91172f55c012a854116 +726dee437972ec351168e920012a854c +166174ee446576e1490162287310e829 +10f32961326a4c7352e11165ee5d02e5 +30eba426f71165ee49116fed3512e96d +f33512ee7ae83564c0ea648865a24866 +0366327538ef6af9116eec4912ed66e6 +3506e80be82ae926f122f61166e635e2 +26e522e61166e6351166e6351164e149 +027434753ae1106e01e231ef3112f96e +e53512f06df33506ee85ee36efa285f3 +a241f51165f3491165eea28007b31db3 +64b426b538b604b029b129b429b527b6 +2904b027b127b427b527b6272a2bb030 +b12cb201b229b32904b029b129b429b5 +27b6291165f3a28007b312b37ab426b5 +22b604b029b229b429b529b6292a2bb0 +26b14eb204b029b229b429b529b62904 +b029b229b429b529b62901b129b3296e +2e7936e51165ee5d13e26b6cee3513ef +6b6cee3561a26062a499630c702ee111 +e1a2cdefa4d8f32af91165ee491173eb +49703e72447a01e822ef117ae835117a +e83512f87ae83512f366f2496a146a30 +6b366f12e16df33512f97ae83512e261 +f25d643065366812f265ee4912ef7ae8 +3513e26669ec5d001576bce692f275f2 +4af9a26cfa1172f55c012a854c166174 +ee437972ec351161f220012a5a4c1661 +74ee417261e24807b327b32ab460b522 +b605b336b329b529b6298407b313b32a +b438b522b605b322b329b529b62910b4 +292a2bb026b122b205b30fb329b529b6 +2905b306b329b529b629b029b129b229 +1165f349e64aeba2aded1165ee5c012a +8545167468e94c6174ee35116eec4976 +36793c7a50e156e21172f55d12ec61f2 +3503e82aec26ee22f01161f23512e261 +fa35127373f9296635701e7030723c75 +12fa61f23501e322e41161f23503f12a +f326f922fa1161f235663069366c12ee +73f13512e261f23513e97379f235613e +624e635a64906501e222e31161f23502 +e526ef32f41173f13501e822f61161f2 +3505f709f726f822f91161f235e82eed +22f11161f2351165ee5d1161f23512e6 +61f2350e7668ee4aee3eef82f2a0f301 +68287310e82910f2290162426510ee5c +012a854216656ee74c6174ee3510ee20 +012a854c166174ee42656ee749117ae8 +48012a8554166962f448616ef3351166 +f24976327a3ee544e81168e95d01e522 +f5116df33512e36de7351172f5496822 +68346a3a6d4e7412ea6df33512f26de7 +3501ee2af1116de735116df33512ed6d +e735613062366512ed65ee5d12ec75f2 +4912fa61f235 } } } diff --git a/icu4c/source/data/misc/metaZones.txt b/icu4c/source/data/misc/metaZones.txt index 123a711c07de..274a8d5dcf70 100644 --- a/icu4c/source/data/misc/metaZones.txt +++ b/icu4c/source/data/misc/metaZones.txt @@ -3734,16 +3734,6 @@ metaZones:table(nofallback){ "Australia_Eastern", } } - "CST6CDT"{ - { - "America_Central", - } - } - "EST5EDT"{ - { - "America_Eastern", - } - } "Etc:GMT"{ { "GMT", @@ -4294,16 +4284,6 @@ metaZones:table(nofallback){ "Reunion", } } - "MST7MDT"{ - { - "America_Mountain", - } - } - "PST8PDT"{ - { - "America_Pacific", - } - } "Pacific:Apia"{ { "Apia", diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index ca539ef488e8..9d82fbec2438 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -2312,6 +2312,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"GP"} } + frgua{ + reason{"deprecated"} + replacement{"GP"} + } frh{ reason{"deprecated"} replacement{"frcor"} @@ -2332,10 +2336,18 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"frnaq"} } + frlre{ + reason{"deprecated"} + replacement{"RE"} + } frm{ reason{"deprecated"} replacement{"frges"} } + frmay{ + reason{"deprecated"} + replacement{"YT"} + } frmf{ reason{"overlong"} replacement{"MF"} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 1d04279f0e39..ef3ccd9a8949 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -8190,6 +8190,7 @@ supplementalData:table(nofallback){ "gbmyl", "gbndn", "gbnta", + "gbnth", "gbnym", "gbomh", "gbpol", @@ -8231,21 +8232,49 @@ supplementalData:table(nofallback){ "gtsu", "gtto", "gtza", + "inct", "indd", "indn", + "inor", + "intg", + "inut", "ir31~2", "is0", + "isakh", "isbfj", + "isblo", "isdju", "isfld", + "ishel", + "ishut", + "issbh", "issey", + "issku", + "isssf", "itao", "itci", "itog", "itot", "itsd", "itvs", + "kzakm", + "kzakt", + "kzala", + "kzalm", + "kzast", + "kzaty", "kzbay", + "kzkar", + "kzkus", + "kzkzy", + "kzman", + "kzpav", + "kzsev", + "kzshy", + "kzvos", + "kzyuz", + "kzzap", + "kzzha", "laxn", "lud", "lug", @@ -8324,10 +8353,26 @@ supplementalData:table(nofallback){ "no19", "no20", "no23", + "np1~5", + "npba", + "npbh", + "npdh", + "npga", + "npja", + "npka", + "npko", + "nplu", + "npma", + "npme", + "npna", + "npra", + "npsa", + "npse", "nzn", "nzs", "omba", "omsh", + "phmag", "pkta", "plds", "plkp", @@ -9005,7 +9050,8 @@ supplementalData:table(nofallback){ "dz10~9", "dz20~9", "dz30~9", - "dz40~8", + "dz40~9", + "dz50~8", "eca~i", "ecl~p", "ecr~s", @@ -9201,6 +9247,7 @@ supplementalData:table(nofallback){ "etor", "etsi", "etsn~o", + "etsw", "etti", "fi02~9", "fi10~9", @@ -9374,8 +9421,8 @@ supplementalData:table(nofallback){ "gbnlk", "gbnln", "gbnmd", + "gbnnh", "gbnsm", - "gbnth", "gbntl", "gbntt", "gbnty", @@ -9445,6 +9492,7 @@ supplementalData:table(nofallback){ "gbwls", "gbwlv", "gbwnd", + "gbwnh", "gbwnm", "gbwok", "gbwor", @@ -9653,7 +9701,9 @@ supplementalData:table(nofallback){ "idnb", "idnt~u", "idpa~b", + "idpd~e", "idpp", + "idps~t", "idri", "idsa~b", "idsg", @@ -9697,8 +9747,7 @@ supplementalData:table(nofallback){ "inap", "inar~s", "inbr", - "inch", - "inct", + "incg~h", "indh", "indl", "inga", @@ -9717,16 +9766,15 @@ supplementalData:table(nofallback){ "inmp", "inmz", "innl", - "inor", + "inod", "inpb", "inpy", "inrj", "insk", - "intg", "intn", - "intr", + "intr~s", + "inuk", "inup", - "inut", "inwb", "iqan", "iqar", @@ -9751,13 +9799,11 @@ supplementalData:table(nofallback){ "ir20~9", "ir30", "is1~8", - "isakh", "isakn", "isaku", "isarn", "isasa", "isbla", - "isblo", "isbog", "isbol", "isdab", @@ -9774,10 +9820,9 @@ supplementalData:table(nofallback){ "isgru", "isgry", "ishaf", - "ishel", "ishrg", "ishru", - "ishut", + "ishug", "ishuv", "ishva", "ishve", @@ -9795,7 +9840,6 @@ supplementalData:table(nofallback){ "isrhh", "isrkn", "isrkv", - "issbh", "issbt", "issdn", "issdv", @@ -9804,11 +9848,10 @@ supplementalData:table(nofallback){ "isshf", "isskf~g", "issko", - "issku", + "isskr", "issnf", "issog", "issol", - "isssf", "issss", "isstr", "issty", @@ -9965,7 +10008,7 @@ supplementalData:table(nofallback){ "knn", "kp01~9", "kp10", - "kp13~4", + "kp13~5", "kr11", "kr26~9", "kr30~1", @@ -9977,23 +10020,23 @@ supplementalData:table(nofallback){ "kwja", "kwku", "kwmu", - "kzakm", - "kzakt", - "kzala", - "kzalm", - "kzast", - "kzaty", - "kzkar", - "kzkus", - "kzkzy", - "kzman", - "kzpav", - "kzsev", - "kzshy", - "kzvos", - "kzyuz", - "kzzap", - "kzzha", + "kz10~1", + "kz15", + "kz19", + "kz23", + "kz27", + "kz31", + "kz33", + "kz35", + "kz39", + "kz43", + "kz47", + "kz55", + "kz59", + "kz61~3", + "kz71", + "kz75", + "kz79", "laat", "labk~l", "lach", @@ -10264,7 +10307,7 @@ supplementalData:table(nofallback){ "mdun", "me01~9", "me10~9", - "me20~4", + "me20~5", "mga", "mgd", "mgf", @@ -10523,22 +10566,7 @@ supplementalData:table(nofallback){ "no46", "no50", "no54", - "np1~5", - "npba", - "npbh", - "npdh", - "npga", - "npja", - "npka", - "npko", - "nplu", - "npma", - "npme", - "npna", "npp1~7", - "npra", - "npsa", - "npse", "nr01~9", "nr10~4", "nzauk", @@ -10668,10 +10696,11 @@ supplementalData:table(nofallback){ "phley", "phlun", "phmad", - "phmag", "phmas", "phmdc", "phmdr", + "phmgn", + "phmgs", "phmou", "phmsc", "phmsr", @@ -18677,12 +18706,6 @@ supplementalData:table(nofallback){ "20", "1", } - { - "uk", - "ru", - "20", - "1", - } { "ur", "en", @@ -21418,6 +21441,16 @@ supplementalData:table(nofallback){ "dz46", "dz47", "dz48", + "dz49", + "dz50", + "dz51", + "dz52", + "dz53", + "dz54", + "dz55", + "dz56", + "dz57", + "dz58", } EC{ "eca", @@ -21532,6 +21565,7 @@ supplementalData:table(nofallback){ "etsi", "etsn", "etso", + "etsw", "etti", } FI{ @@ -21870,8 +21904,8 @@ supplementalData:table(nofallback){ "inar", "inas", "inbr", + "incg", "inch", - "inct", "indh", "indl", "inga", @@ -21890,16 +21924,16 @@ supplementalData:table(nofallback){ "inmp", "inmz", "innl", - "inor", + "inod", "inpb", "inpy", "inrj", "insk", - "intg", "intn", "intr", + "ints", + "inuk", "inup", - "inut", "inwb", } IQ{ @@ -22178,6 +22212,7 @@ supplementalData:table(nofallback){ "kp10", "kp13", "kp14", + "kp15", } KR{ "kr11", @@ -22207,23 +22242,26 @@ supplementalData:table(nofallback){ "kwmu", } KZ{ - "kzakm", - "kzakt", - "kzala", - "kzalm", - "kzast", - "kzaty", - "kzkar", - "kzkus", - "kzkzy", - "kzman", - "kzpav", - "kzsev", - "kzshy", - "kzvos", - "kzyuz", - "kzzap", - "kzzha", + "kz10", + "kz11", + "kz15", + "kz19", + "kz23", + "kz27", + "kz31", + "kz33", + "kz35", + "kz39", + "kz43", + "kz47", + "kz55", + "kz59", + "kz61", + "kz62", + "kz63", + "kz71", + "kz75", + "kz79", } LA{ "laat", @@ -22512,6 +22550,7 @@ supplementalData:table(nofallback){ "me22", "me23", "me24", + "me25", } MG{ "mga", @@ -22975,11 +23014,6 @@ supplementalData:table(nofallback){ "no54", } NP{ - "np1", - "np2", - "np3", - "np4", - "np5", "npp1", "npp2", "npp3", @@ -25289,8 +25323,8 @@ supplementalData:table(nofallback){ "gbnfk", "gbngm", "gbnln", + "gbnnh", "gbnsm", - "gbnth", "gbntt", "gbnty", "gbnwm", @@ -25345,6 +25379,7 @@ supplementalData:table(nofallback){ "gbwll", "gbwlv", "gbwnd", + "gbwnh", "gbwnm", "gbwok", "gbwor", @@ -25525,6 +25560,10 @@ supplementalData:table(nofallback){ idpp{ "idpa", "idpb", + "idpd", + "idpe", + "idps", + "idpt", } idsl{ "idgo", @@ -25606,7 +25645,6 @@ supplementalData:table(nofallback){ "isdab", "iseom", "isgru", - "ishel", "ishva", "issko", "issnf", @@ -25624,12 +25662,10 @@ supplementalData:table(nofallback){ "isver", } is5{ - "isakh", - "isblo", - "ishut", + "ishug", "ishuv", "isskg", - "isssf", + "isskr", "issss", } is6{ @@ -25641,9 +25677,7 @@ supplementalData:table(nofallback){ "ishrg", "islan", "isnor", - "issbh", "issbt", - "issku", "isthg", "istjo", } @@ -26116,30 +26150,6 @@ supplementalData:table(nofallback){ "mwth", "mwzo", } - np1{ - "npba", - "npja", - "npna", - } - np2{ - "npbh", - "npka", - "npra", - } - np3{ - "npdh", - "npga", - "nplu", - } - np4{ - "npko", - "npme", - "npsa", - } - np5{ - "npma", - "npse", - } ph01{ "philn", "phils", @@ -26227,7 +26237,8 @@ supplementalData:table(nofallback){ } ph14{ "phlas", - "phmag", + "phmgn", + "phmgs", "phslu", "phtaw", } @@ -36199,7 +36210,7 @@ supplementalData:table(nofallback){ 86400000, } AE:intvector{ - 7, + 2, 1, 7, 0, diff --git a/icu4c/source/data/misc/windowsZones.txt b/icu4c/source/data/misc/windowsZones.txt index 6ba9ca1e6854..3dd0ba744daa 100644 --- a/icu4c/source/data/misc/windowsZones.txt +++ b/icu4c/source/data/misc/windowsZones.txt @@ -179,7 +179,6 @@ windowsZones:table(nofallback){ "ca/Menominee America/North_Dakota/Beulah America/North_Dakota/Center" " America/North_Dakota/New_Salem" } - ZZ{"CST6CDT"} } "Chatham Islands Standard Time"{ 001{"Pacific/Chatham"} @@ -243,7 +242,6 @@ windowsZones:table(nofallback){ "Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticell" "o America/Louisville" } - ZZ{"EST5EDT"} } "Egypt Standard Time"{ 001{"Africa/Cairo"} @@ -398,7 +396,6 @@ windowsZones:table(nofallback){ CA{"America/Edmonton America/Cambridge_Bay America/Inuvik"} MX{"America/Ciudad_Juarez"} US{"America/Denver America/Boise"} - ZZ{"MST7MDT"} } "Myanmar Standard Time"{ 001{"Asia/Rangoon"} @@ -458,7 +455,6 @@ windowsZones:table(nofallback){ 001{"America/Los_Angeles"} CA{"America/Vancouver"} US{"America/Los_Angeles"} - ZZ{"PST8PDT"} } "Pakistan Standard Time"{ 001{"Asia/Karachi"} diff --git a/icu4c/source/data/unit/ak.txt b/icu4c/source/data/unit/ak.txt index 5c40ee6d2ec7..a0ba2ed153bf 100644 --- a/icu4c/source/data/unit/ak.txt +++ b/icu4c/source/data/unit/ak.txt @@ -285,6 +285,8 @@ ak{ } year{ dnam{"mfeɛ"} + one{"mfeɛ {0}"} + other{"mfeɛ {0}"} per{"mfeɛ biara {0}"} } } diff --git a/icu4c/source/data/unit/ar.txt b/icu4c/source/data/unit/ar.txt index f5a91192f276..13d31a0e8199 100644 --- a/icu4c/source/data/unit/ar.txt +++ b/icu4c/source/data/unit/ar.txt @@ -1083,16 +1083,6 @@ ar{ two{"{0} كيلومتر في الساعة"} zero{"{0} كيلومتر في الساعة"} } - light-speed{ - dnam{"سرعة الضوء"} - few{"سرعة الضوء {0}"} - gender{"feminine"} - many{"سرعة الضوء {0}"} - one{"سرعة الضوء {0}"} - other{"سرعة الضوء {0}"} - two{"سرعة الضوء {0}"} - zero{"سرعة الضوء {0}"} - } meter-per-second{ dnam{"متر في الثانية"} few{"{0} متر في الثانية"} @@ -1713,17 +1703,6 @@ ar{ dnam{"رطل/بوصة²"} } } - speed{ - light-speed{ - dnam{"سرعة الضوء"} - few{"سرعة الضوء {0}"} - many{"سرعة الضوء {0}"} - one{"سرعة الضوء {0}"} - other{"سرعة الضوء {0}"} - two{"سرعة الضوء {0}"} - zero{"سرعة الضوء {0}"} - } - } temperature{ celsius{ dnam{"°م"} @@ -3184,15 +3163,6 @@ ar{ two{"{0} عقدة"} zero{"{0} عقدة"} } - light-speed{ - dnam{"سرعة الضوء"} - few{"سرعة الضوء {0}"} - many{"سرعة الضوء {0}"} - one{"سرعة الضوء {0}"} - other{"سرعة الضوء {0}"} - two{"سرعة الضوء {0}"} - zero{"سرعة الضوء {0}"} - } meter-per-second{ dnam{"م/ث"} few{"{0} م/ث"} diff --git a/icu4c/source/data/unit/be.txt b/icu4c/source/data/unit/be.txt index d0d578927263..c733f05b3d11 100644 --- a/icu4c/source/data/unit/be.txt +++ b/icu4c/source/data/unit/be.txt @@ -1084,13 +1084,6 @@ be{ one{"{0} вузел"} other{"{0} вузла"} } - light-speed{ - dnam{"хуткасць святла"} - few{"{0} хуткасці святла"} - many{"{0} хуткасцей святла"} - one{"{0} хуткасць святла"} - other{"{0} хуткасці святла"} - } meter-per-second{ dnam{"метры за секунду"} few{"{0} метры за секунду"} @@ -1384,15 +1377,6 @@ be{ other{"{0} фунт-сілы"} } } - speed{ - light-speed{ - dnam{"хутк. св."} - few{"{0} хутк. св."} - many{"{0} хутк. св."} - one{"{0} хутк. св."} - other{"{0} хутк. св."} - } - } volume{ dessert-spoon{ few{"{0} дэс. лыжкі"} @@ -2448,13 +2432,6 @@ be{ one{"{0} вуз."} other{"{0} вуз."} } - light-speed{ - dnam{"хутк. св."} - few{"{0} хутк. св."} - many{"{0} хутк. св."} - one{"{0} хутк. св."} - other{"{0} хутк. св."} - } meter-per-second{ dnam{"м/с"} few{"{0} м/с"} diff --git a/icu4c/source/data/unit/bn.txt b/icu4c/source/data/unit/bn.txt index 80ebec7b65ab..d4b793411537 100644 --- a/icu4c/source/data/unit/bn.txt +++ b/icu4c/source/data/unit/bn.txt @@ -639,11 +639,6 @@ bn{ one{"{0} নট"} other{"{0} নট"} } - light-speed{ - dnam{"আঃবঃ"} - one{"{0} আঃবঃ"} - other{"{0} আঃবঃ"} - } meter-per-second{ one{"{0} মিটার প্রতি সেকেন্ড"} other{"{0} মিটার প্রতি সেকেন্ড"} @@ -1056,11 +1051,6 @@ bn{ one{"{0}kph"} other{"{0}kph"} } - light-speed{ - dnam{"আঃবঃ"} - one{"{0} আঃবঃ"} - other{"{0} আঃবঃ"} - } meter-per-second{ dnam{"মি/সেক"} one{"{0}m/s"} @@ -1565,11 +1555,6 @@ bn{ one{"{0} kph"} other{"{0} km/h"} } - light-speed{ - dnam{"আঃবঃ"} - one{"{0} আঃবঃ"} - other{"{0} আঃবঃ"} - } meter-per-second{ dnam{"মিটার প্রতি সেকেন্ড"} } diff --git a/icu4c/source/data/unit/bs.txt b/icu4c/source/data/unit/bs.txt index e484bac44371..bdd7641e13bc 100644 --- a/icu4c/source/data/unit/bs.txt +++ b/icu4c/source/data/unit/bs.txt @@ -874,12 +874,6 @@ bs{ one{"{0} čvor"} other{"{0} čvorova"} } - light-speed{ - dnam{"brzina svjetlosti"} - few{"{0} brzine svjetlosti"} - one{"{0} brzina svjetlosti"} - other{"{0} brzina svjetlosti"} - } meter-per-second{ dnam{"metri u sekundi"} few{"{0} metra u sekundi"} @@ -1291,14 +1285,6 @@ bs{ other{"{0} mb"} } } - speed{ - light-speed{ - dnam{"brz. svjetlosti"} - few{"{0} brz. svjetlosti"} - one{"{0} brz. svjetlosti"} - other{"{0} brz. svjetlosti"} - } - } temperature{ celsius{ few{"{0}°"} @@ -1700,12 +1686,6 @@ bs{ one{"{0} čv"} other{"{0} čv"} } - light-speed{ - dnam{"brz. svjetlosti"} - few{"{0} brz. svjetlosti"} - one{"{0} brz. svjetlosti"} - other{"{0} brz. svjetlosti"} - } } temperature{ celsius{ diff --git a/icu4c/source/data/unit/cs.txt b/icu4c/source/data/unit/cs.txt index 2ea2bdf56479..2df21a059648 100644 --- a/icu4c/source/data/unit/cs.txt +++ b/icu4c/source/data/unit/cs.txt @@ -5729,9 +5729,6 @@ cs{ dnam{"ha"} } } - compound{ - times{"{0}{1}"} - } concentr{ item{ dnam{"položky"} diff --git a/icu4c/source/data/unit/da.txt b/icu4c/source/data/unit/da.txt index 5d0092f19631..d039f0ac3b6c 100644 --- a/icu4c/source/data/unit/da.txt +++ b/icu4c/source/data/unit/da.txt @@ -248,7 +248,6 @@ da{ } } } - times{"{0} gange {1}"} } concentr{ item{ @@ -1507,18 +1506,6 @@ da{ one{"{0} kilometer i timen"} other{"{0} kilometer i timen"} } - light-speed{ - case{ - genitive{ - one{"{0} gang lysets hastigheds"} - other{"{0} gange lysets hastigheds"} - } - } - dnam{"lysets hastighed"} - gender{"common"} - one{"{0} gang lysets hastighed"} - other{"{0} gange lysets hastighed"} - } meter-per-second{ case{ genitive{ @@ -1893,9 +1880,6 @@ da{ other{"{0}m²"} } } - compound{ - times{"{0}⋅{1}"} - } concentr{ millimole-per-liter{ dnam{"mmol/L"} @@ -2097,11 +2081,6 @@ da{ one{"{0} km/t"} other{"{0} km/t"} } - light-speed{ - dnam{"lyset"} - one{"{0} gang lyset"} - other{"{0} gange lyset"} - } meter-per-second{ one{"{0}m/s"} other{"{0}m/s"} @@ -2190,9 +2169,6 @@ da{ other{"{0} kvadratfod"} } } - compound{ - times{"{0} ⋅ {1}"} - } concentr{ item{ dnam{"enhed"} @@ -2494,11 +2470,6 @@ da{ one{"{0} knob"} other{"{0} knob"} } - light-speed{ - dnam{"lyshastigheden"} - one{"{0} gang lyshastigheden"} - other{"{0} gange lyshastigheden"} - } mile-per-hour{ dnam{"engelske mil/timen"} one{"{0} mph"} diff --git a/icu4c/source/data/unit/de.txt b/icu4c/source/data/unit/de.txt index a065f5911834..f036ca003010 100644 --- a/icu4c/source/data/unit/de.txt +++ b/icu4c/source/data/unit/de.txt @@ -2669,26 +2669,6 @@ de{ one{"{0} Knoten"} other{"{0} Knoten"} } - light-speed{ - case{ - accusative{ - one{"{0} Lichtgeschwindigkeit"} - other{"{0}-fache Lichtgeschwindigkeit"} - } - dative{ - one{"{0} Lichtgeschwindigkeit"} - other{"{0}-facher Lichtgeschwindigkeit"} - } - genitive{ - one{"{0} Lichtgeschwindigkeit"} - other{"{0}-facher Lichtgeschwindigkeit"} - } - } - dnam{"Lichtgeschwindigkeit"} - gender{"feminine"} - one{"{0} Lichtgeschwindigkeit"} - other{"{0}-fache Lichtgeschwindigkeit"} - } meter-per-second{ case{ accusative{ @@ -3752,13 +3732,6 @@ de{ dnam{"W"} } } - speed{ - light-speed{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} - } - } temperature{ fahrenheit{ one{"{0}°F"} @@ -4164,13 +4137,6 @@ de{ dnam{"Millibar"} } } - speed{ - light-speed{ - dnam{"Lichtgeschw."} - one{"{0} Lichtgeschw."} - other{"{0}-fache Lichtg."} - } - } temperature{ celsius{ one{"{0} °C"} diff --git a/icu4c/source/data/unit/et.txt b/icu4c/source/data/unit/et.txt index 941c787213e6..8cd5578b9472 100644 --- a/icu4c/source/data/unit/et.txt +++ b/icu4c/source/data/unit/et.txt @@ -787,11 +787,6 @@ et{ one{"{0} sõlm"} other{"{0} sõlme"} } - light-speed{ - dnam{"valguskiirus"} - one{"{0} valguskiirus"} - other{"{0} valguskiirust"} - } meter-per-second{ dnam{"meetrid sekundis"} one{"{0} meeter sekundis"} @@ -1109,11 +1104,6 @@ et{ one{"B{0}"} other{"B{0}"} } - light-speed{ - dnam{"valguskiirus"} - one{"{0} valguskiirus"} - other{"{0} valguskiirust"} - } } volume{ dram{ @@ -1505,13 +1495,6 @@ et{ other{"{0} in Hg"} } } - speed{ - light-speed{ - dnam{"valguskiirus"} - one{"{0} valguskiirus"} - other{"{0} valguskiirust"} - } - } temperature{ celsius{ one{"{0} °C"} diff --git a/icu4c/source/data/unit/fa.txt b/icu4c/source/data/unit/fa.txt index 263da50a1742..7361d6e73c78 100644 --- a/icu4c/source/data/unit/fa.txt +++ b/icu4c/source/data/unit/fa.txt @@ -378,11 +378,6 @@ fa{ one{"{0} کیلومتر در ساعت"} other{"{0} کیلومتر در ساعت"} } - light-speed{ - dnam{"نور"} - one{"{0} نور"} - other{"{0} نور"} - } meter-per-second{ one{"{0} متر در ثانیه"} other{"{0} متر در ثانیه"} @@ -1061,11 +1056,6 @@ fa{ one{"{0}kn"} other{"{0}kn"} } - light-speed{ - dnam{"نور"} - one{"{0} نور"} - other{"{0} نور"} - } meter-per-second{ dnam{"m/s"} one{"{0}m/s"} @@ -1947,11 +1937,6 @@ fa{ one{"{0} گره"} other{"{0} گره"} } - light-speed{ - dnam{"نور"} - one{"{0} نور"} - other{"{0} نور"} - } meter-per-second{ dnam{"متر در ثانیه"} } diff --git a/icu4c/source/data/unit/fi.txt b/icu4c/source/data/unit/fi.txt index 5989870770b9..64ac120df515 100644 --- a/icu4c/source/data/unit/fi.txt +++ b/icu4c/source/data/unit/fi.txt @@ -2598,29 +2598,6 @@ fi{ one{"{0} solmu"} other{"{0} solmua"} } - light-speed{ - case{ - elative{ - one{"{0} valonnopeudesta"} - other{"{0} valonnopeudesta"} - } - genitive{ - one{"{0} valonnopeuden"} - other{"{0} valonnopeuden"} - } - illative{ - one{"{0} valonnopeuteen"} - other{"{0} valonnopeuteen"} - } - partitive{ - one{"{0} valonnopeutta"} - other{"{0} valonnopeutta"} - } - } - dnam{"valonnopeudet"} - one{"{0} valonnopeus"} - other{"{0} valonnopeutta"} - } meter-per-second{ case{ elative{ @@ -3708,11 +3685,6 @@ fi{ one{"{0}kn"} other{"{0}kn"} } - light-speed{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} - } meter-per-second{ one{"{0}m/s"} other{"{0}m/s"} @@ -4195,13 +4167,6 @@ fi{ other{"{0} mmHg"} } } - speed{ - light-speed{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} - } - } temperature{ celsius{ one{"{0} °C"} diff --git a/icu4c/source/data/unit/hy.txt b/icu4c/source/data/unit/hy.txt index ef720e3b309e..5705d1e3872d 100644 --- a/icu4c/source/data/unit/hy.txt +++ b/icu4c/source/data/unit/hy.txt @@ -2601,29 +2601,6 @@ hy{ one{"{0} հանգույց"} other{"{0} հանգույց"} } - light-speed{ - case{ - ablative{ - one{"{0} լույսի արագությունից"} - other{"{0} լույսի արագությունից"} - } - dative{ - one{"{0} լույսի արագությանը"} - other{"{0} լույսի արագությանը"} - } - instrumental{ - one{"{0} լույսի արագությամբ"} - other{"{0} լույսի արագությամբ"} - } - locative{ - one{"{0} լույսի արագությունում"} - other{"{0} լույսի արագությունում"} - } - } - dnam{"լույսի արագություն"} - one{"{0} լույսի արագություն"} - other{"{0} լույսի արագություն"} - } meter-per-second{ case{ ablative{ @@ -3521,11 +3498,6 @@ hy{ one{"Բ{0}"} other{"Բ{0}"} } - light-speed{ - dnam{"լույսի արագություն"} - one{"{0}լույսի արագություն"} - other{"{0}լույսի արագություն"} - } meter-per-second{ one{"{0}մ/վ"} other{"{0}մ/վ"} @@ -4411,11 +4383,6 @@ hy{ one{"{0} հնգ"} other{"{0} հնգ"} } - light-speed{ - dnam{"լույսի արագություն"} - one{"{0} լույսի արագություն"} - other{"{0} լույսի արագություն"} - } meter-per-second{ dnam{"մ/վ"} one{"{0} մ/վ"} diff --git a/icu4c/source/data/unit/is.txt b/icu4c/source/data/unit/is.txt index b011d695c5c9..50552a8bb3a2 100644 --- a/icu4c/source/data/unit/is.txt +++ b/icu4c/source/data/unit/is.txt @@ -2335,26 +2335,6 @@ is{ one{"{0} hnútur"} other{"{0} hnútar"} } - light-speed{ - case{ - accusative{ - one{"{0} ljóshraða"} - other{"{0} ljóshraða"} - } - dative{ - one{"{0} ljóshraða"} - other{"{0} ljóshröðum"} - } - genitive{ - one{"{0} ljóshraða"} - other{"{0} ljóshraða"} - } - } - dnam{"ljóshraði"} - gender{"masculine"} - one{"{0} ljóshraði"} - other{"{0} ljóshraðar"} - } meter-per-second{ case{ accusative{ @@ -3006,11 +2986,6 @@ is{ kilometer-per-hour{ dnam{"km/klst."} } - light-speed{ - dnam{"ljóshr."} - one{"{0} ljóshr."} - other{"{0} ljóshr."} - } meter-per-second{ dnam{"m/sek."} } @@ -3513,11 +3488,6 @@ is{ one{"{0} km/klst."} other{"{0} km/klst."} } - light-speed{ - dnam{"ljóshr."} - one{"{0} ljóshr."} - other{"{0} ljóshr."} - } meter-per-second{ dnam{"metrar/sek."} } diff --git a/icu4c/source/data/unit/it.txt b/icu4c/source/data/unit/it.txt index 4e383b1dd941..396f1f47722e 100644 --- a/icu4c/source/data/unit/it.txt +++ b/icu4c/source/data/unit/it.txt @@ -174,7 +174,6 @@ it{ } } } - times{"{0} {1}"} } concentr{ item{ @@ -941,7 +940,6 @@ it{ other{"{0} nodi"} } light-speed{ - dnam{"luce"} gender{"feminine"} one{"{0} alla velocità della luce"} other{"{0} alla velocità della luce"} @@ -1813,7 +1811,6 @@ it{ other{"{0}kn"} } light-speed{ - dnam{"luce"} one{"{0}l"} other{"{0}l"} } @@ -2253,7 +2250,6 @@ it{ other{"Bft {0}"} } light-speed{ - dnam{"luce"} one{"{0} luce"} other{"{0} luce"} } diff --git a/icu4c/source/data/unit/ka.txt b/icu4c/source/data/unit/ka.txt index 2510efdd0a24..ff89ee36b0bf 100644 --- a/icu4c/source/data/unit/ka.txt +++ b/icu4c/source/data/unit/ka.txt @@ -701,11 +701,6 @@ ka{ one{"{0} კვანძი"} other{"{0} კვანძი"} } - light-speed{ - dnam{"სინათლის სიჩქარე"} - one{"{0}-მაგი სინათლის სიჩქარე"} - other{"{0}-მაგი სინათლის სიჩქარე"} - } meter-per-second{ dnam{"მეტრი წამში"} one{"{0} მეტრი წამში"} @@ -961,13 +956,6 @@ ka{ other{"{0} მბრ"} } } - speed{ - light-speed{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} - } - } volume{ liter{ one{"{0}ლ"} @@ -1735,11 +1723,6 @@ ka{ one{"{0} კვძ."} other{"{0} კვძ."} } - light-speed{ - dnam{"სინათლის სიჩქ."} - one{"{0}-მაგი სინათ. სიჩქ."} - other{"{0}-მაგი სინათ. სიჩქ."} - } meter-per-second{ dnam{"მ/წმ"} one{"{0} მ/წმ"} diff --git a/icu4c/source/data/unit/ko.txt b/icu4c/source/data/unit/ko.txt index 9b69e4e8ceb3..26c963f200c8 100644 --- a/icu4c/source/data/unit/ko.txt +++ b/icu4c/source/data/unit/ko.txt @@ -607,10 +607,6 @@ ko{ dnam{"노트"} other{"{0}노트"} } - light-speed{ - dnam{"광속"} - other{"{0}광속"} - } meter-per-second{ dnam{"미터 매 초"} other{"초속 {0}미터"} @@ -835,10 +831,6 @@ ko{ beaufort{ other{"B{0}"} } - light-speed{ - dnam{"광속"} - other{"{0}광속"} - } mile-per-hour{ other{"{0}mph"} } @@ -1342,10 +1334,6 @@ ko{ knot{ other{"{0}kn"} } - light-speed{ - dnam{"광속"} - other{"{0}광속"} - } meter-per-second{ other{"{0}m/s"} } diff --git a/icu4c/source/data/unit/lt.txt b/icu4c/source/data/unit/lt.txt index b21347dbe55b..b34e70514de7 100644 --- a/icu4c/source/data/unit/lt.txt +++ b/icu4c/source/data/unit/lt.txt @@ -4445,46 +4445,6 @@ lt{ one{"{0} mazgas"} other{"{0} mazgų"} } - light-speed{ - case{ - accusative{ - few{"{0} šviesos greičius"} - many{"{0} šviesos greičio"} - one{"{0} šviesos greitį"} - other{"{0} šviesos greičių"} - } - dative{ - few{"{0} šviesos greičiams"} - many{"{0} šviesos greičio"} - one{"{0} šviesos greičiui"} - other{"{0} šviesos greičių"} - } - genitive{ - few{"{0} šviesos greičių"} - many{"{0} šviesos greičio"} - one{"{0} šviesos greičio"} - other{"{0} šviesos greičių"} - } - instrumental{ - few{"{0} šviesos greičiais"} - many{"{0} šviesos greičio"} - one{"{0} šviesos greičiu"} - other{"{0} šviesos greičių"} - } - locative{ - few{"{0} šviesos greičiuose"} - many{"{0} šviesos greičio"} - one{"{0} šviesos greityje"} - other{"{0} šviesos greičių"} - } - } - dnam{"šviesos greitis"} - few{"{0} šviesos greičiai"} - gender{"masculine"} - many{"{0} šviesos greičio"} - one{"{0} šviesos greitis"} - other{"{0} šviesos greičių"} - } meter-per-second{ case{ accusative{ @@ -5353,13 +5313,6 @@ lt{ one{"{0} km/h"} other{"{0} km/h"} } - light-speed{ - dnam{"c"} - few{"{0} šv. greit."} - many{"{0} šv. greit."} - one{"{0} šv. greit."} - other{"{0} šv. greit."} - } meter-per-second{ dnam{"m/s"} few{"{0} m/s"} @@ -5859,13 +5812,6 @@ lt{ one{"{0} KN"} other{"{0} KN"} } - light-speed{ - dnam{"c"} - few{"{0} šv. greit."} - many{"{0} šv. greit."} - one{"{0} šv. greit."} - other{"{0} šv. greit."} - } meter-per-second{ dnam{"m/sek."} few{"{0} m/sek."} diff --git a/icu4c/source/data/unit/ml.txt b/icu4c/source/data/unit/ml.txt index 0fa7c463f219..53ddf0fed8b7 100644 --- a/icu4c/source/data/unit/ml.txt +++ b/icu4c/source/data/unit/ml.txt @@ -1973,11 +1973,6 @@ ml{ one{"{0} കിലോമീറ്റർ/മണിക്കൂർ"} other{"{0} കിലോമീറ്റർ/മണിക്കൂർ"} } - light-speed{ - dnam{"പ്രകാശവേഗം"} - one{"{0} പ്രകാശവേഗം"} - other{"{0} പ്രകാശവേഗം"} - } meter-per-second{ dnam{"മീറ്റർ/സെക്കൻഡ്"} one{"{0} മീറ്റർ/സെക്കൻഡ്"} @@ -2607,11 +2602,6 @@ ml{ one{"{0}നോട്ട്"} other{"{0}നോട്ട്"} } - light-speed{ - dnam{"പ്രകാശവേഗം"} - one{"{0}പ്രകാശവേഗം"} - other{"{0}പ്രകാശവേഗം"} - } meter-per-second{ dnam{"മീ/സെ."} one{"{0} മീ/സെ"} @@ -3359,11 +3349,6 @@ ml{ one{"{0} നോട്ട്"} other{"{0} നോട്ട്"} } - light-speed{ - dnam{"പ്രകാശവേഗം"} - one{"{0} പ്രകാശവേഗം"} - other{"{0} പ്രകാശവേഗം"} - } meter-per-second{ dnam{"മീറ്റർ/സെ."} one{"{0} മീ/സെ."} diff --git a/icu4c/source/data/unit/mn.txt b/icu4c/source/data/unit/mn.txt index 4140680ab079..91075e91722d 100644 --- a/icu4c/source/data/unit/mn.txt +++ b/icu4c/source/data/unit/mn.txt @@ -659,11 +659,6 @@ mn{ knot{ dnam{"зангилаа"} } - light-speed{ - dnam{"гэрлийн хурд"} - one{"{0} гэрлийн хурд"} - other{"{0} гэрлийн хурд"} - } meter-per-second{ dnam{"секундэд ногдох метр"} one{"секундэд {0} метр"} @@ -1051,11 +1046,6 @@ mn{ kilometer-per-hour{ dnam{"км/ц"} } - light-speed{ - dnam{"гэрлийн хурд"} - one{"{0} гэрлийн хурд"} - other{"{0} гэрлийн хурд"} - } meter-per-second{ dnam{"м/с"} } @@ -1844,11 +1834,6 @@ mn{ one{"{0} занг."} other{"{0} занг."} } - light-speed{ - dnam{"гэрлийн хурд"} - one{"{0} гэрлийн хурд"} - other{"{0} гэрлийн хурд"} - } meter-per-second{ dnam{"метр/сек"} one{"{0} м/с"} diff --git a/icu4c/source/data/unit/nl.txt b/icu4c/source/data/unit/nl.txt index 003bf56c1011..fd31e0cec137 100644 --- a/icu4c/source/data/unit/nl.txt +++ b/icu4c/source/data/unit/nl.txt @@ -1389,9 +1389,6 @@ nl{ per{"{0} per mi²"} } } - compound{ - times{"{0}{1}"} - } concentr{ item{ dnam{"onderdeel"} diff --git a/icu4c/source/data/unit/nn.txt b/icu4c/source/data/unit/nn.txt index bfa30220ca7a..8c0b444e12ed 100644 --- a/icu4c/source/data/unit/nn.txt +++ b/icu4c/source/data/unit/nn.txt @@ -684,9 +684,6 @@ nn{ per{"{0}/mi²"} } } - compound{ - times{"{0}{1}"} - } concentr{ millimole-per-liter{ dnam{"mmol/l"} diff --git a/icu4c/source/data/unit/ru.txt b/icu4c/source/data/unit/ru.txt index 722b1e78625b..10ea7b1c61fe 100644 --- a/icu4c/source/data/unit/ru.txt +++ b/icu4c/source/data/unit/ru.txt @@ -5412,46 +5412,6 @@ ru{ one{"{0} узел"} other{"{0} узла"} } - light-speed{ - case{ - accusative{ - few{"{0} скорости света"} - many{"{0} скоростей света"} - one{"{0} скорость света"} - other{"{0} скорости света"} - } - dative{ - few{"{0} скоростям света"} - many{"{0} скоростям света"} - one{"{0} скорости света"} - other{"{0} скорости света"} - } - genitive{ - few{"{0} скоростей света"} - many{"{0} скоростей света"} - one{"{0} скорости света"} - other{"{0} скорости света"} - } - instrumental{ - few{"{0} скоростями света"} - many{"{0} скоростями света"} - one{"{0} скоростью света"} - other{"{0} скорости света"} - } - prepositional{ - few{"{0} скоростях света"} - many{"{0} скоростях света"} - one{"{0} скорости света"} - other{"{0} скорости света"} - } - } - dnam{"скорость света"} - few{"{0} скорости света"} - gender{"feminine"} - many{"{0} скоростей света"} - one{"{0} скорость света"} - other{"{0} скорости света"} - } meter-per-second{ case{ accusative{ @@ -7176,15 +7136,6 @@ ru{ other{"{0} ам. т"} } } - speed{ - light-speed{ - dnam{"c"} - few{"{0} c"} - many{"{0} c"} - one{"{0} c"} - other{"{0} c"} - } - } temperature{ fahrenheit{ few{"{0} °F"} @@ -8231,13 +8182,6 @@ ru{ one{"{0} уз"} other{"{0} уз"} } - light-speed{ - dnam{"ск. света"} - few{"{0} ск. света"} - many{"{0} ск. света"} - one{"{0} ск. света"} - other{"{0} ск. света"} - } meter-per-second{ dnam{"м/с"} few{"{0} м/с"} diff --git a/icu4c/source/data/unit/sk.txt b/icu4c/source/data/unit/sk.txt index a6ac2dd2ad2a..2b7eda3acb91 100644 --- a/icu4c/source/data/unit/sk.txt +++ b/icu4c/source/data/unit/sk.txt @@ -4593,46 +4593,6 @@ sk{ one{"{0} uzol"} other{"{0} uzlov"} } - light-speed{ - case{ - accusative{ - few{"{0} rýchlosti svetla"} - many{"{0} rýchlosti svetla"} - one{"{0} rýchlosť svetla"} - other{"{0} rýchlostí svetla"} - } - dative{ - few{"{0} rýchlostiam svetla"} - many{"{0} rýchlosti svetla"} - one{"{0} rýchlosti svetla"} - other{"{0} rýchlostiam svetla"} - } - genitive{ - few{"{0} rýchlostí svetla"} - many{"{0} rýchlosti svetla"} - one{"{0} rýchlosti svetla"} - other{"{0} rýchlostí svetla"} - } - instrumental{ - few{"{0} rýchlosťami svetla"} - many{"{0} rýchlosti svetla"} - one{"{0} rýchlosťou svetla"} - other{"{0} rýchlosťami svetla"} - } - locative{ - few{"{0} rýchlostiach svetla"} - many{"{0} rýchlosti svetla"} - one{"{0} rýchlosti svetla"} - other{"{0} rýchlostiach svetla"} - } - } - dnam{"rýchlosť svetla"} - few{"{0} rýchlosti svetla"} - gender{"feminine"} - many{"{0} rýchlosti svetla"} - one{"{0} rýchlosť svetla"} - other{"{0} rýchlostí svetla"} - } meter-per-second{ case{ accusative{ @@ -5552,15 +5512,6 @@ sk{ other{"{0} mb"} } } - speed{ - light-speed{ - dnam{"c0"} - few{"{0} c0"} - many{"{0} c0"} - one{"{0} c0"} - other{"{0} c0"} - } - } } unitsShort{ acceleration{ @@ -5601,9 +5552,6 @@ sk{ dnam{"hektáre"} } } - compound{ - times{"{0}{1}"} - } concentr{ item{ dnam{"pol."} @@ -5896,15 +5844,6 @@ sk{ dnam{"W"} } } - speed{ - light-speed{ - dnam{"c0"} - few{"{0} c0"} - many{"{0} c0"} - one{"{0} c0"} - other{"{0} c0"} - } - } temperature{ celsius{ few{"{0} °C"} diff --git a/icu4c/source/data/unit/sq.txt b/icu4c/source/data/unit/sq.txt index 636d73b2fbe4..fb1d098eaba2 100644 --- a/icu4c/source/data/unit/sq.txt +++ b/icu4c/source/data/unit/sq.txt @@ -779,11 +779,6 @@ sq{ one{"{0} milje nautike në orë"} other{"{0} milje nautike në orë"} } - light-speed{ - dnam{"shpejtësi drite"} - one{"{0} shpejtësi drite"} - other{"{0} shpejtësi drite"} - } meter-per-second{ dnam{"metra në sekondë"} one{"{0} metër në sekondë"} @@ -1135,13 +1130,6 @@ sq{ other{"{0} mb"} } } - speed{ - light-speed{ - dnam{"shpejtësi drite"} - one{"{0} shp. dr."} - other{"{0} shp. dr."} - } - } temperature{ celsius{ dnam{"°C"} @@ -1426,11 +1414,6 @@ sq{ one{"{0} km/orë"} other{"{0} km/orë"} } - light-speed{ - dnam{"shpejtësi drite"} - one{"{0} shpejtësi drite"} - other{"{0} shpejtësi drite"} - } } temperature{ celsius{ diff --git a/icu4c/source/data/unit/uk.txt b/icu4c/source/data/unit/uk.txt index e2bc7dcce1fb..ce2a2f5ba835 100644 --- a/icu4c/source/data/unit/uk.txt +++ b/icu4c/source/data/unit/uk.txt @@ -4556,46 +4556,6 @@ uk{ one{"{0} вузол"} other{"{0} вузла"} } - light-speed{ - case{ - accusative{ - few{"{0} швидкості світла"} - many{"{0} швидкостей світла"} - one{"{0} швидкість світла"} - other{"{0} швидкості світла"} - } - dative{ - few{"{0} швидкостям світла"} - many{"{0} швидкостям світла"} - one{"{0} швидкості світла"} - other{"{0} швидкості світла"} - } - genitive{ - few{"{0} швидкостей світла"} - many{"{0} швидкостей світла"} - one{"{0} швидкості світла"} - other{"{0} швидкості світла"} - } - instrumental{ - few{"{0} швидкостями світла"} - many{"{0} швидкостями світла"} - one{"{0} швидкістю світла"} - other{"{0} швидкості світла"} - } - locative{ - few{"{0} швидкостях світла"} - many{"{0} швидкостях світла"} - one{"{0} швидкістю світла"} - other{"{0} швидкості світла"} - } - } - dnam{"швидкість світла"} - few{"{0} швидкості світла"} - gender{"feminine"} - many{"{0} швидкостей світла"} - one{"{0} швидкість світла"} - other{"{0} швидкості світла"} - } meter-per-second{ case{ accusative{ @@ -6346,13 +6306,6 @@ uk{ one{"{0}вуз."} other{"{0}вуз."} } - light-speed{ - dnam{"шв.св."} - few{"{0}шв.св."} - many{"{0}шв.св."} - one{"{0}шв.св."} - other{"{0}шв.св."} - } meter-per-second{ dnam{"м/с"} few{"{0}м/с"} @@ -7700,13 +7653,6 @@ uk{ one{"{0} вуз."} other{"{0} вуз."} } - light-speed{ - dnam{"шв. св."} - few{"{0} шв. св."} - many{"{0} шв. св."} - one{"{0} шв. св."} - other{"{0} шв. св."} - } meter-per-second{ dnam{"метри/с"} few{"{0} м/с"} diff --git a/icu4c/source/data/unit/uz.txt b/icu4c/source/data/unit/uz.txt index 6120f83ffc55..aecac90b6e30 100644 --- a/icu4c/source/data/unit/uz.txt +++ b/icu4c/source/data/unit/uz.txt @@ -621,11 +621,6 @@ uz{ one{"Bofort {0}"} other{"Bofort {0}"} } - light-speed{ - dnam{"yorug‘lik tezligi"} - one{"{0} yorug‘lik tezligi"} - other{"{0} yorug‘lik tezligi"} - } meter-per-second{ dnam{"metr/soniya"} one{"{0} metr/soniya"} @@ -861,11 +856,6 @@ uz{ } } speed{ - light-speed{ - dnam{"yorug‘lik tezligi"} - one{"{0} yorug‘lik tezligi"} - other{"{0} yorug‘lik tezligi"} - } mile-per-hour{ one{"{0} mi/h"} other{"{0} mi/h"} @@ -1454,11 +1444,6 @@ uz{ one{"{0} uzel"} other{"{0} uzel"} } - light-speed{ - dnam{"yorug‘lik tezligi"} - one{"{0} yorug‘lik tezligi"} - other{"{0} yorug‘lik tezligi"} - } mile-per-hour{ dnam{"mil/soat"} one{"{0} mil/soat"} diff --git a/icu4c/source/data/unit/vi.txt b/icu4c/source/data/unit/vi.txt index e01b0a11e250..2ea0001d06c9 100644 --- a/icu4c/source/data/unit/vi.txt +++ b/icu4c/source/data/unit/vi.txt @@ -497,10 +497,6 @@ vi{ dnam{"hải lý/giờ"} other{"{0} hải lý/giờ"} } - light-speed{ - dnam{"tốc độ ánh sáng"} - other{"{0} tốc độ ánh sáng"} - } meter-per-second{ dnam{"mét/giây"} other{"{0} mét/giây"} @@ -755,12 +751,6 @@ vi{ other{"{0} mb"} } } - speed{ - light-speed{ - dnam{"tốc độ ánh sáng"} - other{"{0}tốc độ ánh sáng"} - } - } volume{ cubic-kilometer{ other{"{0}km³"} @@ -1042,10 +1032,6 @@ vi{ } } speed{ - light-speed{ - dnam{"tốc độ ánh sáng"} - other{"{0} tốc độ ánh sáng"} - } mile-per-hour{ other{"{0} mph"} } diff --git a/icu4c/source/data/unit/yo.txt b/icu4c/source/data/unit/yo.txt index a25af2b3df1a..ca1ce7ff084f 100644 --- a/icu4c/source/data/unit/yo.txt +++ b/icu4c/source/data/unit/yo.txt @@ -155,7 +155,7 @@ yo{ } year{ dnam{"ọ̀dún"} - per{"{0} ọd"} + other{"{0} ọ̀dún"} } } force{ @@ -394,6 +394,10 @@ yo{ dnam{"ọṣẹ́"} per{"{0}/ọ̀ṣẹ̀"} } + year{ + dnam{"ọd"} + other{"{0} ọd"} + } } electric{ ampere{ @@ -862,7 +866,6 @@ yo{ year{ dnam{"ọd"} other{"{0} ọd"} - per{"{0}/ọd"} } } force{ diff --git a/icu4c/source/data/unit/zh_Hant.txt b/icu4c/source/data/unit/zh_Hant.txt index ccd7fdb8be1e..00f9a180e566 100644 --- a/icu4c/source/data/unit/zh_Hant.txt +++ b/icu4c/source/data/unit/zh_Hant.txt @@ -251,10 +251,6 @@ zh_Hant{ dnam{"每小時公里"} other{"每小時 {0} 公里"} } - light-speed{ - dnam{"夜"} - other{"{0} 夜"} - } meter-per-second{ dnam{"每秒公尺"} other{"每秒 {0} 公尺"} @@ -721,10 +717,6 @@ zh_Hant{ kilometer-per-hour{ other{"{0}公里/小時"} } - light-speed{ - dnam{"夜"} - other{"{0} 夜"} - } meter-per-second{ other{"{0}公尺/秒"} } @@ -1416,10 +1408,6 @@ zh_Hant{ dnam{"節"} other{"{0} 節"} } - light-speed{ - dnam{"夜"} - other{"{0} 夜"} - } meter-per-second{ dnam{"公尺/秒"} other{"{0} 公尺/秒"} diff --git a/icu4c/source/data/unit/zu.txt b/icu4c/source/data/unit/zu.txt index c7167f7a1a1d..5ce242c64550 100644 --- a/icu4c/source/data/unit/zu.txt +++ b/icu4c/source/data/unit/zu.txt @@ -163,10 +163,6 @@ zu{ one{"{0} iviki"} other{"{0} amaviki"} } - year{ - one{"{0} y"} - other{"{0} y"} - } } energy{ foodcalorie{ @@ -421,10 +417,6 @@ zu{ one{"{0} w"} other{"{0} w"} } - year{ - one{"{0} y"} - other{"{0} y"} - } } electric{ ampere{ @@ -943,11 +935,6 @@ zu{ one{"{0} viki"} other{"{0} amaviki"} } - year{ - dnam{"y"} - one{"{0} y"} - other{"{0} yrs"} - } } energy{ foodcalorie{ diff --git a/icu4c/source/data/zone/tg.txt b/icu4c/source/data/zone/tg.txt index 1166dbb10fc3..d74c4a47eeca 100644 --- a/icu4c/source/data/zone/tg.txt +++ b/icu4c/source/data/zone/tg.txt @@ -1543,7 +1543,7 @@ tg{ ls{"Вақти уқёнуси Ҳинд"} } "meta:Indochina"{ - ls{"Вақти Ҳиндустон"} + ls{"Вақти Ҳиндучин"} } "meta:Indonesia_Central"{ ls{"Вақти Индонезияи Марказӣ"} diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt index e18091ff410d..d7f06199e44d 100644 --- a/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt +++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt @@ -1035,7 +1035,7 @@ uk-Cyrl ; uk-Cyrl-UA ; uk ; uk-Egyp ; uk-Egyp-UA ; uk-Egyp ; uk-UA ; uk-Cyrl-UA ; uk ; und ; en-Latn-US ; en ; -und-001 ; en-Latn-US ; en ; +und-001 ; en-Latn-001 ; en-001 ; und-150 ; en-Latn-150 ; en-150 ; und-419 ; es-Latn-419 ; es-419 ; und-AD ; ca-Latn-AD ; ca-AD ; @@ -1312,7 +1312,7 @@ und-Laoo ; lo-Laoo-LA ; lo ; und-Laoo-AQ ; lo-Laoo-AQ ; lo-AQ ; und-Laoo-LA ; lo-Laoo-LA ; lo ; und-Latn ; en-Latn-US ; en ; -und-Latn-001 ; en-Latn-US ; en ; +und-Latn-001 ; en-Latn-001 ; en-001 ; und-Latn-150 ; en-Latn-150 ; en-150 ; und-Latn-419 ; es-Latn-419 ; es-419 ; und-Latn-AD ; ca-Latn-AD ; ca-AD ; diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt index e18091ff410d..d7f06199e44d 100644 --- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt +++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt @@ -1035,7 +1035,7 @@ uk-Cyrl ; uk-Cyrl-UA ; uk ; uk-Egyp ; uk-Egyp-UA ; uk-Egyp ; uk-UA ; uk-Cyrl-UA ; uk ; und ; en-Latn-US ; en ; -und-001 ; en-Latn-US ; en ; +und-001 ; en-Latn-001 ; en-001 ; und-150 ; en-Latn-150 ; en-150 ; und-419 ; es-Latn-419 ; es-419 ; und-AD ; ca-Latn-AD ; ca-AD ; @@ -1312,7 +1312,7 @@ und-Laoo ; lo-Laoo-LA ; lo ; und-Laoo-AQ ; lo-Laoo-AQ ; lo-AQ ; und-Laoo-LA ; lo-Laoo-LA ; lo ; und-Latn ; en-Latn-US ; en ; -und-Latn-001 ; en-Latn-US ; en ; +und-Latn-001 ; en-Latn-001 ; en-001 ; und-Latn-150 ; en-Latn-150 ; en-150 ; und-Latn-419 ; es-Latn-419 ; es-419 ; und-Latn-AD ; ca-Latn-AD ; ca-AD ; diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt index 78b1c58c6daf..9abbc13423cf 100644 --- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt +++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt @@ -2194,6 +2194,32 @@ nl-Latn-BE; ਫਲੈਮਿਸ਼ (ਲਾਤੀਨੀ) zh-Hans-fonipa; ਚੀਨੀ (ਸਰਲ, FONIPA) +@locale=pcm +@languageDisplay=standard + +en-MM; Ínglish (Miánma [Bọ́ma]) +es; Spánish Lángwej +es-419; Spánish Lángwej (Látín Amẹ́ríka) +es-Cyrl-MX; Spánish Lángwej (Sírílik, Mẹ́ksíko) +hi-Latn; Híndi Lángwej (Látin) +nl-BE; Dọch Lángwej (Bẹ́ljọm) +nl-Latn-BE; Dọch Lángwej (Látin, Bẹ́ljọm) +zh-Hans-fonipa; Mandarín Chainíz Lángwej (Ízí Chainíz Lángwej, FONIPA) + + +@locale=pcm +@languageDisplay=dialect + +en-MM; Ínglish (Miánma [Bọ́ma]) +es; Spánish Lángwej +es-419; Látín Amẹ́ríka Spánish +es-Cyrl-MX; Mẹ́ksiko Spánish (Sírílik) +hi-Latn; Híndi [Látin] +nl-BE; Flẹ́mish Lángwej +nl-Latn-BE; Flẹ́mish Lángwej (Látin) +zh-Hans-fonipa; Mandarín Chainíz Lángwej (Ízí Chainíz Lángwej, FONIPA) + + @locale=pl @languageDisplay=standard @@ -2740,6 +2766,32 @@ nl-Latn-BE; เฟลมิช (ละติน) zh-Hans-fonipa; จีนตัวย่อ (สัทอักษรสากล) +@locale=ti +@languageDisplay=standard + +en-MM; እንግሊዝኛ (ሚያንማር [በርማ]) +es; ስጳንኛ +es-419; ስጳንኛ (ላቲን ኣመሪካ) +es-Cyrl-MX; ስጳንኛ (ቋንቋ ሲሪል፣ ሜክሲኮ) +hi-Latn; ሂንዲ (ላቲን) +nl-BE; ዳች (ቤልጅዩም) +nl-Latn-BE; ዳች (ላቲን፣ ቤልጅዩም) +zh-Hans-fonipa; ቻይንኛ (ዝተቐለለ፣ FONIPA) + + +@locale=ti +@languageDisplay=dialect + +en-MM; እንግሊዝኛ (ሚያንማር [በርማ]) +es; ስጳንኛ +es-419; ስጳንኛ (ላቲን ኣመሪካ) +es-Cyrl-MX; ስጳንኛ (ቋንቋ ሲሪል፣ ሜክሲኮ) +hi-Latn; ሂንዲ (ላቲን) +nl-BE; ፍላሚሽ +nl-Latn-BE; ፍላሚሽ (ላቲን) +zh-Hans-fonipa; ቀሊል ቻይንኛ (FONIPA) + + @locale=tk @languageDisplay=standard diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt index dbf3ce4d4670..b5d536a2ed7a 100644 --- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt +++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt @@ -1,5 +1,5 @@ -# Test data for unit preferences +# Test data for unit region preferences # Copyright © 1991-2024 Unicode, Inc. # For terms of use, see http://www.unicode.org/copyright.html # SPDX-License-Identifier: Unicode-3.0 @@ -384,9 +384,9 @@ speed; wind; 001; 11/36; 0.3055555555555556; meter-per-second; 11/10; 1.1; kilom speed; wind; 001; 5/18; 0.2777777777777778; meter-per-second; 1; 1.0; kilometer-per-hour speed; wind; 001; 1/4; 0.25; meter-per-second; 9/10; 0.9; kilometer-per-hour -speed; wind; FI; 11/10; 1.1; meter-per-second; 11/10; 1.1; meter-per-second -speed; wind; FI; 1; 1.0; meter-per-second; 1; 1.0; meter-per-second -speed; wind; FI; 9/10; 0.9; meter-per-second; 9/10; 0.9; meter-per-second +speed; wind; CN; 11/10; 1.1; meter-per-second; 11/10; 1.1; meter-per-second +speed; wind; CN; 1; 1.0; meter-per-second; 1; 1.0; meter-per-second +speed; wind; CN; 9/10; 0.9; meter-per-second; 9/10; 0.9; meter-per-second speed; wind; GB; 15367/31250; 0.491744; meter-per-second; 11/10; 1.1; mile-per-hour speed; wind; GB; 1397/3125; 0.44704; meter-per-second; 1; 1.0; mile-per-hour