From: Peter Edberg Date: Fri, 11 Feb 2022 19:37:47 +0000 (-0800) Subject: ICU-21900 integrate CLDR release-41-alpha1 to ICU main for 71 front-load X-Git-Tag: cldr/2022-02-22~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=008fddfaacc2d0923886310f13fd16f613b516d8;p=icu ICU-21900 integrate CLDR release-41-alpha1 to ICU main for 71 front-load --- diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index 74945333891..ea54453fc4e 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -210,21 +210,13 @@ open $ICU4C_DIR/source/data/brkitr/root.txt Mymr{"Burmese_graphclust_model5_heavy.res"} } -# 4f. And the time being (a ticket is being filed to generate the below from CLDR data), -# manually re-add the particles/auxVerbs entries in data/brkitr/ja.txt +# 4f. And the time being (work is in progress to generate the below from CLDR data), +# manually re-add the extensions entries in data/brkitr/ja.txt open $ICU4C_DIR/source/data/brkitr/ja.txt -# paste the following blocks after the boundaries block and before the final closing '}': - particles{ - か, かしら, から, が, くらい, けれども, こそ, - さ, さえ, しか, だけ, だに, だの, て, で, でも, - と, ところが, とも, な, など, なり, に, ね, の, - ので, のに, は, ば, ばかり, へ, ほど, まで, も, - や, やら, よ, より, わ, を - } - auxVerbs { - です, でしょ, でし, ます, ませ, まし - } +# copy in the extensions data from the current version... + +# and delete any bogus extensions data that ended up in $ICU4C_DIR/source/data/locales/ja.txt # 5. Check which data files have modifications, which have been added or removed # (if there are no changes, you may not need to proceed further). Make sure the diff --git a/icu4c/source/data/curr/LOCALE_DEPS.json b/icu4c/source/data/curr/LOCALE_DEPS.json index d83f3bf7cd3..93facb19926 100644 --- a/icu4c/source/data/curr/LOCALE_DEPS.json +++ b/icu4c/source/data/curr/LOCALE_DEPS.json @@ -176,6 +176,7 @@ "es_VE": "es_419", "ff_Adlm": "root", "hi_Latn": "en_IN", + "ks_Deva": "root", "nb": "no", "nn": "no", "pa_Arab": "root", diff --git a/icu4c/source/data/curr/ks_Deva.txt b/icu4c/source/data/curr/ks_Deva.txt new file mode 100644 index 00000000000..39af0161770 --- /dev/null +++ b/icu4c/source/data/curr/ks_Deva.txt @@ -0,0 +1,82 @@ +// © 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 +ks_Deva{ + %%Parent{"root"} + Currencies{ + BRL{ + "R$", + "ब्राज़िली रील", + } + CNY{ + "CN¥", + "चीनी युवान", + } + EUR{ + "€", + "यूरो", + } + GBP{ + "£", + "बरतानवी पूनड", + } + INR{ + "₹", + "इंडियन रूपी", + } + JPY{ + "JP¥", + "जापानी येन", + } + RUB{ + "RUB", + "रूसी रूबल", + } + USD{ + "$", + "US डॉलर", + } + XXX{ + "¤", + "नामोलुम करन्सी", + } + } + CurrencyPlurals{ + BRL{ + one{"ब्राज़िली रील"} + other{"ब्राज़िली रीलज़"} + } + CNY{ + one{"चीनी युवान"} + other{"चीनी युवान"} + } + EUR{ + one{"यूरो"} + other{"यूरोज़"} + } + GBP{ + one{"बरतानवी पूनड"} + other{"बरतानवी पूनड"} + } + INR{ + one{"इंडियन रूपी"} + other{"इंडियन रुपीज़"} + } + JPY{ + one{"जापानी येन"} + other{"जापानी येन"} + } + RUB{ + one{"रूसी रूबल"} + other{"रूसी रूबल"} + } + USD{ + one{"US डॉलर"} + other{"US डॉलर्ज़"} + } + XXX{ + one{"(करन्सी हुंद नामोलुम यूनिट)"} + other{"(नामोलुम करन्सी)"} + } + } +} diff --git a/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd b/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd new file mode 100644 index 00000000000..615bfae409e --- /dev/null +++ b/icu4c/source/data/dtd/cldr/common/dtd/ldml.dtd @@ -0,0 +1,3208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd b/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd new file mode 100644 index 00000000000..4bb39cbf9b8 --- /dev/null +++ b/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4c/source/data/lang/LOCALE_DEPS.json b/icu4c/source/data/lang/LOCALE_DEPS.json index d83f3bf7cd3..93facb19926 100644 --- a/icu4c/source/data/lang/LOCALE_DEPS.json +++ b/icu4c/source/data/lang/LOCALE_DEPS.json @@ -176,6 +176,7 @@ "es_VE": "es_419", "ff_Adlm": "root", "hi_Latn": "en_IN", + "ks_Deva": "root", "nb": "no", "nn": "no", "pa_Arab": "root", diff --git a/icu4c/source/data/lang/ks_Deva.txt b/icu4c/source/data/lang/ks_Deva.txt new file mode 100644 index 00000000000..9453809bf5b --- /dev/null +++ b/icu4c/source/data/lang/ks_Deva.txt @@ -0,0 +1,90 @@ +// © 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 +ks_Deva{ + %%Parent{"root"} + Languages{ + de{"जर्मन"} + de_AT{"आस्ट्रियन जर्मन"} + de_CH{"स्विस हाई जर्मन"} + en{"अंगरिज़ी"} + en_AU{"आसट्रेलवी अंगरिज़ी"} + en_CA{"कनाडियन अंगरिज़ी"} + en_GB{"बरतानवी अंगरिज़ी"} + en_US{"अमरीकी अंगरिज़ी"} + es{"हसपानवी"} + es_419{"लातिनी अमरीकी हसपानवी"} + es_ES{"यूरपी हसपानवी"} + es_MX{"मेकसिकी हसपानवी"} + fr{"फ्रांसीसी"} + fr_CA{"कनाडियन फ्रांसीसी"} + fr_CH{"स्विस फ्रांसीसी"} + it{"इतालवी"} + ja{"जापानी"} + ks{"कॉशुर"} + pt{"पुरतउगाली"} + pt_BR{"ब्राज़िली पुरतउगाली"} + pt_PT{"यूरपी पुरतउगाली"} + ru{"रूसी"} + und{"नामोलुम ज़बान"} + zh{"चीनी (तरजुम इशार: खास तोर, मैन्डरिन चीनी।)"} + zh_Hans{"आसान चीनी"} + zh_Hant{"रिवायाती चीनी"} + } + Languages%long{ + zh_Hans{"आसान मैन्डरिन चीनी"} + zh_Hant{"रिवायाती मैन्डरिन चीनी"} + } + Languages%menu{ + zh{"चीनी, मैन्डरिन"} + } + Languages%short{ + en_GB{"UK अंगरिज़ी"} + en_US{"US अंगरिज़ी"} + } + Scripts{ + Arab{"अरबी"} + Cyrl{"सिरिलिक"} + Deva{"देवनागरी"} + Hans{ + "आसान (तरजुम इशार: स्क्रिप्ट नवुक यि वर्ज़न छु चीनी बापथ ज़बान नाव किस मु" + "रकब कि इस्तिमल करान।)" + } + Hant{ + "रिवायाती (तरजुम इशार: स्क्रिप्ट नवुक यि वर्ज़न छु चीनी बापथ ज़बान नाव कि" + "स मुरकब कि इस्तिमल करान।)" + } + Latn{"लातिनी"} + Zxxx{"गेर तहरीर"} + Zzzz{"गेर तहरीर स्क्रिप्ट"} + } + Scripts%stand-alone{ + Hans{ + "आसान हान (तरजुम इशार: स्क्रिप्ट नवुक यि वर्ज़न छु अलग इस्तिमाल सपदन, यि " + "छु नि चीनी ज़बान बापथ ज़बान नवास सीथ मुरकब।)" + } + Hant{ + "रिवायाती हान (तरजुम इशार: स्क्रिप्ट नवुक यि वर्ज़न छु अलग इस्तिमाल सपदन," + " यि छु नि चीनी ज़बान बापथ ज़बान नवास सीथ मुरकब।)" + } + } + Types{ + calendar{ + gregorian{"ग्रिगोरियन कैलंडर"} + } + collation{ + standard{"मियारी तरतीब ऑर्डर"} + } + numbers{ + arab{"अरबी-इंडिक हिंदसी"} + arabext{"तोसी शुद अरबी-इंडिक हिंदसी"} + deva{"देवनागरी हिंदसि"} + latn{"यूरपी हिंदसी"} + } + } + codePatterns{ + language{"ज़बान: {0}"} + script{"स्क्रिप्ट: {0}"} + territory{"अलाक़: {0}"} + } +} diff --git a/icu4c/source/data/locales/LOCALE_DEPS.json b/icu4c/source/data/locales/LOCALE_DEPS.json index d83f3bf7cd3..93facb19926 100644 --- a/icu4c/source/data/locales/LOCALE_DEPS.json +++ b/icu4c/source/data/locales/LOCALE_DEPS.json @@ -176,6 +176,7 @@ "es_VE": "es_419", "ff_Adlm": "root", "hi_Latn": "en_IN", + "ks_Deva": "root", "nb": "no", "nn": "no", "pa_Arab": "root", diff --git a/icu4c/source/data/locales/en_ZA.txt b/icu4c/source/data/locales/en_ZA.txt index 8db025dd494..d99386622fe 100644 --- a/icu4c/source/data/locales/en_ZA.txt +++ b/icu4c/source/data/locales/en_ZA.txt @@ -4,7 +4,7 @@ en_ZA{ %%Parent{"en_001"} AuxExemplarCharacters{ - "[á à ă â å ä ā æ ç ḓ é è ĕ ê ë ē í ì ĭ î ï ī ḽ ṅ ṋ ñ ó ò ŏ ô ö ø ō œ š ṱ ú ù" + "[á à ă â å ä ā æ ç ḓ é è ĕ ê ë ē í ì ĭ î ï ī ḽ ñ ṅ ṋ ó ò ŏ ô ö ø ō œ š ṱ ú ù" " ŭ û ü ū ÿ]" } ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} diff --git a/icu4c/source/data/locales/es_419.txt b/icu4c/source/data/locales/es_419.txt index 0cb1bb54492..152fa56a6b8 100644 --- a/icu4c/source/data/locales/es_419.txt +++ b/icu4c/source/data/locales/es_419.txt @@ -11,15 +11,12 @@ es_419{ patternsLong{ decimalFormat{ 1000000000000{ - one{"0 billón"} other{"0 billón"} } 10000000000000{ - one{"00 billones"} other{"00 billones"} } 100000000000000{ - one{"000 billones"} other{"000 billones"} } } diff --git a/icu4c/source/data/locales/es_MX.txt b/icu4c/source/data/locales/es_MX.txt index 96725f255c6..9d141112d94 100644 --- a/icu4c/source/data/locales/es_MX.txt +++ b/icu4c/source/data/locales/es_MX.txt @@ -9,15 +9,12 @@ es_MX{ patternsLong{ decimalFormat{ 1000000000000{ - one{"0 billón"} other{"0 billones"} } 10000000000000{ - one{"00 billones"} other{"00 billones"} } 100000000000000{ - one{"000 billones"} other{"000 billones"} } } diff --git a/icu4c/source/data/locales/hi.txt b/icu4c/source/data/locales/hi.txt index 0a10cc993f9..9a3eec781db 100644 --- a/icu4c/source/data/locales/hi.txt +++ b/icu4c/source/data/locales/hi.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 hi{ - AuxExemplarCharacters{"[\u200C \u200D \u0944]"} + AuxExemplarCharacters{"[\u200C\u200D \u0944]"} Ellipsis{ final{"{0}…"} initial{"…{0}"} diff --git a/icu4c/source/data/locales/kea.txt b/icu4c/source/data/locales/kea.txt index 0d8610494b0..cfa8b144fc5 100644 --- a/icu4c/source/data/locales/kea.txt +++ b/icu4c/source/data/locales/kea.txt @@ -14,7 +14,7 @@ kea{ word-initial{"… {0}"} word-medial{"{0} … {1}"} } - ExemplarCharacters{"[a b d {dj} e f g h i j k l {lh} m n {nh} ñ o p r s t {tx} u v x y z]"} + ExemplarCharacters{"[a b d {dj} e f g h i j k l {lh} m n ñ {nh} o p r s t {tx} u v x y z]"} ExemplarCharactersIndex{"[A B D E F G H I J K L M N O P R S T U V X Z]"} ExemplarCharactersNumbers{"[  \\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{ diff --git a/icu4c/source/data/locales/kok.txt b/icu4c/source/data/locales/kok.txt index a3a9fcda036..8c8ae759084 100644 --- a/icu4c/source/data/locales/kok.txt +++ b/icu4c/source/data/locales/kok.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 kok{ - AuxExemplarCharacters{"[\u200C \u200D \u0944]"} + AuxExemplarCharacters{"[\u200C\u200D \u0944]"} ExemplarCharacters{ "[\u093C ० १ २ ३ ४ ५ ६ ७ ८ ९ ॐ \u0902 \u0901 ः अ आ इ ई उ ऊ ऋ ऌ ऍ ए ऐ ऑ ओ औ क " "{क\u093C} ख {ख\u093C} ग {ग\u093C} घ ङ च छ ज {ज\u093C} झ ञ ट ठ ड {ड\u093C} ढ " diff --git a/icu4c/source/data/locales/ks.txt b/icu4c/source/data/locales/ks.txt index 2343a8925e7..e03c60a8c51 100644 --- a/icu4c/source/data/locales/ks.txt +++ b/icu4c/source/data/locales/ks.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 ks{ - AuxExemplarCharacters{"[\u200E\u200F \u064E \u064F \u0650 \u0654 \u0655 \u065F \u0656 \u0657]"} + AuxExemplarCharacters{"[\u200E\u200F \u064E \u064F \u0650 \u0654 \u0655 \u065F \u0656 \u0657 ئ]"} ExemplarCharacters{ "[ء آ أ ٲ ؤ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں" " ھ ہ و ۄ ۆ ی ۍ ؠ ے]" diff --git a/icu4c/source/data/locales/ks_Deva.txt b/icu4c/source/data/locales/ks_Deva.txt new file mode 100644 index 00000000000..57291b83ff0 --- /dev/null +++ b/icu4c/source/data/locales/ks_Deva.txt @@ -0,0 +1,339 @@ +// © 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 +ks_Deva{ + %%Parent{"root"} + AuxExemplarCharacters{"[\u200C\u200D]"} + ExemplarCharacters{ + "[\u093C \u0901 अ आ इ ई उ ऊ ए ऑ ओ क ख ग च {च\u093C} छ {छ\u093C} ज ट ठ ड त थ द" + " न प फ ब म य र ल व श स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 " + "\u0948 ॉ ो ौ \u094D]" + } + ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} + ExemplarCharactersPunctuation{ + "[\\- ‐ ‑ – — , ; \\: ! ? . … ' ‘ ’ \u0022 “ ” ( ) \\[ \\] § @ * / \\& # † ‡ " + "′ ″]" + } + MoreInformation{"?"} + calendar{ + generic{ + DateTimePatterns{ + "a h:mm:ss zzzz", + "a h:mm:ss z", + "a h:mm:ss", + "a h:mm", + "G y MMMM d, EEEE", + "G y MMMM d", + "G y MMM d", + "GGGGG y-MM-dd", + "{1} {0}", + "{0} पेठ {1}", + "{0} पेठ {1}", + "{1} {0}", + "{1} {0}", + } + } + gregorian{ + DateTimePatterns{ + "a h:mm:ss zzzz", + "a h:mm:ss z", + "a h:mm:ss", + "a h:mm", + "EEEE, d MMMM y", + "d MMMM y", + "d MMM y", + "d/M/yy", + "{1}, {0}", + "{0} पेठ {1}", + "{0} पेठ {1}", + "{1}, {0}", + "{1}, {0}", + } + dayNames{ + format{ + narrow{ + "अ", + "च", + "ब", + "ब", + "ब", + "ज", + "ब", + } + wide{ + "आथवार", + "चंदिरवार", + "बुवार", + "बोदवार", + "ब्रेसवार", + "जुम्मा", + "बटवार", + } + } + stand-alone{ + narrow{ + "अ", + "च", + "ब", + "ब", + "ब", + "ज", + "ब", + } + wide{ + "आथवार", + "चंदिरवार", + "बुवार", + "बोदवार", + "ब्रेसवार", + "जुम्मा", + "बटवार", + } + } + } + eras{ + abbreviated{ + "BC", + "AD", + } + } + monthNames{ + format{ + abbreviated{ + "जनवरी", + "फ़रवरी", + "मार्च", + "अप्रैल", + "मे", + "जून", + "जुलाई", + "अगस्त", + "सतुंबर", + "अकतुम्बर", + "नवूमबर", + "दसूमबर", + } + narrow{ + "ज", + "फ़", + "म", + "अ", + "म", + "ज", + "ज", + "अ", + "स", + "ओ", + "न", + "द", + } + wide{ + "जनवरी", + "फ़रवरी", + "मार्च", + "अप्रैल", + "मे", + "जून", + "जुलाई", + "अगस्त", + "सतुंबर", + "अकतुम्बर", + "नवूमबर", + "दसूमबर", + } + } + stand-alone{ + narrow{ + "ज", + "फ़", + "म", + "अ", + "म", + "ज", + "ज", + "अ", + "स", + "ओ", + "न", + "द", + } + wide{ + "जनवरी", + "फ़रवरी", + "मार्च", + "अप्रैल", + "मे", + "जून", + "जुलाई", + "अगस्त", + "सतुंबर", + "अकतुम्बर", + "नवूमबर", + "दसूमबर", + } + } + } + quarters{ + format{ + abbreviated{ + "Q1", + "Q2", + "Q3", + "Q4", + } + wide{ + "1st सह माह", + "2nd सह माह", + "3rd सह माह", + "4th सह माह", + } + } + stand-alone{ + abbreviated{ + "Q1", + "Q2", + "Q3", + "Q4", + } + wide{ + "1st सह माह", + "2nd सह माह", + "3rd सह माह", + "4th सह माह", + } + } + } + } + } + fields{ + day{ + dn{"दोह"} + relative{ + "-1"{"राथ"} + "0"{"अज़"} + "1"{"पगाह"} + } + } + day-narrow{ + dn{"दोह"} + relative{ + "-1"{"राथ"} + "0"{"अज़"} + "1"{"पगाह"} + } + } + day-short{ + dn{"दोह"} + relative{ + "-1"{"राथ"} + "0"{"अज़"} + "1"{"पगाह"} + } + } + dayperiod{ + dn{"AM/PM"} + } + era{ + dn{"दोर"} + } + hour{ + dn{"गनटि"} + } + hour-narrow{ + dn{"गनटि"} + } + hour-short{ + dn{"गनटि"} + } + minute{ + dn{"मिनट"} + } + minute-narrow{ + dn{"मिनट"} + } + minute-short{ + dn{"मिनट"} + } + month{ + dn{"माह"} + } + month-narrow{ + dn{"माह"} + } + month-short{ + dn{"माह"} + } + quarter{ + dn{"चूरिम"} + } + quarter-narrow{ + dn{"चूरिम"} + } + quarter-short{ + dn{"चूरिम"} + } + second{ + dn{"सेकंड"} + } + second-narrow{ + dn{"सेकंड"} + } + second-short{ + dn{"सेकंड"} + } + week{ + dn{"हफ़ति"} + } + week-narrow{ + dn{"हफ़ति"} + } + week-short{ + dn{"हफ़ति"} + } + weekday{ + dn{"हफ़तूक दोह"} + } + year{ + dn{"वरीह"} + } + year-narrow{ + dn{"वरीह"} + } + year-short{ + dn{"वरीह"} + } + zone{ + dn{"वख ज़ून"} + } + } + listPattern{ + standard{ + 2{"{0} ति {1}"} + end{"{0}, ति {1}"} + } + } + measurementSystemNames{ + metric{"मेट्रिक"} + } + parse{ + date{ + lenient{ + "[\\--/]", + "[\\:∶︓﹕：]", + } + } + general{ + lenient{ + "[.․。︒﹒．｡]", + "['ʼ՚᾽᾿’＇]", + "[%٪﹪％]", + "[؉‰]", + "[\$﹩＄]", + "[£₤￡]", + "[¥￥]", + "[₩￦]", + "[₨₹{Rp}{Rs}]", + } + } + } +} diff --git a/icu4c/source/data/locales/ks_Deva_IN.txt b/icu4c/source/data/locales/ks_Deva_IN.txt new file mode 100644 index 00000000000..491dc63e5c3 --- /dev/null +++ b/icu4c/source/data/locales/ks_Deva_IN.txt @@ -0,0 +1,5 @@ +// © 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 +ks_Deva_IN{ +} diff --git a/icu4c/source/data/locales/ml.txt b/icu4c/source/data/locales/ml.txt index 5cec649c4f2..264fb07a82f 100644 --- a/icu4c/source/data/locales/ml.txt +++ b/icu4c/source/data/locales/ml.txt @@ -2545,8 +2545,8 @@ ml{ or{ 2{"{0} അല്ലെങ്കിൽ {1}"} end{"{0}, അല്ലെങ്കിൽ {1}"} - middle{"{0}, {1} എന്നിവ"} - start{"{0}, {1} എന്നിവ"} + middle{"{0}, {1}"} + start{"{0}, {1}"} } standard{ 2{"{0} കൂടാതെ {1}"} diff --git a/icu4c/source/data/locales/mr.txt b/icu4c/source/data/locales/mr.txt index 1160e72458a..40aea5a9aa1 100644 --- a/icu4c/source/data/locales/mr.txt +++ b/icu4c/source/data/locales/mr.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 mr{ - AuxExemplarCharacters{"[\u200C \u200D \u0944]"} + AuxExemplarCharacters{"[\u200C\u200D \u0944]"} Ellipsis{ final{"{0}…"} initial{"…{0}"} diff --git a/icu4c/source/data/locales/ne.txt b/icu4c/source/data/locales/ne.txt index 27239e16285..d8746c01c17 100644 --- a/icu4c/source/data/locales/ne.txt +++ b/icu4c/source/data/locales/ne.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 ne{ - AuxExemplarCharacters{"[\u200C \u200D \u0944]"} + AuxExemplarCharacters{"[\u200C\u200D \u0944]"} Ellipsis{ final{"{0}…"} initial{"…{0}"} diff --git a/icu4c/source/data/locales/ur_IN.txt b/icu4c/source/data/locales/ur_IN.txt index 57a93473a6f..3ed51d0f3db 100644 --- a/icu4c/source/data/locales/ur_IN.txt +++ b/icu4c/source/data/locales/ur_IN.txt @@ -217,20 +217,4 @@ ur_IN{ } } } - listPattern{ - unit{ - 2{"{1}، {0}"} - end{"{1}، {0}"} - } - unit-narrow{ - 2{"{1} {0}"} - end{"{1} {0}"} - middle{"{1} {0}"} - start{"{1} {0}"} - } - unit-short{ - 2{"{1}، {0}"} - end{"{1}، {0}"} - } - } } diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 5b043ff4f20..4c09c1c2f08 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -9,6 +9,6 @@ // *************************************************************************** icuver:table(nofallback){ CLDRVersion{"41"} - DataVersion{"70.1.0.0"} - ICUVersion{"70.1.0.0"} + DataVersion{"71.0.1.0"} + ICUVersion{"71.0.1.0"} } diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index 9fd47124f2b..603e5bca388 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -1889,13 +1889,13 @@ langInfo:table(nofallback){ "ZR","CD", } trie:bin{ -001a6dcc2374c4f977c26777a2b778a4 +001a6dcc2b74c4f977c26777a2b778a4 5279a4c27a0f6d7d7a5c7a30e1ada9e8 -2ef5af4d10e1a53c022a3c42cc4b4811 -616e01e2a3fef4a3f90b4d25540e54ca -f8552a5610cea3fc10d3a3fb4dd81eb1 +2ef5af4d10e1a53c022a3c42cc534811 +616e01e2a3fef4a3f90b4d25540e54cc +00552a5610cea3fc10d3a3fb4dd81eb9 502a5310d2a3f702c1a3f6c6a3f4c8a3 -f547d507473248d81e934910c4a3f201 +f547d50f473248d81e9b4910c4a3f201 c2a3fac6a3f06d326e36733a7910e2ad a910e9af4b10e5af4c10ed22012aa916 4310c3a9176817683269366b3a6c10ed @@ -1969,550 +1969,550 @@ f4ade3f7ade410e2abf901f226f8ade0 012a2e44126576e1addf012aadde4e10 d0addf10ebade16232643667406c10e9 abf810f5abf001e9abf1edabf210e1ab -f670c39c70a4f971a6de72a6eb730028 -7884ec39f229f509f5ab84f6ab8af7ab +f670c3a470a60171a6e672a6f3730028 +788cec39f229f509f5ab84f6ab8af7ab 8bf22cf3ab7df4ab8122032aab374da4 -bf522a5410d2ab3b01cfab3ad5ab38ec -ab5fedab64eeab6befab71f16de429e4 -38e5ab47e7ab4ce9ab55ebab5b032aab -4144324b3a5312696ee4ab44126576e1 -ab4212686feaab437834793e7a48e1ab -2be3ab3601eeab91f7ab9201ecab93f2 -a50e10ecab946cad724f725873747484 -758e7705e809e8ab8bf0ab8ff6ab90e2 -ab8ce3ab8de7ab8e04e2ab7ae3ab36ee -ab7bf2ab7cf8a5f602e4ab7ee7ab7ff9 -ab8001ebab82f1ab8304e1ab85e5ab86 -ebab87f2ab88f3ab896c4a6d666e8c6f -a2437003e4ab77ecab78f3ab79f9a77a -04e4ab60e9ab61ecab62efab5bf9ab63 -05f009f0ab68f1ab69f3ab6ae1ab65ea -ab66eeab6704e3ab6cebab6df0ab6ef8 -ab6ff9ab7004e7ab72ebab73f1ab74f5 -ab75f9ab76673e67426858696e6a846b -02e3ab5cf2ab5df3ab5e03e1ab4df3ab -4ef7ab4ffaab5003e9ab51ebab52eeab -53f5ab5403e4ab56e7ab57ecab58edab -5910f2ab5a614a6276638664a26b6503 -e6ab48e8ab49e9ab4af3ab4b06f30cf3 -ab2ff4ab30f6ab31faab32e6ab2ce8ab -2df1ab2e02e1ab33e5ab34f0ab3506ee -0ceeab3eefab3ff2a704f3ab40e32ceb -ab3cecab3d22055211522e53325410d2 -ab3b10cfab3a10d5ab382aab37312a4d -10c5ab391137b2ab3801e3ab45e8ab46 -00176f5a752bec09eca9f5f3a9e6f4ab -03754c7750e1012a2e41127261e2a9de -012aa9dd5010cba9de10f5ab0510e1ab -067217722e733e7410f0ab0402e1a9ff -e4ab00e7ab0110f3ab026f2e70327110 -eda9fe10eea9fb01e1a9fcefa9fd6839 -6c1d6c406d4a6e03e2a7d3e7a9f8eea9 -f9f4a9fa01e1a9f6f4a93610f3a9f768 -34693e6b01e1a9f3efa9f401eca9efee -a9f001eca9f1f0a9f26420642e653866 -10eca9ee01e3a9e9f4a9ea04e4a9ebef -a9ecf2a574f3a574f8a9ed6134626463 -01e4a9e7eda9e804e7a9dfec32eda9e2 -f0a9e3f5a9e4012aa9e05012686cf0a9 -e101e9a9e5f5a9e6017526f5ab0702e3 -ab08e7ab09faab0700146f457917ef09 -efa951f5ab24f7ab27792cedab17eeab -1c10f5ab2a6f3c724c745075547701eb -ab28efab2902e2ab1fe6ab20efab2110 -efab2210edab2302e5ab25e7ab26eda9 -516934693c6a566b5a6d5e6e01e1ab1d -e7ab1e01e1ab12e622012aab134e10cc -ab1410f3ab1510f4ab1603e6ab18efab -19f4ab1af5ab1b61366346654a675a68 -10e7ab1102e9ab0aeaa966efab0b10e6 -ab0c02eaab0decab0ef3ab0f10eeab10 -6da2656ea63f6f0d7422e30ce3a9caed -a5a5f2a9d4f3a9d7742e75387a10eda9 -dc01e1a9d9eba9da10e9a9db6e236e32 -704272467310e1a9d802e7a9d0eea9d1 -f3a9d210eda9d302efa9d5f5a9d6f9a9 -d4673a6a3e6b02e1a9cdf2a9cef6a9cf -10e3a9cb10f3a9cc0022749fe926ef0f -efa951f2a95cf3a485f4a960f9a3cfe9 -a913eba90deca946ee012abadb4d126f -6ee7a543783d7834793e7a64e7a936e8 -a93c01e3a96feda97005f709f7a974f8 -a975faa976eba971eda972f6a97305f0 -09f0a97af7a97bfaa97ceba977eda978 -eea9797444755a76707703eba96cf2a5 -3af6a96df7a96e03e3a961e6a962e9a9 -63f2a96403e1a965f0a966f2a967f3a9 -6802e1a969eea96af9a96b69786e446e -426f5e707a71907202e4a95deaa95eef -a95f04e1a94de6a94ee9a94febb629f7 -a95004e1a952e5a953e8a954f3a955f8 -a95603f0a957f3a958f4a959f8a95a10 -eca95b693e6b4e6c646d02efa94af5a9 -4bf8a94c02e6a93feea940f7a94103e9 -a942eca943f0a944f7a94502e5a947f0 -a948f3a9496549653e666a67866802e9 -a93deca93ef2a50006ee0ceea92df2a9 -2ef4a92ff5a930e4a92ae5a92beba92c -04e1a931e5a932eea933efa934f1a935 -04e8a937eca938efa939f0a93af9a93b -615e62a25063a25d6406e80ce8a926ea -a927f2a928f8a929e1a923e5a924e6a9 -250bee1df712f7a915f926faa9182201 -2aa9164310c3a917eeb44defa913f3a9 -14e709e7a910e9a911eba912e3a90de4 -a90ee6a90f04e8a919efa91af1a91bf5 -a91cf7a91d04e9a91ef0a91ff1a920f2 -a921f5a9220021745fe41dee0feea9a7 -efa9adf2a9b4f6a9c2f9a9c6e4a98ce5 -a98fe7a994eca54f791579307a3ae1a9 -7de2a98501eda9c7eea9c810e9a9c974 -387542775e7801f1a9c4f2a9c501eda9 -bbf2a9bc04e9a9bdf0a9bef3a9bff6a9 -c0f8a9c110e2a9c36a606f356f4e706a -716e72727304eba9b6eea9b7efa9b8f3 -a9b9f4a9ba04e4a9aee5a9afeea9b0f0 -a9b1f5a9b210e9a98f10efa9b310e2a9 -b56a4a6b4e6d586e04e6a9a8e8a9a9eb -a9aaeda9abf0a9ac10efa9a201e7a9a3 -efa9a401e7a9a5faa9a66637665a675e -686e6906ee0ceea99ef5a99ff9a9a0fa -a9a1e6a99be9a99ceaa99d10f2a99302 -e1a995e2a996eca99702e2a998e5a999 -f7a99a613e636a64906502e2a990f7a9 -91f8a99206ee0ceea981f0a982f1a983 -f3a984e3a97ee6a97feba98005e809e8 -a989efa98af5a98be1a986e5a987e6a9 -8801e3a98df3a98e66c76c69c4a269a4 -1b6aa4c96ba6166c001b744ae717ef0c -efa7fbf4a903f5a905f6a909e7a7e4e9 -a7e6eea7f8771577307a34e1a7cfe2a7 -d610eca90a01e8a90bfaa90c742e7532 -7610f3a90910e7a90403e1a906efa907 -f9a3d6faa9086a4a6d316d326e426f4c -7210e3a90202eea7f5efa7f6f0a7f701 -f3a7f9f5a7fa05f209f2a7fff3a900fa -a901eaa7fceba7fdeca7fe6a346b386c -01e5a7f3eea7f410f0a7f001e9a7f1f4 -a7f2644d6476657a67a2426907e80ce8 -a7eceaa7edeca7eef3a7efe1a7e7e4a7 -e8e626e7a7eb012aa7e94c12696de2a7 -ea10e2a7dc06f00cf0a7e0f1a7e1f5a7 -e2faa7e3e4a7dde5a7deeda7df10e7a7 -e56134625a6301eda7daf0a7db05e809 -e8a7d3eaa7d4f3a7d5e2a7d0e4a7d1e7 -a7d202e5a7d7f5a7d8f7a7d900197739 -eb17f30cf3a712f4a72af5a71ef7a72b -eba56beea725efa727e409e4a714e7a7 -19e9a71c772a7a34e1a70c01eda72cf3 -a72d01e8a72ee9a72f6a366d176d326e -366f3a7210e9a72910efa72410e8a726 -10f5a7286a2e6b326c10efa72310eaa7 -1d04e5a71eeba71ff4a720f7a721f8a7 -22641a643466446701e2a71ae5a71b02 -e4a715e9a716f5a71710e5a718613a62 -446302e1a711e5a712e8a71301eea70d -f2a70e02e1a3a7e2a70ff9a7100b721a -e909e9a738f6a73ef7a73f722a752ee1 -a73010e1a73c10f4a73d67176734693e -6d01e3a73aeca73b01eba733efa73710 -e2a739612e623e6510eea73602e2a731 -eda732f2a73301efa734f5a735002875 -c0f0eb74f23ff628f6a797f7a7b9f902 -2a32414c4c126174eea7c8022aa7c643 -2a5410d2a7c810cea7c7127261e2a7c7 -f2a78af3a7a3f5022aa46741a46d5912 -657ae9a785eb38eca779eda77eeea789 -efa78e012a2e41127261e2a774042aa7 -7241324336493a4d10cea77610c6a773 -10cea77410d2a7757a1b7a38e1a5b4e7 -a75de9a769eaa76d03e8a7cbeaa7ccf2 -a7cdf4a7ce753c766e777e78947901e5 -a7c9f8a7ca07ed0ceda7b2eea7b3f0a7 -b4f3a7b5e2a7aee4a7afe5a7b0eaa7b1 -02e7a7b6f2a7b7f8a7b803eaa7baeba7 -bbefa7bcf1a7bd07ed0ceda7c2f0a7c3 -f7a7c4faa7c5e1a7bee3a7bfe5a7c0ec -a7c16bc0d57063704a7170728673a245 -7403e2a7aaeda7abefa7acf2a7ad05f2 -09f2a796f6a797f8a798e5a793e6a794 -efa79503e2a799e6a79af3a79bf9a79c -05ec09eca7a0f3a7a1f5a7a2e3a79de9 -a79eeaa79f05e809e8a7a7eaa7a8f2a7 -a9e2a7a4e4a7a5e6a7a66b506c5a6d70 -6ea2576f04e9a78feba78ceca790f3a7 -91faa79201e3a777eaa77803eea77af1 -a77bf4a77cf8a77d06f226f232f3a786 -f5a787f7a788022a3241405912657ae9 -a785012aa7824c10c2a783127261e2a7 -84e2a77fe8a780efa78104e3a78ae6a7 -8be7a75deea78cf0a78d665266486758 -686869a06a03e4a76ee7a76ff3a770f9 -a77102efa75af2a75bf9a75c02e5a75e -e6a75ff0a76008f10ff1a764f3a765f4 -a766f7a767faa768e1a761e2a762ebac -9deea76302eaa76af5a76bf7a76c6146 -627e63a24164a24b6502e1a757eea758 -faa75908e90fe9a744eaa745eda746ef -a747f7a748e1a740e2a741e3a742e4a7 -4305f109f1a74cf8a74df9a74ee4a749 -eda74af0a74b03e7a74feba750eca751 -f4a75203e5a753e8a754eca755f4a756 -66a2c267a4776800137546f20ff2a704 -f4a707f5a708f9a342faa70b7534e13e -e5a5ede962efa70001e9a709f2a70a22 -032aa5e3372e43345310c4a5e41133b6 -a5e410cda5e5012aa5ef4c126174eea5 -f06c386c3c6d466e506f6c7301e2a705 -eea70601e1a5f7f5a5f801e4a5f9f4a5 -fa04e4a5fbe5a5fceaa5fdeea5feefa5 -ff02e3a701eaa702f4a7036158627464 -78687c6905e809e8a5f4eca5f5eda5f6 -e1a5f1e6a5f2e7a5f304e7a5e6eba5e7 -eda5e8f7a5e9faa5ea10e2a5eb10f9a5 -ec10f9a5ee00117553e90fe9a57eeaa5 -82efa585f2a58bf9a59a75427694e1a5 -74e6012aa57a4112646ceda57b09e80f -e8a594f1a595f2a596f6a597f9a598e2 -a590e332e4a591e5a592e6a593012aa5 -7a4112646ceda57b10f2a5996d2f6d4e -6f52706271667204e3a58ce5a58bf0a5 -8df2a58ef3a58f10f0a58402e4a586ee -a587f2a58810e5a58910f3a58a613266 -5669606c10f2a58305e908e9a578eea5 -79f467e1a575e2a576e7a57701e9a57c -eda57d02e1a57feca580f4a581001a6e -9f791dec0ceca5c0eea5c4f5a5d4f6a5 -dc792ce1a59be4a5ad01e1a5a6e9a5e2 -733a733e754276747702e3a5dfe9a5e0 -f4a5e110f7a5d307f20cf2a5d8f7a5d9 -f8a5dafaa5dbe2a5d5e3a5d6e4a5d7e7 -a5c402e6a5ddf2a5b7f3a5de6e5a6f6a -7204e2a5a9e332e5a55ef4a5d1f7a5d2 -012aa5cf4c12696ee2a5d002e4a5c5e7 -a5c6efa5c707ee0ceea5c7f2a5ccf3a5 -cdf4a5cee4a5c8e6a5c9e9a5caeda5cb -673c6a236a386b486c526d01eda5c2f6 -a5c302eba5bbeea5bcf5a5bd01eea5be -f0a5bf10eba5c16734683e6901eca5b9 -eda5ba01eea5b7efa56a10f3a5b86428 -642e653e6610eba5b602e5a5aeeea5af -f2a5b005ef09efa5b4f2a530faa5b5e2 -a5b1eaa5b2eca5b3612e626c6310f2a5 -ac09ed0feda5a1eea5a2f7a5a3f9a5a4 -faa5a5e1a59ce6a59de7a59ee8a59fea -a5a005ef09efa5a9f9a5aafaa5abe1a5 -a6e6a5a7eda5a863c2fc63a2a364a602 -6500127733ee19ee38efa567f3a569f4 -a55cf5a366012aa56353126861f7a564 -773478387a3ce5a557eca55e10efa571 -10f4a57210e1a5736d466d486e7a7284 -73887403f2a56df4a56ef5a56ff8a570 -02e1a55fe9a560eb012a2e4e126b6fef -a562012aa5614710cea56201eea565f1 -a56610e9a56802e7a56aeba56bf5a56c -623e664267466b02e1a55beba55cf9a5 -5d10f5a55610e9a55801eca559f9a55a -001b725fe821f316f3a51cf52cf6a522 -f9a523012aa52047126c61e7a521e8a3 -ecefa511f2a514771277307a34e1a3e2 -e5a3e810e4a51410e5a51c722e735a74 -10e4a51f06eb0ceba518eca519eda51a -f3a51be7a515e8a516eaa51701e2a51d -f7a51e69556c336c326d426f727010f3 -a51302e1a50ce3a50de4a50e02e5a50f -e7a510ee022aa26342a2ae4811616e01 -e2a3fef4a3f910f0a51269406a446b03 -e2a508eca509efa50af9a50b10e3a504 -02e1a505eda506f6a507658f65a28066 -a28167a2826805ef09efa501f0a502f2 -a503e92ceba3ffeda500022a3c42a259 -4811616e01e2a3fef4a3f90b4d2d5417 -542e55385610c4a3fc01c8a3f8d7a3f9 -01cba3fad3a3fb4db4b7502a5310d2a3 -f702c6a3f4c8a3f5daa3f6470e473048 -b49b4910c4a3f210c6a3f02aa3ed412a -4210cea3ef10d5a3ee126f70efa3fd10 -e2a3e910e1a3ea10e7a3eb6134623e63 -01e8a3e6f0a3e701e4a3e3eea3e410ea -a3e50017726f791ce508e5a530f6a550 -fa45792a7a34e1a52401efa553f5a554 -10e7a555751d752e764a7710f7a55204 -e1a54be3a54ce4a54de7a54ef4a54f10 -e1a551724073747403eda547f0a548f3 -a549f9a54a02e82ce9a544f3a545012a -2e4d126f6ee7a543012aa5424310cea5 -4310e2a546682d6d176daacc6e3c6f03 -e2a53fe9a537f0a540f7a54110eaa526 -682e69326a10e5a53d10e4a53a01e1a5 -3bf1a53c64286456655a6706ec0ceca5 -36efa537f2a538faa539e1a533e8a534 -e9a53510eea52f01e4a531eea532612e -625a6310e3a52e06e80ce8a528eba529 -f2a52af6a52be4a525e6a526e7a52701 -e4a52cf1a52d2aa4fd61bedc62002373 -a5e51ded0feda3a9eea3aeefa3b2f2a3 -bbf3a3c0e5a37ce7a389e8a38de9a393 -77417732783c794c7a72e1a36201e4a3 -d3f2a3d402e8a3d5eba3d6f2a3c805f3 -09f3a3daf6a3dbf8a3dce5a3d7eea3d8 -f2a3d904e1a3dde5a3dee6a3dfe8a3e0 -f7a3e17332744875587610e2a3d203ea -a3c1f1a3c2f3a3c3f4a3c402efa3c5f4 -a3c6f6a3c709ed0feda3cdefa3cef2a3 -cff3a3d0f5a3d1e1a3c8e3a3c9e4a3ca -e7a3cbeba3cc6a836e3b6e486f587068 -716c7203e1a3bce8a3bdf8a3befaa3bf -02e7a3afeda3b0f0a3b102eaa3b3eda3 -b4eea3b510f9a3b603e3a3b7e9a3b8f0 -a3b9f6a3ba6a446b766c926d03e8a3aa -eba3abf1a3acf5a3ad07ef0cefa39ef2 -a39ff4a3a0faa3a1e8a39ae9a39beaa3 -9ceea39d04e3a3a2eda3a3f1a3a4f5a3 -a5f6a3a601e7a3a7f4a3a8656a656266 -9467a24468a24b6906ed0ceda396eea3 -97efa398f1a399e2a394e7a395eba375 -07f40cf4a381f7a382f8a383faa384e6 -a37de8a37eeaa37feda38003e4a385f1 -a386f4a387f9a38802e3a38aeea38bf8 -a38c05ec09eca391efa38df9a392e2a3 -8ee7a38fe9a3906132626463906410e4 -a37b07f20cf2a367f3a368f6a369f8a3 -6aeca363eea364f0a365f1a36606e40c -e4a36eeaa36ff0a370f2a371e1a36be2 -a36ce3a36d09ed0feda376eea377efa3 -78f1a379f5a37ae3a363e6a372e8a373 -e9a374eca37500184dc28954c0e15736 -5736584e59645a12616ee2addd01612c -631168efa9ac1172e1addc01702a7311 -75f8691165efa9ec01652c691169e9a7 -1c117ae9a785544455a29e5601612c69 -1174e8addb1169e9adda07684e683669 -866ea2426f1174efabeb106101e158e9 -042aabb243324b364c3a5410c8abb210 -cea7db10c8add710c1add8012aa5504d -10d6a55001622a7210e8add910f4012a -a3b24210d4451173e1a9ba6134658066 -8667116ce7add6056d116d2e6e327610 -f4a3a810ecab9510e7abea67346b386c -01e5aba3f5a76210e2add310f2add411 -6cf5aba7116ee7add5126761f2abf650 -c0c350a27252a2a85306694369426f6a -759079016c2a7210e3a50e10efadd201 -643e6e01e4ab44e8012aab554c10cbab -5510e4adcf02672e72387910efa51001 -e4ab72efadd010e1ab7a116ee4add161 -3e675e6801612a7210e4adce10f7a564 -026d2e72327510f2ab3210f2ab6810e2 -adcd116ef7a34b046138654a68506c76 -721174e9adcb016c2a7510e3a51f10ed -a11172edadc902612e6c326e10f8a9f0 -10e7adca01e9a9e0f0a9e11172e4a5f9 -026a306f3675116ef2a9b0116ee7adcc -1168e7ab114d8a4ea2ab4f0467386c3e -72447358751167f2a9db1161edab4d11 -63ebab30016b2a7910e1a9d410e8a9da -01672a6d10e1adc810e5a9d807722e72 -5a7460756679116df2032aa3cf492e4d -325410c8adc210cea76610cda3cf116f -efa95f1165e9adc0116cf4adc1614265 -746c9a6f01642a6e10e7a54310e9adbf -0368326b366e3a7210e3adbb10eaadb8 -10e1adb901e4a976e9adba0264346e38 -7201e3adbdefadbe10e6a53e10e4adbc -1179eda9460461386258655c6b627311 -68f5adc702672e6e327210e2adc510ed -adc310e4adc41161f49f1177e1adc611 -6fefa56247c41b4ac3354aa6c04ba6d9 -4c03614665a69c69a69e7901632a6410 -e9adb710e9adb6026ea6796fa67a7410 -ee001a4bc139545b571457ac7e58ac82 -59305a01c1abfed7ab6b10d4ad725440 -55825603c1ad6dc5ad6fcead6ed5a393 -0bce14d609d6abe6d7abd3daab8bcead -b4cfabc9d2abd1cbc5e2cbabbeccad69 -cdabbd04c1adb5c7ad6bd3a563d9ad6c -daad024e824e8a50a24a52a26d530cce -17d40cd4ad63d5a7a0d6ad64d9adb3ce -ad61cfab71d2ad62ca09caad5fcbab5b -cdad60c3ad5ec5ab8ac9ab5f06c70cc7 -abfac9ad51cca54fcfa985c1ad4ec3ad -4fc5ad500acc14d409d4ad5ad7a9e4d9 -a5c4cca9f5cdad57d2ad58c1ad53c5ad -54c6ad55c7abcdc8a58003c5ad5dcfa9 -51d5a7a0d7ab274b9e4ca2434d0010cd -1dd40fd4a960d5a932d8abfcd9a916da -ad4dcda742cfadb1d1ad4bd2adb2c60c -c6ad4ac7a936cbadb0cca3a9c1adafc3 -ad48c4ad49c5ab3901c5ad3dcdadae04 -c9ad43d3ad44d4a903d5ad45d6a90943 -c0c246644656476648a24d4905d209d2 -adadd3a712d4a72ac3ad3ac4a714c5ad -2e02c9a57ecfa585d2a58b0cce17d30c -d3ad35d4ad36d5ad01d7ad37cead32d0 -ad33d1ad34c608c6ad31c867cca779c1 -ad30c2ad04c5adac04cdad38cead39d2 -a704d4a707d5a708435244a2424505d3 -09d3a569d4ada6daad2fc1ad2ac3ad2b -c5a55c0fcf1ad60cd6ad25d7ad06d9ad -aadaa51ccfad22d0ad23d2ad24d5abff -c9c69ac9ad1fccad20cdad21ceada905 -cb09cba524cfad28daadabc5a530c7ad -5ccaad27345e34ae954178420bce14d2 -09d2ab03d5a742d6ad1bcead18cfad19 -d1ad1ac909c9ab1ccaad16ccad17c1a3 -c0c5ad13c6ad140cd217d50cd5abfbd7 -ad11d8ad12daa35ed2ad0ed3ad0fd4ad -10cd09cdada8cfad0cd1ad0dc4ad09c6 -ada7cc6d2aa563312c321133b0ada611 -37b2a7a010e1a9ae10ef012aa7fb4c10 -c1a7fb1170e3a7e0026d2e6e327310f5 -a7ef10e2a7ea01e1a7d0e2a5d001613a -701161ee012aa7304a10d0a730016d2a -7610e1ada210efada1056e1e6e306f36 -741168e9ada51164e1a7891172e5012a -a78e4b01d0ad3fd2a78e613068506911 -74f3ada4026c2e6e327710e9a74810e9 -a55d10e1ada302612e6d326f10eaab43 -10f2a9ff10f2012aa77e4b10c8a77e47 -3448a25c49127461eca56e0465466c5a -6f60727a75016a2a7210f5a9dd10f2a5 -d4116ff2012aa5b44710c5a5b41161e7 -a521016e2a7410e8a5ce01e7ad94eda5 -6a0161506510eb032aa55e432e473254 -10d2a38c10d9ad2610d2a55e10eead95 -056c186c306d3675116ee7ada01175f7 -a5f8106e01e7ad9ff0a5fd6130659069 -1172e1ad9e106e05ef24efad98f34cf4 -032aa3f9482e4d325410d7a3f910cba3 -f110cfa3f3012aa3ed4310cea3ede2a3 -fee7ad96e9ad971162f2054917493a53 -3e5502c1ad9ccbad9ad3ad9d10cca5ed -10c5ad9b2aa5ed432a4710c2ad9a10c1 -ad9943c115437044a2ce450267406c46 -741168e9012a754501d2ad2dd4751179 -f0a55a01622a7910edad9310e1ad9204 -61a26968a2786fa28770a289791172ec -0a4d335414542e55385810cbad8b01ca -abadd2ad8a10c1abf74d2e523e5310cb -ad8902c4ad87cba90dcea54202cfad88 -d3ab37d5ab242aab244138423c474c4b -01c7a7c6daad4110ccad8402c1ad85c7 -a389d9a37c01c5a9d7d2ad86026b2e6e -327210e9ad8110eda3e710f3a5140261 -2e65327210f3ad8210eda50610f2a503 -1170f4a512016d2a7210f4a5cf10ee01 -2aad834310d9ad8303653469866f8c75 -1170ecad911176e106491749324d364e -3a5010cba3c710cea5ef10d5ad8e10d0 -a98f2aa5ef422a4610caad8d10d4ad8c -1161ebad8f1167f2ad902aa25441aa31 -42056f1f6f3e72447501672a6810e4ad -8010e9ad7f1170efa3fd106101e8a9f3 -e9ad7e6130655c68116bf3ad7d036c32 -6d36733a7410ebad7c10e9ad7b10f5a3 -6a10f3a3c2116ee7012aa3ae4210c4a3 -ae00214ac1c052c0cc5638563c575858 -6259665a01d2abfdd7ab6b04c1ad6dc4 -ad6ec5ad6fcead6ed5a39301c6ad70d3 -ab6410cbad7103c4ad08c5ad08d4ad72 -d5ab375246536c54a2575503c1abf7c7 -ad6bd9ad6cdaad0205d309d3ab37d5ab -24d7ab27c5ad5dc8ab6bcfa9510ecd1a -d40cd4ad63d5ab24d6ad64d9ad65cdad -60cead61cfab71d2ad62c50cc5ab8ac9 -ab5fcaad5fcbab5bc1ad03c3ad5ec4ad -070ecd1ad20cd2abd1d6abe6d7a3f9da -ab8bcdabbdcead6acfabc9d0ad69c80c -c8abb2caabadcbabbeccad69c4ad66c6 -ad67c7ad684e644e404fa89650785102 -c1ad5bcfad5cd5ad2e09cc0fcca54fcf -a985d0a98fd1ad0dd4ad03c1ad4ec3ad -4fc5ad50c8a393c9ad510dcd17d40cd4 -ad5ad7a9e4d9a5c4daad53cdad57d2ad -58d3ad59c70cc7abcdc8a580cbad56cc -a9f5c1ad53c5ad54c6ad554aa2484ba2 -4c4ca2644d0012ce20d50fd5a932d6a5 -50d8abfcd9a916daad4dcea542cfa3f3 -d1ad4bd2ad4cd4a960c60fc6ad4ac7a9 -36cba90dcca3a9cda3cfc1ad47c3ad48 -c4ad49c5ab3901cfad3cd0a73007d00c -d0ad3fd2a78ed7ad40daad41c5ad3dc7 -a7c6c8a77ecdad3e08d30fd3ad44d4a9 -03d5ad45d6a909d9ad46c1a7fbc2ad42 -c9ad43cbab5541c1604598456a46a241 -47a24e48a2754907d10cd1ad3bd2a574 -d3a712d4a72ac3ad3ac4a714cca5edce -a5ef09d20ed2ad2dd3a569d475d5ad2e -daad2fc1ad2ac3ad2bc5a55cc79bc8ad -2c04c9a57ecfa585d1ad0dd2a58bd8a5 -8b0bd014d309d3ad35d4ad36d7ad37d0 -ad33d1ad34d2a55ec808c867cca779ce -ad32c1ad30c5a5b4c6ad3106d20cd2a7 -04d4a707d5a708d6ad14cba3f1cdad38 -cead39415e42a24c43a2834406cb0ccb -a524cfad28d9ad16daad29c4a530c5a5 -30caad270dd117d40cd4ad10d7ad11d8 -ad12daa35ed1ad0dd2ad0ed3ad0fcc0b -cc6dcda342cead06cfad0cc4ad09c5ad -0ac6ad0b0010cc1cd20ed2ab03d445d5 -a3cfd6ad1bd9a37cccad17cead18cfad -19d1ad1ac70cc7a389c8ad15c9ab1cca -ad16c1a3c0c4a3aec5ad13c6ad140010 -cf1dd50fd5abffd6ad25d7ad06d9ad26 -daa51ccfad22d0ad23d2ad24d3ab37c9 -0cc9ad1fccad20cdad21cea3edc4abfd -c6ad1cc7ad1dc8ad1e34223442354837 -4e3801382a3910b0ab3710b6ad081131 -b9ad051133b2ad061133b6ad072aa563 -305031a26b3202302e33383810b0a530 -01b0a51cb2abfa10b075053323333435 -4a3601b1ab64b2a5ef03b0a3edb4a5ef -b5a714b9a72a02b3abfbb4ad00b7ad01 -3034314a3201b1a563b9abff03b2abfa -b3a563b5ab03b9abfb06b50bb59bb7ab -fdb8abfeb9a563b1abfab3abfcb4ab8b -02342e353e3710b2ab2402b2a3edb3ad -02b5ad0303b0ab24b1ab24b4ad04b5a5 -30046436673c68427246761173f44b11 -6ceda57b1168e2abf1116fed6301613c -6d01e99dee012aa3424110cda34210e2 -00134c625131513c53405450556a5901 -c5ad08d4ab8c10c1ad5b02c1ad03c4ad -07d9ad6504c791c8a931caad79cead6a -d2ad7a10cbad744c3c4d464e624f6650 -01cbad56d3ad5901c2ad42d9ad4604c1 -ad47cdad73cea776d2ad4cd5ad7710c7 -ad7810cdad52452e4542474a494e4a64 -4b02c8a505cdad3ed7ad4001c79bc8ad -2c10c2ad7403c4ad75cead76d1ad3bd2 -a57410cfad3c2a9b4132423c43464410 -daad2901c5ad0ac6ad0b01c8ad15d5ad -7301c3a917ceabf300217588e62bf221 -f29bf3a349f6a353f9a35cfa012a2e41 -127261e2a360022aa35e498a5210d5a3 -61e651eb67ed75ee7f7a2d7a2ce125e2 -2de54b10ea012a2e41127261e2a36003 -2aa35e312e49345310d5a3611137b2a3 -6101d1a35fd2a3607538763c77527901 -e2a35df2a35c10f9a35203eca354eea3 -55f4a356f5a35703e1a358e2a359efa3 -5af8a35b6b966f696f44704e726873a2 -507402e1a34fe7a350eaa35102ea89ed -8bfa8d05f206f295f397fa99e38fe491 -e59309ef0fefa344f1a345f3a346f9a3 -47faa348e29be332e8a341eda342eea3 -43022a9d4e2c5012616ceda1126261f4 -9f04e1a34ae5a34be7a34cefa34df4a3 -4e6b3c6c3e6d586e03e381eb83ee85f9 -8710eb6905ee06ee71f36df473e16be2 -6de96f03ed77ee79ef7bf07d65256530 -673668506a10e76501e24df94f05ed06 -ed59ef5bf15de353e455e75702e15fec -61ef636148625263646405f006f045f9 -47fa49e13fe541ea4302e927eb29f52b -04e92ff131f233f435f93702e439e53b -e83d +c7522a5410d2ab3b01cfab3ad5ab38ec +ab5fedab64eeab6befab71f16de431e4 +38e5ab47e7ab4ce9ab55ebab5b032a36 +44444b4c5312696ee4ab44012aab4149 +10ceab42126576e1ab4212686feaab43 +7834793e7a48e1ab2be3ab3601eeab91 +f7ab9201ecab93f2a50e10ecab946cad +724f725873747484758e7705e809e8ab +8bf0ab8ff6ab90e2ab8ce3ab8de7ab8e +04e2ab7ae3ab36eeab7bf2ab7cf8a5f6 +02e4ab7ee7ab7ff9ab8001ebab82f1ab +8304e1ab85e5ab86ebab87f2ab88f3ab +896c4a6d666e8c6fa2437003e4ab77ec +ab78f3ab79f9a77a04e4ab60e9ab61ec +ab62efab5bf9ab6305f009f0ab68f1ab +69f3ab6ae1ab65eaab66eeab6704e3ab +6cebab6df0ab6ef8ab6ff9ab7004e7ab +72ebab73f1ab74f5ab75f9ab76673e67 +426858696e6a846b02e3ab5cf2ab5df3 +ab5e03e1ab4df3ab4ef7ab4ffaab5003 +e9ab51ebab52eeab53f5ab5403e4ab56 +e7ab57ecab58edab5910f2ab5a614a62 +76638664a26b6503e6ab48e8ab49e9ab +4af3ab4b06f30cf3ab2ff4ab30f6ab31 +faab32e6ab2ce8ab2df1ab2e02e1ab33 +e5ab34f0ab3506ee0ceeab3eefab3ff2 +a704f3ab40e32cebab3cecab3d220552 +11522e53325410d2ab3b10cfab3a10d5 +ab382aab37312a4d10c5ab391137b2ab +3801e3ab45e8ab4600176f5a752bec09 +eca9f5f3a9e6f4ab03754c7750e1012a +2e41127261e2a9de012aa9dd5010cba9 +de10f5ab0510e1ab067217722e733e74 +10f0ab0402e1a9ffe4ab00e7ab0110f3 +ab026f2e70327110eda9fe10eea9fb01 +e1a9fcefa9fd68396c1d6c406d4a6e03 +e2a7d3e7a9f8eea9f9f4a9fa01e1a9f6 +f4a93610f3a9f76834693e6b01e1a9f3 +efa9f401eca9efeea9f001eca9f1f0a9 +f26420642e65386610eca9ee01e3a9e9 +f4a9ea04e4a9ebefa9ecf2a574f3a574 +f8a9ed613462646301e4a9e7eda9e804 +e7a9dfec32eda9e2f0a9e3f5a9e4012a +a9e05012686cf0a9e101e9a9e5f5a9e6 +017526f5ab0702e3ab08e7ab09faab07 +00146f457917ef09efa951f5ab24f7ab +27792cedab17eeab1c10f5ab2a6f3c72 +4c745075547701ebab28efab2902e2ab +1fe6ab20efab2110efab2210edab2302 +e5ab25e7ab26eda9516934693c6a566b +5a6d5e6e01e1ab1de7ab1e01e1ab12e6 +22012aab134e10ccab1410f3ab1510f4 +ab1603e6ab18efab19f4ab1af5ab1b61 +366346654a675a6810e7ab1102e9ab0a +eaa966efab0b10e6ab0c02eaab0decab +0ef3ab0f10eeab106da2656ea63f6f0d +7422e30ce3a9caeda5a5f2a9d4f3a9d7 +742e75387a10eda9dc01e1a9d9eba9da +10e9a9db6e236e32704272467310e1a9 +d802e7a9d0eea9d1f3a9d210eda9d302 +efa9d5f5a9d6f9a9d4673a6a3e6b02e1 +a9cdf2a9cef6a9cf10e3a9cb10f3a9cc +0022749fe926ef0fefa951f2a95cf3a4 +85f4a960f9a3cfe9a913eba90deca946 +ee012abadb4d126f6ee7a543783d7834 +793e7a64e7a936e8a93c01e3a96feda9 +7005f709f7a974f8a975faa976eba971 +eda972f6a97305f009f0a97af7a97bfa +a97ceba977eda978eea9797444755a76 +707703eba96cf2a53af6a96df7a96e03 +e3a961e6a962e9a963f2a96403e1a965 +f0a966f2a967f3a96802e1a969eea96a +f9a96b69786e446e426f5e707a719072 +02e4a95deaa95eefa95f04e1a94de6a9 +4ee9a94febb629f7a95004e1a952e5a9 +53e8a954f3a955f8a95603f0a957f3a9 +58f4a959f8a95a10eca95b693e6b4e6c +646d02efa94af5a94bf8a94c02e6a93f +eea940f7a94103e9a942eca943f0a944 +f7a94502e5a947f0a948f3a949654965 +3e666a67866802e9a93deca93ef2a500 +06ee0ceea92df2a92ef4a92ff5a930e4 +a92ae5a92beba92c04e1a931e5a932ee +a933efa934f1a93504e8a937eca938ef +a939f0a93af9a93b615e62a25063a25d +6406e80ce8a926eaa927f2a928f8a929 +e1a923e5a924e6a9250bee1df712f7a9 +15f926faa91822012aa9164310c3a917 +eeb44defa913f3a914e709e7a910e9a9 +11eba912e3a90de4a90ee6a90f04e8a9 +19efa91af1a91bf5a91cf7a91d04e9a9 +1ef0a91ff1a920f2a921f5a922002174 +5fe41dee0feea9a7efa9adf2a9b4f6a9 +c2f9a9c6e4a98ce5a98fe7a994eca54f +791579307a3ae1a97de2a98501eda9c7 +eea9c810e9a9c974387542775e7801f1 +a9c4f2a9c501eda9bbf2a9bc04e9a9bd +f0a9bef3a9bff6a9c0f8a9c110e2a9c3 +6a606f356f4e706a716e72727304eba9 +b6eea9b7efa9b8f3a9b9f4a9ba04e4a9 +aee5a9afeea9b0f0a9b1f5a9b210e9a9 +8f10efa9b310e2a9b56a4a6b4e6d586e +04e6a9a8e8a9a9eba9aaeda9abf0a9ac +10efa9a201e7a9a3efa9a401e7a9a5fa +a9a66637665a675e686e6906ee0ceea9 +9ef5a99ff9a9a0faa9a1e6a99be9a99c +eaa99d10f2a99302e1a995e2a996eca9 +9702e2a998e5a999f7a99a613e636a64 +906502e2a990f7a991f8a99206ee0cee +a981f0a982f1a983f3a984e3a97ee6a9 +7feba98005e809e8a989efa98af5a98b +e1a986e5a987e6a98801e3a98df3a98e +66c76c69c4a269a41b6aa4c96ba6166c +001b744ae717ef0cefa7fbf4a903f5a9 +05f6a909e7a7e4e9a7e6eea7f8771577 +307a34e1a7cfe2a7d610eca90a01e8a9 +0bfaa90c742e75327610f3a90910e7a9 +0403e1a906efa907f9a3d6faa9086a4a +6d316d326e426f4c7210e3a90202eea7 +f5efa7f6f0a7f701f3a7f9f5a7fa05f2 +09f2a7fff3a900faa901eaa7fceba7fd +eca7fe6a346b386c01e5a7f3eea7f410 +f0a7f001e9a7f1f4a7f2644d6476657a +67a2426907e80ce8a7eceaa7edeca7ee +f3a7efe1a7e7e4a7e8e626e7a7eb012a +a7e94c12696de2a7ea10e2a7dc06f00c +f0a7e0f1a7e1f5a7e2faa7e3e4a7dde5 +a7deeda7df10e7a7e56134625a6301ed +a7daf0a7db05e809e8a7d3eaa7d4f3a7 +d5e2a7d0e4a7d1e7a7d202e5a7d7f5a7 +d8f7a7d900197739eb17f30cf3a712f4 +a72af5a71ef7a72beba56beea725efa7 +27e409e4a714e7a719e9a71c772a7a34 +e1a70c01eda72cf3a72d01e8a72ee9a7 +2f6a366d176d326e366f3a7210e9a729 +10efa72410e8a72610f5a7286a2e6b32 +6c10efa72310eaa71d04e5a71eeba71f +f4a720f7a721f8a722641a6434664467 +01e2a71ae5a71b02e4a715e9a716f5a7 +1710e5a718613a62446302e1a711e5a7 +12e8a71301eea70df2a70e02e1a3a7e2 +a70ff9a7100b721ae909e9a738f6a73e +f7a73f722a752ee1a73010e1a73c10f4 +a73d67176734693e6d01e3a73aeca73b +01eba733efa73710e2a739612e623e65 +10eea73602e2a731eda732f2a73301ef +a734f5a735002875c0f0eb74f23ff628 +f6a797f7a7b9f9022a32414c4c126174 +eea7c8022aa7c6432a5410d2a7c810ce +a7c7127261e2a7c7f2a78af3a7a3f502 +2aa46741a46d5912657ae9a785eb38ec +a779eda77eeea789efa78e012a2e4112 +7261e2a774042aa77241324336493a4d +10cea77610c6a77310cea77410d2a775 +7a1b7a38e1a5b4e7a75de9a769eaa76d +03e8a7cbeaa7ccf2a7cdf4a7ce753c76 +6e777e78947901e5a7c9f8a7ca07ed0c +eda7b2eea7b3f0a7b4f3a7b5e2a7aee4 +a7afe5a7b0eaa7b102e7a7b6f2a7b7f8 +a7b803eaa7baeba7bbefa7bcf1a7bd07 +ed0ceda7c2f0a7c3f7a7c4faa7c5e1a7 +bee3a7bfe5a7c0eca7c16bc0d5706370 +4a7170728673a2457403e2a7aaeda7ab +efa7acf2a7ad05f209f2a796f6a797f8 +a798e5a793e6a794efa79503e2a799e6 +a79af3a79bf9a79c05ec09eca7a0f3a7 +a1f5a7a2e3a79de9a79eeaa79f05e809 +e8a7a7eaa7a8f2a7a9e2a7a4e4a7a5e6 +a7a66b506c5a6d706ea2576f04e9a78f +eba78ceca790f3a791faa79201e3a777 +eaa77803eea77af1a77bf4a77cf8a77d +06f226f232f3a786f5a787f7a788022a +3241405912657ae9a785012aa7824c10 +c2a783127261e2a784e2a77fe8a780ef +a78104e3a78ae6a78be7a75deea78cf0 +a78d665266486758686869a06a03e4a7 +6ee7a76ff3a770f9a77102efa75af2a7 +5bf9a75c02e5a75ee6a75ff0a76008f1 +0ff1a764f3a765f4a766f7a767faa768 +e1a761e2a762ebac9deea76302eaa76a +f5a76bf7a76c6146627e63a24164a24b +6502e1a757eea758faa75908e90fe9a7 +44eaa745eda746efa747f7a748e1a740 +e2a741e3a742e4a74305f109f1a74cf8 +a74df9a74ee4a749eda74af0a74b03e7 +a74feba750eca751f4a75203e5a753e8 +a754eca755f4a75666a2c267a4776800 +137546f20ff2a704f4a707f5a708f9a3 +42faa70b7534e13ee5a5ede962efa700 +01e9a709f2a70a22032aa5e3372e4334 +5310c4a5e41133b6a5e410cda5e5012a +a5ef4c126174eea5f06c386c3c6d466e +506f6c7301e2a705eea70601e1a5f7f5 +a5f801e4a5f9f4a5fa04e4a5fbe5a5fc +eaa5fdeea5feefa5ff02e3a701eaa702 +f4a703615862746478687c6905e809e8 +a5f4eca5f5eda5f6e1a5f1e6a5f2e7a5 +f304e7a5e6eba5e7eda5e8f7a5e9faa5 +ea10e2a5eb10f9a5ec10f9a5ee001175 +53e90fe9a57eeaa582efa585f2a58bf9 +a59a75427694e1a574e6012aa57a4112 +646ceda57b09e80fe8a594f1a595f2a5 +96f6a597f9a598e2a590e332e4a591e5 +a592e6a593012aa57a4112646ceda57b +10f2a5996d2f6d4e6f52706271667204 +e3a58ce5a58bf0a58df2a58ef3a58f10 +f0a58402e4a586eea587f2a58810e5a5 +8910f3a58a6132665669606c10f2a583 +05e908e9a578eea579f467e1a575e2a5 +76e7a57701e9a57ceda57d02e1a57fec +a580f4a581001a6e9f791dec0ceca5c0 +eea5c4f5a5d4f6a5dc792ce1a59be4a5 +ad01e1a5a6e9a5e2733a733e75427674 +7702e3a5dfe9a5e0f4a5e110f7a5d307 +f20cf2a5d8f7a5d9f8a5dafaa5dbe2a5 +d5e3a5d6e4a5d7e7a5c402e6a5ddf2a5 +b7f3a5de6e5a6f6a7204e2a5a9e332e5 +a55ef4a5d1f7a5d2012aa5cf4c12696e +e2a5d002e4a5c5e7a5c6efa5c707ee0c +eea5c7f2a5ccf3a5cdf4a5cee4a5c8e6 +a5c9e9a5caeda5cb673c6a236a386b48 +6c526d01eda5c2f6a5c302eba5bbeea5 +bcf5a5bd01eea5bef0a5bf10eba5c167 +34683e6901eca5b9eda5ba01eea5b7ef +a56a10f3a5b86428642e653e6610eba5 +b602e5a5aeeea5aff2a5b005ef09efa5 +b4f2a530faa5b5e2a5b1eaa5b2eca5b3 +612e626c6310f2a5ac09ed0feda5a1ee +a5a2f7a5a3f9a5a4faa5a5e1a59ce6a5 +9de7a59ee8a59feaa5a005ef09efa5a9 +f9a5aafaa5abe1a5a6e6a5a7eda5a863 +c2fc63a2a364a6026500127733ee19ee +38efa567f3a569f4a55cf5a366012aa5 +6353126861f7a564773478387a3ce5a5 +57eca55e10efa57110f4a57210e1a573 +6d466d486e7a728473887403f2a56df4 +a56ef5a56ff8a57002e1a55fe9a560eb +012a2e4e126b6fefa562012aa5614710 +cea56201eea565f1a56610e9a56802e7 +a56aeba56bf5a56c623e664267466b02 +e1a55beba55cf9a55d10f5a55610e9a5 +5801eca559f9a55a001b725fe821f316 +f3a51cf52cf6a522f9a523012aa52047 +126c61e7a521e8a3ecefa511f2a51477 +1277307a34e1a3e2e5a3e810e4a51410 +e5a51c722e735a7410e4a51f06eb0ceb +a518eca519eda51af3a51be7a515e8a5 +16eaa51701e2a51df7a51e69556c336c +326d426f727010f3a51302e1a50ce3a5 +0de4a50e02e5a50fe7a510ee022aa263 +42a2ae4811616e01e2a3fef4a3f910f0 +a51269406a446b03e2a508eca509efa5 +0af9a50b10e3a50402e1a505eda506f6 +a507658f65a28066a28167a2826805ef +09efa501f0a502f2a503e92ceba3ffed +a500022a3c42a2594811616e01e2a3fe +f4a3f90b4d2d5417542e55385610c4a3 +fc01c8a3f8d7a3f901cba3fad3a3fb4d +b4b7502a5310d2a3f702c6a3f4c8a3f5 +daa3f6470e473048b49b4910c4a3f210 +c6a3f02aa3ed412a4210cea3ef10d5a3 +ee126f70efa3fd10e2a3e910e1a3ea10 +e7a3eb6134623e6301e8a3e6f0a3e701 +e4a3e3eea3e410eaa3e50017726f791c +e508e5a530f6a550fa45792a7a34e1a5 +2401efa553f5a55410e7a555751d752e +764a7710f7a55204e1a54be3a54ce4a5 +4de7a54ef4a54f10e1a5517240737474 +03eda547f0a548f3a549f9a54a02e82c +e9a544f3a545012a2e4d126f6ee7a543 +012aa5424310cea54310e2a546682d6d +176daacc6e3c6f03e2a53fe9a537f0a5 +40f7a54110eaa526682e69326a10e5a5 +3d10e4a53a01e1a53bf1a53c64286456 +655a6706ec0ceca536efa537f2a538fa +a539e1a533e8a534e9a53510eea52f01 +e4a531eea532612e625a6310e3a52e06 +e80ce8a528eba529f2a52af6a52be4a5 +25e6a526e7a52701e4a52cf1a52d2aa4 +fd61bedc62002373a5e51ded0feda3a9 +eea3aeefa3b2f2a3bbf3a3c0e5a37ce7 +a389e8a38de9a39377417732783c794c +7a72e1a36201e4a3d3f2a3d402e8a3d5 +eba3d6f2a3c805f309f3a3daf6a3dbf8 +a3dce5a3d7eea3d8f2a3d904e1a3dde5 +a3dee6a3dfe8a3e0f7a3e17332744875 +587610e2a3d203eaa3c1f1a3c2f3a3c3 +f4a3c402efa3c5f4a3c6f6a3c709ed0f +eda3cdefa3cef2a3cff3a3d0f5a3d1e1 +a3c8e3a3c9e4a3cae7a3cbeba3cc6a83 +6e3b6e486f587068716c7203e1a3bce8 +a3bdf8a3befaa3bf02e7a3afeda3b0f0 +a3b102eaa3b3eda3b4eea3b510f9a3b6 +03e3a3b7e9a3b8f0a3b9f6a3ba6a446b +766c926d03e8a3aaeba3abf1a3acf5a3 +ad07ef0cefa39ef2a39ff4a3a0faa3a1 +e8a39ae9a39beaa39ceea39d04e3a3a2 +eda3a3f1a3a4f5a3a5f6a3a601e7a3a7 +f4a3a8656a6562669467a24468a24b69 +06ed0ceda396eea397efa398f1a399e2 +a394e7a395eba37507f40cf4a381f7a3 +82f8a383faa384e6a37de8a37eeaa37f +eda38003e4a385f1a386f4a387f9a388 +02e3a38aeea38bf8a38c05ec09eca391 +efa38df9a392e2a38ee7a38fe9a39061 +32626463906410e4a37b07f20cf2a367 +f3a368f6a369f8a36aeca363eea364f0 +a365f1a36606e40ce4a36eeaa36ff0a3 +70f2a371e1a36be2a36ce3a36d09ed0f +eda376eea377efa378f1a379f5a37ae3 +a363e6a372e8a373e9a374eca3750018 +4dc28954c0e157365736584e59645a12 +616ee2addd01612c631168efa9ac1172 +e1addc01702a731175f8691165efa9ec +01652c691169e9a71c117ae9a7855444 +55a29e5601612c691174e8addb1169e9 +adda07684e683669866ea2426f1174ef +abeb106101e158e9042aabb243324b36 +4c3a5410c8abb210cea7db10c8add710 +c1add8012aa5504d10d6a55001622a72 +10e8add910f4012aa3b24210d4451173 +e1a9ba61346580668667116ce7add605 +6d116d2e6e327610f4a3a810ecab9510 +e7abea67346b386c01e5aba3f5a76210 +e2add310f2add4116cf5aba7116ee7ad +d5126761f2abf650c0c350a27252a2a8 +5306694369426f6a759079016c2a7210 +e3a50e10efadd201643e6e01e4ab44e8 +012aab554c10cbab5510e4adcf02672e +72387910efa51001e4ab72efadd010e1 +ab7a116ee4add1613e675e6801612a72 +10e4adce10f7a564026d2e72327510f2 +ab3210f2ab6810e2adcd116ef7a34b04 +6138654a68506c76721174e9adcb016c +2a7510e3a51f10eda11172edadc90261 +2e6c326e10f8a9f010e7adca01e9a9e0 +f0a9e11172e4a5f9026a306f3675116e +f2a9b0116ee7adcc1168e7ab114d8a4e +a2ab4f0467386c3e72447358751167f2 +a9db1161edab4d1163ebab30016b2a79 +10e1a9d410e8a9da01672a6d10e1adc8 +10e5a9d807722e725a7460756679116d +f2032aa3cf492e4d325410c8adc210ce +a76610cda3cf116fefa95f1165e9adc0 +116cf4adc1614265746c9a6f01642a6e +10e7a54310e9adbf0368326b366e3a72 +10e3adbb10eaadb810e1adb901e4a976 +e9adba0264346e387201e3adbdefadbe +10e6a53e10e4adbc1179eda946046138 +6258655c6b62731168f5adc702672e6e +327210e2adc510edadc310e4adc41161 +f49f1177e1adc6116fefa56247c41b4a +c3354aa6c04ba6d94c03614665a69c69 +a69e7901632a6410e9adb710e9adb602 +6ea6796fa67a7410ee001a4bc139545b +571457ac7e58ac8259305a01c1abfed7 +ab6b10d4ad72544055825603c1ad6dc5 +ad6fcead6ed5a3930bce14d609d6abe6 +d7abd3daab8bceadb4cfabc9d2abd1cb +c5e2cbabbeccad69cdabbd04c1adb5c7 +ad6bd3a563d9ad6cdaad024e824e8a50 +a24a52a26d530cce17d40cd4ad63d5a7 +a0d6ad64d9adb3cead61cfab71d2ad62 +ca09caad5fcbab5bcdad60c3ad5ec5ab +8ac9ab5f06c70cc7abfac9ad51cca54f +cfa985c1ad4ec3ad4fc5ad500acc14d4 +09d4ad5ad7a9e4d9a5c4cca9f5cdad57 +d2ad58c1ad53c5ad54c6ad55c7abcdc8 +a58003c5ad5dcfa951d5a7a0d7ab274b +9e4ca2434d0010cd1dd40fd4a960d5a9 +32d8abfcd9a916daad4dcda742cfadb1 +d1ad4bd2adb2c60cc6ad4ac7a936cbad +b0cca3a9c1adafc3ad48c4ad49c5ab39 +01c5ad3dcdadae04c9ad43d3ad44d4a9 +03d5ad45d6a90943c0c2466446564766 +48a24d4905d209d2adadd3a712d4a72a +c3ad3ac4a714c5ad2e02c9a57ecfa585 +d2a58b0cce17d30cd3ad35d4ad36d5ad +01d7ad37cead32d0ad33d1ad34c608c6 +ad31c867cca779c1ad30c2ad04c5adac +04cdad38cead39d2a704d4a707d5a708 +435244a2424505d309d3a569d4ada6da +ad2fc1ad2ac3ad2bc5a55c0fcf1ad60c +d6ad25d7ad06d9adaadaa51ccfad22d0 +ad23d2ad24d5abffc9c69ac9ad1fccad +20cdad21ceada905cb09cba524cfad28 +daadabc5a530c7ad5ccaad27345e34ae +954178420bce14d209d2ab03d5a742d6 +ad1bcead18cfad19d1ad1ac909c9ab1c +caad16ccad17c1a3c0c5ad13c6ad140c +d217d50cd5abfbd7ad11d8ad12daa35e +d2ad0ed3ad0fd4ad10cd09cdada8cfad +0cd1ad0dc4ad09c6ada7cc6d2aa56331 +2c321133b0ada61137b2a7a010e1a9ae +10ef012aa7fb4c10c1a7fb1170e3a7e0 +026d2e6e327310f5a7ef10e2a7ea01e1 +a7d0e2a5d001613a701161ee012aa730 +4a10d0a730016d2a7610e1ada210efad +a1056e1e6e306f36741168e9ada51164 +e1a7891172e5012aa78e4b01d0ad3fd2 +a78e61306850691174f3ada4026c2e6e +327710e9a74810e9a55d10e1ada30261 +2e6d326f10eaab4310f2a9ff10f2012a +a77e4b10c8a77e473448a25c49127461 +eca56e0465466c5a6f60727a75016a2a +7210f5a9dd10f2a5d4116ff2012aa5b4 +4710c5a5b41161e7a521016e2a7410e8 +a5ce01e7ad94eda56a0161506510eb03 +2aa55e432e47325410d2a38c10d9ad26 +10d2a55e10eead95056c186c306d3675 +116ee7ada01175f7a5f8106e01e7ad9f +f0a5fd61306590691172e1ad9e106e05 +ef24efad98f34cf4032aa3f9482e4d32 +5410d7a3f910cba3f110cfa3f3012aa3 +ed4310cea3ede2a3fee7ad96e9ad9711 +62f2054917493a533e5502c1ad9ccbad +9ad3ad9d10cca5ed10c5ad9b2aa5ed43 +2a4710c2ad9a10c1ad9943c115437044 +a2ce450267406c46741168e9012a7545 +01d2ad2dd4751179f0a55a01622a7910 +edad9310e1ad920461a26968a2786fa2 +8770a289791172ec0a4d335414542e55 +385810cbad8b01caabadd2ad8a10c1ab +f74d2e523e5310cbad8902c4ad87cba9 +0dcea54202cfad88d3ab37d5ab242aab +244138423c474c4b01c7a7c6daad4110 +ccad8402c1ad85c7a389d9a37c01c5a9 +d7d2ad86026b2e6e327210e9ad8110ed +a3e710f3a51402612e65327210f3ad82 +10eda50610f2a5031170f4a512016d2a +7210f4a5cf10ee012aad834310d9ad83 +03653469866f8c751170ecad911176e1 +06491749324d364e3a5010cba3c710ce +a5ef10d5ad8e10d0a98f2aa5ef422a46 +10caad8d10d4ad8c1161ebad8f1167f2 +ad902aa25441aa3142056f1f6f3e7244 +7501672a6810e4ad8010e9ad7f1170ef +a3fd106101e8a9f3e9ad7e6130655c68 +116bf3ad7d036c326d36733a7410ebad +7c10e9ad7b10f5a36a10f3a3c2116ee7 +012aa3ae4210c4a3ae00214ac1c052c0 +cc5638563c5758586259665a01d2abfd +d7ab6b04c1ad6dc4ad6ec5ad6fcead6e +d5a39301c6ad70d3ab6410cbad7103c4 +ad08c5ad08d4ad72d5ab375246536c54 +a2575503c1abf7c7ad6bd9ad6cdaad02 +05d309d3ab37d5ab24d7ab27c5ad5dc8 +ab6bcfa9510ecd1ad40cd4ad63d5ab24 +d6ad64d9ad65cdad60cead61cfab71d2 +ad62c50cc5ab8ac9ab5fcaad5fcbab5b +c1ad03c3ad5ec4ad070ecd1ad20cd2ab +d1d6abe6d7a3f9daab8bcdabbdcead6a +cfabc9d0ad69c80cc8abb2caabadcbab +beccad69c4ad66c6ad67c7ad684e644e +404fa89650785102c1ad5bcfad5cd5ad +2e09cc0fcca54fcfa985d0a98fd1ad0d +d4ad03c1ad4ec3ad4fc5ad50c8a393c9 +ad510dcd17d40cd4ad5ad7a9e4d9a5c4 +daad53cdad57d2ad58d3ad59c70cc7ab +cdc8a580cbad56cca9f5c1ad53c5ad54 +c6ad554aa2484ba24c4ca2644d0012ce +20d50fd5a932d6a550d8abfcd9a916da +ad4dcea542cfa3f3d1ad4bd2ad4cd4a9 +60c60fc6ad4ac7a936cba90dcca3a9cd +a3cfc1ad47c3ad48c4ad49c5ab3901cf +ad3cd0a73007d00cd0ad3fd2a78ed7ad +40daad41c5ad3dc7a7c6c8a77ecdad3e +08d30fd3ad44d4a903d5ad45d6a909d9 +ad46c1a7fbc2ad42c9ad43cbab5541c1 +604598456a46a24147a24e48a2754907 +d10cd1ad3bd2a574d3a712d4a72ac3ad +3ac4a714cca5edcea5ef09d20ed2ad2d +d3a569d475d5ad2edaad2fc1ad2ac3ad +2bc5a55cc79bc8ad2c04c9a57ecfa585 +d1ad0dd2a58bd8a58b0bd014d309d3ad +35d4ad36d7ad37d0ad33d1ad34d2a55e +c808c867cca779cead32c1ad30c5a5b4 +c6ad3106d20cd2a704d4a707d5a708d6 +ad14cba3f1cdad38cead39415e42a24c +43a2834406cb0ccba524cfad28d9ad16 +daad29c4a530c5a530caad270dd117d4 +0cd4ad10d7ad11d8ad12daa35ed1ad0d +d2ad0ed3ad0fcc0bcc6dcda342cead06 +cfad0cc4ad09c5ad0ac6ad0b0010cc1c +d20ed2ab03d445d5a3cfd6ad1bd9a37c +ccad17cead18cfad19d1ad1ac70cc7a3 +89c8ad15c9ab1ccaad16c1a3c0c4a3ae +c5ad13c6ad140010cf1dd50fd5abffd6 +ad25d7ad06d9ad26daa51ccfad22d0ad +23d2ad24d3ab37c90cc9ad1fccad20cd +ad21cea3edc4abfdc6ad1cc7ad1dc8ad +1e342234423548374e3801382a3910b0 +ab3710b6ad081131b9ad051133b2ad06 +1133b6ad072aa563305031a26b320230 +2e33383810b0a53001b0a51cb2abfa10 +b0750533233334354a3601b1ab64b2a5 +ef03b0a3edb4a5efb5a714b9a72a02b3 +abfbb4ad00b7ad013034314a3201b1a5 +63b9abff03b2abfab3a563b5ab03b9ab +fb06b50bb59bb7abfdb8abfeb9a563b1 +abfab3abfcb4ab8b02342e353e3710b2 +ab2402b2a3edb3ad02b5ad0303b0ab24 +b1ab24b4ad04b5a530046436673c6842 +7246761173f44b116ceda57b1168e2ab +f1116fed6301613c6d01e99dee012aa3 +424110cda34210e200134c625131513c +53405450556a5901c5ad08d4ab8c10c1 +ad5b02c1ad03c4ad07d9ad6504c791c8 +a931caad79cead6ad2ad7a10cbad744c +3c4d464e624f665001cbad56d3ad5901 +c2ad42d9ad4604c1ad47cdad73cea776 +d2ad4cd5ad7710c7ad7810cdad52452e +4542474a494e4a644b02c8a505cdad3e +d7ad4001c79bc8ad2c10c2ad7403c4ad +75cead76d1ad3bd2a57410cfad3c2a9b +4132423c43464410daad2901c5ad0ac6 +ad0b01c8ad15d5ad7301c3a917ceabf3 +00217588e62bf221f29bf3a349f6a353 +f9a35cfa012a2e41127261e2a360022a +a35e498a5210d5a361e651eb67ed75ee +7f7a2d7a2ce125e22de54b10ea012a2e +41127261e2a360032aa35e312e493453 +10d5a3611137b2a36101d1a35fd2a360 +7538763c77527901e2a35df2a35c10f9 +a35203eca354eea355f4a356f5a35703 +e1a358e2a359efa35af8a35b6b966f69 +6f44704e726873a2507402e1a34fe7a3 +50eaa35102ea89ed8bfa8d05f206f295 +f397fa99e38fe491e59309ef0fefa344 +f1a345f3a346f9a347faa348e29be332 +e8a341eda342eea343022a9d4e2c5012 +616ceda1126261f49f04e1a34ae5a34b +e7a34cefa34df4a34e6b3c6c3e6d586e +03e381eb83ee85f98710eb6905ee06ee +71f36df473e16be26de96f03ed77ee79 +ef7bf07d65256530673668506a10e765 +01e24df94f05ed06ed59ef5bf15de353 +e455e75702e15fec61ef636148625263 +646405f006f045f947fa49e13fe541ea +4302e927eb29f52b04e92ff131f233f4 +35f93702e439e53be83d } } match{ diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index 78c7b6df5ca..c2922d12444 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -1078,6 +1078,7 @@ likelySubtags:table(nofallback){ scs{"scs_Latn_CA"} sd{"sd_Arab_PK"} sd_Deva{"sd_Deva_IN"} + sd_IN{"sd_Deva_IN"} sd_Khoj{"sd_Khoj_IN"} sd_Sind{"sd_Sind_IN"} sdc{"sdc_Latn_IT"} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 109ce64a69f..062cc62942e 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -29675,7 +29675,7 @@ supplementalData:table(nofallback){ } sd_Deva{ officialStatus{"official_regional"} - populationShareF:int{46260000} + populationShareF:int{47140000} } srx{ populationShareF:int{46350000} diff --git a/icu4c/source/data/region/LOCALE_DEPS.json b/icu4c/source/data/region/LOCALE_DEPS.json index d83f3bf7cd3..93facb19926 100644 --- a/icu4c/source/data/region/LOCALE_DEPS.json +++ b/icu4c/source/data/region/LOCALE_DEPS.json @@ -176,6 +176,7 @@ "es_VE": "es_419", "ff_Adlm": "root", "hi_Latn": "en_IN", + "ks_Deva": "root", "nb": "no", "nn": "no", "pa_Arab": "root", diff --git a/icu4c/source/data/region/ks_Deva.txt b/icu4c/source/data/region/ks_Deva.txt new file mode 100644 index 00000000000..576e14395e9 --- /dev/null +++ b/icu4c/source/data/region/ks_Deva.txt @@ -0,0 +1,19 @@ +// © 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 +ks_Deva{ + %%Parent{"root"} + Countries{ + BR{"ब्राज़ील"} + CN{"चीन"} + DE{"जर्मन"} + FR{"फ्रांस"} + GB{"मुतहीद बादशाहत"} + IN{"भारत"} + IT{"इटली"} + JP{"जापान"} + RU{"रूस"} + US{"मूतहीद रियासत"} + ZZ{"नामोलुम अलाक़"} + } +} diff --git a/icu4c/source/data/translit/Zawgyi_my.txt b/icu4c/source/data/translit/Zawgyi_my.txt index e9b60243eb9..665d83da4e1 100644 --- a/icu4c/source/data/translit/Zawgyi_my.txt +++ b/icu4c/source/data/translit/Zawgyi_my.txt @@ -55,14 +55,14 @@ $wspace = [\u0020\u00a0\u1680\u2000-\u200d\u2060\u202f\u205f\u3000\ufeff]; \u1090 → \u101B ; \u1086 → \u103F ; # yapin -[\u103A|\u107d] → \u103B ; +[\u103A\u107d] → \u103B ; # yayit ($zmedialra)+ → \u103C ; # wasway \u103C* \u108A → \u103D \u103E; # To avoid duplicate medials \u103C → \u103D ; # hatoh -[\u103D|\u1087] → \u103E ; +[\u103D\u1087] → \u103E ; \u1088 → \u103E \u102F ; \u1089 → \u103E \u1030 ; # Vowels diff --git a/icu4c/source/data/translit/my_Zawgyi.txt b/icu4c/source/data/translit/my_Zawgyi.txt index 068379f25cb..52367557c64 100644 --- a/icu4c/source/data/translit/my_Zawgyi.txt +++ b/icu4c/source/data/translit/my_Zawgyi.txt @@ -17,7 +17,7 @@ # The transform is done in two main stages: # (1) Map all Unicode codepoints to their Zawgyi counterparts. # (2) Perform reordering. -# Modern Burmese digits & Unicode code points. +# Modern Burmese digits and Unicode code points. $nondigits = [^\u1040-\u1049]; $consonant = [\u1000-\u1021]; $narrowconsonant = [\u1001\u1002\u1004\u1005\u1007\u100b-\u100e\u1012\u1013\u1015-\u1017\u1019\u101d\u1020\u1025\u1026\u108f]; @@ -28,8 +28,8 @@ $vowelsign = [\u102B-\u1030\u1032]; $vowelmedial = [\u102B-\u1030\u1032\u103c-\u103F]; $ukinzi = [\u1004\u101b\u105a]\u103A\u1039; $medialraZ = [\u103b\u107e-\u1084]; -$lowsignZ = [\u102f\u1030\u1037\u103a\u103c\u103d\u1087-\u108a]; -$highsignZ = [\u102d\u102e\u1032\u1036\u1039\u103d-\u103e\u1064]; +$lowsignZ = [\u102f\u1030\u1037\u103c\u103d\u1087-\u108a]; +$highsignZ = [\u102d\u102e\u1032\u1036\u1039\u1064]; $subscriptitem = [\u1060-\u1063\u1064-\u1068\u106c\u106d\u1070-\u107c\u1085\u1093\u1096]; $vowelsAndConsonants = [\u1000-\u102a]; #### Phase 0: CODEPOINT MAPPING FROM UNICODE TO ZAWGYI @@ -75,9 +75,6 @@ $ukinzi ($consonant) > $1 \u1064 ; \u1039 \u1008 > \u1069 ; \u1039 \u100B > \u106C ; \u1039 \u100C > \u106D ; -\u1039 \u100D > \u106E ; -\u100d \u1039 \u100E > \u106F ; -\u1039 \u100E > \u106F ; \u1039 \u100F > \u1070 ; \u1039 \u1010 > \u1072 ; \u1039 \u1011 > \u1074 ; @@ -91,22 +88,27 @@ $ukinzi ($consonant) > $1 \u1064 ; \u1039 \u1019 > \u107C ; \u1039 \u101C > \u1085 ; \u100d\u1039\u100D > \u106E ; +\u100d\u1039\u100E > \u106F ; \u100F\u1039\u100D > \u1091 ; \u100B\u1039\u100C > \u1092 ; \u100B\u1039\u100B > \u1097 ; \u104E\u1004\u103A\u1038 > \u104E ; #### PHASE 1: Everything is now in Zawgyi code points. REORDERING RULES. ::Null; +# Handle Na with lower modifiers, medial ra. +\u1014 ($subscriptitem) ($highsignZ*) \u103b > \u103b \u108f $1 $2; +\u1014 \u103b ([\u103c\u103d]*) (\u1031*) > $2 \u103b \u108f $1; # E Vowel + medial ra. Move the e vowel -($consonant) \u103b \u1031 > \u1031 \u103b $1 ; +($consonant) \u103b ([\u103c\u103d]*) \u1031 > \u1031 \u103b $1 $2; ($consonant) \u103b > \u103b $1 ; ($consonant) \u103d \u1031 \u1037 > \u1031 $1 \u1094 \u103D ; ($consonant) (\u108a) \u1031 > \u1031 $1 $2 ; -($consonant) ([\u103a\u103d\u103e]+) \u1031 > \u1031 $1 $2 ; # Ra + kinzi ($consonant) \u1064 \u103b > \u103b $1 \u1064 ; # E vowel plus medials -($consonant) ([\u103a\u103c-\u103d]) \u1031 > \u1031 $1 $2 ; +($consonant) ([\u103a\u103c-\u103d]+) \u1031 > \u1031 $1 $2 ; +# Handle consonant, subscripted consonant, medial ra +($consonant) ($subscriptitem) ($highsignZ*) \u103b > \u103b $1 $2 $3 ; # No medials intervening. ($vowelsAndConsonants) \u1031 > \u1031 $1 ; # Handle Na with lower modifiers. @@ -114,8 +116,6 @@ $ukinzi ($consonant) > $1 \u1064 ; \u1014 ($lowsignZ) ($highsignZ) \u1037 > \u108f $1 $2 \u1094; \u1014 ($highsignZ) ($lowsignZ) \u1037 > \u108f $1 $2 \u1094; \u1014 ($highsignZ) \u1037 > \u1014 $1 \u1094; -# Two medials -\u103a \u103c > \u107d \u103c; # a special case \u1014 \u1032 \u1037 > \u1014 \u1032 \u1094; \u1014 \u1037 > \u1014 \u1094; @@ -134,29 +134,34 @@ $ukinzi ($consonant) > $1 \u1064 ; \u1025 \u102E > \u1026; \u1037 \u103A > \u103A \u1037; ([\u102B\u102C\u102F\u1030]) ([\u102D\u102E\u1032]) > $2 $1; -# Medial plus vowel sign U -($medialraZ) ($consonant) \u102f > $1 $2 \u1033; ## Phase 2: Further adjustments ::Null; -# Handle consonant, subscripted consonant, medial ra -($narrowconsonant) ($subscriptitem) ($highsignZ) $medialraZ > \u1083 $1 $2 $3 ; -($wideconsonant) ($subscriptitem) ($highsignZ) $medialraZ > \u1084 $1 $2 ; -($narrowconsonant) ($subscriptitem) $medialraZ > \u1081 $1 $2 ; -($wideconsonant) ($subscriptitem) $medialraZ > \u1082 $1 $2 ; +# Two medials +\u103a \u103c > \u103c \u107d; \u103c \u1094 > \u103c \u1095 ; # Medial ra variations, context dependent -$medialraZ ($narrowconsonant) \u102d \u103d \u102f > \u107f $1 \u102d \u1087 \u1083 ; -$medialraZ ($wideconsonant) \u102d \u103d \u102f > \u1080 $1 \u102d \u1087 \u1083 ; -$medialraZ ($narrowconsonant) ($lowsignZ) ($highsignZ) > \u1083 $1 $2 $3 ; -$medialraZ ($wideconsonant) ($lowsignZ) ($highsignZ) > \u1084 $1 $2 $3 ; -$medialraZ ($narrowconsonant) ($highsignZ) > \u107f $1 $2 ; -$medialraZ ($wideconsonant) ($highsignZ) > \u1080 $1 $2 ; -$medialraZ ($narrowconsonant) \u1030 > \u103b $1 \u1034 ; -$medialraZ ($wideconsonant) \u1030 > \u107e $1 \u1034 ; -$medialraZ ($narrowconsonant) (\u102f) > \u103b $1 \u1033 ; -$medialraZ ($wideconsonant) (\u102f) > \u107e $1 \u1033 ; -$medialraZ ($narrowconsonant) ($lowsignZ) > \u1081 $1 $2 ; -$medialraZ ($wideconsonant) ($lowsignZ) > \u1082 $1 $2 ; +$medialraZ ($narrowconsonant) ($subscriptitem) ($highsignZ) > \u1083 $1 $2 $3 ; +$medialraZ ($wideconsonant) ($subscriptitem) ($highsignZ) > \u1084 $1 $2 $3; +$medialraZ ($narrowconsonant) ($subscriptitem) > \u1081 $1 $2 ; +$medialraZ ($wideconsonant) ($subscriptitem) > \u1082 $1 $2 ; +$medialraZ ($narrowconsonant) ([\u103c\u108a]) ($highsignZ) > \u1083 $1 $2 $3 ; +$medialraZ ($wideconsonant) ([\u103c\u108a]) ($highsignZ) > \u1084 $1 $2 $3 ; +$medialraZ ($narrowconsonant) \u103d ($highsignZ) > \u107f $1 \u1087 $2; +$medialraZ ($wideconsonant) \u103d ($highsignZ) > \u1080 $1 \u1087 $2; +$medialraZ ($narrowconsonant) \u102f ($highsignZ) > \u107f $1 \u1033 $2; +$medialraZ ($wideconsonant) \u102f ($highsignZ) > \u1080 $1 \u1033 $2; +$medialraZ ($narrowconsonant) \u1030 ($highsignZ) > \u107f $1 \u1034 $2; +$medialraZ ($wideconsonant) \u1030 ($highsignZ) > \u1080 $1 \u1034 $2; +$medialraZ ($narrowconsonant) ($lowsignZ*) ($highsignZ) > \u107f $1 $2 $3; +$medialraZ ($wideconsonant) ($lowsignZ*) ($highsignZ) > \u1080 $1 $2 $3; +$medialraZ ($narrowconsonant) ([\u103c\u108a]) > \u1081 $1 $2 ; +$medialraZ ($wideconsonant) ([\u103c\u108a]) > \u1082 $1 $2 ; +$medialraZ ($narrowconsonant) \u103d > \u103b $1 \u1087; +$medialraZ ($wideconsonant) \u103d > \u107e $1 \u1087; +$medialraZ ($narrowconsonant) \u102f > \u103b $1 \u1033; +$medialraZ ($wideconsonant) \u102f > \u107e $1 \u1033; +$medialraZ ($narrowconsonant) \u1030 > \u103b $1 \u1034; +$medialraZ ($wideconsonant) \u1030 > \u107e $1 \u1034; $medialraZ ($widenya) > \u1082 $1 ; $medialraZ ($othernya) > \u103b \u106a ; $medialraZ ($narrowconsonant) > \u103b $1 ; @@ -171,22 +176,21 @@ $medialraZ ($wideconsonant) > \u107e $1 ; \u1064 \u102e > \u108c ; ##### Phase 3 ::Null; -([\u103C\u103D\u103E]+) \u103B > \u103B $1; -([\u103D\u103E]+) \u103C > \u103C $1; -\u103E\u103D > \u103D\u103E ; \u1037 ([\u102D-\u1030\u1032\u1036]) > $1 \u1037; ($consonant) ([\u102B-\u1032\u1036\u103B-\u103E]) \u103A ($consonant)> $1 \u103A $2 $3; # Combine vowel and consonant signs \u103d \u102f > \u1088; \u1033 \u1094 > \u1033 \u1095; # Wider spacing on lower dot -($medialraZ) ($consonant) ($highsignZ) \u102f > $1 $2 $3 \u1033; +($medialraZ) ($narrowconsonant) ($lowsignZ*) ($highsignZ*) \u102f > $1 $2 $3 $4 \u1033; +($medialraZ) ($wideconsonant) ($lowsignZ*) ($highsignZ*) \u102f > $1 $2 $3 $4 \u1033; +($medialraZ) ($narrowconsonant) ($lowsignZ*) ($highsignZ*) \u1030 > $1 $2 $3 $4 \u1034; +($medialraZ) ($wideconsonant) ($lowsignZ*) ($highsignZ*) \u1030 > $1 $2 $3 $4 \u1034; ##### Phase 4. More reorderings of medials ::Null; ([\u103D\u103E]) \u103C > \u103C $1; \u103E\u103D > \u103D\u103E ; \u1038 ($vowelmedial) > $1 \u1038; \u1038 ([\u1036\u1037\u103A]) > $1 \u1038; -\u1036 \u102f > \u102f \u1036; \u103a ([\u1064\u108b-\u108e]) \u102d \u102f > \u103a $1 \u102d \u1033; \u103a \u102d \u102f > \u103a \u102d \u1033; #### Phase 5 @@ -216,10 +220,10 @@ $medialraZ ($wideconsonant) > \u107e $1 ; \u103D \u103D+ > \u103D; \u103E \u103E+ > \u103E; # Visually identical orderings - standardize -\u102f \u102D > \u102D \u102f ; -\u102f \u1036 > \u1036 \u102f ; -\u1039 \u1037 > \u1037 \u1039 ; -\u103c \u1032 > \u1032 \u103c ; -\u103c \u102e > \u102e \u103c ; +([\u102f\u1033]) \u102D > \u102D $1 ; +([\u102f\u1033]) \u1036 > \u1036 $1 ; +\u1037 \u1039 > \u1039 \u1037; +\u1032 \u103c > \u103c \u1032 ; +\u102e \u103c > \u103c \u102e ; \u103d \u1088 > \u1088 ; diff --git a/icu4c/source/data/unit/LOCALE_DEPS.json b/icu4c/source/data/unit/LOCALE_DEPS.json index d83f3bf7cd3..93facb19926 100644 --- a/icu4c/source/data/unit/LOCALE_DEPS.json +++ b/icu4c/source/data/unit/LOCALE_DEPS.json @@ -176,6 +176,7 @@ "es_VE": "es_419", "ff_Adlm": "root", "hi_Latn": "en_IN", + "ks_Deva": "root", "nb": "no", "nn": "no", "pa_Arab": "root", diff --git a/icu4c/source/data/unit/ks_Deva.txt b/icu4c/source/data/unit/ks_Deva.txt new file mode 100644 index 00000000000..4e3f94cb787 --- /dev/null +++ b/icu4c/source/data/unit/ks_Deva.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 +ks_Deva{ + %%Parent{"root"} +} diff --git a/icu4c/source/data/unit/sr_Latn.txt b/icu4c/source/data/unit/sr_Latn.txt index cc923da8a58..d1a29e62ca3 100644 --- a/icu4c/source/data/unit/sr_Latn.txt +++ b/icu4c/source/data/unit/sr_Latn.txt @@ -29,8 +29,17 @@ sr_Latn{ other{"{0} ge sila"} } meter-per-square-second{ + case{ + genitive{ + one{"{0} metra u sekundi na kvadrat"} + } + instrumental{ + one{"{0} metrom u sekundi na kvadrat"} + } + } dnam{"metri u sekundi na kvadrat"} few{"{0} metra u sekundi na kvadrat"} + gender{"inanimate"} one{"{0} metar u sekundi na kvadrat"} other{"{0} metara u sekundi na kvadrat"} } @@ -159,8 +168,17 @@ sr_Latn{ other{"{0} hektara"} } square-centimeter{ + case{ + genitive{ + one{"{0} kvadratnog centimetra"} + } + instrumental{ + one{"{0} kvadratnim centimetrom"} + } + } dnam{"kvadratni centimetri"} few{"{0} kvadratna centimetra"} + gender{"inanimate"} one{"{0} kvadratni centimetar"} other{"{0} kvadratnih centimetara"} per{"{0}/cm²"} @@ -179,15 +197,33 @@ sr_Latn{ per{"{0}/in²"} } square-kilometer{ + case{ + genitive{ + one{"{0} kvadratna kilometra"} + } + instrumental{ + one{"{0} kvadratnim kilometrom"} + } + } dnam{"kvadratni kilometri"} few{"{0} kvadratna kilometra"} + gender{"inanimate"} one{"{0} kvadratni kilometar"} other{"{0} kvadratnih kilometara"} per{"{0} po kvadratnom kilometru"} } square-meter{ + case{ + genitive{ + one{"{0} kvadratna metra"} + } + instrumental{ + one{"{0} kvadratnim metrom"} + } + } dnam{"kvadratni metri"} few{"{0} kvadratna metra"} + gender{"inanimate"} one{"{0} kvadratni metar"} other{"{0} kvadratnih metara"} per{"{0}/m²"} @@ -274,8 +310,20 @@ sr_Latn{ } concentr{ item{ + case{ + accusative{ + one{"{0} stavku"} + } + genitive{ + one{"{0} stavke"} + } + instrumental{ + one{"{0} stavkom"} + } + } dnam{"stavke"} few{"{0} stavke"} + gender{"feminine"} one{"{0} stavka"} other{"{0} stavki"} } @@ -304,8 +352,17 @@ sr_Latn{ other{"{0} miligrama po decilitru"} } millimole-per-liter{ + case{ + genitive{ + one{"{0} milimola po litri"} + } + instrumental{ + one{"{0} milimolom po litri"} + } + } dnam{"milimol po litri"} few{"{0} milimola po litri"} + gender{"inanimate"} one{"{0} milimol po litri"} other{"{0} milimola po litri"} } @@ -396,14 +453,32 @@ sr_Latn{ } consumption{ liter-per-100-kilometer{ + case{ + genitive{ + one{"{0} litra na 100 kilometara"} + } + instrumental{ + one{"{0} litrom na 100 kilometara"} + } + } dnam{"litri na 100 kilometara"} few{"{0} litra na 100 kilometara"} + gender{"inanimate"} one{"{0} litar na 100 kilometara"} other{"{0} litara na 100 kilometara"} } liter-per-kilometer{ + case{ + genitive{ + one{"{0} litra po kilometru"} + } + instrumental{ + one{"{0} litrom po kilometru"} + } + } dnam{"litri po kilometru"} few{"{0} litra po kilometru"} + gender{"inanimate"} one{"{0} litar po kilometru"} other{"{0} litara po kilometru"} } @@ -465,56 +540,142 @@ sr_Latn{ other{"{0} bajtova"} } gigabit{ + case{ + genitive{ + one{"{0} gigabita"} + } + instrumental{ + one{"{0} gigabitom"} + } + } dnam{"gigabitovi"} few{"{0} gigabita"} + gender{"inanimate"} one{"{0} gigabit"} other{"{0} gigabitova"} } gigabyte{ + case{ + genitive{ + one{"{0} gigabajta"} + } + instrumental{ + one{"{0} gigabajtom"} + } + } dnam{"gigabajti"} few{"{0} gigabajta"} + gender{"inanimate"} one{"{0} gigabajt"} other{"{0} gigabajtova"} } kilobit{ + case{ + genitive{ + one{"{0} kilobita"} + } + instrumental{ + one{"{0} kilobitom"} + } + } dnam{"kilobitovi"} few{"{0} kilobita"} + gender{"inanimate"} one{"{0} kilobit"} other{"{0} kilobitova"} } kilobyte{ + case{ + genitive{ + one{"{0} kilobajta"} + } + instrumental{ + one{"{0} kilobajtom"} + } + } dnam{"kilobajti"} few{"{0} kilobajta"} + gender{"inanimate"} one{"{0} kilobajt"} other{"{0} kilobajtova"} } megabit{ + case{ + genitive{ + one{"{0} megabita"} + } + instrumental{ + one{"{0} megabitom"} + } + } dnam{"megabitovi"} few{"{0} megabita"} + gender{"inanimate"} one{"{0} megabit"} other{"{0} megabitova"} } megabyte{ + case{ + genitive{ + one{"{0} megabajta"} + } + instrumental{ + one{"{0} megabajtom"} + } + } dnam{"megabajti"} few{"{0} megabajta"} + gender{"inanimate"} one{"{0} megabajt"} other{"{0} megabajtova"} } petabyte{ + case{ + genitive{ + one{"{0} petabajta"} + } + instrumental{ + one{"{0} petabajtom"} + } + } dnam{"petabajti"} few{"{0} petabajta"} + gender{"inanimate"} one{"{0} petabajt"} other{"{0} petabajtova"} } terabit{ + case{ + genitive{ + one{"{0} terabita"} + } + instrumental{ + one{"{0} terabitom"} + } + } dnam{"terabitovi"} few{"{0} terabita"} + gender{"inanimate"} one{"{0} terabit"} other{"{0} terabitova"} } terabyte{ + case{ + accusative{ + other{"{0} terabajtova"} + } + genitive{ + one{"{0} terabajta"} + other{"{0} terabajtova"} + } + instrumental{ + one{"{0} terabajtom"} + other{"{0} terabajtova"} + } + } dnam{"terabajti"} few{"{0} terabajta"} + gender{"inanimate"} one{"{0} terabajt"} other{"{0} terabajta"} } @@ -598,14 +759,35 @@ sr_Latn{ per{"{0}/sat"} } microsecond{ + case{ + accusative{ + one{"{0} mikrosekundu"} + } + genitive{ + one{"{0} mikrosekunde"} + } + instrumental{ + one{"{0} mikrosekundom"} + } + } dnam{"mikrosekunde"} few{"{0} mikrosekunde"} + gender{"feminine"} one{"{0} mikrosekunda"} other{"{0} mikrosekundi"} } millisecond{ + case{ + genitive{ + one{"{0} milisekunde"} + } + instrumental{ + one{"{0} milisekundom"} + } + } dnam{"milisekunde"} few{"{0} milisekunde"} + gender{"feminine"} one{"{0} milisekunda"} other{"{0} milisekundi"} } @@ -648,8 +830,20 @@ sr_Latn{ per{"{0} mesečno"} } nanosecond{ + case{ + accusative{ + one{"{0} nanosekunde"} + } + genitive{ + one{"{0} nanosekunde"} + } + instrumental{ + one{"{0} nanosekundom"} + } + } dnam{"nanosekunde"} few{"{0} nanosekunde"} + gender{"feminine"} one{"{0} nanosekunda"} other{"{0} nanosekundi"} } @@ -731,8 +925,17 @@ sr_Latn{ other{"{0} ampera"} } milliampere{ + case{ + genitive{ + one{"{0} miliampera"} + } + instrumental{ + one{"{0} miliamperom"} + } + } dnam{"miliamperi"} few{"{0} miliampera"} + gender{"inanimate"} one{"{0} miliamper"} other{"{0} miliampera"} } @@ -832,14 +1035,32 @@ sr_Latn{ other{"{0} kilokalorija"} } kilojoule{ + case{ + genitive{ + one{"{0} kilodžula"} + } + instrumental{ + one{"{0} kilodžulom"} + } + } dnam{"kilodžuli"} few{"{0} kilodžula"} + gender{"inanimate"} one{"{0} kilodžul"} other{"{0} kilodžula"} } kilowatt-hour{ + case{ + genitive{ + one{"{0} kilovat-sata"} + } + instrumental{ + one{"{0} kilovat-satom"} + } + } dnam{"kilovat-sati"} few{"{0} kilovat-sata"} + gender{"inanimate"} one{"{0} kilovat-sat"} other{"{0} kilovat-sati"} } @@ -851,6 +1072,9 @@ sr_Latn{ } } force{ + kilowatt-hour-per-100-kilometer{ + gender{"inanimate"} + } newton{ case{ accusative{ @@ -878,8 +1102,17 @@ sr_Latn{ } frequency{ gigahertz{ + case{ + genitive{ + one{"{0} gigaherca"} + } + instrumental{ + one{"{0} gigahercom"} + } + } dnam{"gigaherci"} few{"{0} gigaherca"} + gender{"inanimate"} one{"{0} gigaherc"} other{"{0} gigaherca"} } @@ -902,14 +1135,32 @@ sr_Latn{ other{"{0} herca"} } kilohertz{ + case{ + genitive{ + one{"{0} kiloherca"} + } + instrumental{ + one{"{0} kilohercom"} + } + } dnam{"kiloherci"} few{"{0} kiloherca"} + gender{"inanimate"} one{"{0} kiloherc"} other{"{0} kiloherca"} } megahertz{ + case{ + genitive{ + one{"{0} megaherca"} + } + instrumental{ + one{"{0} megahercom"} + } + } dnam{"megaherci"} few{"{0} megaherca"} + gender{"inanimate"} one{"{0} megaherc"} other{"{0} megaherca"} } @@ -922,11 +1173,76 @@ sr_Latn{ } em{ gender{"inanimate"} - one{"{0} em"} + } + megapixel{ + case{ + accusative{ + few{"{0} megapiksela"} + one{"{0} megapiksel"} + other{"{0} megapiksela"} + } + genitive{ + few{"{0} megapiksela"} + one{"{0} megapiksela"} + other{"{0} megapiksela"} + } + instrumental{ + few{"{0} megapiksela"} + one{"{0} megapikselom"} + other{"{0} megapiksela"} + } + } + dnam{"megapikseli"} + few{"{0} megapiksela"} + gender{"inanimate"} + one{"{0} megapiksel"} + other{"{0} megapiksela"} } pixel{ + case{ + accusative{ + few{"{0} piksela"} + one{"{0} piksel"} + other{"{0} piksela"} + } + genitive{ + few{"{0} piksela"} + one{"{0} piksela"} + other{"{0} piksela"} + } + instrumental{ + few{"{0} piksela"} + one{"{0} pikselom"} + other{"{0} piksela"} + } + } + few{"{0} piksela"} + gender{"inanimate"} + one{"{0} piksel"} + other{"{0} piksela"} + } + pixel-per-centimeter{ + case{ + accusative{ + few{"{0} piksela na centimetar"} + one{"{0} piksel na centimetar"} + other{"{0} piksela na centimetar"} + } + genitive{ + few{"{0} piksela na centimetar"} + one{"{0} piksela na centimetar"} + other{"{0} piksela na centimetar"} + } + instrumental{ + few{"{0} piksela na centimetar"} + one{"{0} pikselom na centimetar"} + other{"{0} piksela na centimetar"} + } + } + few{"{0} piksela na centimetar"} gender{"inanimate"} - one{"{0} px"} + one{"{0} piksel na centimetar"} + other{"{0} piksela na centimetar"} } } length{ @@ -937,20 +1253,44 @@ sr_Latn{ other{"{0} astronomskih jedinica"} } centimeter{ + case{ + accusative{ + few{"{0} centimetra"} + } + genitive{ + few{"{0} centimetra"} + one{"{0} centimetra"} + } + instrumental{ + few{"{0} centimetra"} + one{"{0} centimetrom"} + } + } dnam{"centimetri"} - few{"{0} centimentra"} + few{"{0} centimetra"} + gender{"inanimate"} one{"{0} centimetar"} other{"{0} centimetara"} per{"{0}/cm"} } decimeter{ + case{ + genitive{ + one{"{0} decimetra"} + } + instrumental{ + one{"{0} decimetrom"} + } + } dnam{"decimetri"} few{"{0} decimetra"} + gender{"inanimate"} one{"{0} decimetar"} other{"{0} decimetara"} } earth-radius{ dnam{"poluprečnik Zemlje"} + few{"{0} poluprečnik Zemlje"} one{"{0} poluprečnik Zemlje"} other{"{0} poluprečnika Zemlje"} } @@ -981,8 +1321,17 @@ sr_Latn{ per{"{0}/in"} } kilometer{ + case{ + genitive{ + one{"{0} kilometra"} + } + instrumental{ + one{"{0} kilometrom"} + } + } dnam{"kilometri"} few{"{0} kilometra"} + gender{"inanimate"} one{"{0} kilometar"} other{"{0} kilometara"} per{"{0}/km"} @@ -1013,8 +1362,17 @@ sr_Latn{ per{"{0}/m"} } micrometer{ + case{ + genitive{ + one{"{0} mikrometra"} + } + instrumental{ + one{"{0} mikrometrom"} + } + } dnam{"mikrometri"} few{"{0} mikrometra"} + gender{"inanimate"} one{"{0} mikrometar"} other{"{0} mikrometara"} } @@ -1043,14 +1401,32 @@ sr_Latn{ other{"{0} skandinavskih milja"} } millimeter{ + case{ + genitive{ + one{"{0} milimetra"} + } + instrumental{ + one{"{0} milimetrom"} + } + } dnam{"milimetri"} few{"{0} milimetra"} + gender{"inanimate"} one{"{0} milimetar"} other{"{0} milimetara"} } nanometer{ + case{ + genitive{ + one{"{0} nanometra"} + } + instrumental{ + one{"{0} nanometrom"} + } + } dnam{"nanometri"} few{"{0} nanometra"} + gender{"inanimate"} one{"{0} nanometar"} other{"{0} nanometara"} } @@ -1067,8 +1443,17 @@ sr_Latn{ other{"{0} parseka"} } picometer{ + case{ + genitive{ + one{"{0} pikometra"} + } + instrumental{ + one{"{0} pikometrom"} + } + } dnam{"pikometri"} few{"{0} pikometra"} + gender{"inanimate"} one{"{0} pikometar"} other{"{0} pikometara"} } @@ -1241,14 +1626,32 @@ sr_Latn{ other{"{0} metričkih tona"} } microgram{ + case{ + genitive{ + one{"{0} mikrograma"} + } + instrumental{ + one{"{0} mikrogramom"} + } + } dnam{"mikrogrami"} few{"{0} mikrograma"} + gender{"inanimate"} one{"{0} mikrogram"} other{"{0} mikrograma"} } milligram{ + case{ + genitive{ + one{"{0} miligrama"} + } + instrumental{ + one{"{0} miligramom"} + } + } dnam{"miligrami"} few{"{0} miligrama"} + gender{"inanimate"} one{"{0} miligram"} other{"{0} miligrama"} } @@ -1293,8 +1696,17 @@ sr_Latn{ } power{ gigawatt{ + case{ + genitive{ + one{"{0} gigavata"} + } + instrumental{ + one{"{0} gigavatom"} + } + } dnam{"gigavati"} few{"{0} gigavata"} + gender{"inanimate"} one{"{0} gigavat"} other{"{0} gigavati"} } @@ -1305,20 +1717,47 @@ sr_Latn{ other{"{0} konjskih snaga"} } kilowatt{ + case{ + genitive{ + one{"{0} kilovata"} + } + instrumental{ + one{"{0} kilovatom"} + } + } dnam{"kilovati"} few{"{0} kilovata"} + gender{"inanimate"} one{"{0} kilovat"} other{"{0} kilovati"} } megawatt{ + case{ + genitive{ + one{"{0} megavata"} + } + instrumental{ + one{"{0} megavatom"} + } + } dnam{"megavati"} few{"{0} megavata"} + gender{"inanimate"} one{"{0} megavat"} other{"{0} megavati"} } milliwatt{ + case{ + genitive{ + one{"{0} milivata"} + } + instrumental{ + one{"{0} milivatom"} + } + } dnam{"milivati"} few{"{0} milivata"} + gender{"inanimate"} one{"{0} milivat"} other{"{0} milivati"} } @@ -1379,8 +1818,17 @@ sr_Latn{ other{"{0} bara"} } hectopascal{ + case{ + genitive{ + one{"{0} hektopaskala"} + } + instrumental{ + one{"{0} hektopaskalom"} + } + } dnam{"hektopaskali"} few{"{0} hektopaskala"} + gender{"inanimate"} one{"{0} hektopaskal"} other{"{0} hektopaskala"} } @@ -1391,20 +1839,47 @@ sr_Latn{ other{"{0} inča živinog stuba"} } kilopascal{ + case{ + genitive{ + one{"{0} kilopaskala"} + } + instrumental{ + one{"{0} kilopaskalom"} + } + } dnam{"kilopaskali"} few{"{0} kilopaskala"} + gender{"inanimate"} one{"{0} kilopaskal"} other{"{0} kilopaskala"} } megapascal{ + case{ + genitive{ + one{"{0} megapaskala"} + } + instrumental{ + one{"{0} megapaskalom"} + } + } dnam{"megapaskali"} few{"{0} megapaskala"} + gender{"inanimate"} one{"{0} megapaskal"} other{"{0} megapaskala"} } millibar{ + case{ + genitive{ + one{"{0} milibara"} + } + instrumental{ + one{"{0} milibarom"} + } + } dnam{"milibari"} few{"{0} milibara"} + gender{"inanimate"} one{"{0} milibar"} other{"{0} milibara"} } @@ -1441,8 +1916,17 @@ sr_Latn{ } speed{ kilometer-per-hour{ + case{ + genitive{ + one{"{0} kilometra na sat"} + } + instrumental{ + one{"{0} kilometrom na sat"} + } + } dnam{"kilometri na sat"} few{"{0} kilometra na sat"} + gender{"inanimate"} one{"{0} kilometar na sat"} other{"{0} kilometara na sat"} } @@ -1453,8 +1937,17 @@ sr_Latn{ other{"{0} čvorova"} } meter-per-second{ + case{ + genitive{ + one{"{0} metra u sekundi"} + } + instrumental{ + one{"{0} metrom u sekundi"} + } + } dnam{"metri u sekundi"} few{"{0} metra u sekundi"} + gender{"inanimate"} one{"{0} metar u sekundi"} other{"{0} metara u sekundi"} } @@ -1518,8 +2011,17 @@ sr_Latn{ } torque{ newton-meter{ + case{ + genitive{ + one{"{0} njutn-metra"} + } + instrumental{ + one{"{0} njutn-metrom"} + } + } dnam{"njutn-metri"} few{"{0} njutn-metra"} + gender{"inanimate"} one{"{0} njutn-metar"} other{"{0} njutn-metara"} } @@ -1550,14 +2052,32 @@ sr_Latn{ other{"{0} bušela"} } centiliter{ + case{ + genitive{ + one{"{0} centilitra"} + } + instrumental{ + one{"{0} centilitrom"} + } + } dnam{"centilitri"} few{"{0} centilitra"} + gender{"inanimate"} one{"{0} centilitar"} other{"{0} centilitara"} } cubic-centimeter{ + case{ + genitive{ + one{"{0} kubnog centimetra"} + } + instrumental{ + one{"{0} kubnim centimetrom"} + } + } dnam{"kubni centimetri"} few{"{0} kubna centimetra"} + gender{"inanimate"} one{"{0} kubni centimetar"} other{"{0} kubnih centimetara"} per{"{0}/cm³"} @@ -1575,14 +2095,32 @@ sr_Latn{ other{"{0} kubnih inča"} } cubic-kilometer{ + case{ + genitive{ + one{"{0} kubnog kilometra"} + } + instrumental{ + one{"{0} kubnim kilometrom"} + } + } dnam{"kubni kilometri"} few{"{0} kubna kilometra"} + gender{"inanimate"} one{"{0} kubni kilometar"} other{"{0} kubnih kilometara"} } cubic-meter{ + case{ + genitive{ + one{"{0} kubnog metra"} + } + instrumental{ + one{"{0} kubnim metrom"} + } + } dnam{"kubni metri"} few{"{0} kubna metra"} + gender{"inanimate"} one{"{0} kubni metar"} other{"{0} kubnih metara"} per{"{0}/m³"} @@ -1624,8 +2162,17 @@ sr_Latn{ other{"{0} metričkih šolja"} } deciliter{ + case{ + genitive{ + one{"{0} decilitra"} + } + instrumental{ + one{"{0} decilitrom"} + } + } dnam{"decilitri"} few{"{0} decilitra"} + gender{"inanimate"} one{"{0} decilitar"} other{"{0} decilitara"} } @@ -1680,8 +2227,17 @@ sr_Latn{ per{"{0} po imp. galonu"} } hectoliter{ + case{ + genitive{ + one{"{0} hektolitra"} + } + instrumental{ + one{"{0} hektolitrom"} + } + } dnam{"hektolitri"} few{"{0} hektolitra"} + gender{"inanimate"} one{"{0} hektolitar"} other{"{0} hektolitara"} } @@ -1711,14 +2267,32 @@ sr_Latn{ per{"{0} po litri"} } megaliter{ + case{ + genitive{ + one{"{0} megalitra"} + } + instrumental{ + one{"{0} megalitrom"} + } + } dnam{"megalitri"} few{"{0} megalitra"} + gender{"inanimate"} one{"{0} megalitar"} other{"{0} megalitara"} } milliliter{ + case{ + genitive{ + one{"{0} mililitra"} + } + instrumental{ + one{"{0} mililitrom"} + } + } dnam{"mililitri"} few{"{0} mililitra"} + gender{"inanimate"} one{"{0} mililitar"} other{"{0} mililitara"} } diff --git a/icu4c/source/data/xml/brkitr/de.xml b/icu4c/source/data/xml/brkitr/de.xml index e9ef95b84f2..581c6a49a24 100644 --- a/icu4c/source/data/xml/brkitr/de.xml +++ b/icu4c/source/data/xml/brkitr/de.xml @@ -6,9 +6,9 @@ See comments on https://unicode-org.atlassian.net/browse/ICU-10750 - this file is needed to emit break iterator rules properly. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/el.xml b/icu4c/source/data/xml/brkitr/el.xml index 1be5e6bd9e0..6101bffa3c0 100644 --- a/icu4c/source/data/xml/brkitr/el.xml +++ b/icu4c/source/data/xml/brkitr/el.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/en.xml b/icu4c/source/data/xml/brkitr/en.xml index 175498432a1..c10869f1869 100644 --- a/icu4c/source/data/xml/brkitr/en.xml +++ b/icu4c/source/data/xml/brkitr/en.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/en_US.xml b/icu4c/source/data/xml/brkitr/en_US.xml index cc9e4c23957..dafa29408fa 100644 --- a/icu4c/source/data/xml/brkitr/en_US.xml +++ b/icu4c/source/data/xml/brkitr/en_US.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/en_US_POSIX.xml b/icu4c/source/data/xml/brkitr/en_US_POSIX.xml index be02f2852e8..6722b3b761b 100644 --- a/icu4c/source/data/xml/brkitr/en_US_POSIX.xml +++ b/icu4c/source/data/xml/brkitr/en_US_POSIX.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/es.xml b/icu4c/source/data/xml/brkitr/es.xml index 50f855a8f75..3ac3031f990 100644 --- a/icu4c/source/data/xml/brkitr/es.xml +++ b/icu4c/source/data/xml/brkitr/es.xml @@ -6,9 +6,9 @@ See comments on https://unicode-org.atlassian.net/browse/ICU-10750 - this file is needed to emit break iterator rules properly. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/fr.xml b/icu4c/source/data/xml/brkitr/fr.xml index bac8973efe4..fea05ffb299 100644 --- a/icu4c/source/data/xml/brkitr/fr.xml +++ b/icu4c/source/data/xml/brkitr/fr.xml @@ -6,9 +6,9 @@ See comments on https://unicode-org.atlassian.net/browse/ICU-10750 - this file is needed to emit break iterator rules properly. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/it.xml b/icu4c/source/data/xml/brkitr/it.xml index 2e728f6a50c..568b4624c73 100644 --- a/icu4c/source/data/xml/brkitr/it.xml +++ b/icu4c/source/data/xml/brkitr/it.xml @@ -6,9 +6,9 @@ See comments on https://unicode-org.atlassian.net/browse/ICU-10750 - this file is needed to emit break iterator rules properly. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/ja.xml b/icu4c/source/data/xml/brkitr/ja.xml index a5a9b3dfb85..944bd3e18fb 100644 --- a/icu4c/source/data/xml/brkitr/ja.xml +++ b/icu4c/source/data/xml/brkitr/ja.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2006-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > @@ -27,6 +27,232 @@ + + + かい + かしら + から + きり + くらい + ぐらい + けれど + けれども + こそ + さえ + しか + した + ずつ + せる + せん + たい + たがる + たく + たら + たり + だけ + だに + だの + だり + つつ + てる + です + でも + ところが + ところで + とも + ない + なか + ながら + なく + なし + なぞ + など + なら + なり + なんぞ + ねる + ので + のに + のみ + ばかり + へる + ほど + まい + まう + まし + ます + まっ + まで + まま + もん + やら + よう + より + らしい + られる + れる + ろう + わっ + わな + わら + わり + わる + われ + わん + + えたい + えて + える + けた + けたい + ける + させる + そうだ + っきゃ + っきり + っけ + っす + ったらしい + っちゅう + って + っていう + ってか + ってな + っと + っぱなし + っぷり + っぽい + にあう + にあがる + にあたって + にあたり + にあたりまして + にあたります + にあたる + において + におきまして + における + にかけ + にかけて + にかけまして + にたいして + にたいしまして + にたいします + にたいする + について + につき + につきまして + につけ + につれ + につれて + にて + にとって + にとり + にとりまして + にまつわります + にまつわる + にもかかわらず + にゃ + によって + により + によりまして + によります + による + にわたって + にわたり + にわたりまして + にわたります + にわたる + に対し + に対して + に対しまして + に対します + に対する + に当たって + に当たり + に当たりまして + に当たります + に当たる + に従い + に従いまして + に従います + に従う + に従って + に関し + に関して + に関しまして + に関します + に関する + に際し + に際して + ものの + ろうし + ろうと + われと + をの + をめぐって + をめぐりまして + をめぐります + をめぐる + をもちまして + をもって + を以て + を通して + を通しまして + を通じ + を通じて + を通じまして + んじゃ + んで + + 々宮 + 々家 + え目 + が丘 + が台 + が床 + が浜 + ヵ国 + ヵ年 + ヵ所 + ヵ月 + ヵ村 + ヵ条 + ヶ丘 + ヶ国 + ヶ島 + ヶ年 + ヶ所 + ヶ月 + ヶ村 + ヶ条 + ージ + ーズ + ータ + ード + ーニャ + ープランス + ーユ + ーランド + ーリンズ + ーン + diff --git a/icu4c/source/data/xml/brkitr/pt.xml b/icu4c/source/data/xml/brkitr/pt.xml index 25742edcd70..8ff12bf0147 100644 --- a/icu4c/source/data/xml/brkitr/pt.xml +++ b/icu4c/source/data/xml/brkitr/pt.xml @@ -6,9 +6,9 @@ See comments on https://unicode-org.atlassian.net/browse/ICU-10750 - this file is needed to emit break iterator rules properly. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/root.xml b/icu4c/source/data/xml/brkitr/root.xml index b145c3bf374..0d3e667ae16 100644 --- a/icu4c/source/data/xml/brkitr/root.xml +++ b/icu4c/source/data/xml/brkitr/root.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/ru.xml b/icu4c/source/data/xml/brkitr/ru.xml index 8b17f7f9882..5a7ae849647 100644 --- a/icu4c/source/data/xml/brkitr/ru.xml +++ b/icu4c/source/data/xml/brkitr/ru.xml @@ -6,9 +6,9 @@ See comments on https://unicode-org.atlassian.net/browse/ICU-10750 - this file is needed to emit break iterator rules properly. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/zh.xml b/icu4c/source/data/xml/brkitr/zh.xml index f7fa7bd5ba7..48d0d681101 100644 --- a/icu4c/source/data/xml/brkitr/zh.xml +++ b/icu4c/source/data/xml/brkitr/zh.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2006-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/brkitr/zh_Hant.xml b/icu4c/source/data/xml/brkitr/zh_Hant.xml index 8043d5af4fd..287b9a5639d 100644 --- a/icu4c/source/data/xml/brkitr/zh_Hant.xml +++ b/icu4c/source/data/xml/brkitr/zh_Hant.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2006-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/collation/root.xml b/icu4c/source/data/xml/collation/root.xml index 2a101d9ae11..ee8fdfd35e2 100644 --- a/icu4c/source/data/xml/collation/root.xml +++ b/icu4c/source/data/xml/collation/root.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/xml/main/root.xml b/icu4c/source/data/xml/main/root.xml index c5809c16047..2fe964aa979 100644 --- a/icu4c/source/data/xml/main/root.xml +++ b/icu4c/source/data/xml/main/root.xml @@ -4,9 +4,9 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + %icu; ] > diff --git a/icu4c/source/data/zone/LOCALE_DEPS.json b/icu4c/source/data/zone/LOCALE_DEPS.json index d83f3bf7cd3..93facb19926 100644 --- a/icu4c/source/data/zone/LOCALE_DEPS.json +++ b/icu4c/source/data/zone/LOCALE_DEPS.json @@ -176,6 +176,7 @@ "es_VE": "es_419", "ff_Adlm": "root", "hi_Latn": "en_IN", + "ks_Deva": "root", "nb": "no", "nn": "no", "pa_Arab": "root", diff --git a/icu4c/source/data/zone/ks_Deva.txt b/icu4c/source/data/zone/ks_Deva.txt new file mode 100644 index 00000000000..deafaf3abf3 --- /dev/null +++ b/icu4c/source/data/zone/ks_Deva.txt @@ -0,0 +1,60 @@ +// © 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 +ks_Deva{ + %%Parent{"root"} + zoneStrings{ + "Etc:UTC"{ + ls{"कोऑर्डनैटिड यूनवर्सल वख"} + } + "Etc:Unknown"{ + ec{"नमोलुम शहर"} + } + "meta:America_Central"{ + ld{"सेंट्रल डे लाइट वख"} + lg{"सेंट्रल वख"} + ls{"सेंट्रल स्टैन्डर्ड वख"} + } + "meta:America_Eastern"{ + ld{"मशरिकी डे लाइट वख"} + lg{"मशरिकी वख"} + ls{"मशरिकी स्टैन्डर्ड वख"} + } + "meta:America_Mountain"{ + ld{"माउंटेन डे लाइट वख"} + lg{"माउंटेन वख"} + ls{"माउंटेन स्टैन्डर्ड वख"} + } + "meta:America_Pacific"{ + ld{"पेसिफिक डे लाइट वख"} + lg{"पेसिफिक वख"} + ls{"पेसिफिक स्टैन्डर्ड वख"} + } + "meta:Atlantic"{ + ld{"अटलांटिक डे लाइट वख"} + lg{"अटलांटिक वख"} + ls{"अटलांटिक स्टैन्डर्ड वख"} + } + "meta:Europe_Central"{ + ld{"मरकज़ी यूरपी समर वख"} + lg{"मरकज़ी यूरपी वख"} + ls{"मरकज़ी यूरपी स्टैन्डर्ड वख"} + } + "meta:Europe_Eastern"{ + ld{"मशरिकी यूरपी समर वख"} + lg{"मशरिकी यूरपी वख"} + ls{"मशरिकी यूरपी स्टैन्डर्ड वख"} + } + "meta:Europe_Western"{ + ld{"मगरीबी यूरपी समर वख"} + lg{"मगरीबी यूरपी वख"} + ls{"मगरीबी यूरपी स्टैन्डर्ड वख"} + } + "meta:GMT"{ + ls{"ग्रीनविच मीन वख"} + } + regionFormat{"{0} वख"} + regionFormatDaylight{"{0} डे लाइट वख"} + regionFormatStandard{"{0} स्टैन्डर्ड वख"} + } +} diff --git a/icu4c/source/data/zone/sr_Latn.txt b/icu4c/source/data/zone/sr_Latn.txt index db37880b62a..472b1428172 100644 --- a/icu4c/source/data/zone/sr_Latn.txt +++ b/icu4c/source/data/zone/sr_Latn.txt @@ -1224,6 +1224,9 @@ sr_Latn{ "Pacific:Johnston"{ ec{"Džonston"} } + "Pacific:Kanton"{ + ec{"Kanton"} + } "Pacific:Kiritimati"{ ec{"Kiritimati"} } diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 9910199a944..f83a6f142d8 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -1002,6 +1002,10 @@ static void VerifyTranslation(void) { log_knownIssue("cldrbug:14995", "mai/sd_Deva day names use chars not in exemplars")) { end = 0; } + if (uprv_strncmp(currLoc,"ks_Deva",7) == 0 && + log_knownIssue("cldrbug:15355", "ks_Deva day names use chars not in exemplars")) { + end = 0; + } for (idx = 0; idx < end; idx++) { const UChar *fromBundleStr = ures_getStringByIndex(resArray, idx, &langSize, &errorCode); @@ -1035,8 +1039,8 @@ static void VerifyTranslation(void) { log_knownIssue("cldrbug:14995", "sd_Deva month names use chars not in exemplars")) { end = 0; } - if (uprv_strncmp(currLoc,"ks",2) == 0 && - log_knownIssue("cldrbug:15341", "ks month names use chars not in exemplars")) { + if (uprv_strncmp(currLoc,"ks_Deva",7) == 0 && + log_knownIssue("cldrbug:15355", "ks_Deva month names use chars not in exemplars")) { end = 0; } diff --git a/icu4c/source/test/intltest/listformattertest.cpp b/icu4c/source/test/intltest/listformattertest.cpp index 831642241e6..5e3a63b0166 100644 --- a/icu4c/source/test/intltest/listformattertest.cpp +++ b/icu4c/source/test/intltest/listformattertest.cpp @@ -276,7 +276,7 @@ void ListFormatterTest::RunTestFieldPositionIteratorWithNItemsPatternShift( const char* testName) { IcuTestErrorCode errorCode(*this, testName); LocalPointer formatter(ListFormatter::createInstance( - Locale("ur", "IN"), + Locale("ur", "IN"), // in CLDR 41 alpha1 the "backwards order" patterns in this and other locales were removed. ULISTFMT_TYPE_UNITS, ULISTFMT_WIDTH_NARROW, errorCode)); @@ -329,21 +329,21 @@ void ListFormatterTest::TestFieldPositionIteratorWith3Items() { } void ListFormatterTest::TestFieldPositionIteratorWith3ItemsPatternShift() { - // 0 1 - // 012345678901234 - // "cc bbb a" + // Note: In CLDR 41 alpha1 the "backwards order" patterns in ur_IN (and one or two + // other locales) were removed, ur_IN now just inherits list patterns from ur. + // So this test may no longer be interesting. UnicodeString data[3] = {"a", "bbb", "cc"}; int32_t expected[] = { - ULISTFMT_ELEMENT_FIELD, 7, 8, - ULISTFMT_LITERAL_FIELD, 6, 7, + ULISTFMT_ELEMENT_FIELD, 0, 1, + ULISTFMT_LITERAL_FIELD, 1, 3, ULISTFMT_ELEMENT_FIELD, 3, 6, - ULISTFMT_LITERAL_FIELD, 2, 3, - ULISTFMT_ELEMENT_FIELD, 0, 2 + ULISTFMT_LITERAL_FIELD, 6, 12, + ULISTFMT_ELEMENT_FIELD, 12, 14 }; int32_t tupleCount = sizeof(expected)/(3 * sizeof(*expected)); RunTestFieldPositionIteratorWithNItemsPatternShift( data, 3, expected, tupleCount, - u"cc bbb a", + u"a، bbb، اور cc", "TestFieldPositionIteratorWith3ItemsPatternShift"); } @@ -365,19 +365,19 @@ void ListFormatterTest::TestFieldPositionIteratorWith2Items() { } void ListFormatterTest::TestFieldPositionIteratorWith2ItemsPatternShift() { - // 0 1 - // 01234567890 - // "cc bbb" + // Note: In CLDR 41 alpha1 the "backwards order" patterns in ur_IN (and one or two + // other locales) were removed, ur_IN now just inherits list patterns from ur. + // So this test may no longer be interesting. UnicodeString data[2] = {"bbb", "cc"}; int32_t expected[] = { - ULISTFMT_ELEMENT_FIELD, 3, 6, - ULISTFMT_LITERAL_FIELD, 2, 3, - ULISTFMT_ELEMENT_FIELD, 0, 2 + ULISTFMT_ELEMENT_FIELD, 0, 3, + ULISTFMT_LITERAL_FIELD, 3, 8, + ULISTFMT_ELEMENT_FIELD, 8, 10 }; int32_t tupleCount = sizeof(expected)/(3 * sizeof(*expected)); RunTestFieldPositionIteratorWithNItemsPatternShift( data, 2, expected, tupleCount, - u"cc bbb", + u"bbb اور cc", "TestFieldPositionIteratorWith2ItemsPatternShift"); } diff --git a/icu4c/source/test/intltest/transtst.cpp b/icu4c/source/test/intltest/transtst.cpp index 0538c135aeb..aaf283f7a4e 100644 --- a/icu4c/source/test/intltest/transtst.cpp +++ b/icu4c/source/test/intltest/transtst.cpp @@ -3654,19 +3654,35 @@ void TransliteratorTest::TestIncrementalProgress(void) { // 1. Devanagari-Arabic // 2. Any-*/BGN // 2a. Any-*/BGN_1981 - // 3. Any-*/UNGEGN - // 4. Any-*/MNS - // If UCONFIG_NO_BREAK_ITERATION is on, Latin-Thai is also not expected to work. + // 3. Any-*/MNS + // + // 4. If UCONFIG_NO_BREAK_ITERATION is on, Latin-Thai is also not expected to work. + // + // The following are direction="both" transforms with variants, inverting the Any-Xxxx/Variant for + // any of these does not work; see ICU-21911 (not sure whether this is intentional or an ICU bug). + // Unfortunately we do not easily have the info at this point as to whether the original transform + // had direction="both" specified. + // 5. Any-*/UNGEGN + // 6. Any-Ethiopic/* + // 7. Any-Braille/* + // 8. Any-*/Gurage_2013 + // 9. Any-*/Gutgarts + // 10. Any-*/Tekie_Alibekit + // 11. Any-*/Xaleget + // if ( id.compare((UnicodeString)"Devanagari-Arabic/") != 0 && !(id.startsWith((UnicodeString)"Any-") && - (id.endsWith((UnicodeString)"/BGN") || id.endsWith((UnicodeString)"/BGN_1981") || id.endsWith((UnicodeString)"/UNGEGN") || id.endsWith((UnicodeString)"/MNS")) + (id.endsWith((UnicodeString)"/BGN") || id.endsWith((UnicodeString)"/BGN_1981") || id.endsWith((UnicodeString)"/MNS")) ) #if UCONFIG_NO_BREAK_ITERATION && id.compare((UnicodeString)"Latin-Thai/") != 0 #endif - && !(logKnownIssue("15337", "Ethiopic transforms new in CLDR 41 fail inverse test ") && - (id.startsWith((UnicodeString)"Any-Ethiopic/") || id.startsWith((UnicodeString)"Any-byn_") || id.startsWith((UnicodeString)"Any-Braille/") || - id.endsWith((UnicodeString)"/Gurage_2013") || id.endsWith((UnicodeString)"/Gutgarts"))) + && !(logKnownIssue("21911", "ICU4C cannot create inverse of Any-Xxxx/Variant transform created from both-direction transform") && + id.startsWith((UnicodeString)"Any-") && + (id.endsWith((UnicodeString)"/UNGEGN") || id.startsWith((UnicodeString)"Any-Ethiopic/") || id.startsWith((UnicodeString)"Any-Braille/") || + id.endsWith((UnicodeString)"/Gurage_2013") || id.endsWith((UnicodeString)"/Gutgarts") || id.endsWith((UnicodeString)"/Tekie_Alibekit") || + id.endsWith((UnicodeString)"/Xaleget")) + ) ) { errln((UnicodeString)"FAIL: Could not create inverse of " + id + ", status " + u_errorName(status)); diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index ca62e9d0332..d8d175dd794 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:a2023c8c2492957393643b34d6b9396060acb3dd8d66d28bf023d118ea03eab7 -size 13867661 +oid sha256:62f6bb6255440bed5ea35dd659ba59dc4d3034ecfd53fae6790be0fcbc3f9eff +size 13873153 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 669f41ed5b7..405db7a6c93 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:1bbf45782f7b1026b5ead53ffa5c1d77bb2dc8e45bdf8774be2dae31855a6e63 -size 96440 +oid sha256:379538ae9348bb63b1a4f1c1314f1513acadd72c6b9630af8dc9e4cc0465ea57 +size 96439 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 9b3f04cac48..f11e00cb726 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:26b283b1ea008e2750b1dfcfc1150fce21dc5fcbdcb4f79b1a9148e18ce926f1 -size 826064 +oid sha256:67aa8c24114eb601f3fa722c490dd07fe236a1205591e6672706e7d93c5e4767 +size 826063 diff --git a/tools/cldr/cldr-to-icu/build-icu-data.xml b/tools/cldr/cldr-to-icu/build-icu-data.xml index a720dec8a8e..b4a160b3fe8 100644 --- a/tools/cldr/cldr-to-icu/build-icu-data.xml +++ b/tools/cldr/cldr-to-icu/build-icu-data.xml @@ -47,10 +47,10 @@ - + - + @@ -187,7 +187,7 @@ // K ka, kab, kam, kde, kea, kgp, khq, ki, kk, kkj, kl, kln, km, kn, ko, kok, ks - ks_IN, ksb, ksf, ksh, ku, kw, ky + ks_Deva, ks_IN, ksb, ksf, ksh, ku, kw, ky // L lag, lb, lg, lkt, ln, lo, lrc, lt, lu, luo, luy, lv diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index 3ee39c864dc..896f068d5ec 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -83,7 +83,7 @@ com.ibm.icu icu4j-for-cldr - 70.0.1-SNAPSHOT-cldr-2021-08-11 + 70.1-cldr-2022-02-08 diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java index 85de60e9f96..75d44de78db 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java @@ -662,6 +662,8 @@ public final class LdmlConverter { .put("boundaries", BRKITR) .put("dictionaries", BRKITR) .put("exceptions", BRKITR) + .put("extensions", BRKITR) + .put("lstm", BRKITR) // COLL .put("collations", COLL) .put("depends", COLL) diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java index 2da26e761b9..d10d1726134 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java @@ -43,6 +43,8 @@ public final class BreakIteratorMapper { specials.addValueAction("icu:boundaries/*", BreakIteratorMapper::addBoundary); specials.addValueAction( "icu:dictionaries/icu:dictionary", BreakIteratorMapper::addDictionary); + specials.addValueAction( + "icu:extensions/icu:extension", BreakIteratorMapper::addExtension); specials.addValueAction( "icu:lstm/icu:lstmdata", BreakIteratorMapper::addLstmdata); CLDR_PROCESSOR = processor.build(); @@ -80,6 +82,7 @@ public final class BreakIteratorMapper { } private void addSuppression(CldrValue v) { + //System.out.println("addSegmentation: " + v.toString()); // debug String type = SEGMENTATION_TYPE.valueFrom(v); // TODO: Understand and document why we escape values here, but not for collation data. icuData.add( @@ -87,19 +90,26 @@ public final class BreakIteratorMapper { } private void addBoundary(CldrValue v) { + //System.out.println("addBoundary: " + v.toString()); // debug addDependency(getDependencyName(v), getBoundaryType(v), getBoundaryDependency(v)); } private void addDictionary(CldrValue v) { - //System.out.println("addDictionary: " + v.toString()); + //System.out.println("addDictionary: " + v.toString()); // debug addDependency( getDependencyName(v), DICTIONARY_TYPE.valueFrom(v), DICTIONARY_DEP.optionalValueFrom(v)); } + private void addExtension(CldrValue v) { + //System.out.println("addExtension: " + v.toString()); // debug + icuData.add( + RbPath.of("extensions"), v.getValue()); + } + private void addLstmdata(CldrValue v) { - //System.out.println("addLstmdata: " + v.toString()); + //System.out.println("addLstmdata: " + v.toString()); // debug addDependency( getDependencyName(v), LSTMDATA_TYPE.valueFrom(v),