From c163f7dc29ea21cacd7c7c9000f1ba8a2f0698b1 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 24 Mar 2020 11:23:09 -0700 Subject: [PATCH] ICU-20979 integrate CLDR release-37-beta to master --- icu4c/source/data/misc/langInfo.txt | 120 ++++++++++---------- icu4c/source/data/misc/supplementalData.txt | 14 ++- icu4j/main/shared/data/icudata.jar | 4 +- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 2 +- 5 files changed, 72 insertions(+), 70 deletions(-) diff --git a/icu4c/source/data/misc/langInfo.txt b/icu4c/source/data/misc/langInfo.txt index 6cdc8ffa1a5..76d7287dab7 100644 --- a/icu4c/source/data/misc/langInfo.txt +++ b/icu4c/source/data/misc/langInfo.txt @@ -2436,15 +2436,15 @@ f93702e439e53be83d } // lsrs } // likely match{ - trie:bin{ // BytesTrie: 2630 bytes + trie:bin{ // BytesTrie: 2627 bytes 00196ec41e74c1b077c0ca77a28078a2 8a79a29a7a036c346daa8ee834f51165 ee5d12ed6df335117ae820022a854834 4c166174ee48616ef34911616e02e99e f3a245f41248616e01f347f42007b314 -b32ab426b536b605b3c8a6b329b429b6 -2910b5292a2bb026b122b205b3c892b3 -29b429b62905b3c888b329b429b62912 +b32ab426b536b605b3c8a3b329b429b6 +2910b5292a2bb026b122b205b3c88fb3 +29b429b62905b3c885b329b429b62912 48616e01f349f4491348616ef43f0175 2aef1166f25d12f57ae835016d2ae811 65ee5d02eda241f622f7116de7350369 @@ -2471,9 +2471,9 @@ f375fa35117ae84971c16171a2ac72a4 4c6174ee2be832e942ee22ef1165ee5d 0262ac2768227310f2291165ee5c012a 855316696ee84c6174ee35702e705272 -58735ee1b0ade41165ee5c012a854116 +58735ee1b0aae41165ee5c012a854116 7261e24c6174ee3512f66ff23512ef73 -e33501e8aef2f91161e1296434674068 +e33501e8aeeff91161e1296434674068 486b12e76de73501e322ee1173e33513 e36b6cee3512f561f23504753a769077 a26478a26df51165f35d0cec16f30bf3 @@ -2487,9 +2487,9 @@ f5350aef14f409f426f522f71171f535 ef26f022f21171f535e12ee32ae826ec 22ee1171f5351171f5350361a80aed30 eea285f71166f25d1164e5496ea26f6f -a2d370086b4d6bac06735ae168f386f4 -1170f4a28007b3c48cb3aa90b4aa8db5 -aa8ab601b129b62901e5a2d3f41170f3 +a2d370086b4d6bac03735ae168f386f4 +1170f4a28007b3c4c2b3aac6b4aac3b5 +aac0b601b129b62901e5a2d3f41170f3 351165ee5c012a8547167572f54c6174 ee351165ee5c012a8541167261e24c61 74ee356234633a65406712e161f23512 @@ -2500,7 +2500,7 @@ f470f33512ed65ee4912ec6df3350a79 01e4a66eee1165ee5d01642c6e01ee49 ef2310e13161a8756834693a6c427312 ef65ee5d12e467ee3513f16b6cee3513 -e56c75f935046b54725ce3acfeeda2dd +e56c75f935046b54725ce3acfbeda2dd f21165ee5c012a854f167279e14c6174 ee3513e96b6cee3502e3a6c6ee22f311 6df33567c32c6ac2486aa2b56ba40d6c @@ -2512,7 +2512,7 @@ e7a448e9a60aec0165426d10ec20012a 854c166174ee4d6c79ed4910ee5c012a 854d166c79ed4c6174ee3512e66dee35 6e1f6e34713a73407512e96df33512f0 -7ae83512e76df33501e8ac69e9116df3 +7ae83512e76df33501e8ac66e9116df3 356134653a66406912ee6df33512f86d f33512ef6df33502e14ae246e51165ee 5d02612ee13af61169e44901eb22f811 @@ -2524,7 +2524,7 @@ e10148464a127061ee2b12616ee10148 36ef2ef57cf91172f55d116bef20022a 8548464a12616def01482c4b126f72e5 2b12616ee72b11616e01e722e9134b6f -72e52b1174f25deba89aed6aee016542 +72e52b1174f25deba897ed6aee016542 6b10ee20012a854c166174ee4b6e64e1 4910ee5c012a854b166e64e14c6174ee 351165ee5c012a854b16686df24c6174 @@ -2540,68 +2540,68 @@ ee350e753ee221e24ee7a29dee4cef11 01e922ed126c75f93513ed6c75f93563 4669526b02e226ef22f3126c75f93512 6c75f93501e522e6116df33512f76df3 -35676a68a2816905e40ae4a88fe734f3 +35676a68a2816905e40ae4a88ce734f3 1165ee49642e6b36e11165ee5d13e16c 75f93512f469f5350a7531ec1eeca40d eea40af50167286810e95d10f520012a 854c166174ee47756af249752ee122e4 1165ee4901e922ee1167ee3561386b4c 6e546f5a7312f764e52902e1a257eea4 -6ef8116fed3513f06b70e53512f767ee +6bf8116fed3513f06b70e53512f767ee 3513ed6b6feb3507e934e94ef26cf4a6 -faf91172f55c012a854116726dee4379 +f7f91172f55c012a854116726dee4379 72ec351168e920012a854c166174ee44 6576e1490162287310e82910f3296132 -6a4c7352e11165ee5d02e530eba410f7 +6a4c7352e11165ee5d02e530eba40df7 1165ee49116fed3512e96df33512ee7a -e83564c0e0648865a248660366327538 +e83564c0dd648865a248660366327538 ef6af9116eec4912ed66e63506e80be8 2ae926f122f61166e635e226e522e611 66e6351166e6351164e149027434753a e1106e01e231ef3112f96ee53512f06d -f33507ef46efa468f32ef496f51165f3 -491165f3a28007b30cb342b43eb53ab6 -01b129b6292a2bb026b14eb204b029b2 -29b329b429b52904b029b229b329b429 -b52901b129b6291166e95d6e9879a0e5 -a41eee1165eea28007b317b362b430b5 -5ab601b229b62904b027b127b327b427 -b5272a2bb030b12cb201b229b62904b0 -29b129b329b427b52913e26b6cee3513 -ef6b6cee3561a25662a482630a6f2c7a -167a30efa4b5f91165ee4901e822ef11 -7ae835117ae8356f3070367212f366f2 -4912e16df33512f87ae8356438653e68 -466a4c6b12e261f25d12ef7ae83513e2 -6669ec5d12f265ee4912f97ae8350015 -75afe288f275f24af9a26cfa1172f55c -012a854c166174ee437972ec351161f2 -20012a5a4c166174ee417261e24807b3 -27b364b426b522b605b436b429b529b6 -298407b313b33cb426b522b605b422b4 -29b529b62910b3292a2bb026b122b205 -b40fb429b529b62905b406b429b529b6 -29b029b129b2291165f349e22ee632eb -1165ee5d1172f55d116eec4975a41d76 -34793a7a4ee1127373f92912ec61f235 -03e82aec26ee22f01161f23512e261fa -3566356c1e6c3e70447203f12af326f9 -22fa1161f23512ee73f13501e322e411 -61f235663069366a12f061f23512e261 -f23513e97379f235613e624e635a6490 -6501e222e31161f23502e526ef32f411 -73f13501e822f61161f23505f709f726 -f822f91161f235e82eed22f11161f235 -1165ee5d1161f23512e661f2350c7655 -e83de83eee42f286f30168287310e829 -10f2291168e95d0162426510ee5c012a -854216656ee74c6174ee3510ee20012a -854c166174ee42656ee7491166f24976 -2e7a3ae51172f54901e522f5116df335 -12e36de7356a1b6a306d447412ea6df3 -3501ee2af1116de735116df33512ed6d -e735623065366812f26de73512fa61f2 -3512ed65ee5d +f33506ee78ee34efa278f396f51165f3 +491165eea28007b317b362b430b55ab6 +01b229b62904b027b127b327b427b527 +2a2bb030b12cb201b229b62904b029b1 +29b329b427b5291165f3a28007b30cb3 +42b43eb53ab601b129b6292a2bb026b1 +4eb204b029b229b329b429b52904b029 +b229b329b429b52901b129b6296e2e79 +36e51165ee5d13e26b6cee3513ef6b6c +ee3561a25662a482630a6f2c7a167a30 +efa4b5f91165ee4901e822ef117ae835 +117ae8356f3070367212f366f24912e1 +6df33512f87ae8356438653e68466a4c +6b12e261f25d12ef7ae83513e26669ec +5d12f265ee4912f97ae835001575afe2 +88f275f24af9a26cfa1172f55c012a85 +4c166174ee437972ec351161f220012a +5a4c166174ee417261e24807b327b364 +b426b522b605b436b429b529b6298407 +b313b33cb426b522b605b422b429b529 +b62910b3292a2bb026b122b205b40fb4 +29b529b62905b406b429b529b629b029 +b129b2291165f349e22ee632eb1165ee +5d1172f55d116eec4975a41d7634793a +7a4ee1127373f92912ec61f23503e82a +ec26ee22f01161f23512e261fa356635 +6c1e6c3e70447203f12af326f922fa11 +61f23512ee73f13501e322e41161f235 +663069366a12f061f23512e261f23513 +e97379f235613e624e635a64906501e2 +22e31161f23502e526ef32f41173f135 +01e822f61161f23505f709f726f822f9 +1161f235e82eed22f11161f2351165ee +5d1161f23512e661f2350c7655e83de8 +3eee42f286f30168287310e82910f229 +1168e95d0162426510ee5c012a854216 +656ee74c6174ee3510ee20012a854c16 +6174ee42656ee7491166f249762e7a3a +e51172f54901e522f5116df33512e36d +e7356a1b6a306d447412ea6df33501ee +2af1116de735116df33512ed6de73562 +3065366812f26de73512fa61f23512ed +65ee5d } // trie regionToPartitions:bin{ // 1677 bytes 000008090a00020000000b0009000201 diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index ecb04aadb52..6c0de73eded 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -18393,12 +18393,6 @@ supplementalData:table(nofallback){ "30", "1", } - { - "et", - "fi", - "30", - "1", - } { "eu", "es", @@ -35917,6 +35911,7 @@ supplementalData:table(nofallback){ concentration-blood-glucose{"millimole-per-liter"} consumption-inverse-vehicle-fuel{"mile-per-gallon-imperial"} length-person{"inch"} + length-person-height{"inch"} } CH{ concentration-blood-glucose{"millimole-per-liter"} @@ -35985,6 +35980,7 @@ supplementalData:table(nofallback){ "inch", } length-person{"inch"} + length-person-height{"inch"} length-road{"yard"} length-vehicle{"foot-and-inch"} length-visiblty{ @@ -36042,6 +36038,7 @@ supplementalData:table(nofallback){ } IN{ length-person{"inch"} + length-person-height{"inch"} pressure-baromtrc{"inch-ofhg"} } IS{ @@ -36179,6 +36176,10 @@ supplementalData:table(nofallback){ SE{ concentration-blood-glucose{"millimole-per-liter"} length-person-height{"meter-and-centimeter"} + length-road{ + "mile-scandinavian", + "kilometer", + } speed-wind{"meter-per-second"} } SG{ @@ -36227,6 +36228,7 @@ supplementalData:table(nofallback){ "inch", } length-person{"inch"} + length-person-height{"inch"} length-rainfall{"inch"} length-snowfall{"inch"} length-vehicle{"foot-and-inch"} diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 3c99ed63ca5..68dd388dd54 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:4c253061af8712a3f527e3d5cf2227ef90b0dcffc428f319ff4563c241a0e1a1 -size 13149632 +oid sha256:11d8383eaff95db943d886a25e5c9d5a251e7c905868a72ed1dad5db51531fe4 +size 13149629 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 5565932f41f..bbd4f9487a8 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:5171c1ef2de18296eb47ef5c8f4f74b2273942ace690b763f3af8902e6ed42b4 +oid sha256:729bcbca1bf967713d4bc07eaf85d21711a271e2bcb05519bc3073751c0b4e83 size 94304 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index be37d535ece..3ebb1b0540f 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:0fbae65d9d55e8bacc2ba5cfc8e9e71c45aee7408aab6fa1158ac1f71b819781 +oid sha256:28f771e6ff9f9e2a4637dd7d8447b6fcc927b15eb857ba866a142d5259bf833b size 723480