diff --git a/icu4c/source/common/uloc_keytype.cpp b/icu4c/source/common/uloc_keytype.cpp index c289ebe76ff..ed76ffa01f3 100644 --- a/icu4c/source/common/uloc_keytype.cpp +++ b/icu4c/source/common/uloc_keytype.cpp @@ -222,6 +222,11 @@ initFromResourceBundle(UErrorCode& sts) { if (U_FAILURE(sts)) { break; } + // TODO: For now we skip loading entries mapping to metazone short ids, + // which have 4 characters. + if (isTZ && uBcpTypeId.length() == 4) { + continue; + } // empty value indicates that BCP type is same with the legacy type. const char* bcpTypeId = legacyTypeId; diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index 986447e4797..93ba253d715 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -201,6 +201,16 @@ ant copy-cldr-testdata # and add the following line to the beginning of these two files # # File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt +# 4e. For the time being, manually re-add the lstm entries in data/brkitr/root.txt + +open $ICU4C_DIR/source/data/brkitr/root.txt + +# paste the following block at the end, after the dictionaries block> + lstm{ + Thai{"Thai_graphclust_model4_heavy.res"} + Mymr{"Burmese_graphclust_model5_heavy.res"} + } + # 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 # list seems reasonable. diff --git a/icu4c/source/data/lang/en.txt b/icu4c/source/data/lang/en.txt index d9c15c30d1b..5de9e43cb75 100644 --- a/icu4c/source/data/lang/en.txt +++ b/icu4c/source/data/lang/en.txt @@ -954,6 +954,13 @@ en{ no{"Sort Digits Individually"} yes{"Sort Digits Numerically"} } + colReorder{ + currency{"Currency"} + digit{"Digits"} + punct{"Punctuation"} + space{"Whitespace"} + symbol{"Symbol"} + } colStrength{ identical{"Sort All"} primary{"Sort Base Letters Only"} @@ -1065,13 +1072,6 @@ en{ viqr{"Vietnamese VIQR Keyboard"} windows{"Windows Keyboard"} } - kr{ - currency{"Currency"} - digit{"Digits"} - punct{"Punctuation"} - space{"Whitespace"} - symbol{"Symbol"} - } kv{ currency{"Ignore Symbols affects spaces, punctuation, all symbols"} punct{"Ignore Symbols affects spaces and punctuation only"} diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index b2b66b429f1..fbe18156cd8 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -25,9 +25,11 @@ langInfo:table(nofallback){ "bgm","bcg", "bh","bho", "bhk","fbl", + "bic","bir", "bjd","drl", "bjq","bzc", "bkb","ebk", + "blg","iba", "btb","beb", "bur","my", "bxk","luy", @@ -157,6 +159,7 @@ langInfo:table(nofallback){ "ojg","oj", "ory","or", "oun","vaj", + "pat","kxr", "pbu","ps", "pcr","adx", "per","fa", @@ -397,6 +400,7 @@ langInfo:table(nofallback){ "bkq","Latn","ZZ", "bku","Latn","PH", "bkv","Latn","ZZ", + "iba","Latn","MY", "blt","Tavt","VN", "bm","Latn","ML", "bmh","Latn","ZZ", @@ -752,7 +756,6 @@ langInfo:table(nofallback){ "ia","Latn","001", "ian","Latn","ZZ", "iar","Latn","ZZ", - "iba","Latn","MY", "ibb","Latn","NG", "iby","Latn","ZZ", "ica","Latn","ZZ", @@ -1877,12 +1880,12 @@ langInfo:table(nofallback){ trie:bin{ 001a6dcc1374c4f977c26777a2b778a4 5279a4c27a0f6d7d7a5c7a30e1ad9fe8 -2ef5af4210e1a539022a3c42cc1c4811 -616e01e2a3fdf4a3f80b4d25540e54ca -c9552a5610cea3fb10d3a3fa4dd81e70 -502a5310d2a3f602c1a3f5c6a3f3c8a3 -f447d4d8473248d81e524910c4a3f101 -c2a3f9c6a3ef6d326e36733a7910e2ad +2ef5af4210e1a53a022a3c42cc1c4811 +616e01e2a3fef4a3f90b4d25540e54ca +c9552a5610cea3fc10d3a3fb4dd81e76 +502a5310d2a3f702c1a3f6c6a3f4c8a3 +f547d4d8473248d81e584910c4a3f201 +c2a3fac6a3f06d326e36733a7910e2ad 9f10e9af4010e5af4110ed22012aa90f 4310c3a9106817683269366b3a6c10ed af3f10f8adbc10e1af3e10f4ad9a6132 @@ -1895,10 +1898,10 @@ e7ad8aebaf0a10efaf0202e3af03e9af 266736683a693e6a4e6c10f3af0110e9 adfa10e7adfb02e2adfcf5adfdf6adfe 01e1adffe9af006138625463646501ec -a520f2adf904e5adf0eaadf1ecadf2ee +a521f2adf904e5adf0eaadf1ecadf2ee adf3f2adf402f0adf5f1adf6f2adf710 e9adf80c6e3d7221722e7332774ee8af -1210e2af1804e1adc2e9af19eca52fed +1210e2af1804e1adc2e9af19eca530ed af1af2af1b10e5af1c6e346f3e7001e5 a78ef2adc001e1adbaf2af1501e7af16 eeaf17651d653a6c3e6d02e6af14eead @@ -1937,7 +1940,7 @@ c0e7abc1f1abc202ecabb4f2abb5f4ab b602e6abb8f8abb9f9abba01e8abbbf9 abbc10e8abbe6546655e667467786888 6906eb0cebabafedabb0efabb1f6abb2 -e2a3b1e6abade7abae03e4ab9eedab9f +e2a3b2e6abade7abae03e4ab9eedab9f efaba0f4aba110e9aba202e3aba5efab a6f5aba702ecaba9f1abaaf2abab6144 625a63866403e4ab99e7ab9ae8ab9bf5 @@ -1949,7 +1952,7 @@ e70ce7ab93efab94f7ab95faab96e3ab 022aabe94b2a4d10ceabeb10daabea73 607464766e7a10ee012a2e41127261e2 adde022aabf8412a4310ceaddf10c6ad -de10e1adda01e8a54af2addb01e8addc +de10e1adda01e8a54bf2addb01e8addc ecaddd6d326d3e6e426f707202e9add7 f4add8f7add910e2abef01f226f8add5 012a2e44126576e1add4012aadd34e10 @@ -1964,10 +1967,10 @@ ab55edab5aeeab61efab67f16de429e4 3744324b3a5312696ee4ab3a126576e1 ab3812686feaab397834793e7a48e1ab 21e3ab2c01eeab87f7ab8801ecab89f2 -a50c10ecab8a6cad724f725873747484 +a50d10ecab8a6cad724f725873747484 758e7705e809e8ab81f0ab85f6ab86e2 ab82e3ab83e7ab8404e2ab70e3ab2cee -ab71f2ab72f8a5f202e4ab74e7ab75f9 +ab71f2ab72f8a5f302e4ab74e7ab75f9 ab7601ebab78f1ab7904e1ab7be5ab7c ebab7df2ab7ef3ab7f6c4a6d666e8c6f a2437003e4ab6decab6ef3ab6ff9a775 @@ -1983,7 +1986,7 @@ ab6bf9ab6c673e67426858696e6a846b e6ab3ee8ab3fe9ab40f3ab4106f30cf3 ab25f4ab26f6ab27faab28e6ab22e8ab 23f1ab2402e1ab29e5ab2af0ab2b06ee -0ceeab34efab35f2a700f3ab36e32ceb +0ceeab34efab35f2a701f3ab36e32ceb ab32ecab3322055211522e53325410d2 ab3110cfab3010d5ab2e2aab2d312a4d 10c5ab2f1137b2ab2e01e3ab3be8ab3c @@ -1997,7 +2000,7 @@ f4a9f110eea9f266306b176b2e6c386d 10f3a9ee01e1a9eaefa9eb01e1a9edf4 a92f663468386901eca9e8f0a9e910ec a9e501eca9e6eea9e7614e627e638864 -926504e4a9e2efa9e3f2a571f3a571f8 +926504e4a9e2efa9e3f2a572f3a572f8 a9e404e7a9d6ec32eda9d9f0a9daf5a9 db012aa9d75012686cf0a9d801e9a9dc f5a9dd01e4a9deeda9df01e3a9e0f4a9 @@ -2013,20 +2016,20 @@ f4ab0c03e6ab0eefab0ff4ab10f5ab11 61366346654a675a6810e7ab0702e9ab 00eaa95fefab0110e6ab0202eaab03ec ab04f3ab0510eeab066da25c6ea6366f -0c7422e30ce3a9c3eda5a2f2a9cbf3a9 +0c7422e30ce3a9c3eda5a3f2a9cbf3a9 ce742e75387a10eda9d301e1a9d0eba9 d110e9a9d27017702e72327310e1a9cf 10eda9ca02efa9ccf5a9cdf9a9cb673a 6b3e6e02e7a9c7eea9c8f3a9c910e3a9 c401f2a9c5f6a9c60022749fe926ef0f -efa94af2a955f3a485f4a959f9a3cee9 +efa94af2a955f3a485f4a959f9a3cfe9 a90ceba906eca93fee012ababc4d126f -6ee7a540783d7834793e7a64e7a92fe8 +6ee7a541783d7834793e7a64e7a92fe8 a93501e3a968eda96905f709f7a96df8 a96efaa96feba96aeda96bf6a96c05f0 09f0a973f7a974faa975eba970eda971 eea9727444755a76707703eba965f2a5 -37f6a966f7a96703e3a95ae6a95be9a9 +38f6a966f7a96703e3a95ae6a95be9a9 5cf2a95d03e1a95ef0a95ff2a960f3a9 6102e1a962eea963f9a96469786e446e 426f5e707a71907202e4a956eaa957ef @@ -2037,7 +2040,7 @@ eca954693e6b4e6c646d02efa943f5a9 44f8a94502e6a938eea939f7a93a03e9 a93beca93cf0a93df7a93e02e5a940f0 a941f3a9426549653e666a67866802e9 -a936eca937f2a3ff06ee0ceea926f2a9 +a936eca937f2a50006ee0ceea926f2a9 27f4a928f5a929e4a923e5a924eba925 04e1a92ae5a92beea92cefa92df1a92e 04e8a930eca931efa932f0a933f9a934 @@ -2050,7 +2053,7 @@ a907e6a90804e8a912efa913f1a914f5 a915f7a91604e9a917f0a918f1a919f2 a91af5a91b0021745fe41dee0feea9a0 efa9a6f2a9adf6a9bbf9a9bfe4a985e5 -a988e7a98deca54c791579307a3ae1a9 +a988e7a98deca54d791579307a3ae1a9 76e2a97e01eda9c0eea9c110e9a9c274 387542775e7801f1a9bdf2a9be01eda9 b4f2a9b504e9a9b6f0a9b7f3a9b8f6a9 @@ -2074,7 +2077,7 @@ efa7f4f4a7fcf5a7fef6a902e7a7dee9 a7e0eea7f1771577307a34e1a7c9e2a7 d010eca90301e8a904faa905742e7532 7610f3a90210e7a7fd03e1a7ffefa900 -f9a3d5faa9016a4a6d316d326e426f4c +f9a3d6faa9016a4a6d316d326e426f4c 7210e3a7fb02eea7eeefa7eff0a7f001 f3a7f2f5a7f305f209f2a7f8f3a7f9fa a7faeaa7f5eba7f6eca7f76a346b386c @@ -2087,17 +2090,17 @@ a7d7e5a7d8eda7d910e7a7df6134625a 6301eda7d4f0a7d505e809e8a7cdeaa7 cef3a7cfe2a7cae4a7cbe7a7cc02e5a7 d1f5a7d2f7a7d300197739eb17f30cf3 -a70ef4a726f5a71af7a727eba568eea7 +a70ef4a726f5a71af7a727eba569eea7 21efa723e409e4a710e7a715e9a71877 -2a7a34e1a70701eda728f3a72901e8a7 +2a7a34e1a70801eda728f3a72901e8a7 2ae9a72b6a366d176d326e366f3a7210 e9a72510efa72010e8a72210f5a7246a 2e6b326c10efa71f10eaa71904e5a71a eba71bf4a71cf7a71df8a71e641a6434 66446701e2a716e5a71702e4a711e9a7 12f5a71310e5a714613a62446302e1a7 -0de5a70ee8a70f01eea708f2a70902e1 -a70ae2a70bf9a70c0b721ae909e9a734 +0de5a70ee8a70f01eea709f2a70a02e1 +a3a7e2a70bf9a70c0b721ae909e9a734 f6a73af7a73b722a752ee1a72c10e1a7 3810f4a73967176734693e6d01e3a736 eca73701eba72fefa73310e2a735612e @@ -2110,7 +2113,7 @@ c210cea7c1127261e2a7c1f2a785f3a7 eb38eca774eda779eea784efa789012a 2e41127261e2a76f042aa76d41324336 493a4d10cea77110c6a76e10cea76f10 -d2a7707a1b7a38e1a5b1e7a758e9a764 +d2a7707a1b7a38e1a5b2e7a758e9a764 eaa76803e8a7c5eaa7c6f2a7c7f4a7c8 753c766e777e788e7901e5a7c3f8a7c4 07ed0ceda7adeea7aef0a7aff3a7b0e2 @@ -2143,358 +2146,358 @@ a73ee4a73f05f109f1a747f8a748f9a7 49e4a744eda745f0a74603e7a74aeba7 4beca74cf4a74d03e5a74ee8a74feca7 50f4a75166a2b567a46a6800137539f2 -0ff2a700f4a703f5a704f9a342faa706 -7536e13ae5a5eae9a5ecefa5fc10e9a7 -0522032aa5e0372e43345310c4a5e111 -33b6a5e110cda5e26c386c3c6d466e50 -6f6c7301e2a701eea70201e1a5f3f5a5 -f401e4a5f5f4a5f604e4a5f7e5a5f8ea -a5f9eea5faefa5fb02e3a5fdeaa5fef4 -a5ff615862746478687c6905e809e8a5 -f0eca5f1eda5f2e1a5ede6a5eee7a5ef -04e7a5e3eba5e4eda5e5f7a5e6faa5e7 -10e2a5e810f9a5e910f9a5eb00117553 -e90fe9a57beaa57fefa582f2a588f9a5 -9775427694e1a571e6012aa577411264 -6ceda57809e80fe8a591f1a592f2a593 -f6a594f9a595e2a58de332e4a58ee5a5 -8fe6a590012aa5774112646ceda57810 -f2a5966d2f6d4e6f52706271667204e3 -a589e5a588f0a58af2a58bf3a58c10f0 -a58102e4a583eea584f2a58510e5a586 -10f3a5876132665669606c10f2a58005 -e908e9a575eea576f467e1a572e2a573 -e7a57401e9a579eda57a02e1a57ceca5 -7df4a57e001a6e9f791dec0ceca5bdee -a5c1f5a5d1f6a5d9792ce1a598e4a5aa -01e1a5a3e9a5df733a733e7542767477 -02e3a5dce9a5ddf4a5de10f7a5d007f2 -0cf2a5d5f7a5d6f8a5d7faa5d8e2a5d2 -e3a5d3e4a5d4e7a5c102e6a5daf2a5b4 -f3a5db6e5a6f6a7204e2a5a6e332e5a5 -5bf4a5cef7a5cf012aa5cc4c12696ee2 -a5cd02e4a5c2e7a5c3efa5c407ee0cee -a5c4f2a5c9f3a5caf4a5cbe4a5c5e6a5 -c6e9a5c7eda5c8673c6a236a386b486c -526d01eda5bff6a5c002eba5b8eea5b9 -f5a5ba01eea5bbf0a5bc10eba5be6734 -683e6901eca5b6eda5b701eea5b4efa5 -6710f3a5b56428642e653e6610eba5b3 -02e5a5abeea5acf2a5ad05ef09efa5b1 -f2a52dfaa5b2e2a5aeeaa5afeca5b061 -2e626c6310f2a5a909ed0feda59eeea5 -9ff7a5a0f9a5a1faa5a2e1a599e6a59a -e7a59be8a59ceaa59d05ef09efa5a6f9 -a5a7faa5a8e1a5a3e6a5a4eda5a563c2 +0ff2a701f4a704f5a705f9a342faa707 +7536e13ae5a5ebe9a5edefa5fd10e9a7 +0622032aa5e1372e43345310c4a5e211 +33b6a5e210cda5e36c386c3c6d466e50 +6f6c7301e2a702eea70301e1a5f4f5a5 +f501e4a5f6f4a5f704e4a5f8e5a5f9ea +a5faeea5fbefa5fc02e3a5feeaa5fff4 +a700615862746478687c6905e809e8a5 +f1eca5f2eda5f3e1a5eee6a5efe7a5f0 +04e7a5e4eba5e5eda5e6f7a5e7faa5e8 +10e2a5e910f9a5ea10f9a5ec00117553 +e90fe9a57ceaa580efa583f2a589f9a5 +9875427694e1a572e6012aa578411264 +6ceda57909e80fe8a592f1a593f2a594 +f6a595f9a596e2a58ee332e4a58fe5a5 +90e6a591012aa5784112646ceda57910 +f2a5976d2f6d4e6f52706271667204e3 +a58ae5a589f0a58bf2a58cf3a58d10f0 +a58202e4a584eea585f2a58610e5a587 +10f3a5886132665669606c10f2a58105 +e908e9a576eea577f467e1a573e2a574 +e7a57501e9a57aeda57b02e1a57deca5 +7ef4a57f001a6e9f791dec0ceca5beee +a5c2f5a5d2f6a5da792ce1a599e4a5ab +01e1a5a4e9a5e0733a733e7542767477 +02e3a5dde9a5def4a5df10f7a5d107f2 +0cf2a5d6f7a5d7f8a5d8faa5d9e2a5d3 +e3a5d4e4a5d5e7a5c202e6a5dbf2a5b5 +f3a5dc6e5a6f6a7204e2a5a7e332e5a5 +5cf4a5cff7a5d0012aa5cd4c12696ee2 +a5ce02e4a5c3e7a5c4efa5c507ee0cee +a5c5f2a5caf3a5cbf4a5cce4a5c6e6a5 +c7e9a5c8eda5c9673c6a236a386b486c +526d01eda5c0f6a5c102eba5b9eea5ba +f5a5bb01eea5bcf0a5bd10eba5bf6734 +683e6901eca5b7eda5b801eea5b5efa5 +6810f3a5b66428642e653e6610eba5b4 +02e5a5aceea5adf2a5ae05ef09efa5b2 +f2a52efaa5b3e2a5afeaa5b0eca5b161 +2e626c6310f2a5aa09ed0feda59feea5 +a0f7a5a1f9a5a2faa5a3e1a59ae6a59b +e7a59ce8a59deaa59e05ef09efa5a7f9 +a5a8faa5a9e1a5a4e6a5a5eda5a663c2 f663a2a364a4fc6500127733ee19ee38 -efa564f3a566f4a559f5a366012aa560 -53126861f7a561773478387a3ce5a554 -eca55b10efa56e10f4a56f10e1a5706d -466d486e7a728473887403f2a56af4a5 -6bf5a56cf8a56d02e1a55ce9a55deb01 -2a2e4e126b6fefa55f012aa55e4710ce -a55f01eea562f1a56310e9a56502e7a5 -67eba568f5a569623e664267466b02e1 -a558eba559f9a55a10f5a55310e9a555 -01eca556f9a557001b725ce821f316f3 -a519f52cf6a51ff9a520012aa51d4712 -6c61e7a51ee8a3ebefa50ff2a5127712 -77307a34e1a3e1e5a3e710e4a51210e5 -a519722e73547410e4a51c05ec09eca5 -16eda517f3a518e8a513eaa514eba515 -01e2a51af7a51b69526c306c326d3c6f -6c7010f3a51101e1a50be4a50c02e5a5 -0de7a50eee022aa26342a2ae4811616e -01e2a3fdf4a3f810f0a51069406a446b -03e2a507eca508efa509f9a50a10e3a5 -0302e1a504eda505f6a506658f65a280 -66a28167a2826805ef09efa500f0a501 -f2a502e92ceba3feeda3ff022a3c42a2 -594811616e01e2a3fdf4a3f80b4d2d54 -17542e55385610c4a3fb01c8a3f7d7a3 -f801cba3f9d3a3fa4db4a5502a5310d2 -a3f602c6a3f3c8a3f4daa3f5470e4730 -48b4894910c4a3f110c6a3ef2aa3ec41 -2a4210cea3ee10d5a3ed126f70efa3fc -10e2a3e810e1a3e910e7a3ea6134623e -6301e8a3e5f0a3e601e4a3e2eea3e310 -eaa3e40017726f791ce508e5a52df6a5 -4dfa45792a7a34e1a52101efa550f5a5 -5110e7a552751d752e764a7710f7a54f -04e1a548e3a549e4a54ae7a54bf4a54c -10e1a54e724073747403eda544f0a545 -f3a546f9a54702e82ce9a541f3a54201 -2a2e4d126f6ee7a540012aa53f4310ce -a54010e2a543682d6d176daac66e3c6f -03e2a53ce9a534f0a53df7a53e10eaa5 -23682e69326a10e5a53a10e4a53701e1 -a538f1a53964286456655a6706ec0cec -a533efa534f2a535faa536e1a530e8a5 -31e9a53210eea52c01e4a52eeea52f61 -2e625a6310e3a52b06e80ce8a525eba5 -26f2a527f6a528e4a522e6a523e7a524 -01e4a529f1a52a2aa4f761beca620023 -73a5e51ded0feda3a8eea3adefa3b1f2 -a3baf3a3bfe5a37ce7a389e8a38de9a3 +efa565f3a567f4a55af5a366012aa561 +53126861f7a562773478387a3ce5a555 +eca55c10efa56f10f4a57010e1a5716d +466d486e7a728473887403f2a56bf4a5 +6cf5a56df8a56e02e1a55de9a55eeb01 +2a2e4e126b6fefa560012aa55f4710ce +a56001eea563f1a56410e9a56602e7a5 +68eba569f5a56a623e664267466b02e1 +a559eba55af9a55b10f5a55410e9a556 +01eca557f9a558001b725ce821f316f3 +a51af52cf6a520f9a521012aa51e4712 +6c61e7a51fe8a3ecefa510f2a5137712 +77307a34e1a3e2e5a3e810e4a51310e5 +a51a722e73547410e4a51d05ec09eca5 +17eda518f3a519e8a514eaa515eba516 +01e2a51bf7a51c69526c306c326d3c6f +6c7010f3a51201e1a50ce4a50d02e5a5 +0ee7a50fee022aa26342a2ae4811616e +01e2a3fef4a3f910f0a51169406a446b +03e2a508eca509efa50af9a50b10e3a5 +0402e1a505eda506f6a507658f65a280 +66a28167a2826805ef09efa501f0a502 +f2a503e92ceba3ffeda500022a3c42a2 +594811616e01e2a3fef4a3f90b4d2d54 +17542e55385610c4a3fc01c8a3f8d7a3 +f901cba3fad3a3fb4db4ab502a5310d2 +a3f702c6a3f4c8a3f5daa3f6470e4730 +48b48f4910c4a3f210c6a3f02aa3ed41 +2a4210cea3ef10d5a3ee126f70efa3fd +10e2a3e910e1a3ea10e7a3eb6134623e +6301e8a3e6f0a3e701e4a3e3eea3e410 +eaa3e50017726f791ce508e5a52ef6a5 +4efa45792a7a34e1a52201efa551f5a5 +5210e7a553751d752e764a7710f7a550 +04e1a549e3a54ae4a54be7a54cf4a54d +10e1a54f724073747403eda545f0a546 +f3a547f9a54802e82ce9a542f3a54301 +2a2e4d126f6ee7a541012aa5404310ce +a54110e2a544682d6d176daacc6e3c6f +03e2a53de9a535f0a53ef7a53f10eaa5 +24682e69326a10e5a53b10e4a53801e1 +a539f1a53a64286456655a6706ec0cec +a534efa535f2a536faa537e1a531e8a5 +32e9a53310eea52d01e4a52feea53061 +2e625a6310e3a52c06e80ce8a526eba5 +27f2a528f6a529e4a523e6a524e7a525 +01e4a52af1a52b2aa4fd61bed0620023 +73a5e51ded0feda3a9eea3aeefa3b2f2 +a3bbf3a3c0e5a37ce7a389e8a38de9a3 9377417732783c794c7a72e1a36201e4 -a3d2f2a3d302e8a3d4eba3d5f2a3c705 -f309f3a3d9f6a3daf8a3dbe5a3d6eea3 -d7f2a3d804e1a3dce5a3dde6a3dee8a3 -dff7a3e07332744875587610e2a3d103 -eaa3c0f1a3c1f3a3c2f4a3c302efa3c4 -f4a3c5f6a3c609ed0feda3ccefa3cdf2 -a3cef3a3cff5a3d0e1a3c7e3a3c8e4a3 -c9e7a3caeba3cb6a7d6e3b6e486f5870 -68716c7203e1a3bbe8a3bcf8a3bdfaa3 -be02e7a3aeeda3aff0a3b002eaa3b2ed -a3b3eea3b410f9a3b503e3a3b6e9a3b7 -f0a3b8f6a3b96a466b786ca4bd6d03e8 -a3a9eba3aaf1a3abf5a3ac07ef0cefa3 -9ef2a39ff4a3a0faa3a1e8a39ae9a39b -eaa39ceea39d04e3a3a2eda3a3f1a3a4 -f5a3a5f6a3a6656a6562669467a24468 -a24b6906ed0ceda396eea397efa398f1 -a399e2a394e7a395eba37507f40cf4a3 -81f7a382f8a383faa384e6a37de8a37e -eaa37feda38003e4a385f1a386f4a387 -f9a38802e3a38aeea38bf8a38c05ec09 -eca391efa38df9a392e2a38ee7a38fe9 -a3906132626463906410e4a37b07f20c -f2a367f3a368f6a369f8a36aeca363ee -a364f0a365f1a36606e40ce4a36eeaa3 -6ff0a370f2a371e1a36be2a36ce3a36d -09ed0feda376eea377efa378f1a379f5 -a37ae3a363e6a372e8a373e9a374eca3 -7500184dc28354c0e157365736584e59 -645a12616ee2add201612c631168efa9 -a51172e1add101702a731175f8691165 -efa9e301652c691169e9a718117ae9a7 -80544455a29e5601612c691174e8add0 -1169e9adcf07684e683669866ea2426f -1174efabe1106101e158e9042aaba843 -324b364c3a5410c8aba810cea7d510c8 -adcc10c1adcd012aa54d4d10d6a54d01 -622a7210e8adce10f4012aa3b14210d4 -451173e1a9b361346580668667116ce7 -adcb056d116d2e6e327610f4a3a710ec -ab8b10e7abe067346b386c01e5ab99f5 -a75d10e2adc810f2adc9116cf5ab9d11 -6ee7adca126761f2abec50c0c350a272 -52a2a85306694369426f6a759079016c -2a7210e3a50c10efadc701643e6e01e4 -ab3ae8012aab4b4c10cbab4b10e4adc4 -02672e72387910efa50e01e4ab68efad -c510e1ab70116ee4adc6613e675e6801 -612a7210e4adc310f7a561026d2e7232 -7510f2ab2810f2ab5e10e2adc2116ef7 -a34b046138654a68506c76721174e9ad -c0016c2a7510e3a51c10eda11172edad -be02612e6c326e10f8a9e710e7adbf01 -e9a9d7f0a9d81172e4a5f5026a306f36 -75116ef2a9a9116ee7adc11168e7ab07 -4d8a4ea2ab4f0467386c3e7244735875 -1167f2a9d21161edab431163ebab2601 -6b2a7910e1a9cb10e8a9d101672a6d10 -e1adbd10e5a9cf07722e725a74607566 -79116df2032aa3ce492e4d325410c8ad -b810cea76110cda3ce116fefa9581165 -e9adb6116cf4adb7614265746c9a6f01 -642a6e10e7a54010e9adb50368326b36 -6e3a7210e3adb110eaadae10e1adaf01 -e4a96fe9adb00264346e387201e3adb3 -efadb410e6a53b10e4adb21179eda93f -046138624c65506b56731168f5adbc01 -6e2a7210e2adba10e4adb91161f49f11 -77e1adbb116fefa55f47c4154ac32f4a -a6c04ba6d94c03614665a69c69a69e79 -01632a6410e9adad10e9adac026ea679 -6fa67a7410ee001a4bc139545b571457 -ac7858ac7c59305a01c1abf4d7ab6110 -d4ad68544055825603c1ad63c5ad65ce -ad64d5a3930bce14d609d6abdcd7abc9 -daab81ceadaacfabbfd2abc7cbc5dccb -abb4ccad5fcdabb304c1adabc7ad61d3 -a560d9ad62daabf84e824e8a50a24a52 -a26d530cce17d40cd4ad59d5a79bd6ad -5ad9ada9cead57cfab67d2ad58ca09ca -ad55cbab51cdad56c3ad54c5ab80c9ab -5506c70cc7abf0c9ad47cca54ccfa97e -c1ad44c3ad45c5ad460acc14d409d4ad -50d7a9dbd9a5c1cca9eccdad4dd2ad4e -c1ad49c5ad4ac6ad4bc7abc3c8a57d03 -c5ad53cfa94ad5a79bd7ab1d4b9e4ca2 -434d0010cd1dd40fd4a959d5a92bd8ab -f2d9a90fdaad43cda73ecfada7d1ad41 -d2ada8c60cc6ad40c7a92fcbada6cca3 -a8c1ada5c3ad3ec4ad3fc5ab2f01c5ad -33cdada404c9ad39d3ad3ad4a7fcd5ad -3bd6a90243c0c246644656476648a24d -4905d209d2ada3d3a70ed4a726c3ad30 -c4a710c5ad2402c9a57bcfa582d2a588 -0cce17d30cd3ad2bd4ad2cd5abf7d7ad -2dcead28d0ad29d1ad2ac608c6ad27c8 -67cca774c1ad26c2abfac5ada204cdad -2ecead2fd2a700d4a703d5a704435244 -a2424505d309d3a566d4ad9cdaad25c1 -ad20c3ad21c5a5590fcf1ad60cd6ad1b -d7abfcd9ada0daa519cfad18d0ad19d2 -ad1ad5abf5c9c694c9ad15ccad16cdad -17cead9f05cb09cba521cfad1edaada1 -c5a52dc7ad52caad1d345e34ae8f4178 -420bce14d209d2a9f9d5a73ed6ad11ce -ad0ecfad0fd1ad10c909c9ab12caad0c -ccad0dc1a3bfc5ad09c6ad0a0cd217d5 -0cd5abf1d7ad07d8ad08daa35ed2ad04 -d3ad05d4ad06cd09cdad9ecfad02d1ad -03c4abffc6ad9dcc6d2aa560312c3211 -33b0ad9c1137b2a79b10e1a9a710ef01 -2aa7f44c10c1a7f41170e3a7da026d2e -6e327310f5a7e810e2a7e401e1a7cae2 -a5cd01613a701161ee012aa72c4a10d0 -a72c016d2a7610e1ad9810efad97056e -1e6e306f36741168e9ad9b1164e1a784 -1172e5012aa7894b01d0ad35d2a78961 -306844691174f3ad9a016c2a6e10e1ad -9910e9a55a02612e6d326f10eaab3910 -f2a9f510f2012aa7794b10c8a7794734 -48a25c49127461eca56b0465466c5a6f -60727a75016a2a7210f5a9d410f2a5d1 -116ff2012aa5b14710c5a5b11161e7a5 -1e016e2a7410e8a5cb01e7ad8aeda567 -0161506510eb032aa55b432e47325410 -d2a38c10d9ad1c10d2a55b10eead8b05 -6c186c306d3675116ee7ad961175f7a5 -f4106e01e7ad95f0a5f9613065906911 -72e1ad94106e05ef24efad8ef34cf403 -2aa3f8482e4d325410d7a3f810cba3f0 -10cfa3f2012aa3ec4310cea3ece2a3fd -e7ad8ce9ad8d1162f2054917493a533e -5502c1ad92cbad90d3ad9310cca5ea10 -c5ad912aa5ea432a4710c2ad9010c1ad -8f43c115437044a2ce450267406c4674 -1168e9012a754501d2ad23d4751179f0 -a55701622a7910edad8910e1ad880461 -a26968a2786fa28770a289791172ec0a -4d335414542e55385810cbad8101caab -a3d2ad8010c1abed4d2e523e5310cbad -7f02c4ad7dcba906cea53f02cfad7ed3 -ab2dd5ab1a2aab1a4138423c474c4b01 -c7a7c0daad3710ccad7a02c1ad7bc7a3 -89d9a37c01c5a9ced2ad7c026b2e6e32 -7210e9ad7710eda3e610f3a51202612e -65327210f3ad7810eda50510f2a50211 -70f4a510016d2a7210f4a5cc10ee012a -ad794310d9ad7903653469866f8c7511 -70ecad871176e106491749324d364e3a -5010cba3c610cea5ec10d5ad8410d0a9 -882aa5ec422a4610caad8310d4ad8211 -61ebad851167f2ad862aa25441aa3142 -056f1f6f3e72447501672a6810e4ad76 -10e9ad751170efa3fc106101e8a9eae9 -ad746130655c68116bf3ad73036c326d -36733a7410ebad7210e9ad7110f5a36a -10f3a3c1116ee7012aa3ad4210c4a3ad -00214ac1c052c0cc5638563c57585862 -59665a01d2abf3d7ab6104c1ad63c4ad -64c5ad65cead64d5a39301c6ad66d3ab -5a10cbad6703c4abfec5abfed4ad68d5 -ab2d5246536c54a2575503c1abedc7ad -61d9ad62daabf805d309d3ab2dd5ab1a -d7ab1dc5ad53c8ab61cfa94a0ecd1ad4 -0cd4ad59d5ab1ad6ad5ad9ad5bcdad56 -cead57cfab67d2ad58c50cc5ab80c9ab -55caad55cbab51c1abf9c3ad54c4abfd -0ecd1ad20cd2abc7d6abdcd7a3f8daab -81cdabb3cead60cfabbfd0ad5fc80cc8 -aba8caaba3cbabb4ccad5fc4ad5cc6ad -5dc7ad5e4e644e404fa89650785102c1 -ad51cfad52d5ad2409cc0fcca54ccfa9 -7ed0a988d1ad03d4abf9c1ad44c3ad45 -c5ad46c8a393c9ad470dcd17d40cd4ad -50d7a9dbd9a5c1daad49cdad4dd2ad4e -d3ad4fc70cc7abc3c8a57dcbad4ccca9 -ecc1ad49c5ad4ac6ad4b4aa2484ba24c -4ca2644d0012ce20d50fd5a92bd6a54d -d8abf2d9a90fdaad43cea53fcfa3f2d1 -ad41d2ad42d4a959c60fc6ad40c7a92f -cba906cca3a8cda3cec1ad3dc3ad3ec4 -ad3fc5ab2f01cfad32d0a72c07d00cd0 -ad35d2a789d7ad36daad37c5ad33c7a7 -c0c8a779cdad3408d30fd3ad3ad4a7fc -d5ad3bd6a902d9ad3cc1a7f4c2ad38c9 -ad39cbab4b41c1604598456a46a24147 -a24e48a2754907d10cd1ad31d2a571d3 -a70ed4a726c3ad30c4a710cca5eacea5 -ec09d20ed2ad23d3a566d475d5ad24da -ad25c1ad20c3ad21c5a559c79bc8ad22 -04c9a57bcfa582d1ad03d2a588d8a588 -0bd014d309d3ad2bd4ad2cd7ad2dd0ad -29d1ad2ad2a55bc808c867cca774cead -28c1ad26c5a5b1c6ad2706d20cd2a700 -d4a703d5a704d6ad0acba3f0cdad2ece -ad2f415e42a24c43a2834406cb0ccba5 -21cfad1ed9ad0cdaad1fc4a52dc5a52d -caad1d0dd117d40cd4ad06d7ad07d8ad -08daa35ed1ad03d2ad04d3ad05cc0bcc -6dcda342ceabfccfad02c4abffc5ad00 -c6ad010010cc1cd20ed2a9f9d445d5a3 -ced6ad11d9a37cccad0dcead0ecfad0f -d1ad10c70cc7a389c8ad0bc9ab12caad -0cc1a3bfc4a3adc5ad09c6ad0a0010cf -1dd50fd5abf5d6ad1bd7abfcd9ad1cda -a519cfad18d0ad19d2ad1ad3ab2dc90c -c9ad15ccad16cdad17cea3ecc4abf3c6 -ad12c7ad13c8ad14342234423548374e -3801382a3910b0ab2d10b6abfe1131b9 -abfb1133b2abfc1133b6abfd2aa56030 -5031a26b3202302e33383810b0a52d01 -b0a519b2abf010b0750533233334354a -3601b1ab5ab2a5ec03b0a3ecb4a5ecb5 -a710b9a72602b3abf1b4abf6b7abf730 -34314a3201b1a560b9abf503b2abf0b3 -a560b5a9f9b9abf106b50bb59bb7abf3 -b8abf4b9a560b1abf0b3abf2b4ab8102 -342e353e3710b2ab1a02b2a3ecb3abf8 -b5abf903b0ab1ab1ab1ab4abfab5a52d -046436673c68427246761173f44b116c -eda5781168e2abe7116fed6301613c6d -01e99dee012aa3424110cda34210e200 -134c625131513c53405450556a5901c5 -abfed4ab8210c1ad5102c1abf9c4abfd -d9ad5b04c791c8a92acaad6fcead60d2 -ad7010cbad6a4c3c4d464e624f665001 -cbad4cd3ad4f01c2ad38d9ad3c04c1ad -3dcdad69cea771d2ad42d5ad6d10c7ad -6e10cdad48452e4542474a494e4a644b -02c8a504cdad34d7ad3601c79bc8ad22 -10c2ad6a03c4ad6bcead6cd1ad31d2a5 -7110cfad322a9b4132423c43464410da -ad1f01c5ad00c6ad0101c8ad0bd5ad69 -01c3a910ceabe900217588e62bf221f2 -9bf3a349f6a353f9a35cfa012a2e4112 -7261e2a360022aa35e498a5210d5a361 -e651eb67ed75ee7f7a2d7a2ce125e22d -e54b10ea012a2e41127261e2a360032a -a35e312e49345310d5a3611137b2a361 -01d1a35fd2a3607538763c77527901e2 -a35df2a35c10f9a35203eca354eea355 -f4a356f5a35703e1a358e2a359efa35a -f8a35b6b966f696f44704e726873a250 -7402e1a34fe7a350eaa35102ea89ed8b -fa8d05f206f295f397fa99e38fe491e5 -9309ef0fefa344f1a345f3a346f9a347 -faa348e29be332e8a341eda342eea343 -022a9d4e2c5012616ceda1126261f49f -04e1a34ae5a34be7a34cefa34df4a34e -6b3c6c3e6d586e03e381eb83ee85f987 -10eb6905ee06ee71f36df473e16be26d -e96f03ed77ee79ef7bf07d6525653067 -3668506a10e76501e24df94f05ed06ed -59ef5bf15de353e455e75702e15fec61 -ef636148625263646405f006f045f947 -fa49e13fe541ea4302e927eb29f52b04 -e92ff131f233f435f93702e439e53be8 -3d +a3d3f2a3d402e8a3d5eba3d6f2a3c805 +f309f3a3daf6a3dbf8a3dce5a3d7eea3 +d8f2a3d904e1a3dde5a3dee6a3dfe8a3 +e0f7a3e17332744875587610e2a3d203 +eaa3c1f1a3c2f3a3c3f4a3c402efa3c5 +f4a3c6f6a3c709ed0feda3cdefa3cef2 +a3cff3a3d0f5a3d1e1a3c8e3a3c9e4a3 +cae7a3cbeba3cc6a836e3b6e486f5870 +68716c7203e1a3bce8a3bdf8a3befaa3 +bf02e7a3afeda3b0f0a3b102eaa3b3ed +a3b4eea3b510f9a3b603e3a3b7e9a3b8 +f0a3b9f6a3ba6a446b766c926d03e8a3 +aaeba3abf1a3acf5a3ad07ef0cefa39e +f2a39ff4a3a0faa3a1e8a39ae9a39bea +a39ceea39d04e3a3a2eda3a3f1a3a4f5 +a3a5f6a3a601e7a3a7f4a3a8656a6562 +669467a24468a24b6906ed0ceda396ee +a397efa398f1a399e2a394e7a395eba3 +7507f40cf4a381f7a382f8a383faa384 +e6a37de8a37eeaa37feda38003e4a385 +f1a386f4a387f9a38802e3a38aeea38b +f8a38c05ec09eca391efa38df9a392e2 +a38ee7a38fe9a3906132626463906410 +e4a37b07f20cf2a367f3a368f6a369f8 +a36aeca363eea364f0a365f1a36606e4 +0ce4a36eeaa36ff0a370f2a371e1a36b +e2a36ce3a36d09ed0feda376eea377ef +a378f1a379f5a37ae3a363e6a372e8a3 +73e9a374eca37500184dc28354c0e157 +365736584e59645a12616ee2add20161 +2c631168efa9a51172e1add101702a73 +1175f8691165efa9e301652c691169e9 +a718117ae9a780544455a29e5601612c +691174e8add01169e9adcf07684e6836 +69866ea2426f1174efabe1106101e158 +e9042aaba843324b364c3a5410c8aba8 +10cea7d510c8adcc10c1adcd012aa54e +4d10d6a54e01622a7210e8adce10f401 +2aa3b24210d4451173e1a9b361346580 +668667116ce7adcb056d116d2e6e3276 +10f4a3a810ecab8b10e7abe067346b38 +6c01e5ab99f5a75d10e2adc810f2adc9 +116cf5ab9d116ee7adca126761f2abec +50c0c350a27252a2a85306694369426f +6a759079016c2a7210e3a50d10efadc7 +01643e6e01e4ab3ae8012aab4b4c10cb +ab4b10e4adc402672e72387910efa50f +01e4ab68efadc510e1ab70116ee4adc6 +613e675e6801612a7210e4adc310f7a5 +62026d2e72327510f2ab2810f2ab5e10 +e2adc2116ef7a34b046138654a68506c +76721174e9adc0016c2a7510e3a51d10 +eda11172edadbe02612e6c326e10f8a9 +e710e7adbf01e9a9d7f0a9d81172e4a5 +f6026a306f3675116ef2a9a9116ee7ad +c11168e7ab074d8a4ea2ab4f0467386c +3e72447358751167f2a9d21161edab43 +1163ebab26016b2a7910e1a9cb10e8a9 +d101672a6d10e1adbd10e5a9cf07722e +725a7460756679116df2032aa3cf492e +4d325410c8adb810cea76110cda3cf11 +6fefa9581165e9adb6116cf4adb76142 +65746c9a6f01642a6e10e7a54110e9ad +b50368326b366e3a7210e3adb110eaad +ae10e1adaf01e4a96fe9adb00264346e +387201e3adb3efadb410e6a53c10e4ad +b21179eda93f046138624c65506b5673 +1168f5adbc016e2a7210e2adba10e4ad +b91161f49f1177e1adbb116fefa56047 +c4154ac32f4aa6c04ba6d94c03614665 +a69c69a69e7901632a6410e9adad10e9 +adac026ea6796fa67a7410ee001a4bc1 +39545b571457ac7858ac7c59305a01c1 +abf4d7ab6110d4ad68544055825603c1 +ad63c5ad65cead64d5a3930bce14d609 +d6abdcd7abc9daab81ceadaacfabbfd2 +abc7cbc5dccbabb4ccad5fcdabb304c1 +adabc7ad61d3a561d9ad62daabf84e82 +4e8a50a24a52a26d530cce17d40cd4ad +59d5a79bd6ad5ad9ada9cead57cfab67 +d2ad58ca09caad55cbab51cdad56c3ad +54c5ab80c9ab5506c70cc7abf0c9ad47 +cca54dcfa97ec1ad44c3ad45c5ad460a +cc14d409d4ad50d7a9dbd9a5c2cca9ec +cdad4dd2ad4ec1ad49c5ad4ac6ad4bc7 +abc3c8a57e03c5ad53cfa94ad5a79bd7 +ab1d4b9e4ca2434d0010cd1dd40fd4a9 +59d5a92bd8abf2d9a90fdaad43cda73e +cfada7d1ad41d2ada8c60cc6ad40c7a9 +2fcbada6cca3a9c1ada5c3ad3ec4ad3f +c5ab2f01c5ad33cdada404c9ad39d3ad +3ad4a7fcd5ad3bd6a90243c0c2466446 +56476648a24d4905d209d2ada3d3a70e +d4a726c3ad30c4a710c5ad2402c9a57c +cfa583d2a5890cce17d30cd3ad2bd4ad +2cd5abf7d7ad2dcead28d0ad29d1ad2a +c608c6ad27c867cca774c1ad26c2abfa +c5ada204cdad2ecead2fd2a701d4a704 +d5a705435244a2424505d309d3a567d4 +ad9cdaad25c1ad20c3ad21c5a55a0fcf +1ad60cd6ad1bd7abfcd9ada0daa51acf +ad18d0ad19d2ad1ad5abf5c9c694c9ad +15ccad16cdad17cead9f05cb09cba522 +cfad1edaada1c5a52ec7ad52caad1d34 +5e34ae8f4178420bce14d209d2a9f9d5 +a73ed6ad11cead0ecfad0fd1ad10c909 +c9ab12caad0cccad0dc1a3c0c5ad09c6 +ad0a0cd217d50cd5abf1d7ad07d8ad08 +daa35ed2ad04d3ad05d4ad06cd09cdad +9ecfad02d1ad03c4abffc6ad9dcc6d2a +a561312c321133b0ad9c1137b2a79b10 +e1a9a710ef012aa7f44c10c1a7f41170 +e3a7da026d2e6e327310f5a7e810e2a7 +e401e1a7cae2a5ce01613a701161ee01 +2aa72c4a10d0a72c016d2a7610e1ad98 +10efad97056e1e6e306f36741168e9ad +9b1164e1a7841172e5012aa7894b01d0 +ad35d2a78961306844691174f3ad9a01 +6c2a6e10e1ad9910e9a55b02612e6d32 +6f10eaab3910f2a9f510f2012aa7794b +10c8a779473448a25c49127461eca56c +0465466c5a6f60727a75016a2a7210f5 +a9d410f2a5d2116ff2012aa5b24710c5 +a5b21161e7a51f016e2a7410e8a5cc01 +e7ad8aeda5680161506510eb032aa55c +432e47325410d2a38c10d9ad1c10d2a5 +5c10eead8b056c186c306d3675116ee7 +ad961175f7a5f5106e01e7ad95f0a5fa +61306590691172e1ad94106e05ef24ef +ad8ef34cf4032aa3f9482e4d325410d7 +a3f910cba3f110cfa3f3012aa3ed4310 +cea3ede2a3fee7ad8ce9ad8d1162f205 +4917493a533e5502c1ad92cbad90d3ad +9310cca5eb10c5ad912aa5eb432a4710 +c2ad9010c1ad8f43c115437044a2ce45 +0267406c46741168e9012a754501d2ad +23d4751179f0a55801622a7910edad89 +10e1ad880461a26968a2786fa28770a2 +89791172ec0a4d335414542e55385810 +cbad8101caaba3d2ad8010c1abed4d2e +523e5310cbad7f02c4ad7dcba906cea5 +4002cfad7ed3ab2dd5ab1a2aab1a4138 +423c474c4b01c7a7c0daad3710ccad7a +02c1ad7bc7a389d9a37c01c5a9ced2ad +7c026b2e6e327210e9ad7710eda3e710 +f3a51302612e65327210f3ad7810eda5 +0610f2a5031170f4a511016d2a7210f4 +a5cd10ee012aad794310d9ad79036534 +69866f8c751170ecad871176e1064917 +49324d364e3a5010cba3c710cea5ed10 +d5ad8410d0a9882aa5ed422a4610caad +8310d4ad821161ebad851167f2ad862a +a25441aa3142056f1f6f3e7244750167 +2a6810e4ad7610e9ad751170efa3fd10 +6101e8a9eae9ad746130655c68116bf3 +ad73036c326d36733a7410ebad7210e9 +ad7110f5a36a10f3a3c2116ee7012aa3 +ae4210c4a3ae00214ac1c052c0cc5638 +563c5758586259665a01d2abf3d7ab61 +04c1ad63c4ad64c5ad65cead64d5a393 +01c6ad66d3ab5a10cbad6703c4abfec5 +abfed4ad68d5ab2d5246536c54a25755 +03c1abedc7ad61d9ad62daabf805d309 +d3ab2dd5ab1ad7ab1dc5ad53c8ab61cf +a94a0ecd1ad40cd4ad59d5ab1ad6ad5a +d9ad5bcdad56cead57cfab67d2ad58c5 +0cc5ab80c9ab55caad55cbab51c1abf9 +c3ad54c4abfd0ecd1ad20cd2abc7d6ab +dcd7a3f9daab81cdabb3cead60cfabbf +d0ad5fc80cc8aba8caaba3cbabb4ccad +5fc4ad5cc6ad5dc7ad5e4e644e404fa8 +9650785102c1ad51cfad52d5ad2409cc +0fcca54dcfa97ed0a988d1ad03d4abf9 +c1ad44c3ad45c5ad46c8a393c9ad470d +cd17d40cd4ad50d7a9dbd9a5c2daad49 +cdad4dd2ad4ed3ad4fc70cc7abc3c8a5 +7ecbad4ccca9ecc1ad49c5ad4ac6ad4b +4aa2484ba24c4ca2644d0012ce20d50f +d5a92bd6a54ed8abf2d9a90fdaad43ce +a540cfa3f3d1ad41d2ad42d4a959c60f +c6ad40c7a92fcba906cca3a9cda3cfc1 +ad3dc3ad3ec4ad3fc5ab2f01cfad32d0 +a72c07d00cd0ad35d2a789d7ad36daad +37c5ad33c7a7c0c8a779cdad3408d30f +d3ad3ad4a7fcd5ad3bd6a902d9ad3cc1 +a7f4c2ad38c9ad39cbab4b41c1604598 +456a46a24147a24e48a2754907d10cd1 +ad31d2a572d3a70ed4a726c3ad30c4a7 +10cca5ebcea5ed09d20ed2ad23d3a567 +d475d5ad24daad25c1ad20c3ad21c5a5 +5ac79bc8ad2204c9a57ccfa583d1ad03 +d2a589d8a5890bd014d309d3ad2bd4ad +2cd7ad2dd0ad29d1ad2ad2a55cc808c8 +67cca774cead28c1ad26c5a5b2c6ad27 +06d20cd2a701d4a704d5a705d6ad0acb +a3f1cdad2ecead2f415e42a24c43a283 +4406cb0ccba522cfad1ed9ad0cdaad1f +c4a52ec5a52ecaad1d0dd117d40cd4ad +06d7ad07d8ad08daa35ed1ad03d2ad04 +d3ad05cc0bcc6dcda342ceabfccfad02 +c4abffc5ad00c6ad010010cc1cd20ed2 +a9f9d445d5a3cfd6ad11d9a37cccad0d +cead0ecfad0fd1ad10c70cc7a389c8ad +0bc9ab12caad0cc1a3c0c4a3aec5ad09 +c6ad0a0010cf1dd50fd5abf5d6ad1bd7 +abfcd9ad1cdaa51acfad18d0ad19d2ad +1ad3ab2dc90cc9ad15ccad16cdad17ce +a3edc4abf3c6ad12c7ad13c8ad143422 +34423548374e3801382a3910b0ab2d10 +b6abfe1131b9abfb1133b2abfc1133b6 +abfd2aa561305031a26b3202302e3338 +3810b0a52e01b0a51ab2abf010b07505 +33233334354a3601b1ab5ab2a5ed03b0 +a3edb4a5edb5a710b9a72602b3abf1b4 +abf6b7abf73034314a3201b1a561b9ab +f503b2abf0b3a561b5a9f9b9abf106b5 +0bb59bb7abf3b8abf4b9a561b1abf0b3 +abf2b4ab8102342e353e3710b2ab1a02 +b2a3edb3abf8b5abf903b0ab1ab1ab1a +b4abfab5a52e046436673c6842724676 +1173f44b116ceda5791168e2abe7116f +ed6301613c6d01e99dee012aa3424110 +cda34210e200134c625131513c534054 +50556a5901c5abfed4ab8210c1ad5102 +c1abf9c4abfdd9ad5b04c791c8a92aca +ad6fcead60d2ad7010cbad6a4c3c4d46 +4e624f665001cbad4cd3ad4f01c2ad38 +d9ad3c04c1ad3dcdad69cea771d2ad42 +d5ad6d10c7ad6e10cdad48452e454247 +4a494e4a644b02c8a505cdad34d7ad36 +01c79bc8ad2210c2ad6a03c4ad6bcead +6cd1ad31d2a57210cfad322a9b413242 +3c43464410daad1f01c5ad00c6ad0101 +c8ad0bd5ad6901c3a910ceabe9002175 +88e62bf221f29bf3a349f6a353f9a35c +fa012a2e41127261e2a360022aa35e49 +8a5210d5a361e651eb67ed75ee7f7a2d +7a2ce125e22de54b10ea012a2e411272 +61e2a360032aa35e312e49345310d5a3 +611137b2a36101d1a35fd2a360753876 +3c77527901e2a35df2a35c10f9a35203 +eca354eea355f4a356f5a35703e1a358 +e2a359efa35af8a35b6b966f696f4470 +4e726873a2507402e1a34fe7a350eaa3 +5102ea89ed8bfa8d05f206f295f397fa +99e38fe491e59309ef0fefa344f1a345 +f3a346f9a347faa348e29be332e8a341 +eda342eea343022a9d4e2c5012616ced +a1126261f49f04e1a34ae5a34be7a34c +efa34df4a34e6b3c6c3e6d586e03e381 +eb83ee85f98710eb6905ee06ee71f36d +f473e16be26de96f03ed77ee79ef7bf0 +7d65256530673668506a10e76501e24d +f94f05ed06ed59ef5bf15de353e455e7 +5702e15fec61ef636148625263646405 +f006f045f947fa49e13fe541ea4302e9 +27eb29f52b04e92ff131f233f435f937 +02e439e53be83d } } match{ diff --git a/icu4c/source/data/misc/likelySubtags.txt b/icu4c/source/data/misc/likelySubtags.txt index dd7b7823731..92236e4e3cb 100644 --- a/icu4c/source/data/misc/likelySubtags.txt +++ b/icu4c/source/data/misc/likelySubtags.txt @@ -165,6 +165,7 @@ likelySubtags:table(nofallback){ bkq{"bkq_Latn_ZZ"} bku{"bku_Latn_PH"} bkv{"bkv_Latn_ZZ"} + blg{"blg_Latn_MY"} blt{"blt_Tavt_VN"} bm{"bm_Latn_ML"} bmh{"bmh_Latn_ZZ"} diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index c983bf70f89..f206e7531d1 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -160,6 +160,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"fbl"} } + bic{ + reason{"deprecated"} + replacement{"bir"} + } bih{ reason{"overlong"} replacement{"bho"} @@ -180,6 +184,10 @@ metadata:table(nofallback){ reason{"deprecated"} replacement{"ebk"} } + blg{ + reason{"deprecated"} + replacement{"iba"} + } bod{ reason{"overlong"} replacement{"bo"} @@ -1228,6 +1236,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"pa"} } + pat{ + reason{"deprecated"} + replacement{"kxr"} + } pbu{ reason{"macrolanguage"} replacement{"ps"} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 8c35feb1d88..d8e4167e2be 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -4676,9 +4676,12 @@ supplementalData:table(nofallback){ "bgm", "bh", "bhk", + "bic", + "bij", "bjd", "bjq", "bkb", + "blg", "bmy", "bpb", "btb", @@ -4736,6 +4739,7 @@ supplementalData:table(nofallback){ "ggn~o", "ggr", "gio", + "gji", "gli", "gno", "gti", @@ -4804,6 +4808,7 @@ supplementalData:table(nofallback){ "mof", "mst", "mup", + "mvm", "mwd", "mwj", "mwx~y", @@ -4815,6 +4820,7 @@ supplementalData:table(nofallback){ "nbf", "nbx", "ncp", + "ngo", "nln", "nlr", "nns", @@ -4827,6 +4833,7 @@ supplementalData:table(nofallback){ "ome", "ory", "oun", + "pat", "pbu", "pbz", "pcr", @@ -4884,9 +4891,11 @@ supplementalData:table(nofallback){ "unp", "uok", "uzn", + "vki", "wgw", "wit", "wiw", + "wra", "xba", "xbx", "xia", @@ -5004,7 +5013,7 @@ supplementalData:table(nofallback){ "aqa", "aqc~d", "aqg", - "aql~n", + "aqk~n", "aqp", "aqr", "aqt", @@ -5075,8 +5084,9 @@ supplementalData:table(nofallback){ "bha~j", "bhl~z", "bi", - "bia~g", - "bij~r", + "bia~b", + "bid~g", + "bik~r", "bit~z", "bja~c", "bje~p", @@ -5084,7 +5094,8 @@ supplementalData:table(nofallback){ "bka", "bkc~d", "bkf~z", - "bla~t", + "bla~f", + "blh~t", "blv~z", "bm", "bma~x", @@ -5097,7 +5108,7 @@ supplementalData:table(nofallback){ "boe~r", "bot~z", "bpa", - "bpd", + "bpd~e", "bpg~z", "bqa~d", "bqf~z", @@ -5228,14 +5239,13 @@ supplementalData:table(nofallback){ "crf~t", "crv~z", "cs", - "csa~w", - "csy~z", + "csa~z", "cta", "ctc~e", "ctg~h", "ctl~p", "cts~u", - "ctz", + "cty~z", "cu", "cua~c", "cug~l", @@ -5307,6 +5317,7 @@ supplementalData:table(nofallback){ "dju", "djw", "dka", + "dkg", "dkk", "dkr~s", "dkx", @@ -5396,6 +5407,7 @@ supplementalData:table(nofallback){ "egl", "ego", "egx~y", + "ehs", "ehu", "eip", "eit", @@ -5422,10 +5434,10 @@ supplementalData:table(nofallback){ "emg", "emi", "emm~n", - "emp", + "emp~q", "ems", "emu", - "emw~y", + "emw~z", "en", "ena~d", "enf", @@ -5569,11 +5581,10 @@ supplementalData:table(nofallback){ "ghn~o", "ghr~t", "gia~e", - "gig~h", + "gig~i", "gil~n", "gip~u", "giw~z", - "gji", "gjk", "gjm~n", "gjr", @@ -5583,7 +5594,7 @@ supplementalData:table(nofallback){ "gkn~p", "gku", "gl", - "glc~d", + "glb~d", "glh", "glj~l", "glo", @@ -5652,7 +5663,7 @@ supplementalData:table(nofallback){ "gyi", "gyl~o", "gyr", - "gyy", + "gyy~z", "gza", "gzi", "gzn", @@ -5686,6 +5697,7 @@ supplementalData:table(nofallback){ "hji", "hka", "hke", + "hkh", "hkk", "hkn", "hks", @@ -5874,7 +5886,7 @@ supplementalData:table(nofallback){ "jax~z", "jbe", "jbi~k", - "jbn~o", + "jbm~o", "jbr", "jbt~u", "jbw", @@ -5907,7 +5919,7 @@ supplementalData:table(nofallback){ "jka", "jkm", "jko~p", - "jkr", + "jkr~s", "jku", "jle", "jls", @@ -6116,7 +6128,7 @@ supplementalData:table(nofallback){ "lrt", "lrv", "lrz", - "lsa", + "lsa~b", "lsd~e", "lsh~i", "lsl~p", @@ -6146,6 +6158,7 @@ supplementalData:table(nofallback){ "lwo", "lws~u", "lww", + "lxm", "lya", "lyg", "lyn", @@ -6222,7 +6235,8 @@ supplementalData:table(nofallback){ "mux~z", "mva~b", "mvd~i", - "mvk~z", + "mvk~l", + "mvn~z", "mwa~c", "mwe~i", "mwk~w", @@ -6263,7 +6277,8 @@ supplementalData:table(nofallback){ "nfr", "nfu", "ng", - "nga~z", + "nga~n", + "ngp~z", "nha~i", "nhk", "nhm~r", @@ -6310,6 +6325,7 @@ supplementalData:table(nofallback){ "nqg", "nqk~o", "nqq", + "nqt", "nqy", "nr", "nra~c", @@ -6373,6 +6389,7 @@ supplementalData:table(nofallback){ "oc", "oca", "och", + "ocm", "oco", "ocu", "oda", @@ -6394,12 +6411,12 @@ supplementalData:table(nofallback){ "ojp", "ojs", "ojv~w", - "oka~b", - "okd~e", + "oka~e", "okg~o", "okr~s", "oku~v", "okx", + "okz", "ola", "old~e", "olk", @@ -6413,7 +6430,7 @@ supplementalData:table(nofallback){ "omi", "omk~l", "omn~r", - "omt~x", + "omt~y", "ona~b", "one", "ong", @@ -6443,7 +6460,7 @@ supplementalData:table(nofallback){ "osa", "osc", "osi", - "oso~p", + "osn~p", "ost~u", "osx", "ota~b", @@ -6467,7 +6484,8 @@ supplementalData:table(nofallback){ "pa", "paa~i", "pak~m", - "pao~z", + "pao~s", + "pau~z", "pbb~c", "pbe~i", "pbl~p", @@ -6685,8 +6703,7 @@ supplementalData:table(nofallback){ "ruy~z", "rw", "rwa", - "rwk", - "rwm", + "rwk~m", "rwo", "rwr", "rxd", @@ -6775,6 +6792,7 @@ supplementalData:table(nofallback){ "sqj~k", "sqm~o", "sqq~u", + "sqx", "sr", "sra~b", "sre~i", @@ -6792,6 +6810,7 @@ supplementalData:table(nofallback){ "sue", "sug", "sui~k", + "suo", "suq~t", "suv~z", "sv", @@ -6937,8 +6956,7 @@ supplementalData:table(nofallback){ "tyn", "typ", "tyr~v", - "tyx", - "tyz", + "tyx~z", "tza", "tzh", "tzj", @@ -6992,6 +7010,7 @@ supplementalData:table(nofallback){ "una", "une", "ung", + "uni", "unk", "unm~n", "unr", @@ -7050,9 +7069,9 @@ supplementalData:table(nofallback){ "vis~t", "viv", "vka", - "vki~m", - "vko~p", + "vkj~p", "vkt~u", + "vkz", "vlp", "vls", "vma~m", @@ -7128,7 +7147,7 @@ supplementalData:table(nofallback){ "wlr~s", "wlu~y", "wma~e", - "wmh~i", + "wmg~i", "wmm~o", "wms~t", "wmw~x", @@ -7149,7 +7168,7 @@ supplementalData:table(nofallback){ "wow", "woy", "wpc", - "wra~b", + "wrb", "wrd", "wrg~i", "wrk~p", @@ -7251,10 +7270,9 @@ supplementalData:table(nofallback){ "xmj~z", "xna~b", "xnd", - "xng~i", - "xnk", + "xng~k", "xnm~o", - "xnr~u", + "xnq~u", "xny~z", "xoc~d", "xog", @@ -7400,8 +7418,7 @@ supplementalData:table(nofallback){ "yry", "ysc~d", "ysg", - "ysl", - "ysn~p", + "ysl~p", "ysr~s", "ysy", "yta", @@ -7441,7 +7458,7 @@ supplementalData:table(nofallback){ "zbc", "zbe", "zbl", - "zbt", + "zbt~u", "zbw", "zca", "zch", @@ -7471,6 +7488,7 @@ supplementalData:table(nofallback){ "zkr", "zkt~v", "zkz", + "zla", "zle", "zlj", "zlm~n", @@ -11524,6 +11542,7 @@ supplementalData:table(nofallback){ "fonnapa", "fonupa", "fonxsamp", + "gallo", "gascon", "grclass", "grital", @@ -11574,6 +11593,7 @@ supplementalData:table(nofallback){ "surmiran", "sursilv", "sutsilv", + "synnejyl", "tarask", "tongyong", "tunumiit", @@ -26684,7 +26704,7 @@ supplementalData:table(nofallback){ populationShareF:int{47210000} } rhg{ - populationShareF:int{47520000} + populationShareF:int{47530000} } rkt{ literacyShareF:int{49200000} @@ -26948,7 +26968,7 @@ supplementalData:table(nofallback){ populationShareF:int{45470000} } yrl{ - populationShareF:int{46104000} + populationShareF:int{46100000} } } BS{ @@ -27520,7 +27540,7 @@ supplementalData:table(nofallback){ 57490848, } yrl{ - populationShareF:int{45620000} + populationShareF:int{45610000} } } CP{ @@ -28311,7 +28331,7 @@ supplementalData:table(nofallback){ } os{ officialStatus{"official_regional"} - populationShareF:int{48409000} + populationShareF:int{48220000} } ru{ populationShareF:int{48900000} @@ -30125,7 +30145,7 @@ supplementalData:table(nofallback){ populationShareF:int{49640000} } rhg{ - populationShareF:int{48160000} + populationShareF:int{48170000} } shn{ populationShareF:int{48640000} @@ -32633,7 +32653,7 @@ supplementalData:table(nofallback){ 57286446, } yrl{ - populationShareF:int{45630000} + populationShareF:int{45700000} } } VG{ diff --git a/icu4c/source/data/misc/timezoneTypes.txt b/icu4c/source/data/misc/timezoneTypes.txt index 8a08adf5fb9..a1d4fd708ed 100644 --- a/icu4c/source/data/misc/timezoneTypes.txt +++ b/icu4c/source/data/misc/timezoneTypes.txt @@ -8,6 +8,7 @@ timezoneTypes:table(nofallback){ cnckg{"cnsha"} cnhrb{"cnsha"} cnkhg{"cnurc"} + gaza{"gazastrp"} usnavajo{"usden"} } } @@ -387,7 +388,7 @@ timezoneTypes:table(nofallback){ "Asia:Dubai"{"aedxb"} "Asia:Dushanbe"{"tjdyu"} "Asia:Famagusta"{"cyfmg"} - "Asia:Gaza"{"gaza"} + "Asia:Gaza"{"gazastrp"} "Asia:Hebron"{"hebron"} "Asia:Hong_Kong"{"hkhkg"} "Asia:Hovd"{"mnhvd"} @@ -605,10 +606,168 @@ timezoneTypes:table(nofallback){ "Pacific:Truk"{"fmtkk"} "Pacific:Wake"{"umawk"} "Pacific:Wallis"{"wfmau"} + Acre{"acre"} + Afghanistan{"afgh"} + Africa_Central{"afce"} + Africa_Eastern{"afea"} + Africa_Southern{"afso"} + Africa_Western{"afwe"} + Alaska{"alas"} + Almaty{"alam"} + Amazon{"amaz"} + America_Central{"amce"} + America_Eastern{"amea"} + America_Mountain{"ammo"} + America_Pacific{"ampa"} + Anadyr{"anad"} + Apia{"apia"} + Aqtau{"aqta"} + Aqtobe{"aqto"} + Arabian{"arab"} + Argentina{"arge"} + Argentina_Western{"arwe"} + Armenia{"arme"} + Atlantic{"atla"} + Australia_Central{"auce"} + Australia_CentralWestern{"aucw"} + Australia_Eastern{"auea"} + Australia_Western{"auwe"} + Azerbaijan{"azer"} + Azores{"azor"} + Bangladesh{"bang"} + Bhutan{"bhut"} + Bolivia{"boli"} + Brasilia{"bras"} + Brunei{"brun"} CST6CDT{"cst6cdt"} + Cape_Verde{"cave"} + Casey{"case"} + Chamorro{"cham"} + Chatham{"chat"} + Chile{"chil"} + China{"chin"} + Choibalsan{"choi"} + Christmas{"chri"} + Cocos{"coco"} + Colombia{"colo"} + Cook{"cook"} + Cuba{"cuba"} + Davis{"davi"} + DumontDUrville{"dumo"} EST5EDT{"est5edt"} + East_Timor{"eati"} + Easter{"east"} + Ecuador{"ecua"} + Europe_Central{"euce"} + Europe_Eastern{"euea"} + Europe_Further_Eastern{"eufe"} + Europe_Western{"euwe"} + Falkland{"falk"} + Fiji{"fiji"} + French_Guiana{"frgu"} + French_Southern{"frso"} + GMT{"mgmt"} + Galapagos{"gala"} + Gambier{"gamb"} + Georgia{"geor"} + Gilbert_Islands{"giis"} + Greenland_Eastern{"grea"} + Greenland_Western{"grwe"} + Guam{"guam"} + Gulf{"gulf"} + Guyana{"guya"} + Hawaii_Aleutian{"haal"} + Hong_Kong{"hoko"} + Hovd{"hovd"} + India{"indi"} + Indian_Ocean{"inoc"} + Indochina{"indo"} + Indonesia_Central{"ince"} + Indonesia_Eastern{"inea"} + Indonesia_Western{"inwe"} + Iran{"iran"} + Irkutsk{"irku"} + Israel{"isra"} + Japan{"japa"} + Kamchatka{"kamc"} + Kazakhstan_Eastern{"kaea"} + Kazakhstan_Western{"kawe"} + Korea{"kore"} + Kosrae{"kosr"} + Krasnoyarsk{"kras"} + Kyrgystan{"kyrg"} + Lanka{"lank"} + Line_Islands{"liis"} + Lord_Howe{"loho"} MST7MDT{"mst7mdt"} + Macau{"maca"} + Macquarie{"macq"} + Magadan{"maga"} + Malaysia{"mala"} + Maldives{"mald"} + Marquesas{"marq"} + Marshall_Islands{"mais"} + Mauritius{"maur"} + Mawson{"maws"} + Mexico_Northwest{"meno"} + Mexico_Pacific{"mepa"} + Mongolia{"mong"} + Moscow{"mosc"} + Myanmar{"myan"} + Nauru{"naur"} + Nepal{"nepa"} + New_Caledonia{"neca"} + New_Zealand{"neze"} + Newfoundland{"newf"} + Niue{"niue"} + Norfolk{"norf"} + Noronha{"noro"} + North_Mariana{"noma"} + Novosibirsk{"novo"} + Omsk{"omsk"} PST8PDT{"pst8pdt"} + Pakistan{"paki"} + Palau{"pala"} + Papua_New_Guinea{"pang"} + Paraguay{"para"} + Peru{"peru"} + Philippines{"phil"} + Phoenix_Islands{"phis"} + Pierre_Miquelon{"pimi"} + Pitcairn{"pitc"} + Ponape{"pona"} + Pyongyang{"pyon"} + Qyzylorda{"qyzy"} + Reunion{"reun"} + Rothera{"roth"} + Sakhalin{"sakh"} + Samara{"sama"} + Samoa{"samo"} + Seychelles{"seyc"} + Singapore{"sing"} + Solomon{"solo"} + South_Georgia{"soge"} + Suriname{"suri"} + Syowa{"syow"} + Tahiti{"tahi"} + Taipei{"taip"} + Tajikistan{"taji"} + Tokelau{"toke"} + Tonga{"tong"} + Truk{"truk"} + Turkmenistan{"turk"} + Tuvalu{"tuva"} + Uruguay{"urug"} + Uzbekistan{"uzbe"} + Vanuatu{"vanu"} + Venezuela{"vene"} + Vladivostok{"vlad"} + Volgograd{"volg"} + Vostok{"vost"} + Wake{"wake"} + Wallis{"wall"} + Yakutsk{"yaku"} + Yekaterinburg{"yeka"} } } } diff --git a/icu4c/source/data/unit/sr_Latn.txt b/icu4c/source/data/unit/sr_Latn.txt index c5127adc169..cc923da8a58 100644 --- a/icu4c/source/data/unit/sr_Latn.txt +++ b/icu4c/source/data/unit/sr_Latn.txt @@ -11,6 +11,17 @@ sr_Latn{ units{ acceleration{ g-force{ + case{ + accusative{ + one{"{0} ge silu"} + } + genitive{ + one{"{0} ge sile"} + } + instrumental{ + one{"{0} ge silom"} + } + } dnam{"ge sila"} few{"{0} ge sila"} gender{"feminine"} @@ -26,6 +37,17 @@ sr_Latn{ } angle{ arc-minute{ + case{ + accusative{ + one{"{0} lučni minut"} + } + genitive{ + one{"{0} lučnog minuta"} + } + instrumental{ + one{"{0} lučnim minutom"} + } + } dnam{"lučni minuti"} few{"{0} lučna minuta"} gender{"inanimate"} @@ -33,6 +55,17 @@ sr_Latn{ other{"{0} lučnih minuta"} } arc-second{ + case{ + accusative{ + one{"{0} lučnu sekundu"} + } + genitive{ + one{"{0} lučne sekunde"} + } + instrumental{ + one{"{0} lučnom sekundom"} + } + } dnam{"lučne sekunde"} few{"{0} lučne sekunde"} gender{"feminine"} @@ -40,6 +73,17 @@ sr_Latn{ other{"{0} lučnih sekundi"} } degree{ + case{ + accusative{ + one{"{0} stepen"} + } + genitive{ + one{"{0} stepena"} + } + instrumental{ + one{"{0} stepenom"} + } + } dnam{"stepeni"} few{"{0} stepena"} gender{"inanimate"} @@ -47,6 +91,17 @@ sr_Latn{ other{"{0} stepeni"} } radian{ + case{ + accusative{ + one{"{0} radijan"} + } + genitive{ + one{"{0} radijana"} + } + instrumental{ + one{"{0} radijanom"} + } + } dnam{"radijani"} few{"{0} radijana"} gender{"inanimate"} @@ -54,6 +109,17 @@ sr_Latn{ other{"{0} radijana"} } revolution{ + case{ + accusative{ + one{"{0} obrtaj"} + } + genitive{ + one{"{0} obrtaja"} + } + instrumental{ + one{"{0} obrtajem"} + } + } dnam{"obrtaj"} few{"{0} obrtaja"} gender{"inanimate"} @@ -75,6 +141,17 @@ sr_Latn{ other{"{0} dunama"} } hectare{ + case{ + accusative{ + one{"{0} hektar"} + } + genitive{ + one{"{0} hektara"} + } + instrumental{ + one{"{0} hektarom"} + } + } dnam{"hektari"} few{"{0} hektara"} gender{"inanimate"} @@ -203,6 +280,17 @@ sr_Latn{ other{"{0} stavki"} } karat{ + case{ + accusative{ + one{"{0} karat"} + } + genitive{ + one{"{0} karata"} + } + instrumental{ + one{"{0} karatom"} + } + } dnam{"karati"} few{"{0} karata"} gender{"inanimate"} @@ -222,6 +310,23 @@ sr_Latn{ other{"{0} milimola po litri"} } mole{ + case{ + accusative{ + few{"{0} mola"} + one{"{0} mol"} + other{"{0} mola"} + } + genitive{ + few{"{0} mola"} + one{"{0} mola"} + other{"{0} mola"} + } + instrumental{ + few{"{0} mola"} + one{"{0} molom"} + other{"{0} mola"} + } + } dnam{"moli"} few{"{0} mola"} gender{"inanimate"} @@ -229,6 +334,17 @@ sr_Latn{ other{"{0} mola"} } percent{ + case{ + accusative{ + one{"{0} procenat"} + } + genitive{ + one{"{0} procenta"} + } + instrumental{ + one{"{0} procentom"} + } + } dnam{"procenat"} few{"{0} procenata"} gender{"inanimate"} @@ -236,6 +352,17 @@ sr_Latn{ other{"{0} procenata"} } permille{ + case{ + accusative{ + one{"{0} promil"} + } + genitive{ + one{"{0} promila"} + } + instrumental{ + one{"{0} promilom"} + } + } dnam{"promil"} few{"{0} promila"} gender{"inanimate"} @@ -243,6 +370,17 @@ sr_Latn{ other{"{0} promila"} } permillion{ + case{ + accusative{ + one{"{0} česticu na milion"} + } + genitive{ + one{"{0} čestice na milion"} + } + instrumental{ + one{"{0} česticom na milion"} + } + } dnam{"čestica na milion"} few{"{0} čestice na milion"} gender{"feminine"} @@ -250,7 +388,10 @@ sr_Latn{ other{"{0} čestica na milion"} } permyriad{ + few{"{0}‱"} gender{"inanimate"} + one{"{0}‱"} + other{"{0}‱"} } } consumption{ @@ -288,6 +429,17 @@ sr_Latn{ } digital{ bit{ + case{ + accusative{ + one{"{0} bit"} + } + genitive{ + one{"{0} bita"} + } + instrumental{ + one{"{0} bitom"} + } + } dnam{"bitovi"} few{"{0} bita"} gender{"inanimate"} @@ -295,6 +447,17 @@ sr_Latn{ other{"{0} bitova"} } byte{ + case{ + accusative{ + one{"{0} bajt"} + } + genitive{ + one{"{0} bajta"} + } + instrumental{ + one{"{0} bajtom"} + } + } dnam{"bajtovi"} few{"{0} bajta"} gender{"inanimate"} @@ -358,6 +521,17 @@ sr_Latn{ } duration{ century{ + case{ + accusative{ + one{"{0} vek"} + } + genitive{ + one{"{0} veka"} + } + instrumental{ + one{"{0} vekom"} + } + } dnam{"vekovi"} few{"{0} veka"} gender{"inanimate"} @@ -365,6 +539,17 @@ sr_Latn{ other{"{0} vekova"} } day{ + case{ + accusative{ + one{"{0} dan"} + } + genitive{ + one{"{0} dana"} + } + instrumental{ + one{"{0} danom"} + } + } dnam{"dani"} few{"{0} dana"} gender{"inanimate"} @@ -376,12 +561,15 @@ sr_Latn{ case{ accusative{ few{"{0} decenije"} + one{"{0} deceniju"} } genitive{ few{"{0} decenije"} + one{"{0} decenije"} } instrumental{ few{"{0} decenije"} + one{"{0} decenijom"} } } dnam{"decenije"} @@ -391,6 +579,17 @@ sr_Latn{ other{"{0} decenija"} } hour{ + case{ + accusative{ + one{"{0} sat"} + } + genitive{ + one{"{0} sata"} + } + instrumental{ + one{"{0} satom"} + } + } dnam{"sati"} few{"{0} sata"} gender{"inanimate"} @@ -411,6 +610,17 @@ sr_Latn{ other{"{0} milisekundi"} } minute{ + case{ + accusative{ + one{"{0} minut"} + } + genitive{ + one{"{0} minuta"} + } + instrumental{ + one{"{0} minutom"} + } + } dnam{"minuti"} few{"{0} minuta"} gender{"inanimate"} @@ -419,6 +629,17 @@ sr_Latn{ per{"{0} u minutu"} } month{ + case{ + accusative{ + one{"{0} mesec"} + } + genitive{ + one{"{0} meseca"} + } + instrumental{ + one{"{0} mesecom"} + } + } dnam{"meseci"} few{"{0} meseca"} gender{"inanimate"} @@ -433,6 +654,17 @@ sr_Latn{ other{"{0} nanosekundi"} } second{ + case{ + accusative{ + one{"{0} sekundu"} + } + genitive{ + one{"{0} sekunde"} + } + instrumental{ + one{"{0} sekundom"} + } + } dnam{"sekunde"} few{"{0} sekunde"} gender{"feminine"} @@ -441,6 +673,17 @@ sr_Latn{ per{"{0}/u sekundi"} } week{ + case{ + accusative{ + one{"{0} nedelju"} + } + genitive{ + one{"{0} nedelje"} + } + instrumental{ + one{"{0} nedeljom"} + } + } dnam{"nedelje"} few{"{0} nedelje"} gender{"feminine"} @@ -449,6 +692,17 @@ sr_Latn{ per{"{0} nedeljno"} } year{ + case{ + accusative{ + one{"{0} godinu"} + } + genitive{ + one{"{0} godine"} + } + instrumental{ + one{"{0} godinom"} + } + } dnam{"godine"} few{"{0} godine"} gender{"feminine"} @@ -459,6 +713,17 @@ sr_Latn{ } electric{ ampere{ + case{ + accusative{ + one{"{0} amper"} + } + genitive{ + one{"{0} ampera"} + } + instrumental{ + one{"{0} amperom"} + } + } dnam{"amperi"} few{"{0} ampera"} gender{"inanimate"} @@ -472,6 +737,17 @@ sr_Latn{ other{"{0} miliampera"} } ohm{ + case{ + accusative{ + one{"{0} om"} + } + genitive{ + one{"{0} oma"} + } + instrumental{ + one{"{0} omom"} + } + } dnam{"omi"} few{"{0} oma"} gender{"inanimate"} @@ -479,6 +755,17 @@ sr_Latn{ other{"{0} oma"} } volt{ + case{ + accusative{ + one{"{0} volt"} + } + genitive{ + one{"{0} volta"} + } + instrumental{ + one{"{0} voltom"} + } + } dnam{"volti"} few{"{0} volta"} gender{"inanimate"} @@ -491,6 +778,17 @@ sr_Latn{ dnam{"Britanska termalna jedinica"} } calorie{ + case{ + accusative{ + one{"{0} kaloriju"} + } + genitive{ + one{"{0} kalorije"} + } + instrumental{ + one{"{0} kalorijom"} + } + } dnam{"kalorije"} few{"{0} kalorije"} gender{"feminine"} @@ -510,6 +808,17 @@ sr_Latn{ other{"{0} kalorija"} } joule{ + case{ + accusative{ + one{"{0} džul"} + } + genitive{ + one{"{0} džula"} + } + instrumental{ + one{"{0} džulom"} + } + } dnam{"džuli"} few{"{0} džula"} gender{"inanimate"} @@ -543,6 +852,17 @@ sr_Latn{ } force{ newton{ + case{ + accusative{ + one{"{0} njutn"} + } + genitive{ + one{"{0} njutna"} + } + instrumental{ + one{"{0} njutnom"} + } + } dnam{"njutni"} few{"{0} njutna"} gender{"inanimate"} @@ -564,6 +884,17 @@ sr_Latn{ other{"{0} gigaherca"} } hertz{ + case{ + accusative{ + one{"{0} herc"} + } + genitive{ + one{"{0} herca"} + } + instrumental{ + one{"{0} hercom"} + } + } dnam{"herci"} few{"{0} herca"} gender{"inanimate"} @@ -591,9 +922,11 @@ sr_Latn{ } em{ gender{"inanimate"} + one{"{0} em"} } pixel{ gender{"inanimate"} + one{"{0} px"} } } length{ @@ -661,6 +994,17 @@ sr_Latn{ other{"{0} svetlosnih godina"} } meter{ + case{ + accusative{ + one{"{0} metar"} + } + genitive{ + one{"{0} metra"} + } + instrumental{ + one{"{0} metrom"} + } + } dnam{"metri"} few{"{0} metra"} gender{"inanimate"} @@ -681,6 +1025,17 @@ sr_Latn{ other{"{0} milja"} } mile-scandinavian{ + case{ + accusative{ + one{"{0} skandinavsku milju"} + } + genitive{ + one{"{0} skandinavske milje"} + } + instrumental{ + one{"{0} skandinavskom miljom"} + } + } dnam{"skandinavska milja"} few{"{0} skandinavske milje"} gender{"feminine"} @@ -738,6 +1093,17 @@ sr_Latn{ } light{ candela{ + case{ + accusative{ + one{"{0} kandelu"} + } + genitive{ + one{"{0} kandele"} + } + instrumental{ + one{"{0} kandelom"} + } + } dnam{"kandela"} few{"{0} kandele"} gender{"feminine"} @@ -745,6 +1111,17 @@ sr_Latn{ other{"{0} kandela"} } lumen{ + case{ + accusative{ + one{"{0} lumen"} + } + genitive{ + one{"{0} lumena"} + } + instrumental{ + one{"{0} lumenom"} + } + } dnam{"lumen"} few{"{0} lumena"} gender{"inanimate"} @@ -752,6 +1129,17 @@ sr_Latn{ other{"{0} lumena"} } lux{ + case{ + accusative{ + one{"{0} luks"} + } + genitive{ + one{"{0} luksa"} + } + instrumental{ + one{"{0} luksom"} + } + } dnam{"luks"} few{"{0} luksa"} gender{"inanimate"} @@ -761,6 +1149,17 @@ sr_Latn{ } mass{ carat{ + case{ + accusative{ + one{"{0} karat"} + } + genitive{ + one{"{0} karata"} + } + instrumental{ + one{"{0} karatom"} + } + } dnam{"karati"} few{"{0} karata"} gender{"inanimate"} @@ -786,6 +1185,17 @@ sr_Latn{ other{"{0} grejna"} } gram{ + case{ + accusative{ + one{"{0} gram"} + } + genitive{ + one{"{0} grama"} + } + instrumental{ + one{"{0} gramom"} + } + } dnam{"grami"} few{"{0} grama"} gender{"inanimate"} @@ -794,6 +1204,17 @@ sr_Latn{ per{"{0} po gramu"} } kilogram{ + case{ + accusative{ + one{"{0} kilogram"} + } + genitive{ + one{"{0} kilograma"} + } + instrumental{ + one{"{0} kilogramom"} + } + } dnam{"kilogrami"} few{"{0} kilograma"} gender{"inanimate"} @@ -802,6 +1223,17 @@ sr_Latn{ per{"{0} po kilogramu"} } metric-ton{ + case{ + accusative{ + one{"{0} metričku tonu"} + } + genitive{ + one{"{0} metričke tone"} + } + instrumental{ + one{"{0} metričkom tonom"} + } + } dnam{"metričke tone"} few{"{0} metričke tone"} gender{"feminine"} @@ -891,6 +1323,17 @@ sr_Latn{ other{"{0} milivati"} } watt{ + case{ + accusative{ + one{"{0} vat"} + } + genitive{ + one{"{0} vata"} + } + instrumental{ + one{"{0} vatom"} + } + } dnam{"vati"} few{"{0} vata"} gender{"inanimate"} @@ -900,6 +1343,17 @@ sr_Latn{ } pressure{ atmosphere{ + case{ + accusative{ + one{"{0} atmosferu"} + } + genitive{ + one{"{0} atmosfere"} + } + instrumental{ + one{"{0} atmosferom"} + } + } dnam{"atmosfere"} few{"{0} atmosfere"} gender{"feminine"} @@ -907,6 +1361,17 @@ sr_Latn{ other{"{0} atmosfera"} } bar{ + case{ + accusative{ + one{"{0} bar"} + } + genitive{ + one{"{0} bara"} + } + instrumental{ + one{"{0} barom"} + } + } dnam{"bari"} few{"{0} bara"} gender{"inanimate"} @@ -950,6 +1415,17 @@ sr_Latn{ other{"{0} milimetara živinog stuba"} } pascal{ + case{ + accusative{ + one{"{0} paskal"} + } + genitive{ + one{"{0} paskala"} + } + instrumental{ + one{"{0} paskalom"} + } + } dnam{"paskali"} few{"{0} paskala"} gender{"inanimate"} @@ -991,6 +1467,17 @@ sr_Latn{ } temperature{ celsius{ + case{ + accusative{ + one{"{0} stepen Celzijusa"} + } + genitive{ + one{"{0} stepena Celzijusa"} + } + instrumental{ + one{"{0} stepenom Celzijusa"} + } + } dnam{"stepeni Celzijusa"} few{"{0} stepena Celzijusa"} gender{"inanimate"} @@ -1011,6 +1498,17 @@ sr_Latn{ other{"{0}°"} } kelvin{ + case{ + accusative{ + one{"{0} kelvin"} + } + genitive{ + one{"{0} kelvina"} + } + instrumental{ + one{"{0} kelvinom"} + } + } dnam{"kelvin"} few{"{0} kelvina"} gender{"inanimate"} @@ -1108,6 +1606,17 @@ sr_Latn{ other{"{0} šolja"} } cup-metric{ + case{ + accusative{ + one{"{0} metričku šolju"} + } + genitive{ + one{"{0} metričke šolje"} + } + instrumental{ + one{"{0} metričkom šoljom"} + } + } dnam{"metrička šolja"} few{"{0} metričke šolje"} gender{"feminine"} @@ -1183,6 +1692,17 @@ sr_Latn{ other{"{0} džigera"} } liter{ + case{ + accusative{ + one{"{0} litar"} + } + genitive{ + one{"{0} litra"} + } + instrumental{ + one{"{0} litrom"} + } + } dnam{"litri"} few{"{0} litra"} gender{"inanimate"} @@ -1215,6 +1735,17 @@ sr_Latn{ other{"{0} pinti"} } pint-metric{ + case{ + accusative{ + one{"{0} metričku pintu"} + } + genitive{ + one{"{0} metričke pinte"} + } + instrumental{ + one{"{0} metričkom pintom"} + } + } dnam{"metričke pinte"} few{"{0} metričke pinte"} gender{"feminine"} diff --git a/icu4c/source/data/unit/yo_BJ.txt b/icu4c/source/data/unit/yo_BJ.txt index 77026377abb..dcda3098fd7 100644 --- a/icu4c/source/data/unit/yo_BJ.txt +++ b/icu4c/source/data/unit/yo_BJ.txt @@ -240,8 +240,8 @@ yo_BJ{ } light{ lumen{ - dnam{"lumɛ́ɛ̀nì"} - other{"{0} lumɛ́ɛ̀nì"} + dnam{"àmì lumɛ́ɛ̀nì"} + other{"{0} Lúmɛ́nì"} } } volume{ diff --git a/icu4c/source/i18n/zonemeta.cpp b/icu4c/source/i18n/zonemeta.cpp index b8afa4760f1..6af2231c777 100644 --- a/icu4c/source/i18n/zonemeta.cpp +++ b/icu4c/source/i18n/zonemeta.cpp @@ -290,9 +290,13 @@ ZoneMeta::getCanonicalCLDRID(const UnicodeString &tzid, UErrorCode& status) { UResourceBundle *rb = ures_getByKey(top, gTypeMapTag, NULL, &tmpStatus); ures_getByKey(rb, gTimezoneTag, rb, &tmpStatus); ures_getByKey(rb, id, rb, &tmpStatus); - if (U_SUCCESS(tmpStatus)) { + int32_t bcp47StrLen = 0; + ures_getString(rb, &bcp47StrLen, &tmpStatus); + if (U_SUCCESS(tmpStatus) && bcp47StrLen!=4) { // type entry (canonical) found // the input is the canonical ID. resolve to const UChar* + // TODO: For now we skip entries mapping to metazone short ids, + // which have 4 characters. canonicalID = TimeZone::findID(tzid); isInputCanonical = TRUE; } @@ -933,7 +937,11 @@ ZoneMeta::getShortIDFromCanonical(const UChar* canonicalID) { ures_getByKey(rb, gTimezoneTag, rb, &status); shortID = ures_getStringByKey(rb, tzidKey, NULL, &status); ures_close(rb); - + if (U_FAILURE(status) || (shortID!=nullptr && u_strlen(shortID)==4)) { + // TODO: For now we skip entries mapping to metazone short ids, + // which have 4 characters. + return NULL; + } return shortID; } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java index 5858b480dda..158002f7ed2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java @@ -401,9 +401,13 @@ public final class ZoneMeta { UResourceBundle typeMap = keyTypeData.get("typeMap"); UResourceBundle typeKeys = typeMap.get("timezone"); try { - /* UResourceBundle canonicalEntry = */ typeKeys.get(tzidKey); - // The given tzid is available in the canonical list - canonical = tzid; + UResourceBundle canonicalEntry = typeKeys.get(tzidKey); + if (canonicalEntry.getString().length() != 4) { + // The given tzid is available in the canonical list + // TODO: For now we skip entries mapping to metazone short ids, + // which have 4 characters. + canonical = tzid; + } } catch (MissingResourceException e) { // fall through } @@ -880,6 +884,11 @@ public final class ZoneMeta { } catch (MissingResourceException e) { // fall through } + if (shortID!=null && shortID.length()==4) { + // TODO: For now we skip entries mapping to metazone short ids, + // which have 4 characters. + return null; + } return shortID; } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java index 50033b3aab9..baa03b2fa5a 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java @@ -340,6 +340,12 @@ public class KeyTypeData { String legacyTypeId = typeMapEntry.getKey(); String bcpTypeId = typeMapEntry.getString(); + // TODO: For now we skip loading entries mapping to metazone short ids, + // which have 4 characters. + if (isTZ && bcpTypeId.length() == 4) { + continue; + } + // special types final char first = legacyTypeId.charAt(0); final boolean isSpecialType = '9' < first && first < 'a' && bcpTypeId.length() == 0; diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 5e8dbe2b039..88da8379aad 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:16109c3147304d51cb8c81783606c644b83a8673ecfdefb9fb6ab05f20b23d39 -size 13621236 +oid sha256:1353025e1c11978a08634320d78eb0ab2dc6755e9e966e6100429815165f37b5 +size 13622547 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 1b99fb9f647..5a6d9bbc0fa 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:04908483993af7e94fbf12f9dd3aa5d1bfa005c401e3f12f8298f5940c3beaed -size 95038 +oid sha256:abfd47aefce01f45015382e67784908314aac96327071f50768bd2e52b4ad18f +size 96724 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 6fc732e03c7..b5f74dee612 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:3e73e42f61b3c0c527d1c62674592acb2094f271f6ab8c3ca7b0c7e691bad2fa +oid sha256:1db5e252cd48bb0610d5d2e84ca24de565e4014a9679ea9246b999d5bc0e74b5 size 826093