diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index 777d6e1f5e6..6d194416199 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -58,6 +58,13 @@ # CLDR_TMP_DIR: Parent of temporary CLDR production data. # Defaults to $CLDR_DIR/../cldr-aux (sibling to CLDR_DIR). # +# *** NOTE ***: In CLDR release-36-beta, the GenerateProductionData +# tool no longer generates data into $CLDR_TMP_DIR/production; instead +# it generates data into $CLDR_DIR/../cldr-staging/production. However +# the rest of the build still assumes that the generated data is in +# $CLDR_TMP_DIR/production. So CLDR_TMP_DIR must be defined to be +# $CLDR_DIR/../cldr-staging +# # c) ICU-related variables # These variables only need to be set if you're directly reusing the # commands below. diff --git a/icu4c/source/data/misc/metadata.txt b/icu4c/source/data/misc/metadata.txt index 73ac14262ae..14932048fab 100644 --- a/icu4c/source/data/misc/metadata.txt +++ b/icu4c/source/data/misc/metadata.txt @@ -2131,6 +2131,10 @@ metadata:table(nofallback){ reason{"overlong"} replacement{"SX"} } + no23{ + reason{"deprecated"} + replacement{"no50"} + } nzn{ reason{"deprecated"} replacement{"nzauk nzbop nzgis nzhkb nzmwt nzntl nztki nzwgn nzwko"} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index afc53ec7542..7a38fc4806b 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -23120,7 +23120,7 @@ supplementalData:table(nofallback){ "no20", "no21", "no22", - "no23", + "no50", } NP{ "np1", @@ -25653,12 +25653,6 @@ supplementalData:table(nofallback){ "itvi", "itvr", } - it36{ - "itgo", - "itpn", - "itts", - "itud", - } it42{ "itge", "itim", @@ -25755,13 +25749,10 @@ supplementalData:table(nofallback){ } it88{ "itca", - "itci", "itnu", - "itog", "itor", - "itot", + "itsd", "itss", - "itvs", } knk{ "kn01", @@ -25861,6 +25852,7 @@ supplementalData:table(nofallback){ "manou", "marab", "masal", + "masik", "masil", "maskh", } @@ -25874,12 +25866,13 @@ supplementalData:table(nofallback){ ma06{ "mabes", "mabrr", + "macas", "macht", "majdi", "mamed", "mamoh", + "maset", "masib", - "masik", } ma07{ "machi", @@ -25892,11 +25885,9 @@ supplementalData:table(nofallback){ "mayus", } ma08{ - "macas", "maerr", "mamid", "maoua", - "maset", "matin", "mazag", } diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 1ae7a83bd86..8f974a10406 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:168573557c146f8f890375cea0415fa9f9786f80e090f14232aefad78f9b4c4e -size 12967197 +oid sha256:fd707bc2310c8fbd2fac9b63492f171934b276dc2d6593b8df7c453adcaf512f +size 12967319 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index c6014ff8591..1219e5faf41 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:eac813ba859d7864a910528c3c4a8a4623665c01ec1d841e40c0229330336e4f +oid sha256:43cba68295238f4d1ecf7e5da88974de86ca942a03e9c195522ebc421c6185ef size 94279 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 08aa05c5dcc..50307fef902 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:a74dc23bc901aca62d330b06538eaee25623e37067179c9feaf70390ccea197d +oid sha256:453deb3e240c6f22d674e04e158f08cbb56864ea0da525a0316f6fdbf3f86320 size 723409